[Columba-cvs] columba/plugins/org.columba.chat.altura/src/org/columba/chat/frame AlturaFrameController.java,1.5,1.6

[Frederik D. <fd...@us...>]

Update of /cvsroot/columba/columba/plugins/org.columba.chat.altura/src/org/columba/chat/frame
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19839/plugins/org.columba.chat.altura/src/org/columba/chat/frame

Modified Files:
	AlturaFrameController.java 
Log Message:
[intern]fixed pending resource loader problem. This works now correctly. See chat.altura plugin for examples on how to load resources. "this.getClass().getResourceAsStream(String str)" does the trick.

Index: AlturaFrameController.java
===================================================================
RCS file: /cvsroot/columba/columba/plugins/org.columba.chat.altura/src/org/columba/chat/frame/AlturaFrameController.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AlturaFrameController.java	28 Jul 2005 07:11:35 -0000	1.5
--- AlturaFrameController.java	28 Jul 2005 15:50:42 -0000	1.6
***************
*** 31,35 ****
  import org.columba.core.gui.frame.ContentPane;
  import org.columba.core.gui.frame.DefaultFrameController;
- import org.columba.core.io.DiskIO;
  import org.columba.core.xml.XmlElement;
  import org.columba.core.xml.XmlIO;
--- 31,34 ----
***************
*** 82,91 ****
  
  		InputStream is = this.getClass().getResourceAsStream(
! 				"org/columba/chat/action/menu.xml");
  		getContainer().extendMenuFromURL(this, is);
  
! 		XmlIO xmlFile = new XmlIO(DiskIO
! 				.getResourceURL("org/columba/chat/action/toolbar.xml"));
! 		xmlFile.load();
  
  		XmlElement toolbar = xmlFile.getRoot().getElement("/toolbar");
--- 81,91 ----
  
  		InputStream is = this.getClass().getResourceAsStream(
! 				"/org/columba/chat/action/menu.xml");
  		getContainer().extendMenuFromURL(this, is);
  
! 		InputStream is2 = this.getClass().getResourceAsStream(
! 				"/org/columba/chat/action/toolbar.xml");
! 		XmlIO xmlFile = new XmlIO();
! 		xmlFile.load(is2);
  
  		XmlElement toolbar = xmlFile.getRoot().getElement("/toolbar");