Introduce GeoEntityUtils

[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..8a258ebc38d4c60511bc10df3680b8cfd5102a53 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;
 
-/** Types related to entities. */
-public enum EntityType implements JcrName {
+import org.argeo.api.acr.QNamed;
+
+/** Types used in the entity namespace http://www.argeo.org/ns/entity. */
+public enum EntityType implements QNamed {
        // entity
        entity, local, relatedTo,
        // structure
@@ -13,17 +15,16 @@ public enum EntityType implements JcrName {
        // graphics
        box,
        // geography
-       geopoint, bearing,
+       geopoint, bearing, geobounded,
        // ldap
        person, user;
 
-       @Override
-       public String getPrefix() {
-               return prefix();
-       }
+       public final static String ENTITY_NAMESPACE_URI = "http://www.argeo.org/ns/entity";
+       public final static String ENTITY_DEFAULT_PREFIX = "entity";
 
-       public static String prefix() {
-               return "entity";
+       @Override
+       public String getDefaultPrefix() {
+               return ENTITY_DEFAULT_PREFIX;
        }
 
        public String basePath() {
@@ -32,11 +33,6 @@ public enum EntityType implements JcrName {
 
        @Override
        public String getNamespace() {
-               return namespace();
+               return ENTITY_NAMESPACE_URI;
        }
-
-       public static String namespace() {
-               return "http://www.argeo.org/ns/entity";
-       }
-
 }