Merge branch 'master' of https://github.com/argeo/argeo-slc.git

[gpl/argeo-slc.git] / org.argeo.slc.client.ui.dist / src / org / argeo / slc / client / ui / dist / wizards / FetchWizard.java

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 81541d79c1664f7e80ff011a16880780e1e5291c..fb40e1c3411d022e8c430092001aaf59d5b89005 100644 (file)
--- 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,20 +28,20 @@ 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.cms.ArgeoNames;
+import org.argeo.cms.ArgeoTypes;
+import org.argeo.cms.ui.workbench.util.PrivilegedJob;
+import org.argeo.eclipse.ui.EclipseJcrMonitor;
+import org.argeo.jcr.JcrMonitor;
 import org.argeo.jcr.JcrUtils;
-import org.argeo.jcr.UserJcrUtils;
-import org.argeo.security.ui.PrivilegedJob;
+import org.argeo.node.NodeUtils;
+import org.argeo.node.security.Keyring;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.dist.DistPlugin;
 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) {
@@ -589,7 +589,8 @@ public class FetchWizard extends Wizard {
                                                // reset workspace list
                                                wkspViewer.setAllChecked(false);
                                                workspaces.clear();
-                                               session = currSourceRepo.login(currSourceCred);
+                                               // FIXME make it more generic
+                                               session = currSourceRepo.login(currSourceCred,RepoConstants.DEFAULT_DEFAULT_WORKSPACE);
                                                // remove unvalid elements
                                                for (String name : session.getWorkspace()
                                                                .getAccessibleWorkspaceNames())
@@ -642,7 +643,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);