Adapt to changes in Argeo CMS

diff --git a/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/CmsUiConstants.java b/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/CmsUiConstants.java
deleted file mode 100644 (file)
index fd1dda5..0000000
--- a/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/CmsUiConstants.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.argeo.cms.ui;
-
-/** Commons constants */
-@Deprecated
-public interface CmsUiConstants {
-       // DATAKEYS
-//     public final static String STYLE = EclipseUiConstants.CSS_CLASS;
-//     public final static String MARKUP = EclipseUiConstants.MARKUP_SUPPORT;
-       @Deprecated
-       /* RWT.CUSTOM_ITEM_HEIGHT */
-       public final static String ITEM_HEIGHT = "org.eclipse.rap.rwt.customItemHeight";
-
-       // EVENT DETAILS
-       @Deprecated
-       /* RWT.HYPERLINK */
-       public final static int HYPERLINK = 1 << 26;
-
-       // STANDARD RESOURCES
-       public final static String LOADING_IMAGE = "icons/loading.gif";
-
-       // MISCEALLENEOUS
-       String DATE_TIME_FORMAT = "dd/MM/yyyy, HH:mm";
-}

diff --git a/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/util/CmsUiUtils.java b/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/util/CmsUiUtils.java
index 3522f1b423b3f3e2fc09422aa36e556c95188ad5..94c5808e4ca9758a13f1f7760c903354a2b64cb9 100644 (file)
--- a/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/util/CmsUiUtils.java
+++ b/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/util/CmsUiUtils.java
@@ -1,7 +1,5 @@
 package org.argeo.cms.ui.util;
 
-import java.io.IOException;
-import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 
@@ -12,16 +10,14 @@ import javax.servlet.http.HttpServletRequest;
 import org.argeo.api.cms.CmsConstants;
 import org.argeo.api.cms.ux.Cms2DSize;
 import org.argeo.api.cms.ux.CmsView;
+import org.argeo.cms.acr.ContentUtils;
 import org.argeo.cms.jcr.CmsJcrUtils;
 import org.argeo.cms.swt.CmsSwtUtils;
-import org.argeo.cms.ui.CmsUiConstants;
 import org.argeo.cms.ux.AbstractImageManager;
 import org.argeo.cms.ux.CmsUxUtils;
 import org.argeo.jcr.JcrUtils;
 import org.eclipse.rap.rwt.RWT;
 import org.eclipse.rap.rwt.service.ResourceManager;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
 import org.eclipse.swt.layout.RowData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
@@ -82,24 +78,22 @@ public class CmsUiUtils {
 
        /** Clean reserved URL characters for use in HTTP links. */
        public static String getDataPathForUrl(Node node) {
-               return CmsSwtUtils.cleanPathForUrl(getDataPath(node));
+               return ContentUtils.cleanPathForUrl(getDataPath(node));
        }
 
        /** @deprecated Use rowData16px() instead. GridData should not be reused. */
        @Deprecated
        public static RowData ROW_DATA_16px = new RowData(16, 16);
 
-       
-
        /*
         * FORM LAYOUT
         */
 
-       
+       public final static String ITEM_HEIGHT = "org.eclipse.rap.rwt.customItemHeight";
 
        @Deprecated
        public static void setItemHeight(Table table, int height) {
-               table.setData(CmsUiConstants.ITEM_HEIGHT, height);
+               table.setData(ITEM_HEIGHT, height);
        }
 
        //

diff --git a/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/widgets/StyledControl.java b/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/widgets/StyledControl.java
index e3a5cb473d588fa47254ddb752773f04fda823d1..d00c52468b24fd0f52ee98618e6fa2f3c1c99bc4 100644 (file)
--- a/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/widgets/StyledControl.java
+++ b/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/widgets/StyledControl.java
@@ -3,7 +3,6 @@ package org.argeo.cms.ui.widgets;
 import javax.jcr.Item;
 
 import org.argeo.cms.swt.CmsSwtUtils;
-import org.argeo.cms.ui.CmsUiConstants;
 import org.argeo.eclipse.ui.specific.EclipseUiSpecificUtils;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.FocusListener;
@@ -12,7 +11,7 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 
 /** Editable text part displaying styled text. */
-public abstract class StyledControl extends JcrComposite implements CmsUiConstants {
+public abstract class StyledControl extends JcrComposite {
        private static final long serialVersionUID = -6372283442330912755L;
        private Control control;