From: Richard Millet <remillet@berkeley.edu>
Date: Thu, 3 May 2012 20:13:58 +0000 (-0700)
Subject: CSPACE-5130: Removing methods that created computed display names.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=ee242a77ff1369173034a5b74ebdafda28a10e65;p=tmp%2Fjakarta-migration.git

CSPACE-5130: Removing methods that created computed display names.
---

diff --git a/services/location/service/src/main/java/org/collectionspace/services/location/nuxeo/LocationDocumentModelHandler.java b/services/location/service/src/main/java/org/collectionspace/services/location/nuxeo/LocationDocumentModelHandler.java
index b761b6de9..d9f9eb356 100644
--- a/services/location/service/src/main/java/org/collectionspace/services/location/nuxeo/LocationDocumentModelHandler.java
+++ b/services/location/service/src/main/java/org/collectionspace/services/location/nuxeo/LocationDocumentModelHandler.java
@@ -63,30 +63,30 @@ public class LocationDocumentModelHandler
      * @param docModel the doc model
      * @throws Exception the exception
      */
-    @Override
-    protected void handleComputedDisplayNames(DocumentModel docModel) throws Exception {
-    	String commonPartLabel = getServiceContext().getCommonPartLabel("locations");
-    	Boolean displayNameComputed = (Boolean) docModel.getProperty(commonPartLabel,
-    			LocationJAXBSchema.DISPLAY_NAME_COMPUTED);
-    	Boolean shortDisplayNameComputed = (Boolean) docModel.getProperty(commonPartLabel,
-    			LocationJAXBSchema.SHORT_DISPLAY_NAME_COMPUTED);
-    	if(displayNameComputed==null)
-    		displayNameComputed = true;
-    	if(shortDisplayNameComputed==null)
-    		shortDisplayNameComputed = true;
-    	if (displayNameComputed || shortDisplayNameComputed) {
-    		String displayName = prepareDefaultDisplayName(
-			(String)docModel.getProperty(commonPartLabel, LocationJAXBSchema.NAME ));
-    		if (displayNameComputed) {
-    			docModel.setProperty(commonPartLabel, LocationJAXBSchema.DISPLAY_NAME,
-    					displayName);
-    		}
-    		if (shortDisplayNameComputed) {
-    			docModel.setProperty(commonPartLabel, LocationJAXBSchema.SHORT_DISPLAY_NAME,
-    					displayName);
-    		}
-    	}
-    }
+//    @Override
+//    protected void handleComputedDisplayNames(DocumentModel docModel) throws Exception {
+//    	String commonPartLabel = getServiceContext().getCommonPartLabel("locations");
+//    	Boolean displayNameComputed = (Boolean) docModel.getProperty(commonPartLabel,
+//    			LocationJAXBSchema.DISPLAY_NAME_COMPUTED);
+//    	Boolean shortDisplayNameComputed = (Boolean) docModel.getProperty(commonPartLabel,
+//    			LocationJAXBSchema.SHORT_DISPLAY_NAME_COMPUTED);
+//    	if(displayNameComputed==null)
+//    		displayNameComputed = true;
+//    	if(shortDisplayNameComputed==null)
+//    		shortDisplayNameComputed = true;
+//    	if (displayNameComputed || shortDisplayNameComputed) {
+//    		String displayName = prepareDefaultDisplayName(
+//			(String)docModel.getProperty(commonPartLabel, LocationJAXBSchema.NAME ));
+//    		if (displayNameComputed) {
+//    			docModel.setProperty(commonPartLabel, LocationJAXBSchema.DISPLAY_NAME,
+//    					displayName);
+//    		}
+//    		if (shortDisplayNameComputed) {
+//    			docModel.setProperty(commonPartLabel, LocationJAXBSchema.SHORT_DISPLAY_NAME,
+//    					displayName);
+//    		}
+//    	}
+//    }
 	
     /**
      * Produces a default displayName from the basic name and dates fields.
diff --git a/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrganizationDocumentModelHandler.java b/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrganizationDocumentModelHandler.java
index f14fefddf..ae52e6373 100644
--- a/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrganizationDocumentModelHandler.java
+++ b/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrganizationDocumentModelHandler.java
@@ -64,36 +64,36 @@ public class OrganizationDocumentModelHandler
      * 
      * @throws Exception the exception
      */
