Fix glitches, finalize cleaning

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

diff --git a/org.argeo.cms.ui.workbench/bnd.bnd b/org.argeo.cms.ui.workbench/bnd.bnd
index b80fb435f8cd01c841deb695121bc849b1250895..3a91b6aa2ad1932087762396c87ab00674eb4a1f 100644 (file)
--- a/org.argeo.cms.ui.workbench/bnd.bnd
+++ b/org.argeo.cms.ui.workbench/bnd.bnd
@@ -1,5 +1,5 @@
 Bundle-SymbolicName: org.argeo.cms.ui.workbench;singleton:=true
-Bundle-Activator: org.argeo.cms.ui.workbench.SecurityUiPlugin
+Bundle-Activator: org.argeo.cms.ui.workbench.WorkbenchUiPlugin
 Bundle-ActivationPolicy: lazy
 
 Require-Bundle:        org.eclipse.core.runtime,\

diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/JcrBrowserPerspective.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/JcrBrowserPerspective.java
index 0b235f7e930009d44d6491b9021e66f8838f284e..82792ed3b00be731a387505caadd07bc4d01416a 100644 (file)
--- a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/JcrBrowserPerspective.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/JcrBrowserPerspective.java
@@ -29,6 +29,5 @@ public class JcrBrowserPerspective implements IPerspectiveFactory {
                                WorkbenchUiPlugin.PLUGIN_ID + ".upperLeft", IPageLayout.LEFT,
                                0.4f, layout.getEditorArea());
                upperLeft.addView(JcrBrowserView.ID);
-
        }
 }
\ No newline at end of file

diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/MaintenancePerspective.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/MaintenancePerspective.java
index da9e26c0f59540f5e657164b1067baed3eba8d9e..ac1b2da35bdf1d7150f764490fed9df4edae00a8 100644 (file)
--- a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/MaintenancePerspective.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/MaintenancePerspective.java
@@ -21,7 +21,7 @@ import org.eclipse.ui.IFolderLayout;
 import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.IPerspectiveFactory;
 
-/** Home perspective for the current user */
+/** First draft of a maintenance perspective. Not yet used */
 public class MaintenancePerspective implements IPerspectiveFactory {
        public final static String ID = WorkbenchUiPlugin.PLUGIN_ID
                        + ".adminMaintenancePerspective";
@@ -38,6 +38,5 @@ public class MaintenancePerspective implements IPerspectiveFactory {
                IFolderLayout left = layout.createFolder("left", IPageLayout.LEFT,
                                0.30f, editorArea);
                left.addView(UserProfile.ID);
-               // left.addView(RolesView.ID);
        }
 }
\ No newline at end of file

diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/WorkbenchUiPlugin.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/WorkbenchUiPlugin.java
index 18b35ae7dcfd392e9ed7d3b7d3f4b25acf8d7f09..a4e5ac39484d041b06d30649ac5aea96eb4bef65 100644 (file)
--- a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/WorkbenchUiPlugin.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/WorkbenchUiPlugin.java
@@ -91,10 +91,11 @@ public class WorkbenchUiPlugin extends AbstractUIPlugin implements ILogListener
                return bundleContext;
        }
 
-       // * Returns the shared instance
-       // *
-       // * @return the shared instance
-       // */
+       /*
+        * Returns the shared instance
+        * 
+        * @return the shared instance
+        */
        public static WorkbenchUiPlugin getDefault() {
                return plugin;
        }

diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/commands/OpenChangePasswordDialog.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/commands/OpenChangePasswordDialog.java
index d48291f385645c5b3352e77f260fbd1ba8c55dd9..1cd98fdae98ce2254f3a65c69ac14bea9377d598 100644 (file)
--- a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/commands/OpenChangePasswordDialog.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/commands/OpenChangePasswordDialog.java
@@ -53,7 +53,7 @@ import org.eclipse.ui.handlers.HandlerUtil;
 import org.osgi.service.useradmin.User;
 import org.osgi.service.useradmin.UserAdmin;
 
-/** Opens the change password dialog. */
+/** Open the change password dialog */
 public class OpenChangePasswordDialog extends AbstractHandler {
        private final static Log log = LogFactory
                        .getLog(OpenChangePasswordDialog.class);
@@ -166,6 +166,5 @@ public class OpenChangePasswordDialog extends AbstractHandler {
                        super.configureShell(shell);
                        shell.setText(changePassword.lead());
                }
-
        }
