[Javaowl-commit] JavaOWL/src/org/javaowl/editor/swing Editor.java,1.26,1.27 EditPage.java,1.6,1.7

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	Editor.java EditPage.java 
Log Message:
Removed all references to ResourceEditorBean

Index: EditPage.java
===================================================================
RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing/EditPage.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** EditPage.java	19 Aug 2004 14:45:32 -0000	1.6
--- EditPage.java	19 Aug 2004 21:27:54 -0000	1.7
***************
*** 46,50 ****
  
  import org.javaowl.editor.ModelEditor;
- import org.javaowl.editor.ResourceEditorBean;
  
  import com.hp.hpl.jena.ontology.Individual;
--- 46,49 ----
***************
*** 71,76 ****
      private JSplitPane center;
  
-     private final ResourceEditorBean resourceEditor;
- 
      private Statement currentStatement;
  
--- 70,73 ----
***************
*** 83,90 ****
  	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();) {
--- 80,86 ----
  	private Resource resource;
  
!     public EditPage(ModelEditor editor, Map propertyEditors, Editor e, Resource resource) {
          this.editor = editor;
          this.e = e;
          this.resource = resource;
          for (Iterator it = propertyEditors.entrySet().iterator(); it.hasNext();) {
***************
*** 207,211 ****
          OntResource ontClass = editor.getValidLeafClass(currentProperty);
          if (ontClass != null) {
!             Individual[] values = resourceEditor.getValidObjects(ontClass);
              propertyEditor.setValues(values, null, ontClass);
          } else {
--- 203,207 ----
          OntResource ontClass = editor.getValidLeafClass(currentProperty);
          if (ontClass != null) {
!             Individual[] values = editor.getValidObjects(ontClass);
              propertyEditor.setValues(values, null, ontClass);
          } else {
***************
*** 227,231 ****
              OntResource ontClass = editor.getValidLeafClass(currentProperty);
              if (ontClass != null) {
!                 Individual[] values = resourceEditor.getValidObjects(ontClass);
                  propertyEditor.setValues(values, (Resource) value, ontClass);
              } else {
--- 223,227 ----
              OntResource ontClass = editor.getValidLeafClass(currentProperty);
              if (ontClass != null) {
!                 Individual[] values = editor.getValidObjects(ontClass);
                  propertyEditor.setValues(values, (Resource) value, ontClass);
              } else {
***************
*** 272,278 ****
      private String getStatus() {
          StringBuffer sb = new StringBuffer();
!         sb.append(resourceEditor.getLabel());
          sb.append(": <");
!         sb.append(resourceEditor.getResource().getURI());
          sb.append(">");
          return sb.toString();
--- 268,274 ----
      private String getStatus() {
          StringBuffer sb = new StringBuffer();
!         sb.append(editor.getLabel(resource));
          sb.append(": <");
!         sb.append(resource.getURI());
          sb.append(">");
          return sb.toString();
***************
*** 283,287 ****
              editor.removeStatement(currentStatement);
          }
!         values.add(resourceEditor.addDataValue(currentProperty, 
                                                 editor.getTypedLiteral(value, type)));
          propertyEditor = null;
--- 279,283 ----
              editor.removeStatement(currentStatement);
          }
!         values.add(editor.addDataValue(resource, currentProperty, 
                                                 editor.getTypedLiteral(value, type)));
          propertyEditor = null;
***************
*** 290,298 ****
      }
      
!     public void setProperty(Resource resource) {
          if (currentStatement != null) {
              editor.removeStatement(currentStatement);
          }
!         values.add(resourceEditor.addObjectValue(currentProperty, resource));
          propertyEditor = null;
          currentStatement = null;
--- 286,294 ----
      }
      
!     public void setProperty(Resource value) {
          if (currentStatement != null) {
              editor.removeStatement(currentStatement);
          }
!         values.add(editor.addObjectValue(resource, currentProperty, value));
          propertyEditor = null;
          currentStatement = null;

Index: Editor.java
===================================================================
RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing/Editor.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** Editor.java	19 Aug 2004 14:45:31 -0000	1.26
--- Editor.java	19 Aug 2004 21:27:54 -0000	1.27
***************
*** 43,47 ****
  import org.javaowl.editor.ModelEditor;
  import org.javaowl.editor.ModelEditorBean;
- import org.javaowl.editor.ResourceEditorBean;
  
  import com.hp.hpl.jena.ontology.OntProperty;
--- 43,46 ----
***************
*** 176,183 ****
  
      public void editResource(Resource resource) {
!         ResourceEditorBean current = editor.getResourceEditor(resource);
!         EditPage editPage = new EditPage(editor, current, panels, this, resource);
          addPane(editPage);
!         setText(current);
      }
  
--- 175,181 ----
  
      public void editResource(Resource resource) {
!         EditPage editPage = new EditPage(editor, panels, this, resource);
          addPane(editPage);
!         setText(resource);
      }
  
***************
*** 186,200 ****
          String uri = uriChooser.getURI();
          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);
--- 184,195 ----
          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);
          setText(current);
***************
*** 243,252 ****
      }
  
!     private void setText(ResourceEditorBean resource) {
          if (resource != null) {
              StringBuffer sb = new StringBuffer();
!             sb.append(resource.getLabel());
              sb.append(": <");
!             sb.append(resource.getResource().getURI());
              sb.append(">");
              setStatus(sb.toString());
--- 238,247 ----
      }
  
!     private void setText(Resource resource) {
          if (resource != null) {
              StringBuffer sb = new StringBuffer();
!             sb.append(editor.getLabel(resource));
              sb.append(": <");
!             sb.append(resource.getURI());
              sb.append(">");
              setStatus(sb.toString());