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

NIHVIVO-1207 Some time ago NetIdIdentifierFactory and SelfEditingUriFactory were merged into SelfEditingIdentifierFactory. Fix several comments to reflect this.

Browse source
This commit is contained in:
jeb228 2010-11-17 21:35:52 +00:00
parent 6f4f1b4659
commit eafa04ccf2
5 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/FakeSelfEditingIdentifierFactory.java
View file

@ -12,7 +12,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
/** /**
* Attempts to simulate the action of NetIdIdentifierFactory.java using the * Attempts to simulate the action of SelfEditingIdentifierFactory.java using the
* request attribute FAKE_SELF_EDIT_NETID. * request attribute FAKE_SELF_EDIT_NETID.
*/ */
public class FakeSelfEditingIdentifierFactory implements IdentifierBundleFactory{ public class FakeSelfEditingIdentifierFactory implements IdentifierBundleFactory{

2
webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/JenaNetidPolicy.java
View file

@ -361,7 +361,7 @@ public class JenaNetidPolicy extends DefaultInconclusivePolicy implements Visiti
/** /**
* An inner class used to setup everything that's needed for * An inner class used to setup everything that's needed for
* a JenaNetidPolicy. This setups the JenaNetidPolicy and a * a JenaNetidPolicy. This setups the JenaNetidPolicy and a
* NetIdIdentifierFactory. * SelfEditingIdentifierFactory.
* *
* @author bdc34 * @author bdc34
* *

3
webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/JenaNetidPolicySetup.java
View file

@ -14,11 +14,10 @@ import edu.cornell.mannlib.vitro.webapp.auth.identifier.SelfEditingIdentifierFac
import edu.cornell.mannlib.vitro.webapp.auth.identifier.ServletIdentifierBundleFactory; import edu.cornell.mannlib.vitro.webapp.auth.identifier.ServletIdentifierBundleFactory;
import edu.cornell.mannlib.vitro.webapp.auth.policy.JenaNetidPolicy; import edu.cornell.mannlib.vitro.webapp.auth.policy.JenaNetidPolicy;
import edu.cornell.mannlib.vitro.webapp.auth.policy.ServletPolicyList; import edu.cornell.mannlib.vitro.webapp.auth.policy.ServletPolicyList;
import edu.cornell.mannlib.vitro.webapp.auth.policy.JenaNetidPolicy.ContextSetup;
/** /**
* Class used to setup a JenaNetidPolicy using the default. * Class used to setup a JenaNetidPolicy using the default.
* This setups the JenaNetidPolicy and a NetIdIdentifierFactory. * This setups the JenaNetidPolicy and a SelfEditingIdentifierFactory.
* *
* See JenaNetidPolicy.setupDefault() for the sparql queries that will * See JenaNetidPolicy.setupDefault() for the sparql queries that will
* be used by the default JenaNetidPolicy. * be used by the default JenaNetidPolicy.

2
webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicyTest.java
View file

@ -58,7 +58,7 @@ public class SelfEditingPolicyTest extends AbstractTestClass {
ids = new ArrayIdentifierBundle(); ids = new ArrayIdentifierBundle();
//ids.add( new NetIdIdentifierFactory.NetId("test223") ); ids.add( new SelfEditingIdentifierFactory.NetId("test223") );
IndividualImpl ind = new IndividualImpl(); IndividualImpl ind = new IndividualImpl();
ind.setURI( SELFEDITOR_URI ); ind.setURI( SELFEDITOR_URI );

11
webapp/web/admin/testnetid.jsp
View file

@ -18,10 +18,9 @@
<%@ page import="org.apache.commons.logging.LogFactory" %> <%@ page import="org.apache.commons.logging.LogFactory" %>
<%@ page import="java.io.StringReader" %> <%@ page import="java.io.StringReader" %>
<%@ page import="java.util.*" %> <%@ page import="java.util.*" %>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.NetIdIdentifierFactory.NetId"%> <%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.SelfEditingIdentifierFactory.NetId"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.NetIdIdentifierFactory"%> <%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.SelfEditingIdentifierFactory.SelfEditing"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.SelfEditingUriFactory.SelfEditing"%> <%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.SelfEditingIdentifierFactory"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.SelfEditingUriFactory"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.ArrayIdentifierBundle"%> <%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.ArrayIdentifierBundle"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle"%> <%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle"%>
<%@page import="java.io.IOException"%> <%@page import="java.io.IOException"%>
@ -51,8 +50,8 @@ private void checkNetId( String inNetId, JspWriter out, HttpServletRequest reque
&& inNetId.length() > 0 && inNetId.length() > 0
&& inNetId.length() < 100 ){ && inNetId.length() < 100 ){
NetIdIdentifierFactory.NetId netid = new NetId(inNetId); SelfEditingIdentifierFactory.NetId netid = new NetId(inNetId);
SelfEditingUriFactory.SelfEditing selfE = null; SelfEditingIdentifierFactory.SelfEditing selfE = null;
IdentifierBundle idb = new ArrayIdentifierBundle(); IdentifierBundle idb = new ArrayIdentifierBundle();
idb.add(netid); idb.add(netid);