Fix a few issues while testing and building distributions.

[gpl/argeo-slc.git] / plugins / org.argeo.slc.client.ui.dist / src / main / java / org / argeo / slc / client / ui / dist / model / WorkspaceElem.java

diff --git a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/WorkspaceElem.java b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/WorkspaceElem.java
index 41ba6efe32fa6dd51d3a3b14e7732381652b4c48..c3088ebb22e8932382bd50f0b5b82a0c9e8cc367 100644 (file)
--- a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/WorkspaceElem.java
+++ b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/WorkspaceElem.java
@@ -44,12 +44,17 @@ public class WorkspaceElem extends DistParentElem {
                currSession = repoElem.repositoryLogin(getName());
        }
 
+       /** Utility to create a new Session with correct credential in this context */
+       public Session getNewSession() {
+               return repoElem.repositoryLogin(getName());
+       }
+
        public boolean hasChildren() {
                try {
                        if (isConnected())
                                return currSession.getRootNode().hasNodes();
                        else
-                               return false;
+                               return true;
                } catch (RepositoryException re) {
                        throw new ArgeoException(
                                        "Unexpected error while checking children node existence",
@@ -65,45 +70,60 @@ public class WorkspaceElem extends DistParentElem {
                } else {
                        // initialize current object
                        try {
+                               // Lazy connect the first time we retrieve children
                                if (currSession == null)
-                                       return null;
-                               else {
-                                       Query groupQuery = currSession.getWorkspace()
-                                                       .getQueryManager()
-                                                       // .createQuery(
-                                                       // "select * from [" + SlcTypes.SLC_GROUP_BASE
-                                                       // + "] as group order by group.["
-                                                       // + SlcNames.SLC_GROUP_BASE_ID + "]",
-                                                       .createQuery(
-                                                                       "select * from ["
-                                                                                       + SlcTypes.SLC_MODULAR_DISTRIBUTION
-                                                                                       + "]", Query.JCR_SQL2);
-                                       NodeIterator distributions = groupQuery.execute()
-                                                       .getNodes();
-                                       distribs: while (distributions.hasNext()) {
-                                               Node currDist = distributions.nextNode();
-                                               Node distBase = currDist.getParent().getParent();
-                                               if (!distBase.isNodeType(SlcTypes.SLC_ARTIFACT_BASE))
-                                                       continue distribs;
-                                               String groupId = distBase.getProperty(
-                                                               SlcNames.SLC_GROUP_ID).getString();
-                                               String artifactId = distBase.getProperty(
-                                                               SlcNames.SLC_ARTIFACT_ID).getString();
+                                       login();
 
-                                               String name;
-                                               String type;
-                                               if (ModularDistBaseElem.AETHER_BINARIES_TYPE
-                                                               .equals(artifactId)) {
-                                                       name = groupId;
-                                                       type = ModularDistBaseElem.AETHER_BINARIES_TYPE;
-                                               } else {
-                                                       name = artifactId;
-                                                       type = ModularDistBaseElem.AETHER_DEP_TYPE;
-                                               }
-                                               if (getChildByName(name) == null)
-                                                       addChild(new ModularDistBaseElem(
-                                                                       WorkspaceElem.this, name, distBase, type));
+                               // Retrieve already existing distribution
+                               Query groupQuery = currSession
+                                               .getWorkspace()
+                                               .getQueryManager()
+                                               .createQuery(
+                                                               "select * from ["
+                                                                               + SlcTypes.SLC_MODULAR_DISTRIBUTION
+                                                                               + "]", Query.JCR_SQL2);
+                               NodeIterator distributions = groupQuery.execute().getNodes();
+                               distribs: while (distributions.hasNext()) {
+                                       Node currDist = distributions.nextNode();
+                                       Node distBase = currDist.getParent().getParent();
+                                       if (!distBase.isNodeType(SlcTypes.SLC_ARTIFACT_BASE))
+                                               continue distribs;
+                                       String groupId = distBase
+                                                       .getProperty(SlcNames.SLC_GROUP_ID).getString();
+                                       String artifactId = distBase.getProperty(
+                                                       SlcNames.SLC_ARTIFACT_ID).getString();
+
+                                       String name;
+                                       String type;
+                                       if (ModularDistBaseElem.AETHER_BINARIES_TYPE
+                                                       .equals(artifactId)) {
+                                               name = groupId;
+                                               type = ModularDistBaseElem.AETHER_BINARIES_TYPE;
+                                       } else {
+                                               name = artifactId;
+                                               type = ModularDistBaseElem.AETHER_DEP_TYPE;
                                        }
+                                       if (getChildByName(name) == null)
+                                               addChild(new ModularDistBaseElem(WorkspaceElem.this,
+                                                               name, distBase, type));
+                               }
+                               // Add empty group base that have been marked as relevant
+                               groupQuery = currSession
+                                               .getWorkspace()
+                                               .getQueryManager()
+                                               .createQuery(
+                                                               "select * from ["
+                                                                               + SlcTypes.SLC_CATEGORY + "]",
+                                                               Query.JCR_SQL2);
+                               distributions = groupQuery.execute().getNodes();
+                               while (distributions.hasNext()) {
+                                       Node distBase = distributions.nextNode();
+                                       String groupBaseId = distBase.getProperty(
+                                                       SlcNames.SLC_GROUP_BASE_ID).getString();
+                                       if (getChildByName(groupBaseId) == null)
+                                               addChild(new ModularDistBaseElem(WorkspaceElem.this,
+                                                               groupBaseId, distBase,
+                                                               ModularDistBaseElem.AETHER_CATEGORY_BASE));
                                }
                                return super.getChildren();
                        } catch (RepositoryException e) {