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

Fixed calls from jsps to EditN3Utils.getEditorUri. Broken in r7579.

Browse source
This commit is contained in:
rjy7 2011-03-11 21:39:50 +00:00
parent 316cb523c3
commit c892741970
5 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java
View file

@ -6,14 +6,11 @@ import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; 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.DataProperty;
import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; 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.PropertyInstanceDao;
import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; 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; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.BaseTemplateModel;
/* /*

2
webapp/web/edit/forms/datapropStmtDelete.jsp
View file

@ -43,7 +43,7 @@
VitroRequest vreq = new VitroRequest(request); VitroRequest vreq = new VitroRequest(request);
WebappDaoFactory wdf = vreq.getWebappDaoFactory(); WebappDaoFactory wdf = vreq.getWebappDaoFactory();
String editorUri = EditN3Utils.getEditorUri(request,session,application); String editorUri = EditN3Utils.getEditorUri();
wdf = wdf.getUserAwareDaoFactory(editorUri); wdf = wdf.getUserAwareDaoFactory(editorUri);
DataProperty prop = wdf.getDataPropertyDao().getDataPropertyByURI(predicateUri); DataProperty prop = wdf.getDataPropertyDao().getDataPropertyByURI(predicateUri);

2
webapp/web/edit/forms/propDelete.jsp
View file

@ -74,7 +74,7 @@ public WebappDaoFactory getUnfilteredDaoFactory() {
//do the delete //do the delete
if( request.getParameter("y") != null ) { if( request.getParameter("y") != null ) {
String editorUri = EditN3Utils.getEditorUri(request,session,application); String editorUri = EditN3Utils.getEditorUri(request);
wdf = wdf.getUserAwareDaoFactory(editorUri); wdf = wdf.getUserAwareDaoFactory(editorUri);
if (prop.getStubObjectRelation()) { if (prop.getStubObjectRelation()) {

2
webapp/web/edit/n3Delete.jsp
View file

@ -210,7 +210,7 @@
} }
OntModel writeModel = editConfig.getWriteModelSelector().getModel(request,application); OntModel writeModel = editConfig.getWriteModelSelector().getModel(request,application);
String editorUri = EditN3Utils.getEditorUri(request,session,application); String editorUri = EditN3Utils.getEditorUri(request);
Lock lock = null; Lock lock = null;
try{ try{
lock = writeModel.getLock(); lock = writeModel.getLock();

2
webapp/web/edit/processDatapropRdfForm.jsp
View file

@ -255,7 +255,7 @@ and set a flag in the request to indicate "back button confusion"
OntModel writeModel = editConfig.getWriteModelSelector().getModel(request,application); OntModel writeModel = editConfig.getWriteModelSelector().getModel(request,application);
Lock lock = null; Lock lock = null;
String editorUri = EditN3Utils.getEditorUri(request,session,application); String editorUri = EditN3Utils.getEditorUri(request);
try{ try{
lock = writeModel.getLock(); lock = writeModel.getLock();
lock.enterCriticalSection(Lock.WRITE); lock.enterCriticalSection(Lock.WRITE);