[Javaowl-commit] JavaOWL/src/org/javaowl/editor ModelEditor.java,1.31,1.32 ModelEditorBean.java,1.19,1.20

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

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

Modified Files:
	ModelEditor.java ModelEditorBean.java 
Log Message:
More remote api changes


Index: ModelEditorBean.java
===================================================================
RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/ModelEditorBean.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** ModelEditorBean.java	25 Aug 2004 19:19:21 -0000	1.19
--- ModelEditorBean.java	25 Aug 2004 23:59:48 -0000	1.20
***************
*** 67,71 ****
      }
  
!     public ModelEditorBean(InputStream ontologyIn, InputStream dataIn, String prefix) throws IOException {
          this.prefix = prefix;
          ontology = ModelFactory.createDefaultModel();
--- 67,72 ----
      }
  
!     public ModelEditorBean(InputStream ontologyIn, InputStream dataIn, String prefix) 
!         throws IOException {
          this.prefix = prefix;
          ontology = ModelFactory.createDefaultModel();
***************
*** 73,77 ****
          ontologyIn.close();
          ontModel = ModelFactory
!                                .createOntologyModel(OntModelSpec.OWL_DL_MEM_RULE_INF, ontology);
          data = ModelFactory.createDefaultModel();
          data.read(dataIn, null, "N3");
--- 74,78 ----
          ontologyIn.close();
          ontModel = ModelFactory
!             .createOntologyModel(OntModelSpec.OWL_DL_MEM_RULE_INF, ontology);
          data = ModelFactory.createDefaultModel();
          data.read(dataIn, null, "N3");
***************
*** 85,89 ****
          this.ontology = ontology;
          ontModel = ModelFactory
!                                .createOntologyModel(OntModelSpec.OWL_DL_MEM_RULE_INF, ontology);
          this.data = data;
          ontModel.addSubModel(data);
--- 86,90 ----
          this.ontology = ontology;
          ontModel = ModelFactory
!             .createOntologyModel(OntModelSpec.OWL_DL_MEM_RULE_INF, ontology);
          this.data = data;
          ontModel.addSubModel(data);
***************
*** 221,230 ****
      public StatementEditorBean addObjectValue(ResourceEditorBean resource, Property property, ResourceEditorBean value) {
          resource.resource.addProperty(property, value.resource);
!         return new StatementEditorBean(resource.resource.getProperty(property), this); // TODO: This is a BUG!
      }
  
      public StatementEditorBean addDataValue(ResourceEditorBean resource, Property property, Literal value) {
          resource.resource.addProperty(property, value);
!         return new StatementEditorBean(resource.resource.getProperty(property),this);  // TODO: This is a BUG!
      }
  
--- 222,233 ----
      public StatementEditorBean addObjectValue(ResourceEditorBean resource, Property property, ResourceEditorBean value) {
          resource.resource.addProperty(property, value.resource);
!         return new StatementEditorBean(resource.resource.getProperty(property), this); 
!         // TODO: This is a BUG!
      }
  
      public StatementEditorBean addDataValue(ResourceEditorBean resource, Property property, Literal value) {
          resource.resource.addProperty(property, value);
!         return new StatementEditorBean(resource.resource.getProperty(property),this);  
!         // TODO: This is a BUG!
      }
  
***************
*** 269,274 ****
      }
  
!     public Literal getTypedLiteral(Object value, OntResource type) {
!         return data.createTypedLiteral(value, type.getURI());
      }
  
--- 272,277 ----
      }
  
!     public Literal getTypedLiteral(Object value, String typeURI) {
!         return data.createTypedLiteral(value, typeURI);
      }
  

Index: ModelEditor.java
===================================================================
RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/ModelEditor.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** ModelEditor.java	25 Aug 2004 19:19:21 -0000	1.31
--- ModelEditor.java	25 Aug 2004 23:59:48 -0000	1.32
***************
*** 66,70 ****
      public OntClass[] getSubClasses(OntClass clazz);
  
!     public Literal getTypedLiteral(Object value, OntResource type);
      
      public OntClass getValidLeafClass(Property currentProperty);
--- 66,70 ----
      public OntClass[] getSubClasses(OntClass clazz);
  
!     public Literal getTypedLiteral(Object value, String typeURI);
      
      public OntClass getValidLeafClass(Property currentProperty);