From: Mathieu Baudier Date: Thu, 23 Jun 2022 10:59:22 +0000 (+0200) Subject: Move UX components between packages X-Git-Tag: v2.3.8~80 X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=9c3baf6fd38128aea09679be4c0b54d23cf7a876 Move UX components between packages --- diff --git a/org.argeo.app.ui/src/org/argeo/app/ui/DefaultEditionLayer.java b/org.argeo.app.ui/src/org/argeo/app/ui/DefaultEditionLayer.java index 2398249..d383e45 100644 --- a/org.argeo.app.ui/src/org/argeo/app/ui/DefaultEditionLayer.java +++ b/org.argeo.app.ui/src/org/argeo/app/ui/DefaultEditionLayer.java @@ -8,8 +8,8 @@ import org.argeo.api.acr.Content; import org.argeo.cms.Localized; import org.argeo.cms.swt.CmsSwtTheme; import org.argeo.cms.swt.CmsSwtUtils; +import org.argeo.cms.swt.acr.SwtTabbedArea; import org.argeo.cms.swt.acr.SwtUiProvider; -import org.argeo.cms.swt.widgets.SwtTabbedArea; import org.argeo.cms.ui.CmsUiProvider; import org.argeo.util.LangUtils; import org.eclipse.swt.SWT; diff --git a/org.argeo.app.ui/src/org/argeo/app/ui/docbook/AbstractDbkViewer.java b/org.argeo.app.ui/src/org/argeo/app/ui/docbook/AbstractDbkViewer.java index abca42a..98b9c6c 100644 --- a/org.argeo.app.ui/src/org/argeo/app/ui/docbook/AbstractDbkViewer.java +++ b/org.argeo.app.ui/src/org/argeo/app/ui/docbook/AbstractDbkViewer.java @@ -23,7 +23,7 @@ import org.argeo.app.docbook.DbkAttr; import org.argeo.app.docbook.DbkType; import org.argeo.app.docbook.DbkUtils; 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.NodePart; import org.argeo.cms.ui.viewers.PropertyPart; @@ -273,7 +273,7 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke return sectionTitle; } - protected void updateContent(EditablePart part) throws RepositoryException { + protected void updateContent(SwtEditablePart part) throws RepositoryException { if (part instanceof SectionPart) { SectionPart sectionPart = (SectionPart) part; Node partNode = sectionPart.getNode(); @@ -317,7 +317,7 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke // OVERRIDDEN FROM PARENT VIEWER @Override - protected void save(EditablePart part) throws RepositoryException { + protected void save(SwtEditablePart part) throws RepositoryException { if (part instanceof EditableText) { EditableText et = (EditableText) part; if (!et.getEditable()) @@ -362,7 +362,7 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke } } - protected void saveLine(EditablePart part, String line) { + protected void saveLine(SwtEditablePart part, String line) { if (part instanceof NodePart) { saveLine(((NodePart) part).getNode(), line); } else if (part instanceof PropertyPart) { @@ -378,7 +378,7 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke } @Override - protected void prepare(EditablePart part, Object caretPosition) { + protected void prepare(SwtEditablePart part, Object caretPosition) { Control control = part.getControl(); if (control instanceof Text) { Text text = (Text) control; @@ -614,7 +614,7 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke } } - protected synchronized void upload(EditablePart part) { + protected synchronized void upload(SwtEditablePart part) { try { if (part instanceof SectionPart) { SectionPart sectionPart = (SectionPart) part; @@ -936,14 +936,14 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke public void mouseDoubleClick(MouseEvent e) { 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 DbkImg) { if (getCmsEditable().canEdit()) { if (getCmsEditable().isEditing() && !(getEdited() instanceof DbkImg)) { if (source == mainSection) return; - EditablePart part = findDataParent(source); + SwtEditablePart part = findDataParent(source); upload(part); } else { getCmsEditable().startEditing(); @@ -972,7 +972,7 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke public void mouseDown(MouseEvent e) { if (getCmsEditable().isEditing()) { if (e.button == 3) { - EditablePart composite = findDataParent((Control) e.getSource()); + SwtEditablePart composite = findDataParent((Control) e.getSource()); if (styledTools != null) { List styles = getAvailableStyles(composite); styledTools.show(composite, new Point(e.x, e.y), styles); @@ -986,7 +986,7 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke } } - protected List getAvailableStyles(EditablePart editablePart) { + protected List getAvailableStyles(SwtEditablePart editablePart) { return new ArrayList<>(); } diff --git a/org.argeo.app.ui/src/org/argeo/app/ui/docbook/DbkContextMenu.java b/org.argeo.app.ui/src/org/argeo/app/ui/docbook/DbkContextMenu.java index 0a37409..1673bd8 100644 --- a/org.argeo.app.ui/src/org/argeo/app/ui/docbook/DbkContextMenu.java +++ b/org.argeo.app.ui/src/org/argeo/app/ui/docbook/DbkContextMenu.java @@ -9,7 +9,7 @@ import org.argeo.api.cms.ux.CmsEditable; import org.argeo.app.docbook.DbkMsg; import org.argeo.app.docbook.DbkUtils; import org.argeo.cms.swt.CmsSwtUtils; -import org.argeo.cms.swt.EditablePart; +import org.argeo.cms.swt.SwtEditablePart; import org.argeo.cms.swt.MouseDown; import org.argeo.cms.ui.viewers.NodePart; import org.argeo.cms.ui.viewers.Section; @@ -46,7 +46,7 @@ class DbkContextMenu { shell.addShellListener(new ToolsShellListener()); } - void show(EditablePart editablePart, Point location, List availableStyles) { + void show(SwtEditablePart editablePart, Point location, List availableStyles) { if (shell.isVisible()) shell.setVisible(false); CmsSwtUtils.clear(shell); @@ -201,9 +201,9 @@ class DbkContextMenu { class StyledToolMouseListener extends MouseAdapter { private static final long serialVersionUID = 8516297091549329043L; - private EditablePart editablePart; + private SwtEditablePart editablePart; - public StyledToolMouseListener(EditablePart editablePart) { + public StyledToolMouseListener(SwtEditablePart editablePart) { super(); this.editablePart = editablePart; } diff --git a/org.argeo.app.ui/src/org/argeo/app/ui/docbook/DbkSectionTitle.java b/org.argeo.app.ui/src/org/argeo/app/ui/docbook/DbkSectionTitle.java index 645b905..a68a39c 100644 --- a/org.argeo.app.ui/src/org/argeo/app/ui/docbook/DbkSectionTitle.java +++ b/org.argeo.app.ui/src/org/argeo/app/ui/docbook/DbkSectionTitle.java @@ -3,13 +3,13 @@ package org.argeo.app.ui.docbook; import javax.jcr.Node; import javax.jcr.RepositoryException; -import org.argeo.cms.swt.EditablePart; +import org.argeo.cms.swt.SwtEditablePart; import org.argeo.cms.ui.viewers.NodePart; import org.argeo.cms.ui.widgets.EditableText; import org.eclipse.swt.widgets.Composite; /** The title of a section, based on an XML text node. */ -public class DbkSectionTitle extends EditableText implements EditablePart, NodePart { +public class DbkSectionTitle extends EditableText implements SwtEditablePart, NodePart { private static final long serialVersionUID = -1787983154946583171L; private final TextSection section; diff --git a/org.argeo.app.ui/src/org/argeo/app/ui/docbook/TextSection.java b/org.argeo.app.ui/src/org/argeo/app/ui/docbook/TextSection.java index c63987b..c462d10 100644 --- a/org.argeo.app.ui/src/org/argeo/app/ui/docbook/TextSection.java +++ b/org.argeo.app.ui/src/org/argeo/app/ui/docbook/TextSection.java @@ -4,7 +4,7 @@ import javax.jcr.Node; import org.argeo.app.docbook.DbkType; import org.argeo.cms.swt.CmsSwtUtils; -import org.argeo.cms.swt.EditablePart; +import org.argeo.cms.swt.SwtEditablePart; import org.argeo.cms.ui.viewers.Section; import org.argeo.cms.ui.widgets.TextStyles; import org.eclipse.swt.SWT; diff --git a/org.argeo.app.ui/src/org/argeo/app/ui/forms/AbstractTermsPart.java b/org.argeo.app.ui/src/org/argeo/app/ui/forms/AbstractTermsPart.java index 7f61acc..b1cadca 100644 --- a/org.argeo.app.ui/src/org/argeo/app/ui/forms/AbstractTermsPart.java +++ b/org.argeo.app.ui/src/org/argeo/app/ui/forms/AbstractTermsPart.java @@ -9,7 +9,7 @@ import org.argeo.app.api.Typology; import org.argeo.cms.Localized; import org.argeo.cms.swt.CmsSwtTheme; import org.argeo.cms.swt.CmsSwtUtils; -import org.argeo.cms.swt.EditablePart; +import org.argeo.cms.swt.SwtEditablePart; import org.argeo.cms.swt.widgets.ContextOverlay; import org.argeo.cms.ui.widgets.StyledControl; import org.eclipse.swt.SWT; @@ -22,7 +22,7 @@ import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.ToolItem; /** Common logic between single and mutliple terms editable part. */ -public abstract class AbstractTermsPart extends StyledControl implements EditablePart { +public abstract class AbstractTermsPart extends StyledControl implements SwtEditablePart { private static final long serialVersionUID = -5497097995341927710L; protected final TermsManager termsManager; protected final Typology typology; diff --git a/org.argeo.app.ui/src/org/argeo/app/ui/forms/MultiTermsPart.java b/org.argeo.app.ui/src/org/argeo/app/ui/forms/MultiTermsPart.java index 5439fc1..c936db3 100644 --- a/org.argeo.app.ui/src/org/argeo/app/ui/forms/MultiTermsPart.java +++ b/org.argeo.app.ui/src/org/argeo/app/ui/forms/MultiTermsPart.java @@ -9,7 +9,7 @@ import org.argeo.api.cms.CmsLog; import org.argeo.app.api.Term; import org.argeo.app.api.TermsManager; import org.argeo.cms.swt.CmsSwtUtils; -import org.argeo.cms.swt.EditablePart; +import org.argeo.cms.swt.SwtEditablePart; import org.argeo.cms.swt.MouseDoubleClick; import org.argeo.cms.swt.MouseDown; import org.argeo.cms.swt.Selected; @@ -28,7 +28,7 @@ import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.ToolBar; import org.eclipse.swt.widgets.ToolItem; -/** {@link EditablePart} for multiple terms. */ +/** {@link SwtEditablePart} for multiple terms. */ public class MultiTermsPart extends AbstractTermsPart { private static final long serialVersionUID = -4961135649177920808L; private final static CmsLog log = CmsLog.getLog(MultiTermsPart.class); diff --git a/org.argeo.app.ui/src/org/argeo/app/ui/forms/SingleTermPart.java b/org.argeo.app.ui/src/org/argeo/app/ui/forms/SingleTermPart.java index 34dacd0..57086ad 100644 --- a/org.argeo.app.ui/src/org/argeo/app/ui/forms/SingleTermPart.java +++ b/org.argeo.app.ui/src/org/argeo/app/ui/forms/SingleTermPart.java @@ -7,7 +7,7 @@ import javax.jcr.Item; import org.argeo.app.api.Term; import org.argeo.app.api.TermsManager; import org.argeo.cms.swt.CmsSwtUtils; -import org.argeo.cms.swt.EditablePart; +import org.argeo.cms.swt.SwtEditablePart; import org.argeo.cms.swt.MouseDoubleClick; import org.argeo.cms.swt.MouseDown; import org.argeo.cms.swt.Selected; @@ -25,7 +25,7 @@ import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.ToolBar; import org.eclipse.swt.widgets.ToolItem; -/** {@link EditablePart} for terms. */ +/** {@link SwtEditablePart} for terms. */ public class SingleTermPart extends AbstractTermsPart { private static final long serialVersionUID = -4961135649177920808L; diff --git a/org.argeo.app.ui/src/org/argeo/app/ui/people/PeopleEntryArea.java b/org.argeo.app.ui/src/org/argeo/app/ui/people/PeopleEntryArea.java index a2ddfe9..46e1fb4 100644 --- a/org.argeo.app.ui/src/org/argeo/app/ui/people/PeopleEntryArea.java +++ b/org.argeo.app.ui/src/org/argeo/app/ui/people/PeopleEntryArea.java @@ -10,10 +10,10 @@ import org.argeo.app.ui.SuiteEvent; import org.argeo.app.ui.SuiteIcon; import org.argeo.app.ui.dialogs.NewUserWizard; import org.argeo.cms.CmsUserManager; +import org.argeo.cms.jface.dialog.CmsWizardDialog; import org.argeo.cms.swt.CmsSwtTheme; import org.argeo.cms.swt.CmsSwtUtils; import org.argeo.cms.swt.Selected; -import org.argeo.cms.swt.dialogs.CmsWizardDialog; import org.argeo.cms.ui.CmsUiProvider; import org.argeo.util.naming.LdapAttrs; import org.eclipse.jface.viewers.ColumnLabelProvider; diff --git a/org.argeo.app.ui/src/org/argeo/app/ui/people/PersonUiProvider.java b/org.argeo.app.ui/src/org/argeo/app/ui/people/PersonUiProvider.java index 5814efe..6e710a5 100644 --- a/org.argeo.app.ui/src/org/argeo/app/ui/people/PersonUiProvider.java +++ b/org.argeo.app.ui/src/org/argeo/app/ui/people/PersonUiProvider.java @@ -9,7 +9,7 @@ import org.argeo.app.ui.SuiteMsg; import org.argeo.app.ui.SuiteUiUtils; import org.argeo.cms.CmsUserManager; import org.argeo.cms.swt.CmsSwtUtils; -import org.argeo.cms.swt.widgets.SwtSection; +import org.argeo.cms.swt.acr.SwtSection; import org.argeo.cms.ui.CmsUiProvider; import org.argeo.util.naming.LdapAttrs; import org.eclipse.swt.SWT; diff --git a/org.argeo.app.ui/src/org/argeo/app/ui/people/SuiteUsersEntryArea.java b/org.argeo.app.ui/src/org/argeo/app/ui/people/SuiteUsersEntryArea.java index 693d0d6..82787a4 100644 --- a/org.argeo.app.ui/src/org/argeo/app/ui/people/SuiteUsersEntryArea.java +++ b/org.argeo.app.ui/src/org/argeo/app/ui/people/SuiteUsersEntryArea.java @@ -10,10 +10,10 @@ import org.argeo.app.ui.SuiteEvent; import org.argeo.app.ui.SuiteIcon; import org.argeo.app.ui.dialogs.NewUserWizard; import org.argeo.cms.CmsUserManager; +import org.argeo.cms.jface.dialog.CmsWizardDialog; import org.argeo.cms.swt.CmsSwtTheme; import org.argeo.cms.swt.CmsSwtUtils; import org.argeo.cms.swt.Selected; -import org.argeo.cms.swt.dialogs.CmsWizardDialog; import org.argeo.cms.ui.CmsUiProvider; import org.argeo.util.naming.LdapAttrs; import org.eclipse.jface.viewers.ColumnLabelProvider; diff --git a/org.argeo.app.ui/src/org/argeo/app/ui/people/UsersEntryArea.java b/org.argeo.app.ui/src/org/argeo/app/ui/people/UsersEntryArea.java index 50b012e..355f520 100644 --- a/org.argeo.app.ui/src/org/argeo/app/ui/people/UsersEntryArea.java +++ b/org.argeo.app.ui/src/org/argeo/app/ui/people/UsersEntryArea.java @@ -20,11 +20,11 @@ import org.argeo.cms.auth.CmsRole; import org.argeo.cms.auth.CurrentUser; import org.argeo.cms.auth.UserAdminUtils; import org.argeo.cms.jcr.acr.JcrContent; +import org.argeo.cms.jface.dialog.CmsWizardDialog; import org.argeo.cms.swt.CmsSwtTheme; import org.argeo.cms.swt.CmsSwtUtils; import org.argeo.cms.swt.Selected; import org.argeo.cms.swt.acr.SwtUiProvider; -import org.argeo.cms.swt.dialogs.CmsWizardDialog; import org.argeo.cms.swt.widgets.SwtHierarchicalPart; import org.argeo.cms.swt.widgets.SwtTabularPart; import org.argeo.cms.ui.CmsUiProvider;