Adapt refactoring (remove APIs from argeo.util)

[gpl/argeo-slc.git] / org.argeo.slc.client.ui.dist / src / org / argeo / slc / client / ui / dist / commands / NormalizeWorkspace.java

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java
index d2628f7fe394d09d274d1ff4ca2a5b174877b981..db87371eabe4547d5c4157600158bf8268b94f4f 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java
@@ -29,9 +29,10 @@ 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.SlcException;
 import org.argeo.slc.client.ui.dist.DistPlugin;
 import org.argeo.slc.jcr.SlcNames;
@@ -41,7 +42,6 @@ import org.argeo.slc.repo.ModularDistributionIndexer;
 import org.argeo.slc.repo.PdeSourcesIndexer;
 import org.argeo.slc.repo.RepoConstants;
 import org.argeo.slc.repo.RepoUtils;
-import org.argeo.util.security.Keyring;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
@@ -130,7 +130,7 @@ public class NormalizeWorkspace extends AbstractHandler implements SlcNames {
                @Override
                protected IStatus run(IProgressMonitor progressMonitor) {
                        try {
-                               ArgeoMonitor monitor = new EclipseArgeoMonitor(progressMonitor);
+                               JcrMonitor monitor = new EclipseJcrMonitor(progressMonitor);
                                // Normalize artifacts
                                Query countQuery = session
                                                .getWorkspace()
@@ -162,9 +162,9 @@ public class NormalizeWorkspace 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;
                }