[Jpodder-develop] jPodder3/jpodder/src/java/com/jpodder/ui/swt/directory DirectoryController.java, 1.4, 1.5 InstructionParser.java, 1.4, 1.5

[Christophe B. <dz...@us...>]

Update of /cvsroot/jpodder/jPodder3/jpodder/src/java/com/jpodder/ui/swt/directory
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16676/jpodder/src/java/com/jpodder/ui/swt/directory

Modified Files:
	DirectoryController.java InstructionParser.java 
Log Message:


Index: DirectoryController.java
===================================================================
RCS file: /cvsroot/jpodder/jPodder3/jpodder/src/java/com/jpodder/ui/swt/directory/DirectoryController.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DirectoryController.java	20 May 2006 20:35:30 -0000	1.4
--- DirectoryController.java	17 Jun 2006 10:43:18 -0000	1.5
***************
*** 102,106 ****
  		
  		// 1. Is the status text XML (RPC response?)
! 		if (lParser.parse(lText)) {
  			lPreviousText = lText;
  			String lOutputText = lParser.getOutput();
--- 102,106 ----
  		
  		// 1. Is the status text XML (RPC response?)
! 		if (lText.startsWith("<") && lParser.parse(lText)) {
  			lPreviousText = lText;
  			String lOutputText = lParser.getOutput();

Index: InstructionParser.java
===================================================================
RCS file: /cvsroot/jpodder/jPodder3/jpodder/src/java/com/jpodder/ui/swt/directory/InstructionParser.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** InstructionParser.java	28 May 2006 08:29:53 -0000	1.4
--- InstructionParser.java	17 Jun 2006 10:43:18 -0000	1.5
***************
*** 2,6 ****
--- 2,8 ----
  
  import java.io.ByteArrayOutputStream;
+ import java.io.DataOutputStream;
  import java.io.File;
+ import java.io.FileOutputStream;
  import java.io.IOException;
  import java.io.InputStreamReader;
***************
*** 99,113 ****
  		}
  
! 		StringBufferInputStream lReader = new StringBufferInputStream(
  				pInstruction);
! 		InputStreamReader inputStreamReader;
  		try {
! 			inputStreamReader = new InputStreamReader(lReader, "ISO-8859-1");
  			SAXBuilder builder = new SAXBuilder();
  			builder.setErrorHandler(this);
  			String lEncoding = "UTF-16";
- 			// String lEncoding = "ISO-8859-1";
  
! 			Document doc = builder.build(inputStreamReader);
  			File lStylesheet = new File(XSL_PATH);
  			if (lStylesheet.exists()) {
--- 101,115 ----
  		}
  
! 		StringBufferInputStream lInputStream = new StringBufferInputStream(
  				pInstruction);
! 		InputStreamReader lReader;
  		try {
! 			// String lEncoding = "ISO-8859-1";
! 			lReader = new InputStreamReader(lInputStream, "ISO-8859-1");
  			SAXBuilder builder = new SAXBuilder();
  			builder.setErrorHandler(this);
  			String lEncoding = "UTF-16";
  
! 			Document doc = builder.build(lReader);
  			File lStylesheet = new File(XSL_PATH);
  			if (lStylesheet.exists()) {
***************
*** 132,141 ****
  
  				// CB TODO Debug code, remove later.
! 				// DataOutputStream dos= new DataOutputStream(new
! 				// FileOutputStream(File.createTempFile("_test", ".xml")));
! 				// OutputStreamWriter osw=new OutputStreamWriter(dos,"UTF-16") ;
! 				// osw.write(mParseOut,0,mParseOut.length() );
! 				// osw.close();
! 				// dos.close();
  
  				return true;
--- 134,143 ----
  
  				// CB TODO Debug code, remove later.
! 				 DataOutputStream dos= new DataOutputStream(new
! 				 FileOutputStream(File.createTempFile("_test", ".xml")));
! 				 OutputStreamWriter osw=new OutputStreamWriter(dos,"UTF-16") ;
! 				 osw.write(mParseOut,0,mParseOut.length() );
! 				 osw.close();
! 				 dos.close();
  
  				return true;
***************
*** 147,152 ****
  		} catch (JDOMException e) {
  			// It's not XML, but that's OK.
! 			
! //			mLog.warn("JDOM error: " + e.getMessage());
  		} catch (IOException e) {
  			mLog.warn("IO Error:" + e.getMessage());
--- 149,153 ----
  		} catch (JDOMException e) {
  			// It's not XML, but that's OK.
! 			// mLog.warn("JDOM error: " + e.getMessage());
  		} catch (IOException e) {
  			mLog.warn("IO Error:" + e.getMessage());