X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.client.ui.dist%2Fsrc%2Forg%2Fargeo%2Fslc%2Fclient%2Fui%2Fdist%2Fcommands%2FNormalizeDistribution.java;h=ab4f333031d5acfe642e7305bd6eb82c62fdc7d5;hb=f59056d0b805cb91f524671a28b8780338509ba4;hp=6b849f9eecc14b99c87807086a6ef4187e1fff88;hpb=2db415932b071525adb52c6374e021174512a924;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java
index 6b849f9ee..ab4f33303 100644
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java
@@ -31,22 +31,24 @@ import javax.jcr.util.TraversingItemVisitor;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.ArgeoMonitor;
-import org.argeo.eclipse.ui.EclipseArgeoMonitor;
+import org.argeo.eclipse.ui.EclipseJcrMonitor;
+import org.argeo.jcr.JcrMonitor;
 import org.argeo.jcr.JcrUtils;
+import org.argeo.node.security.Keyring;
 import org.argeo.slc.NameVersion;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.aether.AetherUtils;
 import org.argeo.slc.client.ui.dist.DistPlugin;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
 import org.argeo.slc.repo.ArtifactIndexer;
 import org.argeo.slc.repo.JarFileIndexer;
 import org.argeo.slc.repo.RepoConstants;
 import org.argeo.slc.repo.RepoUtils;
 import org.argeo.slc.repo.maven.MavenConventionsUtils;
 import org.argeo.slc.repo.osgi.NormalizeGroup;
-import org.argeo.util.security.Keyring;
+import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.artifact.DefaultArtifact;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
@@ -69,15 +71,14 @@ import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.handlers.HandlerUtil;
-import org.eclipse.aether.artifact.Artifact;
-import org.eclipse.aether.artifact.DefaultArtifact;
 
 /** Legacy - Make sure than Maven and OSGi metadata are consistent */
 public class NormalizeDistribution extends AbstractHandler implements SlcNames {
 	private final static Log log = LogFactory
 			.getLog(NormalizeDistribution.class);
 
-	public final static String ID = DistPlugin.ID + ".normalizeDistribution";
+	public final static String ID = DistPlugin.PLUGIN_ID
+			+ ".normalizeDistribution";
 	public final static String DEFAULT_LABEL = "Legacy Normalization...";
 	public final static ImageDescriptor DEFAULT_ICON = DistPlugin
 			.getImageDescriptor("icons/normalize.gif");
@@ -206,7 +207,7 @@ public class NormalizeDistribution extends AbstractHandler implements SlcNames {
 		protected IStatus run(IProgressMonitor progressMonitor) {
 
 			try {
-				ArgeoMonitor monitor = new EclipseArgeoMonitor(progressMonitor);
+				JcrMonitor monitor = new EclipseJcrMonitor(progressMonitor);
 				// normalize artifacts
 				Query countQuery = session
 						.getWorkspace()
@@ -237,7 +238,7 @@ public class NormalizeDistribution extends AbstractHandler implements SlcNames {
 							overridePoms, monitor);
 				}
 			} catch (Exception e) {
-				return new Status(IStatus.ERROR, DistPlugin.ID,
+				return new Status(IStatus.ERROR, DistPlugin.PLUGIN_ID,
 						"Cannot normalize distribution "
 								+ session.getWorkspace().getName(), e);
 			} finally {
@@ -249,9 +250,9 @@ public class NormalizeDistribution extends AbstractHandler implements SlcNames {
 	}
 
 	private class NormalizingTraverser extends TraversingItemVisitor {
-		ArgeoMonitor monitor;
+		JcrMonitor monitor;
 
-		public NormalizingTraverser(ArgeoMonitor monitor) {
+		public NormalizingTraverser(JcrMonitor monitor) {
 			super();
 			this.monitor = monitor;
 		}
@@ -302,6 +303,8 @@ public class NormalizeDistribution extends AbstractHandler implements SlcNames {
 	}
 
 	public class NormalizationDialog extends TitleAreaDialog {
+		private static final long serialVersionUID = -3103886455862638580L;
+
 		private Text versionT;
 		private String version;
 		private Button overridePomsC;