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%2FMergeWorkspaces.java;fp=org.argeo.slc.client.ui.dist%2Fsrc%2Forg%2Fargeo%2Fslc%2Fclient%2Fui%2Fdist%2Fcommands%2FMergeWorkspaces.java;h=965e5348f1f9a1e5c2a88edf3d57b303c80bab5f;hb=8a01e42cd1a963be1f37d444f15e09512dc7d07f;hp=e3190072648437086e0e3a1e53288abc00283ecb;hpb=b7574609d9db49e8235b6c12e7405add0c8da4ba;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/MergeWorkspaces.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/MergeWorkspaces.java
index e31900726..965e5348f 100644
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/MergeWorkspaces.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/MergeWorkspaces.java
@@ -27,13 +27,13 @@ import javax.jcr.query.QueryResult;
 
 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.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;
@@ -150,7 +150,7 @@ public class MergeWorkspaces extends AbstractHandler {
 				if (log.isDebugEnabled())
 					log.debug("Will copy " + expectedCount + " files...");
 
-				ArgeoMonitor monitor = new EclipseArgeoMonitor(eclipseMonitor);
+				JcrMonitor monitor = new EclipseJcrMonitor(eclipseMonitor);
 				eclipseMonitor
 						.beginTask("Copy files", expectedCount.intValue());