From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Mon, 10 Oct 2011 21:39:06 +0000 (+0000)
Subject: CSPACE-4468,CSPACE-4470: Added constants for new style fields in Relation records.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=c583a50b6345f6079d7aeea8bde27b0e71829a1e;p=tmp%2Fjakarta-migration.git

CSPACE-4468,CSPACE-4470: Added constants for new style fields in Relation records.
---

diff --git a/services/common/src/main/java/org/collectionspace/services/common/relation/RelationJAXBSchema.java b/services/common/src/main/java/org/collectionspace/services/common/relation/RelationJAXBSchema.java
index 73e2fe88e..83128dcec 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/relation/RelationJAXBSchema.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/relation/RelationJAXBSchema.java
@@ -57,10 +57,13 @@ public interface RelationJAXBSchema {
 	/** The Constant RELATIONSHIP_TYPE_DISPLAYNAME. */
 	final static String RELATIONSHIP_TYPE_DISPLAYNAME = "predicateDisplayName";
 
-    final static String subjectUri = "subjectUri";
-
-    final static String objectUri = "objectUri";
+    final static String SUBJECT_URI = "subjectUri";
+    final static String SUBJECT_CSID = "subjectCsid";
+    final static String SUBJECT_REFNAME = "subjectRefName";
 
+    final static String OBJECT_URI = "objectUri";
+    final static String OBJECT_CSID = "objectCsid";
+    final static String OBJECT_REFNAME = "objectRefName";
 }
 
 
diff --git a/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java b/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java
index c86964019..fcf9b7958 100644
--- a/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java
+++ b/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java
@@ -174,7 +174,7 @@ public class RelationDocumentModelHandler
         //Object o1 =  docModel.getProperty(ctx.getCommonPartLabel(), "subject");
         //Object o2 =  docModel.getProperty(ctx.getCommonPartLabel(), "object");
 
-        String subjectUri = (String) docModel.getProperty(ctx.getCommonPartLabel(), RelationJAXBSchema.subjectUri);
+        String subjectUri = (String) docModel.getProperty(ctx.getCommonPartLabel(), RelationJAXBSchema.SUBJECT_URI);
         subject.setUri(subjectUri);
         relationListItem.setSubject(subject);
 
@@ -182,7 +182,7 @@ public class RelationDocumentModelHandler
         String documentType2 = (String) docModel.getProperty(ctx.getCommonPartLabel(), RelationJAXBSchema.DOCUMENT_TYPE_2);
         RelationsDocListItem object = createRelationsDocListItem(ctx, sbt, objectCsid, tReader, documentType2);
 
-        String objectUri = (String) docModel.getProperty(ctx.getCommonPartLabel(), RelationJAXBSchema.objectUri);
+        String objectUri = (String) docModel.getProperty(ctx.getCommonPartLabel(), RelationJAXBSchema.OBJECT_URI);
         object.setUri(objectUri);
         relationListItem.setObject(object);