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