Improve ACR

[lgpl/argeo-commons.git] / org.argeo.api.acr / src / org / argeo / api / acr / Content.java

diff --git a/org.argeo.api.acr/src/org/argeo/api/acr/Content.java b/org.argeo.api.acr/src/org/argeo/api/acr/Content.java
index cd03b16a828906dff4990ad62a7b77621c9f96cd..3cdf8d7dbec044f6a3a0c7a40fbe092b407a2b86 100644 (file)
--- a/org.argeo.api.acr/src/org/argeo/api/acr/Content.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/Content.java
@@ -2,6 +2,7 @@ package org.argeo.api.acr;
 
 import java.io.Closeable;
 import java.io.IOException;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -92,7 +93,39 @@ public interface Content extends Iterable<Content>, Map<QName, Object> {
        /*
         * TYPING
         */
-       List<QName> getTypes();
+       List<QName> getContentClasses();
+
+       default void addContentClasses(QName... contentClass) {
+               throw new UnsupportedOperationException("Adding content classes to " + getPath() + " is not supported");
+       }
+
+       /** AND */
+       default boolean isContentClass(QName... contentClass) {
+               List<QName> contentClasses = getContentClasses();
+               for (QName cClass : contentClass) {
+                       if (!contentClasses.contains(cClass))
+                               return false;
+               }
+               return true;
+       }
+
+       /** OR */
+       default boolean hasContentClass(QName... contentClass) {
+               List<QName> contentClasses = getContentClasses();
+               for (QName cClass : contentClass) {
+                       if (contentClasses.contains(cClass))
+                               return true;
+               }
+               return false;
+       }
+
+       /*
+        * SIBLINGS
+        */
+
+       default int getSiblingIndex() {
+               return 1;
+       }
 
        /*
         * DEFAULT METHODS
@@ -109,12 +142,52 @@ public interface Content extends Iterable<Content>, Map<QName, Object> {
                throw new UnsupportedOperationException("Cannot write content " + this + " as " + clss.getName());
        }
 
+       /*
+        * CHILDREN
+        */
+
+       default boolean hasChild(QName name) {
+               for (Content child : this) {
+                       if (child.getName().equals(name))
+                               return true;
+               }
+               return false;
+       }
+
+       default Content anyOrAddChild(QName name, QName... classes) {
+               Content child = anyChild(name);
+               if (child != null)
+                       return child;
+               return this.add(name, classes);
+       }
+
+       /** Any child with this name, or null if there is none */
+       default Content anyChild(QName name) {
+               for (Content child : this) {
+                       if (child.getName().equals(name))
+                               return child;
+               }
+               return null;
+       }
+
        /*
         * CONVENIENCE METHODS
         */
-//     default String attr(String key) {
-//             return get(key, String.class);
-//     }
+       default String attr(String key) {
+               Object obj = get(key);
+               if (obj == null)
+                       return null;
+               return obj.toString();
+
+       }
+
+       default String attr(QName key) {
+               Object obj = get(key);
+               if (obj == null)
+                       return null;
+               return obj.toString();
+
+       }
 //
 //     default String attr(Object key) {
 //             return key != null ? attr(key.toString()) : attr(null);