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

Clarify login in fillDataPropertiesForIndividual by using generic-types on collections, and converting to new-style for loops.

Browse source
This commit is contained in:
j2blake 2011-07-17 13:59:53 +00:00
parent cdd0d2f733
commit 12e6af44f5
1 changed files with 15 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java
View file

@ -59,10 +59,9 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
protected static final Log log = LogFactory.getLog(DataPropertyDaoJena.class.getName()); protected static final Log log = LogFactory.getLog(DataPropertyDaoJena.class.getName());
private class DataPropertyRanker implements Comparator { private class DataPropertyRanker implements Comparator<DataProperty> {
public int compare (Object o1, Object o2) { @Override
DataProperty dp1 = (DataProperty) o1; public int compare (DataProperty dp1, DataProperty dp2) {
DataProperty dp2 = (DataProperty) o2;
int diff = dp1.getDisplayTier() - dp2.getDisplayTier(); int diff = dp1.getDisplayTier() - dp2.getDisplayTier();
if (diff==0) if (diff==0)
return dp1.getPublicName().compareTo(dp2.getPublicName()); return dp1.getPublicName().compareTo(dp2.getPublicName());
@ -127,22 +126,23 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
removeABoxStatementsWithPredicate(URI); removeABoxStatementsWithPredicate(URI);
} }
@Override
public void fillDataPropertiesForIndividual(Individual entity) { public void fillDataPropertiesForIndividual(Individual entity) {
if( entity == null ) return; if( entity == null ) return;
List dataprops = new ArrayList(); List<DataProperty> dataprops = new ArrayList<DataProperty>();
dataprops.addAll( getDataPropertyStatements(entity.getDataPropertyStatements()) ); dataprops.addAll( getDataPropertyStatements(entity.getDataPropertyStatements()) );
entity.setDatatypePropertyList(dataprops); entity.setDatatypePropertyList(dataprops);
} }
private List getDataPropertyStatements(List dataPropertyStmts) { private List<DataProperty> getDataPropertyStatements(List<DataPropertyStatement> dataPropertyStmts) {
if( dataPropertyStmts == null || dataPropertyStmts.size() < 1) return new ArrayList(); if (dataPropertyStmts == null || dataPropertyStmts.isEmpty()) {
HashMap hash = new HashMap(); return new ArrayList<DataProperty>();
String uris =""; }
Iterator it = dataPropertyStmts.iterator();
while(it.hasNext()){ HashMap<String, DataProperty> hash = new HashMap<String, DataProperty>();
DataPropertyStatement dataPropertyStmt = (DataPropertyStatement)it.next(); for (DataPropertyStatement dataPropertyStmt: dataPropertyStmts) {
if (hash.containsKey(dataPropertyStmt.getDatapropURI())) { if (hash.containsKey(dataPropertyStmt.getDatapropURI())) {
DataProperty p = (DataProperty) hash.get(dataPropertyStmt.getDatapropURI()); DataProperty p = hash.get(dataPropertyStmt.getDatapropURI());
p.addDataPropertyStatement(dataPropertyStmt); p.addDataPropertyStatement(dataPropertyStmt);
} else { } else {
OntModel ontModel = getOntModelSelector().getTBoxModel(); OntModel ontModel = getOntModelSelector().getTBoxModel();
@ -160,12 +160,7 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
} }
} }
List dataprops = new ArrayList(); List<DataProperty> dataprops = new ArrayList<DataProperty>(hash.values());
Iterator keyIt = hash.keySet().iterator();
while (keyIt.hasNext()) {
Object key = keyIt.next();
dataprops.add(hash.get(key));
}
Collections.sort(dataprops, new DataPropertyRanker()); Collections.sort(dataprops, new DataPropertyRanker());
return dataprops; return dataprops;
} }