[Javaowl-commit] JavaOWL/src/org/javaowl/editor/swing LabelListCellRenderer.java,1.3,1.4 BrowsePage.java,1.7,1.8 OntTreePagelet.java,1.6,1.7 PropertyEditorPagelet.java,1.4,1.5 EditPage.java,1.8,1.9 Editor.java,1.28,1.29 Util.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-serv6871/src/org/javaowl/editor/swing

Modified Files:
	LabelListCellRenderer.java BrowsePage.java OntTreePagelet.java 
	PropertyEditorPagelet.java EditPage.java Editor.java Util.java 
Log Message:
Moe work on refactoring

Index: OntTreePagelet.java
===================================================================
RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing/OntTreePagelet.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** OntTreePagelet.java	19 Aug 2004 14:45:31 -0000	1.6
--- OntTreePagelet.java	21 Aug 2004 00:22:48 -0000	1.7
***************
*** 34,44 ****
  
  import org.javaowl.editor.ModelEditor;
  
  import com.hp.hpl.jena.ontology.OntClass;
- import com.hp.hpl.jena.ontology.OntResource;
  import com.hp.hpl.jena.rdf.model.Property;
- import com.hp.hpl.jena.rdf.model.Resource;
  import com.hp.hpl.jena.vocabulary.OWL;
- import com.hp.hpl.jena.vocabulary.RDFS;
  
  public class OntTreePagelet implements  Pagelet {
--- 34,42 ----
  
  import org.javaowl.editor.ModelEditor;
+ import org.javaowl.editor.ResourceEditorBean;
  
  import com.hp.hpl.jena.ontology.OntClass;
  import com.hp.hpl.jena.rdf.model.Property;
  import com.hp.hpl.jena.vocabulary.OWL;
  
  public class OntTreePagelet implements  Pagelet {
***************
*** 77,85 ****
                          .getLastSelectedPathComponent();
                  if (node != null) {
!                     OntResource resource = (OntResource) node.getUserObject();
                      if (e.getClickCount() == 2) {
                          notifyCreateResource(resource);
                      } else {
!                         notifySetResource(resource);
                      }
                  }
--- 75,83 ----
                          .getLastSelectedPathComponent();
                  if (node != null) {
!                     OntClass resource = (OntClass) node.getUserObject();
                      if (e.getClickCount() == 2) {
                          notifyCreateResource(resource);
                      } else {
!                         notifySetClass(resource);
                      }
                  }
***************
*** 98,103 ****
                          setText(p.getLocalName());
                          setToolTipText(value.toString());
!                     } else if (value instanceof Resource) {
!                         setText(Util.getPropertyValue((Resource) value, RDFS.label, true));
                          setToolTipText(value.toString());
                      } else
--- 96,101 ----
                          setText(p.getLocalName());
                          setToolTipText(value.toString());
!                     } else if (value instanceof ResourceEditorBean) {
!                         setText(((ResourceEditorBean) value).getLabel(true));
                          setToolTipText(value.toString());
                      } else
***************
*** 121,130 ****
      }
  
!     private void notifyCreateResource(OntResource resource) {
!         browsePage.notifyCreateResource(resource);
      }
  
!     private void notifySetResource(OntResource resource) {
!         browsePage.setResource(resource);
      }
  
--- 119,128 ----
      }
  
!     private void notifyCreateResource(OntClass clazz) {
!         browsePage.notifyCreateResource(clazz);
      }
  
!     private void notifySetClass(OntClass clazz) {
!         browsePage.setClass(clazz);
      }
  

Index: BrowsePage.java
===================================================================
RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing/BrowsePage.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** BrowsePage.java	20 Aug 2004 18:16:43 -0000	1.7
--- BrowsePage.java	21 Aug 2004 00:22:48 -0000	1.8
***************
*** 39,45 ****
  
  import org.javaowl.editor.ModelEditor;
  
! import com.hp.hpl.jena.ontology.OntResource;
! import com.hp.hpl.jena.rdf.model.Resource;
  import com.hp.hpl.jena.vocabulary.RDFS;
  
--- 39,45 ----
  
  import org.javaowl.editor.ModelEditor;
+ import org.javaowl.editor.ResourceEditorBean;
  
! import com.hp.hpl.jena.ontology.OntClass;
  import com.hp.hpl.jena.vocabulary.RDFS;
  
***************
*** 66,70 ****
      private final OntTreePagelet tree;
  
