From 688b8586415ee2fdad70d116887a652d7a5d170d Mon Sep 17 00:00:00 2001
From: brianjlowe <bjl23@cornell.edu>
Date: Fri, 27 Sep 2013 15:42:43 -0400
Subject: [PATCH] VIVO-266 and VIVO-24 improvements to restriction editing

---
 .../edit/RestrictionRetryController.java      | 19 ++++++++++++++++---
 .../webapp/dao/jena/DataPropertyDaoJena.java  |  4 +++-
 .../dao/jena/ObjectPropertyDaoJena.java       |  6 ++++--
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionRetryController.java
index e601aceac..a2d20d9f0 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionRetryController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionRetryController.java
@@ -14,6 +14,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import com.hp.hpl.jena.vocabulary.OWL;
 import com.hp.hpl.jena.vocabulary.RDFS;
 import com.ibm.icu.text.Collator;
 
@@ -63,7 +64,7 @@ public class RestrictionRetryController extends BaseEditController {
 			List<Option> onPropertyList = new LinkedList<Option>(); 
 			Collections.sort(pList, new PropSorter());
 			for (Property p: pList) {
-				onPropertyList.add( new Option(p.getURI(),p.getLocalNameWithPrefix()) );
+				onPropertyList.add( new Option(p.getURI(),p.getPickListName()));
 			}
 					
 			epo.setFormObject(new FormObject());
@@ -117,8 +118,20 @@ public class RestrictionRetryController extends BaseEditController {
 	private List<Option> getValueClassOptionList(VitroRequest request) {
 		List<Option> valueClassOptionList = new LinkedList<Option>();
 		VClassDao vcDao = request.getUnfilteredWebappDaoFactory().getVClassDao();
-		for (VClass vc: vcDao.getAllVclasses()) {
-			valueClassOptionList.add(new Option(vc.getURI(), vc.getLocalNameWithPrefix()));
+		List<VClass> vclasses = vcDao.getAllVclasses();
+        boolean addOwlThing = true;
+        for (VClass vclass : vclasses) {
+            if (OWL.Thing.getURI().equals(vclass.getURI())) {
+                addOwlThing = false;
+                break;
+            }
+        }
+        if(addOwlThing) {
+            vclasses.add(new VClass(OWL.Thing.getURI()));
+        }
+        Collections.sort(vclasses);
+		for (VClass vc: vclasses) {
+			valueClassOptionList.add(new Option(vc.getURI(), vc.getPickListName()));
 		}
 		return valueClassOptionList;
 	}
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 0d4d77a9b..053edbebc 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
@@ -183,9 +183,11 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
                 if (!VitroVocabulary.vitroURI.equals(dp.getNamespace())) {
                     log.debug("datapropFromOntProperty(): no ontology object found for the namespace "+dp.getNamespace());
                 }
+                dp.setLocalNameWithPrefix(dp.getLocalName());
+                dp.setPickListName(getLabelOrId(op));
             } else {
                 dp.setLocalNameWithPrefix(o.getPrefix()==null?(o.getName()==null?"unspec:"+dp.getLocalName():o.getName()+":"+dp.getLocalName()):o.getPrefix()+":"+dp.getLocalName());
-                dp.setPickListName(dp.getLocalName()+o.getPrefix()==null?(o.getName()==null?" (unspec:)":" ("+o.getName()+")"):" ("+o.getPrefix()+")");
+                dp.setPickListName(getLabelOrId(op)+o.getPrefix()==null?(o.getName()==null?" (unspec:)":" ("+o.getName()+")"):" ("+o.getPrefix()+")");
             }
             dp.setName(op.getLocalName());
             dp.setPublicName(getLabelOrId(op));
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 487d2a116..0a8ba5510 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
@@ -96,15 +96,17 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
             p.setLocalName(op.getLocalName());
             OntologyDao oDao=getWebappDaoFactory().getOntologyDao();
             Ontology o = oDao.getOntologyByURI(p.getNamespace());
-            if (o==null) {
+            if (o == null) {
                 if (!VitroVocabulary.vitroURI.equals(p.getNamespace())) {
                     log.debug("propertyFromOntProperty(): no ontology object found for the namespace "+p.getNamespace());
                 }
+                p.setLocalNameWithPrefix(p.getLocalName());
+                p.setPickListName(getLabelOrId(op));                
             } else {
                 String prefix = o.getPrefix()==null?(o.getName()==null?"unspec":o.getName()):o.getPrefix();
                 p.setLocalNameWithPrefix(prefix+":"+p.getLocalName());
                 //log.warn("setting pickListName to: "+p.getLocalName()+" ("+prefix+")");
-                p.setPickListName(p.getLocalName()+" ("+prefix+")");
+                p.setPickListName(getLabelOrId(op) + " ("+prefix+")");
             }
             String propertyName = getPropertyStringValue(op,PROPERTY_FULLPROPERTYNAMEANNOT);
             if (op.getLabel(null) != null)