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

resolves issue NIHVIVO-175 'allow rdfs:Literal in restrictions

Browse source
This commit is contained in:
bjl23 2010-03-26 19:35:48 +00:00
parent 5051879764
commit 5471893d88
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionRetryController.java
View file

@ -15,6 +15,7 @@ import javax.servlet.http.HttpServletResponse;
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 com.hp.hpl.jena.vocabulary.RDFS;
import com.ibm.icu.text.Collator; import com.ibm.icu.text.Collator;
import edu.cornell.mannlib.vedit.beans.EditProcessObject; import edu.cornell.mannlib.vedit.beans.EditProcessObject;
@ -96,9 +97,6 @@ public class RestrictionRetryController extends BaseEditController {
request.setAttribute("propertyType", "object"); request.setAttribute("propertyType", "object");
} else { } else {
request.setAttribute("propertyType", "data"); request.setAttribute("propertyType", "data");
List<Option> datatypeOptions = getValueDatatypeOptionList();
datatypeOptions.add(0, new Option("", "none (plain literal)"));
epo.getFormObject().getOptionLists().put("ValueDatatype", datatypeOptions);
} }
} else if (restrictionTypeStr.equals("minCardinality") || restrictionTypeStr.equals("maxCardinality") || restrictionTypeStr.equals("cardinality")) { } else if (restrictionTypeStr.equals("minCardinality") || restrictionTypeStr.equals("maxCardinality") || restrictionTypeStr.equals("cardinality")) {
request.setAttribute("specificRestrictionForm", "cardinalityRestriction_retry.jsp"); request.setAttribute("specificRestrictionForm", "cardinalityRestriction_retry.jsp");
@ -137,13 +135,14 @@ public class RestrictionRetryController extends BaseEditController {
} }
private List<Option> getValueDatatypeOptionList() { private List<Option> getValueDatatypeOptionList() {
List<Option> valueClassOptionList = new LinkedList<Option>(); List<Option> valueDatatypeOptionList = new LinkedList<Option>();
DatatypeDao dtDao = getWebappDaoFactory().getDatatypeDao(); DatatypeDao dtDao = getWebappDaoFactory().getDatatypeDao();
for (Iterator i = dtDao.getAllDatatypes().iterator(); i.hasNext(); ) { for (Iterator i = dtDao.getAllDatatypes().iterator(); i.hasNext(); ) {
Datatype dt = (Datatype) i.next(); Datatype dt = (Datatype) i.next();
valueClassOptionList.add(new Option(dt.getUri(), dt.getName())); valueDatatypeOptionList.add(new Option(dt.getUri(), dt.getName()));
} }
return valueClassOptionList; valueDatatypeOptionList.add(new Option(RDFS.Literal.getURI(), "rdfs:Literal"));
return valueDatatypeOptionList;
} }
private class PropSorter implements Comparator<Property> { private class PropSorter implements Comparator<Property> {