Work on modular distributions - change lazy init policies, add observer on the catego...

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

diff --git a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/ModularDistBaseElem.java b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/ModularDistBaseElem.java
index 08c7d6d3eaee8f9e5222883f2a27aa0dcbcb65c1..35e3f21dd40f01ad2bec30df308913719d180986 100644 (file)
--- a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/ModularDistBaseElem.java
+++ b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/ModularDistBaseElem.java
@@ -21,6 +21,7 @@ import org.argeo.slc.jcr.SlcTypes;
  */
 public class ModularDistBaseElem extends DistParentElem {
 
+       final static public String AETHER_CATEGORY_BASE = "categoryBase";
        final static public String AETHER_BINARIES_TYPE = "binaries";
        final static public String AETHER_DEP_TYPE = "dep";
        private String type;
@@ -57,7 +58,7 @@ public class ModularDistBaseElem extends DistParentElem {
                        // initialize current object
                        try {
                                NodeIterator ni = getDistVersions();
-                               while (ni.hasNext()) {
+                               while (ni != null && ni.hasNext()) {
                                        Node curNode = ni.nextNode();
                                        addChild(new ModularDistVersionElem(this, curNode
                                                        .getProperty(SlcNames.SLC_ARTIFACT_VERSION)
@@ -74,6 +75,9 @@ public class ModularDistBaseElem extends DistParentElem {
 
        public NodeIterator getDistVersions() {
                try {
+                       if (AETHER_CATEGORY_BASE.equals(type))
+                               return null;
+
                        QueryManager queryManager = artifactBase.getSession()
                                        .getWorkspace().getQueryManager();
                        QueryObjectModelFactory factory = queryManager.getQOMFactory();