-    @Override
-    protected void handleComputedDisplayNames(DocumentModel docModel) throws Exception {
-    	String commonPartLabel = getServiceContext().getCommonPartLabel("organizations");
-    	Boolean displayNameComputed = (Boolean) docModel.getProperty(commonPartLabel,
-    			OrganizationJAXBSchema.DISPLAY_NAME_COMPUTED);
-    	Boolean shortDisplayNameComputed = (Boolean) docModel.getProperty(commonPartLabel,
-    			OrganizationJAXBSchema.SHORT_DISPLAY_NAME_COMPUTED);
-    	if(displayNameComputed==null)
-    		displayNameComputed = Boolean.TRUE;
-    	if(shortDisplayNameComputed==null)
-    		shortDisplayNameComputed = Boolean.TRUE;
-    	if (displayNameComputed.booleanValue() || shortDisplayNameComputed.booleanValue()) {
-        	String shortName = getStringValueInPrimaryRepeatingComplexProperty(
-        			docModel, commonPartLabel, OrganizationJAXBSchema.MAIN_BODY_GROUP_LIST, 
-        			OrganizationJAXBSchema.SHORT_NAME);
-            // FIXME: Determine how to handle cases where primary short name is null or empty.
-    		if(shortDisplayNameComputed.booleanValue()) {
-	    		String displayName = prepareDefaultDisplayName(shortName, null);
-	    		docModel.setProperty(commonPartLabel, OrganizationJAXBSchema.SHORT_DISPLAY_NAME,
-	    				displayName);
-    		}
-    		if(displayNameComputed.booleanValue()) {
-            	String foundingPlace = (String) docModel.getProperty(commonPartLabel,
-						OrganizationJAXBSchema.FOUNDING_PLACE);
-	       		String displayName = prepareDefaultDisplayName(shortName, foundingPlace);
-				docModel.setProperty(commonPartLabel, OrganizationJAXBSchema.DISPLAY_NAME,
-							displayName);
-    		}
-    	}
-    }
+//    @Override
+//    protected void handleComputedDisplayNames(DocumentModel docModel) throws Exception {
+//    	String commonPartLabel = getServiceContext().getCommonPartLabel("organizations");
+//    	Boolean displayNameComputed = (Boolean) docModel.getProperty(commonPartLabel,
+//    			OrganizationJAXBSchema.DISPLAY_NAME_COMPUTED);
+//    	Boolean shortDisplayNameComputed = (Boolean) docModel.getProperty(commonPartLabel,
+//    			OrganizationJAXBSchema.SHORT_DISPLAY_NAME_COMPUTED);
+//    	if(displayNameComputed==null)
+//    		displayNameComputed = Boolean.TRUE;
+//    	if(shortDisplayNameComputed==null)
+//    		shortDisplayNameComputed = Boolean.TRUE;
+//    	if (displayNameComputed.booleanValue() || shortDisplayNameComputed.booleanValue()) {
+//        	String shortName = getStringValueInPrimaryRepeatingComplexProperty(
+//        			docModel, commonPartLabel, OrganizationJAXBSchema.MAIN_BODY_GROUP_LIST, 
+//        			OrganizationJAXBSchema.SHORT_NAME);
+//            // FIXME: Determine how to handle cases where primary short name is null or empty.
+//    		if(shortDisplayNameComputed.booleanValue()) {
+//	    		String displayName = prepareDefaultDisplayName(shortName, null);
+//	    		docModel.setProperty(commonPartLabel, OrganizationJAXBSchema.SHORT_DISPLAY_NAME,
+//	    				displayName);
+//    		}
+//    		if(displayNameComputed.booleanValue()) {
+//            	String foundingPlace = (String) docModel.getProperty(commonPartLabel,
+//						OrganizationJAXBSchema.FOUNDING_PLACE);
+//	       		String displayName = prepareDefaultDisplayName(shortName, foundingPlace);
+//				docModel.setProperty(commonPartLabel, OrganizationJAXBSchema.DISPLAY_NAME,
+//							displayName);
+//    		}
+//    	}
+//    }
 
     /**
      * Produces a default displayName from the basic name and foundingPlace fields.