From c7b104ca40f74b3d5dbddfd6d7603394aff26bb7 Mon Sep 17 00:00:00 2001 From: j2blake Date: Tue, 7 May 2013 13:27:44 -0400 Subject: [PATCH] Cleanup: remove unused imports and unneeded casts. --- .../webapp/dao/jena/DataPropertyDaoJena.java | 23 +++++------ .../jena/DataPropertyStatementDaoJena.java | 13 +++--- .../dao/jena/DataPropertyStatementDaoSDB.java | 8 +--- .../webapp/dao/jena/DatatypeDaoJena.java | 4 -- .../dao/jena/DependentResourceDeleteJena.java | 6 +-- .../webapp/dao/jena/DisplayModelDaoJena.java | 3 -- .../vitro/webapp/dao/jena/EmptyReifier.java | 1 - .../webapp/dao/jena/IndividualDaoJena.java | 20 +++++----- .../webapp/dao/jena/IndividualDaoSDB.java | 4 +- .../vitro/webapp/dao/jena/IndividualJena.java | 14 +++---- .../vitro/webapp/dao/jena/IndividualSDB.java | 15 +++---- .../vitro/webapp/dao/jena/JenaBaseDao.java | 14 +++---- .../webapp/dao/jena/JenaChangeListener.java | 2 - .../vitro/webapp/dao/jena/JenaModelUtils.java | 4 +- .../dao/jena/ObjectPropertyDaoJena.java | 16 ++++---- .../jena/ObjectPropertyStatementDaoJena.java | 4 +- .../jena/ObjectPropertyStatementDaoSDB.java | 2 +- .../webapp/dao/jena/OntologyDaoJena.java | 3 -- .../vitro/webapp/dao/jena/PageDaoJena.java | 1 - .../webapp/dao/jena/PropertyDaoJena.java | 13 +++--- .../webapp/dao/jena/PropertyGroupDaoJena.java | 5 +-- .../dao/jena/PropertyInstanceDaoJena.java | 12 +----- .../webapp/dao/jena/RDFServiceDataset.java | 1 - .../dao/jena/RDFServiceDatasetGraph.java | 5 --- .../dao/jena/RDFServiceGraphBulkUpdater.java | 1 - .../webapp/dao/jena/RDFServiceModelMaker.java | 2 +- .../vitro/webapp/dao/jena/VClassDaoJena.java | 40 +++++++++---------- .../vitro/webapp/dao/jena/VClassDaoSDB.java | 8 +--- .../webapp/dao/jena/VClassGroupCache.java | 3 -- .../webapp/dao/jena/VClassGroupDaoJena.java | 13 +++--- .../vitro/webapp/dao/jena/VClassJena.java | 4 +- .../dao/jena/VitroJenaSpecialModelMaker.java | 3 -- .../webapp/dao/jena/WebappDaoFactoryJena.java | 3 +- ...ObjectPropertyStatementPatternFactory.java | 6 --- .../dao/jena/pellet/PelletListener.java | 4 +- .../utils/ProcessDataGetterN3Map.java | 16 -------- .../utils/ProcessDataGetterN3Utils.java | 13 ------ .../webapp/servlet/setup/WebappDaoSetup.java | 33 +++++---------- .../IndividualsForClassesDataGetter.java | 12 ------ 39 files changed, 113 insertions(+), 241 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java index 8a1ce1189..0d4d77a9b 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java @@ -8,7 +8,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Comparator; import java.util.HashMap; -import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -24,7 +23,6 @@ import com.hp.hpl.jena.ontology.OntProperty; import com.hp.hpl.jena.ontology.OntResource; import com.hp.hpl.jena.ontology.ProfileException; import com.hp.hpl.jena.ontology.Restriction; -import com.hp.hpl.jena.ontology.SomeValuesFromRestriction; import com.hp.hpl.jena.query.Query; import com.hp.hpl.jena.query.QueryExecution; import com.hp.hpl.jena.query.QueryExecutionFactory; @@ -53,7 +51,6 @@ import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao; import edu.cornell.mannlib.vitro.webapp.dao.InsertException; import edu.cornell.mannlib.vitro.webapp.dao.OntologyDao; -import edu.cornell.mannlib.vitro.webapp.dao.VClassDao; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.jena.event.EditEvent; import edu.cornell.mannlib.vitro.webapp.dao.jena.pellet.PelletListener; @@ -93,7 +90,7 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements try { com.hp.hpl.jena.ontology.OntResource ind = ontModel.getOntResource(dataPropertyURI); if( ind != null ){ - ontModel.add(ind,(Property)DATAPROPERTY_ISEXTERNALID, "TRUE"); + ontModel.add(ind, DATAPROPERTY_ISEXTERNALID, "TRUE"); return true; }else{ return false; @@ -114,7 +111,7 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements while(restIt.hasNext()) { Resource restRes = restIt.next(); if (restRes.canAs(OntResource.class)) { - OntResource restOntRes = (OntResource) restRes.as(OntResource.class); + OntResource restOntRes = restRes.as(OntResource.class); smartRemove(restOntRes, ontModel); } } @@ -181,7 +178,7 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements dp.setNamespace(op.getNameSpace()); dp.setLocalName(op.getLocalName()); OntologyDao oDao=getWebappDaoFactory().getOntologyDao(); - Ontology o = (Ontology)oDao.getOntologyByURI(dp.getNamespace()); + Ontology o = oDao.getOntologyByURI(dp.getNamespace()); if (o==null) { if (!VitroVocabulary.vitroURI.equals(dp.getNamespace())) { log.debug("datapropFromOntProperty(): no ontology object found for the namespace "+dp.getNamespace()); @@ -206,8 +203,8 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements dp.setExample(getPropertyStringValue(op,EXAMPLE_ANNOT)); dp.setDescription(getPropertyStringValue(op,DESCRIPTION_ANNOT)); dp.setPublicDescription(getPropertyStringValue(op,PUBLIC_DESCRIPTION_ANNOT)); - dp.setDisplayTier(((WebappDaoFactoryJena)getWebappDaoFactory()).getJenaBaseDao().getPropertyNonNegativeIntValue(op, DISPLAY_RANK_ANNOT)); - dp.setDisplayLimit(((WebappDaoFactoryJena)getWebappDaoFactory()).getJenaBaseDao().getPropertyNonNegativeIntValue(op, DISPLAY_LIMIT)); + dp.setDisplayTier((getWebappDaoFactory()).getJenaBaseDao().getPropertyNonNegativeIntValue(op, DISPLAY_RANK_ANNOT)); + dp.setDisplayLimit((getWebappDaoFactory()).getJenaBaseDao().getPropertyNonNegativeIntValue(op, DISPLAY_LIMIT)); //There might be multiple HIDDEN_FROM_DISPLAY_BELOW_ROLE_LEVEL_ANNOT properties, only use the highest StmtIterator it = op.listProperties(HIDDEN_FROM_DISPLAY_BELOW_ROLE_LEVEL_ANNOT); @@ -216,7 +213,7 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements Statement stmt = it.nextStatement(); RDFNode obj; if( stmt != null && (obj = stmt.getObject()) != null && obj.isURIResource() ){ - Resource res = (Resource)obj.as(Resource.class); + Resource res = obj.as(Resource.class); if( res != null && res.getURI() != null ){ BaseResourceBean.RoleLevel roleFromModel = BaseResourceBean.RoleLevel.getRoleByUri(res.getURI()); if( roleFromModel != null && @@ -235,7 +232,7 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements Statement stmt = it.nextStatement(); RDFNode obj; if( stmt != null && (obj = stmt.getObject()) != null && obj.isURIResource() ){ - Resource res = (Resource)obj.as(Resource.class); + Resource res = obj.as(Resource.class); if( res != null && res.getURI() != null ){ BaseResourceBean.RoleLevel roleFromModel = BaseResourceBean.RoleLevel.getRoleByUri(res.getURI()); if( roleFromModel != null && @@ -365,7 +362,7 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements while (restIt.hasNext()) { Resource restRes = restIt.next(); if (restRes.canAs(Restriction.class)) { - Restriction rest = (Restriction) restRes.as(Restriction.class); + Restriction rest = restRes.as(Restriction.class); if (rest.isAllValuesFromRestriction()) { AllValuesFromRestriction avfrest = rest.asAllValuesFromRestriction(); if (avfrest.getAllValuesFrom() != null) { @@ -485,7 +482,7 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements } com.hp.hpl.jena.ontology.DatatypeProperty jDataprop = ontModel.createDatatypeProperty(dtp.getURI()); if (dtp.getPublicName() != null && dtp.getPublicName().length() > 0) { - jDataprop.setLabel(dtp.getPublicName(), (String) getDefaultLanguage()); + jDataprop.setLabel(dtp.getPublicName(), getDefaultLanguage()); } else { jDataprop.removeAll(RDFS.label); } @@ -609,7 +606,7 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements while (parentNodeIt.hasNext()) { RDFNode parentNode = parentNodeIt.next(); if (parentNode.canAs(Property.class)) { - parentList.add((Property) parentNode.as(Property.class)); + parentList.add(parentNode.as(Property.class)); } } if (parentList.size()==0) { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoJena.java index 600d0fa4d..9abceea00 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoJena.java @@ -10,6 +10,9 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import com.hp.hpl.jena.datatypes.TypeMapper; import com.hp.hpl.jena.ontology.OntModel; import com.hp.hpl.jena.ontology.OntResource; @@ -27,7 +30,6 @@ import com.hp.hpl.jena.rdf.model.Literal; import com.hp.hpl.jena.rdf.model.Model; import com.hp.hpl.jena.rdf.model.ModelFactory; import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; import com.hp.hpl.jena.rdf.model.Resource; import com.hp.hpl.jena.rdf.model.ResourceFactory; import com.hp.hpl.jena.rdf.model.Statement; @@ -40,14 +42,9 @@ import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatementImpl; import edu.cornell.mannlib.vitro.webapp.beans.Individual; -import edu.cornell.mannlib.vitro.webapp.controller.edit.ReorderController; import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyStatementDao; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.jena.event.IndividualUpdateEvent; -import edu.cornell.mannlib.vitro.webapp.dao.jena.ObjectPropertyStatementDaoJena; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; public class DataPropertyStatementDaoJena extends JenaBaseDao implements DataPropertyStatementDao { @@ -114,7 +111,7 @@ public class DataPropertyStatementDaoJena extends JenaBaseDao implements DataPro StmtIterator stmtIt = ind.listProperties(); while( stmtIt.hasNext() ) { - Statement st = (Statement)stmtIt.next(); + Statement st = stmtIt.next(); boolean addToList = /*allowAnyNameSpace ? st.getObject().canAs(Literal.class) :*/ st.getObject().isLiteral() && ( (RDF.value.equals(st.getPredicate()) || VitroVocabulary.value.equals(st.getPredicate().getURI())) @@ -210,7 +207,7 @@ public class DataPropertyStatementDaoJena extends JenaBaseDao implements DataPro // do something annoying if we are dealing with a blank node try { getOntModel().enterCriticalSection(Lock.READ); - OntResource ontRes = (OntResource) getOntModel().createResource( + OntResource ontRes = getOntModel().createResource( new AnonId(entity.getLocalName())).as(OntResource.class); if (ontRes == null) { return edList; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoSDB.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoSDB.java index dcdc82f19..64f39301c 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoSDB.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoSDB.java @@ -3,7 +3,6 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena; import java.util.ArrayList; -import java.util.Collection; import java.util.List; import com.hp.hpl.jena.ontology.OntModel; @@ -12,20 +11,15 @@ import com.hp.hpl.jena.query.Dataset; import com.hp.hpl.jena.query.QueryExecution; import com.hp.hpl.jena.query.QueryExecutionFactory; import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.QuerySolutionMap; -import com.hp.hpl.jena.query.ResultSet; import com.hp.hpl.jena.rdf.model.Literal; import com.hp.hpl.jena.rdf.model.Model; import com.hp.hpl.jena.rdf.model.ModelFactory; import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; import com.hp.hpl.jena.rdf.model.Statement; import com.hp.hpl.jena.rdf.model.StmtIterator; import com.hp.hpl.jena.shared.Lock; import com.hp.hpl.jena.vocabulary.RDF; -import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatementImpl; import edu.cornell.mannlib.vitro.webapp.beans.Individual; @@ -85,7 +79,7 @@ public class DataPropertyStatementDaoSDB extends DataPropertyStatementDaoJena StmtIterator stmtIt = ind.listProperties(); while( stmtIt.hasNext() ) { - Statement st = (Statement)stmtIt.next(); + Statement st = stmtIt.next(); boolean addToList = /*allowAnyNameSpace ? st.getObject().canAs(Literal.class) :*/ st.getObject().isLiteral() && ( (RDF.value.equals(st.getPredicate()) || VitroVocabulary.value.equals(st.getPredicate().getURI())) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DatatypeDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DatatypeDaoJena.java index f6a41b3bc..c0d31c9ee 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DatatypeDaoJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DatatypeDaoJena.java @@ -4,14 +4,10 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena; import java.util.ArrayList; import java.util.HashMap; -import java.util.HashSet; import java.util.List; -import com.hp.hpl.jena.ontology.OntModel; - import edu.cornell.mannlib.vitro.webapp.beans.Datatype; import edu.cornell.mannlib.vitro.webapp.dao.DatatypeDao; -import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; public class DatatypeDaoJena extends JenaBaseDao implements DatatypeDao { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DependentResourceDeleteJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DependentResourceDeleteJena.java index 08b879c0b..8583ebe93 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DependentResourceDeleteJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DependentResourceDeleteJena.java @@ -9,7 +9,6 @@ import java.util.List; import java.util.ListIterator; import java.util.Set; -import com.hp.hpl.jena.ontology.OntModel; import com.hp.hpl.jena.rdf.model.Model; import com.hp.hpl.jena.rdf.model.ModelFactory; import com.hp.hpl.jena.rdf.model.Property; @@ -89,14 +88,13 @@ public class DependentResourceDeleteJena { * Find all statements where for a given statement in the assertions, * there is at least one statement in the retractions that has * the same predicate and object. */ - @SuppressWarnings("unchecked") private static List getChangedStmts(Model assertions, Model retractions){ List changedStmts = new LinkedList(); StmtIterator it = assertions.listStatements(); while(it.hasNext()){ Statement assertionStmtStatement = it.nextStatement(); if( assertionStmtStatement.getObject().canAs( Resource.class )){ - Resource asserObj = (Resource) assertionStmtStatement.getObject().as(Resource.class); + Resource asserObj = assertionStmtStatement.getObject().as(Resource.class); StmtIterator retractionStmts = retractions.listStatements( (Resource)null, @@ -138,7 +136,7 @@ public class DependentResourceDeleteJena { if( ( obj.canAs(Resource.class) && isPredicateDependencyRelation(stmt.getPredicate(), model) ) || ( obj.isAnon() && perviousWasDependentResource ) ){ - Resource res = (Resource)obj.as(Resource.class); + Resource res = obj.as(Resource.class); String id = res.isAnon()?res.getId().toString():res.getURI(); if( !visitedUris.contains(id) ){ diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DisplayModelDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DisplayModelDaoJena.java index d1568e413..59af49fa8 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DisplayModelDaoJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DisplayModelDaoJena.java @@ -7,9 +7,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.FileReader; -import java.io.FileWriter; import java.io.IOException; -import java.io.InputStream; import java.io.StringReader; import java.nio.channels.FileChannel; @@ -22,7 +20,6 @@ import com.hp.hpl.jena.rdf.model.Property; import com.hp.hpl.jena.rdf.model.Resource; import com.hp.hpl.jena.rdf.model.ResourceFactory; import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.util.FileManager; import edu.cornell.mannlib.vitro.webapp.dao.DisplayModelDao; import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/EmptyReifier.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/EmptyReifier.java index 064dce350..ac29c9077 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/EmptyReifier.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/EmptyReifier.java @@ -2,7 +2,6 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena; -import java.util.ArrayList; import java.util.Collections; import org.apache.commons.collections.iterators.EmptyIterator; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java index 7293e0dda..ec2a79761 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java @@ -146,7 +146,7 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao { if (theClass.isAnon() && theClass.canAs(UnionClass.class)) { - UnionClass u = (UnionClass) theClass.as(UnionClass.class); + UnionClass u = theClass.as(UnionClass.class); for (OntClass operand : u.listOperands().toList()) { VClass vc = new VClassJena(operand, getWebappDaoFactory()); ents.addAll(getIndividualsByVClass(vc)); @@ -159,8 +159,8 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao { try { while (stmtIt.hasNext()) { Statement stmt = stmtIt.nextStatement(); - OntResource ind = (OntResource) stmt.getSubject().as(OntResource.class); - ents.add(new IndividualJena(ind, (WebappDaoFactoryJena) getWebappDaoFactory())); + OntResource ind = stmt.getSubject().as(OntResource.class); + ents.add(new IndividualJena(ind, getWebappDaoFactory())); } } finally { stmtIt.close(); @@ -232,7 +232,7 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao { ontModel.getBaseModel().notifyEvent(new IndividualCreationEvent(getWebappDaoFactory().getUserURI(),true,entURI)); com.hp.hpl.jena.ontology.Individual ind = ontModel.createIndividual(entURI,cls); if (ent.getName() != null) { - ind.setLabel(ent.getName(), (String) getDefaultLanguage()); + ind.setLabel(ent.getName(), getDefaultLanguage()); } List vclasses = ent.getVClasses(false); if (vclasses != null) { @@ -388,7 +388,7 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao { return 1; } if (res.canAs(OntResource.class)) { - OntResource ontRes = (OntResource) res.as(OntResource.class); + OntResource ontRes = res.as(OntResource.class); smartRemove(ontRes, ontModel); } else { ontModel.removeAll(res,null,null); @@ -420,7 +420,7 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao { OntResource ontRes = (entityURI.startsWith(VitroVocabulary.PSEUDO_BNODE_NS)) ? (OntResource) ontModel.createResource(new AnonId(entityURI.substring(VitroVocabulary.PSEUDO_BNODE_NS.length()))).as(OntResource.class) : ontModel.getOntResource(entityURI); - Individual ent = new IndividualJena(ontRes, (WebappDaoFactoryJena) getWebappDaoFactory()); + Individual ent = new IndividualJena(ontRes, getWebappDaoFactory()); return ent; } catch (Exception ex) { return null; @@ -494,7 +494,7 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao { String subUri = ((Resource)sub).getURI(); if( ! individualsMap.containsKey(subUri)){ com.hp.hpl.jena.ontology.Individual ind = getOntModel().getIndividual(subUri); - individualsMap.put(subUri,new IndividualJena(ind, (WebappDaoFactoryJena) getWebappDaoFactory())); + individualsMap.put(subUri,new IndividualJena(ind, getWebappDaoFactory())); } } @@ -519,7 +519,7 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao { String subUri = ((Resource)sub).getURI(); if( ! individualsMap.containsKey(subUri)){ com.hp.hpl.jena.ontology.Individual ind = getOntModel().getIndividual(subUri); - individualsMap.put(subUri,new IndividualJena(ind, (WebappDaoFactoryJena) getWebappDaoFactory())); + individualsMap.put(subUri,new IndividualJena(ind, getWebappDaoFactory())); } } @@ -544,7 +544,7 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao { String subUri = ((Resource)sub).getURI(); if( ! individualsMap.containsKey(subUri)){ com.hp.hpl.jena.ontology.Individual ind = getOntModel().getIndividual(subUri); - individualsMap.put(subUri,new IndividualJena(ind, (WebappDaoFactoryJena) getWebappDaoFactory())); + individualsMap.put(subUri,new IndividualJena(ind, getWebappDaoFactory())); } } } finally { @@ -594,7 +594,7 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao { continue; } com.hp.hpl.jena.ontology.Individual ind = getOntModel().getIndividual(st.getURI()); - inds.add(new IndividualJena(ind, (WebappDaoFactoryJena) getWebappDaoFactory())); + inds.add(new IndividualJena(ind, getWebappDaoFactory())); } } finally { if( stmts != null ) stmts.close(); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoSDB.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoSDB.java index 388a69078..6ddec9a32 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoSDB.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoSDB.java @@ -106,7 +106,7 @@ public class IndividualDaoSDB extends IndividualDaoJena { : ResourceFactory.createResource(vclassURI); if (theClass.isAnon() && theClass.canAs(UnionClass.class)) { - UnionClass u = (UnionClass) theClass.as(UnionClass.class); + UnionClass u = theClass.as(UnionClass.class); for (OntClass operand : u.listOperands().toList()) { VClass vc = new VClassJena(operand, getWebappDaoFactory()); ents.addAll(getIndividualsByVClass(vc)); @@ -523,7 +523,7 @@ public class IndividualDaoSDB extends IndividualDaoJena { try { ResultSet results = qe.execSelect(); while (results.hasNext()) { - QuerySolution qs = (QuerySolution) results.next(); + QuerySolution qs = results.next(); Resource res = (Resource) qs.get("?ent"); if (res.getURI() != null) { individualURIs.add(res.getURI()); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualJena.java index c0e6c0b61..944851dd8 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualJena.java @@ -254,8 +254,8 @@ public class IndividualJena extends IndividualImpl implements Individual { if (!s.getSubject().canAs(OntResource.class) || !s.getObject().canAs(OntResource.class)) { continue; } - Individual subj = new IndividualJena((OntResource) s.getSubject().as(OntResource.class), webappDaoFactory); - Individual obj = new IndividualJena((OntResource) s.getObject().as(OntResource.class), webappDaoFactory); + Individual subj = new IndividualJena(s.getSubject().as(OntResource.class), webappDaoFactory); + Individual obj = new IndividualJena(s.getObject().as(OntResource.class), webappDaoFactory); ObjectProperty op = webappDaoFactory.getObjectPropertyDao().getObjectPropertyByURI(s.getPredicate().getURI()); if (subj != null && obj != null && op != null) { ObjectPropertyStatement ops = new ObjectPropertyStatementImpl(); @@ -287,7 +287,7 @@ public class IndividualJena extends IndividualImpl implements Individual { RDFNode value = values.nextNode(); if (value.canAs(OntResource.class)) { relatedIndividuals.add( - new IndividualJena((OntResource) value.as(OntResource.class), webappDaoFactory) ); + new IndividualJena(value.as(OntResource.class), webappDaoFactory) ); } } } finally { @@ -305,7 +305,7 @@ public class IndividualJena extends IndividualImpl implements Individual { try { RDFNode value = ind.getPropertyValue(ind.getModel().getProperty(propertyURI)); if (value != null && value.canAs(OntResource.class)) { - return new IndividualJena((OntResource) value.as(OntResource.class), webappDaoFactory); + return new IndividualJena(value.as(OntResource.class), webappDaoFactory); } else { return null; } @@ -582,11 +582,11 @@ public class IndividualJena extends IndividualImpl implements Individual { int rv = 0; try { if( val1 instanceof String ) - rv = collator.compare( ((String)val1) , ((String)val2) ); + rv = collator.compare(val1 , val2); //rv = ((String)val1).compareTo((String)val2); else if( val1 instanceof Date ) { - DateTime dt1 = new DateTime((Date)val1); - DateTime dt2 = new DateTime((Date)val2); + DateTime dt1 = new DateTime(val1); + DateTime dt2 = new DateTime(val2); rv = dt1.compareTo(dt2); } else diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB.java index a12bd2fbe..05c224030 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB.java @@ -478,8 +478,7 @@ public class IndividualSDB extends IndividualImpl implements Individual { Individual subj = null; try { subj = new IndividualSDB( - ((OntResource) s.getSubject().as(OntResource.class)) - .getURI(), + s.getSubject().as(OntResource.class).getURI(), this.dwf, datasetMode, webappDaoFactory); } catch (IndividualNotFoundException e) { // leave null subject @@ -487,8 +486,7 @@ public class IndividualSDB extends IndividualImpl implements Individual { Individual obj = null; try { obj = new IndividualSDB( - ((OntResource) s.getObject().as(OntResource.class)) - .getURI(), + s.getObject().as(OntResource.class).getURI(), this.dwf, datasetMode, webappDaoFactory); } catch (IndividualNotFoundException e) { // leave null object @@ -548,8 +546,7 @@ public class IndividualSDB extends IndividualImpl implements Individual { if (value.canAs(OntResource.class)) { relatedIndividuals.add( new IndividualSDB( - ((OntResource) value.as(OntResource.class)) - .getURI(), + value.as(OntResource.class).getURI(), this.dwf, datasetMode, webappDaoFactory) ); @@ -588,7 +585,7 @@ public class IndividualSDB extends IndividualImpl implements Individual { if (value != null && value.canAs(OntResource.class)) { try { return new IndividualSDB( - ((OntResource) value.as(OntResource.class)).getURI(), + value.as(OntResource.class).getURI(), dwf, datasetMode, webappDaoFactory); } catch (IndividualNotFoundException e) { return null; @@ -1045,8 +1042,8 @@ public class IndividualSDB extends IndividualImpl implements Individual { rv = collator.compare( ((String)val1) , ((String)val2) ); //rv = ((String)val1).compareTo((String)val2); else if( val1 instanceof Date ) { - DateTime dt1 = new DateTime((Date)val1); - DateTime dt2 = new DateTime((Date)val2); + DateTime dt1 = new DateTime(val1); + DateTime dt2 = new DateTime(val2); rv = dt1.compareTo(dt2); } else diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java index 8bdd4fd00..bec886cd9 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java @@ -12,7 +12,6 @@ import java.util.Date; import java.util.HashSet; import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.Set; import org.apache.commons.logging.Log; @@ -23,7 +22,6 @@ import com.hp.hpl.jena.datatypes.xsd.XSDDatatype; import com.hp.hpl.jena.graph.Node; import com.hp.hpl.jena.iri.IRI; import com.hp.hpl.jena.iri.IRIFactory; -import com.hp.hpl.jena.iri.Violation; import com.hp.hpl.jena.ontology.DatatypeProperty; import com.hp.hpl.jena.ontology.ObjectProperty; import com.hp.hpl.jena.ontology.OntClass; @@ -749,10 +747,10 @@ public class JenaBaseDao extends JenaBaseDaoCon { if (label != null && label.length() > 0) { - String existingValue = ontRes.getLabel((String) getDefaultLanguage()); + String existingValue = ontRes.getLabel(getDefaultLanguage()); if (existingValue == null || !existingValue.equals(label)) { - ontRes.setLabel(label, (String) getDefaultLanguage()); + ontRes.setLabel(label, getDefaultLanguage()); } } else { ontRes.removeAll(RDFS.label); @@ -910,7 +908,7 @@ public class JenaBaseDao extends JenaBaseDaoCon { if (iri.hasViolation(false) ) { String errorStr = ("Bad URI: "+ uri + "\nOnly well-formed absolute URIrefs can be included in RDF/XML output: " - + ((Violation)iri.violations(false).next()).getShortMessage()); + + (iri.violations(false).next()).getShortMessage()); return errorStr; } else { return null; @@ -933,7 +931,7 @@ public class JenaBaseDao extends JenaBaseDaoCon { String idStr = vitroURIStr.split("#")[1]; RDFNode rdfNode = ontModel.getRDFNode(Node.createAnon(AnonId.create(idStr))); if ( (rdfNode != null) && (rdfNode.canAs(OntClass.class)) ) { - cls = (OntClass) rdfNode.as(OntClass.class); + cls = rdfNode.as(OntClass.class); } } else { try { @@ -1006,7 +1004,7 @@ public class JenaBaseDao extends JenaBaseDaoCon { StmtIterator stmtIt = getOntModel().listStatements((Resource)null, prop, value); while (stmtIt.hasNext()) { Statement stmt = stmtIt.nextStatement(); - possibleSubjectSet.add((Resource)stmt.getSubject()); + possibleSubjectSet.add(stmt.getSubject()); } Iterator possibleSubjectIt = possibleSubjectSet.iterator(); @@ -1016,7 +1014,7 @@ public class JenaBaseDao extends JenaBaseDaoCon { boolean hasAlternatePath = false; while (stmtIt.hasNext()) { Statement stmt = stmtIt.nextStatement(); - if (stmt.getObject().isResource() && possibleSubjectSet.contains((Resource)stmt.getObject())) { + if (stmt.getObject().isResource() && possibleSubjectSet.contains(stmt.getObject())) { hasAlternatePath = true; break; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaChangeListener.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaChangeListener.java index 47d040fc1..9304d99a7 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaChangeListener.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaChangeListener.java @@ -8,7 +8,6 @@ import java.util.HashSet; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.openjena.riot.RiotException; import com.hp.hpl.jena.rdf.model.Model; import com.hp.hpl.jena.rdf.model.ModelChangedListener; @@ -17,7 +16,6 @@ import com.hp.hpl.jena.rdf.model.Statement; import com.hp.hpl.jena.rdf.model.StmtIterator; import edu.cornell.mannlib.vitro.webapp.rdfservice.ChangeListener; -import edu.cornell.mannlib.vitro.webapp.servlet.setup.JenaDataSourceSetupBase; import edu.cornell.mannlib.vitro.webapp.servlet.setup.SimpleReasonerSetup; /** diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaModelUtils.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaModelUtils.java index 93900a7a7..f271542e9 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaModelUtils.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaModelUtils.java @@ -95,7 +95,7 @@ public class JenaModelUtils { .getRootClasses(); for (Iterator rootClassIt = rootClasses.iterator(); rootClassIt.hasNext(); ) { - VClass rootClass = (VClass) rootClassIt.next(); + VClass rootClass = rootClassIt.next(); Individual classGroup = modelForClassgroups.createIndividual( wadf.getDefaultNamespace() + "vitroClassGroup" + rootClass.getLocalName(), classGroupClass); @@ -108,7 +108,7 @@ public class JenaModelUtils { for (Iterator childIt = myWebappDaoFactory.getVClassDao() .getAllSubClassURIs(rootClass.getURI()).iterator(); childIt.hasNext(); ) { - String childURI = (String) childIt.next(); + String childURI = childIt.next(); Resource childClass = modelForClassgroupAnnotations .getResource(childURI); if (!modelForClassgroupAnnotations.contains( diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java index 1c71bcc48..1b0e54dbd 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java @@ -90,7 +90,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp p.setNamespace(op.getNameSpace()); p.setLocalName(op.getLocalName()); OntologyDao oDao=getWebappDaoFactory().getOntologyDao(); - Ontology o = (Ontology)oDao.getOntologyByURI(p.getNamespace()); + Ontology o = oDao.getOntologyByURI(p.getNamespace()); if (o==null) { if (!VitroVocabulary.vitroURI.equals(p.getNamespace())) { log.debug("propertyFromOntProperty(): no ontology object found for the namespace "+p.getNamespace()); @@ -178,7 +178,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp Statement stmt = it.nextStatement(); RDFNode obj; if( stmt != null && (obj = stmt.getObject()) != null && obj.isURIResource() ){ - Resource res = (Resource)obj.as(Resource.class); + Resource res = obj.as(Resource.class); if( res != null && res.getURI() != null ){ BaseResourceBean.RoleLevel roleFromModel = BaseResourceBean.RoleLevel.getRoleByUri(res.getURI()); if( roleFromModel != null && @@ -197,7 +197,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp Statement stmt = it.nextStatement(); RDFNode obj; if( stmt != null && (obj = stmt.getObject()) != null && obj.isURIResource() ){ - Resource res = (Resource)obj.as(Resource.class); + Resource res = obj.as(Resource.class); if( res != null && res.getURI() != null ){ BaseResourceBean.RoleLevel roleFromModel = BaseResourceBean.RoleLevel.getRoleByUri(res.getURI()); if( roleFromModel != null && @@ -257,7 +257,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp while (opIt.hasNext()) { Resource res = (Resource) opIt.next(); if ( (res.canAs(OntProperty.class)) && (!NONUSER_NAMESPACES.contains(res.getNameSpace())) ) { - props.add(propertyFromOntProperty((OntProperty)res.as(OntProperty.class))); + props.add(propertyFromOntProperty(res.as(OntProperty.class))); } } } finally { @@ -296,7 +296,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp while(it.hasNext()){ ObjectPropertyStatement objPropertyStmt = (ObjectPropertyStatement)it.next(); if (hash.containsKey(objPropertyStmt.getPropertyURI())) { - ObjectProperty p = (ObjectProperty) hash.get(objPropertyStmt.getPropertyURI()); + ObjectProperty p = hash.get(objPropertyStmt.getPropertyURI()); p.addObjectPropertyStatement(objPropertyStmt); } else { OntProperty op = getOntModel().getOntProperty(objPropertyStmt.getPropertyURI()); @@ -601,7 +601,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp while(restIt.hasNext()) { Resource restRes = restIt.next(); if (restRes.canAs(OntResource.class)) { - OntResource restOntRes = (OntResource) restRes.as(OntResource.class); + OntResource restOntRes = restRes.as(OntResource.class); smartRemove(restOntRes, ontModel); } } @@ -625,7 +625,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp while(restIt.hasNext()) { Resource restRes = restIt.next(); if (restRes.canAs(OntResource.class)) { - OntResource restOntRes = (OntResource) restRes.as(OntResource.class); + OntResource restOntRes = restRes.as(OntResource.class); smartRemove(restOntRes, ontModel); } } @@ -658,7 +658,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp while (propIt.hasNext()) { Resource res = (Resource) propIt.next(); if (res.canAs(OntProperty.class)) { - com.hp.hpl.jena.ontology.OntProperty op = (com.hp.hpl.jena.ontology.OntProperty) res.as(OntProperty.class); + com.hp.hpl.jena.ontology.OntProperty op = res.as(OntProperty.class); boolean isRoot = false; Iterator parentIt = op.listSuperProperties(); if (parentIt != null) { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java index 84255162a..1a1e3cf87 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java @@ -99,7 +99,7 @@ public class ObjectPropertyStatementDaoJena extends JenaBaseDao implements Objec ClosableIterator propIt = ind.listProperties(); try { while (propIt.hasNext()) { - Statement st = (Statement) propIt.next(); + Statement st = propIt.next(); if (st.getObject().isResource() && !(NONUSER_NAMESPACES.contains(st.getPredicate().getNameSpace()))) { try { @@ -173,7 +173,7 @@ public class ObjectPropertyStatementDaoJena extends JenaBaseDao implements Objec try { int count = 0; while ( (opsIt.hasNext()) && ((endIndex<0) || (count propIt = ind.listProperties(); try { while (propIt.hasNext()) { - Statement st = (Statement) propIt.next(); + Statement st = propIt.next(); if (st.getObject().isResource() && !(NONUSER_NAMESPACES.contains(st.getPredicate().getNameSpace()))) { try { ObjectPropertyStatement objPropertyStmt = new ObjectPropertyStatementImpl(); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/OntologyDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/OntologyDaoJena.java index 067a29cf2..94a5b97f0 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/OntologyDaoJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/OntologyDaoJena.java @@ -2,10 +2,8 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena; -import java.text.Collator; import java.util.ArrayList; import java.util.Collections; -import java.util.HashSet; import java.util.List; import com.hp.hpl.jena.ontology.OntModel; @@ -16,7 +14,6 @@ import com.hp.hpl.jena.util.iterator.ClosableIterator; import edu.cornell.mannlib.vitro.webapp.beans.Ontology; import edu.cornell.mannlib.vitro.webapp.dao.OntologyDao; -import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; public class OntologyDaoJena extends JenaBaseDao implements OntologyDao { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PageDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PageDaoJena.java index e552e20c8..e8ac4392e 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PageDaoJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PageDaoJena.java @@ -8,7 +8,6 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.HashMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyDaoJena.java index d91d2dd0a..e34797ba7 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyDaoJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyDaoJena.java @@ -34,7 +34,6 @@ import com.hp.hpl.jena.rdf.model.Statement; import com.hp.hpl.jena.rdf.model.StmtIterator; import com.hp.hpl.jena.shared.Lock; import com.hp.hpl.jena.sparql.resultset.ResultSetMem; -import com.hp.hpl.jena.util.iterator.ClosableIterator; import com.hp.hpl.jena.vocabulary.OWL; import com.hp.hpl.jena.vocabulary.RDFS; @@ -151,7 +150,7 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao { List directSubproperties = getSubPropertyURIs(propertyURI); Iterator it=directSubproperties.iterator(); while(it.hasNext()){ - String uri = (String)it.next(); + String uri = it.next(); if (!subtree.contains(uri)) { subtree.add(uri); getAllSubPropertyURIs(uri,subtree); @@ -192,7 +191,7 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao { List directSuperproperties = getSuperPropertyURIs(propertyURI,true); Iterator it=directSuperproperties.iterator(); while(it.hasNext()){ - String uri = (String)it.next(); + String uri = it.next(); if (!subtree.contains(uri)) { subtree.add(uri); getAllSuperPropertyURIs(uri,subtree); @@ -342,13 +341,13 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao { if (targetProp != null) { - StmtIterator stmtIter = ontModel.listStatements((Resource) null, OWL.onProperty, (RDFNode) targetProp); + StmtIterator stmtIter = ontModel.listStatements((Resource) null, OWL.onProperty, targetProp); while (stmtIter.hasNext()) { Statement statement = stmtIter.next(); if ( statement.getSubject().canAs(OntClass.class) ) { - classURISet.addAll(getRelatedClasses((OntClass) statement.getSubject().as(OntClass.class))); + classURISet.addAll(getRelatedClasses(statement.getSubject().as(OntClass.class))); } else { log.warn("getClassesWithRestrictionOnProperty: Unexpected use of onProperty: it is not applied to a class"); } @@ -661,7 +660,7 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao { // TODO: check if restriction is something like // maxCardinality 0 or allValuesFrom owl:Nothing, // in which case the property is NOT applicable! - Restriction rest = (Restriction) relatedClass.as(Restriction.class); + Restriction rest = relatedClass.as(Restriction.class); OntProperty onProperty = rest.getOnProperty(); if (onProperty != null) { Resource[] ranges = new Resource[2]; @@ -726,7 +725,7 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao { rangeClassURI = PSEUDO_BNODE_NS + rangeRes.getId() .toString(); } else { - rangeClassURI = (String) rangeRes.getURI(); + rangeClassURI = rangeRes.getURI(); } pi.setRangeClassURI(rangeClassURI); VClass range = getWebappDaoFactory().getVClassDao() diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyGroupDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyGroupDaoJena.java index 6bb652094..2d713d3f3 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyGroupDaoJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyGroupDaoJena.java @@ -4,7 +4,6 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena; import java.util.ArrayList; import java.util.Collections; -import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.ListIterator; @@ -16,7 +15,6 @@ import com.hp.hpl.jena.datatypes.xsd.XSDDatatype; import com.hp.hpl.jena.ontology.Individual; import com.hp.hpl.jena.ontology.OntModel; import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.rdf.model.Literal; import com.hp.hpl.jena.rdf.model.Model; import com.hp.hpl.jena.rdf.model.ModelFactory; import com.hp.hpl.jena.rdf.model.Resource; @@ -26,7 +24,6 @@ import com.hp.hpl.jena.shared.Lock; import com.hp.hpl.jena.util.iterator.ClosableIterator; import edu.cornell.mannlib.vitro.webapp.beans.IndividualImpl; -import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; import edu.cornell.mannlib.vitro.webapp.beans.Property; import edu.cornell.mannlib.vitro.webapp.beans.PropertyGroup; import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao; @@ -228,7 +225,7 @@ public class PropertyGroupDaoJena extends JenaBaseDao implements PropertyGroupDa try { Individual groupInd = ontModel.getIndividual(group.getURI()); try { - groupInd.setLabel(group.getName(), (String) getDefaultLanguage()); + groupInd.setLabel(group.getName(), getDefaultLanguage()); } catch (Exception e) { log.error("error updating name for "+groupInd.getURI()); } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJena.java index b1517700d..e03271273 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJena.java @@ -7,27 +7,18 @@ import java.util.Calendar; import java.util.Collection; import java.util.Collections; import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; import java.util.Iterator; import java.util.List; -import java.util.Map; -import java.util.Set; -import com.hp.hpl.jena.ontology.ObjectProperty; -import com.hp.hpl.jena.ontology.OntClass; import com.hp.hpl.jena.ontology.OntModel; import com.hp.hpl.jena.ontology.OntProperty; -import com.hp.hpl.jena.ontology.Restriction; import com.hp.hpl.jena.rdf.model.Property; import com.hp.hpl.jena.rdf.model.Resource; import com.hp.hpl.jena.rdf.model.ResourceFactory; import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; import com.hp.hpl.jena.shared.Lock; import com.hp.hpl.jena.vocabulary.OWL; import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement; @@ -35,7 +26,6 @@ import edu.cornell.mannlib.vitro.webapp.beans.PropertyInstance; import edu.cornell.mannlib.vitro.webapp.beans.PropertyInstanceIface; import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.dao.PropertyInstanceDao; -import edu.cornell.mannlib.vitro.webapp.dao.VClassDao; import edu.cornell.mannlib.vitro.webapp.dao.jena.event.IndividualDeletionEvent; import edu.cornell.mannlib.vitro.webapp.dao.jena.event.IndividualUpdateEvent; public class PropertyInstanceDaoJena extends PropertyDaoJena implements @@ -58,7 +48,7 @@ public class PropertyInstanceDaoJena extends PropertyDaoJena implements Property pred = tboxModel.getProperty(propertyURI); OntProperty invPred = null; if (pred.canAs(OntProperty.class)) { - invPred = ((OntProperty)pred.as(OntProperty.class)).getInverse(); + invPred = pred.as(OntProperty.class).getInverse(); } Resource objRes = ontModel.getResource(objectURI); if ( (subjRes != null) && (pred != null) && (objRes != null) ) { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceDataset.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceDataset.java index 61cd2b58c..6517b495f 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceDataset.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceDataset.java @@ -8,7 +8,6 @@ import java.util.Iterator; import com.hp.hpl.jena.graph.Node; import com.hp.hpl.jena.query.Dataset; import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; import com.hp.hpl.jena.shared.Lock; import com.hp.hpl.jena.sparql.core.DatasetGraph; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceDatasetGraph.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceDatasetGraph.java index ca0dfa80f..23f9aaff2 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceDatasetGraph.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceDatasetGraph.java @@ -10,10 +10,6 @@ import java.util.List; import com.hp.hpl.jena.graph.Graph; import com.hp.hpl.jena.graph.Node; import com.hp.hpl.jena.graph.Triple; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; import com.hp.hpl.jena.query.QuerySolution; import com.hp.hpl.jena.query.ResultSet; import com.hp.hpl.jena.shared.Lock; @@ -21,7 +17,6 @@ import com.hp.hpl.jena.shared.LockMRSW; import com.hp.hpl.jena.sparql.core.DatasetGraph; import com.hp.hpl.jena.sparql.core.Quad; import com.hp.hpl.jena.sparql.resultset.JSONInput; -import com.hp.hpl.jena.sparql.resultset.ResultSetMem; import com.hp.hpl.jena.sparql.util.Context; import com.hp.hpl.jena.util.iterator.SingletonIterator; import com.hp.hpl.jena.util.iterator.WrappedIterator; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceGraphBulkUpdater.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceGraphBulkUpdater.java index 4cf036c2a..8a1170204 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceGraphBulkUpdater.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceGraphBulkUpdater.java @@ -4,7 +4,6 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.io.InputStream; import java.util.Iterator; import java.util.List; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceModelMaker.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceModelMaker.java index de822941c..004eadbb9 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceModelMaker.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceModelMaker.java @@ -305,7 +305,7 @@ public class RDFServiceModelMaker implements ModelMaker { List graphNames = rdfService.getGraphURIs(); Iterator nameIt = graphNames.iterator(); while (nameIt.hasNext()) { - String name = (String) nameIt.next(); + String name = nameIt.next(); metadataModel.add(dbResource,metadataModel.getProperty( HAS_NAMED_MODEL_URI),name); } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoJena.java index e26729272..9252c994f 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoJena.java @@ -98,11 +98,11 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao { labelStr += "some values from "; } if (fillerRes.canAs(OntClass.class)) { - OntClass avf = (OntClass) fillerRes.as(OntClass.class); + OntClass avf = fillerRes.as(OntClass.class); labelStr += getLabelForClass(avf,withPrefix,forPickList); } else { try { - labelStr += getLabelOrId( (OntResource) fillerRes.as(OntResource.class)); + labelStr += getLabelOrId(fillerRes.as(OntResource.class)); } catch (Exception e) { labelStr += "???"; } @@ -113,9 +113,9 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao { RDFNode fillerNode = hvRest.getHasValue(); try { if (fillerNode.isResource()) { - labelStr += getLabelOrId((OntResource)fillerNode.as(OntResource.class)); + labelStr += getLabelOrId(fillerNode.as(OntResource.class)); } else { - labelStr += ((Literal) fillerNode.as(Literal.class)).getLexicalForm(); + labelStr += fillerNode.as(Literal.class).getLexicalForm(); } } catch (Exception e) { labelStr += "???"; @@ -138,10 +138,10 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao { String labelStr = "("; if (cls.isComplementClass()) { labelStr += "not "; - ComplementClass ccls = (ComplementClass) cls.as(ComplementClass.class); + ComplementClass ccls = cls.as(ComplementClass.class); labelStr += getLabelForClass(ccls.getOperand(),withPrefix,forPickList); } else if (cls.isIntersectionClass()) { - IntersectionClass icls = (IntersectionClass) cls.as(IntersectionClass.class); + IntersectionClass icls = cls.as(IntersectionClass.class); for (Iterator operandIt = icls.listOperands(); operandIt.hasNext();) { OntClass operand = (OntClass) operandIt.next(); labelStr += getLabelForClass(operand,withPrefix,forPickList); @@ -150,7 +150,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao { } } } else if (cls.isUnionClass()) { - UnionClass icls = (UnionClass) cls.as(UnionClass.class); + UnionClass icls = cls.as(UnionClass.class); for (Iterator operandIt = icls.listOperands(); operandIt.hasNext();) { OntClass operand = (OntClass) operandIt.next(); labelStr += getLabelForClass(operand,withPrefix,forPickList); @@ -169,7 +169,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao { } else { if (withPrefix || forPickList) { OntologyDao oDao=getWebappDaoFactory().getOntologyDao(); - Ontology o = (Ontology)oDao.getOntologyByURI(cls.getNameSpace()); + Ontology o = oDao.getOntologyByURI(cls.getNameSpace()); if (o!=null) { if (withPrefix) { return(o.getPrefix()==null?(o.getName()==null?"unspec:"+getLabelOrId(cls):o.getName()+":"+getLabelOrId(cls)):o.getPrefix()+":"+getLabelOrId(cls)); @@ -208,7 +208,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao { while(restIt.hasNext()) { Resource restRes = restIt.next(); if (restRes.canAs(OntResource.class)) { - OntResource restOntRes = (OntResource) restRes.as(OntResource.class); + OntResource restOntRes = restRes.as(OntResource.class); smartRemove(restOntRes, ontModel); } } @@ -216,7 +216,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao { while(restIt.hasNext()) { Resource restRes = restIt.next(); if (restRes.canAs(OntResource.class)) { - OntResource restOntRes = (OntResource) restRes.as(OntResource.class); + OntResource restOntRes = restRes.as(OntResource.class); smartRemove(restOntRes, ontModel); } } @@ -400,7 +400,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao { List directSubclasses = getSubClassURIs(classURI); Iterator it=directSubclasses.iterator(); while(it.hasNext()){ - String uri = (String)it.next(); + String uri = it.next(); if (!subtree.contains(uri)) { subtree.add(uri); getAllSubClassURIs(uri,subtree); @@ -423,7 +423,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao { while (superClassIt.hasNext()) { Statement stmt = superClassIt.nextStatement(); if (stmt.getObject().canAs(OntResource.class)) { - OntResource superRes = (OntResource) stmt.getObject().as(OntResource.class); + OntResource superRes = stmt.getObject().as(OntResource.class); String test = getClassURIStr(superRes); superclassURIs.add(test); } @@ -442,7 +442,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao { List directSuperclasses = getSuperClassURIs(classURI, true); Iterator it=directSuperclasses.iterator(); while(it.hasNext()){ - String uri = (String)it.next(); + String uri = it.next(); if (!subtree.contains(uri)) { subtree.add(uri); getAllSuperClassURIs(uri,subtree); @@ -459,7 +459,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao { while (classIt.hasNext()) { try { Individual classInd = classIt.next(); - OntClass cls = (OntClass) classInd.as(OntClass.class); + OntClass cls = classInd.as(OntClass.class); if (!cls.isAnon() && !(NONUSER_NAMESPACES.contains(cls.getNameSpace()))) { classes.add(new VClassJena(cls,getWebappDaoFactory())); } @@ -724,17 +724,17 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao { Statement axStmt = (Statement) axStmtIt.next(); OntResource subjOntRes = null; if (axStmt.getSubject().canAs(OntResource.class)) { - subjOntRes = (OntResource) axStmt.getSubject().as(OntResource.class); + subjOntRes = axStmt.getSubject().as(OntResource.class); } if ( (subjOntRes != null) && (subjSuperclasses.contains(getClassURIStr(subjOntRes))) && (axStmt.getPredicate().equals(RDFS.subClassOf) || (axStmt.getPredicate().equals(OWL.equivalentClass))) ) { if (restRes.canAs(AllValuesFromRestriction.class)) { - AllValuesFromRestriction avfRest = (AllValuesFromRestriction) restRes.as(AllValuesFromRestriction.class); + AllValuesFromRestriction avfRest = restRes.as(AllValuesFromRestriction.class); Resource avf = avfRest.getAllValuesFrom(); if (avf.canAs(OntClass.class)) { - superclass = (OntClass) avfRest.getAllValuesFrom().as(OntClass.class); + superclass = avfRest.getAllValuesFrom().as(OntClass.class); } } } @@ -818,8 +818,8 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao { while (annotIt.hasNext()) { try { Statement annot = (Statement) annotIt.next(); - Resource cls = (Resource) annot.getSubject(); - VClass vcw = (VClass) getVClassByURI(cls.getURI()); + Resource cls = annot.getSubject(); + VClass vcw = getVClassByURI(cls.getURI()); if (vcw != null) { boolean classIsInstantiated = false; if (getIndividualCount) { @@ -926,7 +926,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao { OntClass ontCls = ontModel.createClass(cls.getURI()); try { if (cls.getName() != null && cls.getName().length() > 0) { - ontCls.setLabel(cls.getName(), (String) getDefaultLanguage()); + ontCls.setLabel(cls.getName(), getDefaultLanguage()); } else { ontCls.removeAll(RDFS.label); } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoSDB.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoSDB.java index c177161fa..cbcd7c298 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoSDB.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoSDB.java @@ -2,8 +2,6 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena; -import java.util.List; - import com.hp.hpl.jena.ontology.AnnotationProperty; import com.hp.hpl.jena.ontology.OntClass; import com.hp.hpl.jena.query.Dataset; @@ -11,8 +9,6 @@ import com.hp.hpl.jena.query.Query; import com.hp.hpl.jena.query.QueryExecution; import com.hp.hpl.jena.query.QueryExecutionFactory; import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.QuerySolutionMap; import com.hp.hpl.jena.query.ResultSet; import com.hp.hpl.jena.query.Syntax; import com.hp.hpl.jena.rdf.model.Literal; @@ -64,8 +60,8 @@ public class VClassDaoSDB extends VClassDaoJena { while (annotIt.hasNext()) { try { Statement annot = (Statement) annotIt.next(); - Resource cls = (Resource) annot.getSubject(); - VClass vcw = (VClass) getVClassByURI(cls.getURI()); + Resource cls = annot.getSubject(); + VClass vcw = getVClassByURI(cls.getURI()); if (vcw != null) { boolean classIsInstantiated = false; if (getIndividualCount) { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupCache.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupCache.java index cf8387a06..40e0eaddd 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupCache.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupCache.java @@ -4,10 +4,8 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Set; import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; @@ -33,7 +31,6 @@ import com.hp.hpl.jena.vocabulary.RDFS; import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup; -import edu.cornell.mannlib.vitro.webapp.dao.VClassDao; import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupDao; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupDaoJena.java index d45fa222e..37bcf9434 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupDaoJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupDaoJena.java @@ -14,11 +14,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import com.hp.hpl.jena.datatypes.xsd.XSDDatatype; -import com.hp.hpl.jena.ontology.DatatypeProperty; import com.hp.hpl.jena.ontology.Individual; import com.hp.hpl.jena.ontology.OntModel; import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.rdf.model.Literal; import com.hp.hpl.jena.rdf.model.ModelFactory; import com.hp.hpl.jena.rdf.model.Resource; import com.hp.hpl.jena.rdf.model.ResourceFactory; @@ -32,7 +30,6 @@ import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.InsertException; import edu.cornell.mannlib.vitro.webapp.dao.VClassDao; import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupDao; -import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.search.beans.ProhibitedFromSearch; @@ -82,7 +79,7 @@ public class VClassGroupDaoJena extends JenaBaseDao implements VClassGroupDao { ClosableIterator groupIt = getOntModel().listIndividuals(CLASSGROUP); try { while (groupIt.hasNext()) { - Individual groupInd = (Individual) groupIt.next(); + Individual groupInd = groupIt.next(); VClassGroup group = groupFromGroupIndividual(groupInd); if (group!=null) { groups.add(group); @@ -94,7 +91,7 @@ public class VClassGroupDaoJena extends JenaBaseDao implements VClassGroupDao { Collections.sort(groups); Iterator groupsIt = groups.iterator(); while (groupsIt.hasNext()) { - VClassGroup group = (VClassGroup) groupsIt.next(); + VClassGroup group = groupsIt.next(); map.put(group.getPublicName(), group); } return map; @@ -140,7 +137,7 @@ public class VClassGroupDaoJena extends JenaBaseDao implements VClassGroupDao { ClosableIterator groupIt = getOntModel().listIndividuals(CLASSGROUP); try { while (groupIt.hasNext()) { - Individual grp = (Individual) groupIt.next(); + Individual grp = groupIt.next(); VClassGroup vgrp = groupFromGroupIndividual(grp); if (vgrp != null) { groups.add(vgrp); @@ -247,7 +244,7 @@ public class VClassGroupDaoJena extends JenaBaseDao implements VClassGroupDao { int removedGroupsCount = 0; ListIterator it = groups.listIterator(); while(it.hasNext()){ - VClassGroup group = (VClassGroup) it.next(); + VClassGroup group = it.next(); List classes = group.getVitroClassList(); if( classes == null || classes.size() < 1 ){ removedGroupsCount++; @@ -283,7 +280,7 @@ public class VClassGroupDaoJena extends JenaBaseDao implements VClassGroupDao { try { Individual groupInd = ontModel.getIndividual(vcg.getURI()); try { - groupInd.setLabel(vcg.getPublicName(), (String) getDefaultLanguage()); + groupInd.setLabel(vcg.getPublicName(), getDefaultLanguage()); } catch (Exception e) { log.error("error updating name for "+groupInd.getURI()); } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassJena.java index 1715eeec9..c4db19dd2 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassJena.java @@ -324,7 +324,7 @@ public class VClassJena extends VClass { Statement stmt = it.nextStatement(); RDFNode obj; if( stmt != null && (obj = stmt.getObject()) != null && obj.isURIResource() ){ - Resource res = (Resource)obj.as(Resource.class); + Resource res = obj.as(Resource.class); if( res != null && res.getURI() != null ){ BaseResourceBean.RoleLevel roleFromModel = BaseResourceBean.RoleLevel.getRoleByUri(res.getURI()); if( roleFromModel != null && @@ -358,7 +358,7 @@ public class VClassJena extends VClass { Statement stmt = it.nextStatement(); RDFNode obj; if( stmt != null && (obj = stmt.getObject()) != null && obj.isURIResource() ){ - Resource res = (Resource)obj.as(Resource.class); + Resource res = obj.as(Resource.class); if( res != null && res.getURI() != null ){ BaseResourceBean.RoleLevel roleFromModel = BaseResourceBean.RoleLevel.getRoleByUri(res.getURI()); if( roleFromModel != null && diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VitroJenaSpecialModelMaker.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VitroJenaSpecialModelMaker.java index 4dd2cfcc3..1feb261f9 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VitroJenaSpecialModelMaker.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VitroJenaSpecialModelMaker.java @@ -2,8 +2,6 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena; -import java.util.HashMap; - import javax.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; @@ -14,7 +12,6 @@ import com.hp.hpl.jena.ontology.OntModel; import com.hp.hpl.jena.rdf.model.Model; import com.hp.hpl.jena.rdf.model.ModelMaker; import com.hp.hpl.jena.rdf.model.ModelReader; -import com.hp.hpl.jena.rdf.model.Resource; import com.hp.hpl.jena.util.iterator.ExtendedIterator; /** diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java index f519824a1..6ec54c82e 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java @@ -11,7 +11,6 @@ import java.util.Set; import com.hp.hpl.jena.iri.IRI; import com.hp.hpl.jena.iri.IRIFactory; -import com.hp.hpl.jena.iri.Violation; import com.hp.hpl.jena.ontology.OntModel; import com.hp.hpl.jena.ontology.OntModelSpec; import com.hp.hpl.jena.ontology.OntResource; @@ -184,7 +183,7 @@ public class WebappDaoFactoryJena implements WebappDaoFactory { IRI iri = factory.create( uriStr ); if (iri.hasViolation(false) ) { validURI = false; - errorMsg += ((Violation)iri.violations(false).next()) + errorMsg += (iri.violations(false).next()) .getShortMessage() + " "; } else if (checkUniqueness) { OntModel ontModel = ontModelSelector.getFullModel(); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/pellet/ObjectPropertyStatementPatternFactory.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/pellet/ObjectPropertyStatementPatternFactory.java index ad7ac82f8..57fb8f900 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/pellet/ObjectPropertyStatementPatternFactory.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/pellet/ObjectPropertyStatementPatternFactory.java @@ -2,15 +2,9 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena.pellet; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Set; - import com.hp.hpl.jena.rdf.model.Property; import com.hp.hpl.jena.rdf.model.Resource; -import edu.cornell.mannlib.vitro.webapp.dao.jena.pellet.ObjectPropertyStatementPattern; - public class ObjectPropertyStatementPatternFactory { //private static Set patternSet = new HashSet(); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/pellet/PelletListener.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/pellet/PelletListener.java index 2a2e1fda1..58be08c6d 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/pellet/PelletListener.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/pellet/PelletListener.java @@ -320,9 +320,9 @@ public class PelletListener implements ModelChangedListener { try { if ( ( ((Resource)stmt.getObject()).equals(RDFS.Resource) ) ) { reject = true; - } else if ( ( ((Resource)stmt.getSubject()).equals(OWL.Nothing) ) ) { + } else if ( ( stmt.getSubject().equals(OWL.Nothing) ) ) { reject = true; - } else if ( ( ((Resource)stmt.getObject()).equals(OWL.Nothing) ) ) { + } else if ( ( stmt.getObject().equals(OWL.Nothing) ) ) { reject = true; } } catch (Exception e) {} diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Map.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Map.java index 6612cf8a0..4900cba6f 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Map.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Map.java @@ -2,27 +2,11 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils; -import java.lang.reflect.Constructor; import java.util.HashMap; -import java.util.Map; - -import javax.servlet.ServletContext; - -import net.sf.json.JSONObject; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.StmtIterator; - -import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; -import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelContext; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessDataGetterN3; -import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.DataGetter; - /* * This class determines what n3 should be returned for a particular data getter and can be overwritten or extended in VIVO. */ diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Utils.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Utils.java index a4dbacd0b..64a64b36c 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Utils.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Utils.java @@ -4,25 +4,12 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocess import java.lang.reflect.Constructor; import java.util.HashMap; -import java.util.Map; - -import javax.servlet.ServletContext; import net.sf.json.JSONObject; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.StmtIterator; - -import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; -import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelContext; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessDataGetterN3; -import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.DataGetter; - /* * This class determines what n3 should be returned for a particular data getter and can be overwritten or extended in VIVO. */ diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/WebappDaoSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/WebappDaoSetup.java index 5ad2fb4ce..b55cba9fd 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/WebappDaoSetup.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/WebappDaoSetup.java @@ -94,17 +94,10 @@ public class WebappDaoSetup extends JenaDataSourceSetupBase setStartupDataset(dataset, ctx); // ABox assertions - Model aboxAssertions = dataset.getNamedModel( - JenaDataSourceSetupBase.JENA_DB_MODEL); - baseOms.setABoxModel( - ModelFactory.createOntologyModel( - OntModelSpec.OWL_MEM, aboxAssertions)); + baseOms.setABoxModel(ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM, dataset.getNamedModel(JenaDataSourceSetupBase.JENA_DB_MODEL))); // ABox inferences - Model aboxInferences = dataset.getNamedModel( - JenaDataSourceSetupBase.JENA_INF_MODEL); - inferenceOms.setABoxModel(ModelFactory.createOntologyModel( - OntModelSpec.OWL_MEM, aboxInferences)); + inferenceOms.setABoxModel(ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM, dataset.getNamedModel(JenaDataSourceSetupBase.JENA_INF_MODEL))); // TBox assertions try { @@ -115,15 +108,11 @@ public class WebappDaoSetup extends JenaDataSourceSetupBase if (tboxAssertionsDB != null) { long startTime = System.currentTimeMillis(); - System.out.println( - "Copying cached tbox assertions into memory"); + log.info("Copying cached tbox assertions into memory"); tboxAssertions.add(tboxAssertionsDB); - System.out.println((System.currentTimeMillis() - startTime) - / 1000 + " seconds to load tbox assertions"); + log.info((System.currentTimeMillis() - startTime)/ 1000 + " seconds to load tbox assertions"); + tboxAssertions.getBaseModel().register(new ModelSynchronizer(tboxAssertionsDB)); } - - tboxAssertions.getBaseModel().register(new ModelSynchronizer( - tboxAssertionsDB)); baseOms.setTBoxModel(tboxAssertions); } catch (Throwable e) { @@ -139,15 +128,15 @@ public class WebappDaoSetup extends JenaDataSourceSetupBase if (tboxInferencesDB != null) { long startTime = System.currentTimeMillis(); - System.out.println( + log.info( "Copying cached tbox inferences into memory"); tboxInferences.add(tboxInferencesDB); System.out.println((System.currentTimeMillis() - startTime) / 1000 + " seconds to load tbox inferences"); + + tboxInferences.getBaseModel().register(new ModelSynchronizer( + tboxInferencesDB)); } - - tboxInferences.getBaseModel().register(new ModelSynchronizer( - tboxInferencesDB)); inferenceOms.setTBoxModel(tboxInferences); } catch (Throwable e) { log.error("Unable to load tbox inference cache from DB", e); @@ -155,7 +144,6 @@ public class WebappDaoSetup extends JenaDataSourceSetupBase } // union ABox - Model m = ModelFactory.createUnion( baseOms.getABoxModel(), inferenceOms.getABoxModel()); m = ModelFactory.createModelForGraph( @@ -167,8 +155,7 @@ public class WebappDaoSetup extends JenaDataSourceSetupBase unionOms.setABoxModel(unionABoxModel); // union TBox - m = ModelFactory.createUnion( - baseOms.getTBoxModel(), inferenceOms.getTBoxModel()); + m = ModelFactory.createUnion(baseOms.getTBoxModel(), inferenceOms.getTBoxModel()); m = ModelFactory.createModelForGraph( new SpecialBulkUpdateHandlerGraph( m.getGraph(), diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/IndividualsForClassesDataGetter.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/IndividualsForClassesDataGetter.java index c4787acfb..f8e51c9ff 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/IndividualsForClassesDataGetter.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/IndividualsForClassesDataGetter.java @@ -5,7 +5,6 @@ package edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter; import java.net.URLEncoder; import java.util.ArrayList; import java.util.Collections; -import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -17,22 +16,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.json.JSONObject; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; - -import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.controller.freemarker.IndividualListController; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; -import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.PageDao; -import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; -import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelContext; import edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.VClassGroupTemplateModel;