From 8540688d6d279c24a1c410345955564701f2b918 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sun, 25 Mar 2018 16:12:06 +0200 Subject: [PATCH] Centralise UI components --- .../internal/jcr/parts/AddPrivilegeWizard.java | 2 +- .../cms/ui}/useradmin/PickUpUserDialog.java | 2 +- .../org/argeo/cms/ui}/useradmin/UserLP.java | 3 +-- .../argeo/cms/ui}/useradmin/UsersImages.java | 18 +++++++----------- 4 files changed, 10 insertions(+), 15 deletions(-) rename {org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench => org.argeo.cms.ui/src/org/argeo/cms/ui}/useradmin/PickUpUserDialog.java (99%) rename {org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench => org.argeo.cms.ui/src/org/argeo/cms/ui}/useradmin/UserLP.java (94%) rename {org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal => org.argeo.cms.ui/src/org/argeo/cms/ui}/useradmin/UsersImages.java (52%) diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/AddPrivilegeWizard.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/AddPrivilegeWizard.java index 576698146..6837a7d2a 100644 --- a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/AddPrivilegeWizard.java +++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/AddPrivilegeWizard.java @@ -23,7 +23,7 @@ import javax.jcr.RepositoryException; import javax.jcr.Session; import javax.jcr.security.Privilege; -import org.argeo.cms.ui.workbench.useradmin.PickUpUserDialog; +import org.argeo.cms.ui.useradmin.PickUpUserDialog; import org.argeo.cms.util.UserAdminUtils; import org.argeo.eclipse.ui.EclipseUiException; import org.argeo.eclipse.ui.EclipseUiUtils; diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/PickUpUserDialog.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/useradmin/PickUpUserDialog.java similarity index 99% rename from org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/PickUpUserDialog.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/useradmin/PickUpUserDialog.java index cba14f402..36a1da28e 100644 --- a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/PickUpUserDialog.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/useradmin/PickUpUserDialog.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.cms.ui.workbench.useradmin; +package org.argeo.cms.ui.useradmin; import java.util.ArrayList; import java.util.List; diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/UserLP.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/useradmin/UserLP.java similarity index 94% rename from org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/UserLP.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/useradmin/UserLP.java index e782e370e..2344590bd 100644 --- a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/UserLP.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/useradmin/UserLP.java @@ -1,6 +1,5 @@ -package org.argeo.cms.ui.workbench.useradmin; +package org.argeo.cms.ui.useradmin; -import org.argeo.cms.ui.workbench.internal.useradmin.UsersImages; import org.argeo.cms.util.UserAdminUtils; import org.argeo.node.NodeConstants; import org.eclipse.jface.resource.JFaceResources; diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/UsersImages.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/useradmin/UsersImages.java similarity index 52% rename from org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/UsersImages.java rename to org.argeo.cms.ui/src/org/argeo/cms/ui/useradmin/UsersImages.java index 595ef1738..17ede563f 100644 --- a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/UsersImages.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/useradmin/UsersImages.java @@ -13,21 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.cms.ui.workbench.internal.useradmin; +package org.argeo.cms.ui.useradmin; -import org.argeo.cms.ui.workbench.WorkbenchUiPlugin; +import org.argeo.cms.ui.theme.CmsImages; import org.eclipse.swt.graphics.Image; -/** Specific users icons. TODO centralize and use an image registry */ +/** Specific users icons. */ public class UsersImages { private final static String PREFIX = "icons/"; - public final static Image ICON_USER = WorkbenchUiPlugin.getImageDescriptor( - PREFIX + "person.png").createImage(); - public final static Image ICON_GROUP = WorkbenchUiPlugin.getImageDescriptor( - PREFIX + "group.png").createImage(); - public final static Image ICON_ROLE = WorkbenchUiPlugin.getImageDescriptor( - PREFIX + "role.gif").createImage(); - public final static Image ICON_CHANGE_PASSWORD = WorkbenchUiPlugin.getImageDescriptor( - PREFIX + "security.gif").createImage(); + public final static Image ICON_USER = CmsImages.createImg(PREFIX + "person.png"); + public final static Image ICON_GROUP = CmsImages.createImg(PREFIX + "group.png"); + public final static Image ICON_ROLE = CmsImages.createImg(PREFIX + "role.gif"); + public final static Image ICON_CHANGE_PASSWORD = CmsImages.createImg(PREFIX + "security.gif"); } -- 2.30.2