Working Argeo 2 deployment (with UI)

[lgpl/argeo-commons.git] / org.argeo.eclipse.ui.workbench / src / org / argeo / eclipse / ui / workbench / internal / jcr / model / RepositoriesElem.java

diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/RepositoriesElem.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/RepositoriesElem.java
index 984d01b5ff60044a50d9a14bfca1343dc9911dcd..0737544873b4e1d39657f72c665844dade9a1407 100644 (file)
--- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/RepositoriesElem.java
+++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/RepositoriesElem.java
@@ -28,7 +28,6 @@ import org.argeo.ArgeoException;
 import org.argeo.eclipse.ui.TreeParent;
 import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
 import org.argeo.jcr.ArgeoNames;
-import org.argeo.jcr.MaintainedRepository;
 import org.argeo.jcr.RepositoryRegister;
 import org.argeo.jcr.UserJcrUtils;
 import org.argeo.util.security.Keyring;
@@ -55,9 +54,8 @@ public class RepositoriesElem extends TreeParent implements ArgeoNames {
        private final Session userSession;
        private final Keyring keyring;
 
-       public RepositoriesElem(String name, RepositoryRegister repositoryRegister,
-                       RepositoryFactory repositoryFactory, TreeParent parent,
-                       Session userSession, Keyring keyring) {
+       public RepositoriesElem(String name, RepositoryRegister repositoryRegister, RepositoryFactory repositoryFactory,
+                       TreeParent parent, Session userSession, Keyring keyring) {
                super(name);
                this.repositoryRegister = repositoryRegister;
                this.repositoryFactory = repositoryFactory;
@@ -75,15 +73,14 @@ public class RepositoriesElem extends TreeParent implements ArgeoNames {
                        return super.getChildren();
                } else {
                        // initialize current object
-                       Map<String, Repository> refRepos = repositoryRegister
-                                       .getRepositories();
+                       Map<String, Repository> refRepos = repositoryRegister.getRepositories();
                        for (String name : refRepos.keySet()) {
                                Repository repository = refRepos.get(name);
-                               if (repository instanceof MaintainedRepository)
-                                       super.addChild(new MaintainedRepositoryElem(name,
-                                                       repository, this));
-                               else
-                                       super.addChild(new RepositoryElem(name, repository, this));
+                               // if (repository instanceof MaintainedRepository)
+                               // super.addChild(new MaintainedRepositoryElem(name,
+                               // repository, this));
+                               // else
+                               super.addChild(new RepositoryElem(name, repository, this));
                        }
 
                        // remote
@@ -91,16 +88,14 @@ public class RepositoriesElem extends TreeParent implements ArgeoNames {
                                try {
                                        addRemoteRepositories(keyring);
                                } catch (RepositoryException e) {
-                                       throw new ArgeoException(
-                                                       "Cannot browse remote repositories", e);
+                                       throw new ArgeoException("Cannot browse remote repositories", e);
                                }
                        }
                        return super.getChildren();
                }
        }
 
-       protected void addRemoteRepositories(Keyring jcrKeyring)
-                       throws RepositoryException {
+       protected void addRemoteRepositories(Keyring jcrKeyring) throws RepositoryException {
                Node userHome = UserJcrUtils.getUserHome(userSession);
                if (userHome != null && userHome.hasNode(ARGEO_REMOTE)) {
                        NodeIterator it = userHome.getNode(ARGEO_REMOTE).getNodes();
@@ -108,13 +103,11 @@ public class RepositoriesElem extends TreeParent implements ArgeoNames {
                                Node remoteNode = it.nextNode();
                                String uri = remoteNode.getProperty(ARGEO_URI).getString();
                                try {
-                                       RemoteRepositoryElem remoteRepositoryNode = new RemoteRepositoryElem(
-                                                       remoteNode.getName(), repositoryFactory, uri, this,
-                                                       userSession, jcrKeyring, remoteNode.getPath());
+                                       RemoteRepositoryElem remoteRepositoryNode = new RemoteRepositoryElem(remoteNode.getName(),
+                                                       repositoryFactory, uri, this, userSession, jcrKeyring, remoteNode.getPath());
                                        super.addChild(remoteRepositoryNode);
                                } catch (Exception e) {
-                                       ErrorFeedback.show("Cannot add remote repository "
-                                                       + remoteNode, e);
+                                       ErrorFeedback.show("Cannot add remote repository " + remoteNode, e);
                                }
                        }
                }