From f05ecdeb7e28f07af367ef7eb462b156b2be5503 Mon Sep 17 00:00:00 2001 From: remillet Date: Fri, 2 Jun 2017 12:06:03 -0700 Subject: [PATCH] CSPACE-6901: Removed hard-coded domain string from CE and BCE refnames. Added code to inject current tenant domain string into the BCE and CE refnames. --- .../collectionspace/services/structureddate/Era.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/services/structureddate/src/main/java/org/collectionspace/services/structureddate/Era.java b/services/structureddate/src/main/java/org/collectionspace/services/structureddate/Era.java index 3ac7789dc..c1d5e4269 100644 --- a/services/structureddate/src/main/java/org/collectionspace/services/structureddate/Era.java +++ b/services/structureddate/src/main/java/org/collectionspace/services/structureddate/Era.java @@ -1,8 +1,8 @@ package org.collectionspace.services.structureddate; public enum Era { - BCE ("urn:cspace:core.collectionspace.org:vocabularies:name(dateera):item:name(bce)'BCE'"), - CE ("urn:cspace:core.collectionspace.org:vocabularies:name(dateera):item:name(ce)'CE'"); + BCE ("urn:cspace:*:vocabularies:name(dateera):item:name(bce)'BCE'"), + CE ("urn:cspace:*:vocabularies:name(dateera):item:name(ce)'CE'"); private final String value; @@ -10,10 +10,16 @@ public enum Era { this.value = value; } + @Override public String toString() { return value; } + public String toString(String tenantDomain) { + String result = toString().replace("*", tenantDomain); + return result; + } + public String toDisplayString() { int index = value.indexOf("'"); -- 2.47.3