From dd80f542ea30613e0dce4b5d88ad1ce84cd6173c Mon Sep 17 00:00:00 2001
From: brianjlowe <bjl23@cornell.edu>
Date: Tue, 6 Aug 2013 10:34:33 -0400
Subject: [PATCH] work on application ontology support for property/class
 configuration

---
 .../dao/jena/ObjectPropertyDaoJena.java       |  2 +-
 .../EditRequestDispatchController.java        | 24 +++++++------------
 2 files changed, 10 insertions(+), 16 deletions(-)

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 5a5f537cb..3a882a93b 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
@@ -286,7 +286,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
     
     public ObjectProperty getObjectPropertyByURIAndRangeURI(String propertyURI, String rangeURI) {
         ObjectProperty op = getObjectPropertyByURI(propertyURI);
-        if (op == null) {
+        if (op == null || rangeURI == null) {
             return op;
         }
         op.setRangeVClassURI(rangeURI);
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java
index fba13b869..b31bbf10c 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java
@@ -215,9 +215,9 @@ public class EditRequestDispatchController extends FreemarkerHttpServlet {
 
       	// *** check for a predicate URI in the request        	
         }else if( predicateUri != null && !predicateUri.isEmpty() ){                      
-            Property prop = getProperty( predicateUri, vreq);
+            Property prop = getProperty( predicateUri, rangeUri, vreq);
             if (prop != null && rangeUri != null) {
-                editConfGeneratorName = getCustomEntryFormForPropertyAndRange(prop, rangeUri);
+                editConfGeneratorName = getCustomEntryForm(prop);
             } else if( prop != null && prop.getCustomEntryForm() != null ){
                 //there is a custom form, great! let's use it.
                 editConfGeneratorName = prop.getCustomEntryForm();
@@ -247,25 +247,19 @@ public class EditRequestDispatchController extends FreemarkerHttpServlet {
         return editConfGeneratorName;
 	}
 
-	private String getCustomEntryFormForPropertyAndRange(Property prop, String rangeUri){
-	    String entryFormName = null;
-	    // = ApplicationConfigurationOntologyUtils.getEntryForm(prop.getURI(), rangeUri);
-	    if (entryFormName == null) {
-	        if (prop.getCustomEntryForm() != null) {
-	            return prop.getCustomEntryForm();
-	        } else {
-	            return DEFAULT_OBJ_FORM;
-	        }
+	private String getCustomEntryForm(Property prop){
+	    if (prop.getCustomEntryForm() == null) {
+	        return DEFAULT_OBJ_FORM;
 	    } else {
-	        prop.setCustomEntryForm(entryFormName);
-	        return entryFormName;
+	        return prop.getCustomEntryForm();
 	    }
 	}
 	
-	private Property getProperty(String predicateUri, VitroRequest vreq) {	   
+	private Property getProperty(String predicateUri, String rangeUri, VitroRequest vreq) {	   
 		Property p = null;
 		try{
-    		p = vreq.getWebappDaoFactory().getObjectPropertyDao().getObjectPropertyByURI(predicateUri);
+    		p = vreq.getWebappDaoFactory().getObjectPropertyDao().getObjectPropertyByURIAndRangeURI(
+    		        predicateUri, rangeUri);
     		if(p == null) {
     			p = vreq.getWebappDaoFactory().getDataPropertyDao().getDataPropertyByURI(predicateUri);
     		}