From e2c48e65f966b182a3ce2ede783b06dda0593317 Mon Sep 17 00:00:00 2001
From: brianjlowe <bjl23@cornell.edu>
Date: Tue, 8 Oct 2013 14:33:38 -0400
Subject: [PATCH] VIVO-303 picklist sorting

---
 .../cornell/mannlib/vedit/util/FormUtils.java | 22 +-------------
 .../edit/Classes2ClassesRetryController.java  |  4 +--
 .../edit/DatapropEditController.java          |  5 +++-
 .../Properties2PropertiesRetryController.java |  2 +-
 .../edit/PropertyEditController.java          | 30 +++++--------------
 .../edit/RefactorRetryController.java         |  4 +--
 .../ClassHierarchyListingController.java      |  4 +--
 ...ataPropertyHierarchyListingController.java |  6 ++--
 .../DatatypePropertiesListingController.java  |  4 +--
 ...ectPropertyHierarchyListingController.java |  6 ++--
 ...ectPropertyStatementListingController.java |  2 +-
 .../PropertyWebappsListingController.java     |  6 ++--
 .../VClassWebappsListingController.java       |  4 +--
 .../jena/RestrictionsListingController.java   |  2 +-
 .../ListDatatypePropertiesController.java     |  8 ++---
 .../ListPropertyWebappsController.java        |  4 +--
 .../ListVClassWebappsController.java          |  6 ++--
 .../ShowClassHierarchyController.java         | 18 ++++++-----
 .../ShowDataPropertyHierarchyController.java  | 19 ++++++------
 ...ShowObjectPropertyHierarchyController.java | 18 +++++------
 .../webapp/dao/jena/DataPropertyDaoJena.java  |  2 +-
 .../dao/jena/ObjectPropertyDaoJena.java       |  3 +-
 .../webapp/dao/jena/WebappDaoFactoryJena.java |  8 +++--
 .../templates/edit/specific/classes_edit.jsp  | 18 +++++------
 .../edit/specific/dataprops_edit.jsp          |  6 ++--
 .../templates/edit/specific/props_edit.jsp    |  6 ++--
 26 files changed, 94 insertions(+), 123 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vedit/util/FormUtils.java b/webapp/src/edu/cornell/mannlib/vedit/util/FormUtils.java
