[Javaowl-commit] JavaOWL/src/org/javaowl/editor/remote RemoteModelEditor.java,1.4,1.5 SerializableTriple.java,1.1,1.2 RemoteModelEditorWrapper.java,1.5,1.6

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

Update of /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/remote
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6871/src/org/javaowl/editor/remote

Modified Files:
	RemoteModelEditor.java SerializableTriple.java 
	RemoteModelEditorWrapper.java 
Log Message:
Moe work on refactoring

Index: RemoteModelEditorWrapper.java
===================================================================
RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/remote/RemoteModelEditorWrapper.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** RemoteModelEditorWrapper.java	20 Aug 2004 18:16:44 -0000	1.5
--- RemoteModelEditorWrapper.java	21 Aug 2004 00:22:50 -0000	1.6
***************
*** 21,24 ****
--- 21,26 ----
  
  import org.javaowl.editor.ModelEditor;
+ import org.javaowl.editor.ModelEditorBean;
+ import org.javaowl.editor.ResourceEditorBean;
  
  import com.hp.hpl.jena.ontology.Individual;
***************
*** 31,35 ****
  import com.hp.hpl.jena.rdf.model.Resource;
  import com.hp.hpl.jena.rdf.model.Statement;
- import com.hp.hpl.jena.vocabulary.RDF;
  
  public class RemoteModelEditorWrapper implements ModelEditor {
--- 33,36 ----
***************
*** 44,65 ****
      }
  
!     public Statement addDataValue(Resource resource, Property currentProperty, Literal typedLiteral) {
          // TODO Auto-generated method stub
          return null;
      }
  
!     public Statement addObjectValue(Resource resource, Property currentProperty, Resource value) {
          // TODO Auto-generated method stub
          return null;
      }
  
! 	public Resource createResource(Resource classResource) {
! 		Resource resource = ontModel.createResource(remote.createResource(classResource.getURI()));
! 		return resource.addProperty(RDF.type, classResource);
  	}
  
! 	public Resource createResource(String uri, Resource classResource) {
! 		Resource resource = ontModel.createResource(remote.createResource(uri, classResource.getURI()));
! 		return resource.addProperty(RDF.type, classResource);
  	}
      
--- 45,66 ----
      }
  
!     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;
      }
  
! 	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);
  	}
      
***************
*** 74,99 ****
  	}
  
! 	public OntProperty[] getApplicableProperties(Resource resource) {
  		String[] uris = remote.getApplicableProperties(resource.getURI());
  		return createOntPropertiesFromURIs(uris);
  	}
! 
!     public String getComment(Resource resource) {
!         return remote.getComment(resource.getURI());
!     }
! 	public Statement[] getDeclaredProperties(Resource resource) {
  		// TODO Auto-generated method stub
  		return null;
  	}
  	
! 	public Resource[] getInstances(Resource clazz, boolean all) {
  		String[] uris = remote.getInstances(clazz.getURI(), all);
! 		Resource[] resources = new Resource[uris.length];
  		for (int i = 0; i < uris.length; i++)
! 			resources[i] = ontModel.createOntProperty(uris[i]);
  		return resources;
  	}
  
!     public String getLabel(Resource resource) {
          return remote.getLabel(resource.getURI());
      }
--- 75,97 ----
  	}
  
! 	public OntProperty[] getApplicableProperties(ResourceEditorBean resource) {
  		String[] uris = remote.getApplicableProperties(resource.getURI());
  		return createOntPropertiesFromURIs(uris);
  	}
! 	
! 	public Statement[] getDeclaredProperties(ResourceEditorBean resource) {
  		// TODO Auto-generated method stub
  		return null;
  	}
  	
! 	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());
      }
***************
*** 107,117 ****
  	}
  
! 	public OntProperty[] getProperties(Resource clazz, boolean all) {
  		String[] uris = remote.getProperties(clazz.getURI(), all);
  		return createOntPropertiesFromURIs(uris);
  	}
  
! 	public OntClass[] getSubClasses(OntClass resourceClass) {
! 		String[] uris = remote.getSubClasses(resourceClass.getURI());
  		return createOntClassesFromUri(uris);
  	}
--- 105,115 ----
  	}
  
! 	public OntProperty[] getProperties(OntClass clazz, boolean all) {
  		String[] uris = remote.getProperties(clazz.getURI(), all);
  		return createOntPropertiesFromURIs(uris);
  	}
  
! 	public OntClass[] getSubClasses(OntClass clazz) {
! 		String[] uris = remote.getSubClasses(clazz.getURI());
  		return createOntClassesFromUri(uris);
  	}
***************
*** 126,131 ****
      }
  
!     public Individual[] getValidObjects(OntClass ontClass) {
!         String[] uris = remote.getValidObjects(ontClass.getURI());
          Individual[] individuals = new Individual[uris.length/2];
  		for (int i = 0; i < uris.length; i+=2)
--- 124,129 ----
      }
  
!     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)
***************
*** 135,139 ****
      }
  
! 	public void removeResource(Resource resource) {
  		remote.removeResource(resource.getURI());
  
--- 133,137 ----
      }
  
! 	public void removeResource(ResourceEditorBean resource) {
  		remote.removeResource(resource.getURI());
  
***************
*** 144,155 ****
  	}
  
-     public void setComment(Resource resource, String comment) {
-         	remote.setComment(resource.getURI(), comment);
-     }
- 
-     public void setLabel(Resource resource, String label) {
-         remote.setLabel(resource.getURI(), label);	
-     }
-     
  	private OntClass[] createOntClassesFromUri(String[] uris) {
  		OntClass[] classes = new OntClass[uris.length];
--- 142,145 ----
***************
*** 165,168 ****
--- 155,176 ----
  		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;
+ 	}
     
  }

Index: RemoteModelEditor.java
===================================================================
RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/remote/RemoteModelEditor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** RemoteModelEditor.java	20 Aug 2004 18:16:44 -0000	1.4
--- RemoteModelEditor.java	21 Aug 2004 00:22:50 -0000	1.5
***************
*** 22,27 ****
  import java.rmi.Remote;
  
- import com.hp.hpl.jena.rdf.model.Property;
- 
  public interface RemoteModelEditor extends Remote{
  
--- 22,25 ----

Index: SerializableTriple.java
===================================================================
RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/remote/SerializableTriple.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SerializableTriple.java	19 Aug 2004 14:45:32 -0000	1.1
--- SerializableTriple.java	21 Aug 2004 00:22:50 -0000	1.2
***************
*** 23,30 ****
  import java.io.Serializable;
  
- import com.hp.hpl.jena.graph.Triple;
- 
  import org.javaowl.models.prevalence.TripleUtil;
  
  public class SerializableTriple implements Serializable {
  
--- 23,30 ----
  import java.io.Serializable;
  
  import org.javaowl.models.prevalence.TripleUtil;
  
+ import com.hp.hpl.jena.graph.Triple;
+ 
  public class SerializableTriple implements Serializable {