[Javaowl-commit] JavaOWL/src/org/javaowl/editor ModelEditor.java,1.29,1.30 ModelEditorBean.java,1.17,1.18 StatementEditorBean.java,1.1,1.2

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

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

Modified Files:
	ModelEditor.java ModelEditorBean.java StatementEditorBean.java 
Log Message:
Changes in remote API.


Index: ModelEditorBean.java
===================================================================
RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/ModelEditorBean.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ModelEditorBean.java	23 Aug 2004 22:23:54 -0000	1.17
--- ModelEditorBean.java	25 Aug 2004 19:12:00 -0000	1.18
***************
*** 306,309 ****
--- 306,313 ----
      }
  
+     public ResourceEditorBean getResourceEditor(String uri) {
+         return new ResourceEditorBean(ontModel.getResource(uri), this);
+     }
+ 
      public ResourceEditorBean createResourceEditor(String uri, OntClass clazz) {
          Resource r = data.createResource(uri);

Index: StatementEditorBean.java
===================================================================
RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/StatementEditorBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StatementEditorBean.java	23 Aug 2004 20:02:11 -0000	1.1
--- StatementEditorBean.java	25 Aug 2004 19:12:00 -0000	1.2
***************
*** 27,32 ****
  public final class StatementEditorBean {
  
! 	final Statement statement;
! 	private final ModelEditor editor;
  	
      StatementEditorBean(Statement statement, ModelEditor editor) {     
--- 27,32 ----
  public final class StatementEditorBean {
  
!     final Statement statement;
!     private final ModelEditor editor;
  	
      StatementEditorBean(Statement statement, ModelEditor editor) {     
***************
*** 35,53 ****
      }
  
! 	public Property getPredicate() {
! 		return statement.getPredicate();
! 	}
  
! 	public Object getObject() {
! 		Object value = statement.getObject();
! 		if(value instanceof Resource) {
! 			return new ResourceEditorBean((Resource)value, editor);
! 		}
! 		return value;
! 	}
  
! 	public Triple asTriple() {
! 		return statement.asTriple();
! 	}
      
  }
--- 35,53 ----
      }
  
!     public Property getPredicate() {
!         return statement.getPredicate();
!     }
  
!     public Object getObject() {
!         Object value = statement.getObject();
!         if(value instanceof Resource) {
!             return new ResourceEditorBean((Resource)value, editor);
!         }
!         return value;
!     }
  
!     public Triple asTriple() {
!         return statement.asTriple();
!     }
      
  }

Index: ModelEditor.java
===================================================================
RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/ModelEditor.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** ModelEditor.java	23 Aug 2004 20:02:11 -0000	1.29
--- ModelEditor.java	25 Aug 2004 19:12:00 -0000	1.30
***************
*** 30,73 ****
  public interface ModelEditor {
  
!     public StatementEditorBean addDataValue(ResourceEditorBean resource, Property currentProperty, Literal typedLiteral);
  
!     public StatementEditorBean addObjectValue(ResourceEditorBean resource, Property currentProperty, ResourceEditorBean value);
  
! 	public void addPropertyValue(ResourceEditorBean bean, Property label, String value);
  	
! 	public ResourceEditorBean createResourceEditor(OntClass clazz);
  
! 	public ResourceEditorBean createResourceEditor(String uri, OntClass clazz);
  	
! 	public OntClass[] getAllClasses();
  
! 	public OntProperty[] getAllDatatypeProperties();
  
! 	public OntProperty[] getApplicableProperties(ResourceEditorBean resource);
  
! 	public StatementEditorBean[] getDeclaredProperties(ResourceEditorBean resource);
  
! 	public ResourceEditorBean[] getInstances(OntClass clazz, boolean all);
  
! 	public OntClass getOntClass(Resource resource);
  
! 	public OntProperty getOntProperty(Property property);
  
! 	public OntProperty[] getProperties(OntClass clazz, boolean all);
  	
! 	public String getPropertyValue(OntClass clazz, Property label, boolean b);
      
! 	public String getPropertyValue(ResourceEditorBean bean, Property p, boolean uri);
! 
! 	public OntClass[] getSubClasses(OntClass clazz);
  
! 	public Literal getTypedLiteral(Object value, OntResource type);
  
      public OntClass getValidLeafClass(Property currentProperty);
! 
      public ResourceEditorBean[] getValidObjects(OntClass clazz);
  
! 	public void removeResource(ResourceEditorBean resource);
  
! 	public void removeStatement(StatementEditorBean statement);
  }
--- 30,78 ----
  public interface ModelEditor {
  
!     public StatementEditorBean addDataValue(ResourceEditorBean resource, 
!                                             Property property, Literal typedLiteral);
  
!     public StatementEditorBean addObjectValue(ResourceEditorBean resource, 
!                                               Property property, 
!                                               ResourceEditorBean value);
  
!     public void addPropertyValue(ResourceEditorBean bean, Property label, String value);
  	
!     public ResourceEditorBean createResourceEditor(OntClass clazz);
  
!     public ResourceEditorBean createResourceEditor(String uri, OntClass clazz);
! 
!     public ResourceEditorBean getResourceEditor(String uri);
  	
!     public OntClass[] getAllClasses();
  
!     public OntProperty[] getAllDatatypeProperties();
  
!     public OntProperty[] getApplicableProperties(ResourceEditorBean resource);
  
!     public StatementEditorBean[] getDeclaredProperties(ResourceEditorBean resource);
  
!     public ResourceEditorBean[] getInstances(OntClass clazz, boolean all);
  
!     public OntClass getOntClass(Resource resource);
  
!     public OntProperty getOntProperty(Property property);
  
!     public OntProperty[] getProperties(OntClass clazz, boolean all);
  	
!     public String getPropertyValue(OntClass clazz, Property label, boolean b);
      
!     public String getPropertyValue(ResourceEditorBean bean, Property p, boolean uri);
  
!     public OntClass[] getSubClasses(OntClass clazz);
  
+     public Literal getTypedLiteral(Object value, OntResource type);
+     
      public OntClass getValidLeafClass(Property currentProperty);
!     
      public ResourceEditorBean[] getValidObjects(OntClass clazz);
  
!     public void removeResource(ResourceEditorBean resource);
  
!     public void removeStatement(StatementEditorBean statement);
  }