X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=plugins%2Forg.argeo.slc.client.ui.dist%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fclient%2Fui%2Fdist%2Fcommands%2FNormalizeWorkspace.java;h=f6f9d06fea52412651de0080c99545ec112a8271;hb=460cb0f2be7a8fa92ee6f22564b42a25aac5de4b;hp=a9abb5fe82bca38db6d58ead5dd45b5ce6e287e7;hpb=7af5edc4d006d39174dba9665b0f78ccc2f9dfe6;p=gpl%2Fargeo-slc.git

diff --git a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java
index a9abb5fe8..f6f9d06fe 100644
--- a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java
+++ b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java
@@ -60,26 +60,25 @@ public class NormalizeWorkspace extends AbstractHandler implements SlcNames {
 	private final static Log log = LogFactory.getLog(NormalizeWorkspace.class);
 
 	public final static String ID = DistPlugin.ID + ".normalizeWorkspace";
+	public final static ImageDescriptor DEFAULT_ICON = DistPlugin
+			.getImageDescriptor("icons/normalize.gif");
 
 	public final static String PARAM_WORKSPACE_NAME = "workspaceName";
 	public final static String PARAM_TARGET_REPO_PATH = "targetRepoPath";
-	public final static ImageDescriptor DEFAULT_ICON = DistPlugin
-			.getImageDescriptor("icons/normalize.gif");
 
 	private String artifactBasePath = RepoConstants.DEFAULT_ARTIFACTS_BASE_PATH;
 
-	private ArtifactIndexer artifactIndexer = new ArtifactIndexer();
-	private JarFileIndexer jarFileIndexer = new JarFileIndexer();
-	private PdeSourcesIndexer pdeSourceIndexer = new PdeSourcesIndexer(
-			artifactIndexer, jarFileIndexer);
-
 	// DEPENDENCY INJECTION
 	private RepositoryFactory repositoryFactory;
 	private Keyring keyring;
 	private Repository repository;
 
-	public Object execute(ExecutionEvent event) throws ExecutionException {
+	private ArtifactIndexer artifactIndexer = new ArtifactIndexer();
+	private JarFileIndexer jarFileIndexer = new JarFileIndexer();
+	private PdeSourcesIndexer pdeSourceIndexer = new PdeSourcesIndexer(
+			artifactIndexer, jarFileIndexer);
 
+	public Object execute(ExecutionEvent event) throws ExecutionException {
 		String targetRepoPath = event.getParameter(PARAM_TARGET_REPO_PATH);
 		String wkspName = event.getParameter(PARAM_WORKSPACE_NAME);
 
@@ -88,7 +87,7 @@ public class NormalizeWorkspace extends AbstractHandler implements SlcNames {
 		try {
 			String msg = "Your are about to normalize workspace: " + wkspName
 					+ ".\nThis will index OSGi bundles and Maven artifacts, "
-					+ "it will also generate pdeSources if needed.\n"
+					+ "it will also convert Maven sources to PDE Sources if needed.\n"
 					+ "Note that no information will be overwritten: "
 					+ "all existing information are kept."
 					+ "\n\n Do you really want to proceed ?";
@@ -126,10 +125,9 @@ public class NormalizeWorkspace extends AbstractHandler implements SlcNames {
 
 		@Override
 		protected IStatus run(IProgressMonitor progressMonitor) {
-
 			try {
 				ArgeoMonitor monitor = new EclipseArgeoMonitor(progressMonitor);
-				// normalize artifacts
+				// Normalize artifacts
 				Query countQuery = session
 						.getWorkspace()
 						.getQueryManager()
@@ -203,7 +201,6 @@ public class NormalizeWorkspace extends AbstractHandler implements SlcNames {
 		@Override
 		protected void leaving(Node node, int level) throws RepositoryException {
 		}
-
 	}
 
 	/* DEPENDENCY INJECTION */