Update of /cvsroot/javaowl/JOWLEditor/src/org/javaowl/editor
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14758/src/org/javaowl/editor
Modified Files:
ModelEditorBean.java
Log Message:
Changed reasoner to new pellet reasoner
Index: ModelEditorBean.java
===================================================================
RCS file: /cvsroot/javaowl/JOWLEditor/src/org/javaowl/editor/ModelEditorBean.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ModelEditorBean.java 6 Oct 2004 13:15:16 -0000 1.1.1.1
--- ModelEditorBean.java 6 May 2005 17:53:53 -0000 1.2
***************
*** 30,34 ****
import java.util.Vector;
! import org.javaowl.editor.reasoner.EditorReasoner;
import com.hp.hpl.jena.ontology.DatatypeProperty;
--- 30,34 ----
import java.util.Vector;
! import org.mindswap.pellet.jena.OWLReasoner;
import com.hp.hpl.jena.ontology.DatatypeProperty;
***************
*** 61,65 ****
private OntClass[] classes;
! private EditorReasoner ontologyReasoner;
public ModelEditorBean(String ontology, String data, String prefix)
--- 61,65 ----
private OntClass[] classes;
! private OWLReasoner ontologyReasoner;
public ModelEditorBean(String ontology, String data, String prefix)
***************
*** 101,105 ****
l.add(clazz.getURI());
if (all)
! l.addAll(ontologyReasoner.getSuperClasses(clazz, true));
Set props = new HashSet();
for (Iterator iter = l.iterator(); iter.hasNext(); ) {
--- 101,105 ----
l.add(clazz.getURI());
if (all)
! l.addAll(ontologyReasoner.getSuperClasses(clazz, false));
Set props = new HashSet();
for (Iterator iter = l.iterator(); iter.hasNext(); ) {
***************
*** 130,136 ****
OntResource or = (OntResource) it.next();
OntClass oc = or.asClass();
! Iterator it2 = oc.listSubClasses();
! if (!it2.hasNext() && !or.getNameSpace().equals(XSD.xstring.getNameSpace()))
list.add(oc);
}
if (list.size() > 0)
--- 130,143 ----
OntResource or = (OntResource) it.next();
OntClass oc = or.asClass();
! // TODO: what whith the list???
! if (or.getNameSpace().equals(prefix)) {
list.add(oc);
+ for (Iterator it2 = oc.listSubClasses(); it2.hasNext(); ) {
+ OntClass ioc = (OntClass) it2.next();
+ if (ioc.getNameSpace().equals(prefix)) {
+ list.add(ioc);
+ }
+ }
+ }
}
if (list.size() > 0)
***************
*** 195,204 ****
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();
--- 202,211 ----
List resources = new ArrayList();
if (all) {
! OWLReasoner reasoner = new OWLReasoner();
Model model = ModelFactory.createDefaultModel();
model.add(ontology);
model.add(data);
try {
! reasoner.load(model);
} catch (Exception e) {
e.printStackTrace();
***************
*** 243,252 ****
private InstanceClassification getInstanceClassification(Resource instance) {
! EditorReasoner reasoner = new EditorReasoner();
Model model = ModelFactory.createDefaultModel();
model.add(ontology);
model.add(data);
try {
! reasoner.loadOntology(model);
} catch (Exception e) {
e.printStackTrace();
--- 250,259 ----
private InstanceClassification getInstanceClassification(Resource instance) {
! OWLReasoner reasoner = new OWLReasoner();
Model model = ModelFactory.createDefaultModel();
model.add(ontology);
model.add(data);
try {
! reasoner.load(model);
} catch (Exception e) {
e.printStackTrace();
***************
*** 264,268 ****
result.addInferredClass(uri);
if (result.isDeclaredClass(uri) || result.isInferredClass(uri) ||
! reasoner.canBeInstanceOf(instance, oc))
result.addPossibleClass(uri);
}
--- 271,275 ----
result.addInferredClass(uri);
if (result.isDeclaredClass(uri) || result.isInferredClass(uri) ||
! reasoner.isInstanceOf(instance, oc))
result.addPossibleClass(uri);
}
***************
*** 295,305 ****
}
public OntClass[] getSubClasses(OntClass clazz) {
List classes = new ArrayList();
! Vector v = ontologyReasoner.getSubClasses(clazz, false);
for (Iterator iter = v.iterator(); iter.hasNext(); ) {
! String uri = iter.next().toString();
! if (uri.startsWith(prefix))
classes.add(ontModel.getOntClass(uri));
}
return (OntClass[]) classes.toArray(new OntClass[0]);
--- 302,320 ----
}
+ private Object getFirstElement(Set set) {
+ for (Iterator it = set.iterator(); it.hasNext();) {
+ return it.next();
+ }
+ return null;
+ }
+
public OntClass[] getSubClasses(OntClass clazz) {
List classes = new ArrayList();
! Set v = ontologyReasoner.getSubClasses(clazz, true);
for (Iterator iter = v.iterator(); iter.hasNext(); ) {
! String uri = getFirstElement((Set) iter.next()).toString();
! if (uri.startsWith(prefix)) {
classes.add(ontModel.getOntClass(uri));
+ }
}
return (OntClass[]) classes.toArray(new OntClass[0]);
***************
*** 347,353 ****
private void init() {
! ontologyReasoner = new EditorReasoner();
try {
! ontologyReasoner.loadOntology(ontology);
ontologyReasoner.classify();
} catch (Exception e) {
--- 362,368 ----
private void init() {
! ontologyReasoner = new OWLReasoner();
try {
! ontologyReasoner.load(ontology);
ontologyReasoner.classify();
} catch (Exception e) {
|
