Adapt to new third parties

diff --git a/Makefile b/Makefile
index 49a995426246cbd9dbb053f8b6283a523f5876da..81140566be027f3acf109f8607eaeb1e9d0be310 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -48,6 +48,7 @@ org.argeo.tp \
 org.argeo.tp.apache \
 org.argeo.tp.jetty \
 org.argeo.tp.eclipse.equinox \
+org.argeo.tp.eclipse.rwt \
 org.argeo.tp.eclipse.rap \
 org.argeo.tp.jcr
 

diff --git a/Makefile-rcp.mk b/Makefile-rcp.mk
index 8811d2448d15539af7d6b6f71a854e3eb0c476f0..99197c05b320d79e57763f3698eeccf0d446c302 100644 (file)
--- a/Makefile-rcp.mk
+++ b/Makefile-rcp.mk
@@ -20,6 +20,7 @@ org.argeo.tp \
 org.argeo.tp.apache \
 org.argeo.tp.jetty \
 org.argeo.tp.eclipse.equinox \
+org.argeo.tp.eclipse.swt \
 org.argeo.tp.eclipse.rcp \
 org.argeo.tp.jcr
 

diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/EclipseJcrMonitor.java b/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/EclipseJcrMonitor.java
new file mode 100644 (file)
index 0000000..e10738e
--- /dev/null
+++ b/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/EclipseJcrMonitor.java
@@ -0,0 +1,44 @@
+package org.argeo.cms.e4.jcr;
+
+import org.argeo.jcr.JcrMonitor;
+import org.eclipse.core.runtime.IProgressMonitor;
+
+/**
+ * Wraps an Eclipse {@link IProgressMonitor} so that it can be passed to
+ * framework agnostic Argeo routines.
+ */
+public class EclipseJcrMonitor implements JcrMonitor {
+       private final IProgressMonitor progressMonitor;
+
+       public EclipseJcrMonitor(IProgressMonitor progressMonitor) {
+               this.progressMonitor = progressMonitor;
+       }
+
+       public void beginTask(String name, int totalWork) {
+               progressMonitor.beginTask(name, totalWork);
+       }
+
+       public void done() {
+               progressMonitor.done();
+       }
+
+       public boolean isCanceled() {
+               return progressMonitor.isCanceled();
+       }
+
+       public void setCanceled(boolean value) {
+               progressMonitor.setCanceled(value);
+       }
+
+       public void setTaskName(String name) {
+               progressMonitor.setTaskName(name);
+       }
+
+       public void subTask(String name) {
+               progressMonitor.subTask(name);
+       }
+
+       public void worked(int work) {
+               progressMonitor.worked(work);
+       }
+}

diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsSwtTheme.java b/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsSwtTheme.java
index b5f7c0e4d4edd2d66a93564f20744426d485b7fc..b40c2a06ce497bf714e98bc760131ba306b9e018 100644 (file)
--- a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsSwtTheme.java
+++ b/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsSwtTheme.java
@@ -5,8 +5,8 @@ import org.eclipse.swt.graphics.Image;
 
 /** SWT specific {@link CmsTheme}. */
 public interface CmsSwtTheme extends CmsTheme {
-       /** The image registered at this path, or <code>null</code> if not found. */
-       Image getImage(String path);
+//     /** The image registered at this path, or <code>null</code> if not found. */
+//     Image getImage(String path);
 
        /**
         * And icon with this file name (without the extension), with a best effort to

diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/CmsWizardDialog.java b/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/CmsWizardDialog.java
index 59d9ab7f5528a0ac900bd506c07ef91a15b4031e..d9957d63c92a512a975328af86ed92bec26f7c89 100644 (file)
--- a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/CmsWizardDialog.java
+++ b/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/CmsWizardDialog.java
@@ -179,7 +179,8 @@ public class CmsWizardDialog extends LightweightDialog implements IWizardContain
        @Override
        public void run(boolean fork, boolean cancelable, IRunnableWithProgress runnable)
                        throws InvocationTargetException, InterruptedException {
-               runnable.run(null);
+               // FIXME it creates a dependency to Eclipse Core Runtime
+               // runnable.run(null);
        }
 
        @Override

diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/osgi/BundleCmsSwtTheme.java b/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/osgi/BundleCmsSwtTheme.java
index 8626a53e374458e84d23591b8e856158266359f0..c37a5b74476fdd361e951813270914dfcd9096ae 100644 (file)
--- a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/osgi/BundleCmsSwtTheme.java
+++ b/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/osgi/BundleCmsSwtTheme.java
@@ -17,7 +17,7 @@ public class BundleCmsSwtTheme extends BundleCmsTheme implements CmsSwtTheme {
 
        private Map<String, Map<Integer, String>> iconPaths = new HashMap<>();
 
-       public Image getImage(String path) {
+       protected Image getImage(String path) {
                if (!imageCache.containsKey(path)) {
                        try (InputStream in = getResourceAsStream(path)) {
                                if (in == null)

diff --git a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/editor/FormEditor.java b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/editor/FormEditor.java
index 7fa00d9c2436a0badced2d6a9c43903416ef2d07..484dae8420b63466c8c7f3f58aaf57124bb84171 100644 (file)
--- a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/editor/FormEditor.java
+++ b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/editor/FormEditor.java
@@ -1,11 +1,7 @@
 package org.argeo.cms.ui.eclipse.forms.editor;
 
 import org.argeo.cms.ui.eclipse.forms.FormToolkit;
-import org.eclipse.core.runtime.ListenerList;
 import org.eclipse.jface.dialogs.IPageChangeProvider;
-import org.eclipse.jface.dialogs.IPageChangedListener;
-import org.eclipse.jface.dialogs.PageChangedEvent;
-import org.eclipse.jface.util.SafeRunnable;
 
 /**
  * This class forms a base of multi-page form editors that typically use one or
@@ -54,36 +50,36 @@ public FormPage getActivePageInstance() {
        // RAP [if] As RAP is still using workbench 3.4, the implementation of
 // IPageChangeProvider is missing from MultiPageEditorPart. Remove this code
 // with the adoption of workbench > 3.5
-       private ListenerList pageListeners = new ListenerList();
-       
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.jface.dialogs.IPageChangeProvider#addPageChangedListener(org.eclipse.jface.dialogs.IPageChangedListener)
-     */
-    public void addPageChangedListener(IPageChangedListener listener) {
-        pageListeners.add(listener);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.jface.dialogs.IPageChangeProvider#removePageChangedListener(org.eclipse.jface.dialogs.IPageChangedListener)
-     */
-    public void removePageChangedListener(IPageChangedListener listener) {
-        pageListeners.remove(listener);
-    }
-    
-       private void firePageChanged(final PageChangedEvent event) {
-        Object[] listeners = pageListeners.getListeners();
-        for (int i = 0; i < listeners.length; ++i) {
-            final IPageChangedListener l = (IPageChangedListener) listeners[i];
-            SafeRunnable.run(new SafeRunnable() {
-                public void run() {
-                    l.pageChanged(event);
-                }
-            });
-        }
-    }
+//     private ListenerList pageListeners = new ListenerList();
+//     
+//    /*
+//     * (non-Javadoc)
+//     * 
+//     * @see org.eclipse.jface.dialogs.IPageChangeProvider#addPageChangedListener(org.eclipse.jface.dialogs.IPageChangedListener)
+//     */
+//    public void addPageChangedListener(IPageChangedListener listener) {
+//        pageListeners.add(listener);
+//    }
+//
+//    /*
+//     * (non-Javadoc)
+//     * 
+//     * @see org.eclipse.jface.dialogs.IPageChangeProvider#removePageChangedListener(org.eclipse.jface.dialogs.IPageChangedListener)
+//     */
+//    public void removePageChangedListener(IPageChangedListener listener) {
+//        pageListeners.remove(listener);
+//    }
+//    
+//     private void firePageChanged(final PageChangedEvent event) {
+//        Object[] listeners = pageListeners.getListeners();
+//        for (int i = 0; i < listeners.length; ++i) {
+//            final IPageChangedListener l = (IPageChangedListener) listeners[i];
+//            SafeRunnable.run(new SafeRunnable() {
+//                public void run() {
+//                    l.pageChanged(event);
+//                }
+//            });
+//        }
+//    }
 // RAPEND [if]
 }

diff --git a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/editor/FormPage.java b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/editor/FormPage.java
index 1511cf38c61272551a33d42c919237615288c328..a788412dba91e023cf936717129472e07022a3d2 100644 (file)
--- a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/editor/FormPage.java
+++ b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/editor/FormPage.java
@@ -1,7 +1,6 @@
 package org.argeo.cms.ui.eclipse.forms.editor;
 import org.argeo.cms.ui.eclipse.forms.IManagedForm;
 import org.argeo.cms.ui.eclipse.forms.ManagedForm;
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.swt.custom.BusyIndicator;
 import org.eclipse.swt.custom.ScrolledComposite;
 import org.eclipse.swt.graphics.Image;
@@ -201,10 +200,10 @@ public class FormPage implements IFormPage {
        /**
         * @see org.eclipse.ui.ISaveablePart#doSave(org.eclipse.core.runtime.IProgressMonitor)
         */
-       public void doSave(IProgressMonitor monitor) {
-               if (mform != null)
-                       mform.commit(true);
-       }
+//     public void doSave(IProgressMonitor monitor) {
+//             if (mform != null)
+//                     mform.commit(true);
+//     }
        /**
         * @see org.eclipse.ui.ISaveablePart#doSaveAs()
         */

diff --git a/jcr/org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/EclipseJcrMonitor.java b/jcr/org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/EclipseJcrMonitor.java
deleted file mode 100644 (file)
index b83aaa2..0000000
--- a/jcr/org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/EclipseJcrMonitor.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.argeo.eclipse.ui.jcr;
-
-import org.argeo.jcr.JcrMonitor;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-/**
- * Wraps an Eclipse {@link IProgressMonitor} so that it can be passed to
- * framework agnostic Argeo routines.
- */
-public class EclipseJcrMonitor implements JcrMonitor {
-       private final IProgressMonitor progressMonitor;
-
-       public EclipseJcrMonitor(IProgressMonitor progressMonitor) {
-               this.progressMonitor = progressMonitor;
-       }
-
-       public void beginTask(String name, int totalWork) {
-               progressMonitor.beginTask(name, totalWork);
-       }
-
-       public void done() {
-               progressMonitor.done();
-       }
-
-       public boolean isCanceled() {
-               return progressMonitor.isCanceled();
-       }
-
-       public void setCanceled(boolean value) {
-               progressMonitor.setCanceled(value);
-       }
-
-       public void setTaskName(String name) {
-               progressMonitor.setTaskName(name);
-       }
-
-       public void subTask(String name) {
-               progressMonitor.subTask(name);
-       }
-
-       public void worked(int work) {
-               progressMonitor.worked(work);
-       }
-}

diff --git a/sdk/argeo-build b/sdk/argeo-build
index 90dfe68dd0a8f9510939b2a276aed3d79e563bb2..2cb8a40febfe1b42ab2aebecbf6e0ec06b2c5e4d 160000 (submodule)
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit 90dfe68dd0a8f9510939b2a276aed3d79e563bb2
+Subproject commit 2cb8a40febfe1b42ab2aebecbf6e0ec06b2c5e4d