javaowl-commit

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

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