-}
+}
\ No newline at end of file

diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/JcrBrowserUtils.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/JcrBrowserUtils.java
index 363ecfbb5931daa69d618718cdf32398b36e624a..d1dac40ad25afd0d73c90fd8b1c5eeb8232b7d0f 100644 (file)
--- a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/JcrBrowserUtils.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/JcrBrowserUtils.java
@@ -25,7 +25,7 @@ import org.argeo.cms.ui.workbench.internal.jcr.model.WorkspaceElem;
 import org.argeo.eclipse.ui.EclipseUiException;
 import org.argeo.eclipse.ui.TreeParent;
 
-/** Centralizes useful methods to manage the JCR Browser */
+/** Useful methods to manage the JCR Browser */
 public class JcrBrowserUtils {
 
        /** Insure that the UI component is not stale, refresh if needed */

diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/NodeLabelProvider.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/NodeLabelProvider.java
index df8a26e7a354500d3a29a404d86d858fb46b704c..be4f5a0d76c4e23c4eeb957a72036d88a5eaf878 100644 (file)
--- a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/NodeLabelProvider.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/NodeLabelProvider.java
@@ -120,7 +120,5 @@ public class NodeLabelProvider extends ColumnLabelProvider {
                        e.printStackTrace();
                        return null;
                }
-
        }
-
-}
+}
\ No newline at end of file

diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/GenericNodeEditorInput.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/GenericNodeEditorInput.java
index c87127b89ad46ade7f075718d2998eade164a720..d27c57e1223811e90a502cc278b18a95c59a90b6 100644 (file)
--- a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/GenericNodeEditorInput.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/GenericNodeEditorInput.java
@@ -53,6 +53,7 @@ public class GenericNodeEditorInput implements IEditorInput {
                return currentNode;
        }
 
+       @SuppressWarnings("unchecked")
        public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {
                return null;
        }

diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/JcrQueryEditorInput.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/JcrQueryEditorInput.java
index 5de33ff88d3839e24b98d2526634c88a768f675d..11256fe75ebcf94e065644aedcc802b17ae2e974 100644 (file)
--- a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/JcrQueryEditorInput.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/JcrQueryEditorInput.java
@@ -33,6 +33,7 @@ public class JcrQueryEditorInput implements IEditorInput {
                        this.queryType = queryType;
        }
 
+       @SuppressWarnings("unchecked")
        public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {
                return null;
        }

diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/NodeEditorInput.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/NodeEditorInput.java
index ccda0999571ce22424f77b3d37a5b65142328bd3..d51aeb3f27c1417c312e2ab85a5dc8169c47e4ad 100644 (file)
--- a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/NodeEditorInput.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/NodeEditorInput.java
@@ -31,6 +31,7 @@ public class NodeEditorInput implements IEditorInput {
                this.path = path;
        }
 
+       @SuppressWarnings("unchecked")
        public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {
                return null;
        }

diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/StringNodeEditorInput.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/StringNodeEditorInput.java
index 3740debe6f99a2eec8e239d8f010ea5508dde3b5..6aae94c2815dfbe9386ba3a63ddd033d323a8a36 100644 (file)
--- a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/StringNodeEditorInput.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/StringNodeEditorInput.java
@@ -54,6 +54,7 @@ public class StringNodeEditorInput implements IEditorInput {
                this.workspaceName = workspaceName;
        }
 
+       @SuppressWarnings("unchecked")
        public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {
                return null;
        }

diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/ArgeoUserEditorInput.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/ArgeoUserEditorInput.java
index d0ed6b45fe1f3ee56f0f6167a15dfe3dd2d5218a..71089f690f33ea72a4f0a170516faa228b05ff32 100644 (file)
--- a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/ArgeoUserEditorInput.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/ArgeoUserEditorInput.java
@@ -27,6 +27,7 @@ public class ArgeoUserEditorInput implements IEditorInput {
                this.username = username;
        }
 
+       @SuppressWarnings("unchecked")
        public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {
                return null;
        }

diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserEditorInput.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserEditorInput.java
index 576c53e6d95288f4d06c30ecb3fff9b093736157..64f12f44a437b3e83ec4404c624fe6cceb6d97fe 100644 (file)
--- a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserEditorInput.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserEditorInput.java
@@ -30,6 +30,7 @@ public class UserEditorInput implements IEditorInput {
                this.username = username;
        }
 
+       @SuppressWarnings("unchecked")
        public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {
                return null;
        }