[Javaowl-commit] JavaOWL/src/org/javaowl/editor/remote RemoteModelEditor.java,1.5,1.6 RemoteModelEditorWrapper.java,1.7,1.8

[Elmer G. <ega...@us...>]

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);
  
  }