index 5c65da7c0..c28ebf2a6 100644
--- a/webapp/src/edu/cornell/mannlib/vedit/util/FormUtils.java
+++ b/webapp/src/edu/cornell/mannlib/vedit/util/FormUtils.java
@@ -239,27 +239,7 @@ public class FormUtils {
         for (VClass vclass : wadf.getVClassDao().getAllVclasses()) {
         	Option option = new Option();
         	option.setValue(vclass.getURI());
-        	if ( (selectedVClassURI != null) 
-        			&& (vclass.getURI() != null) 
-        			&& (selectedVClassURI.equals(vclass.getURI())) ) {
-        		option.setSelected(true);
-        	}
-        	String ontologyPrefix = null;
-        	if (vclass.getNamespace() != null) {
-        		Ontology ont = wadf.getOntologyDao().getOntologyByURI(
-        				vclass.getNamespace());
-        		if ( (ont != null) && (ont.getPrefix() != null) ) {
-        			ontologyPrefix = ont.getPrefix();
-        		}
-        	}
-        	StringBuffer classNameBuffer = new StringBuffer();
-        	if (ontologyPrefix != null) {
-        		classNameBuffer.append(ontologyPrefix).append(":");
-        	}
-        	if (vclass.getName() != null) {
-        		classNameBuffer.append(vclass.getName());
-        	}
-        	option.setBody(classNameBuffer.toString());
+        	option.setBody(vclass.getPickListName());
         	vclassOptionList.add(option);
         }
         return vclassOptionList;
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesRetryController.java
index f724e82b1..94318919a 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesRetryController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesRetryController.java
@@ -60,8 +60,8 @@ public class Classes2ClassesRetryController extends BaseEditController {
         populateBeanFromParams(objectForEditing, request);
 
         HashMap hash = new HashMap();
-        hash.put("SuperclassURI", FormUtils.makeOptionListFromBeans(vcDao.getAllVclasses(),"URI","LocalNameWithPrefix",objectForEditing.getSuperclassURI(),null));
-        hash.put("SubclassURI", FormUtils.makeOptionListFromBeans(vcDao.getAllVclasses(),"URI","LocalNameWithPrefix",objectForEditing.getSubclassURI(),null));
+        hash.put("SuperclassURI", FormUtils.makeOptionListFromBeans(vcDao.getAllVclasses(),"URI","PickListName",objectForEditing.getSuperclassURI(),null));
+        hash.put("SubclassURI", FormUtils.makeOptionListFromBeans(vcDao.getAllVclasses(),"URI","PickListName",objectForEditing.getSubclassURI(),null));
 
         FormObject foo = new FormObject();
         foo.setOptionLists(hash);
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java
index 301611599..732b62be8 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java
@@ -24,6 +24,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean;
 import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
 import edu.cornell.mannlib.vitro.webapp.beans.Ontology;
 import edu.cornell.mannlib.vitro.webapp.beans.PropertyGroup;
+import edu.cornell.mannlib.vitro.webapp.beans.VClass;
 import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao;
@@ -101,7 +102,9 @@ public class DatapropEditController extends BaseEditController {
         // TODO - need unionOf/intersectionOf-style domains for domain class
         String domainStr="";
         try {
-            domainStr = (dp.getDomainClassURI() == null) ? "" : "<a href=\"vclassEdit?uri="+URLEncoder.encode(dp.getDomainClassURI(),"UTF-8")+"\">"+dp.getDomainClassURI()+"</a>";
+            VClass domainClass = getWebappDaoFactory().getVClassDao().getVClassByURI(dp.getDomainClassURI());
+            String domainLinkAnchor = (domainClass != null) ? domainClass.getPickListName() : dp.getDomainClassURI();
+            domainStr = (dp.getDomainClassURI() == null) ? "" : "<a href=\"vclassEdit?uri="+URLEncoder.encode(dp.getDomainClassURI(),"UTF-8")+"\">"+domainLinkAnchor+"</a>";
         } catch (UnsupportedEncodingException e) {
             log.error(e, e);
         }
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesRetryController.java
index 1700983ae..6d1633ad8 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesRetryController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesRetryController.java
@@ -59,7 +59,7 @@ public class Properties2PropertiesRetryController extends BaseEditController {
     	? dpDao.getAllDataProperties()
     	: opDao.getAllObjectProperties();
         
-    	Collections.sort(propList);
+    	sortForPickList(propList, request);
     	
     	 String superpropertyURIstr = request.getParameter("SuperpropertyURI");
          String subpropertyURIstr = request.getParameter("SubpropertyURI");
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyEditController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyEditController.java
index 106564297..accb66cb7 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyEditController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyEditController.java
@@ -86,7 +86,7 @@ public class PropertyEditController extends BaseEditController {
         	ObjectProperty parent = propDao.getObjectPropertyByURI(p.getParentURI());
         	if (parent != null && parent.getURI() != null) {
         		try {
-        			parentPropertyStr = "<a href=\"propertyEdit?uri="+URLEncoder.encode(parent.getURI(),"UTF-8")+"\">"+parent.getLocalNameWithPrefix()+"</a>";
+        			parentPropertyStr = "<a href=\"propertyEdit?uri="+URLEncoder.encode(parent.getURI(),"UTF-8")+"\">"+parent.getPickListName()+"</a>";
         		} catch (UnsupportedEncodingException e) {
         		    log.error(e, e);
         		}
@@ -121,12 +121,12 @@ public class PropertyEditController extends BaseEditController {
         String domainStr = ""; 
         if (p.getDomainVClassURI() != null) {
         	VClass domainClass = vcDao.getVClassByURI(p.getDomainVClassURI());
-        	if (domainClass != null && domainClass.getURI() != null && domainClass.getLocalNameWithPrefix() != null) {
+        	if (domainClass != null && domainClass.getURI() != null && domainClass.getPickListName() != null) {
         		try {
         			if (domainClass.isAnonymous()) {
-        				domainStr = domainClass.getLocalNameWithPrefix();
+        				domainStr = domainClass.getPickListName();
         			} else {
-        				domainStr = "<a href=\"vclassEdit?uri="+URLEncoder.encode(domainClass.getURI(),"UTF-8")+"\">"+domainClass.getLocalNameWithPrefix()+"</a>";
+        				domainStr = "<a href=\"vclassEdit?uri="+URLEncoder.encode(domainClass.getURI(),"UTF-8")+"\">"+domainClass.getPickListName()+"</a>";
         			}
         		} catch (UnsupportedEncodingException e) {
         		    log.error(e, e);
@@ -138,12 +138,12 @@ public class PropertyEditController extends BaseEditController {
         String rangeStr = ""; 
         if (p.getRangeVClassURI() != null) {
         	VClass rangeClass = vcDao.getVClassByURI(p.getRangeVClassURI());
-        	if (rangeClass != null && rangeClass.getURI() != null && rangeClass.getLocalNameWithPrefix() != null) {
+        	if (rangeClass != null && rangeClass.getURI() != null && rangeClass.getPickListName() != null) {
         		try {
         			if (rangeClass.isAnonymous()) {
-        				rangeStr = rangeClass.getLocalNameWithPrefix();
+        				rangeStr = rangeClass.getPickListName();
         			} else {
-        				rangeStr = "<a href=\"vclassEdit?uri="+URLEncoder.encode(rangeClass.getURI(),"UTF-8")+"\">"+rangeClass.getLocalNameWithPrefix()+"</a>";
+        				rangeStr = "<a href=\"vclassEdit?uri="+URLEncoder.encode(rangeClass.getURI(),"UTF-8")+"\">"+rangeClass.getPickListName()+"</a>";
         			}
         		} catch (UnsupportedEncodingException e) {
         		    log.error(e, e);
@@ -175,22 +175,6 @@ public class PropertyEditController extends BaseEditController {
         results.add(p.getSelectFromExisting() ? "true" : "false");   // column 21
         results.add(p.getOfferCreateNewOption() ? "true" : "false"); // column 22
         
-        /*
-        String datapropStr = ""; 
-        if (p.getObjectIndividualSortPropertyURI() != null) {
-            DataProperty dProp = dpDao.getDataPropertyByURI(p.getObjectIndividualSortPropertyURI());
-            if (dProp != null && dProp.getURI() != null && dProp.getLocalNameWithPrefix() != null) {
-                try {
-                    datapropStr = "<a href=\"datapropEdit?uri="+URLEncoder.encode(dProp.getURI(),"UTF-8")+"\">"+dProp.getLocalNameWithPrefix()+"</a>";
-                } catch (UnsupportedEncodingException e) {
-                    e.printStackTrace();
-                }
-            }
-            results.add(datapropStr); // column 16
-        } else {
-            results.add("name (rdfs:label)"); // column 16
-        }
-        */
         results.add(p.getDomainEntitySortDirection() == null ? "ascending" : p.getDomainEntitySortDirection()); // column 23
 
         results.add(p.getURI()); // column 24
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorRetryController.java
index e4859f349..7aaefe2b7 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorRetryController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorRetryController.java
@@ -54,7 +54,7 @@ public class RefactorRetryController extends BaseEditController {
 		epo.setFormObject(foo);
 		HashMap<String,List<Option>> optMap = new HashMap<String,List<Option>>();
 		foo.setOptionLists(optMap);
-		List<Option> subjectClassOpts = FormUtils.makeOptionListFromBeans(request.getUnfilteredWebappDaoFactory().getVClassDao().getAllVclasses(),"URI","Name", null, null);
+		List<Option> subjectClassOpts = FormUtils.makeOptionListFromBeans(request.getUnfilteredWebappDaoFactory().getVClassDao().getAllVclasses(),"URI","PickListName", null, null);
 		subjectClassOpts.add(0,new Option("","? wildcard",true));
 		optMap.put("SubjectClassURI", subjectClassOpts);
 		optMap.put("ObjectClassURI", subjectClassOpts);
@@ -90,7 +90,7 @@ public class RefactorRetryController extends BaseEditController {
 		epo.setFormObject(foo);
 		HashMap<String,List<Option>> optMap = new HashMap<String,List<Option>>();
 		foo.setOptionLists(optMap);
-		List<Option> newClassURIopts = FormUtils.makeOptionListFromBeans(request.getUnfilteredWebappDaoFactory().getVClassDao().getAllVclasses(),"URI","LocalNameWithPrefix", null, null);
+		List<Option> newClassURIopts = FormUtils.makeOptionListFromBeans(request.getUnfilteredWebappDaoFactory().getVClassDao().getAllVclasses(),"URI","PickListName", null, null);
 		newClassURIopts.add(new Option ("","move to trash"));
 		optMap.put("NewVClassURI", newClassURIopts);
 		request.setAttribute("editAction","refactorOp");
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ClassHierarchyListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ClassHierarchyListingController.java
index 94f1e0bb0..27fcce879 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ClassHierarchyListingController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ClassHierarchyListingController.java
@@ -201,9 +201,9 @@ public class ClassHierarchyListingController extends BaseEditController {
             Integer numCols = (NUM_COLS-1)-position;
 
             try {
-                numCols = addColToResults(((vcw.getLocalNameWithPrefix() == null) ? "" : "<a href=\"vclassEdit?uri="+URLEncoder.encode(vcw.getURI(),"UTF-8")+"\">"+vcw.getLocalNameWithPrefix()+"</a>"), results, numCols);
+                numCols = addColToResults(((vcw.getPickListName() == null) ? "" : "<a href=\"vclassEdit?uri="+URLEncoder.encode(vcw.getURI(),"UTF-8")+"\">"+vcw.getPickListName()+"</a>"), results, numCols);
             } catch (Exception e) {
-                numCols = addColToResults(((vcw.getLocalNameWithPrefix() == null) ? "" : vcw.getLocalNameWithPrefix()), results, numCols); // column 2
+                numCols = addColToResults(((vcw.getPickListName() == null) ? "" : vcw.getPickListName()), results, numCols); // column 2
             }
             numCols = addColToResults(((vcw.getShortDef() == null) ? "" : vcw.getShortDef()), results, numCols); // column 3
             numCols = addColToResults(((vcw.getExample() == null) ? "" : vcw.getExample()), results, numCols); // column 4
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/DataPropertyHierarchyListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/DataPropertyHierarchyListingController.java
index 02c5792e5..5b1ab3dc1 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/DataPropertyHierarchyListingController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/DataPropertyHierarchyListingController.java
@@ -187,13 +187,13 @@ public class DataPropertyHierarchyListingController extends BaseEditController {
 
             String nameStr = dp.getPublicName()==null ? dp.getName()==null ? dp.getURI()==null ? "(no name)" : dp.getURI() : dp.getName() : dp.getPublicName();
             try {
-                numCols=addColToResults("<a href=\"datapropEdit?uri="+URLEncoder.encode(dp.getURI(),"UTF-8")+"\">"+nameStr+"</a> <span style='font-style:italic; color:\"grey\";'>"+dp.getLocalNameWithPrefix()+"</span>",results,numCols); // column 2
+                numCols=addColToResults("<a href=\"datapropEdit?uri="+URLEncoder.encode(dp.getURI(),"UTF-8")+"\">"+nameStr+"</a> <span style='font-style:italic; color:\"grey\";'>"+dp.getPickListName()+"</span>",results,numCols); // column 2
             } catch (Exception e) {
-                numCols=addColToResults(nameStr + " <i>" + dp.getLocalNameWithPrefix() + "</i>",results,numCols); // column 2
+                numCols=addColToResults(nameStr + " <i>" + dp.getPickListName() + "</i>",results,numCols); // column 2
             }
             VClass tmp = null;
             try {
-            	numCols = addColToResults((((tmp = vcDao.getVClassByURI(dp.getDomainClassURI())) != null && (tmp.getLocalNameWithPrefix() == null)) ? "" : vcDao.getVClassByURI(dp.getDomainClassURI()).getLocalNameWithPrefix()), results, numCols); // column 3
+            	numCols = addColToResults((((tmp = vcDao.getVClassByURI(dp.getDomainClassURI())) != null && (tmp.getPickListName() == null)) ? "" : vcDao.getVClassByURI(dp.getDomainClassURI()).getPickListName()), results, numCols); // column 3
             } catch (NullPointerException e) {
             	numCols = addColToResults("-",results,numCols);
             }
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/DatatypePropertiesListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/DatatypePropertiesListingController.java
index c17c85fbf..cdaf2a633 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/DatatypePropertiesListingController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/DatatypePropertiesListingController.java
@@ -111,9 +111,9 @@ public class DatatypePropertiesListingController extends BaseEditController {
                     results.add("XX"); // column 1
                     String nameStr = prop.getPublicName()==null ? prop.getName()==null ? prop.getURI()==null ? "(no name)" : prop.getURI() : prop.getName() : prop.getPublicName();
                     try {
-                        results.add("<a href=\"datapropEdit?uri="+URLEncoder.encode(prop.getURI(),"UTF-8")+"\">"+nameStr+"</a> <span style='font-style:italic; color:\"grey\";'>"+prop.getLocalNameWithPrefix()+"</span>"); // column 2
+                        results.add("<a href=\"datapropEdit?uri="+URLEncoder.encode(prop.getURI(),"UTF-8")+"\">"+nameStr+"</a> <span style='font-style:italic; color:\"grey\";'>"+prop.getPickListName()+"</span>"); // column 2
                     } catch (Exception e) {
-                        results.add(nameStr + " <span style='font-style:italic; color:\"grey\";'>" + prop.getLocalNameWithPrefix() + "</span>"); // column 2
+                        results.add(nameStr + " <span style='font-style:italic; color:\"grey\";'>" + prop.getPickListName() + "</span>"); // column 2
                     }
                     VClass vc = null;
                     String domainStr="";
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ObjectPropertyHierarchyListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ObjectPropertyHierarchyListingController.java
index 8aa60d5eb..458d88a68 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ObjectPropertyHierarchyListingController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ObjectPropertyHierarchyListingController.java
@@ -187,16 +187,16 @@ public class ObjectPropertyHierarchyListingController extends BaseEditController
             }
             
             numCols = addColToResults( ((hyperlink != null) ? hyperlink : getDisplayLabel(op)) 
-            		+ "<br/><span style='font-style:italic; color:\"grey\";'>"+op.getLocalNameWithPrefix()+"</span>", results, numCols); // column 2
+            		+ "<br/><span style='font-style:italic; color:\"grey\";'>"+op.getPickListName()+"</span>", results, numCols); // column 2
             
             VClass tmp = null;
             try {
-            	numCols = addColToResults((((tmp = vcDao.getVClassByURI(op.getDomainVClassURI())) != null && (tmp.getLocalNameWithPrefix() == null)) ? "" : vcDao.getVClassByURI(op.getDomainVClassURI()).getLocalNameWithPrefix()), results, numCols); // column 3
+            	numCols = addColToResults((((tmp = vcDao.getVClassByURI(op.getDomainVClassURI())) != null && (tmp.getPickListName() == null)) ? "" : vcDao.getVClassByURI(op.getDomainVClassURI()).getPickListName()), results, numCols); // column 3
             } catch (NullPointerException e) {
             	numCols = addColToResults("",results,numCols);
             }
             try {
-            	numCols = addColToResults((((tmp = vcDao.getVClassByURI(op.getRangeVClassURI())) != null && (tmp.getLocalNameWithPrefix() == null)) ? "" : vcDao.getVClassByURI(op.getRangeVClassURI()).getLocalNameWithPrefix()), results, numCols); // column 4
+            	numCols = addColToResults((((tmp = vcDao.getVClassByURI(op.getRangeVClassURI())) != null && (tmp.getPickListName() == null)) ? "" : vcDao.getVClassByURI(op.getRangeVClassURI()).getPickListName()), results, numCols); // column 4
             } catch (NullPointerException e) {
             	numCols = addColToResults("",results,numCols);
             }
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ObjectPropertyStatementListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ObjectPropertyStatementListingController.java
index c11f105e7..65f5a1086 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ObjectPropertyStatementListingController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ObjectPropertyStatementListingController.java
@@ -140,7 +140,7 @@ public class ObjectPropertyStatementListingController extends
         
         if (count == 0) {
         	results.add("XX");
-        	results.add("No statements found for property \""+op.getLocalNameWithPrefix()+"\"");
+        	results.add("No statements found for property \""+op.getPickListName()+"\"");
         	results.add("");
         	results.add("");
         	if (showVClasses) {
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/PropertyWebappsListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/PropertyWebappsListingController.java
index 9eb993bcd..23c1a7d27 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/PropertyWebappsListingController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/PropertyWebappsListingController.java
@@ -165,16 +165,16 @@ public class PropertyWebappsListingController extends BaseEditController {
                         results.add(propNameStr); // column 2
                     }
                     
-                    results.add(prop.getLocalNameWithPrefix()); // column 3
+                    results.add(prop.getPickListName()); // column 3
                     
                     VClass vc = (prop.getDomainVClassURI() != null) ?
                         vcDao.getVClassByURI(prop.getDomainVClassURI()) : null;
-                    String domainStr = (vc != null) ? vc.getLocalNameWithPrefix() : ""; 
+                    String domainStr = (vc != null) ? vc.getPickListName() : ""; 
                     results.add(domainStr); // column 4
                     
                     vc = (prop.getRangeVClassURI() != null) ?
                         vcDao.getVClassByURI(prop.getRangeVClassURI()) : null;
-                    String rangeStr = (vc != null) ? vc.getLocalNameWithPrefix() : ""; 
+                    String rangeStr = (vc != null) ? vc.getPickListName() : ""; 
                     results.add(rangeStr); // column 5
                     
                     if (prop.getGroupURI() != null) {
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/VClassWebappsListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/VClassWebappsListingController.java
index 971c211f9..a6fe7f87e 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/VClassWebappsListingController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/VClassWebappsListingController.java
@@ -79,9 +79,9 @@ public class VClassWebappsListingController extends BaseEditController {
 	                if (cls.getName() != null)
 	                    try {
 	                        //String className = (cls.getName()==null || cls.getName().length()==0) ? cls.getURI() : cls.getName();
-	                        results.add("<a href=\"./vclassEdit?uri="+URLEncoder.encode(cls.getURI(),"UTF-8")+"\">"+cls.getLocalNameWithPrefix()+"</a>");
+	                        results.add("<a href=\"./vclassEdit?uri="+URLEncoder.encode(cls.getURI(),"UTF-8")+"\">"+cls.getPickListName()+"</a>");
 	                    } catch (Exception e) {
-	                        results.add(cls.getLocalNameWithPrefix());
+	                        results.add(cls.getPickListName());
 	                    }
 	                else
 	                    results.add("");
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/RestrictionsListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/RestrictionsListingController.java
index a0117ba8c..a66731a89 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/RestrictionsListingController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/RestrictionsListingController.java
@@ -124,7 +124,7 @@ public class RestrictionsListingController extends BaseEditController {
 				results.add("XX");
 				Property onProperty = rest.getOnProperty();
 				ObjectProperty op = opDao.getObjectPropertyByURI(onProperty.getURI());
-				results.add(op.getLocalNameWithPrefix());
+				results.add(op.getPickListName());
 				if (rest.isAllValuesFromRestriction()) {
 					results.add("all values from");
 					AllValuesFromRestriction avfrest = (AllValuesFromRestriction) rest.as(AllValuesFromRestriction.class);
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListDatatypePropertiesController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListDatatypePropertiesController.java
index 56fc35a39..8ecbbd8a7 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListDatatypePropertiesController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListDatatypePropertiesController.java
@@ -92,7 +92,7 @@ public class ListDatatypePropertiesController extends FreemarkerHttpServlet {
             }
 
             if (props != null) {
-        	    Collections.sort(props);
+        	    sortForPickList(props, vreq);
             }
 
             String json = new String();
@@ -107,7 +107,7 @@ public class ListDatatypePropertiesController extends FreemarkerHttpServlet {
                             json += ", ";
                         }
                         
-                        String nameStr = prop.getPublicName()==null ? prop.getName()==null ? prop.getURI()==null ? "(no name)" : prop.getURI() : prop.getName() : prop.getPublicName();
+                        String nameStr = prop.getPickListName()==null ? prop.getName()==null ? prop.getURI()==null ? "(no name)" : prop.getURI() : prop.getName() : prop.getPublicName();
 
                         try {
                             json += "{ \"name\": " + JSONUtils.quote("<a href='datapropEdit?uri="+ URLEncoder.encode(prop.getURI())+"'>" + nameStr + "</a>") + ", "; 
@@ -115,7 +115,7 @@ public class ListDatatypePropertiesController extends FreemarkerHttpServlet {
                             json += "{ \"name\": " + JSONUtils.quote(nameStr) + ", ";
                         }
                         
-                        json += "\"data\": { \"internalName\": " + JSONUtils.quote(prop.getLocalNameWithPrefix()) + ", ";
+                        json += "\"data\": { \"internalName\": " + JSONUtils.quote(prop.getPickListName()) + ", ";
                         
 /*                        VClass vc = null;
                         String domainStr="";
@@ -131,7 +131,7 @@ public class ListDatatypePropertiesController extends FreemarkerHttpServlet {
                         }
 */                        
                         VClass vc = (prop.getDomainClassURI() != null) ? vcDao.getVClassByURI(prop.getDomainClassURI()) : null;
-                        String domainStr = (vc != null) ? vc.getLocalNameWithPrefix() : ""; 
+                        String domainStr = (vc != null) ? vc.getPickListName() : ""; 
                         json += "\"domainVClass\": " + JSONUtils.quote(domainStr) + ", " ;
 
                         Datatype rangeDatatype = dDao.getDatatypeByURI(prop.getRangeDatatypeURI());
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyWebappsController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyWebappsController.java
index 7550a1751..973f50c67 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyWebappsController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyWebappsController.java
@@ -161,11 +161,11 @@ public class ListPropertyWebappsController extends FreemarkerHttpServlet {
                          json += "\"data\": { \"internalName\": " + JSONUtils.quote(prop.getLocalNameWithPrefix()) + ", "; 
                     
                          VClass vc = (prop.getDomainVClassURI() != null) ? vcDao.getVClassByURI(prop.getDomainVClassURI()) : null;
-                         String domainStr = (vc != null) ? vc.getLocalNameWithPrefix() : ""; 
+                         String domainStr = (vc != null) ? vc.getPickListName() : ""; 
                          json += "\"domainVClass\": " + JSONUtils.quote(domainStr) + ", " ;
                     
                          vc = (prop.getRangeVClassURI() != null) ? vcDao.getVClassByURI(prop.getRangeVClassURI()) : null;
-                         String rangeStr = (vc != null) ? vc.getLocalNameWithPrefix() : ""; 
+                         String rangeStr = (vc != null) ? vc.getPickListName() : ""; 
                          json += "\"rangeVClass\": " + JSONUtils.quote(rangeStr) + ", " ; 
                     
                          if (prop.getGroupURI() != null) {
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListVClassWebappsController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListVClassWebappsController.java
index d07ea6743..d76ac897c 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListVClassWebappsController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListVClassWebappsController.java
@@ -69,7 +69,7 @@ public class ListVClassWebappsController extends FreemarkerHttpServlet {
         String ontologyURI = vreq.getParameter("ontologyUri");
 
         if (classes != null) {
-            Collections.sort(classes);
+            sortForPickList(classes, vreq);
             Iterator<VClass> classesIt = classes.iterator();
             while (classesIt.hasNext()) {
                 if ( counter > 0 ) {
@@ -79,9 +79,9 @@ public class ListVClassWebappsController extends FreemarkerHttpServlet {
                 if ( (ontologyURI==null) || ( (ontologyURI != null) && (cls.getNamespace()!=null) && (ontologyURI.equals(cls.getNamespace())) ) ) {
 	                if (cls.getName() != null)
 	                    try {
-	                        json += "{ \"name\": " + JSONUtils.quote("<a href='./vclassEdit?uri="+URLEncoder.encode(cls.getURI(),"UTF-8")+"'>"+cls.getLocalNameWithPrefix()+"</a>") + ", ";
+	                        json += "{ \"name\": " + JSONUtils.quote("<a href='./vclassEdit?uri="+URLEncoder.encode(cls.getURI(),"UTF-8")+"'>"+cls.getPickListName()+"</a>") + ", ";
 	                    } catch (Exception e) {
-	                        json += "{ \"name\": " + JSONUtils.quote(cls.getLocalNameWithPrefix()) + ", ";
+	                        json += "{ \"name\": " + JSONUtils.quote(cls.getPickListName()) + ", ";
 	                    }
 	                else
 	                    json += "{ \"name\": \"\"";
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowClassHierarchyController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowClassHierarchyController.java
index f703b4318..66ee023fc 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowClassHierarchyController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowClassHierarchyController.java
@@ -97,7 +97,7 @@ public class ShowClassHierarchyController extends FreemarkerHttpServlet {
         	roots.add(vreq.getUnfilteredWebappDaoFactory().getVClassDao()
         			.getTopConcept());
         }
-        Collections.sort(roots);
+        sortForPickList(roots, vreq);
         int counter = 0;
 
         Iterator<VClass> rootIt = roots.iterator();
@@ -109,7 +109,8 @@ public class ShowClassHierarchyController extends FreemarkerHttpServlet {
             while (rootIt.hasNext()) {
                 VClass root = (VClass) rootIt.next();
 	            if (root != null) {
-	                json += addChildren(vreq.getUnfilteredWebappDaoFactory(), root, 0, ontologyUri,counter);
+	                json += addChildren(vreq.getUnfilteredWebappDaoFactory(), 
+	                        root, 0, ontologyUri, counter, vreq);
 	                counter += 1;
                 }
             }
@@ -123,7 +124,8 @@ public class ShowClassHierarchyController extends FreemarkerHttpServlet {
         return new TemplateResponseValues(TEMPLATE_NAME, body);
     }
 
-    private String addChildren(WebappDaoFactory wadf, VClass parent, int position, String ontologyUri, int counter) {
+    private String addChildren(WebappDaoFactory wadf, VClass parent, int position, 
+            String ontologyUri, int counter, VitroRequest vreq) {
         String rowElts = addVClassDataToResultsList(wadf, parent, position, ontologyUri, counter);
     	int childShift = (rowElts.length() > 0) ? 1 : 0;  // if addVClassDataToResultsList filtered out the result, don't shift the children over 
         int length = rowElts.length();
@@ -142,11 +144,11 @@ public class ShowClassHierarchyController extends FreemarkerHttpServlet {
                     }
                 } catch (Exception e) {}
             }
-            Collections.sort(childClasses);
+            sortForPickList(childClasses, vreq);
             Iterator<VClass> childClassIt = childClasses.iterator();
             while (childClassIt.hasNext()) {
                 VClass child = (VClass) childClassIt.next();
-                leaves += addChildren(wadf, child, position + childShift, ontologyUri, counter);
+                leaves += addChildren(wadf, child, position + childShift, ontologyUri, counter, vreq);
                 if (!childClassIt.hasNext()) {
                     if ( ontologyUri == null ) {
                         leaves += " }] ";
@@ -197,10 +199,10 @@ public class ShowClassHierarchyController extends FreemarkerHttpServlet {
             try {
                 tempString += JSONUtils.quote("<a href='vclassEdit?uri=" + 
                         URLEncoder.encode(vcw.getURI(),"UTF-8") + "'>" + 
-                        vcw.getLocalNameWithPrefix() + "</a>") +", ";
+                        vcw.getPickListName() + "</a>") +", ";
             } catch (Exception e) {
-                 tempString += JSONUtils.quote(((vcw.getLocalNameWithPrefix() == null) 
-                         ? "" : vcw.getLocalNameWithPrefix())) + ", ";
+                 tempString += JSONUtils.quote(((vcw.getPickListName() == null) 
+                         ? "" : vcw.getPickListName())) + ", ";
             }
 
             String shortDef = ((vcw.getShortDef() == null) ? "" : vcw.getShortDef()) ;
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowDataPropertyHierarchyController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowDataPropertyHierarchyController.java
index 7c5dcf90a..87509254e 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowDataPropertyHierarchyController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowDataPropertyHierarchyController.java
@@ -94,7 +94,7 @@ public class ShowDataPropertyHierarchyController extends FreemarkerHttpServlet {
             } else {
                 roots = dpDao.getRootDataProperties();
                 if (roots!=null){
-                    Collections.sort(roots);
+                    sortForPickList(roots, vreq);
                 }
             }
 
@@ -113,7 +113,7 @@ public class ShowDataPropertyHierarchyController extends FreemarkerHttpServlet {
                     while (rootIt.hasNext()) {
                         DataProperty root = rootIt.next();
                         if ( (ontologyUri==null) || ( (ontologyUri!=null) && (root.getNamespace()!=null) && (ontologyUri.equals(root.getNamespace())) ) ) {
-                    	    json += addChildren(root, 0, ontologyUri, counter);
+                    	    json += addChildren(root, 0, ontologyUri, counter, vreq);
                     	    counter += 1;
                 	    }
                     }	
@@ -132,7 +132,8 @@ public class ShowDataPropertyHierarchyController extends FreemarkerHttpServlet {
         return new TemplateResponseValues(TEMPLATE_NAME, body);
     }
 
-    private String addChildren(DataProperty parent, int position, String ontologyUri, int counter) {
+    private String addChildren(DataProperty parent, int position, String ontologyUri,
+            int counter, VitroRequest vreq) {
     	if (parent == null) {
     		return "";
     	}
@@ -149,11 +150,11 @@ public class ShowDataPropertyHierarchyController extends FreemarkerHttpServlet {
                 DataProperty child = dpDao.getDataPropertyByURI(URIstr);
                 childProps.add(child);
             }
-            Collections.sort(childProps);
+            sortForPickList(childProps, vreq);
             Iterator<DataProperty> childPropIt = childProps.iterator();
             while (childPropIt.hasNext()) {
                 DataProperty child = childPropIt.next();
-                leaves += addChildren(child, position+1, ontologyUri, counter);
+                leaves += addChildren(child, position+1, ontologyUri, counter, vreq);
                 if (!childPropIt.hasNext()) {
                     if ( ontologyUri == null ) {
                         leaves += " }] ";
@@ -204,7 +205,7 @@ public class ShowDataPropertyHierarchyController extends FreemarkerHttpServlet {
                 tempString += "}, { \"name\": ";
             }
 
-            String nameStr = dp.getPublicName() == null 
+            String nameStr = dp.getPickListName() == null 
                     ? dp.getName() == null 
                             ? dp.getURI() == null 
                                     ? "(no name)" : dp.getURI() : dp.getName() : dp.getPublicName();
@@ -214,17 +215,17 @@ public class ShowDataPropertyHierarchyController extends FreemarkerHttpServlet {
                             dp.getURI()) + "'>" + nameStr + "</a>") + ", ";                 
 
             tempString += "\"data\": { \"internalName\": " + JSONUtils.quote(
-                    dp.getLocalNameWithPrefix()) + ", ";
+                    dp.getPickListName()) + ", ";
 
             VClass tmp = null;
             try {
             	tempString += "\"domainVClass\": " + JSONUtils.quote(
             	        ((tmp = vcDao.getVClassByURI(dp.getDomainClassURI())) != null
-            	        && (tmp.getLocalNameWithPrefix() == null)) 
+            	        && (tmp.getPickListName() == null)) 
             	                ? "" 
             	                : vcDao.getVClassByURI(
             	                        dp.getDomainClassURI())
-            	                        .getLocalNameWithPrefix()) + ", " ;
+            	                        .getPickListName()) + ", " ;
             } catch (NullPointerException e) {
             	tempString += "\"domainVClass\": \"\",";
             }
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowObjectPropertyHierarchyController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowObjectPropertyHierarchyController.java
index 5fb2471f8..ecd728c55 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowObjectPropertyHierarchyController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowObjectPropertyHierarchyController.java
@@ -219,11 +219,11 @@ public class ShowObjectPropertyHierarchyController extends FreemarkerHttpServlet
             	tempString += "\"domainVClass\": " + JSONUtils.quote(
             	        ((tmp = vcDao.getVClassByURI(
             	                op.getDomainVClassURI())) != null 
-            	                && (tmp.getLocalNameWithPrefix() == null)) 
+            	                && (tmp.getPickListName() == null)) 
             	                        ? "" 
             	                        : vcDao.getVClassByURI(
             	                                op.getDomainVClassURI())
-            	                                .getLocalNameWithPrefix()) + ", " ;
+            	                                .getPickListName()) + ", " ;
             } catch (NullPointerException e) {
             	tempString += "\"domainVClass\": \"\",";
             }
@@ -231,11 +231,11 @@ public class ShowObjectPropertyHierarchyController extends FreemarkerHttpServlet
             	tempString += "\"rangeVClass\": " + JSONUtils.quote(
             	        ((tmp = vcDao.getVClassByURI(
             	                op.getRangeVClassURI())) != null 
-            	                && (tmp.getLocalNameWithPrefix() == null)) 
+            	                && (tmp.getPickListName() == null)) 
             	                        ? "" 
             	                        : vcDao.getVClassByURI(
             	                                op.getRangeVClassURI())
-            	                                .getLocalNameWithPrefix()) + ", " ;
+            	                                .getPickListName()) + ", " ;
             } catch (NullPointerException e) {
             	tempString += "\"rangeVClass\": \"\",";
             }
@@ -267,8 +267,8 @@ public class ShowObjectPropertyHierarchyController extends FreemarkerHttpServlet
         	} else if (op2 == null) {
         		return -1;
         	}
-        	String propLabel1 = getDisplayLabel(op1);
-        	String propLabel2 = getDisplayLabel(op2);
+        	String propLabel1 = op1.getPickListName();
+        	String propLabel2 = op2.getPickListName();
         	if (propLabel1 == null) {
         		return 1;
         	} else if (propLabel2 == null) {
@@ -283,9 +283,9 @@ public class ShowObjectPropertyHierarchyController extends FreemarkerHttpServlet
      * should never be null
      */
     public static String getDisplayLabel(ObjectProperty op) {
-    	String domainPublic = op.getDomainPublic();
-    	String displayLabel = (domainPublic != null && domainPublic.length() > 0)  
-			? domainPublic 
+        String displayLabel = op.getPickListName();
+    	displayLabel = (displayLabel != null && displayLabel.length() > 0)  
+			? displayLabel 
 			: op.getLocalName();
 		return (displayLabel != null) ? displayLabel : "[object property]" ;
     }
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java
index 439643662..c137de39c 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java
@@ -178,9 +178,9 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
             dp.setNamespace(op.getNameSpace());
             dp.setLocalName(op.getLocalName());
             dp.setLocalNameWithPrefix(getWebappDaoFactory().makeLocalNameWithPrefix(dp));
-            dp.setPickListName(getWebappDaoFactory().makePickListName(dp));
             dp.setName(op.getLocalName());
             dp.setPublicName(getLabelOrId(op));
+            dp.setPickListName(getWebappDaoFactory().makePickListName(dp));
             Resource dRes = op.getDomain();
             if (dRes != null) {
                 dp.setDomainClassURI(dRes.getURI());
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java
index 8c74e8532..5dd6ba5ac 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java
@@ -95,14 +95,13 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
             p.setNamespace(op.getNameSpace());
             p.setLocalName(op.getLocalName());
             p.setLocalNameWithPrefix(getWebappDaoFactory().makeLocalNameWithPrefix(p));
-            p.setPickListName(getWebappDaoFactory().makePickListName(p));
-            String propertyName = getPropertyStringValue(op,PROPERTY_FULLPROPERTYNAMEANNOT);
             if (op.getLabel(null) != null)
                 p.setDomainPublic(getLabelOrId(op));
             else
                 p.setDomainPublic(op.getLocalName());
             if (p.getDomainPublic() == null)
                 p.setDomainPublic("[related to]");
+            p.setPickListName(getWebappDaoFactory().makePickListName(p));
             if (op.getDomain() != null)
                 p.setDomainVClassURI( (op.getDomain().isAnon()) ? PSEUDO_BNODE_NS+op.getDomain().getId().toString() : op.getDomain().getURI());
             if (op.getRange() != null)
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java
index 0f6d4b790..9668c60e8 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java
@@ -558,18 +558,20 @@ public class WebappDaoFactoryJena implements WebappDaoFactory {
     public String makePickListName(ResourceBean bean) {
         OntologyDao oDao = this.getOntologyDao();
         Ontology o = oDao.getOntologyByURI(bean.getNamespace());
+        String label = (bean.getLabel() != null) ? bean.getLabel () : bean.getLocalName();
+        label = (label != null) ? label : bean.getURI();
         if (o == null) {
             if (VitroVocabulary.vitroURI.equals(bean.getNamespace())) {
-                return bean.getLabel() + " (vitro)";
+                return label + " (vitro)";
             } else {
                 log.debug("no ontology object found for namespace " + bean.getNamespace());
-                return bean.getLabel();
+                return label;
             }
         } else {
             String prefix = o.getPrefix() == null ? (
                     o.getName() == null ? 
                             "unspec" : o.getName()) : o.getPrefix();
-            return bean.getLabel() + " (" + prefix + ")";
+            return label + " (" + prefix + ")";
         }       
     }
     
diff --git a/webapp/web/templates/edit/specific/classes_edit.jsp b/webapp/web/templates/edit/specific/classes_edit.jsp
index 1030ec536..2649b437b 100644
--- a/webapp/web/templates/edit/specific/classes_edit.jsp
+++ b/webapp/web/templates/edit/specific/classes_edit.jsp
@@ -77,7 +77,7 @@
 					<input type="hidden" name="VClassName" value="this anonymous class"/>
 				</c:when>
 				<c:otherwise>
-           			<input type="hidden" name="VClassName" value="${VClass.localNameWithPrefix}"/>
+           			<input type="hidden" name="VClassName" value="${VClass.pickListName}"/>
 				</c:otherwise>
 			</c:choose>
            	<input type="hidden" name="mode" value="moveInstances"/>
@@ -99,10 +99,10 @@
 				<li><input type="checkbox" name="SuperclassURI" value="${superclass.URI}" class="form-item"/>
 					<c:choose>
 						<c:when test="${!superclass.anonymous}">
-							<a href="${superclassURL}">${superclass.localNameWithPrefix}</a>
+							<a href="${superclassURL}">${superclass.pickListName}</a>
 						</c:when>
 						<c:otherwise>
-							${superclass.localNameWithPrefix}
+							${superclass.pickListName}
 						</c:otherwise>
 					</c:choose>
 				</li>
@@ -137,10 +137,10 @@
 				<li><input type="checkbox" name="SubclassURI" value="${subclass.URI}" class="form-item"/>
 					<c:choose>
 					    <c:when test="${!subclass.anonymous}">
-					    	<a href="${subclassURL}"> ${subclass.localNameWithPrefix} </a>
+					    	<a href="${subclassURL}"> ${subclass.pickListName} </a>
 					    </c:when>
 					    <c:otherwise>
-						${subclass.localNameWithPrefix}
+						${subclass.pickListName}
 					    </c:otherwise>
 				        </c:choose>
 				</li>						
@@ -181,10 +181,10 @@
 				<li><input type="checkbox" name="SubclassURI" value="${subclass.URI}" class="form-item"/>
 				    <c:choose>
 					    <c:when test="${!subclass.anonymous}">
-					        <a href="${subclassURL}"> ${subclass.localNameWithPrefix} </a>
+					        <a href="${subclassURL}"> ${subclass.pickListName} </a>
 					    </c:when>
 					    <c:otherwise>
-					        ${subclass.localNameWithPrefix}
+					        ${subclass.pickListName}
 					    </c:otherwise>
                     </c:choose>
 				</li>
@@ -223,10 +223,10 @@
 				<li><input type="checkbox" name="SubclassURI" value="${subclass.URI}" class="form-item"/>
 				    <c:choose>
 					<c:when test="${!subclass.anonymous}">
-					    <a href="${subclassURL}"> ${subclass.localNameWithPrefix} </a>
+					    <a href="${subclassURL}"> ${subclass.pickListName} </a>
 					</c:when>
 					<c:otherwise>
-					    ${subclass.localNameWithPrefix}
+					    ${subclass.pickListName}
 					</c:otherwise>
 				    </c:choose>
 				</li>
diff --git a/webapp/web/templates/edit/specific/dataprops_edit.jsp b/webapp/web/templates/edit/specific/dataprops_edit.jsp
index e7d2a04ec..7aa5cdfb7 100644
--- a/webapp/web/templates/edit/specific/dataprops_edit.jsp
+++ b/webapp/web/templates/edit/specific/dataprops_edit.jsp
@@ -81,7 +81,7 @@
                 <c:param name="uri" value="${superproperty.URI}"/>
             </c:url>
                 <li><input type="checkbox" name="SuperpropertyURI" value="${superproperty.URI}" class="form-item"/>
-                    <a href="${superpropertyURL}">${superproperty.localNameWithPrefix}</a>
+                    <a href="${superpropertyURL}">${superproperty.pickListName}</a>
                 </li>
             </c:forEach>
             </ul>
@@ -114,7 +114,7 @@
                     <c:param name="uri" value="${subproperty.URI}"/>
                 </c:url>
                 <li><input type="checkbox" name="SubpropertyURI" value="${subproperty.URI}" class="form-item"/>
-                     <a href="${subpropertyURL}"> ${subproperty.localNameWithPrefix} </a>
+                     <a href="${subpropertyURL}"> ${subproperty.pickListName} </a>
                 </li>                       
             </c:forEach>    
             </ul>
@@ -147,7 +147,7 @@
                     <c:param name="uri" value="${eqproperty.URI}"/>
                 </c:url>
                 <li><input type="checkbox" name="SubpropertyURI" value="${eqproperty.URI}" class="form-item"/>
-                     <a href="${eqpropertyURL}"> ${eqproperty.localNameWithPrefix} </a>
+                     <a href="${eqpropertyURL}"> ${eqproperty.pickListName} </a>
                 </li>                       
             </c:forEach>    
             </ul>
diff --git a/webapp/web/templates/edit/specific/props_edit.jsp b/webapp/web/templates/edit/specific/props_edit.jsp
index 1f55c02f5..c4c130621 100644
--- a/webapp/web/templates/edit/specific/props_edit.jsp
+++ b/webapp/web/templates/edit/specific/props_edit.jsp
@@ -103,7 +103,7 @@
 				<c:param name="uri" value="${superproperty.URI}"/>
 			</c:url>
 				<li><input type="checkbox" name="SuperpropertyURI" value="${superproperty.URI}" class="form-item"/>
-					<a href="${superpropertyURL}">${superproperty.localNameWithPrefix}</a>
+					<a href="${superpropertyURL}">${superproperty.pickListName}</a>
 				</li>
 			</c:forEach>
 			</ul>
@@ -135,7 +135,7 @@
 					<c:param name="uri" value="${subproperty.URI}"/>
 				</c:url>
 				<li><input type="checkbox" name="SubpropertyURI" value="${subproperty.URI}" class="form-item"/>
-					 <a href="${subpropertyURL}"> ${subproperty.localNameWithPrefix} </a>
+					 <a href="${subpropertyURL}"> ${subproperty.pickListName} </a>
 				</li>						
 			</c:forEach>	
 			</ul>
@@ -172,7 +172,7 @@
                     <c:param name="uri" value="${eqproperty.URI}"/>
                 </c:url>
                 <li><input type="checkbox" name="SubpropertyURI" value="${eqproperty.URI}" class="form-item"/>
-                     <a href="${eqpropertyURL}"> ${eqproperty.localNameWithPrefix} </a>
+                     <a href="${eqpropertyURL}"> ${eqproperty.pickListName} </a>
                 </li>                       
             </c:forEach>    
             </ul>