[Javaowl-commit] JavaOWL/src/org/javaowl/editor ModelEditorBean.java,1.13,1.14 ModelEditor.java,1.26,1.27

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

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

Modified Files:
	ModelEditorBean.java ModelEditor.java 
Log Message:
Remote model

Index: ModelEditorBean.java
===================================================================
RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/ModelEditorBean.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ModelEditorBean.java	19 Aug 2004 21:27:54 -0000	1.13
--- ModelEditorBean.java	20 Aug 2004 18:16:43 -0000	1.14
***************
*** 119,123 ****
      //TODO: get all valid Instances for the range intersection and the
      // resource restrictions
!     public OntResource getValidLeafClass(Property property) {
          OntProperty op;
          if (property instanceof OntProperty)
--- 119,123 ----
      //TODO: get all valid Instances for the range intersection and the
      // resource restrictions
!     public OntClass getValidLeafClass(Property property) {
          OntProperty op;
          if (property instanceof OntProperty)
***************
*** 132,139 ****
              Iterator it2 = oc.listSubClasses();
              if (!it2.hasNext() && !or.getNameSpace().equals(XSD.xstring.getNameSpace()))
!                 list.add(or);
          }
          if (list.size() > 0)
!             return (OntResource) list.get(0);
          return null;
      }
--- 132,139 ----
              Iterator it2 = oc.listSubClasses();
              if (!it2.hasNext() && !or.getNameSpace().equals(XSD.xstring.getNameSpace()))
!                 list.add(oc);
          }
          if (list.size() > 0)
!             return (OntClass) list.get(0);
          return null;
      }
***************
*** 213,219 ****
      }
      
!     public Individual[] getValidObjects(OntResource resource) {
          List resources = new ArrayList();
-         OntClass oc = resource.asClass();
          for (Iterator it = oc.listInstances(); it.hasNext();)
              resources.add(it.next());
--- 213,218 ----
      }
      
!     public Individual[] getValidObjects(OntClass oc) {
          List resources = new ArrayList();
          for (Iterator it = oc.listInstances(); it.hasNext();)
              resources.add(it.next());
***************
*** 295,299 ****
      }
  
!     public Resource createResource(OntResource classResource) {
          Resource r = data.createResource();
          r.addProperty(RDF.type, classResource);
--- 294,298 ----
      }
  
!     public Resource createResource(Resource classResource) {
          Resource r = data.createResource();
          r.addProperty(RDF.type, classResource);
***************
*** 301,305 ****
      }
  
!     public Resource createResource(String uri, OntResource classResource) {
          Resource r = data.createResource(uri);
          r.addProperty(RDF.type, classResource);
--- 300,304 ----
      }
  
!     public Resource createResource(String uri, Resource classResource) {
          Resource r = data.createResource(uri);
          r.addProperty(RDF.type, classResource);

Index: ModelEditor.java
===================================================================
RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/ModelEditor.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** ModelEditor.java	19 Aug 2004 21:27:54 -0000	1.26
--- ModelEditor.java	20 Aug 2004 18:16:43 -0000	1.27
***************
*** 31,77 ****
  
  public interface ModelEditor {
- 	
- 	public OntClass[] getAllClasses();
  
! 	public OntProperty[] getProperties(Resource clazz, boolean all);
  
! 	public OntProperty[] getAllDatatypeProperties();
  
! 	public Resource[] getInstances(Resource clazz, boolean all);
  
! 	public OntClass getOntClass(Resource resource);
  
! 	public OntProperty getOntProperty(Property property);
  
! 	public Literal getTypedLiteral(Object value, OntResource type);
  
! 	public void removeStatement(Statement statement);
  
! 	public void removeResource(Resource resource);
  
! 	public OntClass[] getSubClasses(OntClass resourceClass);
! 	
! 	public Resource createResource(OntResource classResource);
  
! 	public Resource createResource(String uri, OntResource classResource);
  
! 	public OntProperty[] getApplicableProperties(Resource resource);
  
! 	public Statement[] getDeclaredProperties(Resource resource);
  
!     public OntResource getValidLeafClass(Property currentProperty);
  
!     public Individual[] getValidObjects(OntResource ontClass);
  
!     public Statement addDataValue(Resource resource, Property currentProperty, Literal typedLiteral);
  
!     public Statement addObjectValue(Resource resource, Property currentProperty, Resource value);
  
!     public String getLabel(Resource resource);
  
!     public void setLabel(Resource currentResource, String label);
  
!     public String getComment(Resource resource);
  
!     public void setComment(Resource currentResource, String comment);
  }
--- 31,77 ----
  
  public interface ModelEditor {
  
!     public Statement addDataValue(Resource resource, Property currentProperty, Literal typedLiteral);
  
!     public Statement addObjectValue(Resource resource, Property currentProperty, Resource value);
! 	
! 	public Resource createResource(Resource classResource);
  
! 	public Resource createResource(String uri, Resource classResource);
! 	
! 	public OntClass[] getAllClasses();
  
! 	public OntProperty[] getAllDatatypeProperties();
  
! 	public OntProperty[] getApplicableProperties(Resource resource);
  
!     public String getComment(Resource resource);
  
! 	public Statement[] getDeclaredProperties(Resource resource);
  
! 	public Resource[] getInstances(Resource clazz, boolean all);
  
!     public String getLabel(Resource resource);
  
! 	public OntClass getOntClass(Resource resource);
  
! 	public OntProperty getOntProperty(Property property);
  
! 	public OntProperty[] getProperties(Resource clazz, boolean all);
  
! 	public OntClass[] getSubClasses(OntClass resourceClass);
  
! 	public Literal getTypedLiteral(Object value, OntResource type);
  
!     public OntClass getValidLeafClass(Property currentProperty);
  
!     public Individual[] getValidObjects(OntClass ontClass);
  
! 	public void removeResource(Resource resource);
  
! 	public void removeStatement(Statement statement);
  
!     public void setComment(Resource resource, String comment);
  
!     public void setLabel(Resource resource, String label);
  }