X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.client.ui.dist%2Fsrc%2Forg%2Fargeo%2Fslc%2Fclient%2Fui%2Fdist%2Fwizards%2FFetchWizard.java;h=4e29e48e4b22087c9ec03e73e99e2ee209a09b8e;hb=8a01e42cd1a963be1f37d444f15e09512dc7d07f;hp=81541d79c1664f7e80ff011a16880780e1e5291c;hpb=9cdf3ff23b7416beca4ec27fba01888c7c37d298;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/FetchWizard.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/FetchWizard.java
index 81541d79c..4e29e48e4 100644
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/FetchWizard.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/FetchWizard.java
@@ -28,12 +28,13 @@ import javax.jcr.RepositoryException;
 import javax.jcr.RepositoryFactory;
 import javax.jcr.Session;
 
-import org.argeo.ArgeoMonitor;
-import org.argeo.eclipse.ui.EclipseArgeoMonitor;
-import org.argeo.jcr.ArgeoNames;
-import org.argeo.jcr.ArgeoTypes;
+import org.argeo.eclipse.ui.EclipseJcrMonitor;
+import org.argeo.jcr.JcrMonitor;
 import org.argeo.jcr.JcrUtils;
-import org.argeo.jcr.UserJcrUtils;
+import org.argeo.node.ArgeoNames;
+import org.argeo.node.ArgeoTypes;
+import org.argeo.node.NodeUtils;
+import org.argeo.node.security.Keyring;
 import org.argeo.security.ui.PrivilegedJob;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.dist.DistPlugin;
@@ -41,7 +42,6 @@ import org.argeo.slc.client.ui.dist.utils.ViewerUtils;
 import org.argeo.slc.repo.RepoConstants;
 import org.argeo.slc.repo.RepoSync;
 import org.argeo.slc.repo.RepoUtils;
-import org.argeo.util.security.Keyring;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -529,7 +529,7 @@ public class FetchWizard extends Wizard {
 		@Override
 		protected IStatus doRun(IProgressMonitor progressMonitor) {
 			try {
-				ArgeoMonitor monitor = new EclipseArgeoMonitor(progressMonitor);
+				JcrMonitor monitor = new EclipseJcrMonitor(progressMonitor);
 				repoSync.setMonitor(monitor);
 				repoSync.run();
 			} catch (Exception e) {
@@ -642,7 +642,7 @@ public class FetchWizard extends Wizard {
 	// populate available source repo list
 	private Map<String, Node> getSourceRepoUris() {
 		try {
-			Node repoList = currSession.getNode(UserJcrUtils.getUserHome(
+			Node repoList = currSession.getNode(NodeUtils.getUserHome(
 					currSession).getPath()
 					+ RepoConstants.REPOSITORIES_BASE_PATH);