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

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

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

Modified Files:
	BrowsePage.java OntTreePagelet.java Editor.java EditPage.java 
Log Message:
more work on remote model

Index: OntTreePagelet.java
===================================================================
RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing/OntTreePagelet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** OntTreePagelet.java	28 Jul 2004 07:17:03 -0000	1.5
--- OntTreePagelet.java	19 Aug 2004 14:45:31 -0000	1.6
***************
*** 33,37 ****
  import javax.swing.tree.TreeSelectionModel;
  
! import org.javaowl.editor.ModelEditorBean;
  
  import com.hp.hpl.jena.ontology.OntClass;
--- 33,37 ----
  import javax.swing.tree.TreeSelectionModel;
  
! import org.javaowl.editor.ModelEditor;
  
  import com.hp.hpl.jena.ontology.OntClass;
***************
*** 44,48 ****
  public class OntTreePagelet implements  Pagelet {
  
!     private final ModelEditorBean editor;
  
      private final JTree component;
--- 44,48 ----
  public class OntTreePagelet implements  Pagelet {
  
!     private final ModelEditor editor;
  
      private final JTree component;
***************
*** 52,56 ****
      private final BrowsePage browsePage;  
  
!     public OntTreePagelet(ModelEditorBean editor, BrowsePage browsePage) {
          this.editor = editor;
          this.browsePage = browsePage;
--- 52,56 ----
      private final BrowsePage browsePage;  
  
!     public OntTreePagelet(ModelEditor editor, BrowsePage browsePage) {
          this.editor = editor;
          this.browsePage = browsePage;

Index: EditPage.java
===================================================================
RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing/EditPage.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** EditPage.java	28 Jul 2004 07:17:04 -0000	1.5
--- EditPage.java	19 Aug 2004 14:45:32 -0000	1.6
***************
*** 45,49 ****
  import javax.swing.table.DefaultTableCellRenderer;
  
! import org.javaowl.editor.ModelEditorBean;
  import org.javaowl.editor.ResourceEditorBean;
  
--- 45,49 ----
  import javax.swing.table.DefaultTableCellRenderer;
  
! import org.javaowl.editor.ModelEditor;
  import org.javaowl.editor.ResourceEditorBean;
  
***************
*** 51,56 ****
  import com.hp.hpl.jena.ontology.OntProperty;
  import com.hp.hpl.jena.ontology.OntResource;
- import com.hp.hpl.jena.rdf.model.Property;
  import com.hp.hpl.jena.rdf.model.Literal;
  import com.hp.hpl.jena.rdf.model.Resource;
  import com.hp.hpl.jena.rdf.model.Statement;
--- 51,56 ----
  import com.hp.hpl.jena.ontology.OntProperty;
  import com.hp.hpl.jena.ontology.OntResource;
  import com.hp.hpl.jena.rdf.model.Literal;
+ import com.hp.hpl.jena.rdf.model.Property;
  import com.hp.hpl.jena.rdf.model.Resource;
  import com.hp.hpl.jena.rdf.model.Statement;
***************
*** 63,67 ****
      private TableModel values = new TableModel();
  
!     private final ModelEditorBean editor;
  
      private final Component component;
--- 63,67 ----
      private TableModel values = new TableModel();
  
!     private final ModelEditor editor;
  
      private final Component component;
***************
*** 81,88 ****
      private Editor e;
  
!     public EditPage(ModelEditorBean editor, ResourceEditorBean resourceEditor, Map propertyEditors, Editor e) {
          this.editor = editor;
          this.e = e;
          this.resourceEditor = resourceEditor;
          for (Iterator it = propertyEditors.entrySet().iterator(); it.hasNext();) {
              Map.Entry entry = (Map.Entry) it.next();
--- 81,91 ----
      private Editor e;
  
! 	private Resource resource;
! 
!     public EditPage(ModelEditor editor, ResourceEditorBean resourceEditor, Map propertyEditors, Editor e, Resource resource) {
          this.editor = editor;
          this.e = e;
          this.resourceEditor = resourceEditor;
+         this.resource = resource;
          for (Iterator it = propertyEditors.entrySet().iterator(); it.hasNext();) {
              Map.Entry entry = (Map.Entry) it.next();
***************
*** 202,206 ****
          }
          propertyEditor.setRangeType(editor.getOntProperty(currentProperty).getRange());
!         OntResource ontClass = resourceEditor.getValidLeafClass(currentProperty);
          if (ontClass != null) {
              Individual[] values = resourceEditor.getValidObjects(ontClass);
--- 205,209 ----
          }
          propertyEditor.setRangeType(editor.getOntProperty(currentProperty).getRange());
!         OntResource ontClass = editor.getValidLeafClass(currentProperty);
          if (ontClass != null) {
              Individual[] values = resourceEditor.getValidObjects(ontClass);
***************
*** 222,226 ****
          propertyEditor.setRangeType(editor.getOntProperty(currentProperty).getRange());
          if (value instanceof Resource) {
!             OntResource ontClass = resourceEditor.getValidLeafClass(currentProperty);
              if (ontClass != null) {
                  Individual[] values = resourceEditor.getValidObjects(ontClass);
--- 225,229 ----
          propertyEditor.setRangeType(editor.getOntProperty(currentProperty).getRange());
          if (value instanceof Resource) {
!             OntResource ontClass = editor.getValidLeafClass(currentProperty);
              if (ontClass != null) {
                  Individual[] values = resourceEditor.getValidObjects(ontClass);
***************
*** 254,260 ****
  
      private void refresh() {
!         Util.setList(properties, resourceEditor.getApplicableProperties());
          values.clear();
!         Statement[] stmts = resourceEditor.getDeclaredProperties();
          for (int i = 0; i < stmts.length; i++)
              values.add(stmts[i]);
--- 257,263 ----
  
      private void refresh() {
!         Util.setList(properties, editor.getApplicableProperties(resource));
          values.clear();
!         Statement[] stmts = editor.getDeclaredProperties(resource);
          for (int i = 0; i < stmts.length; i++)
              values.add(stmts[i]);

Index: BrowsePage.java
===================================================================
RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing/BrowsePage.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** BrowsePage.java	27 Jul 2004 17:25:36 -0000	1.5
--- BrowsePage.java	19 Aug 2004 14:45:31 -0000	1.6
***************
*** 38,42 ****
  import javax.swing.ListSelectionModel;
  
! import org.javaowl.editor.ModelEditorBean;
  
  import com.hp.hpl.jena.ontology.OntResource;
--- 38,42 ----
  import javax.swing.ListSelectionModel;
  
! import org.javaowl.editor.ModelEditor;
  
  import com.hp.hpl.jena.ontology.OntResource;
***************
*** 52,56 ****
      private final DefaultListModel instances = new DefaultListModel();
  
!     private final ModelEditorBean editor;
  
      private final Component component;
--- 52,56 ----
      private final DefaultListModel instances = new DefaultListModel();
  
!     private final ModelEditor editor;
  
      private final Component component;
***************
*** 68,72 ****
      private OntResource resource;
  
!     public BrowsePage(ModelEditorBean editor, Editor e) {
          this.editor = editor;
          this.e = e;
--- 68,72 ----
      private OntResource resource;
  
!     public BrowsePage(ModelEditor editor, Editor e) {
          this.editor = editor;
          this.e = e;

Index: Editor.java
===================================================================
RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing/Editor.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Editor.java	28 Jul 2004 07:17:03 -0000	1.25
--- Editor.java	19 Aug 2004 14:45:31 -0000	1.26
***************
*** 41,44 ****
--- 41,45 ----
  
  import org.javaowl.models.prevalence.PrevalentGraph;
+ import org.javaowl.editor.ModelEditor;
  import org.javaowl.editor.ModelEditorBean;
  import org.javaowl.editor.ResourceEditorBean;
***************
*** 61,65 ****
      private JTextField status;
  
!     private ModelEditorBean editor;
  
      private LinkedList stack = new LinkedList();
--- 62,66 ----
      private JTextField status;
  
!     private ModelEditor editor;
  
      private LinkedList stack = new LinkedList();
***************
*** 81,89 ****
          Model data = ModelFactory.createModelForGraph(new PrevalentGraph(args[1]));
                  
!         ModelEditorBean editor = new ModelEditorBean(ontology, data, args[2]);
          new Editor(editor).show();
      }
  
!     public Editor(ModelEditorBean editor) {
          this.editor = editor;
          init();
--- 82,90 ----
          Model data = ModelFactory.createModelForGraph(new PrevalentGraph(args[1]));
                  
!         ModelEditor editor = new ModelEditorBean(ontology, data, args[2]);
          new Editor(editor).show();
      }
  
!     public Editor(ModelEditor editor) {
          this.editor = editor;
          init();
***************
*** 175,180 ****
  
      public void editResource(Resource resource) {
!         ResourceEditorBean current = editor.getResource(resource);
!         EditPage editPage = new EditPage(editor, current, panels, this);
          addPane(editPage);
          setText(current);
--- 176,181 ----
  
      public void editResource(Resource resource) {
!         ResourceEditorBean current = editor.getResourceEditor(resource);
!         EditPage editPage = new EditPage(editor, current, panels, this, resource);
          addPane(editPage);
          setText(current);
***************
*** 186,195 ****
          String label = uriChooser.getLabel();
          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);
          addPane(editPage);
          setText(current);
--- 187,200 ----
          String label = uriChooser.getLabel();
          ResourceEditorBean current;
!         Resource currentResource;
!         if (uri == null) {
!             current = editor.createResourceEditor(resource);
!             currentResource = editor.createResource(resource);
!         } else {
!             current = editor.createResourceEditor(uri, resource);
!             currentResource = editor.createResource(resource);
!         }
          current.setLabel(label);
!         EditPage editPage = new EditPage(editor, current, panels, this, currentResource);
          addPane(editPage);
          setText(current);