Improve ACR

[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 ad4df115f923a193a5b92e0171db2afc003e8ae4..43a4034159034cc8565e59aad94d54d42ab6b5d6 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,6 +5,7 @@ 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.HierarchicalPart;
 
@@ -12,6 +13,8 @@ public class ContentHierarchicalPart extends AbstractDataPart<Content, 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();) {
@@ -21,9 +24,17 @@ public class ContentHierarchicalPart extends AbstractDataPart<Content, Content>
                return res;
        }
 
+       protected boolean isLeaf(Content content) {
+               return false;
+       }
+
        @Override
        public String getText(Content model) {
-               return model.getName().toString();
+               try {
+                       return NamespaceUtils.toPrefixedName(model.getName());
+               } catch (IllegalStateException e) {
+                       return model.getName().toString();
+               }
        }
 
 }