!     private OntResource resource;
  
      public BrowsePage(ModelEditor editor, Editor e) {
--- 66,70 ----
      private final OntTreePagelet tree;
  
!     private OntClass clazz;
  
      public BrowsePage(ModelEditor editor, Editor e) {
***************
*** 86,90 ****
                  if (e.getClickCount() == 2) {
                      int index = instancesList.locationToIndex(e.getPoint());
!                     Resource resource = (Resource) instances.elementAt(index);
                      notifyEditResource(resource);
                  }
--- 86,90 ----
                  if (e.getClickCount() == 2) {
                      int index = instancesList.locationToIndex(e.getPoint());
!                     ResourceEditorBean resource = (ResourceEditorBean) instances.elementAt(index);
                      notifyEditResource(resource);
                  }
***************
*** 95,100 ****
              public void keyReleased(KeyEvent e) {
                  if (KeyEvent.VK_DELETE == e.getKeyCode()) {
!                     Resource resource = (Resource) instancesList
!                             .getSelectedValue();
                      instances.removeElement(resource);
                      notifyRemoveResource(resource);
--- 95,99 ----
              public void keyReleased(KeyEvent e) {
                  if (KeyEvent.VK_DELETE == e.getKeyCode()) {
!                     ResourceEditorBean resource = (ResourceEditorBean) instancesList.getSelectedValue();
                      instances.removeElement(resource);
                      notifyRemoveResource(resource);
***************
*** 126,138 ****
      }
  
!     public void notifyCreateResource(OntResource resource) {
          e.createResource(resource);
      }
  
!     private void notifyEditResource(Resource resource) {
          e.editResource(resource);
      }
      
!     private void notifyRemoveResource(Resource resource) {
          editor.removeResource(resource);
      }
--- 125,137 ----
      }
  
!     public void notifyCreateResource(OntClass resource) {
          e.createResource(resource);
      }
  
!     private void notifyEditResource(ResourceEditorBean resource) {
          e.editResource(resource);
      }
      
!     private void notifyRemoveResource(ResourceEditorBean resource) {
          editor.removeResource(resource);
      }
***************
*** 146,151 ****
      }
  
!     public void setResource(OntResource resource) {
!         this.resource = resource;
          refresh();
      }
--- 145,150 ----
      }
  
!     public void setClass(OntClass clazz) {
!         this.clazz = clazz;
          refresh();
      }
***************
*** 159,167 ****
      public void refresh() {
          Util.setList(resources, editor.getAllClasses());
!         if (resource != null) {
!             Util.setList(properties, editor.getProperties(resource,
!                     allProperties.isSelected()));
!             Util.setList(instances, editor.getInstances(resource, allInstances
!                     .isSelected()));
          }
          notifySetStatus();
--- 158,164 ----
      public void refresh() {
          Util.setList(resources, editor.getAllClasses());
!         if (clazz != null) {
!             Util.setList(properties, editor.getProperties(clazz, allProperties.isSelected()));
!             Util.setList(instances, editor.getInstances(clazz, allInstances.isSelected()));
          }
          notifySetStatus();
***************
*** 169,174 ****
  
      private String getStatus() {
!         return (resource != null) ? Util.getPropertyValue(resource, RDFS.label,
!                 true) : null;
      }
  
--- 166,170 ----
  
      private String getStatus() {
!         return (clazz != null) ? editor.getPropertyValue(clazz, RDFS.label, true) : null;
      }
  

Index: Util.java
===================================================================
RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing/Util.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Util.java	22 Jul 2004 18:28:38 -0000	1.4
--- Util.java	21 Aug 2004 00:22:48 -0000	1.5
***************
*** 24,31 ****
  import javax.swing.DefaultListModel;
  
- import com.hp.hpl.jena.rdf.model.Property;
- import com.hp.hpl.jena.rdf.model.Resource;
- import com.hp.hpl.jena.rdf.model.Statement;
- 
  public class Util {
  
--- 24,27 ----
***************
*** 34,44 ****
      }
  
-     public static String getPropertyValue(Resource r, Property p, boolean showUri) {
-         Statement s = r.getProperty(p);
-         if (s != null)
-             return s.getString();
-         return showUri ? r.toString() : null;
-     }
- 
      public static void setList(DefaultListModel dlm, Object[] o) {
          dlm.clear();
--- 30,33 ----

Index: EditPage.java
===================================================================
RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing/EditPage.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** EditPage.java	20 Aug 2004 18:16:44 -0000	1.8
--- EditPage.java	21 Aug 2004 00:22:48 -0000	1.9
***************
*** 46,49 ****
--- 46,50 ----
  
  import org.javaowl.editor.ModelEditor;
+ import org.javaowl.editor.ResourceEditorBean;
  
  import com.hp.hpl.jena.ontology.Individual;
***************
*** 55,59 ****
  import com.hp.hpl.jena.rdf.model.Resource;
  import com.hp.hpl.jena.rdf.model.Statement;
- import com.hp.hpl.jena.vocabulary.RDFS;
  
  public class EditPage implements Page {
--- 56,59 ----
***************
*** 79,85 ****
      private Editor e;
  
! 	private Resource resource;
  
!     public EditPage(ModelEditor editor, Map propertyEditors, Editor e, Resource resource) {
          this.editor = editor;
          this.e = e;
--- 79,85 ----
      private Editor e;
  
! 	private ResourceEditorBean resource;
  
!     public EditPage(ModelEditor editor, Map propertyEditors, Editor e, ResourceEditorBean resource) {
          this.editor = editor;
          this.e = e;
***************
*** 141,148 ****
                      setText(p.getLocalName());
                      setToolTipText(value.toString());
!                 } else if (value instanceof Resource) {
!                     setText(Util.getPropertyValue((Resource) value, RDFS.label, true));
!                     setToolTipText(Util
!                                        .getPropertyValue((Resource) value, RDFS.comment, false));
                  } else if (value instanceof Literal) {
                      Literal literal = (Literal) value;
--- 141,147 ----
                      setText(p.getLocalName());
                      setToolTipText(value.toString());
!                 } else if (value instanceof ResourceEditorBean) {
!                     setText(((ResourceEditorBean) value).getLabel(true));
!                     setToolTipText(((ResourceEditorBean) value).getComment(false));
                  } else if (value instanceof Literal) {
                      Literal literal = (Literal) value;
***************
*** 239,244 ****
      }
  
!     public void notifyCreateResource(OntResource resource) {
!         e.createResource(resource);
          if (currentStatement != null) {
              editProperty(currentStatement);
--- 238,243 ----
      }
  
!     public void notifyCreateResource(OntClass clazz) {
!         e.createResource(clazz);
          if (currentStatement != null) {
              editProperty(currentStatement);
***************
*** 269,273 ****
      private String getStatus() {
          StringBuffer sb = new StringBuffer();
!         sb.append(editor.getLabel(resource));
          sb.append(": <");
          sb.append(resource.getURI());
--- 268,272 ----
      private String getStatus() {
          StringBuffer sb = new StringBuffer();
!         sb.append(resource.getLabel(false));
          sb.append(": <");
          sb.append(resource.getURI());

Index: PropertyEditorPagelet.java
===================================================================
RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing/PropertyEditorPagelet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PropertyEditorPagelet.java	27 Jul 2004 04:10:18 -0000	1.4
--- PropertyEditorPagelet.java	21 Aug 2004 00:22:48 -0000	1.5
***************
*** 19,22 ****
--- 19,23 ----
  package org.javaowl.editor.swing;
  
+ import com.hp.hpl.jena.ontology.OntClass;
  import com.hp.hpl.jena.ontology.OntResource;
  import com.hp.hpl.jena.rdf.model.Resource;
***************
*** 24,28 ****
  public interface PropertyEditorPagelet extends  Pagelet {
  
!     public void setValues(Resource[] o, Resource value, OntResource resourceClass);
  
      public void setValue(String o);
--- 25,29 ----
  public interface PropertyEditorPagelet extends  Pagelet {
  
!     public void setValues(Resource[] o, Resource value, OntClass clazz);
  
      public void setValue(String o);

Index: Editor.java
===================================================================
RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing/Editor.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** Editor.java	19 Aug 2004 21:33:42 -0000	1.28
--- Editor.java	21 Aug 2004 00:22:48 -0000	1.29
***************
*** 25,30 ****
  import java.awt.event.WindowAdapter;
  import java.awt.event.WindowEvent;
- import java.io.FileInputStream;
  import java.io.File;
  import java.io.IOException;
  import java.util.HashMap;
--- 25,30 ----
  import java.awt.event.WindowAdapter;
  import java.awt.event.WindowEvent;
  import java.io.File;
+ import java.io.FileInputStream;
  import java.io.IOException;
  import java.util.HashMap;
***************
*** 40,50 ****
  import javax.swing.JTextField;
  
- import org.javaowl.models.prevalence.PrevalentGraph;
  import org.javaowl.editor.ModelEditor;
  import org.javaowl.editor.ModelEditorBean;
  
  import com.hp.hpl.jena.ontology.OntProperty;
  import com.hp.hpl.jena.ontology.OntResource;
- import com.hp.hpl.jena.rdf.model.Resource;
  import com.hp.hpl.jena.rdf.model.Model;
  import com.hp.hpl.jena.rdf.model.ModelFactory;
--- 40,51 ----
  import javax.swing.JTextField;
  
  import org.javaowl.editor.ModelEditor;
  import org.javaowl.editor.ModelEditorBean;
+ import org.javaowl.editor.ResourceEditorBean;
+ import org.javaowl.models.prevalence.PrevalentGraph;
  
+ import com.hp.hpl.jena.ontology.OntClass;
  import com.hp.hpl.jena.ontology.OntProperty;
  import com.hp.hpl.jena.ontology.OntResource;
  import com.hp.hpl.jena.rdf.model.Model;
  import com.hp.hpl.jena.rdf.model.ModelFactory;
***************
*** 118,122 ****
          setURIGenerator(new DefaultURIGenerator("http://www.javaowl.org/default#"));
          try {
!             addPropertyEditor("", Class.forName("org.javaowl.editor.swing.DefaultPropertyEditorPagelet"));
              OntProperty[] props = editor.getAllDatatypeProperties();
              for(int i = 0; i < props.length; i++) {
--- 119,123 ----
          setURIGenerator(new DefaultURIGenerator("http://www.javaowl.org/default#"));
          try {
!             addPropertyEditor("", Class.forName("org.javaowl.editor.swing.pe.DefaultPropertyEditorPagelet"));
              OntProperty[] props = editor.getAllDatatypeProperties();
              for(int i = 0; i < props.length; i++) {
***************
*** 174,178 ****
      }
  
!     public void editResource(Resource resource) {
          EditPage editPage = new EditPage(editor, panels, this, resource);
          addPane(editPage);
--- 175,179 ----
      }
  
!     public void editResource(ResourceEditorBean resource) {
          EditPage editPage = new EditPage(editor, panels, this, resource);
          addPane(editPage);
***************
*** 180,194 ****
      }
  
!     public void createResource(OntResource resource) {
          uriChooser.show(uriGenerator, resource);
          String uri = uriChooser.getURI();
          String label = uriChooser.getLabel();
!         Resource current;
          if (uri == null) {
!             current = editor.createResource(resource);
          } else {
!             current = editor.createResource(resource);
          }
!         editor.setLabel(current, label);
          EditPage editPage = new EditPage(editor, panels, this, current);
          addPane(editPage);
--- 181,195 ----
      }
  
!     public void createResource(OntClass resource) {
          uriChooser.show(uriGenerator, resource);
          String uri = uriChooser.getURI();
          String label = uriChooser.getLabel();
!         ResourceEditorBean current;
          if (uri == null) {
!             current = editor.createResourceEditor(resource);
          } else {
!             current = editor.createResourceEditor(resource);
          }
!         current.setLabel(label);
          EditPage editPage = new EditPage(editor, panels, this, current);
          addPane(editPage);
***************
*** 238,245 ****
      }
  
!     private void setText(Resource resource) {
          if (resource != null) {
              StringBuffer sb = new StringBuffer();
!             sb.append(editor.getLabel(resource));
              sb.append(": <");
              sb.append(resource.getURI());
--- 239,246 ----
      }
  
!     private void setText(ResourceEditorBean resource) {
          if (resource != null) {
              StringBuffer sb = new StringBuffer();
!             sb.append(resource.getLabel(true));
              sb.append(": <");
              sb.append(resource.getURI());

Index: LabelListCellRenderer.java
===================================================================
RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing/LabelListCellRenderer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** LabelListCellRenderer.java	17 Jul 2004 05:39:11 -0000	1.3
--- LabelListCellRenderer.java	21 Aug 2004 00:22:48 -0000	1.4
***************
*** 24,30 ****
  import javax.swing.JList;
  
  import com.hp.hpl.jena.rdf.model.Property;
- import com.hp.hpl.jena.rdf.model.Resource;
- import com.hp.hpl.jena.vocabulary.RDFS;
  
  public class LabelListCellRenderer extends DefaultListCellRenderer {
--- 24,30 ----
  import javax.swing.JList;
  
+ import org.javaowl.editor.ResourceEditorBean;
+ 
  import com.hp.hpl.jena.rdf.model.Property;
  
  public class LabelListCellRenderer extends DefaultListCellRenderer {
***************
*** 38,44 ****
                  setText(p.getLocalName());
                  setToolTipText(value.toString());
!             } else if (value instanceof Resource) {
!                 setText(Util.getPropertyValue((Resource) value, RDFS.label, true));
!                 setToolTipText(Util.getPropertyValue((Resource) value, RDFS.comment, false));
              } else
                  setText(value.toString());
--- 38,44 ----
                  setText(p.getLocalName());
                  setToolTipText(value.toString());
!             } else if (value instanceof ResourceEditorBean) {
!                 setText(((ResourceEditorBean) value).getLabel(true));
!                 setToolTipText(((ResourceEditorBean) value).getComment(false));
              } else
                  setText(value.toString());