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

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

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

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