From 7b3b9d27e8530c6476fb133cd7d13da1d8ab313c Mon Sep 17 00:00:00 2001
From: jeb228 <jeb228@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Wed, 30 Jun 2010 18:39:35 +0000
Subject: [PATCH] NIHVIVO-161 Don't show "main image" as an object propety in
 the editing list.

---
 .../EntityMergedPropertyListController.java     | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/EntityMergedPropertyListController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/EntityMergedPropertyListController.java
index aefb940ec..e74a2b140 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/EntityMergedPropertyListController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/EntityMergedPropertyListController.java
@@ -4,6 +4,7 @@ package edu.cornell.mannlib.vitro.webapp.controller;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
@@ -36,6 +37,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.PropertyGroupDao;
 import edu.cornell.mannlib.vitro.webapp.dao.PropertyInstanceDao;
+import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.servlet.setup.PropertyMaskingSetup;
 
@@ -57,8 +59,13 @@ public class EntityMergedPropertyListController extends VitroHttpServlet {
      */
     
     private static final Log log = LogFactory.getLog(EntityMergedPropertyListController.class.getName());
-    private static final int MAX_GROUP_DISPLAY_RANK = 99;
-    
+    private static final int MAX_GROUP_DISPLAY_RANK = 99;
+    
+    /** Don't include these properties in the list. */
+	private static final Collection<String> SUPPRESSED_OBJECT_PROPERTIES = Collections
+			.unmodifiableCollection(Arrays
+					.asList(new String[] { VitroVocabulary.IND_MAIN_IMAGE }));
+
     public void doGet( HttpServletRequest request, HttpServletResponse res )
     throws IOException, ServletException {
     	
@@ -108,8 +115,10 @@ public class EntityMergedPropertyListController extends VitroHttpServlet {
             // now first get the properties this entity actually has, presumably populated with statements 
             List<ObjectProperty> objectPropertyList = subject.getObjectPropertyList();
             for (ObjectProperty op : objectPropertyList) {
-                op.setEditLabel(op.getDomainPublic());
-                mergedPropertyList.add(op);
+            	if (!SUPPRESSED_OBJECT_PROPERTIES.contains(op)) {
+                    op.setEditLabel(op.getDomainPublic());
+                    mergedPropertyList.add(op);
+            	}
             }
             
             if (editMode) {