Small improvements while migrating to ACR

diff --git a/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/forms/FormConstants.java b/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/forms/FormConstants.java
index fe9f7e7d7537062c4541f4d652a6d3ae62829c9d..2ea824c20b4f278139b3e06f693de81803ad2579 100644 (file)
--- a/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/forms/FormConstants.java
+++ b/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/forms/FormConstants.java
@@ -1,7 +1,8 @@
 package org.argeo.cms.ui.forms;
 
 /** Constants used in the various CMS Forms */
-public interface FormConstants {
+@Deprecated
+interface FormConstants {
        // DATAKEYS
        public final static String LINKED_VALUE = "LinkedValue";
 }

diff --git a/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/forms/FormPageViewer.java b/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/forms/FormPageViewer.java
index 1888055fccef9c0cbcb9a462200ca2aec8a64e3e..136fff72e09ed6030f5377ed999e81cabf89590c 100644 (file)
--- a/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/forms/FormPageViewer.java
+++ b/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/forms/FormPageViewer.java
@@ -305,7 +305,7 @@ public class FormPageViewer extends AbstractPageViewer {
 
        protected CmsImageManager<Control, Node> imageManager() {
                if (imageManager == null)
-                       imageManager = (CmsImageManager<Control, Node>) CmsSwtUtils.getCmsView(mainSection).getImageManager();
+                       imageManager = CmsSwtUtils.getCmsView(mainSection).getImageManager();
                return imageManager;
        }
 

diff --git a/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/widgets/Img.java b/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/widgets/Img.java
index 41063fa47239d3ffb86166bf58de2d6e2d3e5c12..9093c8435166f250edacb545454885fb36f59408 100644 (file)
--- a/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/widgets/Img.java
+++ b/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/widgets/Img.java
@@ -53,8 +53,7 @@ public class Img extends EditableImage implements SectionPart, NodePart {
                        CmsImageManager<Control, Node> imageManager) throws RepositoryException {
                super(parent, swtStyle, imgNode, false, preferredImageSize);
                this.section = section;
-               this.imageManager = imageManager != null ? imageManager
-                               : (CmsImageManager<Control, Node>) CmsSwtUtils.getCmsView(section).getImageManager();
+               this.imageManager = imageManager != null ? imageManager : CmsSwtUtils.getCmsView(section).getImageManager();
                CmsSwtUtils.style(this, TextStyles.TEXT_IMG);
        }