[Babeldoc-devel] babeldoc/modules/jfreereports/src/com/babeldoc/jfreereports/pipeline/stage JFRPipelineStage.java,1.1.2.5,1.1.2.6

[<mic...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/jfreereports/src/com/babeldoc/jfreereports/pipeline/stage
In directory sc8-pr-cvs1:/tmp/cvs-serv32146/modules/jfreereports/src/com/babeldoc/jfreereports/pipeline/stage

Modified Files:
      Tag: TEMP_MIKEA
	JFRPipelineStage.java 
Log Message:
Got the file loading right

Index: JFRPipelineStage.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/jfreereports/src/com/babeldoc/jfreereports/pipeline/stage/Attic/JFRPipelineStage.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -d -r1.1.2.5 -r1.1.2.6
*** JFRPipelineStage.java	26 Nov 2003 08:39:39 -0000	1.1.2.5
--- JFRPipelineStage.java	26 Nov 2003 13:24:30 -0000	1.1.2.6
***************
*** 83,86 ****
--- 83,87 ----
  import com.babeldoc.utils.XMLTableModel;
  
+ import java.io.BufferedInputStream;
  import java.io.IOException;
  import java.io.File;
***************
*** 236,241 ****
  				URL urlReportDefinitionUrl;
  				try {
! 					urlReportDefinitionUrl = new URL(strReportDefinitionUrl);
! 					xmlReportDefinition = (String) urlReportDefinitionUrl.getContent();
  				} catch (java.net.MalformedURLException e) {
  					throw new PipelineException(I18n.get("jfr.102"), e);
--- 237,247 ----
  				URL urlReportDefinitionUrl;
  				try {
! 					File file = new File(strReportDefinitionUrl);
! 					BufferedInputStream in = new BufferedInputStream(new FileInputStream(file));
! 					byte[] b = new byte[in.available()];
! 					in.read(b, 0, b.length);
! 					String s = new String(b, 0, b.length);
! 					in.close();
! 					xmlReportDefinition = s;
  				} catch (java.net.MalformedURLException e) {
  					throw new PipelineException(I18n.get("jfr.102"), e);
***************
*** 261,271 ****
  				URL urlReportDefinitionUrl;
  				try {
! 					urlReportDefinitionUrl = new URL(strReportDefinitionUrl);
! 					StringWriter sw = new StringWriter();
! 					FileInputStream fis = (FileInputStream) urlReportDefinitionUrl.getContent();
! 					
! 					xmlReportDefinition = 
! 					log.logInfo(urlReportDefinitionUrl.getContent().getClass().getName());
! 					log.logDebug("Report definition URL found in stage options");
  				} catch (java.net.MalformedURLException e) {
  					throw new PipelineException(I18n.get("jfr.102"), e);
--- 267,277 ----
  				URL urlReportDefinitionUrl;
  				try {
! 					File file = new File(strReportDefinitionUrl);
! 					BufferedInputStream in = new BufferedInputStream(new FileInputStream(file));
! 					byte[] b = new byte[in.available()];
! 					in.read(b, 0, b.length);
! 					String s = new String(b, 0, b.length);
! 					in.close();
! 					xmlReportDefinition = s;
  				} catch (java.net.MalformedURLException e) {
  					throw new PipelineException(I18n.get("jfr.102"), e);