Merge remote-tracking branch 'origin/unstable' into merge-to-testing

[lgpl/argeo-commons.git] / org.argeo.cms.ux / src / org / argeo / cms / ux / acr / ContentHierarchicalPart.java

diff --git a/org.argeo.cms.ux/src/org/argeo/cms/ux/acr/ContentHierarchicalPart.java b/org.argeo.cms.ux/src/org/argeo/cms/ux/acr/ContentHierarchicalPart.java
index 237219ad6a78ffa0a2d3fb1c2bf1612abd6d063f..baaa25238ebb0f39a33871cbb67ab99270ddb8ea 100644 (file)
--- a/org.argeo.cms.ux/src/org/argeo/cms/ux/acr/ContentHierarchicalPart.java
+++ b/org.argeo.cms.ux/src/org/argeo/cms/ux/acr/ContentHierarchicalPart.java
@@ -5,14 +5,15 @@ import java.util.Iterator;
 import java.util.List;
 
 import org.argeo.api.acr.Content;
-import org.argeo.api.acr.NamespaceUtils;
-import org.argeo.cms.ux.widgets.AbstractDataPart;
+import org.argeo.cms.ux.widgets.AbstractHierarchicalPart;
 import org.argeo.cms.ux.widgets.HierarchicalPart;
 
-public class ContentHierarchicalPart extends AbstractDataPart<Content, Content> implements HierarchicalPart<Content> {
+public class ContentHierarchicalPart extends AbstractHierarchicalPart<Content> implements HierarchicalPart<Content> {
        @Override
        public List<Content> getChildren(Content content) {
                List<Content> res = new ArrayList<>();
+               if (isLeaf(content))
+                       return res;
                if (content == null)
                        return res;
                for (Iterator<Content> it = content.iterator(); it.hasNext();) {
@@ -22,13 +23,7 @@ public class ContentHierarchicalPart extends AbstractDataPart<Content, Content>
                return res;
        }
 
-       @Override
-       public String getText(Content model) {
-               try {
-                       return NamespaceUtils.toPrefixedName(model.getName());
-               } catch (IllegalStateException e) {
-                       return model.getName().toString();
-               }
+       protected boolean isLeaf(Content content) {
+               return false;
        }
-
 }