From 5ba1340812d3f14d2caecf6eab57cc9c753ef20c Mon Sep 17 00:00:00 2001 From: Bruno Sinou Date: Tue, 24 Mar 2015 20:15:54 +0000 Subject: [PATCH] Fix a few glitches in the various maintenance pages. git-svn-id: https://svn.argeo.org/commons/trunk@8037 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../src/org/argeo/cms/maintenance/Browse.java | 3 ++- .../src/org/argeo/cms/users/UserPart.java | 15 +++++++-------- .../src/org/argeo/cms/users/UserRolesPart.java | 6 ++++-- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/org.argeo.cms/src/org/argeo/cms/maintenance/Browse.java b/org.argeo.cms/src/org/argeo/cms/maintenance/Browse.java index eea27478a..e0bba8168 100644 --- a/org.argeo.cms/src/org/argeo/cms/maintenance/Browse.java +++ b/org.argeo.cms/src/org/argeo/cms/maintenance/Browse.java @@ -60,6 +60,8 @@ public class Browse implements CmsUiProvider { private final static String BROWSE_PREFIX = "browse#"; private final static int THUMBNAIL_WIDTH = 400; private final static int COLUMN_WIDTH = 160; + private DateFormat timeFormatter = new SimpleDateFormat("dd-MM-yyyy', 'HH:mm"); + // keep a cache of the opened nodes // Key is the path @@ -373,7 +375,6 @@ public class Browse implements CmsUiProvider { private String getPropAsString(Property property) throws RepositoryException { String result = ""; - DateFormat timeFormatter = new SimpleDateFormat(""); if (property.isMultiple()) { result = getMultiAsString(property, ", "); } else { diff --git a/org.argeo.cms/src/org/argeo/cms/users/UserPart.java b/org.argeo.cms/src/org/argeo/cms/users/UserPart.java index 1c42134f1..ea544c97c 100644 --- a/org.argeo.cms/src/org/argeo/cms/users/UserPart.java +++ b/org.argeo.cms/src/org/argeo/cms/users/UserPart.java @@ -21,7 +21,6 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.swt.SWT; import org.eclipse.swt.events.FocusEvent; import org.eclipse.swt.events.FocusListener; -import org.eclipse.swt.events.MouseListener; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.layout.GridData; @@ -70,13 +69,13 @@ public class UserPart extends StyledControl implements EditablePart, NodePart, } // Experimental, remove - public void setMouseListener(MouseListener mouseListener) { - super.setMouseListener(mouseListener); - - for (Text txt : texts) - txt.addMouseListener(mouseListener); - - } + // public void setMouseListener(MouseListener mouseListener) { + // super.setMouseListener(mouseListener); + // + // for (Text txt : texts) + // txt.addMouseListener(mouseListener); + // + // } @Override protected Control createControl(Composite box, String style) { diff --git a/org.argeo.cms/src/org/argeo/cms/users/UserRolesPart.java b/org.argeo.cms/src/org/argeo/cms/users/UserRolesPart.java index 2da98a38d..610c49c7f 100644 --- a/org.argeo.cms/src/org/argeo/cms/users/UserRolesPart.java +++ b/org.argeo.cms/src/org/argeo/cms/users/UserRolesPart.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; import javax.jcr.Item; +import javax.jcr.Node; import javax.jcr.RepositoryException; import org.argeo.ArgeoException; @@ -78,7 +79,7 @@ public class UserRolesPart extends StyledControl implements EditablePart, } @Override - protected Control createControl(Composite box, String style) { + public Control createControl(Composite box, String style) { // box.setLayout(CmsUtils.noSpaceGridLayout()); box.setLayout(new GridLayout()); @@ -174,7 +175,8 @@ public class UserRolesPart extends StyledControl implements EditablePart, public void setUserAdminService(UserAdminService userAdminService) { this.userAdminService = userAdminService; try { - String username = getNode().getProperty(ArgeoNames.ARGEO_USER_ID) + Node currNode = getNode(); + String username = currNode.getProperty(ArgeoNames.ARGEO_USER_ID) .getString(); if (userAdminService.userExists(username)) { JcrUserDetails userDetails = (JcrUserDetails) userAdminService -- 2.30.2