[Tail-cvs] TailS/src/java/net/sf/tails/swing/helper CompleteReportGenerator.java, 1.6

[xanaot <xa...@us...>]

Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/helper
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9440/src/java/net/sf/tails/swing/helper

Modified Files:
	CompleteReportGenerator.java 
Log Message:
Acerto na Thread

Index: CompleteReportGenerator.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/helper/CompleteReportGenerator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CompleteReportGenerator.java	17 Oct 2007 18:32:33 -0000	1.5
--- CompleteReportGenerator.java	17 Oct 2007 21:45:58 -0000	1.6
***************
*** 57,61 ****
  					try {
  						index.updateReportProgress(0);
! 						double percent = 44d / report.getDecisions().size();
  						for (Decision decision : report.getDecisions()) {
  							charts.add(generateImage(decision, filePath));
--- 57,61 ----
  					try {
  						index.updateReportProgress(0);
! 						double percent = 44 / report.getDecisions().size();
  						for (Decision decision : report.getDecisions()) {
  							charts.add(generateImage(decision, filePath));
***************
*** 71,78 ****
--- 71,83 ----
  						index.updateReportProgress(100);
  						
+ 						
  					} catch (Exception e) {
  						e.printStackTrace();
  						JOptionPane.showMessageDialog(null, e.getMessage(), "Error", 0);
  					}
+ 					finally
+ 					{
+ 						System.exit(0);
+ 					}
  				}}).start();
  	}
***************
*** 90,94 ****
  			public void run() {
  				index.updateReportProgress(0);
! 				double percent = 43d / report.getDecisions().size();
  				new File(reportDir).mkdir();
  				new File(styleDir).mkdir();
--- 95,99 ----
  			public void run() {
  				index.updateReportProgress(0);
! 				double percent = 43 / report.getDecisions().size();
  				new File(reportDir).mkdir();
  				new File(styleDir).mkdir();
***************
*** 119,122 ****
--- 124,131 ----
  					JOptionPane.showMessageDialog(null, e.getMessage(), "Error", 0);
  				}
+ 				finally
+ 				{
+ 					System.exit(0);
+ 				}
  			}
  		}).start();
***************
*** 149,153 ****
  	
  	public File generateImage(Decision decision, String chartDir) throws IOException {
! 		LOG.info("Initializing image generator for " + decision.getFileName());
  		index.appendConsoleArea("Initializing image generator for " + decision.getFileName() + ".");
  		TimeSeries timeSeries = decision.getSeries();
--- 158,163 ----
  	
  	public File generateImage(Decision decision, String chartDir) throws IOException {
! 		LOG.info("Initializing image generator for Decison " + decision.getFileName());
! 		long time = System.currentTimeMillis();
  		index.appendConsoleArea("Initializing image generator for " + decision.getFileName() + ".");
  		TimeSeries timeSeries = decision.getSeries();
***************
*** 164,174 ****
  		File reportPNG = new File(imagePath);
  		ChartUtilities.saveChartAsPNG(reportPNG, jfreechart, 800, 300);
! 		LOG.info("Ending image generator");
! 		index.appendConsoleArea("Ending image generator.");
  		return reportPNG;
  	}
  
  	public File generateImage(Report report, Period period, String chartDir) throws IOException {
! 		LOG.info("Initializing image generator for " + report.getFileName());
  		index.appendConsoleArea("Initializing image generator for " + report.getFileName() + ".");
  		TimeSeries timeSeries = report.getSlicer().getSeries();
--- 174,185 ----
  		File reportPNG = new File(imagePath);
  		ChartUtilities.saveChartAsPNG(reportPNG, jfreechart, 800, 300);
! 		LOG.info("Image of the Decision " + decision.getFileName() + " generated (" + (System.currentTimeMillis() - time) + " miliseconds)");
! 		index.appendConsoleArea("Image of the Decision " + decision.getFileName() + " generated (" + (System.currentTimeMillis() - time) + " miliseconds)");
  		return reportPNG;
  	}
  
  	public File generateImage(Report report, Period period, String chartDir) throws IOException {
! 		LOG.info("Initializing image generator for Report " + report.getFileName());
! 		long time = System.currentTimeMillis();
  		index.appendConsoleArea("Initializing image generator for " + report.getFileName() + ".");
  		TimeSeries timeSeries = report.getSlicer().getSeries();
***************
*** 181,186 ****
  		File reportPNG = new File(imagePath);
  		ChartUtilities.saveChartAsPNG(reportPNG, jfreechart, 800, 300);
! 		LOG.info("Ending image generator");
! 		index.appendConsoleArea("Ending image generator.");
  		
  		return reportPNG;
--- 192,197 ----
  		File reportPNG = new File(imagePath);
  		ChartUtilities.saveChartAsPNG(reportPNG, jfreechart, 800, 300);
! 		LOG.info("Image of the Report " + report.getFileName() + " generated (" + (System.currentTimeMillis() - time) + " miliseconds)");
! 		index.appendConsoleArea("Image of the Report " + report.getFileName() + " generated (" + (System.currentTimeMillis() - time) + " miliseconds)");
  		
  		return reportPNG;