Code clean up

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 b605fa1e0062140b18fd5b1784fe8ea0fd6171bc..f52ab31b8f25223e109b4781707502f924cd5ebd 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
@@ -128,6 +128,14 @@ public interface Content extends Iterable<Content>, Map<QName, Object> {
                return true;
        }
 
+       /** AND */
+       default boolean isContentClass(QNamed... contentClass) {
+               List<QName> lst = new ArrayList<>();
+               for (QNamed qNamed : contentClass)
+                       lst.add(qNamed.qName());
+               return isContentClass(lst.toArray(new QName[lst.size()]));
+       }
+
        /** OR */
        default boolean hasContentClass(QName... contentClass) {
                List<QName> contentClasses = getContentClasses();
@@ -138,8 +146,12 @@ public interface Content extends Iterable<Content>, Map<QName, Object> {
                return false;
        }
 
-       default boolean hasContentClass(QNamed contentClass) {
-               return hasContentClass(contentClass.qName());
+       /** OR */
+       default boolean hasContentClass(QNamed... contentClass) {
+               List<QName> lst = new ArrayList<>();
+               for (QNamed qNamed : contentClass)
+                       lst.add(qNamed.qName());
+               return hasContentClass(lst.toArray(new QName[lst.size()]));
        }
 
        /*

diff --git a/org.argeo.cms/src/org/argeo/cms/acr/CmsContentSession.java b/org.argeo.cms/src/org/argeo/cms/acr/CmsContentSession.java
index 34d683605ac4e81240be687a04e4371f7e325d79..73adc7012860c99503bacf683488d6b0c2fb0235 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/acr/CmsContentSession.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/CmsContentSession.java
@@ -12,7 +12,6 @@ import javax.security.auth.Subject;
 
 import org.argeo.api.acr.Content;
 import org.argeo.api.acr.ContentSession;
-import org.argeo.api.acr.CrName;
 import org.argeo.api.acr.DName;
 import org.argeo.api.acr.spi.ContentProvider;
 import org.argeo.api.acr.spi.ProvidedContent;
@@ -119,23 +118,8 @@ class CmsContentSession implements ProvidedSession {
        }
 
        /*
-        * NAMESPACE CONTEXT
+        * EDITION
         */
-
-//     @Override
-//     public String getNamespaceURI(String prefix) {
-//             return RuntimeNamespaceContext.getNamespaceContext().getNamespaceURI(prefix);
-////           return NamespaceUtils.getNamespaceURI((p) -> contentRepository.getTypesManager().getPrefixes().get(p), prefix);
-//     }
-//
-//     @Override
-//     public Iterator<String> getPrefixes(String namespaceURI) {
-//             return RuntimeNamespaceContext.getNamespaceContext().getPrefixes(namespaceURI);
-////           return NamespaceUtils.getPrefixes((ns) -> contentRepository.getTypesManager().getPrefixes().entrySet().stream()
-////                           .filter(e -> e.getValue().equals(ns)).map(Map.Entry::getKey).collect(Collectors.toUnmodifiableSet()),
-////                           namespaceURI);
-//     }
-
        @Override
        public CompletionStage<ContentSession> edit(Consumer<ContentSession> work) {
                edition = CompletableFuture.supplyAsync(() -> {
@@ -181,7 +165,7 @@ class CmsContentSession implements ProvidedSession {
                        else {
                                Content runDir = get(CmsContentRepository.RUN_BASE);
                                // TODO deal with no run dir available?
-                               sessionRunDir = runDir.add(uuid.toString(),DName.collection.qName());
+                               sessionRunDir = runDir.add(uuid.toString(), DName.collection.qName());
                        }
                }
                return sessionRunDir;

diff --git a/org.argeo.cms/src/org/argeo/cms/auth/CmsRole.java b/org.argeo.cms/src/org/argeo/cms/auth/CmsRole.java
index 5ac23ea6a158e3a140d7b9023de43d6dcf558079..31068b1a3c84115b847eff3d19ff3fce0bc5d26b 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/auth/CmsRole.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/CmsRole.java
@@ -8,7 +8,9 @@ import org.argeo.api.acr.ContentName;
 /** Standard CMS system roles. */
 public enum CmsRole implements SystemRole {
        userAdmin, //
-       groupAdmin;
+       groupAdmin, //
+       //
+       ;
 
        private final static String QUALIFIER = "cms.";