From c8927419707676961d1ec2b6a39ea0a4f71426c0 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Fri, 11 Mar 2011 21:39:50 +0000
Subject: [PATCH] Fixed calls from jsps to EditN3Utils.getEditorUri. Broken in
 r7579.

---
 .../web/templatemodels/individual/GroupedPropertyList.java    | 4 ----
 webapp/web/edit/forms/datapropStmtDelete.jsp                  | 2 +-
 webapp/web/edit/forms/propDelete.jsp                          | 2 +-
 webapp/web/edit/n3Delete.jsp                                  | 2 +-
 webapp/web/edit/processDatapropRdfForm.jsp                    | 2 +-
 5 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java
index 6018a5dff..3351c2e03 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java
@@ -6,14 +6,11 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
 import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
 import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
@@ -27,7 +24,6 @@ import edu.cornell.mannlib.vitro.webapp.dao.PropertyGroupDao;
 import edu.cornell.mannlib.vitro.webapp.dao.PropertyInstanceDao;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
-import edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep;
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.BaseTemplateModel;
 
 /*
diff --git a/webapp/web/edit/forms/datapropStmtDelete.jsp b/webapp/web/edit/forms/datapropStmtDelete.jsp
index 810fcaaf3..91d8c425b 100644
--- a/webapp/web/edit/forms/datapropStmtDelete.jsp
+++ b/webapp/web/edit/forms/datapropStmtDelete.jsp
@@ -43,7 +43,7 @@
 
     VitroRequest vreq = new VitroRequest(request);
     WebappDaoFactory wdf = vreq.getWebappDaoFactory();
-    String editorUri = EditN3Utils.getEditorUri(request,session,application);        
+    String editorUri = EditN3Utils.getEditorUri();        
     wdf = wdf.getUserAwareDaoFactory(editorUri);
     
     DataProperty prop = wdf.getDataPropertyDao().getDataPropertyByURI(predicateUri);
diff --git a/webapp/web/edit/forms/propDelete.jsp b/webapp/web/edit/forms/propDelete.jsp
index b7d671be2..cc7118c70 100644
--- a/webapp/web/edit/forms/propDelete.jsp
+++ b/webapp/web/edit/forms/propDelete.jsp
@@ -74,7 +74,7 @@ public WebappDaoFactory getUnfilteredDaoFactory() {
     //do the delete
     if( request.getParameter("y") != null ) {
         
-        String editorUri = EditN3Utils.getEditorUri(request,session,application);        
+        String editorUri = EditN3Utils.getEditorUri(request);        
          wdf = wdf.getUserAwareDaoFactory(editorUri);
         
         if (prop.getStubObjectRelation()) {
diff --git a/webapp/web/edit/n3Delete.jsp b/webapp/web/edit/n3Delete.jsp
index d51ca703b..78ddcb1e8 100644
--- a/webapp/web/edit/n3Delete.jsp
+++ b/webapp/web/edit/n3Delete.jsp
@@ -210,7 +210,7 @@
     }    
     
     OntModel writeModel = editConfig.getWriteModelSelector().getModel(request,application);
-    String editorUri = EditN3Utils.getEditorUri(request,session,application);    
+    String editorUri = EditN3Utils.getEditorUri(request);    
     Lock lock = null;
     try{
         lock =  writeModel.getLock();
diff --git a/webapp/web/edit/processDatapropRdfForm.jsp b/webapp/web/edit/processDatapropRdfForm.jsp
index 591208aff..f76e9d098 100644
--- a/webapp/web/edit/processDatapropRdfForm.jsp
+++ b/webapp/web/edit/processDatapropRdfForm.jsp
@@ -255,7 +255,7 @@ and set a flag in the request to indicate "back button confusion"
     
     OntModel writeModel = editConfig.getWriteModelSelector().getModel(request,application);
     Lock lock = null;
-    String editorUri = EditN3Utils.getEditorUri(request,session,application);    
+    String editorUri = EditN3Utils.getEditorUri(request);    
     try{
         lock =  writeModel.getLock();
         lock.enterCriticalSection(Lock.WRITE);