From: Richard Millet <remillet@berkeley.edu>
Date: Thu, 17 May 2012 20:26:17 +0000 (-0700)
Subject: CSPACE-5129: Minor changes to support repository session sharing during call to get... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=3fdb71eb0dd27d638b12a09b27fe8a0befec41cc;p=tmp%2Fjakarta-migration.git

CSPACE-5129: Minor changes to support repository session sharing during call to get authority item showing relations
---

diff --git a/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java b/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java
index b9979ecb7..30a95a63b 100644
--- a/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java
+++ b/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java
@@ -1212,7 +1212,7 @@ public abstract class AuthorityItemDocumentModelHandler<AICommon>
         queryParams.putSingle(IRelationsManager.SUBJECT_QP, subjectCSID);
         queryParams.putSingle(IRelationsManager.OBJECT_QP, objectCSID);
 
-        RelationResource relationResource = new RelationResource();
+        RelationResource relationResource = new RelationResource(); //is this still acting like a singleton as it should be?
         RelationsCommonList relationsCommonList = relationResource.getList(ctx.getUriInfo());
         return relationsCommonList;
     }
diff --git a/services/relation/service/src/main/java/org/collectionspace/services/relation/RelationResource.java b/services/relation/service/src/main/java/org/collectionspace/services/relation/RelationResource.java
index 1bc19d1a6..05c60e2c3 100644
--- a/services/relation/service/src/main/java/org/collectionspace/services/relation/RelationResource.java
+++ b/services/relation/service/src/main/java/org/collectionspace/services/relation/RelationResource.java
@@ -83,8 +83,7 @@ public class RelationResource extends ResourceBase {
 		return this.getRelationList(queryParams, subjectCsid, subjectType, predicate, objectCsid, objectType);
 	}
 
-    //this is called by collectionobjectresource...so it is still public.
-    public RelationsCommonList getRelationList(MultivaluedMap<String, String> queryParams, String subjectCsid, String subjectType,
+    private RelationsCommonList getRelationList(MultivaluedMap<String, String> queryParams, String subjectCsid, String subjectType,
                                                                          String predicate, String objectCsid, String objectType) throws WebApplicationException {
         try {
             ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = createServiceContext(queryParams);
diff --git a/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyItemDocumentModelHandler.java b/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyItemDocumentModelHandler.java
index 369015619..b59bf2dca 100644
--- a/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyItemDocumentModelHandler.java
+++ b/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyItemDocumentModelHandler.java
@@ -74,7 +74,7 @@ public class VocabularyItemDocumentModelHandler
      */
 	@Override
 	protected String getPrimaryDisplayName(DocumentModel docModel,
-			String schema, String complexPropertyName, String fieldName) {
+			String schema, String complexPropertyName, String fieldName) { // ignore 'complexPropertyName', and 'fieldName' -use VocabularyItem specific alternatives instead.
 		String result = null;
 
 		try {