From: Bruno Sinou <bsinou@argeo.org>
Date: Tue, 20 Sep 2016 12:04:49 +0000 (+0000)
Subject: Fix glitches, finalize cleaning
X-Git-Tag: argeo-commons-2.1.46~7
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=0cdccc76ae0233aaaefeda94c13df7fdecfb43d1;p=lgpl%2Fargeo-commons.git

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 b80fb435f..3a91b6aa2 100644
--- 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 0b235f7e9..82792ed3b 100644
--- 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 da9e26c0f..ac1b2da35 100644
--- 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 18b35ae7d..a4e5ac394 100644
--- 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 d48291f38..1cd98fdae 100644
--- 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 363ecfbb5..d1dac40ad 100644
--- 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 df8a26e7a..be4f5a0d7 100644
--- 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 c87127b89..d27c57e12 100644
--- 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 5de33ff88..11256fe75 100644
--- 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 ccda09995..d51aeb3f2 100644
--- 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 3740debe6..6aae94c28 100644
--- 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 d0ed6b45f..71089f690 100644
--- 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 576c53e6d..64f12f44a 100644
--- 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;
 	}