javaowl-commit

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

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

Modified Files:
	LabelListCellRenderer.java OntTreePagelet.java Editor.java 
Log Message:
More refactoring

Index: OntTreePagelet.java
===================================================================
RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing/OntTreePagelet.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** OntTreePagelet.java	21 Aug 2004 00:22:48 -0000	1.7
--- OntTreePagelet.java	22 Aug 2004 17:41:00 -0000	1.8
***************
*** 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 {
--- 34,42 ----
  
  import org.javaowl.editor.ModelEditor;
  
  import com.hp.hpl.jena.ontology.OntClass;
  import com.hp.hpl.jena.rdf.model.Property;
  import com.hp.hpl.jena.vocabulary.OWL;
+ import com.hp.hpl.jena.vocabulary.RDFS;
  
  public class OntTreePagelet implements  Pagelet {
***************
*** 96,101 ****
                          setText(p.getLocalName());
                          setToolTipText(value.toString());
!                     } else if (value instanceof ResourceEditorBean) {
!                         setText(((ResourceEditorBean) value).getLabel(true));
                          setToolTipText(value.toString());
                      } else
--- 96,101 ----
                          setText(p.getLocalName());
                          setToolTipText(value.toString());
!                     } else if (value instanceof OntClass) {
!                         setText(editor.getPropertyValue((OntClass) value, RDFS.label,true));
                          setToolTipText(value.toString());
                      } else

Index: Editor.java
===================================================================
RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing/Editor.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** Editor.java	21 Aug 2004 00:22:48 -0000	1.29
--- Editor.java	22 Aug 2004 17:41:00 -0000	1.30
***************
*** 189,193 ****
              current = editor.createResourceEditor(resource);
          } else {
!             current = editor.createResourceEditor(resource);
          }
          current.setLabel(label);
--- 189,193 ----
              current = editor.createResourceEditor(resource);
          } else {
!             current = editor.createResourceEditor(uri, resource);
          }
          current.setLabel(label);

Index: LabelListCellRenderer.java
===================================================================
RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing/LabelListCellRenderer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** LabelListCellRenderer.java	21 Aug 2004 00:22:48 -0000	1.4
--- LabelListCellRenderer.java	22 Aug 2004 17:41:00 -0000	1.5
***************
*** 26,29 ****
--- 26,30 ----
  import org.javaowl.editor.ResourceEditorBean;
  
+ import com.hp.hpl.jena.ontology.Individual;
  import com.hp.hpl.jena.rdf.model.Property;
  
***************
*** 34,37 ****
--- 35,39 ----
          super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
          if (value != null) {
+             System.out.println(value.getClass());
              if (value instanceof Property) {
                  Property p = (Property) value;
***************
*** 41,44 ****
--- 43,49 ----
                  setText(((ResourceEditorBean) value).getLabel(true));
                  setToolTipText(((ResourceEditorBean) value).getComment(false));
+             } else if (value instanceof Individual) {
+                 setText(((Individual) value).getLabel(null));
+                 setToolTipText(((Individual) value).getComment(null));
              } else
                  setText(value.toString());