From e8fd911e8f9c8eaf8272d6b665ed9b287064a7e0 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 7 May 2022 11:03:29 +0200 Subject: [PATCH 1/1] Adapt to new third parties --- Makefile | 1 + Makefile-rcp.mk | 1 + .../argeo/cms/e4}/jcr/EclipseJcrMonitor.java | 2 +- .../src/org/argeo/cms/swt/CmsSwtTheme.java | 4 +- .../cms/swt/dialogs/CmsWizardDialog.java | 3 +- .../argeo/cms/swt/osgi/BundleCmsSwtTheme.java | 2 +- .../ui/eclipse/forms/editor/FormEditor.java | 66 +++++++++---------- .../cms/ui/eclipse/forms/editor/FormPage.java | 9 ++- sdk/argeo-build | 2 +- 9 files changed, 44 insertions(+), 46 deletions(-) rename {jcr/org.argeo.cms.ui/src/org/argeo/eclipse/ui => eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4}/jcr/EclipseJcrMonitor.java (96%) diff --git a/Makefile b/Makefile index 49a995426..81140566b 100644 --- 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 8811d2448..99197c05b 100644 --- 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/jcr/org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/EclipseJcrMonitor.java b/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/EclipseJcrMonitor.java similarity index 96% rename from jcr/org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/EclipseJcrMonitor.java rename to eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/EclipseJcrMonitor.java index b83aaa25a..e10738ee0 100644 --- a/jcr/org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/EclipseJcrMonitor.java +++ b/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/EclipseJcrMonitor.java @@ -1,4 +1,4 @@ -package org.argeo.eclipse.ui.jcr; +package org.argeo.cms.e4.jcr; import org.argeo.jcr.JcrMonitor; import org.eclipse.core.runtime.IProgressMonitor; 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 b5f7c0e4d..b40c2a06c 100644 --- 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 null if not found. */ - Image getImage(String path); +// /** The image registered at this path, or null 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 59d9ab7f5..d9957d63c 100644 --- 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 8626a53e3..c37a5b744 100644 --- 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> 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 7fa00d9c2..484dae842 100644 --- 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 1511cf38c..a788412db 100644 --- 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/sdk/argeo-build b/sdk/argeo-build index 90dfe68dd..2cb8a40fe 160000 --- a/sdk/argeo-build +++ b/sdk/argeo-build @@ -1 +1 @@ -Subproject commit 90dfe68dd0a8f9510939b2a276aed3d79e563bb2 +Subproject commit 2cb8a40febfe1b42ab2aebecbf6e0ec06b2c5e4d -- 2.30.2