|
From: Elmer G. <ega...@us...> - 2004-08-18 01:23:47
|
Update of /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23532/src/org/javaowl/editor Modified Files: ModelEditorBean.java ModelEditor.java ResourceEditorBean.java Log Message: Work on remote model wrapper Index: ModelEditorBean.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/ModelEditorBean.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ModelEditorBean.java 9 Aug 2004 19:07:31 -0000 1.10 --- ModelEditorBean.java 18 Aug 2004 01:23:23 -0000 1.11 *************** *** 56,60 **** private final String prefix; ! private OntResource[] classes; private EditorReasoner ontologyReasoner; --- 56,60 ---- private final String prefix; ! private OntClass[] classes; private EditorReasoner ontologyReasoner; *************** *** 89,93 **** } ! public OntResource[] getAllClasses() { return classes; } --- 89,93 ---- } ! public OntClass[] getAllClasses() { return classes; } *************** *** 231,238 **** OntClass oc = or.asClass(); if (prefix == null || oc.getNameSpace().equals(prefix)) { ! classes.add(or); } } ! this.classes = (OntResource[]) classes.toArray(new OntResource[0]); } } --- 231,238 ---- OntClass oc = or.asClass(); if (prefix == null || oc.getNameSpace().equals(prefix)) { ! classes.add(oc); } } ! this.classes = (OntClass[]) classes.toArray(new OntClass[0]); } } Index: ModelEditor.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/ModelEditor.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** ModelEditor.java 17 Aug 2004 23:46:02 -0000 1.23 --- ModelEditor.java 18 Aug 2004 01:23:23 -0000 1.24 *************** *** 33,37 **** public interface ModelEditor { ! public OntResource[] getAllClasses(); public Set getPropertiesURIs(Resource clazz, boolean all); --- 33,37 ---- public interface ModelEditor { ! public OntClass[] getAllClasses(); public Set getPropertiesURIs(Resource clazz, boolean all); Index: ResourceEditorBean.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/ResourceEditorBean.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ResourceEditorBean.java 28 Jul 2004 07:17:03 -0000 1.6 --- ResourceEditorBean.java 18 Aug 2004 01:23:23 -0000 1.7 *************** *** 144,150 **** for (StmtIterator iter = modelInstance.listProperties(RDF.type); iter.hasNext(); ) result.addDeclaredClass(iter.nextStatement().getObject().toString()); ! OntResource[] classes = modelEditor.getAllClasses(); for (int i = 0; i < classes.length; i++) { ! OntClass oc = classes[i].asClass(); String uri = oc.getURI(); if (!result.isDeclaredClass(uri) && reasoner.isType(instance, oc)) --- 144,150 ---- for (StmtIterator iter = modelInstance.listProperties(RDF.type); iter.hasNext(); ) result.addDeclaredClass(iter.nextStatement().getObject().toString()); ! OntClass[] classes = modelEditor.getAllClasses(); for (int i = 0; i < classes.length; i++) { ! OntClass oc = classes[i]; String uri = oc.getURI(); if (!result.isDeclaredClass(uri) && reasoner.isType(instance, oc)) |