litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changing IndividualSDB.getMoniker() to return empty string and never null. NIHVIVO-2061

Browse source
This commit is contained in:
bdc34 2011-02-07 17:56:16 +00:00
parent a3345f4c53
commit b78d6ed883
1 changed files with 6 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB.java
View file

@ -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();