[Javaowl-commit] JavaOWL/src/org/javaowl/editor/swing OntTreePagelet.java,1.4,1.5 Editor.java,1.24,1.25 EditPage.java,1.4,1.5

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

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

Modified Files:
	OntTreePagelet.java Editor.java EditPage.java 
Log Message:
Fixed some TODO's in ModelEditorBean and ResourceEditorBean

Index: OntTreePagelet.java
===================================================================
RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing/OntTreePagelet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** OntTreePagelet.java	27 Jul 2004 15:59:56 -0000	1.4
--- OntTreePagelet.java	28 Jul 2004 07:17:03 -0000	1.5
***************
*** 59,63 ****
  
      private JTree createPanel() {
!         OntClass thing = editor.createClass(OWL.Thing);
          DefaultMutableTreeNode top = new DefaultMutableTreeNode(thing);
          paths.put(thing, top);
--- 59,63 ----
  
      private JTree createPanel() {
!         OntClass thing = editor.getOntClass(OWL.Thing);
          DefaultMutableTreeNode top = new DefaultMutableTreeNode(thing);
          paths.put(thing, top);
***************
*** 129,154 ****
      }
  
-     /*
-     public void showTypes() {
-         component.setExpandsSelectedPaths(true);
-         if (resource != null) {
-             OntClass[] types = resource.getTypes();
-             for (int i = 0; i < types.length; i++) {
-                 DefaultMutableTreeNode node = (DefaultMutableTreeNode) paths.get(types[i]);
-                 component.setSelectionPath(new TreePath(node.getPath()));
-             }
-         }
-     }
-     */
- 
      public Component getComponent() {
-         refresh();
          return component;
!     }
! 
!     public void refresh() {
!         // TODO: Is this method ever called? 
!     }
!     
  }
  
--- 129,135 ----
      }
  
      public Component getComponent() {
          return component;
!     }    
  }
  

Index: EditPage.java
===================================================================
RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing/EditPage.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** EditPage.java	22 Jul 2004 02:47:41 -0000	1.4
--- EditPage.java	28 Jul 2004 07:17:04 -0000	1.5
***************
*** 201,205 ****
              propertyEditor = (PropertyEditorPagelet) propertyEditors.get("");
          }
!         propertyEditor.setRangeType(editor.createProperty(currentProperty).getRange());
          OntResource ontClass = resourceEditor.getValidLeafClass(currentProperty);
          if (ontClass != null) {
--- 201,205 ----
              propertyEditor = (PropertyEditorPagelet) propertyEditors.get("");
          }
!         propertyEditor.setRangeType(editor.getOntProperty(currentProperty).getRange());
          OntResource ontClass = resourceEditor.getValidLeafClass(currentProperty);
          if (ontClass != null) {
***************
*** 220,224 ****
              propertyEditor = (PropertyEditorPagelet) propertyEditors.get("");
          }
!         propertyEditor.setRangeType(editor.createProperty(currentProperty).getRange());
          if (value instanceof Resource) {
              OntResource ontClass = resourceEditor.getValidLeafClass(currentProperty);
--- 220,224 ----
              propertyEditor = (PropertyEditorPagelet) propertyEditors.get("");
          }
!         propertyEditor.setRangeType(editor.getOntProperty(currentProperty).getRange());
          if (value instanceof Resource) {
              OntResource ontClass = resourceEditor.getValidLeafClass(currentProperty);
***************
*** 256,260 ****
          Util.setList(properties, resourceEditor.getApplicableProperties());
          values.clear();
!         Statement[] stmts = resourceEditor.getProperties();
          for (int i = 0; i < stmts.length; i++)
              values.add(stmts[i]);
--- 256,260 ----
          Util.setList(properties, resourceEditor.getApplicableProperties());
          values.clear();
!         Statement[] stmts = resourceEditor.getDeclaredProperties();
          for (int i = 0; i < stmts.length; i++)
              values.add(stmts[i]);
***************
*** 281,285 ****
          }
          values.add(resourceEditor.addDataValue(currentProperty, 
!                                                editor.createTypedLiteral(value, type)));
          propertyEditor = null;
          currentStatement = null;
--- 281,285 ----
          }
          values.add(resourceEditor.addDataValue(currentProperty, 
!                                                editor.getTypedLiteral(value, type)));
          propertyEditor = null;
          currentStatement = null;

Index: Editor.java
===================================================================
RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing/Editor.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Editor.java	26 Jul 2004 22:55:02 -0000	1.24
--- Editor.java	28 Jul 2004 07:17:03 -0000	1.25
***************
*** 79,87 ****
          Model ontology = ModelFactory.createDefaultModel();
          ontology.read(new FileInputStream(args[0]), null, "N3");
!         Model props = ModelFactory.createDefaultModel();
!         props.read(new FileInputStream(args[1]), null, "N3");
!         Model data = ModelFactory.createModelForGraph(new PrevalentGraph(args[2]));
                  
!         ModelEditorBean editor = new ModelEditorBean(ontology, props, data, args[3]);
          new Editor(editor).show();
      }
--- 79,85 ----
          Model ontology = ModelFactory.createDefaultModel();
          ontology.read(new FileInputStream(args[0]), null, "N3");
!         Model data = ModelFactory.createModelForGraph(new PrevalentGraph(args[1]));
                  
!         ModelEditorBean editor = new ModelEditorBean(ontology, data, args[2]);
          new Editor(editor).show();
      }
***************
*** 121,125 ****
          try {
              addPropertyEditor("", Class.forName("org.javaowl.editor.swing.DefaultPropertyEditorPagelet"));
!             OntProperty[] props = editor.getAllProperties();
              for(int i = 0; i < props.length; i++) {
                  addPropertyEditor(props[i].getURI(), 
--- 119,123 ----
          try {
              addPropertyEditor("", Class.forName("org.javaowl.editor.swing.DefaultPropertyEditorPagelet"));
!             OntProperty[] props = editor.getAllDatatypeProperties();
              for(int i = 0; i < props.length; i++) {
                  addPropertyEditor(props[i].getURI(), 
***************
*** 177,181 ****
  
      public void editResource(Resource resource) {
!         ResourceEditorBean current = editor.getResourceEditor(resource);
          EditPage editPage = new EditPage(editor, current, panels, this);
          addPane(editPage);
--- 175,179 ----
  
      public void editResource(Resource resource) {
!         ResourceEditorBean current = editor.getResource(resource);
          EditPage editPage = new EditPage(editor, current, panels, this);
          addPane(editPage);
***************
*** 189,195 ****
          ResourceEditorBean current;
          if (uri == null)
!             current = editor.getNewResourceEditor(resource);
          else
!             current = editor.getNewResourceEditor(uri, resource);
          current.setLabel(label);
          EditPage editPage = new EditPage(editor, current, panels, this);
--- 187,193 ----
          ResourceEditorBean current;
          if (uri == null)
!             current = editor.createResource(resource);
          else
!             current = editor.createResource(uri, resource);
          current.setLabel(label);
          EditPage editPage = new EditPage(editor, current, panels, this);