From 12b933fa329dae45662f4f06eba9d03995e86154 Mon Sep 17 00:00:00 2001
From: bdc34 <bdc34@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Wed, 21 Jul 2010 18:47:00 +0000
Subject: [PATCH] merging code to deal with duplicate international areas.

---
 .../controller/EntityMergedPropertyListController.java      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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 e74a2b140..a75b152b9 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/EntityMergedPropertyListController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/EntityMergedPropertyListController.java
@@ -492,7 +492,11 @@ public class EntityMergedPropertyListController extends VitroHttpServlet {
 						stmtsForClass.add(stmt);
 					}
 				}
-
+				
+				//bdc34: What do we do if a object individual is directly asserted to two different
+				//types?  For now we just show them in whichever type shows up first. related to NIHVIVO-876
+				orgStmtList.removeAll(stmtsForClass);				
+				
 				Collections.sort(stmtsForClass,
 						new Comparator<ObjectPropertyStatement>() {
 							public int compare(ObjectPropertyStatement o1,