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

[gpl/argeo-suite.git] / org.argeo.app.api / src / org / argeo / app / api / EntityType.java

diff --git a/org.argeo.app.api/src/org/argeo/app/api/EntityType.java b/org.argeo.app.api/src/org/argeo/app/api/EntityType.java
index 48b1266b00edfc3e7f118c8a072e4d1d9ce0bc88..8b9164a77d86aca468b0417d5712e0a6f4babd48 100644 (file)
--- a/org.argeo.app.api/src/org/argeo/app/api/EntityType.java
+++ b/org.argeo.app.api/src/org/argeo/app/api/EntityType.java
@@ -1,7 +1,9 @@
 package org.argeo.app.api;
 
+import org.argeo.api.acr.QNamed;
+
 /** Types related to entities. */
-public enum EntityType implements JcrName {
+public enum EntityType implements QNamed {
        // entity
        entity, local, relatedTo,
        // structure
@@ -18,25 +20,30 @@ public enum EntityType implements JcrName {
        person, user;
 
        @Override
-       public String getPrefix() {
-               return prefix();
-       }
-
-       public static String prefix() {
+       public String getDefaultPrefix() {
                return "entity";
        }
 
+//     @Override
+//     public String getPrefix() {
+//             return getDefaultPrefix();
+//     }
+//
+//     public static String prefix() {
+//             return "entity";
+//     }
+
        public String basePath() {
                return '/' + name();
        }
 
        @Override
        public String getNamespace() {
-               return namespace();
-       }
-
-       public static String namespace() {
                return "http://www.argeo.org/ns/entity";
        }
 
+//     public static String namespace() {
+//             return "http://www.argeo.org/ns/entity";
+//     }
+
 }