From 9fd6744d04e89fac07e34947d962aec1509ff9f8 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 23 Jun 2022 12:59:13 +0200 Subject: [PATCH] Move UX components between packages --- .../org/argeo/cms/e4/jcr/JcrBrowserView.java | 2 +- .../cms/e4/jcr/handlers/AddFolderNode.java | 2 +- .../cms/e4/jcr/handlers/DeleteNodes.java | 2 +- .../argeo/cms/e4/jcr/handlers/Refresh.java | 2 +- .../argeo/cms/e4/monitoring/BundleNode.java | 2 +- .../argeo/cms/e4/monitoring/ModulesView.java | 2 +- .../e4/monitoring/ServiceReferenceNode.java | 2 +- .../dialog}/CmsWizardDialog.java | 3 +- ...EditablePart.java => SwtEditablePart.java} | 7 ++--- .../cms/swt/{widgets => acr}/SwtSection.java | 3 +- .../swt/{widgets => acr}/SwtSectionPart.java | 4 +-- .../swt/{widgets => acr}/SwtTabbedArea.java | 3 +- .../ui/AbstractTreeContentProvider.java | 1 + .../org/argeo/cms/ui/forms/EditableLink.java | 4 +-- .../ui/forms/EditableMultiStringProperty.java | 4 +-- .../cms/ui/forms/EditablePropertyDate.java | 4 +-- .../cms/ui/forms/EditablePropertyString.java | 4 +-- .../argeo/cms/ui/forms/FormPageViewer.java | 16 +++++------ .../org/argeo/cms/ui/jcr/JcrBrowserUtils.java | 2 +- .../argeo/cms/ui/jcr/NodeContentProvider.java | 2 +- .../jcr/model/MaintainedRepositoryElem.java | 2 +- .../ui/jcr/model/RemoteRepositoryElem.java | 2 +- .../cms/ui/jcr/model/RepositoriesElem.java | 2 +- .../cms/ui/jcr/model/RepositoryElem.java | 2 +- .../cms/ui/jcr/model/SingleJcrNodeElem.java | 2 +- .../argeo/cms/ui/jcr/model/WorkspaceElem.java | 2 +- .../cms/ui/viewers/AbstractPageViewer.java | 28 +++++++++---------- .../src/org/argeo/cms/ui/viewers/Section.java | 4 +-- .../org/argeo/cms/ui/viewers/SectionPart.java | 4 +-- .../cms/ux/{widgets => acr}/ContentPart.java | 2 +- .../org/argeo/cms/ux/widgets}/TreeParent.java | 2 +- 31 files changed, 60 insertions(+), 63 deletions(-) rename eclipse/org.argeo.cms.swt/src/org/argeo/cms/{swt/dialogs => jface/dialog}/CmsWizardDialog.java (98%) rename eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/{EditablePart.java => SwtEditablePart.java} (62%) rename eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/{widgets => acr}/SwtSection.java (98%) rename eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/{widgets => acr}/SwtSectionPart.java (74%) rename eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/{widgets => acr}/SwtTabbedArea.java (98%) rename org.argeo.cms.ux/src/org/argeo/cms/ux/{widgets => acr}/ContentPart.java (83%) rename {eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui => org.argeo.cms.ux/src/org/argeo/cms/ux/widgets}/TreeParent.java (98%) diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/JcrBrowserView.java b/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/JcrBrowserView.java index 98e80936d..46e1b6507 100644 --- a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/JcrBrowserView.java +++ b/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/JcrBrowserView.java @@ -27,8 +27,8 @@ import org.argeo.cms.ui.jcr.NodeLabelProvider; import org.argeo.cms.ui.jcr.OsgiRepositoryRegister; import org.argeo.cms.ui.jcr.PropertiesContentProvider; import org.argeo.cms.ui.jcr.model.SingleJcrNodeElem; +import org.argeo.cms.ux.widgets.TreeParent; import org.argeo.eclipse.ui.EclipseUiException; -import org.argeo.eclipse.ui.TreeParent; import org.argeo.eclipse.ui.jcr.AsyncUiEventListener; import org.argeo.eclipse.ui.jcr.util.NodeViewerComparer; import org.argeo.jcr.JcrUtils; diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/AddFolderNode.java b/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/AddFolderNode.java index 8f5bc36e1..09fa760cd 100644 --- a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/AddFolderNode.java +++ b/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/AddFolderNode.java @@ -10,7 +10,7 @@ import javax.jcr.nodetype.NodeType; import org.argeo.cms.e4.jcr.JcrBrowserView; import org.argeo.cms.ui.jcr.model.SingleJcrNodeElem; import org.argeo.cms.ui.jcr.model.WorkspaceElem; -import org.argeo.eclipse.ui.TreeParent; +import org.argeo.cms.ux.widgets.TreeParent; import org.argeo.eclipse.ui.dialogs.ErrorFeedback; import org.argeo.eclipse.ui.dialogs.SingleValue; import org.eclipse.e4.core.di.annotations.Execute; diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/DeleteNodes.java b/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/DeleteNodes.java index 1974e4d44..b8de06b46 100644 --- a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/DeleteNodes.java +++ b/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/DeleteNodes.java @@ -9,8 +9,8 @@ import javax.jcr.RepositoryException; import org.argeo.cms.e4.jcr.JcrBrowserView; import org.argeo.cms.ui.jcr.model.SingleJcrNodeElem; import org.argeo.cms.ui.jcr.model.WorkspaceElem; +import org.argeo.cms.ux.widgets.TreeParent; import org.argeo.eclipse.ui.EclipseUiException; -import org.argeo.eclipse.ui.TreeParent; import org.argeo.eclipse.ui.dialogs.ErrorFeedback; import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.e4.ui.model.application.ui.basic.MPart; diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/Refresh.java b/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/Refresh.java index 4ae072cb5..036e70ac1 100644 --- a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/Refresh.java +++ b/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/Refresh.java @@ -6,7 +6,7 @@ import javax.inject.Named; import org.argeo.cms.e4.jcr.JcrBrowserView; import org.argeo.cms.ui.jcr.JcrBrowserUtils; -import org.argeo.eclipse.ui.TreeParent; +import org.argeo.cms.ux.widgets.TreeParent; import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.e4.ui.model.application.ui.basic.MPart; import org.eclipse.e4.ui.services.IServiceConstants; diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/BundleNode.java b/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/BundleNode.java index 962ad386e..e9536830f 100644 --- a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/BundleNode.java +++ b/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/BundleNode.java @@ -1,6 +1,6 @@ package org.argeo.cms.e4.monitoring; -import org.argeo.eclipse.ui.TreeParent; +import org.argeo.cms.ux.widgets.TreeParent; import org.osgi.framework.Bundle; import org.osgi.framework.ServiceReference; diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/ModulesView.java b/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/ModulesView.java index f0d8c2952..6317882c4 100644 --- a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/ModulesView.java +++ b/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/ModulesView.java @@ -5,7 +5,7 @@ import java.util.List; import javax.annotation.PostConstruct; -import org.argeo.eclipse.ui.TreeParent; +import org.argeo.cms.ux.widgets.TreeParent; import org.eclipse.e4.ui.di.Focus; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.TreeViewer; diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/ServiceReferenceNode.java b/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/ServiceReferenceNode.java index d9c45fe11..1c60811d2 100644 --- a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/ServiceReferenceNode.java +++ b/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/ServiceReferenceNode.java @@ -1,6 +1,6 @@ package org.argeo.cms.e4.monitoring; -import org.argeo.eclipse.ui.TreeParent; +import org.argeo.cms.ux.widgets.TreeParent; import org.osgi.framework.Bundle; import org.osgi.framework.ServiceReference; 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/jface/dialog/CmsWizardDialog.java similarity index 98% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/CmsWizardDialog.java rename to eclipse/org.argeo.cms.swt/src/org/argeo/cms/jface/dialog/CmsWizardDialog.java index d9957d63c..33841a1bb 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/jface/dialog/CmsWizardDialog.java @@ -1,10 +1,11 @@ -package org.argeo.cms.swt.dialogs; +package org.argeo.cms.jface.dialog; import java.lang.reflect.InvocationTargetException; import org.argeo.cms.CmsMsg; import org.argeo.cms.swt.CmsSwtUtils; import org.argeo.cms.swt.Selected; +import org.argeo.cms.swt.dialogs.LightweightDialog; import org.argeo.eclipse.ui.EclipseUiUtils; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.wizard.IWizard; diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/EditablePart.java b/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/SwtEditablePart.java similarity index 62% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/EditablePart.java rename to eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/SwtEditablePart.java index 90c16773c..f2cceef07 100644 --- a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/EditablePart.java +++ b/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/SwtEditablePart.java @@ -1,12 +1,9 @@ package org.argeo.cms.swt; +import org.argeo.cms.ux.widgets.EditablePart; import org.eclipse.swt.widgets.Control; /** Manages whether an editable or non editable control is shown. */ -public interface EditablePart { - public void startEditing(); - - public void stopEditing(); - +public interface SwtEditablePart extends EditablePart { public Control getControl(); } diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/SwtSection.java b/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/acr/SwtSection.java similarity index 98% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/SwtSection.java rename to eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/acr/SwtSection.java index 5562bcf4e..89d003870 100644 --- a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/SwtSection.java +++ b/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/acr/SwtSection.java @@ -1,4 +1,4 @@ -package org.argeo.cms.swt.widgets; +package org.argeo.cms.swt.acr; import java.util.Collections; import java.util.LinkedHashMap; @@ -6,7 +6,6 @@ import java.util.Map; import org.argeo.api.acr.Content; import org.argeo.cms.swt.CmsSwtUtils; -import org.argeo.cms.swt.acr.ContentComposite; import org.argeo.cms.ux.widgets.EditablePart; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/SwtSectionPart.java b/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/acr/SwtSectionPart.java similarity index 74% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/SwtSectionPart.java rename to eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/acr/SwtSectionPart.java index e0578609e..7fbf4bbca 100644 --- a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/SwtSectionPart.java +++ b/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/acr/SwtSectionPart.java @@ -1,6 +1,6 @@ -package org.argeo.cms.swt.widgets; +package org.argeo.cms.swt.acr; -import org.argeo.cms.ux.widgets.ContentPart; +import org.argeo.cms.ux.acr.ContentPart; import org.argeo.cms.ux.widgets.EditablePart; /** An editable part dynamically related to a Section */ diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/SwtTabbedArea.java b/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/acr/SwtTabbedArea.java similarity index 98% rename from eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/SwtTabbedArea.java rename to eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/acr/SwtTabbedArea.java index a2f7671c0..cd4e37d19 100644 --- a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/SwtTabbedArea.java +++ b/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/acr/SwtTabbedArea.java @@ -1,4 +1,4 @@ -package org.argeo.cms.swt.widgets; +package org.argeo.cms.swt.acr; import java.util.ArrayList; import java.util.List; @@ -7,7 +7,6 @@ import org.argeo.api.acr.Content; import org.argeo.api.acr.spi.ProvidedContent; import org.argeo.cms.swt.CmsSwtUtils; import org.argeo.cms.swt.Selected; -import org.argeo.cms.swt.acr.SwtUiProvider; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.StackLayout; import org.eclipse.swt.graphics.Image; diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/AbstractTreeContentProvider.java b/eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/AbstractTreeContentProvider.java index c882eb766..64ea2dbc9 100644 --- a/eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/AbstractTreeContentProvider.java +++ b/eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/AbstractTreeContentProvider.java @@ -1,5 +1,6 @@ package org.argeo.eclipse.ui; +import org.argeo.cms.ux.widgets.TreeParent; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; diff --git a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/EditableLink.java b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/EditableLink.java index 689fca316..3c1e8cda5 100644 --- a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/EditableLink.java +++ b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/EditableLink.java @@ -3,7 +3,7 @@ package org.argeo.cms.ui.forms; import javax.jcr.Node; import javax.jcr.RepositoryException; -import org.argeo.cms.swt.EditablePart; +import org.argeo.cms.swt.SwtEditablePart; import org.argeo.eclipse.ui.EclipseUiUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; @@ -13,7 +13,7 @@ import org.eclipse.swt.widgets.Text; /** Editable String that displays a browsable link when read-only */ public class EditableLink extends EditablePropertyString implements - EditablePart { + SwtEditablePart { private static final long serialVersionUID = 5055000749992803591L; private String type; diff --git a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/EditableMultiStringProperty.java b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/EditableMultiStringProperty.java index a04537ef4..ff8270046 100644 --- a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/EditableMultiStringProperty.java +++ b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/EditableMultiStringProperty.java @@ -6,7 +6,7 @@ import javax.jcr.Node; import javax.jcr.RepositoryException; import org.argeo.cms.swt.CmsSwtUtils; -import org.argeo.cms.swt.EditablePart; +import org.argeo.cms.swt.SwtEditablePart; import org.argeo.cms.ui.widgets.StyledControl; import org.argeo.eclipse.ui.EclipseUiUtils; import org.eclipse.jface.dialogs.MessageDialog; @@ -24,7 +24,7 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; /** Display, add or remove values from a list in a CMS context */ -public class EditableMultiStringProperty extends StyledControl implements EditablePart { +public class EditableMultiStringProperty extends StyledControl implements SwtEditablePart { private static final long serialVersionUID = -7044614381252178595L; private String propertyName; diff --git a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/EditablePropertyDate.java b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/EditablePropertyDate.java index 0f80ca78c..641f916f2 100644 --- a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/EditablePropertyDate.java +++ b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/EditablePropertyDate.java @@ -8,7 +8,7 @@ import javax.jcr.Node; import javax.jcr.RepositoryException; import org.argeo.cms.swt.CmsSwtUtils; -import org.argeo.cms.swt.EditablePart; +import org.argeo.cms.swt.SwtEditablePart; import org.argeo.cms.ui.widgets.StyledControl; import org.argeo.eclipse.ui.EclipseUiUtils; import org.eclipse.swt.SWT; @@ -29,7 +29,7 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; /** CMS form part to display and edit a date */ -public class EditablePropertyDate extends StyledControl implements EditablePart { +public class EditablePropertyDate extends StyledControl implements SwtEditablePart { private static final long serialVersionUID = 2500215515778162468L; // Context diff --git a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/EditablePropertyString.java b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/EditablePropertyString.java index ffe7e36f7..f2575e1f9 100644 --- a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/EditablePropertyString.java +++ b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/EditablePropertyString.java @@ -7,7 +7,7 @@ import javax.jcr.Node; import javax.jcr.RepositoryException; import org.argeo.cms.swt.CmsSwtUtils; -import org.argeo.cms.swt.EditablePart; +import org.argeo.cms.swt.SwtEditablePart; import org.argeo.cms.ui.widgets.EditableText; import org.argeo.eclipse.ui.EclipseUiUtils; import org.eclipse.swt.widgets.Composite; @@ -16,7 +16,7 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; /** Editable String in a CMS context */ -public class EditablePropertyString extends EditableText implements EditablePart { +public class EditablePropertyString extends EditableText implements SwtEditablePart { private static final long serialVersionUID = 5055000749992803591L; private String propertyName; diff --git a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormPageViewer.java b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormPageViewer.java index e10dd4556..1888055fc 100644 --- a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormPageViewer.java +++ b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormPageViewer.java @@ -19,7 +19,7 @@ import org.argeo.api.cms.ux.Cms2DSize; import org.argeo.api.cms.ux.CmsEditable; import org.argeo.api.cms.ux.CmsImageManager; import org.argeo.cms.swt.CmsSwtUtils; -import org.argeo.cms.swt.EditablePart; +import org.argeo.cms.swt.SwtEditablePart; import org.argeo.cms.ui.viewers.AbstractPageViewer; import org.argeo.cms.ui.viewers.Section; import org.argeo.cms.ui.viewers.SectionPart; @@ -86,14 +86,14 @@ public class FormPageViewer extends AbstractPageViewer { } @Override - protected void prepare(EditablePart part, Object caretPosition) { + protected void prepare(SwtEditablePart part, Object caretPosition) { if (part instanceof Img) { ((Img) part).setFileUploadListener(fileUploadListener); } } /** To be overridden.Save the edited part. */ - protected void save(EditablePart part) throws RepositoryException { + protected void save(SwtEditablePart part) throws RepositoryException { Node node = null; if (part instanceof EditableMultiStringProperty) { EditableMultiStringProperty ept = (EditableMultiStringProperty) part; @@ -148,7 +148,7 @@ public class FormPageViewer extends AbstractPageViewer { } @Override - protected void updateContent(EditablePart part) throws RepositoryException { + protected void updateContent(SwtEditablePart part) throws RepositoryException { if (part instanceof EditableMultiStringProperty) { EditableMultiStringProperty ept = (EditableMultiStringProperty) part; // SWT : View @@ -259,7 +259,7 @@ public class FormPageViewer extends AbstractPageViewer { if (getCmsEditable().isEditing() && !(getEdited() instanceof Img)) { if (source == mainSection) return; - EditablePart part = findDataParent(source); + SwtEditablePart part = findDataParent(source); upload(part); } else { getCmsEditable().startEditing(); @@ -273,7 +273,7 @@ public class FormPageViewer extends AbstractPageViewer { if (getCmsEditable().isEditing()) { if (e.button == 1) { Control source = (Control) e.getSource(); - EditablePart composite = findDataParent(source); + SwtEditablePart composite = findDataParent(source); Point point = new Point(e.x, e.y); if (!(composite instanceof Img)) edit(composite, source.toDisplay(point)); @@ -286,7 +286,7 @@ public class FormPageViewer extends AbstractPageViewer { } } - protected synchronized void upload(EditablePart part) { + protected synchronized void upload(SwtEditablePart part) { if (part instanceof SectionPart) { if (part instanceof Img) { if (getEdited() == part) @@ -561,7 +561,7 @@ public class FormPageViewer extends AbstractPageViewer { if (source instanceof Button) { Button btn = (Button) source; Object obj = btn.getData(FormConstants.LINKED_VALUE); - EditablePart ep = findDataParent(btn); + SwtEditablePart ep = findDataParent(btn); if (ep != null && ep instanceof EditableMultiStringProperty) { EditableMultiStringProperty emsp = (EditableMultiStringProperty) ep; List values = emsp.getValues(); diff --git a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/JcrBrowserUtils.java b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/JcrBrowserUtils.java index e4c5873a0..b36acc368 100644 --- a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/JcrBrowserUtils.java +++ b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/JcrBrowserUtils.java @@ -9,8 +9,8 @@ import org.argeo.cms.ui.jcr.model.RepositoriesElem; import org.argeo.cms.ui.jcr.model.RepositoryElem; import org.argeo.cms.ui.jcr.model.SingleJcrNodeElem; import org.argeo.cms.ui.jcr.model.WorkspaceElem; +import org.argeo.cms.ux.widgets.TreeParent; import org.argeo.eclipse.ui.EclipseUiException; -import org.argeo.eclipse.ui.TreeParent; /** Useful methods to manage the JCR Browser */ public class JcrBrowserUtils { diff --git a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/NodeContentProvider.java b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/NodeContentProvider.java index 00449df26..0625cc872 100644 --- a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/NodeContentProvider.java +++ b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/NodeContentProvider.java @@ -16,7 +16,7 @@ import org.argeo.cms.jcr.CmsJcrUtils; import org.argeo.cms.security.Keyring; import org.argeo.cms.ui.jcr.model.RepositoriesElem; import org.argeo.cms.ui.jcr.model.SingleJcrNodeElem; -import org.argeo.eclipse.ui.TreeParent; +import org.argeo.cms.ux.widgets.TreeParent; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; diff --git a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/model/MaintainedRepositoryElem.java b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/model/MaintainedRepositoryElem.java index 61654b61a..d33b33f63 100644 --- a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/model/MaintainedRepositoryElem.java +++ b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/model/MaintainedRepositoryElem.java @@ -2,7 +2,7 @@ package org.argeo.cms.ui.jcr.model; import javax.jcr.Repository; -import org.argeo.eclipse.ui.TreeParent; +import org.argeo.cms.ux.widgets.TreeParent; /** Wrap a MaintainedRepository */ public class MaintainedRepositoryElem extends RepositoryElem { diff --git a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/model/RemoteRepositoryElem.java b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/model/RemoteRepositoryElem.java index 428e7f1cd..908d1b135 100644 --- a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/model/RemoteRepositoryElem.java +++ b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/model/RemoteRepositoryElem.java @@ -12,8 +12,8 @@ import javax.jcr.SimpleCredentials; import org.argeo.cms.ArgeoNames; import org.argeo.cms.jcr.CmsJcrUtils; import org.argeo.cms.security.Keyring; +import org.argeo.cms.ux.widgets.TreeParent; import org.argeo.eclipse.ui.EclipseUiException; -import org.argeo.eclipse.ui.TreeParent; /** Root of a remote repository */ public class RemoteRepositoryElem extends RepositoryElem { diff --git a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/model/RepositoriesElem.java b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/model/RepositoriesElem.java index 858633202..742800b0b 100644 --- a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/model/RepositoriesElem.java +++ b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/model/RepositoriesElem.java @@ -13,8 +13,8 @@ import org.argeo.cms.ArgeoNames; import org.argeo.cms.jcr.CmsJcrUtils; import org.argeo.cms.security.Keyring; import org.argeo.cms.ui.jcr.RepositoryRegister; +import org.argeo.cms.ux.widgets.TreeParent; import org.argeo.eclipse.ui.EclipseUiException; -import org.argeo.eclipse.ui.TreeParent; import org.argeo.eclipse.ui.dialogs.ErrorFeedback; /** diff --git a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/model/RepositoryElem.java b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/model/RepositoryElem.java index afff3ef9e..296c36922 100644 --- a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/model/RepositoryElem.java +++ b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/model/RepositoryElem.java @@ -5,8 +5,8 @@ import javax.jcr.RepositoryException; import javax.jcr.Session; import org.argeo.api.cms.CmsConstants; +import org.argeo.cms.ux.widgets.TreeParent; import org.argeo.eclipse.ui.EclipseUiException; -import org.argeo.eclipse.ui.TreeParent; import org.argeo.jcr.JcrUtils; /** diff --git a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/model/SingleJcrNodeElem.java b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/model/SingleJcrNodeElem.java index 859deee97..a2584a5e8 100644 --- a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/model/SingleJcrNodeElem.java +++ b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/model/SingleJcrNodeElem.java @@ -5,8 +5,8 @@ import javax.jcr.NodeIterator; import javax.jcr.RepositoryException; import javax.jcr.Workspace; +import org.argeo.cms.ux.widgets.TreeParent; import org.argeo.eclipse.ui.EclipseUiException; -import org.argeo.eclipse.ui.TreeParent; /** * UI Tree component. Wraps a node of a JCR {@link Workspace}. It also keeps a diff --git a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/model/WorkspaceElem.java b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/model/WorkspaceElem.java index 24fc5758d..2d786669f 100644 --- a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/model/WorkspaceElem.java +++ b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/model/WorkspaceElem.java @@ -8,8 +8,8 @@ import javax.jcr.Session; // import javax.jcr.Workspace; import javax.jcr.Workspace; +import org.argeo.cms.ux.widgets.TreeParent; import org.argeo.eclipse.ui.EclipseUiException; -import org.argeo.eclipse.ui.TreeParent; import org.argeo.jcr.JcrUtils; /** diff --git a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/AbstractPageViewer.java b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/AbstractPageViewer.java index a247313e1..e23846e92 100644 --- a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/AbstractPageViewer.java +++ b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/AbstractPageViewer.java @@ -13,7 +13,7 @@ import javax.security.auth.Subject; import org.argeo.api.cms.CmsLog; import org.argeo.api.cms.ux.CmsEditable; -import org.argeo.cms.swt.EditablePart; +import org.argeo.cms.swt.SwtEditablePart; import org.argeo.cms.swt.widgets.ScrolledPage; import org.argeo.jcr.JcrException; import org.eclipse.jface.viewers.ContentViewer; @@ -43,7 +43,7 @@ public abstract class AbstractPageViewer extends ContentViewer implements Observ private MouseListener mouseListener; private FocusListener focusListener; - private EditablePart edited; + private SwtEditablePart edited; private ISelection selection = StructuredSelection.EMPTY; private AccessControlContext accessControlContext; @@ -141,11 +141,11 @@ public abstract class AbstractPageViewer extends ContentViewer implements Observ } /** To be overridden.Save the edited part. */ - protected void save(EditablePart part) throws RepositoryException { + protected void save(SwtEditablePart part) throws RepositoryException { } /** Prepare the edited part */ - protected void prepare(EditablePart part, Object caretPosition) { + protected void prepare(SwtEditablePart part, Object caretPosition) { } /** Notified when the editing state changed. Does nothing, to be overridden */ @@ -178,17 +178,17 @@ public abstract class AbstractPageViewer extends ContentViewer implements Observ this.selection = selection; } - protected void updateContent(EditablePart part) throws RepositoryException { + protected void updateContent(SwtEditablePart part) throws RepositoryException { } // LOW LEVEL EDITION - protected void edit(EditablePart part, Object caretPosition) { + protected void edit(SwtEditablePart part, Object caretPosition) { try { if (edited == part) return; if (edited != null && edited != part) { - EditablePart previouslyEdited = edited; + SwtEditablePart previouslyEdited = edited; try { stopEditing(true); } catch (Exception e) { @@ -240,8 +240,8 @@ public abstract class AbstractPageViewer extends ContentViewer implements Observ save(edited); edited.stopEditing(); - EditablePart editablePart = edited; - Control control = ((EditablePart) edited).getControl(); + SwtEditablePart editablePart = edited; + Control control = ((SwtEditablePart) edited).getControl(); edited = null; // TODO make edited state management more robust updateContent(editablePart); @@ -270,11 +270,11 @@ public abstract class AbstractPageViewer extends ContentViewer implements Observ } /** - * Find the first {@link EditablePart} in the parents hierarchy of this control + * Find the first {@link SwtEditablePart} in the parents hierarchy of this control */ - protected EditablePart findDataParent(Control parent) { - if (parent instanceof EditablePart) { - return (EditablePart) parent; + protected SwtEditablePart findDataParent(Control parent) { + if (parent instanceof SwtEditablePart) { + return (SwtEditablePart) parent; } if (parent.getParent() != null) return findDataParent(parent.getParent()); @@ -328,7 +328,7 @@ public abstract class AbstractPageViewer extends ContentViewer implements Observ return readOnly; } - protected EditablePart getEdited() { + protected SwtEditablePart getEdited() { return edited; } diff --git a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/Section.java b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/Section.java index 0e489e05f..b27fa3845 100644 --- a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/Section.java +++ b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/Section.java @@ -8,7 +8,7 @@ import javax.jcr.Node; import javax.jcr.RepositoryException; import org.argeo.cms.swt.CmsSwtUtils; -import org.argeo.cms.swt.EditablePart; +import org.argeo.cms.swt.SwtEditablePart; import org.argeo.cms.ui.widgets.JcrComposite; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; @@ -57,7 +57,7 @@ public class Section extends JcrComposite { private void collectDirectSubSections(Composite composite, LinkedHashMap subSections) throws RepositoryException { - if (composite == sectionHeader || composite instanceof EditablePart) + if (composite == sectionHeader || composite instanceof SwtEditablePart) return; if (composite instanceof Section) { Section section = (Section) composite; diff --git a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/SectionPart.java b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/SectionPart.java index df3c734c2..4278c83cc 100644 --- a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/SectionPart.java +++ b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/SectionPart.java @@ -1,9 +1,9 @@ package org.argeo.cms.ui.viewers; -import org.argeo.cms.swt.EditablePart; +import org.argeo.cms.swt.SwtEditablePart; /** An editable part dynamically related to a Section */ -public interface SectionPart extends EditablePart, NodePart { +public interface SectionPart extends SwtEditablePart, NodePart { public String getPartId(); public Section getSection(); diff --git a/org.argeo.cms.ux/src/org/argeo/cms/ux/widgets/ContentPart.java b/org.argeo.cms.ux/src/org/argeo/cms/ux/acr/ContentPart.java similarity index 83% rename from org.argeo.cms.ux/src/org/argeo/cms/ux/widgets/ContentPart.java rename to org.argeo.cms.ux/src/org/argeo/cms/ux/acr/ContentPart.java index 5e91f5c79..8d674f8a3 100644 --- a/org.argeo.cms.ux/src/org/argeo/cms/ux/widgets/ContentPart.java +++ b/org.argeo.cms.ux/src/org/argeo/cms/ux/acr/ContentPart.java @@ -1,4 +1,4 @@ -package org.argeo.cms.ux.widgets; +package org.argeo.cms.ux.acr; import org.argeo.api.acr.Content; diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/TreeParent.java b/org.argeo.cms.ux/src/org/argeo/cms/ux/widgets/TreeParent.java similarity index 98% rename from eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/TreeParent.java rename to org.argeo.cms.ux/src/org/argeo/cms/ux/widgets/TreeParent.java index cf3c15795..97dedcc24 100644 --- a/eclipse/org.argeo.cms.swt/src/org/argeo/eclipse/ui/TreeParent.java +++ b/org.argeo.cms.ux/src/org/argeo/cms/ux/widgets/TreeParent.java @@ -1,4 +1,4 @@ -package org.argeo.eclipse.ui; +package org.argeo.cms.ux.widgets; import java.util.ArrayList; import java.util.List; -- 2.30.2