From b78d6ed883f123ea84d032844b32adce4d406624 Mon Sep 17 00:00:00 2001
From: bdc34 <bdc34@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Mon, 7 Feb 2011 17:56:16 +0000
Subject: [PATCH] Changing IndividualSDB.getMoniker() to return empty string
 and never null. NIHVIVO-2061

---
 .../vitro/webapp/dao/jena/IndividualSDB.java  | 48 +++----------------
 1 file changed, 6 insertions(+), 42 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB.java
index 76866c32e..cfb5f6b72 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB.java
@@ -587,48 +587,12 @@ public class IndividualSDB extends IndividualImpl implements Individual {
                 moniker = webappDaoFactory.getJenaBaseDao()
                         .getPropertyStringValue(
                                 ind,webappDaoFactory.getJenaBaseDao().MONIKER);
-                //Changing behavior to moniker because it is taking extra time to get the vclass
-                //alternative if the moniker isn't filled out.  That time is wasted if the vclass alternative isn't desired.
-                //see NIHVIVO-2001
-//                if (moniker == null) {                   
-//                	try {
-//                        // trying to deal with the fact that an entity 
-//                	    // may have more than 1 VClass
-//                        List<VClass> clasList = this.getVClasses(true);
-//                        if (clasList == null || clasList.size() < 2) {
-//                            if( getVClass() != null )
-//                                moniker = getVClass().getName();
-//                        } else {
-//                            VClass preferredClass = null;
-//                            for (VClass clas : clasList) {
-//                                if (clas.getCustomDisplayView() != null 
-//                                        && clas.getCustomDisplayView()
-//                                                .length()>0) {
-//                                    // arbitrarily deciding that the 
-//                                    // preferred class (could be >1) 
-//                                    // is one with a custom view
-//                                    preferredClass = clas;
-//                                    log.debug("Found direct class [" +
-//                                            clas.getName() + 
-//                                            "] with custom view " +
-//                                            clas.getCustomDisplayView() + 
-//                                            "; resetting entity vClass " +
-//                                            "to this class");
-//                                }
-//                            }
-//                            if (preferredClass == null) {
-//                                // no basis for selecting a preferred 
-//                                // class name to use
-//                                moniker = null; 
-//                                        // was this.getVClass().getName();
-//                            } else {
-//                                 preferredClass.getName();
-//                            }
-//                        }
-//                	} catch (Exception e) {
-//                		log.error(e,e);
-//                	}
-//                }
+                if (moniker == null) {
+                    //Changing behavior to moniker because it is taking extra time to get the vclass
+                    //alternative if the moniker isn't filled out.  That time is wasted if the vclass alternative isn't desired.
+                    //see NIHVIVO-2001
+                      moniker = "";
+                  }                
                 return moniker;
             } finally {
             	ind.getOntModel().leaveCriticalSection();