From dc3be714555e9f6d75eda904c788020125cc762d Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 26 Oct 2023 08:55:05 +0200
Subject: [PATCH] Improve entity names

---
 .../src/org/argeo/app/api/EntityName.java        |  4 +++-
 .../src/org/argeo/app/api/EntityNames.java       | 16 ++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/org.argeo.app.api/src/org/argeo/app/api/EntityName.java b/org.argeo.app.api/src/org/argeo/app/api/EntityName.java
index f890632..4330294 100644
--- a/org.argeo.app.api/src/org/argeo/app/api/EntityName.java
+++ b/org.argeo.app.api/src/org/argeo/app/api/EntityName.java
@@ -4,7 +4,9 @@ import org.argeo.api.acr.QNamed;
 
 /** Names used in the entity namespace http://www.argeo.org/ns/entity. */
 public enum EntityName implements QNamed {
-	type, //
+	type, relatedTo, //
+	// time,
+	date,
 	// geography
 	minLat, minLon, maxLat, maxLon,
 	// geo entities
diff --git a/org.argeo.app.api/src/org/argeo/app/api/EntityNames.java b/org.argeo.app.api/src/org/argeo/app/api/EntityNames.java
index 2e33c34..b6240b3 100644
--- a/org.argeo.app.api/src/org/argeo/app/api/EntityNames.java
+++ b/org.argeo.app.api/src/org/argeo/app/api/EntityNames.java
@@ -18,16 +18,16 @@ public interface EntityNames {
 	final String ADM = "adm";
 
 	@Deprecated
-	final String ENTITY_TYPE = "entity:type";
+	final String ENTITY_TYPE = EntityName.type.get();
 
 	// GENERIC CONCEPTS
 //	/** The language which is relevant. */
 //	final String XML_LANG = "xml:lang";
 	/** The date which is relevant. */
 	@Deprecated
-	final String ENTITY_DATE = "entity:date";
+	final String ENTITY_DATE = EntityName.date.get();
 	@Deprecated
-	final String ENTITY_RELATED_TO = "entity:relatedTo";
+	final String ENTITY_RELATED_TO = EntityName.relatedTo.get();
 
 	// DEFAULT FOLDER NAMES
 	final String MEDIA = "media";
@@ -35,16 +35,16 @@ public interface EntityNames {
 
 	// LDAP-LIKE ENTITIES
 	@Deprecated
-	final String DISPLAY_NAME = LdapAttr.displayName.property();
+	final String DISPLAY_NAME = LdapAttr.displayName.get();
 	// Persons
 	@Deprecated
-	final String GIVEN_NAME = LdapAttr.givenName.property();
+	final String GIVEN_NAME = LdapAttr.givenName.get();
 	@Deprecated
-	final String SURNAME = LdapAttr.sn.property();
+	final String SURNAME = LdapAttr.sn.get();
 	@Deprecated
-	final String EMAIL = LdapAttr.mail.property();
+	final String EMAIL = LdapAttr.mail.get();
 	@Deprecated
-	final String OU = LdapAttr.ou.property();
+	final String OU = LdapAttr.ou.get();
 
 	// WGS84
 	@Deprecated
-- 
2.30.2