|
From: Gerardo H. <ma...@us...> - 2004-07-22 18:44:31
|
Update of /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4049/src/org/javaowl/editor Modified Files: ModelEditorBean.java Log Message: Updated ModelEditor.getInstances() to use Pellet reasoner. Index: ModelEditorBean.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/ModelEditorBean.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ModelEditorBean.java 22 Jul 2004 18:28:38 -0000 1.3 --- ModelEditorBean.java 22 Jul 2004 18:44:22 -0000 1.4 *************** *** 37,45 **** import com.hp.hpl.jena.ontology.OntProperty; import com.hp.hpl.jena.ontology.OntResource; 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.Resource; - import com.hp.hpl.jena.rdf.model.Literal; import com.hp.hpl.jena.rdf.model.Statement; import com.hp.hpl.jena.vocabulary.RDF; --- 37,46 ---- import com.hp.hpl.jena.ontology.OntProperty; import com.hp.hpl.jena.ontology.OntResource; + 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.ResIterator; import com.hp.hpl.jena.rdf.model.Resource; import com.hp.hpl.jena.rdf.model.Statement; import com.hp.hpl.jena.vocabulary.RDF; *************** *** 143,153 **** } ! public Resource[] getInstances(OntResource resource, boolean all) { List resources = new ArrayList(); if (all) { ! for (Iterator it = ontModel.listSubjectsWithProperty(RDF.type, resource); it.hasNext();) ! resources.add(it.next()); } else { ! for (Iterator it = data.listSubjectsWithProperty(RDF.type, resource); it.hasNext();) resources.add(it.next()); } --- 144,167 ---- } ! public Resource[] getInstances(OntResource clazz, boolean all) { List resources = new ArrayList(); if (all) { ! EditorReasoner reasoner = new EditorReasoner(); ! Model model = ModelFactory.createDefaultModel(); ! model.add(ontology); ! model.add(data); ! try { ! reasoner.loadOntology(model); ! } catch (Exception e) { ! e.printStackTrace(); ! throw new RuntimeException("instance reasoner exception: ", e); ! } ! for (ResIterator it = data.listSubjects(); it.hasNext();) { ! Resource resource = it.nextResource(); ! if (reasoner.canBeInstanceOf(resource, clazz)) ! resources.add(resource); ! } } else { ! for (Iterator it = data.listSubjectsWithProperty(RDF.type, clazz); it.hasNext();) resources.add(it.next()); } |