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

sorting checkboxes on property edit pages

Browse source
This commit is contained in:
brianjlowe 2013-10-17 09:53:03 -04:00
parent c201e7389f
commit 7e20ef9e6e
2 changed files with 48 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java
View file

@ -6,7 +6,6 @@ import java.io.UnsupportedEncodingException;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator;
import java.util.List; import java.util.List;
import javax.servlet.RequestDispatcher; import javax.servlet.RequestDispatcher;
@ -143,43 +142,20 @@ public class DatapropEditController extends BaseEditController {
DataPropertyDao assertionsDpDao = vreq.getUnfilteredAssertionsWebappDaoFactory().getDataPropertyDao(); DataPropertyDao assertionsDpDao = vreq.getUnfilteredAssertionsWebappDaoFactory().getDataPropertyDao();
List superURIs = assertionsDpDao.getSuperPropertyURIs(dp.getURI(),false); List<DataProperty> superProps = getDataPropertiesForURIList(
List superProperties = new ArrayList(); assertionsDpDao.getSuperPropertyURIs(dp.getURI(), false), assertionsDpDao);
Iterator superURIit = superURIs.iterator(); sortForPickList(superProps, vreq);
while (superURIit.hasNext()) { request.setAttribute("superproperties", superProps);
String superURI = (String) superURIit.next();
if (superURI != null) {
DataProperty superProperty = assertionsDpDao.getDataPropertyByURI(superURI);
if (superProperty != null) {
superProperties.add(superProperty);
}
}
}
request.setAttribute("superproperties",superProperties);
List subURIs = assertionsDpDao.getSubPropertyURIs(dp.getURI()); List<DataProperty> subProps = getDataPropertiesForURIList(
List subProperties = new ArrayList(); assertionsDpDao.getSubPropertyURIs(dp.getURI()), assertionsDpDao);
Iterator subURIit = subURIs.iterator(); sortForPickList(subProps, vreq);
while (subURIit.hasNext()) { request.setAttribute("subproperties", subProps);
String subURI = (String) subURIit.next();
DataProperty subProperty = dpDao.getDataPropertyByURI(subURI);
if (subProperty != null) {
subProperties.add(subProperty);
}
}
request.setAttribute("subproperties",subProperties);
List eqURIs = assertionsDpDao.getEquivalentPropertyURIs(dp.getURI()); List<DataProperty> eqProps = getDataPropertiesForURIList(
List eqProperties = new ArrayList(); assertionsDpDao.getEquivalentPropertyURIs(dp.getURI()), assertionsDpDao);
Iterator eqURIit = eqURIs.iterator(); sortForPickList(eqProps, vreq);
while (eqURIit.hasNext()) { request.setAttribute("equivalentProperties", eqProps);
String eqURI = (String) eqURIit.next();
DataProperty eqProperty = dpDao.getDataPropertyByURI(eqURI);
if (eqProperty != null) {
eqProperties.add(eqProperty);
}
}
request.setAttribute("equivalentProperties", eqProperties);
ApplicationBean appBean = vreq.getAppBean(); ApplicationBean appBean = vreq.getAppBean();
@ -202,5 +178,17 @@ public class DatapropEditController extends BaseEditController {
public void doGet (HttpServletRequest request, HttpServletResponse response) { public void doGet (HttpServletRequest request, HttpServletResponse response) {
doPost(request,response); doPost(request,response);
} }
private List<DataProperty> getDataPropertiesForURIList(List<String> propertyURIs,
DataPropertyDao dpDao) {
List<DataProperty> properties = new ArrayList<DataProperty>();
for (String propertyURI : propertyURIs) {
DataProperty property = dpDao.getDataPropertyByURI(propertyURI);
if (property != null) {
properties.add(property);
}
}
return properties;
}
} }

59
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyEditController.java
View file

@ -194,43 +194,20 @@ public class PropertyEditController extends BaseEditController {
// superproperties and subproperties // superproperties and subproperties
ObjectPropertyDao opDao = vreq.getUnfilteredAssertionsWebappDaoFactory().getObjectPropertyDao(); ObjectPropertyDao opDao = vreq.getUnfilteredAssertionsWebappDaoFactory().getObjectPropertyDao();
List superURIs = opDao.getSuperPropertyURIs(p.getURI(),false); List<ObjectProperty> superProps = getObjectPropertiesForURIList(
List superProperties = new ArrayList(); opDao.getSuperPropertyURIs(p.getURI(), false), opDao);
Iterator superURIit = superURIs.iterator(); sortForPickList(superProps, vreq);
while (superURIit.hasNext()) { request.setAttribute("superproperties", superProps);
String superURI = (String) superURIit.next();
if (superURI != null) {
ObjectProperty superProperty = opDao.getObjectPropertyByURI(superURI);
if (superProperty != null) {
superProperties.add(superProperty);
}
}
}
request.setAttribute("superproperties",superProperties);
List subURIs = opDao.getSubPropertyURIs(p.getURI()); List<ObjectProperty> subProps = getObjectPropertiesForURIList(
List subProperties = new ArrayList(); opDao.getSubPropertyURIs(p.getURI()), opDao);
Iterator subURIit = subURIs.iterator(); sortForPickList(subProps, vreq);
while (subURIit.hasNext()) { request.setAttribute("subproperties", subProps);
String subURI = (String) subURIit.next();
ObjectProperty subProperty = opDao.getObjectPropertyByURI(subURI);
if (subProperty != null) {
subProperties.add(subProperty);
}
}
request.setAttribute("subproperties",subProperties);
List eqURIs = opDao.getEquivalentPropertyURIs(p.getURI()); List<ObjectProperty> eqProps = getObjectPropertiesForURIList(
List eqProperties = new ArrayList(); opDao.getEquivalentPropertyURIs(p.getURI()), opDao);
Iterator eqURIit = eqURIs.iterator(); sortForPickList(eqProps, vreq);
while (eqURIit.hasNext()) { request.setAttribute("equivalentProperties", eqProps);
String eqURI = (String) eqURIit.next();
ObjectProperty eqProperty = opDao.getObjectPropertyByURI(eqURI);
if (eqProperty != null) {
eqProperties.add(eqProperty);
}
}
request.setAttribute("equivalentProperties", eqProperties);
RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP);
request.setAttribute("epoKey",epo.getKey()); request.setAttribute("epoKey",epo.getKey());
@ -252,5 +229,17 @@ public class PropertyEditController extends BaseEditController {
public void doGet (HttpServletRequest request, HttpServletResponse response) { public void doGet (HttpServletRequest request, HttpServletResponse response) {
doPost(request,response); doPost(request,response);
} }
private List<ObjectProperty> getObjectPropertiesForURIList(List<String> propertyURIs,
ObjectPropertyDao opDao) {
List<ObjectProperty> properties = new ArrayList<ObjectProperty>();
for (String propertyURI : propertyURIs) {
ObjectProperty property = opDao.getObjectPropertyByURI(propertyURI);
if (property != null) {
properties.add(property);
}
}
return properties;
}
} }