From b4f8687c665491a6c8a623d8cd7ad7c6f353b838 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 16 Mar 2018 09:15:35 +0100 Subject: [PATCH] Move pseudo-Eclipse forms to CMS UI --- .../org/argeo/cms/ui/eclipse}/forms/AbstractFormPart.java | 2 +- .../src/org/argeo/cms/ui/eclipse}/forms/FormColors.java | 2 +- .../src/org/argeo/cms/ui/eclipse}/forms/FormFonts.java | 2 +- .../src/org/argeo/cms/ui/eclipse}/forms/FormToolkit.java | 2 +- .../src/org/argeo/cms/ui/eclipse}/forms/FormUtil.java | 2 +- .../src/org/argeo/cms/ui/eclipse}/forms/IFormColors.java | 2 +- .../src/org/argeo/cms/ui/eclipse}/forms/IFormPart.java | 2 +- .../src/org/argeo/cms/ui/eclipse}/forms/IManagedForm.java | 2 +- .../src/org/argeo/cms/ui/eclipse}/forms/ManagedForm.java | 2 +- .../org/argeo/cms/ui/eclipse}/forms/editor/FormEditor.java | 4 ++-- .../org/argeo/cms/ui/eclipse}/forms/editor/FormPage.java | 6 +++--- .../org/argeo/cms/ui/eclipse}/forms/editor/IFormPage.java | 4 ++-- 12 files changed, 16 insertions(+), 16 deletions(-) rename {org.argeo.eclipse.ui/src/org/argeo/eclipse/ui => org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse}/forms/AbstractFormPart.java (98%) rename {org.argeo.eclipse.ui/src/org/argeo/eclipse/ui => org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse}/forms/FormColors.java (99%) rename {org.argeo.eclipse.ui/src/org/argeo/eclipse/ui => org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse}/forms/FormFonts.java (98%) rename {org.argeo.eclipse.ui/src/org/argeo/eclipse/ui => org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse}/forms/FormToolkit.java (99%) rename {org.argeo.eclipse.ui/src/org/argeo/eclipse/ui => org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse}/forms/FormUtil.java (99%) rename {org.argeo.eclipse.ui/src/org/argeo/eclipse/ui => org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse}/forms/IFormColors.java (98%) rename {org.argeo.eclipse.ui/src/org/argeo/eclipse/ui => org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse}/forms/IFormPart.java (99%) rename {org.argeo.eclipse.ui/src/org/argeo/eclipse/ui => org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse}/forms/IManagedForm.java (99%) rename {org.argeo.eclipse.ui/src/org/argeo/eclipse/ui => org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse}/forms/ManagedForm.java (99%) rename {org.argeo.eclipse.ui/src/org/argeo/eclipse/ui => org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse}/forms/editor/FormEditor.java (97%) rename {org.argeo.eclipse.ui/src/org/argeo/eclipse/ui => org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse}/forms/editor/FormPage.java (97%) rename {org.argeo.eclipse.ui/src/org/argeo/eclipse/ui => org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse}/forms/editor/IFormPage.java (97%) diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/forms/AbstractFormPart.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/AbstractFormPart.java similarity index 98% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/forms/AbstractFormPart.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/AbstractFormPart.java index c847327b8..4ce468826 100644 --- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/forms/AbstractFormPart.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/AbstractFormPart.java @@ -1,4 +1,4 @@ -package org.argeo.eclipse.ui.forms; +package org.argeo.cms.ui.eclipse.forms; /** * AbstractFormPart implements IFormPart interface and can be used as a * convenient base class for concrete form parts. If a method contains diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/forms/FormColors.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/FormColors.java similarity index 99% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/forms/FormColors.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/FormColors.java index e2e2d899d..32b031b86 100644 --- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/forms/FormColors.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/FormColors.java @@ -1,4 +1,4 @@ -package org.argeo.eclipse.ui.forms; +package org.argeo.cms.ui.eclipse.forms; import java.util.HashMap; import java.util.Map; diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/forms/FormFonts.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/FormFonts.java similarity index 98% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/forms/FormFonts.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/FormFonts.java index c4eb54b0f..9e931ba50 100644 --- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/forms/FormFonts.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/FormFonts.java @@ -1,4 +1,4 @@ -package org.argeo.eclipse.ui.forms; +package org.argeo.cms.ui.eclipse.forms; import java.util.HashMap; diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/forms/FormToolkit.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/FormToolkit.java similarity index 99% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/forms/FormToolkit.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/FormToolkit.java index f12b6471f..99271046a 100644 --- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/forms/FormToolkit.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/FormToolkit.java @@ -1,4 +1,4 @@ -package org.argeo.eclipse.ui.forms; +package org.argeo.cms.ui.eclipse.forms; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.window.Window; diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/forms/FormUtil.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/FormUtil.java similarity index 99% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/forms/FormUtil.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/FormUtil.java index 81c3a2ff1..76e3f1104 100644 --- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/forms/FormUtil.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/FormUtil.java @@ -1,4 +1,4 @@ -package org.argeo.eclipse.ui.forms; +package org.argeo.cms.ui.eclipse.forms; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.ScrolledComposite; diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/forms/IFormColors.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/IFormColors.java similarity index 98% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/forms/IFormColors.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/IFormColors.java index 78b7a4798..cf0e5d35e 100644 --- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/forms/IFormColors.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/IFormColors.java @@ -1,4 +1,4 @@ -package org.argeo.eclipse.ui.forms; +package org.argeo.cms.ui.eclipse.forms; /** * A place to hold all the color constants used in the forms package. diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/forms/IFormPart.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/IFormPart.java similarity index 99% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/forms/IFormPart.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/IFormPart.java index e1fc9a667..954cc0372 100644 --- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/forms/IFormPart.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/IFormPart.java @@ -1,4 +1,4 @@ -package org.argeo.eclipse.ui.forms; +package org.argeo.cms.ui.eclipse.forms; /** * Classes that implement this interface can be added to the managed form and diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/forms/IManagedForm.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/IManagedForm.java similarity index 99% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/forms/IManagedForm.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/IManagedForm.java index 36d799e5c..cec7bb9c7 100644 --- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/forms/IManagedForm.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/IManagedForm.java @@ -1,4 +1,4 @@ -package org.argeo.eclipse.ui.forms; +package org.argeo.cms.ui.eclipse.forms; import org.eclipse.jface.viewers.ISelection; //import org.eclipse.ui.forms.widgets.FormToolkit; diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/forms/ManagedForm.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/ManagedForm.java similarity index 99% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/forms/ManagedForm.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/ManagedForm.java index ddcaa4fa6..19e8211e6 100644 --- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/forms/ManagedForm.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/ManagedForm.java @@ -1,4 +1,4 @@ -package org.argeo.eclipse.ui.forms; +package org.argeo.cms.ui.eclipse.forms; import java.util.Vector; import org.eclipse.jface.viewers.ISelection; diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/forms/editor/FormEditor.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/editor/FormEditor.java similarity index 97% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/forms/editor/FormEditor.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/editor/FormEditor.java index 1c5a166d4..7fa00d9c2 100644 --- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/forms/editor/FormEditor.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/editor/FormEditor.java @@ -1,6 +1,6 @@ -package org.argeo.eclipse.ui.forms.editor; +package org.argeo.cms.ui.eclipse.forms.editor; -import org.argeo.eclipse.ui.forms.FormToolkit; +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; diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/forms/editor/FormPage.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/editor/FormPage.java similarity index 97% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/forms/editor/FormPage.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/editor/FormPage.java index 3a022af75..1511cf38c 100644 --- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/forms/editor/FormPage.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/editor/FormPage.java @@ -1,6 +1,6 @@ -package org.argeo.eclipse.ui.forms.editor; -import org.argeo.eclipse.ui.forms.IManagedForm; -import org.argeo.eclipse.ui.forms.ManagedForm; +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; diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/forms/editor/IFormPage.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/editor/IFormPage.java similarity index 97% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/forms/editor/IFormPage.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/editor/IFormPage.java index 958f38ef2..eb08cb59d 100644 --- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/forms/editor/IFormPage.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/eclipse/forms/editor/IFormPage.java @@ -1,5 +1,5 @@ -package org.argeo.eclipse.ui.forms.editor; -import org.argeo.eclipse.ui.forms.IManagedForm; +package org.argeo.cms.ui.eclipse.forms.editor; +import org.argeo.cms.ui.eclipse.forms.IManagedForm; import org.eclipse.swt.widgets.Control; /** * Interface that all GUI pages need to implement in order -- 2.30.2