[Spedit-commits] CVS: prototype/Sources/net/sourceforge/spedit/app Application.java,1.7,1.8

[S?bastien P. <kaz...@us...>]

Update of /cvsroot/spedit/prototype/Sources/net/sourceforge/spedit/app
In directory usw-pr-cvs1:/tmp/cvs-serv12239/net/sourceforge/spedit/app

Modified Files:
	Application.java 
Log Message:
Partly fixed remove bug. Functional thought.


Index: Application.java
===================================================================
RCS file: /cvsroot/spedit/prototype/Sources/net/sourceforge/spedit/app/Application.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Application.java	2001/12/04 16:37:29	1.7
--- Application.java	2001/12/06 10:11:17	1.8
***************
*** 147,152 ****
  			editorPane = new JEditorPane();
  			navigator = new NavigationTree(this);
! 			//editorKit = new XMLEditorKit("../Support/SP-Configuration.xml");
! 			editorKit = new XMLEditorKit("../Support/ON-Configuration.xml");
  			editorPane.setEditorKit(editorKit);
  			factory = (XMLViewFactory)editorKit.getViewFactory();
--- 147,152 ----
  			editorPane = new JEditorPane();
  			navigator = new NavigationTree(this);
! 			editorKit = new XMLEditorKit("../Support/SP-Configuration.xml");
! 			//editorKit = new XMLEditorKit("../Support/ON-Configuration.xml");
  			editorPane.setEditorKit(editorKit);
  			factory = (XMLViewFactory)editorKit.getViewFactory();
***************
*** 178,183 ****
  			
  			//We load the custom file
! 			//File ff = new File("../Support/SP-P11388.xml");
! 			File ff = new File("../Support/ON-Document.xml");
  			document = XMLDocument.loadFromFile(ff, factory);
  			document.filter(factory);
--- 178,183 ----
  			
  			//We load the custom file
! 			File ff = new File("../Support/SP-P11388.xml");
! 			//File ff = new File("../Support/ON-Document.xml");
  			document = XMLDocument.loadFromFile(ff, factory);
  			document.filter(factory);
***************
*** 374,381 ****
  				CompositeView view =
  				(CompositeView)((WrapperView)factory.getElementView(wrp)).getNestedView();
- 				//wrp.getXMLElement().removeContent(wrapper.getXMLElement());
- 				wrapper.remove(wrapper.getStartOffset(), wrapper.getEndOffset());
- 				//We do this to force a loadChildren() method call in the CompositeView.
  				view.replace(0,view.getViewCount(),new View[0]);
  				view.setParent(view.getParent());
  				//view.getContainer().repaint();
--- 374,381 ----
  				CompositeView view =
  				(CompositeView)((WrapperView)factory.getElementView(wrp)).getNestedView();
  				view.replace(0,view.getViewCount(),new View[0]);
+ 				wrp.getXMLElement().removeContent(wrapper.getXMLElement());
+ 				//wrapper.remove(wrapper.getStartOffset(), wrapper.getEndOffset());
+ 				//We do this to force a loadChildren() method call in the CompositeView.
  				view.setParent(view.getParent());
  				//view.getContainer().repaint();