NIHVIVO-149 Mechanism for modifying vitro namespace properties based on data property editing

NIHVIVO-142 Added edit link to name field on individual page; currently routes to a dummy page

webapp/config/tlds/PropertyEditLink.tld

@@ -17,7 +17,7 @@
 
 	<tag>
 		<name>editLinks</name>
-        <display-name>Edit Links for Propery</display-name>
+        <display-name>Edit Links for Property</display-name>
         <description>
             Create the A elements for a specified Property.
         </description>

webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/DropDataPropStmt.java

@@ -8,6 +8,7 @@ import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.VisitingPolicyIface;
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestActionConstants;
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
 import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatementImpl;
 
 public class DropDataPropStmt implements RequestedAction {
 
@@ -17,6 +18,13 @@ public class DropDataPropStmt implements RequestedAction {
         this.dataPropStmt = dps;
     }
 
+    public DropDataPropStmt(String subjectUri, String predicateUri, String data) {
+        dataPropStmt = new DataPropertyStatementImpl();
+        dataPropStmt.setIndividualURI(subjectUri);
+        dataPropStmt.setDatapropURI(predicateUri);
+        dataPropStmt.setData(data);        
+    }
+    
     public PolicyDecision accept(VisitingPolicyIface policy, IdentifierBundle whoToAuth) {
         return policy.visit(whoToAuth,this);
     }

webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/EditDataPropStmt.java

@@ -8,6 +8,7 @@ import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.VisitingPolicyIface;
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestActionConstants;
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
 import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatementImpl;
 
 public class EditDataPropStmt implements RequestedAction {
 
@@ -17,6 +18,13 @@ public class EditDataPropStmt implements RequestedAction {
         this.dataPropStmt = dps;
     }
     
+    public EditDataPropStmt(String subjectUri, String predicateUri, String data) {
+        dataPropStmt = new DataPropertyStatementImpl();
+        dataPropStmt.setIndividualURI(subjectUri);
+        dataPropStmt.setDatapropURI(predicateUri);
+        dataPropStmt.setData(data);        
+    }
+    
     public PolicyDecision accept(VisitingPolicyIface policy, IdentifierBundle whoToAuth) {
         return policy.visit(whoToAuth,this);
     }

webapp/src/edu/cornell/mannlib/vitro/webapp/utils/StringUtils.java

@@ -0,0 +1,9 @@
+package edu.cornell.mannlib.vitro.webapp.utils;
+
+public class StringUtils {
+    
+    public static String capitalize(String s) {
+        return s.substring(0, 1).toUpperCase() + s.substring(1);
+    }
+
+}

webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/PropertyEditLinks.java

@@ -2,6 +2,9 @@
 
 package edu.cornell.mannlib.vitro.webapp.web.jsptags;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
@@ -39,6 +42,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
 import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.RdfLiteralHash;
+import edu.cornell.mannlib.vitro.webapp.utils.StringUtils;
 
 /**
  * JSP tag to generate the HTML of links for edit, delete or
@@ -110,26 +114,21 @@ public class PropertyEditLinks extends TagSupport{
         if( item instanceof ObjectPropertyStatement ){
             ObjectPropertyStatement prop = (ObjectPropertyStatement)item;           
             links = doObjPropStmt( prop, themeDir, policyToAccess(ids, policy, prop), contextPath );            
-            
         } else if( item instanceof DataPropertyStatement ){
             DataPropertyStatement prop = (DataPropertyStatement)item;
             links = doDataPropStmt( prop, themeDir, policyToAccess(ids, policy, prop), contextPath );
-            
+        } else if (entity == null) {
+            log.error("unable to find an Individual in request using var name 'entity'");
+            return SKIP_BODY;           
         } else if( item instanceof ObjectProperty ){
             ObjectProperty prop = (ObjectProperty)item;                     
-            if( entity == null ) {
-                log.error("unable to find an Individual in request using var name 'entity'");
-                return SKIP_BODY;
-            }            
             links = doObjProp( prop, entity, themeDir, policyToAccess(ids, policy, entity.getURI(), prop), contextPath );            
-            
         } else if( item instanceof DataProperty ){
             DataProperty prop = (DataProperty)item; // a DataProperty populated for this subject individual            
-            if( entity == null ) {
-                log.error("unable to find an Individual in request using var name 'entity'");
-                return SKIP_BODY;
-            }            
             links = doDataProp( prop, entity, themeDir,policyToAccess(ids, policy, entity.getURI(), prop), contextPath ) ;
+        } else if (item instanceof String) {
+            String predicateUri = (String) item;
+            links = doVitroNamespaceProp( predicateUri, entity, themeDir, policyToAccess(ids, policy, entity.getURI(), predicateUri), contextPath );     
         } else {
             log.error("PropertyEditLinks cannot make links for an object of type "+item.getClass().getName());
         	return SKIP_BODY;
@@ -319,11 +318,65 @@ public class PropertyEditLinks extends TagSupport{
         return links;
     }
     
+    protected LinkStruct[] doVitroNamespaceProp(String predicateUri, Individual entity, String themeDir, EditLinkAccess[] allowedAccessTypeArray, String contextPath) {
+        
+        LinkStruct[] links = new LinkStruct[2];
+            
+        if( allowedAccessTypeArray == null || predicateUri == null || allowedAccessTypeArray.length == 0 ) {
+            log.debug("Null or empty access type array for vitro namespace property " + predicateUri);
+            return empty_array;
+        }
+
+        int index = 0;
+        LinkStruct ls = new LinkStruct();
+
+        String dispatchUrl = contextPath + "edit/editDatapropStmtRequestDispatch.jsp";
+        
+        String propName = predicateUri.substring(predicateUri.lastIndexOf('#')+1);
+        String editForm = "vitroNs" + StringUtils.capitalize(propName) + "Form.jsp";
+        
+        if ( contains( allowedAccessTypeArray, EditLinkAccess.MODIFY ) ){ 
+            log.debug("Permission found to UPDATE vitro namespace property " + predicateUri);
+            String url = makeRelativeHref(dispatchUrl, 
+                                          "subjectUri", entity.getURI(),
+                                          "predicateUri", predicateUri,
+                                          "editForm", editForm);
+            ls.setHref(url);
+            ls.setType("edit");
+            ls.setMouseoverText("edit this property");
+            links[index] = ls; 
+            index++;
+        }
+        else {
+            log.debug("NO permission found to UPDATE vitro namespace property " + predicateUri);
+        }
+
+        // Name and type can be edited but not deleted
+        if ( !( predicateUri.endsWith("#label") || predicateUri.endsWith("#type") ) ) {
+            if ( contains( allowedAccessTypeArray, EditLinkAccess.DELETE ) ){ 
+                log.debug("Permission found to DELETE vitro namespace property " + predicateUri);
+                String url = makeRelativeHref(dispatchUrl, 
+                                              "subjectUri", entity.getURI(),
+                                              "predicateUri", predicateUri);
+                ls.setHref(url);
+                ls.setType("delete");
+                ls.setMouseoverText("delete this property");
+                links[index] = ls; 
+                index++;
+            }
+            else {
+                log.debug("NO permission found to DELETE vitro namespace property " + predicateUri);
+            }
+        }
+            
+        return links;
+    }
+
     /* ********************* utility methods ********************************* */
     protected static String makeRelativeHref( String baseUrl, String ... queries ) {
         String href = baseUrl;
         if( queries == null || queries.length % 2 != 0 )
-            log.debug("makeRelativeHref() needs a even number of queries");
+            log.debug("makeRelativeHref() needs an even number of queries");
 
         for( int i=0; i < queries.length; i=i+2){
             String separator = ( i==0 ? "?" : "&amp;" );
@@ -455,6 +508,25 @@ public class PropertyEditLinks extends TagSupport{
         return access;
     }
 
+    protected EditLinkAccess[] policyToAccess( IdentifierBundle ids, PolicyIface policy, String subjectUri, String propertyUri) {
+        
+        ArrayList<EditLinkAccess> list = new ArrayList<EditLinkAccess>(2);
+ 
+        RequestedAction action = new EditDataPropStmt(subjectUri, propertyUri, (String) null);
+        PolicyDecision dec = policy.isAuthorized(ids, action);        
+        if ( dec != null && dec.getAuthorized() == Authorization.AUTHORIZED ){
+            list.add( EditLinkAccess.MODIFY);
+        } 
+
+        action = new DropDataPropStmt(subjectUri, propertyUri, (String) null);
+        dec = policy.isAuthorized(ids, action);        
+        if( dec != null && dec.getAuthorized() == Authorization.AUTHORIZED ){
+            list.add( EditLinkAccess.DELETE );
+        }
+       
+        return list.toArray(ACCESS_TEMPLATE);
+    }
+    
     public enum EditLinkAccess{ MODIFY, DELETE, ADDNEW, INFO, ADMIN  };
 
     public class LinkStruct {

webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/VitroNamespacePropertyEditLinks.java

@@ -0,0 +1,496 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.web.jsptags;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.tagext.TagSupport;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.ServletIdentifierBundleFactory;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyList;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.RequestPolicyList;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ServletPolicyList;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyIface;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AddDataPropStmt;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AddObjectPropStmt;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.DropDataPropStmt;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.DropObjectPropStmt;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.EditDataPropStmt;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.EditObjPropStmt;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestActionConstants;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
+import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.RdfLiteralHash;
+
+/**
+ * JSP tag to generate the HTML of links for edit, delete or
+ * add of a Property.
+ *
+ * Maybe we should have a mode where it just sets a var to a
+ * map with "href" = "edit/editDatapropDispatch.jsp?subjectUri=..." and "type" = "delete"
+ *
+ * @author bdc34
+ *
+ */
+public class VitroNamespacePropertyEditLinks extends TagSupport{
+    Object item;
+    String var;
+    String icons;
+    
+    private static final Log log = LogFactory.getLog(VitroNamespacePropertyEditLinks.class.getName());
+    
+    public static final String ICON_DIR = "/images/edit_icons/";
+    
+    public Object getItem() { return item; }
+    public void setItem(Object item) { this.item = item; }
+
+    public String getVar(){ return var; }
+    public void setVar(String var){ this.var = var; }
+
+    public void setIcons(String ic){ icons = ic; }
+    public String getIcons(){ return icons; }
+            
+    @Override
+    public int doStartTag() throws JspException {
+        if( item == null ) {
+            log.error("item passed to <edLnk> tag is null");
+            return SKIP_BODY;
+        }                                
+        //try the policy in the request first, the look for a policy in the servlet context
+        //request policy takes precedence
+        PolicyIface policy = RequestPolicyList.getPolicies(pageContext.getRequest());
+        if( policy == null || ( policy instanceof PolicyList && ((PolicyList)policy).size() == 0 )){
+            policy = ServletPolicyList.getPolicies( pageContext.getServletContext() );
+            if( policy == null || ( policy instanceof PolicyList && ((PolicyList)policy).size() == 0 )){            
+                log.error("No policy found in request at " + RequestPolicyList.POLICY_LIST);
+                return SKIP_BODY;
+            }
+        }              
+        
+        IdentifierBundle ids = (IdentifierBundle)ServletIdentifierBundleFactory
+            .getIdBundleForRequest(pageContext.getRequest(), 
+                    pageContext.getSession(), 
+                    pageContext.getServletContext());
+        
+        if( ids == null ){
+            log.error("No IdentifierBundle objects for request");
+            return SKIP_BODY;
+        }
+        
+        Individual entity = (Individual)pageContext.getRequest().getAttribute("entity");           
+                 
+        LinkStruct[] links = null;
+        String themeDir = (String)pageContext.getAttribute("themeDir");
+
+        //get context prefix needs to end with a slash like "/vivo/" or "/"
+        String contextPath =  ((HttpServletRequest)pageContext.getRequest()).getContextPath();
+        if( ! contextPath.endsWith("/") )
+            contextPath = contextPath + "/";
+        if( ! contextPath.startsWith("/") )
+            contextPath = "/" + contextPath;
+        
+        if( item instanceof ObjectPropertyStatement ){
+            ObjectPropertyStatement prop = (ObjectPropertyStatement)item;           
+            links = doObjPropStmt( prop, themeDir, policyToAccess(ids, policy, prop), contextPath );
+            
+        } else if( item instanceof DataPropertyStatement ){
+            DataPropertyStatement prop = (DataPropertyStatement)item;
+            links = doDataPropStmt( prop, themeDir, policyToAccess(ids, policy, prop), contextPath );
+            
+        } else if( item instanceof ObjectProperty ){
+            ObjectProperty prop = (ObjectProperty)item;           
+            if( entity == null ) {
+                log.error("unable to find an Individual in request using var name 'entity'");
+                return SKIP_BODY;
+            }            
+            links = doObjProp( prop, entity, themeDir, policyToAccess(ids, policy, entity.getURI(), prop), contextPath );
+            
+        } else if( item instanceof DataProperty ){
+            DataProperty prop = (DataProperty)item; // a DataProperty populated for this subject individual
+            if( entity == null ) {
+                log.error("unable to find an Individual in request using var name 'entity'");
+                return SKIP_BODY;
+            }            
+            links = doDataProp( prop, entity, themeDir,policyToAccess(ids, policy, entity.getURI(), prop), contextPath ) ;
+        } else {
+            log.error("PropertyEditLinks cannot make links for an object of type "+item.getClass().getName());
+            return SKIP_BODY;
+        }
+
+        if( getVar() != null ){
+            pageContext.getRequest().setAttribute(getVar(), links);
+        } else {
+            try{    
+                JspWriter out = pageContext.getOut();
+                if( links != null ){
+                    for( LinkStruct ln : links ){
+                        if( ln != null ){
+                            out.print( makeElement( ln ) + '\n' );
+                        }
+                    }
+                }               
+            } catch(IOException ioe){
+                log.error( ioe );
+            }
+        }
+
+        return SKIP_BODY;
+    }
+
+    protected LinkStruct[] doDataProp(DataProperty dprop, Individual entity, String themeDir, EditLinkAccess[] allowedAccessTypeArray, String contextPath) {
+        if( allowedAccessTypeArray == null || dprop == null || allowedAccessTypeArray.length == 0 ) {
+            log.debug("null or empty access type array in doDataProp for dprop "+dprop.getPublicName()+"; most likely just a property prohibited from editing");
+            return empty_array;
+        }
+        LinkStruct[] links = new LinkStruct[1];
+        
+        if (dprop.getDataPropertyStatements()!= null && dprop.getDisplayLimit()==1 && dprop.getDataPropertyStatements().size()>=1) {
+            log.debug("not showing an \"add\" link for data property because it has a display limit of 1 (a hack until expose a choice to make the dataproperty functional)");
+        } else {
+            if( contains( allowedAccessTypeArray, EditLinkAccess.ADDNEW ) ){
+                log.debug("data property "+dprop.getPublicName()+" gets an \"add\" link");
+                String url = makeRelativeHref(contextPath + "edit/editDatapropStmtRequestDispatch.jsp",
+                                              "subjectUri",   entity.getURI(),
+                                              "predicateUri", dprop.getURI());
+                LinkStruct ls = new LinkStruct();
+                ls.setHref( url );
+                ls.setType("add");
+                ls.setMouseoverText("add a new entry");
+                links[0] = ls;
+            } else {
+                log.debug("no add link generated for property "+dprop.getPublicName());
+            }
+        }
+        return links;
+    }
+
+
+    protected LinkStruct[] doObjProp(ObjectProperty oprop, Individual entity, String themeDir, EditLinkAccess[] allowedAccessTypeArray, String contextPath) {
+        if( allowedAccessTypeArray == null || oprop == null || allowedAccessTypeArray.length == 0 ) {
+            log.debug("null or empty access type array in doObjProp for oprop "+oprop.getDomainPublic()+"; most likely just a property prohibited from editing");
+            return empty_array;
+        }
+        LinkStruct[] links = new LinkStruct[1];
+
+        if( contains( allowedAccessTypeArray, EditLinkAccess.ADDNEW )){
+            String url= makeRelativeHref(contextPath + "edit/editRequestDispatch.jsp",
+                                         "subjectUri",   entity.getURI(),
+                                         "predicateUri", oprop.getURI());
+            LinkStruct ls = new LinkStruct();
+            ls.setHref( url );
+            ls.setType("add");
+            ls.setMouseoverText("add relationship");
+            links[0]=ls;
+        }
+        return links;
+    }
+
+    protected LinkStruct[] doDataPropStmt(DataPropertyStatement dpropStmt, String themeDir, EditLinkAccess[] allowedAccessTypeArray, String contextPath) {
+        if( allowedAccessTypeArray == null || dpropStmt == null || allowedAccessTypeArray.length == 0 ) {
+            log.info("null or empty access type array in doDataPropStmt for "+dpropStmt.getDatapropURI());
+            return empty_array;
+        }
+        LinkStruct[] links = new LinkStruct[2];
+        int index=0;
+
+        String dpropHash =  String.valueOf(RdfLiteralHash.makeRdfLiteralHash( dpropStmt ));
+
+        if( contains( allowedAccessTypeArray, EditLinkAccess.MODIFY ) ){
+            log.debug("permission found to UPDATE data property statement "+dpropStmt.getDatapropURI()+" ("+dpropStmt.getData()+") so icon created");
+            String url = ( contains( allowedAccessTypeArray, EditLinkAccess.DELETE ) ) 
+                ? makeRelativeHref(contextPath + "edit/editDatapropStmtRequestDispatch.jsp",
+                        "subjectUri",   dpropStmt.getIndividualURI(),
+                        "predicateUri", dpropStmt.getDatapropURI(),
+                        "datapropKey",  dpropHash)
+                : makeRelativeHref(contextPath + "edit/editDatapropStmtRequestDispatch.jsp",
+                        "subjectUri",   dpropStmt.getIndividualURI(),
+                        "predicateUri", dpropStmt.getDatapropURI(),
+                        "datapropKey",  dpropHash,
+                        "deleteProhibited", "prohibited");
+            LinkStruct ls = new LinkStruct();
+            ls.setHref( url );
+            ls.setType("edit");
+            ls.setMouseoverText("edit this text");
+            links[index] = ls;             index++;
+
+
+//             String imgUrl = makeRelativeHref( themeDir + "site_icons/pencil.gif");
+
+//             str += "<a class\"edit image\" href=" + url + " title=\"edit\">" +
+//                     "<img src=" + imgUrl + " alt=\"(edit)\"/></a>\n";
+        } else {
+            log.debug("NO permission to UPDATE this data property statement ("+dpropStmt.getDatapropURI()+") found in policy");
+        }
+        if( contains( allowedAccessTypeArray, EditLinkAccess.DELETE ) ){
+            log.debug("permission found to DELETE data property statement "+dpropStmt.getDatapropURI()+" so icon created");
+            String url = makeRelativeHref(contextPath + "edit/editDatapropStmtRequestDispatch.jsp",
+                                          "subjectUri",   dpropStmt.getIndividualURI(),
+                                          "predicateUri", dpropStmt.getDatapropURI(),
+                                          "datapropKey",  dpropHash,
+                                          "cmd", "delete");
+            LinkStruct ls = new LinkStruct();
+            ls.setHref( url );
+            ls.setType("delete");
+            ls.setMouseoverText("delete this text");
+            links[index] = ls;     index++;
+
+//             String imgUrl = makeRelativeHref( themeDir + "site_icons/trashcan.gif");
+
+//             str += "<a class\"delete image\" href=" + url + " title=\"delete\">" +
+//                     "<img src=" + imgUrl + " alt=\"(delete)\"/></a>\n";
+        } else {
+            log.debug("NO permission to DELETE this data property statement ("+dpropStmt.getDatapropURI()+") found in policy");
+        }
+        return links;
+    }
+
+    protected LinkStruct[] doObjPropStmt(ObjectPropertyStatement opropStmt, String themeDir2, EditLinkAccess[] allowedAccessTypeArray, String contextPath) {
+        if( allowedAccessTypeArray == null || opropStmt == null || allowedAccessTypeArray.length == 0 ) {
+            log.info("null or empty access type array in doObjPropStmt for "+opropStmt.getPropertyURI());
+            return empty_array;
+        }
+        LinkStruct[] links = new LinkStruct[2];
+        int index=0;
+        
+        if( contains( allowedAccessTypeArray, EditLinkAccess.MODIFY ) ){            
+            log.debug("permission found to UPDATE object property statement "+opropStmt.getPropertyURI()+" so icon created");
+            String url = ( contains( allowedAccessTypeArray, EditLinkAccess.DELETE ) ) 
+                ? makeRelativeHref(contextPath + "edit/editRequestDispatch.jsp",
+                    "subjectUri",   opropStmt.getSubjectURI(),
+                    "predicateUri", opropStmt.getPropertyURI(),
+                    "objectUri",    opropStmt.getObjectURI())
+                : makeRelativeHref(contextPath + "edit/editRequestDispatch.jsp",
+                    "subjectUri",   opropStmt.getSubjectURI(),
+                    "predicateUri", opropStmt.getPropertyURI(),
+                    "objectUri",    opropStmt.getObjectURI(),
+                    "deleteProhibited", "prohibited");
+
+            LinkStruct ls = new LinkStruct();
+            ls.setHref( url );
+            ls.setType("edit");
+            ls.setMouseoverText("change this relationship");
+            links[index] = ls; index++;
+
+//             String imgUrl = makeRelativeHref( themeDir + "site_icons/pencil.gif");
+
+//             str += "<a class\"edit image\" href=" + url + " title=\"edit\">" +
+//                     "<img src=" + imgUrl + " alt=\"(edit)\"/></a>\n";
+        } else {
+            log.debug("NO permission to UPDATE this object property statement ("+opropStmt.getPropertyURI()+") found in policy");
+        }
+        if( contains( allowedAccessTypeArray, EditLinkAccess.DELETE ) ){
+            log.debug("permission found to DELETE object property statement "+opropStmt.getPropertyURI()+" so icon created");
+            String url = makeRelativeHref(contextPath + "edit/editRequestDispatch.jsp",
+                    "subjectUri",   opropStmt.getSubjectURI(),
+                    "predicateUri", opropStmt.getPropertyURI(),
+                    "objectUri",    opropStmt.getObjectURI(),
+                    "cmd",          "delete");
+            LinkStruct ls = new LinkStruct();
+            ls.setHref( url );
+            ls.setType("delete");
+            ls.setMouseoverText("delete this relationship");
+            links[index] = ls; index++;
+
+//             String imgUrl = makeRelativeHref( themeDir + "site_icons/trashcan.gif");
+
+//             str += "<a class\"delete image\" href=" + url + " title=\"delete\">" +
+//                     "<img src=" + imgUrl + " alt=\"(delete)\"/></a>\n";
+        } else {
+            log.debug("NO permission to DELETE this object property statement ("+opropStmt.getPropertyURI()+") found in policy");
+        }
+        return links;
+    }
+
+    /* ********************* utility methods ********************************* */
+    protected static String makeRelativeHref( String baseUrl, String ... queries ) {
+        String href = baseUrl;
+        if( queries == null || queries.length % 2 != 0 )
+            log.debug("makeRelativeHref() needs a even number of queries");
+
+        for( int i=0; i < queries.length; i=i+2){
+            String separator = ( i==0 ? "?" : "&amp;" );
+            try {
+                href = href + separator + URLEncoder.encode(queries[i], "UTF-8") + '=' + URLEncoder.encode(queries[i+1],"UTF-8");
+            } catch (UnsupportedEncodingException e) { log.error( e ); }
+        }
+        return href;
+    }
+
+    protected static boolean contains(EditLinkAccess[] allowedAccessTypeArray, EditLinkAccess accessType) {
+        if( allowedAccessTypeArray == null || allowedAccessTypeArray.length == 0 || accessType == null  )
+            return false;
+
+        for( int i=0; i< allowedAccessTypeArray.length ; i ++ ){
+            if( allowedAccessTypeArray[i] == accessType ) return true;
+        }
+        return false;
+    }
+
+    protected String makeElement( LinkStruct ln ){
+        String element = 
+            "<a class=\"image " + ln.getType() + "\" href=\"" + ln.getHref() + 
+            "\" title=\"" + (ln.getMouseoverText()==null ? ln.getType() : ln.getMouseoverText()) + "\">" ;
+        
+        if( "true".equalsIgnoreCase(getIcons()) ){
+            String contextPath=((HttpServletRequest)pageContext.getRequest()).getContextPath();
+            String imagePath=null;
+            if (contextPath==null) {
+                imagePath = ICON_DIR + ln.getType() + ".gif";
+                log.debug("image path when context path null: \""+imagePath+"\".");
+            } else if (contextPath.equals("")) {
+                imagePath = ICON_DIR + ln.getType() + ".gif";
+                log.debug("image path when context path blank: \""+imagePath+"\".");
+            } else {
+                imagePath = contextPath + ICON_DIR + ln.getType() + ".gif";
+                log.debug("image path when non-zero context path (\""+contextPath+"\"): \""+imagePath+"\".");
+            }
+            element +=  "<img src=\"" + imagePath+ "\" alt=\"" + ln.getType() + "\"/>";            
+        } else {                          
+            element +=  ln.getType() ;
+        }        
+        return element + "</a>\n";
+    }
+
+   
+    
+//    protected Map<Property,EditLinkAccess[]> getAccess(){
+//        //right now we return an all access, all the time hashmap.
+//        return new HashMap<Property,EditLinkAccess[]>(){
+//
+//            public boolean containsKey(Object key) { return true; }
+//
+//            public EditLinkAccess[] get(Object key) {
+//                    EditLinkAccess[] ela = { EditLinkAccess.MODIFY,
+//                            EditLinkAccess.DELETE, EditLinkAccess.ADDNEW,
+//                            EditLinkAccess.INFO, EditLinkAccess.ADMIN  };
+//                    return ela;
+//            }
+//            public boolean isEmpty() { return false; }
+//        };
+//    }
+//    
+    
+    public static final EditLinkAccess[] NO_ACCESS = {};
+    public static final EditLinkAccess[] ACCESS_TEMPLATE = {}; 
+
+    protected EditLinkAccess[] policyToAccess( IdentifierBundle ids, PolicyIface policy, String subjectUri, ObjectProperty item){
+        EditLinkAccess[] allowedAccessTypeArray;
+        
+        RequestedAction action = new AddObjectPropStmt(subjectUri, item.getURI(), RequestActionConstants.SOME_URI);
+        PolicyDecision dec = policy.isAuthorized(ids, action);
+        
+        if( dec != null && dec.getAuthorized() == Authorization.AUTHORIZED ){
+            allowedAccessTypeArray = new EditLinkAccess[1];
+            allowedAccessTypeArray[0] = EditLinkAccess.ADDNEW;
+        }else
+            allowedAccessTypeArray = NO_ACCESS;
+        
+        return allowedAccessTypeArray;
+    }
+
+    protected EditLinkAccess[] policyToAccess( IdentifierBundle ids, PolicyIface policy, ObjectPropertyStatement item){
+        ArrayList<EditLinkAccess> list = new ArrayList<EditLinkAccess>(2);
+        
+        RequestedAction action = new EditObjPropStmt( item );
+        PolicyDecision dec = policy.isAuthorized(ids, action);        
+        if( dec != null && dec.getAuthorized() == Authorization.AUTHORIZED ){
+            list.add( EditLinkAccess.MODIFY);
+        }
+        
+        action = new DropObjectPropStmt(item.getSubjectURI(), item.getPropertyURI(), item.getObjectURI());
+        dec = policy.isAuthorized(ids, action);        
+        if( dec != null && dec.getAuthorized() == Authorization.AUTHORIZED ){
+            list.add( EditLinkAccess.DELETE );
+        }                        
+        return list.toArray(ACCESS_TEMPLATE);
+    }
+
+    protected EditLinkAccess[] policyToAccess( IdentifierBundle ids,  PolicyIface policy, DataPropertyStatement item) {
+        ArrayList<EditLinkAccess> list = new ArrayList<EditLinkAccess>(2);
+        
+        RequestedAction action = new EditDataPropStmt( item );
+        PolicyDecision dec = policy.isAuthorized(ids, action);        
+        if(  dec != null && dec.getAuthorized() == Authorization.AUTHORIZED ){
+            list.add( EditLinkAccess.MODIFY);
+        }
+        
+        action = new DropDataPropStmt( item );
+        dec = policy.isAuthorized(ids, action);        
+        if( dec != null && dec.getAuthorized() == Authorization.AUTHORIZED ){
+            list.add( EditLinkAccess.DELETE );
+        }                        
+        return list.toArray(ACCESS_TEMPLATE);
+    }
+
+    protected EditLinkAccess[] policyToAccess( IdentifierBundle ids, PolicyIface policy, String subjectUri, DataProperty item) {
+        EditLinkAccess[] access;
+        
+        RequestedAction action = new AddDataPropStmt(subjectUri, item.getURI(), RequestActionConstants.SOME_LITERAL, null, null);
+        PolicyDecision dec = policy.isAuthorized(ids, action);
+        
+        if(  dec != null && dec.getAuthorized() == Authorization.AUTHORIZED ){
+            access = new EditLinkAccess[1];
+            access[0] = EditLinkAccess.ADDNEW;
+        }else
+            access = NO_ACCESS;
+        
+        return access;
+    }
+
+    public enum EditLinkAccess{ MODIFY, DELETE, ADDNEW, INFO, ADMIN  };
+
+    public class LinkStruct {
+        String href;
+        String type;
+        String mouseoverText;
+        
+        public String getHref() {
+            return href;
+        }
+        public void setHref(String href) {
+            this.href = href;
+        }
+        public String getType() {
+            return type;
+        }
+        public void setType(String type) {
+            this.type = type;
+        }
+        
+        public String getMouseoverText() {
+            return mouseoverText;
+        }
+        
+        public void setMouseoverText(String s) {
+            mouseoverText = s;
+        }
+        
+    }
+
+//    public interface CheckAccess{
+//        boolean access(ObjectProperty prop,          EditLinkAccess access );
+//        boolean access(DataProperty   prop,          EditLinkAccess access );
+//        boolean access(ObjectPropertyStatement stmt, EditLinkAccess access );   
+//        boolean access(DataPropertyStatement   stmt, EditLinkAccess access );        
+//    }
+
+    private LinkStruct[] empty_array = {};
+}

webapp/web/edit/editDatapropStmtRequestDispatch.jsp

@@ -70,21 +70,26 @@
     Individual subject = wdf.getIndividualDao().getIndividualByURI(subjectUri);
     if( subject == null ) {
         log.error("Could not find subject Individual '"+subjectUri+"' in model");
-        throw new Error("editDatapropStmtRequest.jsp: Could not find subject Individual in model: '" + subjectUri + "'");
+        throw new Error("editDatapropStmtRequestDispatch.jsp: Could not find subject Individual in model: '" + subjectUri + "'");
     }
     vreq.setAttribute("subject", subject);
 
     DataProperty dataproperty = wdf.getDataPropertyDao().getDataPropertyByURI( predicateUri );
     if( dataproperty == null) {
+        // We must have either a dataproperty or a custom form
+        // A custom form is used for a vitro namespace property
+        if (formParam == null) {
             log.error("Could not find data property '"+predicateUri+"' in model");
             throw new Error("editDatapropStmtRequest.jsp: Could not find DataProperty in model: " + predicateUri);
         }
+    }
+    else {
         vreq.setAttribute("predicate", dataproperty);
+    }
 
     String url= "/edit/editDatapropStmtRequestDispatch.jsp"; //I'd like to get this from the request but...
     vreq.setAttribute("formUrl", url + "?" + vreq.getQueryString());
 
-
     String datapropKeyStr = vreq.getParameter("datapropKey");
     int dataHash = 0;
     if( datapropKeyStr != null ){
@@ -112,7 +117,7 @@
     if( log.isDebugEnabled() ){
         log.debug("predicate for DataProperty from request is " + dataproperty.getURI() + " with rangeDatatypeUri of '" + dataproperty.getRangeDatatypeURI() + "'");
         if( dps == null )
-            log.debug("no exisitng DataPropertyStatement statement was found, making a new statemet");
+            log.debug("no existng DataPropertyStatement statement was found, making a new statemet");
         else{
             log.debug("Found an existing DataPropertyStatement");
             String msg = "existing datapropstmt: ";

webapp/web/edit/forms/vitroNsLabelForm.jsp

@@ -0,0 +1 @@
+In vitroNsLabelForm

webapp/web/templates/entity/entityBasic.jsp

@@ -10,8 +10,10 @@
 <%@ page import="org.apache.commons.logging.Log" %>
 <%@ page import="org.apache.commons.logging.LogFactory" %>
 <%@ page import="java.util.List" %>
+
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <%@ taglib uri="http://vitro.mannlib.cornell.edu/vitro/tags/StringProcessorTag" prefix="p" %>
+<%@ taglib uri="http://vitro.mannlib.cornell.edu/vitro/tags/PropertyEditLink" prefix="edLnk" %>
 
 <%@ page errorPage="/error.jsp"%>
 <%! 
@@ -50,6 +52,9 @@ if (VitroRequestPrep.isSelfEditing(request) || LoginFormBean.loggedIn(request, L
               sessionScope.loginHandler.loginRole >= LoginFormBean.NON_EDITOR}">
     <c:set var="showCuratorEdits" value="${true}"/>
 </c:if>
+
+<c:set var="showEdits" value="${showSelfEdits || showCuratorEdits}" />
+
 <c:set var='imageDir' value='images' />
 <c:set var="themeDir"><c:out value="${portalBean.themeDir}" /></c:set>
 <%
@@ -73,6 +78,10 @@ if (VitroRequestPrep.isSelfEditing(request) || LoginFormBean.loggedIn(request, L
 <c:set var='portal' value='${currentPortalId}'/>
 <c:set var='portalBean' value='${currentPortal}'/>
 
+<c:set var="vitroNsUri" value="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#" />
+<c:set var="typeUri" value="http://www.w3.org/1999/02/22-rdf-syntax-ns#type" />
+<c:set var="labelUri" value="http://www.w3.org/2000/01/rdf-schema#label" />
+
 <c:set var='themeDir'><c:out value='${portalBean.themeDir}' /></c:set>
 
     <div id="content">
@@ -91,7 +100,14 @@ if (VitroRequestPrep.isSelfEditing(request) || LoginFormBean.loggedIn(request, L
                     <p><a href="${backToSubjectLink}">&larr; return to ${relatedSubject.name}</a></p>
 	            </c:when>
 	            <c:otherwise>
+	            <div class="vitroNsPropertyValue">
+                    <div class="statementWrap">
 	                   <h2><p:process>${entity.name}</p:process></h2> 
+	                   <c:if test="${showEdits}">
+                            <c:set var="editLinks"><edLnk:editLinks item="${labelUri}" icons="false"/></c:set>
+                            <c:if test="${!empty editLinks}"><span class="editLinks">${editLinks}</span></c:if>             
+                        </c:if>
+                    </div></div>
 	                <c:if test="${!empty entity.moniker}">
 	                    <p:process><em class="moniker">${entity.moniker}</em></p:process>
 	                </c:if>
@@ -142,7 +158,7 @@ if (VitroRequestPrep.isSelfEditing(request) || LoginFormBean.loggedIn(request, L
                 <div class='description'>${entity.description}</div>
             </p:process>
             <c:choose>
-                <c:when test="${showCuratorEdits || showSelfEdits}">
+                <c:when test="${showEdits}">
                      <c:import url="${entityMergedPropsListJsp}">
                          <c:param name="mode" value="edit"/>
                          <c:param name="grouped" value="false"/>