Menu
▾
▴
javaowl-commit — JavaOWL CVS commits
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(32) |
Aug
(65) |
Sep
(15) |
Oct
(35) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(5) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Elmer G. <ega...@us...> - 2004-09-02 00:31:02
|
Update of /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10892/src/org/javaowl/editor Modified Files: ModelEditorBean.java ModelEditor.java Removed Files: PropertyEditorBean.java Log Message: Fixed more remote problems Index: ModelEditorBean.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/ModelEditorBean.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** ModelEditorBean.java 1 Sep 2004 21:44:17 -0000 1.22 --- ModelEditorBean.java 2 Sep 2004 00:30:50 -0000 1.23 *************** *** 188,191 **** --- 188,195 ---- } + public OntResource getPropertyRange(String uri) { + return ontModel.getOntProperty(uri).getRange(); + } + public ResourceEditorBean[] getInstances(OntClass clazz, boolean all) { List resources = new ArrayList(); Index: ModelEditor.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/ModelEditor.java,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** ModelEditor.java 1 Sep 2004 21:44:17 -0000 1.34 --- ModelEditor.java 2 Sep 2004 00:30:51 -0000 1.35 *************** *** 56,59 **** --- 56,61 ---- public OntClass getOntClass(String uri); + + public OntResource getPropertyRange(String uri); public OntProperty getOntProperty(String uri); --- PropertyEditorBean.java DELETED --- |
|
From: Elmer G. <ega...@us...> - 2004-09-02 00:31:01
|
Update of /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10892/src/org/javaowl/editor/swing Modified Files: EditPage.java Log Message: Fixed more remote problems Index: EditPage.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing/EditPage.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** EditPage.java 1 Sep 2004 21:44:17 -0000 1.13 --- EditPage.java 2 Sep 2004 00:30:52 -0000 1.14 *************** *** 198,202 **** propertyEditor = (PropertyEditorPagelet) propertyEditors.get(""); } ! propertyEditor.setRangeType(editor.getOntProperty(currentProperty.getURI()).getRange()); OntClass ontClass = editor.getValidLeafClass(currentProperty); if (ontClass != null) { --- 198,202 ---- propertyEditor = (PropertyEditorPagelet) propertyEditors.get(""); } ! propertyEditor.setRangeType(editor.getPropertyRange(currentProperty.getURI())); OntClass ontClass = editor.getValidLeafClass(currentProperty); if (ontClass != null) { *************** *** 217,221 **** propertyEditor = (PropertyEditorPagelet) propertyEditors.get(""); } ! propertyEditor.setRangeType(editor.getOntProperty(currentProperty.getURI()).getRange()); if (value instanceof ResourceEditorBean) { OntClass ontClass = editor.getValidLeafClass(currentProperty); --- 217,221 ---- propertyEditor = (PropertyEditorPagelet) propertyEditors.get(""); } ! propertyEditor.setRangeType(editor.getPropertyRange(currentProperty.getURI())); if (value instanceof ResourceEditorBean) { OntClass ontClass = editor.getValidLeafClass(currentProperty); |
|
From: Elmer G. <ega...@us...> - 2004-09-01 21:44:27
|
Update of /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13658/src/org/javaowl/editor/swing Modified Files: EditPage.java Log Message: More tests and fixes to remote model editor implementation. Index: EditPage.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing/EditPage.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** EditPage.java 25 Aug 2004 23:59:48 -0000 1.12 --- EditPage.java 1 Sep 2004 21:44:17 -0000 1.13 *************** *** 279,282 **** --- 279,284 ---- editor.removeStatement(currentStatement); } + System.out.println(value); + System.out.println(type); values.add(editor.addDataValue(resource, currentProperty, editor.getTypedLiteral(value, type.getURI()))); |
|
From: Elmer G. <ega...@us...> - 2004-09-01 21:44:26
|
Update of /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13658/src/org/javaowl/editor Modified Files: ModelEditor.java ModelEditorBean.java Added Files: PropertyEditorBean.java Log Message: More tests and fixes to remote model editor implementation. Index: ModelEditorBean.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/ModelEditorBean.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** ModelEditorBean.java 28 Aug 2004 00:43:01 -0000 1.21 --- ModelEditorBean.java 1 Sep 2004 21:44:17 -0000 1.22 *************** *** 32,35 **** --- 32,36 ---- import org.javaowl.editor.reasoner.EditorReasoner; + import com.hp.hpl.jena.ontology.DatatypeProperty; import com.hp.hpl.jena.ontology.OntClass; import com.hp.hpl.jena.ontology.OntModel; *************** *** 181,185 **** Set props = new HashSet(); for (Iterator it = ontModel.listDatatypeProperties(); it.hasNext();) { ! props.add(getOntClass(((OntProperty) it.next()).getURI())); } return (OntClass[]) props.toArray(new OntClass[0]); --- 182,187 ---- Set props = new HashSet(); for (Iterator it = ontModel.listDatatypeProperties(); it.hasNext();) { ! props.add(ontModel ! .getOntClass(((DatatypeProperty) it.next()).getRange().getURI())); } return (OntClass[]) props.toArray(new OntClass[0]); *************** *** 329,333 **** if (s != null) return s.getString(); ! return showUri ? resource.toString() : null; } --- 331,335 ---- if (s != null) return s.getString(); ! return showUri ? resource.resource.toString() : null; } Index: ModelEditor.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/ModelEditor.java,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** ModelEditor.java 28 Aug 2004 00:43:00 -0000 1.33 --- ModelEditor.java 1 Sep 2004 21:44:17 -0000 1.34 *************** *** 21,24 **** --- 21,25 ---- + import com.hp.hpl.jena.ontology.DatatypeProperty; import com.hp.hpl.jena.ontology.OntClass; import com.hp.hpl.jena.ontology.OntProperty; --- NEW FILE: PropertyEditorBean.java --- /* * PropertyEditorBean.java Copyright (C) 2004 Gerardo Horvilleur Martinez, Elmer * Garduno Hernandez * * This library is free software; you can redistribute it and/or modify it under * the terms of the GNU Lesser General Public License as published by the Free * Software Foundation; either version 2.1 of the License, or (at your option) * any later version. * * This library is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more * details. * * You should have received a copy of the GNU Lesser General Public License * along with this library; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ package org.javaowl.editor; import com.hp.hpl.jena.ontology.OntProperty; public final class PropertyEditorBean { final OntProperty property; private final ModelEditor editor; PropertyEditorBean(OntProperty property, ModelEditor editor) { this.property = property; this.editor = editor; } } |
|
From: Elmer G. <ega...@us...> - 2004-09-01 21:44:26
|
Update of /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/remote In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13658/src/org/javaowl/editor/remote Modified Files: RemoteModelEditor.java RemoteModelEditorBase.java RemoteModelEditorWrapper.java Log Message: More tests and fixes to remote model editor implementation. Index: RemoteModelEditorWrapper.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/remote/RemoteModelEditorWrapper.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** RemoteModelEditorWrapper.java 28 Aug 2004 00:43:02 -0000 1.13 --- RemoteModelEditorWrapper.java 1 Sep 2004 21:44:17 -0000 1.14 *************** *** 88,92 **** return classes; } ! private OntProperty[] createOntPropertiesFromURIs(String[] uris) { OntProperty[] properties = new OntProperty[uris.length]; --- 88,92 ---- return classes; } ! private OntProperty[] createOntPropertiesFromURIs(String[] uris) { OntProperty[] properties = new OntProperty[uris.length]; *************** *** 169,173 **** return ModelEditorBean .getStatementEditor(ontModel.createStatement((Resource) subject, ! (Property) predicate, object), this); } --- 169,175 ---- return ModelEditorBean .getStatementEditor(ontModel.createStatement((Resource) subject, ! (Property) predicate ! .as(Property.class), ! object), this); } *************** *** 213,217 **** boolean uri) { try { ! return remote.getPropertyValue(resource.getURI(), property.getURI(), uri); } catch (RemoteException e) { throw new RuntimeException(e); --- 215,219 ---- boolean uri) { try { ! return remote.getResourcePropertyValue(resource.getURI(), property.getURI(), uri); } catch (RemoteException e) { throw new RuntimeException(e); *************** *** 219,223 **** } ! public OntClass[] getSubClasses(OntClass clazz) { try { String[] uris = remote.getSubClasses(clazz.getURI()); --- 221,225 ---- } ! public OntClass[] getSubClasses(OntClass clazz) { try { String[] uris = remote.getSubClasses(clazz.getURI()); *************** *** 235,239 **** try { String uri = remote.getValidLeafClass(property.getURI()); ! return ontModel.createClass(uri); } catch (RemoteException e) { throw new RuntimeException(e); --- 237,241 ---- try { String uri = remote.getValidLeafClass(property.getURI()); ! return (uri == null) ? null : ontModel.createClass(uri); } catch (RemoteException e) { throw new RuntimeException(e); Index: RemoteModelEditor.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/remote/RemoteModelEditor.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** RemoteModelEditor.java 28 Aug 2004 00:43:01 -0000 1.10 --- RemoteModelEditor.java 1 Sep 2004 21:44:17 -0000 1.11 *************** *** 55,58 **** --- 55,61 ---- throws RemoteException; + String getResourcePropertyValue(String resource, String property, boolean uri) + throws RemoteException; + String[] getSubClasses(String clazz) throws RemoteException; Index: RemoteModelEditorBase.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/remote/RemoteModelEditorBase.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RemoteModelEditorBase.java 28 Aug 2004 00:43:01 -0000 1.2 --- RemoteModelEditorBase.java 1 Sep 2004 21:44:17 -0000 1.3 *************** *** 1,8 **** /* ! * Created on Aug 25, 2004 ! * ! * TODO To change the template for this generated file go to ! * Window - Preferences - Java - Code Style - Code Templates */ package org.javaowl.editor.remote; --- 1,21 ---- /* ! * RemoteModelEditorWrapper.java Copyright (C) 2004 Gerardo Horvilleur Martinez, Elmer ! * Garduno Hernandez ! * ! * This library is free software; you can redistribute it and/or modify it under ! * the terms of the GNU Lesser General Public License as published by the Free ! * Software Foundation; either version 2.1 of the License, or (at your option) ! * any later version. ! * ! * This library is distributed in the hope that it will be useful, but WITHOUT ! * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS ! * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more ! * details. ! * ! * You should have received a copy of the GNU Lesser General Public License ! * along with this library; if not, write to the Free Software Foundation, Inc., ! * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + package org.javaowl.editor.remote; *************** *** 15,18 **** --- 28,32 ---- import com.hp.hpl.jena.rdf.model.ModelFactory; import com.hp.hpl.jena.rdf.model.RDFNode; + import com.hp.hpl.jena.ontology.OntClass; import org.javaowl.editor.ModelEditor; *************** *** 93,96 **** --- 107,116 ---- } + public String getResourcePropertyValue(String resource, String property, boolean uri) { + return editor.getPropertyValue(editor.getResourceEditor(resource), + editor.getOntProperty(property), + uri); + } + public String[] getSubClasses(String clazz) { return getURIsFromResources *************** *** 99,103 **** public String getValidLeafClass(String property) { ! return editor.getValidLeafClass(editor.getOntProperty(property)).getURI(); } --- 119,124 ---- public String getValidLeafClass(String property) { ! OntClass oc = editor.getValidLeafClass(editor.getOntProperty(property)); ! return (oc == null) ? null : oc.getURI(); } |
|
From: Elmer G. <ega...@us...> - 2004-08-28 00:43:15
|
Update of /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv724/src/org/javaowl/editor/swing Modified Files: Editor.java Log Message: Testing remote model editor Index: Editor.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing/Editor.java,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** Editor.java 22 Aug 2004 17:41:00 -0000 1.30 --- Editor.java 28 Aug 2004 00:43:02 -0000 1.31 *************** *** 119,127 **** setURIGenerator(new DefaultURIGenerator("http://www.javaowl.org/default#")); try { ! addPropertyEditor("", Class.forName("org.javaowl.editor.swing.pe.DefaultPropertyEditorPagelet")); ! OntProperty[] props = editor.getAllDatatypeProperties(); for(int i = 0; i < props.length; i++) { addPropertyEditor(props[i].getURI(), ! getPropertyEditorClass(props[i].getRange())); } } catch (ClassNotFoundException e) { --- 119,128 ---- setURIGenerator(new DefaultURIGenerator("http://www.javaowl.org/default#")); try { ! addPropertyEditor("", Class.forName ! ("org.javaowl.editor.swing.pe.DefaultPropertyEditorPagelet")); ! OntClass[] props = editor.getAllDatatypeRanges(); for(int i = 0; i < props.length; i++) { addPropertyEditor(props[i].getURI(), ! getPropertyEditorClass(props[i])); } } catch (ClassNotFoundException e) { *************** *** 201,205 **** } ! private Class getPropertyEditorClass(OntResource resource) throws ClassNotFoundException { if (resource.equals(XSD.xstring) || resource.equals(XSD.normalizedString) || --- 202,206 ---- } ! private Class getPropertyEditorClass(OntClass resource) throws ClassNotFoundException { if (resource.equals(XSD.xstring) || resource.equals(XSD.normalizedString) || |
|
From: Elmer G. <ega...@us...> - 2004-08-28 00:43:15
|
Update of /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/remote In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv724/src/org/javaowl/editor/remote Modified Files: RemoteModelEditor.java RemoteModelEditorBase.java RemoteModelEditorWrapper.java Log Message: Testing remote model editor Index: RemoteModelEditorWrapper.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/remote/RemoteModelEditorWrapper.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** RemoteModelEditorWrapper.java 25 Aug 2004 23:59:48 -0000 1.12 --- RemoteModelEditorWrapper.java 28 Aug 2004 00:43:02 -0000 1.13 *************** *** 36,53 **** import com.hp.hpl.jena.rdf.model.RDFNode; import com.hp.hpl.jena.rdf.model.Resource; public class RemoteModelEditorWrapper implements ModelEditor { ! private OntModel ontModel; ! private RemoteModelEditor remote; ! public RemoteModelEditorWrapper(String prefix, RemoteModelEditor remote) { ! try { ! this.remote = remote; ! remote.init(prefix); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } } --- 36,50 ---- import com.hp.hpl.jena.rdf.model.RDFNode; import com.hp.hpl.jena.rdf.model.Resource; + import com.hp.hpl.jena.rdf.model.ModelFactory; public class RemoteModelEditorWrapper implements ModelEditor { ! private final OntModel ontModel; ! private final RemoteModelEditor remote; ! public RemoteModelEditorWrapper(RemoteModelEditor remote) { ! this.remote = remote; ! ontModel = ModelFactory.createOntologyModel(); } *************** *** 85,89 **** } ! private OntClass[] createOntClassesFromUri(String[] uris) { OntClass[] classes = new OntClass[uris.length]; for (int i = 0; i < uris.length; i++) --- 82,86 ---- } ! private OntClass[] createOntClassesFromURIs(String[] uris) { OntClass[] classes = new OntClass[uris.length]; for (int i = 0; i < uris.length; i++) *************** *** 102,106 **** try { Resource resource = ontModel ! .createResource(remote.createResource(clazz.getURI())); return ModelEditorBean.getResourceEditor(resource, this); } catch (RemoteException e) { --- 99,103 ---- try { Resource resource = ontModel ! .createResource(remote.createAnonResource(clazz.getURI())); return ModelEditorBean.getResourceEditor(resource, this); } catch (RemoteException e) { *************** *** 122,126 **** try { String[] uris = remote.getAllClasses(); ! return createOntClassesFromUri(uris); } catch (RemoteException e) { throw new RuntimeException(e); --- 119,123 ---- try { String[] uris = remote.getAllClasses(); ! return createOntClassesFromURIs(uris); } catch (RemoteException e) { throw new RuntimeException(e); *************** *** 128,135 **** } ! public OntProperty[] getAllDatatypeProperties() { try { ! String[] uris = remote.getAllDatatypeProperties(); ! return createOntPropertiesFromURIs(uris); } catch (RemoteException e) { throw new RuntimeException(e); --- 125,132 ---- } ! public OntClass[] getAllDatatypeRanges() { try { ! String[] uris = remote.getAllDatatypeRanges(); ! return createOntClassesFromURIs(uris); } catch (RemoteException e) { throw new RuntimeException(e); *************** *** 225,229 **** try { String[] uris = remote.getSubClasses(clazz.getURI()); ! return createOntClassesFromUri(uris); } catch (RemoteException e) { throw new RuntimeException(e); --- 222,226 ---- try { String[] uris = remote.getSubClasses(clazz.getURI()); ! return createOntClassesFromURIs(uris); } catch (RemoteException e) { throw new RuntimeException(e); Index: RemoteModelEditor.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/remote/RemoteModelEditor.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** RemoteModelEditor.java 25 Aug 2004 23:59:48 -0000 1.9 --- RemoteModelEditor.java 28 Aug 2004 00:43:01 -0000 1.10 *************** *** 36,40 **** void clearEditor() throws RemoteException; ! String createResource(String clazz) throws RemoteException; String createResource(String uri, String clazz) throws RemoteException; --- 36,40 ---- void clearEditor() throws RemoteException; ! String createAnonResource(String clazz) throws RemoteException; String createResource(String uri, String clazz) throws RemoteException; *************** *** 42,46 **** String[] getAllClasses() throws RemoteException; ! String[] getAllDatatypeProperties() throws RemoteException; String[] getApplicableProperties(String resource) throws RemoteException; --- 42,46 ---- String[] getAllClasses() throws RemoteException; ! String[] getAllDatatypeRanges() throws RemoteException; String[] getApplicableProperties(String resource) throws RemoteException; *************** *** 61,64 **** --- 61,67 ---- String[] getValidObjects(String clazz) throws RemoteException; + void setup(String oModel, String oFormat, + String dModel, String dFormat, String prefix) throws RemoteException; + void init(String prefix) throws RemoteException; Index: RemoteModelEditorBase.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/remote/RemoteModelEditorBase.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RemoteModelEditorBase.java 26 Aug 2004 00:04:26 -0000 1.1 --- RemoteModelEditorBase.java 28 Aug 2004 00:43:01 -0000 1.2 *************** *** 26,31 **** public abstract class RemoteModelEditorBase implements RemoteModelEditor{ ! private ModelEditor editor; ! public SerializableTriple addDataValue(String resource, String property, String value, --- 26,30 ---- public abstract class RemoteModelEditorBase implements RemoteModelEditor{ ! protected ModelEditor editor; public SerializableTriple addDataValue(String resource, String property, String value, *************** *** 52,56 **** } ! public String createResource(String clazz) { return editor.createResourceEditor(editor.getOntClass(clazz)).getURI(); } --- 51,55 ---- } ! public String createAnonResource(String clazz) { return editor.createResourceEditor(editor.getOntClass(clazz)).getURI(); } *************** *** 64,69 **** } ! public String[] getAllDatatypeProperties() { ! return getURIsFromResources(editor.getAllDatatypeProperties()); } --- 63,68 ---- } ! public String[] getAllDatatypeRanges() { ! return getURIsFromResources(editor.getAllDatatypeRanges()); } |
|
From: Elmer G. <ega...@us...> - 2004-08-28 00:43:15
|
Update of /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv724/src/org/javaowl/editor Modified Files: ModelEditor.java ModelEditorBean.java Log Message: Testing remote model editor Index: ModelEditorBean.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/ModelEditorBean.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** ModelEditorBean.java 25 Aug 2004 23:59:48 -0000 1.20 --- ModelEditorBean.java 28 Aug 2004 00:43:01 -0000 1.21 *************** *** 178,187 **** } ! public OntProperty[] getAllDatatypeProperties() { Set props = new HashSet(); for (Iterator it = ontModel.listDatatypeProperties(); it.hasNext();) { ! props.add(it.next()); } ! return (OntProperty[]) props.toArray(new OntProperty[0]); } --- 178,187 ---- } ! public OntClass[] getAllDatatypeRanges() { Set props = new HashSet(); for (Iterator it = ontModel.listDatatypeProperties(); it.hasNext();) { ! props.add(getOntClass(((OntProperty) it.next()).getURI())); } ! return (OntClass[]) props.toArray(new OntClass[0]); } Index: ModelEditor.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/ModelEditor.java,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** ModelEditor.java 25 Aug 2004 23:59:48 -0000 1.32 --- ModelEditor.java 28 Aug 2004 00:43:00 -0000 1.33 *************** *** 46,50 **** public OntClass[] getAllClasses(); ! public OntProperty[] getAllDatatypeProperties(); public OntProperty[] getApplicableProperties(ResourceEditorBean resource); --- 46,50 ---- public OntClass[] getAllClasses(); ! public OntClass[] getAllDatatypeRanges(); public OntProperty[] getApplicableProperties(ResourceEditorBean resource); |
|
From: Elmer G. <ega...@us...> - 2004-08-26 00:04:34
|
Update of /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/remote In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1490/src/org/javaowl/editor/remote Added Files: RemoteModelEditorBase.java Log Message: Added remote editor base --- NEW FILE: RemoteModelEditorBase.java --- /* * Created on Aug 25, 2004 * * TODO To change the template for this generated file go to * Window - Preferences - Java - Code Style - Code Templates */ package org.javaowl.editor.remote; import java.io.IOException; import java.io.File; import com.hp.hpl.jena.rdf.model.Property; import com.hp.hpl.jena.rdf.model.Resource; import com.hp.hpl.jena.rdf.model.Model; import com.hp.hpl.jena.rdf.model.ModelFactory; import com.hp.hpl.jena.rdf.model.RDFNode; import org.javaowl.editor.ModelEditor; import org.javaowl.editor.ModelEditorBean; import org.javaowl.editor.ResourceEditorBean; import org.javaowl.editor.StatementEditorBean; import org.javaowl.editor.remote.RemoteModelEditor; import org.javaowl.editor.remote.SerializableTriple; import org.javaowl.models.prevalence.TripleUtil; public abstract class RemoteModelEditorBase implements RemoteModelEditor{ private ModelEditor editor; public SerializableTriple addDataValue(String resource, String property, String value, String dataType) { return new SerializableTriple(editor .addDataValue(editor.getResourceEditor(resource), editor.getOntProperty(property), editor.getTypedLiteral(value, dataType)) .asTriple()); } public SerializableTriple addObjectValue(String resource, String property, String value) { return new SerializableTriple(editor .addObjectValue(editor.getResourceEditor(resource), editor.getOntProperty(property), editor.getResourceEditor(value)) .asTriple()); } public void addPropertyValue(String resource, String property, String value) { editor.addPropertyValue(editor.getResourceEditor(resource), editor.getOntProperty(property), value); } public String createResource(String clazz) { return editor.createResourceEditor(editor.getOntClass(clazz)).getURI(); } public String createResource(String uri, String clazz) { return editor.createResourceEditor(uri, editor.getOntClass(clazz)).getURI(); } public String[] getAllClasses() { return getURIsFromResources(editor.getAllClasses()); } public String[] getAllDatatypeProperties() { return getURIsFromResources(editor.getAllDatatypeProperties()); } public String[] getApplicableProperties(String resource) { return getURIsFromResources (editor.getApplicableProperties(editor.getResourceEditor(resource))); } public SerializableTriple[] getDeclaredProperties(String resource) { return getTriplesFromStatements (editor.getDeclaredProperties(editor.getResourceEditor(resource))); } public String[] getInstances(String clazz, boolean all) { return getURIsFromResourceEditors (editor.getInstances(editor.getOntClass(clazz), all)); } public String[] getProperties(String clazz, boolean all) { return getURIsFromResources (editor.getProperties(editor.getOntClass(clazz), all)); } public String getPropertyValue(String clazz, String property, boolean uri) { return editor.getPropertyValue(editor.getOntClass(clazz), editor.getOntProperty(property), uri); } public String[] getSubClasses(String clazz) { return getURIsFromResources (editor.getSubClasses(editor.getOntClass(clazz))); } public String getValidLeafClass(String property) { return editor.getValidLeafClass(editor.getOntProperty(property)).getURI(); } public String[] getValidObjects(String clazz) { return getURIsFromResourceEditors (editor.getValidObjects(editor.getOntClass(clazz))); } public void removeResource(String uri) { editor.removeResource(editor.getResourceEditor(uri)); } public void removeStatement(SerializableTriple statement) { editor.removeStatement(createStatementFromTriple(statement)); } private StatementEditorBean createStatementFromTriple(SerializableTriple triple) { Model data = ModelFactory.createDefaultModel(); RDFNode subject = data .getRDFNode(TripleUtil.stringToNode(triple.getSubject())); RDFNode predicate = data .getRDFNode(TripleUtil.stringToNode(triple.getPredicate())); RDFNode object = data.getRDFNode(TripleUtil.stringToNode(triple.getObject())); return ModelEditorBean .getStatementEditor(data.createStatement((Resource) subject, (Property) predicate, object), editor); } private String[] getURIsFromResources(Resource[] resources) { String[] uris = new String[resources.length]; for (int i = 0; i < resources.length; i++) { uris[i] = resources[i].getURI(); } return uris; } private String[] getURIsFromResourceEditors(ResourceEditorBean[] resources) { String[] uris = new String[resources.length]; for (int i = 0; i < resources.length; i++) { uris[i] = resources[i].getURI(); } return uris; } private SerializableTriple[] getTriplesFromStatements(StatementEditorBean[] statements) { SerializableTriple[] triples = new SerializableTriple[statements.length]; for (int i = 0; i < triples.length; i++) { triples[i] = new SerializableTriple(statements[i].asTriple()); } return triples; } } |
|
From: Elmer G. <ega...@us...> - 2004-08-25 23:59:59
|
Update of /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/remote In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv321/src/org/javaowl/editor/remote Modified Files: RemoteModelEditor.java RemoteModelEditorWrapper.java Log Message: More remote api changes Index: RemoteModelEditorWrapper.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/remote/RemoteModelEditorWrapper.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** RemoteModelEditorWrapper.java 25 Aug 2004 19:19:22 -0000 1.11 --- RemoteModelEditorWrapper.java 25 Aug 2004 23:59:48 -0000 1.12 *************** *** 69,73 **** try { SerializableTriple triple = ! remote.addDataValue(resource.getURI(), property.getURI(), value.getURI()); return createStatementFromTriple(triple); } catch (RemoteException e) { --- 69,73 ---- try { SerializableTriple triple = ! remote.addObjectValue(resource.getURI(), property.getURI(), value.getURI()); return createStatementFromTriple(triple); } catch (RemoteException e) { *************** *** 79,83 **** String value) { try { ! remote.addDataValue(resource.getURI(), property.getURI(), value); } catch (RemoteException e) { throw new RuntimeException(e); --- 79,83 ---- String value) { try { ! remote.addPropertyValue(resource.getURI(), property.getURI(), value); } catch (RemoteException e) { throw new RuntimeException(e); *************** *** 231,236 **** } ! public Literal getTypedLiteral(Object value, OntResource type) { ! return ontModel.createTypedLiteral(value, type.getURI()); } --- 231,236 ---- } ! public Literal getTypedLiteral(Object value, String typeURI) { ! return ontModel.createTypedLiteral(value, typeURI); } Index: RemoteModelEditor.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/remote/RemoteModelEditor.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** RemoteModelEditor.java 25 Aug 2004 19:12:00 -0000 1.8 --- RemoteModelEditor.java 25 Aug 2004 23:59:48 -0000 1.9 *************** *** 24,31 **** public interface RemoteModelEditor extends Remote{ ! ! SerializableTriple addDataValue(String resource, String property, String object) throws RemoteException; ! ! SerializableTriple addDataValue(String resource, String property, String value, String dataType) throws RemoteException; void clearEditor() throws RemoteException; --- 24,36 ---- public interface RemoteModelEditor extends Remote{ ! ! SerializableTriple addDataValue(String resource, String property, String value, ! String dataType) throws RemoteException; ! ! SerializableTriple addObjectValue(String resource, String property, String value) ! throws RemoteException; ! ! void addPropertyValue(String resource, String property, String value) ! throws RemoteException; void clearEditor() throws RemoteException; *************** *** 45,51 **** String[] getInstances(String clazz, boolean all) throws RemoteException; ! String[] getProperties(String resource, boolean all) throws RemoteException; ! String getPropertyValue(String clazz, String label, boolean uri) throws RemoteException; String[] getSubClasses(String clazz) throws RemoteException; --- 50,57 ---- String[] getInstances(String clazz, boolean all) throws RemoteException; ! String[] getProperties(String clazz, boolean all) throws RemoteException; ! String getPropertyValue(String clazz, String property, boolean uri) ! throws RemoteException; String[] getSubClasses(String clazz) throws RemoteException; *************** *** 60,67 **** void removeStatement(SerializableTriple statement) throws RemoteException; - - void setComment(String resource, String comment) throws RemoteException; - - void setLabel(String resource, String label) throws RemoteException; - } --- 66,68 ---- |
|
From: Elmer G. <ega...@us...> - 2004-08-25 23:59:59
|
Update of /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv321/src/org/javaowl/editor Modified Files: ModelEditor.java ModelEditorBean.java Log Message: More remote api changes Index: ModelEditorBean.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/ModelEditorBean.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** ModelEditorBean.java 25 Aug 2004 19:19:21 -0000 1.19 --- ModelEditorBean.java 25 Aug 2004 23:59:48 -0000 1.20 *************** *** 67,71 **** } ! public ModelEditorBean(InputStream ontologyIn, InputStream dataIn, String prefix) throws IOException { this.prefix = prefix; ontology = ModelFactory.createDefaultModel(); --- 67,72 ---- } ! public ModelEditorBean(InputStream ontologyIn, InputStream dataIn, String prefix) ! throws IOException { this.prefix = prefix; ontology = ModelFactory.createDefaultModel(); *************** *** 73,77 **** ontologyIn.close(); ontModel = ModelFactory ! .createOntologyModel(OntModelSpec.OWL_DL_MEM_RULE_INF, ontology); data = ModelFactory.createDefaultModel(); data.read(dataIn, null, "N3"); --- 74,78 ---- ontologyIn.close(); ontModel = ModelFactory ! .createOntologyModel(OntModelSpec.OWL_DL_MEM_RULE_INF, ontology); data = ModelFactory.createDefaultModel(); data.read(dataIn, null, "N3"); *************** *** 85,89 **** this.ontology = ontology; ontModel = ModelFactory ! .createOntologyModel(OntModelSpec.OWL_DL_MEM_RULE_INF, ontology); this.data = data; ontModel.addSubModel(data); --- 86,90 ---- this.ontology = ontology; ontModel = ModelFactory ! .createOntologyModel(OntModelSpec.OWL_DL_MEM_RULE_INF, ontology); this.data = data; ontModel.addSubModel(data); *************** *** 221,230 **** public StatementEditorBean addObjectValue(ResourceEditorBean resource, Property property, ResourceEditorBean value) { resource.resource.addProperty(property, value.resource); ! return new StatementEditorBean(resource.resource.getProperty(property), this); // TODO: This is a BUG! } public StatementEditorBean addDataValue(ResourceEditorBean resource, Property property, Literal value) { resource.resource.addProperty(property, value); ! return new StatementEditorBean(resource.resource.getProperty(property),this); // TODO: This is a BUG! } --- 222,233 ---- public StatementEditorBean addObjectValue(ResourceEditorBean resource, Property property, ResourceEditorBean value) { resource.resource.addProperty(property, value.resource); ! return new StatementEditorBean(resource.resource.getProperty(property), this); ! // TODO: This is a BUG! } public StatementEditorBean addDataValue(ResourceEditorBean resource, Property property, Literal value) { resource.resource.addProperty(property, value); ! return new StatementEditorBean(resource.resource.getProperty(property),this); ! // TODO: This is a BUG! } *************** *** 269,274 **** } ! public Literal getTypedLiteral(Object value, OntResource type) { ! return data.createTypedLiteral(value, type.getURI()); } --- 272,277 ---- } ! public Literal getTypedLiteral(Object value, String typeURI) { ! return data.createTypedLiteral(value, typeURI); } Index: ModelEditor.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/ModelEditor.java,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** ModelEditor.java 25 Aug 2004 19:19:21 -0000 1.31 --- ModelEditor.java 25 Aug 2004 23:59:48 -0000 1.32 *************** *** 66,70 **** public OntClass[] getSubClasses(OntClass clazz); ! public Literal getTypedLiteral(Object value, OntResource type); public OntClass getValidLeafClass(Property currentProperty); --- 66,70 ---- public OntClass[] getSubClasses(OntClass clazz); ! public Literal getTypedLiteral(Object value, String typeURI); public OntClass getValidLeafClass(Property currentProperty); |
|
From: Elmer G. <ega...@us...> - 2004-08-25 23:59:58
|
Update of /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv321/src/org/javaowl/editor/swing Modified Files: EditPage.java Log Message: More remote api changes Index: EditPage.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing/EditPage.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** EditPage.java 25 Aug 2004 19:19:21 -0000 1.11 --- EditPage.java 25 Aug 2004 23:59:48 -0000 1.12 *************** *** 280,284 **** } values.add(editor.addDataValue(resource, currentProperty, ! editor.getTypedLiteral(value, type))); propertyEditor = null; currentStatement = null; --- 280,284 ---- } values.add(editor.addDataValue(resource, currentProperty, ! editor.getTypedLiteral(value, type.getURI()))); propertyEditor = null; currentStatement = null; |
|
From: Elmer G. <ega...@us...> - 2004-08-25 19:19:31
|
Update of /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9660/src/org/javaowl/editor/swing Modified Files: OntTreePagelet.java EditPage.java Log Message: Changes in remote api Index: OntTreePagelet.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing/OntTreePagelet.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** OntTreePagelet.java 22 Aug 2004 17:41:00 -0000 1.8 --- OntTreePagelet.java 25 Aug 2004 19:19:21 -0000 1.9 *************** *** 57,61 **** private JTree createPanel() { ! OntClass thing = editor.getOntClass(OWL.Thing); DefaultMutableTreeNode top = new DefaultMutableTreeNode(thing); paths.put(thing, top); --- 57,61 ---- private JTree createPanel() { ! OntClass thing = editor.getOntClass(OWL.Thing.getURI()); DefaultMutableTreeNode top = new DefaultMutableTreeNode(thing); paths.put(thing, top); Index: EditPage.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing/EditPage.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** EditPage.java 23 Aug 2004 20:02:11 -0000 1.10 --- EditPage.java 25 Aug 2004 19:19:21 -0000 1.11 *************** *** 198,202 **** propertyEditor = (PropertyEditorPagelet) propertyEditors.get(""); } ! propertyEditor.setRangeType(editor.getOntProperty(currentProperty).getRange()); OntClass ontClass = editor.getValidLeafClass(currentProperty); if (ontClass != null) { --- 198,202 ---- propertyEditor = (PropertyEditorPagelet) propertyEditors.get(""); } ! propertyEditor.setRangeType(editor.getOntProperty(currentProperty.getURI()).getRange()); OntClass ontClass = editor.getValidLeafClass(currentProperty); if (ontClass != null) { *************** *** 217,221 **** propertyEditor = (PropertyEditorPagelet) propertyEditors.get(""); } ! propertyEditor.setRangeType(editor.getOntProperty(currentProperty).getRange()); if (value instanceof ResourceEditorBean) { OntClass ontClass = editor.getValidLeafClass(currentProperty); --- 217,221 ---- propertyEditor = (PropertyEditorPagelet) propertyEditors.get(""); } ! propertyEditor.setRangeType(editor.getOntProperty(currentProperty.getURI()).getRange()); if (value instanceof ResourceEditorBean) { OntClass ontClass = editor.getValidLeafClass(currentProperty); |
|
From: Elmer G. <ega...@us...> - 2004-08-25 19:19:31
|
Update of /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/remote In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9660/src/org/javaowl/editor/remote Modified Files: RemoteModelEditorWrapper.java Log Message: Changes in remote api Index: RemoteModelEditorWrapper.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/remote/RemoteModelEditorWrapper.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** RemoteModelEditorWrapper.java 25 Aug 2004 19:12:00 -0000 1.10 --- RemoteModelEditorWrapper.java 25 Aug 2004 19:19:22 -0000 1.11 *************** *** 188,197 **** } ! public OntClass getOntClass(Resource resource) { ! return ontModel.createClass(resource.getURI()); } ! public OntProperty getOntProperty(Property property) { ! return ontModel.createOntProperty(property.getURI()); } --- 188,197 ---- } ! public OntClass getOntClass(String uri) { ! return ontModel.createClass(uri); } ! public OntProperty getOntProperty(String uri) { ! return ontModel.createOntProperty(uri); } |
|
From: Elmer G. <ega...@us...> - 2004-08-25 19:19:30
|
Update of /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9660/src/org/javaowl/editor Modified Files: ModelEditorBean.java ModelEditor.java Log Message: Changes in remote api Index: ModelEditorBean.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/ModelEditorBean.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** ModelEditorBean.java 25 Aug 2004 19:12:00 -0000 1.18 --- ModelEditorBean.java 25 Aug 2004 19:19:21 -0000 1.19 *************** *** 261,270 **** } ! public OntClass getOntClass(Resource resource) { ! return ontModel.createClass(resource.getURI()); } ! public OntProperty getOntProperty(Property property) { ! return ontModel.createOntProperty(property.getURI()); } --- 261,270 ---- } ! public OntClass getOntClass(String uri) { ! return ontModel.createClass(uri); } ! public OntProperty getOntProperty(String uri) { ! return ontModel.createOntProperty(uri); } Index: ModelEditor.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/ModelEditor.java,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** ModelEditor.java 25 Aug 2004 19:12:00 -0000 1.30 --- ModelEditor.java 25 Aug 2004 19:19:21 -0000 1.31 *************** *** 26,30 **** import com.hp.hpl.jena.rdf.model.Literal; import com.hp.hpl.jena.rdf.model.Property; - import com.hp.hpl.jena.rdf.model.Resource; public interface ModelEditor { --- 26,29 ---- *************** *** 55,61 **** public ResourceEditorBean[] getInstances(OntClass clazz, boolean all); ! public OntClass getOntClass(Resource resource); ! public OntProperty getOntProperty(Property property); public OntProperty[] getProperties(OntClass clazz, boolean all); --- 54,60 ---- public ResourceEditorBean[] getInstances(OntClass clazz, boolean all); ! public OntClass getOntClass(String uri); ! public OntProperty getOntProperty(String uri); public OntProperty[] getProperties(OntClass clazz, boolean all); |
|
From: Elmer G. <ega...@us...> - 2004-08-25 19:12:10
|
Update of /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/remote In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7743/src/org/javaowl/editor/remote Modified Files: RemoteModelEditor.java RemoteModelEditorWrapper.java Log Message: Changes in remote API. Index: RemoteModelEditorWrapper.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/remote/RemoteModelEditorWrapper.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** RemoteModelEditorWrapper.java 24 Aug 2004 12:11:54 -0000 1.9 --- RemoteModelEditorWrapper.java 25 Aug 2004 19:12:00 -0000 1.10 *************** *** 38,264 **** public class RemoteModelEditorWrapper implements ModelEditor { ! private String name; ! private OntModel ontModel; private RemoteModelEditor remote; ! public RemoteModelEditorWrapper(String name, RemoteModelEditor remote) { ! this.remote = remote; ! this.name = name; } ! public StatementEditorBean addDataValue(ResourceEditorBean resource, Property property, Literal typedLiteral) { SerializableTriple triple; ! try { ! triple = remote.addDataValue(resource.getURI(), property.getURI(), typedLiteral.getString(), typedLiteral.getDatatype().getURI()); ! return createStatementFromTriple(triple); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } } ! public StatementEditorBean addObjectValue(ResourceEditorBean resource, Property property, ResourceEditorBean value) { try { ! SerializableTriple triple = ! remote.addDataValue(resource.getURI(), property.getURI(), value.getURI()); ! return createStatementFromTriple(triple); } catch (RemoteException e) { ! throw new RuntimeException(e); } } ! public void addPropertyValue(ResourceEditorBean resource, Property property, String value) { ! try { ! remote.addDataValue(resource.getURI(), property.getURI(), value); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } ! } ! private OntClass[] createOntClassesFromUri(String[] uris) { ! OntClass[] classes = new OntClass[uris.length]; ! for (int i = 0; i < uris.length; i++) ! classes[i] = ontModel.createClass(uris[i]); ! return classes; ! } ! private OntProperty[] createOntPropertiesFromURIs(String[] uris) { ! OntProperty[] properties = new OntProperty[uris.length]; ! for (int i = 0; i < uris.length; i++) ! properties[i] = ontModel.createOntProperty(uris[i]); ! return properties; ! } ! public ResourceEditorBean createResourceEditor(OntClass clazz) { ! try { ! Resource resource = ontModel.createResource(remote.createResource(clazz.getURI())); ! return ModelEditorBean.getResourceEditor(resource, this); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } ! } ! public ResourceEditorBean createResourceEditor(String uri, OntClass clazz) { ! try { ! Resource resource = ontModel.createResource(remote.createResource(uri, clazz.getURI())); ! return ModelEditorBean.getResourceEditor(resource, this); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } ! } ! public OntClass[] getAllClasses() { ! try { ! String[] uris = remote.getAllClasses(); ! return createOntClassesFromUri(uris); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } ! } ! public OntProperty[] getAllDatatypeProperties() { ! try { ! String[] uris = remote.getAllDatatypeProperties(); ! return createOntPropertiesFromURIs(uris); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } ! } ! public OntProperty[] getApplicableProperties(ResourceEditorBean resource) { ! try { ! String[] uris = remote.getApplicableProperties(resource.getURI()); ! return createOntPropertiesFromURIs(uris); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } ! } ! public StatementEditorBean[] getDeclaredProperties(ResourceEditorBean resource) { ! try { ! SerializableTriple[] triples = remote.getDeclaredProperties(resource.getURI()); ! StatementEditorBean[] statements = new StatementEditorBean[triples.length]; ! for (int i = 0 ; i < triples.length; i ++) { ! statements[i] = createStatementFromTriple(triples[i]); ! } ! return statements; ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } ! } ! ! private StatementEditorBean createStatementFromTriple(SerializableTriple triple) { ! RDFNode subject = ontModel.getRDFNode(TripleUtil.stringToNode(triple.getSubject())); ! RDFNode predicate = ontModel.getRDFNode(TripleUtil.stringToNode(triple.getPredicate())); ! RDFNode object = ontModel.getRDFNode(TripleUtil.stringToNode(triple.getObject())); ! return ModelEditorBean.getStatementEditor(ontModel.createStatement((Resource) subject, (Property) predicate, object), this); ! } ! ! public ResourceEditorBean[] getInstances(OntClass clazz, boolean all) { ! try { ! String[] uris = remote.getInstances(clazz.getURI(), all); ! ResourceEditorBean[] resources = new ResourceEditorBean[uris.length]; ! for (int i = 0; i < uris.length; i++) ! resources[i] = ModelEditorBean.getResourceEditor(ontModel.createResource(uris[i]), this); ! return resources; ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } ! } ! public String getLabel(ResourceEditorBean resource) { ! try { ! return remote.getLabel(resource.getURI()); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } } ! public OntClass getOntClass(Resource resource) { ! return ontModel.createClass(resource.getURI()); ! } ! public OntProperty getOntProperty(Property property) { ! return ontModel.createOntProperty(property.getURI()); ! } ! public OntProperty[] getProperties(OntClass clazz, boolean all) { ! try { ! String[] uris = remote.getProperties(clazz.getURI(), all); ! return createOntPropertiesFromURIs(uris); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } ! } ! public String getPropertyValue(OntClass clazz, Property label, boolean uri) { ! try { ! return remote.getPropertyValue(clazz.getURI(), label.getURI(), uri); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } ! } ! public String getPropertyValue(ResourceEditorBean resource, Property property, boolean uri) { ! try { ! return remote.getPropertyValue(resource.getURI(), property.getURI(), uri); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } ! } ! public OntClass[] getSubClasses(OntClass clazz) { ! try { ! String[] uris = remote.getSubClasses(clazz.getURI()); ! return createOntClassesFromUri(uris); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } ! } ! public Literal getTypedLiteral(Object value, OntResource type) { ! return ontModel.createTypedLiteral(value, type.getURI()); ! } public OntClass getValidLeafClass(Property property) { ! try { ! String uri = remote.getValidLeafClass(property.getURI()); ! return ontModel.createClass(uri); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } } public ResourceEditorBean[] getValidObjects(OntClass clazz) { ! try { ! String[] uris = remote.getValidObjects(clazz.getURI()); ! ResourceEditorBean[] individuals = new ResourceEditorBean[uris.length]; ! for (int i = 0; i < uris.length; i++) ! individuals[i] = ModelEditorBean.getResourceEditor(ontModel.createResource(uris[i]), this); ! return individuals; ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } } ! public void removeResource(ResourceEditorBean resource) { ! try { ! remote.removeResource(resource.getURI()); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } ! } ! public void removeStatement(StatementEditorBean statement) { ! try { ! remote.removeStatement(new SerializableTriple(statement.asTriple())); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } ! } ! } --- 38,275 ---- public class RemoteModelEditorWrapper implements ModelEditor { ! ! private OntModel ontModel; private RemoteModelEditor remote; ! public RemoteModelEditorWrapper(String prefix, RemoteModelEditor remote) { ! try { ! this.remote = remote; ! remote.init(prefix); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } } ! public StatementEditorBean addDataValue(ResourceEditorBean resource, Property property, ! Literal typedLiteral) { SerializableTriple triple; ! try { ! triple = remote.addDataValue(resource.getURI(), property.getURI(), ! typedLiteral.getString(), ! typedLiteral.getDatatype().getURI()); ! return createStatementFromTriple(triple); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } } ! public StatementEditorBean addObjectValue(ResourceEditorBean resource, Property property, ! ResourceEditorBean value) { try { ! SerializableTriple triple = ! remote.addDataValue(resource.getURI(), property.getURI(), value.getURI()); ! return createStatementFromTriple(triple); } catch (RemoteException e) { ! throw new RuntimeException(e); } } ! public void addPropertyValue(ResourceEditorBean resource, Property property, ! String value) { ! try { ! remote.addDataValue(resource.getURI(), property.getURI(), value); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } ! } ! private OntClass[] createOntClassesFromUri(String[] uris) { ! OntClass[] classes = new OntClass[uris.length]; ! for (int i = 0; i < uris.length; i++) ! classes[i] = ontModel.createClass(uris[i]); ! return classes; ! } ! private OntProperty[] createOntPropertiesFromURIs(String[] uris) { ! OntProperty[] properties = new OntProperty[uris.length]; ! for (int i = 0; i < uris.length; i++) ! properties[i] = ontModel.createOntProperty(uris[i]); ! return properties; ! } ! public ResourceEditorBean createResourceEditor(OntClass clazz) { ! try { ! Resource resource = ontModel ! .createResource(remote.createResource(clazz.getURI())); ! return ModelEditorBean.getResourceEditor(resource, this); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } ! } ! public ResourceEditorBean createResourceEditor(String uri, OntClass clazz) { ! try { ! Resource resource = ontModel ! .createResource(remote.createResource(uri, clazz.getURI())); ! return ModelEditorBean.getResourceEditor(resource, this); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } ! } ! public OntClass[] getAllClasses() { ! try { ! String[] uris = remote.getAllClasses(); ! return createOntClassesFromUri(uris); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } ! } ! public OntProperty[] getAllDatatypeProperties() { ! try { ! String[] uris = remote.getAllDatatypeProperties(); ! return createOntPropertiesFromURIs(uris); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } ! } ! public OntProperty[] getApplicableProperties(ResourceEditorBean resource) { ! try { ! String[] uris = remote.getApplicableProperties(resource.getURI()); ! return createOntPropertiesFromURIs(uris); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } ! } ! public StatementEditorBean[] getDeclaredProperties(ResourceEditorBean resource) { ! try { ! SerializableTriple[] triples = remote.getDeclaredProperties(resource.getURI()); ! StatementEditorBean[] statements = new StatementEditorBean[triples.length]; ! for (int i = 0 ; i < triples.length; i ++) { ! statements[i] = createStatementFromTriple(triples[i]); ! } ! return statements; ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } ! } ! public ResourceEditorBean getResourceEditor(String uri) { ! throw new UnsupportedOperationException(); ! } ! private StatementEditorBean createStatementFromTriple(SerializableTriple triple) { ! RDFNode subject = ontModel ! .getRDFNode(TripleUtil.stringToNode(triple.getSubject())); ! RDFNode predicate = ontModel ! .getRDFNode(TripleUtil.stringToNode(triple.getPredicate())); ! RDFNode object = ontModel.getRDFNode(TripleUtil.stringToNode(triple.getObject())); ! return ModelEditorBean ! .getStatementEditor(ontModel.createStatement((Resource) subject, ! (Property) predicate, object), this); ! } ! public ResourceEditorBean[] getInstances(OntClass clazz, boolean all) { ! try { ! String[] uris = remote.getInstances(clazz.getURI(), all); ! ResourceEditorBean[] resources = new ResourceEditorBean[uris.length]; ! for (int i = 0; i < uris.length; i++) ! resources[i] = ModelEditorBean ! .getResourceEditor(ontModel.createResource(uris[i]), this); ! return resources; ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } } ! public OntClass getOntClass(Resource resource) { ! return ontModel.createClass(resource.getURI()); ! } ! public OntProperty getOntProperty(Property property) { ! return ontModel.createOntProperty(property.getURI()); ! } ! public OntProperty[] getProperties(OntClass clazz, boolean all) { ! try { ! String[] uris = remote.getProperties(clazz.getURI(), all); ! return createOntPropertiesFromURIs(uris); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } ! } ! public String getPropertyValue(OntClass clazz, Property label, boolean uri) { ! try { ! return remote.getPropertyValue(clazz.getURI(), label.getURI(), uri); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } ! } ! public String getPropertyValue(ResourceEditorBean resource, Property property, ! boolean uri) { ! try { ! return remote.getPropertyValue(resource.getURI(), property.getURI(), uri); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } ! } ! public OntClass[] getSubClasses(OntClass clazz) { ! try { ! String[] uris = remote.getSubClasses(clazz.getURI()); ! return createOntClassesFromUri(uris); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } ! } ! public Literal getTypedLiteral(Object value, OntResource type) { ! return ontModel.createTypedLiteral(value, type.getURI()); ! } public OntClass getValidLeafClass(Property property) { ! try { ! String uri = remote.getValidLeafClass(property.getURI()); ! return ontModel.createClass(uri); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } } public ResourceEditorBean[] getValidObjects(OntClass clazz) { ! try { ! String[] uris = remote.getValidObjects(clazz.getURI()); ! ResourceEditorBean[] individuals = new ResourceEditorBean[uris.length]; ! for (int i = 0; i < uris.length; i++) ! individuals[i] = ModelEditorBean ! .getResourceEditor(ontModel.createResource(uris[i]), this); ! return individuals; ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } } ! public void removeResource(ResourceEditorBean resource) { ! try { ! remote.removeResource(resource.getURI()); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } ! } ! public void removeStatement(StatementEditorBean statement) { ! try { ! remote.removeStatement(new SerializableTriple(statement.asTriple())); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } ! } } Index: RemoteModelEditor.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/remote/RemoteModelEditor.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** RemoteModelEditor.java 24 Aug 2004 12:11:54 -0000 1.7 --- RemoteModelEditor.java 25 Aug 2004 19:12:00 -0000 1.8 *************** *** 25,65 **** public interface RemoteModelEditor extends Remote{ ! SerializableTriple addDataValue(String resource, String property, String object) throws RemoteException; ! ! SerializableTriple addDataValue(String resource, String property, String value, String dataType) throws RemoteException; String createResource(String clazz) throws RemoteException; ! String createResource(String uri, String clazz) throws RemoteException; ! ! String[] getAllClasses() throws RemoteException; ! ! String[] getAllDatatypeProperties() throws RemoteException; ! String[] getApplicableProperties(String resource) throws RemoteException; ! ! String getComment(String resource) throws RemoteException; ! ! SerializableTriple[] getDeclaredProperties(String resource) throws RemoteException; ! ! String[] getInstances(String clazz, boolean all) throws RemoteException; ! ! String getLabel(String resource) throws RemoteException; ! ! String[] getProperties(String resource, boolean all) throws RemoteException; ! ! String getPropertyValue(String clazz, String label, boolean uri) throws RemoteException; ! ! String[] getSubClasses(String clazz) throws RemoteException; ! String getValidLeafClass(String property) throws RemoteException; String[] getValidObjects(String clazz) throws RemoteException; ! void removeEditor(String name) throws RemoteException; ! void removeResource(String uri) throws RemoteException; ! ! void removeStatement(SerializableTriple statement) throws RemoteException; void setComment(String resource, String comment) throws RemoteException; --- 25,63 ---- public interface RemoteModelEditor extends Remote{ ! SerializableTriple addDataValue(String resource, String property, String object) throws RemoteException; ! ! SerializableTriple addDataValue(String resource, String property, String value, String dataType) throws RemoteException; ! ! void clearEditor() throws RemoteException; String createResource(String clazz) throws RemoteException; ! String createResource(String uri, String clazz) throws RemoteException; ! ! String[] getAllClasses() throws RemoteException; ! ! String[] getAllDatatypeProperties() throws RemoteException; ! String[] getApplicableProperties(String resource) throws RemoteException; ! ! SerializableTriple[] getDeclaredProperties(String resource) throws RemoteException; ! ! String[] getInstances(String clazz, boolean all) throws RemoteException; ! ! String[] getProperties(String resource, boolean all) throws RemoteException; ! ! String getPropertyValue(String clazz, String label, boolean uri) throws RemoteException; ! ! String[] getSubClasses(String clazz) throws RemoteException; ! String getValidLeafClass(String property) throws RemoteException; String[] getValidObjects(String clazz) throws RemoteException; ! void init(String prefix) throws RemoteException; ! void removeResource(String uri) throws RemoteException; ! ! void removeStatement(SerializableTriple statement) throws RemoteException; void setComment(String resource, String comment) throws RemoteException; |
|
From: Elmer G. <ega...@us...> - 2004-08-25 19:12:10
|
Update of /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7743/src/org/javaowl/editor Modified Files: ModelEditor.java ModelEditorBean.java StatementEditorBean.java Log Message: Changes in remote API. Index: ModelEditorBean.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/ModelEditorBean.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** ModelEditorBean.java 23 Aug 2004 22:23:54 -0000 1.17 --- ModelEditorBean.java 25 Aug 2004 19:12:00 -0000 1.18 *************** *** 306,309 **** --- 306,313 ---- } + public ResourceEditorBean getResourceEditor(String uri) { + return new ResourceEditorBean(ontModel.getResource(uri), this); + } + public ResourceEditorBean createResourceEditor(String uri, OntClass clazz) { Resource r = data.createResource(uri); Index: StatementEditorBean.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/StatementEditorBean.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** StatementEditorBean.java 23 Aug 2004 20:02:11 -0000 1.1 --- StatementEditorBean.java 25 Aug 2004 19:12:00 -0000 1.2 *************** *** 27,32 **** public final class StatementEditorBean { ! final Statement statement; ! private final ModelEditor editor; StatementEditorBean(Statement statement, ModelEditor editor) { --- 27,32 ---- public final class StatementEditorBean { ! final Statement statement; ! private final ModelEditor editor; StatementEditorBean(Statement statement, ModelEditor editor) { *************** *** 35,53 **** } ! public Property getPredicate() { ! return statement.getPredicate(); ! } ! public Object getObject() { ! Object value = statement.getObject(); ! if(value instanceof Resource) { ! return new ResourceEditorBean((Resource)value, editor); ! } ! return value; ! } ! public Triple asTriple() { ! return statement.asTriple(); ! } } --- 35,53 ---- } ! public Property getPredicate() { ! return statement.getPredicate(); ! } ! public Object getObject() { ! Object value = statement.getObject(); ! if(value instanceof Resource) { ! return new ResourceEditorBean((Resource)value, editor); ! } ! return value; ! } ! public Triple asTriple() { ! return statement.asTriple(); ! } } Index: ModelEditor.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/ModelEditor.java,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** ModelEditor.java 23 Aug 2004 20:02:11 -0000 1.29 --- ModelEditor.java 25 Aug 2004 19:12:00 -0000 1.30 *************** *** 30,73 **** public interface ModelEditor { ! public StatementEditorBean addDataValue(ResourceEditorBean resource, Property currentProperty, Literal typedLiteral); ! public StatementEditorBean addObjectValue(ResourceEditorBean resource, Property currentProperty, ResourceEditorBean value); ! public void addPropertyValue(ResourceEditorBean bean, Property label, String value); ! public ResourceEditorBean createResourceEditor(OntClass clazz); ! public ResourceEditorBean createResourceEditor(String uri, OntClass clazz); ! public OntClass[] getAllClasses(); ! public OntProperty[] getAllDatatypeProperties(); ! public OntProperty[] getApplicableProperties(ResourceEditorBean resource); ! public StatementEditorBean[] getDeclaredProperties(ResourceEditorBean resource); ! public ResourceEditorBean[] getInstances(OntClass clazz, boolean all); ! public OntClass getOntClass(Resource resource); ! public OntProperty getOntProperty(Property property); ! public OntProperty[] getProperties(OntClass clazz, boolean all); ! public String getPropertyValue(OntClass clazz, Property label, boolean b); ! public String getPropertyValue(ResourceEditorBean bean, Property p, boolean uri); ! ! public OntClass[] getSubClasses(OntClass clazz); ! public Literal getTypedLiteral(Object value, OntResource type); public OntClass getValidLeafClass(Property currentProperty); ! public ResourceEditorBean[] getValidObjects(OntClass clazz); ! public void removeResource(ResourceEditorBean resource); ! public void removeStatement(StatementEditorBean statement); } --- 30,78 ---- public interface ModelEditor { ! public StatementEditorBean addDataValue(ResourceEditorBean resource, ! Property property, Literal typedLiteral); ! public StatementEditorBean addObjectValue(ResourceEditorBean resource, ! Property property, ! ResourceEditorBean value); ! public void addPropertyValue(ResourceEditorBean bean, Property label, String value); ! public ResourceEditorBean createResourceEditor(OntClass clazz); ! public ResourceEditorBean createResourceEditor(String uri, OntClass clazz); ! ! public ResourceEditorBean getResourceEditor(String uri); ! public OntClass[] getAllClasses(); ! public OntProperty[] getAllDatatypeProperties(); ! public OntProperty[] getApplicableProperties(ResourceEditorBean resource); ! public StatementEditorBean[] getDeclaredProperties(ResourceEditorBean resource); ! public ResourceEditorBean[] getInstances(OntClass clazz, boolean all); ! public OntClass getOntClass(Resource resource); ! public OntProperty getOntProperty(Property property); ! public OntProperty[] getProperties(OntClass clazz, boolean all); ! public String getPropertyValue(OntClass clazz, Property label, boolean b); ! public String getPropertyValue(ResourceEditorBean bean, Property p, boolean uri); ! public OntClass[] getSubClasses(OntClass clazz); + public Literal getTypedLiteral(Object value, OntResource type); + public OntClass getValidLeafClass(Property currentProperty); ! public ResourceEditorBean[] getValidObjects(OntClass clazz); ! public void removeResource(ResourceEditorBean resource); ! public void removeStatement(StatementEditorBean statement); } |
|
From: Elmer G. <ega...@us...> - 2004-08-24 12:12:06
|
Update of /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/remote In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9728/src/org/javaowl/editor/remote Modified Files: RemoteModelEditor.java RemoteModelEditorWrapper.java Log Message: Added RemoteExceptions Index: RemoteModelEditorWrapper.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/remote/RemoteModelEditorWrapper.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** RemoteModelEditorWrapper.java 23 Aug 2004 22:23:55 -0000 1.8 --- RemoteModelEditorWrapper.java 24 Aug 2004 12:11:54 -0000 1.9 *************** *** 20,23 **** --- 20,25 ---- package org.javaowl.editor.remote; + import java.rmi.RemoteException; + import org.javaowl.editor.ModelEditor; import org.javaowl.editor.ModelEditorBean; *************** *** 47,63 **** public StatementEditorBean addDataValue(ResourceEditorBean resource, Property property, Literal typedLiteral) { ! SerializableTriple triple = ! remote.addDataValue(resource.getURI(), property.getURI(), typedLiteral.getString(), typedLiteral.getDatatype().getURI()); ! return createStatementFromTriple(triple); } public StatementEditorBean addObjectValue(ResourceEditorBean resource, Property property, ResourceEditorBean value) { ! SerializableTriple triple = ! remote.addDataValue(resource.getURI(), property.getURI(), value.getURI()); ! return createStatementFromTriple(triple); } public void addPropertyValue(ResourceEditorBean resource, Property property, String value) { ! remote.addDataValue(resource.getURI(), property.getURI(), value); } --- 49,77 ---- public StatementEditorBean addDataValue(ResourceEditorBean resource, Property property, Literal typedLiteral) { ! SerializableTriple triple; ! try { ! triple = remote.addDataValue(resource.getURI(), property.getURI(), typedLiteral.getString(), typedLiteral.getDatatype().getURI()); ! return createStatementFromTriple(triple); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } } public StatementEditorBean addObjectValue(ResourceEditorBean resource, Property property, ResourceEditorBean value) { ! try { ! SerializableTriple triple = ! remote.addDataValue(resource.getURI(), property.getURI(), value.getURI()); ! return createStatementFromTriple(triple); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } } public void addPropertyValue(ResourceEditorBean resource, Property property, String value) { ! try { ! remote.addDataValue(resource.getURI(), property.getURI(), value); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } } *************** *** 77,113 **** public ResourceEditorBean createResourceEditor(OntClass clazz) { ! Resource resource = ontModel.createResource(remote.createResource(clazz.getURI())); ! return ModelEditorBean.getResourceEditor(resource, this); } public ResourceEditorBean createResourceEditor(String uri, OntClass clazz) { ! Resource resource = ontModel.createResource(remote.createResource(uri, clazz.getURI())); ! return ModelEditorBean.getResourceEditor(resource, this); } public OntClass[] getAllClasses() { ! String[] uris = remote.getAllClasses(); ! return createOntClassesFromUri(uris); } public OntProperty[] getAllDatatypeProperties() { ! String[] uris = remote.getAllDatatypeProperties(); ! return createOntPropertiesFromURIs(uris); } public OntProperty[] getApplicableProperties(ResourceEditorBean resource) { ! String[] uris = remote.getApplicableProperties(resource.getURI()); ! return createOntPropertiesFromURIs(uris); } public StatementEditorBean[] getDeclaredProperties(ResourceEditorBean resource) { ! SerializableTriple[] triples = remote.getDeclaredProperties(resource.getURI()); ! StatementEditorBean[] statements = new StatementEditorBean[triples.length]; ! for (int i = 0 ; i < triples.length; i ++) { ! statements[i] = createStatementFromTriple(triples[i]); } - return statements; } private StatementEditorBean createStatementFromTriple(SerializableTriple triple) { RDFNode subject = ontModel.getRDFNode(TripleUtil.stringToNode(triple.getSubject())); --- 91,154 ---- public ResourceEditorBean createResourceEditor(OntClass clazz) { ! try { ! Resource resource = ontModel.createResource(remote.createResource(clazz.getURI())); ! return ModelEditorBean.getResourceEditor(resource, this); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } } public ResourceEditorBean createResourceEditor(String uri, OntClass clazz) { ! try { ! Resource resource = ontModel.createResource(remote.createResource(uri, clazz.getURI())); ! return ModelEditorBean.getResourceEditor(resource, this); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } } public OntClass[] getAllClasses() { ! try { ! String[] uris = remote.getAllClasses(); ! return createOntClassesFromUri(uris); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } } public OntProperty[] getAllDatatypeProperties() { ! try { ! String[] uris = remote.getAllDatatypeProperties(); ! return createOntPropertiesFromURIs(uris); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } } + public OntProperty[] getApplicableProperties(ResourceEditorBean resource) { ! try { ! String[] uris = remote.getApplicableProperties(resource.getURI()); ! return createOntPropertiesFromURIs(uris); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } } public StatementEditorBean[] getDeclaredProperties(ResourceEditorBean resource) { ! try { ! SerializableTriple[] triples = remote.getDeclaredProperties(resource.getURI()); ! StatementEditorBean[] statements = new StatementEditorBean[triples.length]; ! for (int i = 0 ; i < triples.length; i ++) { ! statements[i] = createStatementFromTriple(triples[i]); ! } ! return statements; ! } catch (RemoteException e) { ! throw new RuntimeException(e); } } + + private StatementEditorBean createStatementFromTriple(SerializableTriple triple) { RDFNode subject = ontModel.getRDFNode(TripleUtil.stringToNode(triple.getSubject())); *************** *** 117,130 **** } ! public ResourceEditorBean[] getInstances(OntClass clazz, boolean all) { ! String[] uris = remote.getInstances(clazz.getURI(), all); ! ResourceEditorBean[] resources = new ResourceEditorBean[uris.length]; ! for (int i = 0; i < uris.length; i++) ! resources[i] = ModelEditorBean.getResourceEditor(ontModel.createResource(uris[i]), this); ! return resources; } public String getLabel(ResourceEditorBean resource) { ! return remote.getLabel(resource.getURI()); } --- 158,179 ---- } ! public ResourceEditorBean[] getInstances(OntClass clazz, boolean all) { ! try { ! String[] uris = remote.getInstances(clazz.getURI(), all); ! ResourceEditorBean[] resources = new ResourceEditorBean[uris.length]; ! for (int i = 0; i < uris.length; i++) ! resources[i] = ModelEditorBean.getResourceEditor(ontModel.createResource(uris[i]), this); ! return resources; ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } } public String getLabel(ResourceEditorBean resource) { ! try { ! return remote.getLabel(resource.getURI()); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } } *************** *** 138,156 **** public OntProperty[] getProperties(OntClass clazz, boolean all) { ! String[] uris = remote.getProperties(clazz.getURI(), all); ! return createOntPropertiesFromURIs(uris); } public String getPropertyValue(OntClass clazz, Property label, boolean uri) { ! return remote.getPropertyValue(clazz.getURI(), label.getURI(), uri); } public String getPropertyValue(ResourceEditorBean resource, Property property, boolean uri) { ! return remote.getPropertyValue(resource.getURI(), property.getURI(), uri); } ! public OntClass[] getSubClasses(OntClass clazz) { ! String[] uris = remote.getSubClasses(clazz.getURI()); ! return createOntClassesFromUri(uris); } --- 187,221 ---- public OntProperty[] getProperties(OntClass clazz, boolean all) { ! try { ! String[] uris = remote.getProperties(clazz.getURI(), all); ! return createOntPropertiesFromURIs(uris); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } } public String getPropertyValue(OntClass clazz, Property label, boolean uri) { ! try { ! return remote.getPropertyValue(clazz.getURI(), label.getURI(), uri); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } } public String getPropertyValue(ResourceEditorBean resource, Property property, boolean uri) { ! try { ! return remote.getPropertyValue(resource.getURI(), property.getURI(), uri); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } } ! public OntClass[] getSubClasses(OntClass clazz) { ! try { ! String[] uris = remote.getSubClasses(clazz.getURI()); ! return createOntClassesFromUri(uris); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } } *************** *** 159,182 **** } ! public OntClass getValidLeafClass(Property property) { ! String uri = remote.getValidLeafClass(property.getURI()); ! return ontModel.createClass(uri); } ! public ResourceEditorBean[] getValidObjects(OntClass clazz) { ! String[] uris = remote.getValidObjects(clazz.getURI()); ! ResourceEditorBean[] individuals = new ResourceEditorBean[uris.length]; ! for (int i = 0; i < uris.length; i++) ! individuals[i] = ModelEditorBean.getResourceEditor(ontModel.createResource(uris[i]), this); ! return individuals; } ! public void removeResource(ResourceEditorBean resource) { ! remote.removeResource(resource.getURI()); } ! public void removeStatement(StatementEditorBean statement) { ! remote.removeStatement(new SerializableTriple(statement.asTriple())); } --- 224,263 ---- } ! public OntClass getValidLeafClass(Property property) { ! try { ! String uri = remote.getValidLeafClass(property.getURI()); ! return ontModel.createClass(uri); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } } ! public ResourceEditorBean[] getValidObjects(OntClass clazz) { ! try { ! String[] uris = remote.getValidObjects(clazz.getURI()); ! ResourceEditorBean[] individuals = new ResourceEditorBean[uris.length]; ! for (int i = 0; i < uris.length; i++) ! individuals[i] = ModelEditorBean.getResourceEditor(ontModel.createResource(uris[i]), this); ! return individuals; ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } } ! public void removeResource(ResourceEditorBean resource) { ! try { ! remote.removeResource(resource.getURI()); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } } ! public void removeStatement(StatementEditorBean statement) { ! try { ! remote.removeStatement(new SerializableTriple(statement.asTriple())); ! } catch (RemoteException e) { ! throw new RuntimeException(e); ! } } Index: RemoteModelEditor.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/remote/RemoteModelEditor.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** RemoteModelEditor.java 23 Aug 2004 22:23:55 -0000 1.6 --- RemoteModelEditor.java 24 Aug 2004 12:11:54 -0000 1.7 *************** *** 21,66 **** import java.rmi.Remote; public interface RemoteModelEditor extends Remote{ ! String[] getAllClasses(); ! ! String[] getAllDatatypeProperties(); ! String[] getProperties(String resource, boolean all); ! void removeResource(String uri); ! String[] getInstances(String clazz, boolean all); ! String[] getSubClasses(String clazz); ! void removeStatement(SerializableTriple statement); ! String[] getApplicableProperties(String resource); ! String getComment(String resource); ! String getLabel(String resource); ! void setComment(String resource, String comment); ! void setLabel(String resource, String label); ! String createResource(String uri, String clazz); ! String createResource(String clazz); ! String[] getValidObjects(String clazz); ! String getValidLeafClass(String property); ! String getPropertyValue(String clazz, String label, boolean uri); ! SerializableTriple[] getDeclaredProperties(String resource); ! SerializableTriple addDataValue(String resource, String property, String value, String dataType); ! ! SerializableTriple addDataValue(String resource, String property, String object); } --- 21,69 ---- import java.rmi.Remote; + import java.rmi.RemoteException; public interface RemoteModelEditor extends Remote{ + + SerializableTriple addDataValue(String resource, String property, String object) throws RemoteException; ! SerializableTriple addDataValue(String resource, String property, String value, String dataType) throws RemoteException; ! String createResource(String clazz) throws RemoteException; ! String createResource(String uri, String clazz) throws RemoteException; ! String[] getAllClasses() throws RemoteException; ! String[] getAllDatatypeProperties() throws RemoteException; ! String[] getApplicableProperties(String resource) throws RemoteException; ! String getComment(String resource) throws RemoteException; ! SerializableTriple[] getDeclaredProperties(String resource) throws RemoteException; ! String[] getInstances(String clazz, boolean all) throws RemoteException; ! String getLabel(String resource) throws RemoteException; ! String[] getProperties(String resource, boolean all) throws RemoteException; ! String getPropertyValue(String clazz, String label, boolean uri) throws RemoteException; ! String[] getSubClasses(String clazz) throws RemoteException; ! String getValidLeafClass(String property) throws RemoteException; ! String[] getValidObjects(String clazz) throws RemoteException; ! void removeEditor(String name) throws RemoteException; ! ! void removeResource(String uri) throws RemoteException; ! void removeStatement(SerializableTriple statement) throws RemoteException; ! void setComment(String resource, String comment) throws RemoteException; + void setLabel(String resource, String label) throws RemoteException; + } |
|
From: Elmer G. <ega...@us...> - 2004-08-23 22:24:06
|
Update of /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/remote In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31192/src/org/javaowl/editor/remote Modified Files: RemoteModelEditor.java RemoteModelEditorWrapper.java Log Message: Implemented remote wrapper methods. Index: RemoteModelEditorWrapper.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/remote/RemoteModelEditorWrapper.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** RemoteModelEditorWrapper.java 23 Aug 2004 20:02:11 -0000 1.7 --- RemoteModelEditorWrapper.java 23 Aug 2004 22:23:55 -0000 1.8 *************** *** 24,27 **** --- 24,28 ---- import org.javaowl.editor.ResourceEditorBean; import org.javaowl.editor.StatementEditorBean; + import org.javaowl.models.prevalence.TripleUtil; import com.hp.hpl.jena.ontology.OntClass; *************** *** 31,34 **** --- 32,36 ---- import com.hp.hpl.jena.rdf.model.Literal; import com.hp.hpl.jena.rdf.model.Property; + import com.hp.hpl.jena.rdf.model.RDFNode; import com.hp.hpl.jena.rdf.model.Resource; *************** *** 44,57 **** } ! public StatementEditorBean addDataValue(ResourceEditorBean resource, Property currentProperty, Literal typedLiteral) { ! // TODO Auto-generated method stub ! return null; } ! public StatementEditorBean addObjectValue(ResourceEditorBean resource, Property currentProperty, ResourceEditorBean value) { ! // TODO Auto-generated method stub ! return null; } public ResourceEditorBean createResourceEditor(OntClass clazz) { Resource resource = ontModel.createResource(remote.createResource(clazz.getURI())); --- 46,79 ---- } ! public StatementEditorBean addDataValue(ResourceEditorBean resource, Property property, Literal typedLiteral) { ! SerializableTriple triple = ! remote.addDataValue(resource.getURI(), property.getURI(), typedLiteral.getString(), typedLiteral.getDatatype().getURI()); ! return createStatementFromTriple(triple); } ! public StatementEditorBean addObjectValue(ResourceEditorBean resource, Property property, ResourceEditorBean value) { ! SerializableTriple triple = ! remote.addDataValue(resource.getURI(), property.getURI(), value.getURI()); ! return createStatementFromTriple(triple); } + public void addPropertyValue(ResourceEditorBean resource, Property property, String value) { + remote.addDataValue(resource.getURI(), property.getURI(), value); + } + + private OntClass[] createOntClassesFromUri(String[] uris) { + OntClass[] classes = new OntClass[uris.length]; + for (int i = 0; i < uris.length; i++) + classes[i] = ontModel.createClass(uris[i]); + return classes; + } + + private OntProperty[] createOntPropertiesFromURIs(String[] uris) { + OntProperty[] properties = new OntProperty[uris.length]; + for (int i = 0; i < uris.length; i++) + properties[i] = ontModel.createOntProperty(uris[i]); + return properties; + } + public ResourceEditorBean createResourceEditor(OntClass clazz) { Resource resource = ontModel.createResource(remote.createResource(clazz.getURI())); *************** *** 63,67 **** return ModelEditorBean.getResourceEditor(resource, this); } ! public OntClass[] getAllClasses() { String[] uris = remote.getAllClasses(); --- 85,89 ---- return ModelEditorBean.getResourceEditor(resource, this); } ! public OntClass[] getAllClasses() { String[] uris = remote.getAllClasses(); *************** *** 80,87 **** public StatementEditorBean[] getDeclaredProperties(ResourceEditorBean resource) { ! // TODO Auto-generated method stub ! return null; } public ResourceEditorBean[] getInstances(OntClass clazz, boolean all) { String[] uris = remote.getInstances(clazz.getURI(), all); --- 102,120 ---- public StatementEditorBean[] getDeclaredProperties(ResourceEditorBean resource) { ! SerializableTriple[] triples = remote.getDeclaredProperties(resource.getURI()); ! StatementEditorBean[] statements = new StatementEditorBean[triples.length]; ! for (int i = 0 ; i < triples.length; i ++) { ! statements[i] = createStatementFromTriple(triples[i]); ! } ! return statements; } + private StatementEditorBean createStatementFromTriple(SerializableTriple triple) { + RDFNode subject = ontModel.getRDFNode(TripleUtil.stringToNode(triple.getSubject())); + RDFNode predicate = ontModel.getRDFNode(TripleUtil.stringToNode(triple.getPredicate())); + RDFNode object = ontModel.getRDFNode(TripleUtil.stringToNode(triple.getObject())); + return ModelEditorBean.getStatementEditor(ontModel.createStatement((Resource) subject, (Property) predicate, object), this); + } + public ResourceEditorBean[] getInstances(OntClass clazz, boolean all) { String[] uris = remote.getInstances(clazz.getURI(), all); *************** *** 109,112 **** --- 142,153 ---- } + public String getPropertyValue(OntClass clazz, Property label, boolean uri) { + return remote.getPropertyValue(clazz.getURI(), label.getURI(), uri); + } + + public String getPropertyValue(ResourceEditorBean resource, Property property, boolean uri) { + return remote.getPropertyValue(resource.getURI(), property.getURI(), uri); + } + public OntClass[] getSubClasses(OntClass clazz) { String[] uris = remote.getSubClasses(clazz.getURI()); *************** *** 118,123 **** } ! public OntClass getValidLeafClass(Property currentProperty) { ! String uri = remote.getValidLeafClass(currentProperty.getURI()); return ontModel.createClass(uri); } --- 159,164 ---- } ! public OntClass getValidLeafClass(Property property) { ! String uri = remote.getValidLeafClass(property.getURI()); return ontModel.createClass(uri); } *************** *** 139,174 **** remote.removeStatement(new SerializableTriple(statement.asTriple())); } - - private OntClass[] createOntClassesFromUri(String[] uris) { - OntClass[] classes = new OntClass[uris.length]; - for (int i = 0; i < uris.length; i++) - classes[i] = ontModel.createClass(uris[i]); - return classes; - } - - private OntProperty[] createOntPropertiesFromURIs(String[] uris) { - OntProperty[] properties = new OntProperty[uris.length]; - for (int i = 0; i < uris.length; i++) - properties[i] = ontModel.createOntProperty(uris[i]); - return properties; - } - - public String getPropertyValue(ResourceEditorBean bean, Property p, boolean uri) { - // TODO Auto-generated method stub - return null; - } - - public void addPropertyValue(ResourceEditorBean bean, Property label, String value) { - // TODO Auto-generated method stub - - } - - /* (non-Javadoc) - * @see org.javaowl.editor.ModelEditor#getPropertyValue(com.hp.hpl.jena.ontology.OntClass, com.hp.hpl.jena.rdf.model.Property, boolean) - */ - public String getPropertyValue(OntClass clazz, Property label, boolean b) { - // TODO Auto-generated method stub - return null; - } } --- 180,183 ---- Index: RemoteModelEditor.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/remote/RemoteModelEditor.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** RemoteModelEditor.java 21 Aug 2004 00:22:50 -0000 1.5 --- RemoteModelEditor.java 23 Aug 2004 22:23:55 -0000 1.6 *************** *** 28,58 **** String[] getAllDatatypeProperties(); ! String[] getProperties(String uri, boolean all); void removeResource(String uri); ! String[] getInstances(String uri, boolean all); ! String[] getSubClasses(String uri); ! void removeStatement(SerializableTriple triple); ! String[] getApplicableProperties(String uri); ! String getComment(String uri); ! String getLabel(String uri); ! void setComment(String uri, String comment); ! void setLabel(String uri, String label); ! String createResource(String uri, String resourceClass); ! String createResource(String resourceClass); ! String[] getValidObjects(String uri); ! String getValidLeafClass(String currentProperty); } --- 28,66 ---- String[] getAllDatatypeProperties(); ! String[] getProperties(String resource, boolean all); void removeResource(String uri); ! String[] getInstances(String clazz, boolean all); ! String[] getSubClasses(String clazz); ! void removeStatement(SerializableTriple statement); ! String[] getApplicableProperties(String resource); ! String getComment(String resource); ! String getLabel(String resource); ! void setComment(String resource, String comment); ! void setLabel(String resource, String label); ! String createResource(String uri, String clazz); ! String createResource(String clazz); ! String[] getValidObjects(String clazz); ! String getValidLeafClass(String property); ! ! String getPropertyValue(String clazz, String label, boolean uri); ! ! SerializableTriple[] getDeclaredProperties(String resource); ! ! SerializableTriple addDataValue(String resource, String property, String value, String dataType); ! ! SerializableTriple addDataValue(String resource, String property, String object); } |
|
From: Elmer G. <ega...@us...> - 2004-08-23 22:24:05
|
Update of /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31192/src/org/javaowl/editor Modified Files: ModelEditorBean.java Log Message: Implemented remote wrapper methods. Index: ModelEditorBean.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/ModelEditorBean.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** ModelEditorBean.java 23 Aug 2004 20:02:11 -0000 1.16 --- ModelEditorBean.java 23 Aug 2004 22:23:54 -0000 1.17 *************** *** 312,315 **** --- 312,319 ---- } + + public static StatementEditorBean getStatementEditor(Statement statement, ModelEditor editor) { + return new StatementEditorBean(statement, editor); + } *************** *** 346,349 **** } this.classes = (OntClass[]) classes.toArray(new OntClass[0]); ! } } --- 350,354 ---- } this.classes = (OntClass[]) classes.toArray(new OntClass[0]); ! } ! } |
|
From: Elmer G. <ega...@us...> - 2004-08-23 20:02:23
|
Update of /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17115/src/org/javaowl/editor Modified Files: ModelEditorBean.java ModelEditor.java ResourceEditorBean.java Added Files: StatementEditorBean.java Log Message: Finished refactoring Index: ModelEditorBean.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/ModelEditorBean.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** ModelEditorBean.java 21 Aug 2004 00:22:49 -0000 1.15 --- ModelEditorBean.java 23 Aug 2004 20:02:11 -0000 1.16 *************** *** 32,36 **** import org.javaowl.editor.reasoner.EditorReasoner; - import com.hp.hpl.jena.ontology.Individual; import com.hp.hpl.jena.ontology.OntClass; import com.hp.hpl.jena.ontology.OntModel; --- 32,35 ---- *************** *** 157,168 **** } ! public Statement[] getDeclaredProperties(ResourceEditorBean resource) { List resources = new ArrayList(); for (Iterator it = resource.resource.listProperties(); it.hasNext();) { Statement stmt = (Statement) it.next(); if (stmt.getPredicate().getNameSpace().equals(prefix)) ! resources.add(stmt); } ! return (Statement[]) resources.toArray(new Statement[0]); } --- 156,167 ---- } ! public StatementEditorBean[] getDeclaredProperties(ResourceEditorBean resource) { List resources = new ArrayList(); for (Iterator it = resource.resource.listProperties(); it.hasNext();) { Statement stmt = (Statement) it.next(); if (stmt.getPredicate().getNameSpace().equals(prefix)) ! resources.add(new StatementEditorBean(stmt, this)); } ! return (StatementEditorBean[]) resources.toArray(new StatementEditorBean[0]); } *************** *** 212,231 **** } ! public Individual[] getValidObjects(OntClass oc) { List resources = new ArrayList(); for (Iterator it = oc.listInstances(); it.hasNext();) ! resources.add(it.next()); ! return (Individual[]) resources.toArray(new Individual[0]); } ! public Statement addObjectValue(ResourceEditorBean resource, Property property, Resource value) { ! resource.resource.addProperty(property, value); ! return resource.resource.getProperty(property); // TODO: This is a BUG! } ! public Statement addDataValue(ResourceEditorBean resource, Property property, Literal value) { resource.resource.addProperty(property, value); ! return resource.resource.getProperty(property); // TODO: This is a BUG! } --- 211,230 ---- } ! public ResourceEditorBean[] getValidObjects(OntClass oc) { List resources = new ArrayList(); for (Iterator it = oc.listInstances(); it.hasNext();) ! resources.add(new ResourceEditorBean((Resource) it.next(), this)); ! return (ResourceEditorBean[]) resources.toArray(new ResourceEditorBean[0]); } ! public StatementEditorBean addObjectValue(ResourceEditorBean resource, Property property, ResourceEditorBean value) { ! resource.resource.addProperty(property, value.resource); ! return new StatementEditorBean(resource.resource.getProperty(property), this); // TODO: This is a BUG! } ! public StatementEditorBean addDataValue(ResourceEditorBean resource, Property property, Literal value) { resource.resource.addProperty(property, value); ! return new StatementEditorBean(resource.resource.getProperty(property),this); // TODO: This is a BUG! } *************** *** 274,279 **** } ! public void removeStatement(Statement statement) { ! data.remove(statement); } --- 273,278 ---- } ! public void removeStatement(StatementEditorBean statement) { ! data.remove(statement.statement); } --- NEW FILE: StatementEditorBean.java --- /* * StatementEditorBean.java Copyright (C) 2004 Gerardo Horvilleur Martinez, Elmer * Garduno Hernandez * * This library is free software; you can redistribute it and/or modify it under * the terms of the GNU Lesser General Public License as published by the Free * Software Foundation; either version 2.1 of the License, or (at your option) * any later version. * * This library is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more * details. * * You should have received a copy of the GNU Lesser General Public License * along with this library; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ package org.javaowl.editor; import com.hp.hpl.jena.graph.Triple; import com.hp.hpl.jena.rdf.model.Property; import com.hp.hpl.jena.rdf.model.Resource; import com.hp.hpl.jena.rdf.model.Statement; public final class StatementEditorBean { final Statement statement; private final ModelEditor editor; StatementEditorBean(Statement statement, ModelEditor editor) { this.statement = statement; this.editor = editor; } public Property getPredicate() { return statement.getPredicate(); } public Object getObject() { Object value = statement.getObject(); if(value instanceof Resource) { return new ResourceEditorBean((Resource)value, editor); } return value; } public Triple asTriple() { return statement.asTriple(); } } Index: ModelEditor.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/ModelEditor.java,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** ModelEditor.java 21 Aug 2004 00:22:49 -0000 1.28 --- ModelEditor.java 23 Aug 2004 20:02:11 -0000 1.29 *************** *** 21,25 **** - import com.hp.hpl.jena.ontology.Individual; import com.hp.hpl.jena.ontology.OntClass; import com.hp.hpl.jena.ontology.OntProperty; --- 21,24 ---- *************** *** 28,38 **** import com.hp.hpl.jena.rdf.model.Property; import com.hp.hpl.jena.rdf.model.Resource; - import com.hp.hpl.jena.rdf.model.Statement; public interface ModelEditor { ! public Statement addDataValue(ResourceEditorBean resource, Property currentProperty, Literal typedLiteral); ! public Statement addObjectValue(ResourceEditorBean resource, Property currentProperty, Resource value); public void addPropertyValue(ResourceEditorBean bean, Property label, String value); --- 27,36 ---- import com.hp.hpl.jena.rdf.model.Property; import com.hp.hpl.jena.rdf.model.Resource; public interface ModelEditor { ! public StatementEditorBean addDataValue(ResourceEditorBean resource, Property currentProperty, Literal typedLiteral); ! public StatementEditorBean addObjectValue(ResourceEditorBean resource, Property currentProperty, ResourceEditorBean value); public void addPropertyValue(ResourceEditorBean bean, Property label, String value); *************** *** 48,52 **** public OntProperty[] getApplicableProperties(ResourceEditorBean resource); ! public Statement[] getDeclaredProperties(ResourceEditorBean resource); public ResourceEditorBean[] getInstances(OntClass clazz, boolean all); --- 46,50 ---- public OntProperty[] getApplicableProperties(ResourceEditorBean resource); ! public StatementEditorBean[] getDeclaredProperties(ResourceEditorBean resource); public ResourceEditorBean[] getInstances(OntClass clazz, boolean all); *************** *** 68,75 **** public OntClass getValidLeafClass(Property currentProperty); ! public Individual[] getValidObjects(OntClass clazz); public void removeResource(ResourceEditorBean resource); ! public void removeStatement(Statement statement); } --- 66,73 ---- public OntClass getValidLeafClass(Property currentProperty); ! public ResourceEditorBean[] getValidObjects(OntClass clazz); public void removeResource(ResourceEditorBean resource); ! public void removeStatement(StatementEditorBean statement); } Index: ResourceEditorBean.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/ResourceEditorBean.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ResourceEditorBean.java 21 Aug 2004 00:22:49 -0000 1.10 --- ResourceEditorBean.java 23 Aug 2004 20:02:11 -0000 1.11 *************** *** 49,53 **** public String getComment(boolean uri) { ! String s = editor.getPropertyValue(this, RDFS.label, uri); return s == null ? "" : s; } --- 49,53 ---- public String getComment(boolean uri) { ! String s = editor.getPropertyValue(this, RDFS.comment, uri); return s == null ? "" : s; } *************** *** 63,66 **** --- 63,71 ---- return test == null || test.length() == 0; } + + public String toString() { + return getLabel(true); + } + /*InstanceClassification ic = getInstanceClassification(resource); for (Iterator it = ic.possibleIterator(); it.hasNext(); ) { |
|
From: Elmer G. <ega...@us...> - 2004-08-23 20:02:22
|
Update of /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/remote In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17115/src/org/javaowl/editor/remote Modified Files: RemoteModelEditorWrapper.java Log Message: Finished refactoring Index: RemoteModelEditorWrapper.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/remote/RemoteModelEditorWrapper.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** RemoteModelEditorWrapper.java 21 Aug 2004 00:22:50 -0000 1.6 --- RemoteModelEditorWrapper.java 23 Aug 2004 20:02:11 -0000 1.7 *************** *** 23,28 **** import org.javaowl.editor.ModelEditorBean; import org.javaowl.editor.ResourceEditorBean; - import com.hp.hpl.jena.ontology.Individual; import com.hp.hpl.jena.ontology.OntClass; import com.hp.hpl.jena.ontology.OntModel; --- 23,28 ---- import org.javaowl.editor.ModelEditorBean; import org.javaowl.editor.ResourceEditorBean; + import org.javaowl.editor.StatementEditorBean; import com.hp.hpl.jena.ontology.OntClass; import com.hp.hpl.jena.ontology.OntModel; *************** *** 32,36 **** import com.hp.hpl.jena.rdf.model.Property; import com.hp.hpl.jena.rdf.model.Resource; - import com.hp.hpl.jena.rdf.model.Statement; public class RemoteModelEditorWrapper implements ModelEditor { --- 32,35 ---- *************** *** 45,54 **** } ! public Statement addDataValue(ResourceEditorBean resource, Property currentProperty, Literal typedLiteral) { // TODO Auto-generated method stub return null; } ! public Statement addObjectValue(ResourceEditorBean resource, Property currentProperty, Resource value) { // TODO Auto-generated method stub return null; --- 44,53 ---- } ! public StatementEditorBean addDataValue(ResourceEditorBean resource, Property currentProperty, Literal typedLiteral) { // TODO Auto-generated method stub return null; } ! public StatementEditorBean addObjectValue(ResourceEditorBean resource, Property currentProperty, ResourceEditorBean value) { // TODO Auto-generated method stub return null; *************** *** 80,84 **** } ! public Statement[] getDeclaredProperties(ResourceEditorBean resource) { // TODO Auto-generated method stub return null; --- 79,83 ---- } ! public StatementEditorBean[] getDeclaredProperties(ResourceEditorBean resource) { // TODO Auto-generated method stub return null; *************** *** 124,133 **** } ! public Individual[] getValidObjects(OntClass clazz) { String[] uris = remote.getValidObjects(clazz.getURI()); ! Individual[] individuals = new Individual[uris.length/2]; ! for (int i = 0; i < uris.length; i+=2) ! individuals[i] = ontModel.createIndividual(uris[i], ! ontModel.createResource(uris[i+1])); return individuals; } --- 123,131 ---- } ! public ResourceEditorBean[] getValidObjects(OntClass clazz) { String[] uris = remote.getValidObjects(clazz.getURI()); ! ResourceEditorBean[] individuals = new ResourceEditorBean[uris.length]; ! for (int i = 0; i < uris.length; i++) ! individuals[i] = ModelEditorBean.getResourceEditor(ontModel.createResource(uris[i]), this); return individuals; } *************** *** 138,142 **** } ! public void removeStatement(Statement statement) { remote.removeStatement(new SerializableTriple(statement.asTriple())); } --- 136,140 ---- } ! public void removeStatement(StatementEditorBean statement) { remote.removeStatement(new SerializableTriple(statement.asTriple())); } |
|
From: Elmer G. <ega...@us...> - 2004-08-23 20:02:22
|
Update of /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17115/src/org/javaowl/editor/swing Modified Files: LabelListCellRenderer.java TableModel.java PropertyEditorPagelet.java EditPage.java Log Message: Finished refactoring Index: TableModel.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing/TableModel.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** TableModel.java 17 Jul 2004 05:39:11 -0000 1.9 --- TableModel.java 23 Aug 2004 20:02:11 -0000 1.10 *************** *** 24,28 **** import javax.swing.table.AbstractTableModel; ! import com.hp.hpl.jena.rdf.model.Property; import com.hp.hpl.jena.rdf.model.Statement; --- 24,29 ---- import javax.swing.table.AbstractTableModel; ! import org.javaowl.editor.StatementEditorBean; ! import com.hp.hpl.jena.rdf.model.Statement; *************** *** 31,36 **** private String[] names = new String[] { "Property", "Value" }; - private List[] data = new List[] { new ArrayList(), new ArrayList() }; - private List statements = new ArrayList(); --- 32,35 ---- *************** *** 44,64 **** public int getRowCount() { ! return data[0].size(); } public Object getValueAt(int row, int col) { ! return data[col].get(row); } ! private void add(Property property, Object value) { ! data[0].add(property); ! data[1].add(value); ! int rc = getRowCount(); ! fireTableRowsInserted(rc, rc); ! } ! public void add(Statement statement) { ! add(statement.getPredicate(), statement.getObject()); statements.add(statement); } --- 43,65 ---- public int getRowCount() { ! return statements.size(); } public Object getValueAt(int row, int col) { ! StatementEditorBean statement = (StatementEditorBean) statements.get(row); ! if(col == 0) { ! return statement.getPredicate(); ! } else if (col == 1) { ! return statement.getObject(); ! } ! throw new IndexOutOfBoundsException("column =" + col); } ! ! public void add(StatementEditorBean statement) { statements.add(statement); + int rc = getRowCount(); + fireTableRowsInserted(rc, rc); } *************** *** 67,84 **** if (old == 0) return; - data[0].clear(); - data[1].clear(); statements.clear(); fireTableRowsDeleted(0, old - 1); } ! public Statement getRow(int row) { ! return (Statement) statements.get(row); } ! public Statement removeRow(int row) { ! Statement stmt = (Statement) statements.remove(row); ! data[0].remove(row); ! data[1].remove(row); fireTableRowsDeleted(row, row); return stmt; --- 68,81 ---- if (old == 0) return; statements.clear(); fireTableRowsDeleted(0, old - 1); } ! public StatementEditorBean getRow(int row) { ! return (StatementEditorBean) statements.get(row); } ! public StatementEditorBean removeRow(int row) { ! StatementEditorBean stmt = (StatementEditorBean) statements.remove(row); fireTableRowsDeleted(row, row); return stmt; Index: EditPage.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing/EditPage.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** EditPage.java 21 Aug 2004 00:22:48 -0000 1.9 --- EditPage.java 23 Aug 2004 20:02:11 -0000 1.10 *************** *** 47,52 **** import org.javaowl.editor.ModelEditor; import org.javaowl.editor.ResourceEditorBean; - import com.hp.hpl.jena.ontology.Individual; import com.hp.hpl.jena.ontology.OntClass; import com.hp.hpl.jena.ontology.OntProperty; --- 47,52 ---- import org.javaowl.editor.ModelEditor; import org.javaowl.editor.ResourceEditorBean; + import org.javaowl.editor.StatementEditorBean; import com.hp.hpl.jena.ontology.OntClass; import com.hp.hpl.jena.ontology.OntProperty; *************** *** 54,59 **** import com.hp.hpl.jena.rdf.model.Literal; import com.hp.hpl.jena.rdf.model.Property; - import com.hp.hpl.jena.rdf.model.Resource; - import com.hp.hpl.jena.rdf.model.Statement; public class EditPage implements Page { --- 54,57 ---- *************** *** 71,75 **** private JSplitPane center; ! private Statement currentStatement; private Property currentProperty; --- 69,73 ---- private JSplitPane center; ! private StatementEditorBean currentStatement; private Property currentProperty; *************** *** 120,124 **** public void mouseClicked(MouseEvent e) { int index = table.getSelectedRow(); ! Statement stmt = values.getRow(index); editProperty(stmt); } --- 118,122 ---- public void mouseClicked(MouseEvent e) { int index = table.getSelectedRow(); ! StatementEditorBean stmt = values.getRow(index); editProperty(stmt); } *************** *** 129,133 **** if (KeyEvent.VK_DELETE == e.getKeyCode()) { int index = table.getSelectedRow(); ! Statement stmt = values.removeRow(index); removeStatement(stmt); } --- 127,131 ---- if (KeyEvent.VK_DELETE == e.getKeyCode()) { int index = table.getSelectedRow(); ! StatementEditorBean stmt = values.removeRow(index); removeStatement(stmt); } *************** *** 185,189 **** } ! private void removeStatement(Statement statement) { editor.removeStatement(statement); currentStatement = null; --- 183,187 ---- } ! private void removeStatement(StatementEditorBean statement) { editor.removeStatement(statement); currentStatement = null; *************** *** 203,207 **** OntClass ontClass = editor.getValidLeafClass(currentProperty); if (ontClass != null) { ! Individual[] values = editor.getValidObjects(ontClass); propertyEditor.setValues(values, null, ontClass); } else { --- 201,205 ---- OntClass ontClass = editor.getValidLeafClass(currentProperty); if (ontClass != null) { ! ResourceEditorBean[] values = editor.getValidObjects(ontClass); propertyEditor.setValues(values, null, ontClass); } else { *************** *** 211,215 **** } ! private void editProperty(Statement stmt) { currentStatement = stmt; Object value = stmt.getObject(); --- 209,213 ---- } ! private void editProperty(StatementEditorBean stmt) { currentStatement = stmt; Object value = stmt.getObject(); *************** *** 220,231 **** } propertyEditor.setRangeType(editor.getOntProperty(currentProperty).getRange()); ! if (value instanceof Resource) { OntClass ontClass = editor.getValidLeafClass(currentProperty); if (ontClass != null) { ! Individual[] values = editor.getValidObjects(ontClass); ! propertyEditor.setValues(values, (Resource) value, ontClass); } else { ! propertyEditor.setValues(null, (Resource) value, ontClass); } } else { propertyEditor.setValue(value.toString()); --- 218,231 ---- } propertyEditor.setRangeType(editor.getOntProperty(currentProperty).getRange()); ! if (value instanceof ResourceEditorBean) { OntClass ontClass = editor.getValidLeafClass(currentProperty); if (ontClass != null) { ! ResourceEditorBean[] values = editor.getValidObjects(ontClass); ! propertyEditor.setValues(values, (ResourceEditorBean) value, ontClass); } else { ! propertyEditor.setValues(null, (ResourceEditorBean) value, ontClass); } + } else if (value instanceof Literal){ + propertyEditor.setValue(((Literal)value).getString()); } else { propertyEditor.setValue(value.toString()); *************** *** 255,259 **** Util.setList(properties, editor.getApplicableProperties(resource)); values.clear(); ! Statement[] stmts = editor.getDeclaredProperties(resource); for (int i = 0; i < stmts.length; i++) values.add(stmts[i]); --- 255,259 ---- Util.setList(properties, editor.getApplicableProperties(resource)); values.clear(); ! StatementEditorBean[] stmts = editor.getDeclaredProperties(resource); for (int i = 0; i < stmts.length; i++) values.add(stmts[i]); *************** *** 286,290 **** } ! public void setProperty(Resource value) { if (currentStatement != null) { editor.removeStatement(currentStatement); --- 286,290 ---- } ! public void setProperty(ResourceEditorBean value) { if (currentStatement != null) { editor.removeStatement(currentStatement); Index: PropertyEditorPagelet.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing/PropertyEditorPagelet.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** PropertyEditorPagelet.java 21 Aug 2004 00:22:48 -0000 1.5 --- PropertyEditorPagelet.java 23 Aug 2004 20:02:11 -0000 1.6 *************** *** 19,29 **** package org.javaowl.editor.swing; import com.hp.hpl.jena.ontology.OntClass; import com.hp.hpl.jena.ontology.OntResource; - import com.hp.hpl.jena.rdf.model.Resource; public interface PropertyEditorPagelet extends Pagelet { ! public void setValues(Resource[] o, Resource value, OntClass clazz); public void setValue(String o); --- 19,30 ---- package org.javaowl.editor.swing; + import org.javaowl.editor.ResourceEditorBean; + import com.hp.hpl.jena.ontology.OntClass; import com.hp.hpl.jena.ontology.OntResource; public interface PropertyEditorPagelet extends Pagelet { ! public void setValues(ResourceEditorBean[] o, ResourceEditorBean value, OntClass clazz); public void setValue(String o); Index: LabelListCellRenderer.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing/LabelListCellRenderer.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** LabelListCellRenderer.java 22 Aug 2004 17:41:00 -0000 1.5 --- LabelListCellRenderer.java 23 Aug 2004 20:02:11 -0000 1.6 *************** *** 26,30 **** import org.javaowl.editor.ResourceEditorBean; - import com.hp.hpl.jena.ontology.Individual; import com.hp.hpl.jena.rdf.model.Property; --- 26,29 ---- *************** *** 35,39 **** super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); if (value != null) { - System.out.println(value.getClass()); if (value instanceof Property) { Property p = (Property) value; --- 34,37 ---- *************** *** 43,49 **** setText(((ResourceEditorBean) value).getLabel(true)); setToolTipText(((ResourceEditorBean) value).getComment(false)); - } else if (value instanceof Individual) { - setText(((Individual) value).getLabel(null)); - setToolTipText(((Individual) value).getComment(null)); } else setText(value.toString()); --- 41,44 ---- |
|
From: Elmer G. <ega...@us...> - 2004-08-23 20:02:20
|
Update of /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing/pe In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17115/src/org/javaowl/editor/swing/pe Modified Files: DefaultPropertyEditorPagelet.java StringPropertyEditorPagelet.java Log Message: Finished refactoring Index: StringPropertyEditorPagelet.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing/pe/StringPropertyEditorPagelet.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** StringPropertyEditorPagelet.java 21 Aug 2004 00:22:50 -0000 1.1 --- StringPropertyEditorPagelet.java 23 Aug 2004 20:02:10 -0000 1.2 *************** *** 28,31 **** --- 28,32 ---- import javax.swing.JTextField; + import org.javaowl.editor.ResourceEditorBean; import org.javaowl.editor.swing.EditPage; import org.javaowl.editor.swing.PropertyEditorPagelet; *************** *** 33,37 **** import com.hp.hpl.jena.ontology.OntClass; import com.hp.hpl.jena.ontology.OntResource; - import com.hp.hpl.jena.rdf.model.Resource; public class StringPropertyEditorPagelet implements PropertyEditorPagelet { --- 34,37 ---- *************** *** 72,76 **** } ! public void setValues(Resource[] o, Resource value, OntClass clazz) { } --- 72,76 ---- } ! public void setValues(ResourceEditorBean[] o, ResourceEditorBean value, OntClass clazz) { } Index: DefaultPropertyEditorPagelet.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing/pe/DefaultPropertyEditorPagelet.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DefaultPropertyEditorPagelet.java 21 Aug 2004 00:22:50 -0000 1.1 --- DefaultPropertyEditorPagelet.java 23 Aug 2004 20:02:10 -0000 1.2 *************** *** 30,33 **** --- 30,34 ---- import javax.swing.ListCellRenderer; + import org.javaowl.editor.ResourceEditorBean; import org.javaowl.editor.swing.EditPage; import org.javaowl.editor.swing.LabelListCellRenderer; *************** *** 36,40 **** import com.hp.hpl.jena.ontology.OntClass; import com.hp.hpl.jena.ontology.OntResource; - import com.hp.hpl.jena.rdf.model.Resource; public class DefaultPropertyEditorPagelet implements PropertyEditorPagelet { --- 37,40 ---- *************** *** 92,96 **** } ! public void setValues(Resource[] o, Resource value, OntClass clazz) { this.clazz = clazz; textField.setText(null); --- 92,96 ---- } ! public void setValues(ResourceEditorBean[] o, ResourceEditorBean value, OntClass clazz) { this.clazz = clazz; textField.setText(null); *************** *** 119,123 **** editPage.setProperty(textField.getText(), rangeType); } else if (textField.getText().equals("") && comboBox.getItemCount() != 0) { ! editPage.setProperty((Resource) comboBox.getSelectedItem()); } else { editPage.cancel(); --- 119,123 ---- editPage.setProperty(textField.getText(), rangeType); } else if (textField.getText().equals("") && comboBox.getItemCount() != 0) { ! editPage.setProperty((ResourceEditorBean) comboBox.getSelectedItem()); } else { editPage.cancel(); |
|
From: Elmer G. <ega...@us...> - 2004-08-22 17:41:20
|
Update of /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1973/src/org/javaowl/editor/swing Modified Files: LabelListCellRenderer.java OntTreePagelet.java Editor.java Log Message: More refactoring Index: OntTreePagelet.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing/OntTreePagelet.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** OntTreePagelet.java 21 Aug 2004 00:22:48 -0000 1.7 --- OntTreePagelet.java 22 Aug 2004 17:41:00 -0000 1.8 *************** *** 34,42 **** import org.javaowl.editor.ModelEditor; - import org.javaowl.editor.ResourceEditorBean; import com.hp.hpl.jena.ontology.OntClass; import com.hp.hpl.jena.rdf.model.Property; import com.hp.hpl.jena.vocabulary.OWL; public class OntTreePagelet implements Pagelet { --- 34,42 ---- import org.javaowl.editor.ModelEditor; import com.hp.hpl.jena.ontology.OntClass; import com.hp.hpl.jena.rdf.model.Property; import com.hp.hpl.jena.vocabulary.OWL; + import com.hp.hpl.jena.vocabulary.RDFS; public class OntTreePagelet implements Pagelet { *************** *** 96,101 **** setText(p.getLocalName()); setToolTipText(value.toString()); ! } else if (value instanceof ResourceEditorBean) { ! setText(((ResourceEditorBean) value).getLabel(true)); setToolTipText(value.toString()); } else --- 96,101 ---- setText(p.getLocalName()); setToolTipText(value.toString()); ! } else if (value instanceof OntClass) { ! setText(editor.getPropertyValue((OntClass) value, RDFS.label,true)); setToolTipText(value.toString()); } else Index: Editor.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing/Editor.java,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** Editor.java 21 Aug 2004 00:22:48 -0000 1.29 --- Editor.java 22 Aug 2004 17:41:00 -0000 1.30 *************** *** 189,193 **** current = editor.createResourceEditor(resource); } else { ! current = editor.createResourceEditor(resource); } current.setLabel(label); --- 189,193 ---- current = editor.createResourceEditor(resource); } else { ! current = editor.createResourceEditor(uri, resource); } current.setLabel(label); Index: LabelListCellRenderer.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing/LabelListCellRenderer.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** LabelListCellRenderer.java 21 Aug 2004 00:22:48 -0000 1.4 --- LabelListCellRenderer.java 22 Aug 2004 17:41:00 -0000 1.5 *************** *** 26,29 **** --- 26,30 ---- import org.javaowl.editor.ResourceEditorBean; + import com.hp.hpl.jena.ontology.Individual; import com.hp.hpl.jena.rdf.model.Property; *************** *** 34,37 **** --- 35,39 ---- super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); if (value != null) { + System.out.println(value.getClass()); if (value instanceof Property) { Property p = (Property) value; *************** *** 41,44 **** --- 43,49 ---- setText(((ResourceEditorBean) value).getLabel(true)); setToolTipText(((ResourceEditorBean) value).getComment(false)); + } else if (value instanceof Individual) { + setText(((Individual) value).getLabel(null)); + setToolTipText(((Individual) value).getComment(null)); } else setText(value.toString()); |
