projects
/
gpl
/
argeo-suite.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
77f9dec
)
Move UX components between packages
author
Mathieu Baudier <mbaudier@argeo.org>
Thu, 23 Jun 2022 10:59:22 +0000
(12:59 +0200)
committer
Mathieu Baudier <mbaudier@argeo.org>
Thu, 23 Jun 2022 10:59:22 +0000
(12:59 +0200)
12 files changed:
org.argeo.app.ui/src/org/argeo/app/ui/DefaultEditionLayer.java
patch
|
blob
|
history
org.argeo.app.ui/src/org/argeo/app/ui/docbook/AbstractDbkViewer.java
patch
|
blob
|
history
org.argeo.app.ui/src/org/argeo/app/ui/docbook/DbkContextMenu.java
patch
|
blob
|
history
org.argeo.app.ui/src/org/argeo/app/ui/docbook/DbkSectionTitle.java
patch
|
blob
|
history
org.argeo.app.ui/src/org/argeo/app/ui/docbook/TextSection.java
patch
|
blob
|
history
org.argeo.app.ui/src/org/argeo/app/ui/forms/AbstractTermsPart.java
patch
|
blob
|
history
org.argeo.app.ui/src/org/argeo/app/ui/forms/MultiTermsPart.java
patch
|
blob
|
history
org.argeo.app.ui/src/org/argeo/app/ui/forms/SingleTermPart.java
patch
|
blob
|
history
org.argeo.app.ui/src/org/argeo/app/ui/people/PeopleEntryArea.java
patch
|
blob
|
history
org.argeo.app.ui/src/org/argeo/app/ui/people/PersonUiProvider.java
patch
|
blob
|
history
org.argeo.app.ui/src/org/argeo/app/ui/people/SuiteUsersEntryArea.java
patch
|
blob
|
history
org.argeo.app.ui/src/org/argeo/app/ui/people/UsersEntryArea.java
patch
|
blob
|
history
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 23982499cf9cfdb05dbd2aded5b1eeed2d6214d7..d383e450f0f7158b1762fa1a9b03a522ef11ff22 100644
(file)
--- 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.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.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;
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 abca42a87a6637f2f4b87bc63535668d2b930ff8..98b9c6c1eda244a774dcb438795bcedbafbb32f9 100644
(file)
--- 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.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.
Swt
EditablePart;
import org.argeo.cms.ui.viewers.AbstractPageViewer;
import org.argeo.cms.ui.viewers.NodePart;
import org.argeo.cms.ui.viewers.PropertyPart;
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;
}
return sectionTitle;
}
- protected void updateContent(EditablePart part) throws RepositoryException {
+ protected void updateContent(
Swt
EditablePart part) throws RepositoryException {
if (part instanceof SectionPart) {
SectionPart sectionPart = (SectionPart) part;
Node partNode = sectionPart.getNode();
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
// OVERRIDDEN FROM PARENT VIEWER
@Override
- protected void save(EditablePart part) throws RepositoryException {
+ protected void save(
Swt
EditablePart part) throws RepositoryException {
if (part instanceof EditableText) {
EditableText et = (EditableText) part;
if (!et.getEditable())
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(
Swt
EditablePart part, String line) {
if (part instanceof NodePart) {
saveLine(((NodePart) part).getNode(), line);
} else if (part instanceof PropertyPart) {
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
}
@Override
- protected void prepare(EditablePart part, Object caretPosition) {
+ protected void prepare(
Swt
EditablePart part, Object caretPosition) {
Control control = part.getControl();
if (control instanceof Text) {
Text text = (Text) control;
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(
Swt
EditablePart part) {
try {
if (part instanceof SectionPart) {
SectionPart sectionPart = (SectionPart) 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();
public void mouseDoubleClick(MouseEvent e) {
if (e.button == 1) {
Control source = (Control) e.getSource();
- EditablePart composite = findDataParent(source);
+
Swt
EditablePart 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;
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);
+
Swt
EditablePart part = findDataParent(source);
upload(part);
} else {
getCmsEditable().startEditing();
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) {
public void mouseDown(MouseEvent e) {
if (getCmsEditable().isEditing()) {
if (e.button == 3) {
- EditablePart composite = findDataParent((Control) e.getSource());
+
Swt
EditablePart composite = findDataParent((Control) e.getSource());
if (styledTools != null) {
List<String> styles = getAvailableStyles(composite);
styledTools.show(composite, new Point(e.x, e.y), styles);
if (styledTools != null) {
List<String> 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<String> getAvailableStyles(EditablePart editablePart) {
+ protected List<String> getAvailableStyles(
Swt
EditablePart editablePart) {
return new ArrayList<>();
}
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 0a374097765360db07b0f23d17cf9aab23d83890..1673bd8743fdda242a346b22c57cd444e3ab9175 100644
(file)
--- 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.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.
Swt
EditablePart;
import org.argeo.cms.swt.MouseDown;
import org.argeo.cms.ui.viewers.NodePart;
import org.argeo.cms.ui.viewers.Section;
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());
}
shell.addShellListener(new ToolsShellListener());
}
- void show(EditablePart editablePart, Point location, List<String> availableStyles) {
+ void show(
Swt
EditablePart editablePart, Point location, List<String> availableStyles) {
if (shell.isVisible())
shell.setVisible(false);
CmsSwtUtils.clear(shell);
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;
class StyledToolMouseListener extends MouseAdapter {
private static final long serialVersionUID = 8516297091549329043L;
- private EditablePart editablePart;
+ private
Swt
EditablePart editablePart;
- public StyledToolMouseListener(EditablePart editablePart) {
+ public StyledToolMouseListener(
Swt
EditablePart editablePart) {
super();
this.editablePart = 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 645b905490781c6e29dfab602ca9922563549231..a68a39c5ca7fa5713e534dbf675df6a3589a859f 100644
(file)
--- 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 javax.jcr.Node;
import javax.jcr.RepositoryException;
-import org.argeo.cms.swt.EditablePart;
+import org.argeo.cms.swt.
Swt
EditablePart;
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. */
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
Swt
EditablePart, NodePart {
private static final long serialVersionUID = -1787983154946583171L;
private final TextSection section;
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 c63987b152a1a78c57f5d4107852403712b0390c..c462d10b0e7a8fc1184578b0a6fe3b8b46694e39 100644
(file)
--- 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.app.docbook.DbkType;
import org.argeo.cms.swt.CmsSwtUtils;
-import org.argeo.cms.swt.EditablePart;
+import org.argeo.cms.swt.
Swt
EditablePart;
import org.argeo.cms.ui.viewers.Section;
import org.argeo.cms.ui.widgets.TextStyles;
import org.eclipse.swt.SWT;
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 7f61accf410e7e71acf5e598dc7b9053ba2bf838..b1cadcad923b912e17770764219d6bd787cf2882 100644
(file)
--- 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.Localized;
import org.argeo.cms.swt.CmsSwtTheme;
import org.argeo.cms.swt.CmsSwtUtils;
-import org.argeo.cms.swt.EditablePart;
+import org.argeo.cms.swt.
Swt
EditablePart;
import org.argeo.cms.swt.widgets.ContextOverlay;
import org.argeo.cms.ui.widgets.StyledControl;
import org.eclipse.swt.SWT;
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. */
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
Swt
EditablePart {
private static final long serialVersionUID = -5497097995341927710L;
protected final TermsManager termsManager;
protected final Typology typology;
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 5439fc113dd32a93408ba1c56accb4e05aa1b0c8..c936db3889a2486343583078223161697a2ab50c 100644
(file)
--- 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.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.
Swt
EditablePart;
import org.argeo.cms.swt.MouseDoubleClick;
import org.argeo.cms.swt.MouseDown;
import org.argeo.cms.swt.Selected;
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;
import org.eclipse.swt.widgets.ToolBar;
import org.eclipse.swt.widgets.ToolItem;
-/** {@link EditablePart} for multiple terms. */
+/** {@link
Swt
EditablePart} for multiple terms. */
public class MultiTermsPart extends AbstractTermsPart {
private static final long serialVersionUID = -4961135649177920808L;
private final static CmsLog log = CmsLog.getLog(MultiTermsPart.class);
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 34dacd0741b4b8312bd946ae2f306592151d7556..57086ad643854830a96997d5b9720906ab8234c3 100644
(file)
--- 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.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.
Swt
EditablePart;
import org.argeo.cms.swt.MouseDoubleClick;
import org.argeo.cms.swt.MouseDown;
import org.argeo.cms.swt.Selected;
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;
import org.eclipse.swt.widgets.ToolBar;
import org.eclipse.swt.widgets.ToolItem;
-/** {@link EditablePart} for terms. */
+/** {@link
Swt
EditablePart} for terms. */
public class SingleTermPart extends AbstractTermsPart {
private static final long serialVersionUID = -4961135649177920808L;
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 a2ddfe90ed953b6c12ae4607061a6b0e9d56591c..46e1fb4689ebf0190d4a7115b54d970d58e564cf 100644
(file)
--- 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.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.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;
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 5814efe2e4f234048e164d3527d040920afe6884..6e710a564e87aee9121332fedacafae9af61ea4d 100644
(file)
--- 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.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;
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 693d0d6bf710ba95e3f394909784d280ef09f533..82787a41dafb306db1828b1f8f4c3ecc50b8ea4f 100644
(file)
--- 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.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.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;
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 50b012e8fb33742f2a105480437741922b384346..355f5202732422fe8e71b4a19c001daa25317076 100644
(file)
--- 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.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.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;
import org.argeo.cms.swt.widgets.SwtHierarchicalPart;
import org.argeo.cms.swt.widgets.SwtTabularPart;
import org.argeo.cms.ui.CmsUiProvider;