Fix a few glitches in the various maintenance pages.

git-svn-id: https://svn.argeo.org/commons/trunk@8037 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

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 eea27478ab5694870544161551affacd44c98354..e0bba81682ba09c7ab402a77cdd108c59ecb1304 100644 (file)
--- 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 1c42134f1e5af0007c49771ca3edf4f1a66dd726..ea544c97c79edb711b9965c6a13a72074e7b4619 100644 (file)
--- 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 2da98a38d67eee4e4761a7ee6991c5152fa0da81..610c49c7f7f9e2994b1dc97be64135a2728c6ebc 100644 (file)
--- 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