[Tail-cvs] TailS/src/java/net/sf/tails/swing/helper MyTabelModel.java, 1.1 CompleteReportGenerator.java, 1.3 FrameHelper.java, 1.18

[Carlos <ma...@us...>]

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

Modified Files:
	CompleteReportGenerator.java FrameHelper.java 
Added Files:
	MyTabelModel.java 
Log Message:
Atualização de tela... Criado console e progressbar e ajustes de detalhes na table do stock analysis.

--- NEW FILE: MyTabelModel.java ---
package net.sf.tails.swing.helper;

import javax.swing.table.AbstractTableModel;

   class MyTableModel extends AbstractTableModel {  

	private static final long serialVersionUID = 3617540321014880366L;

	private Object[][] data;  
	private String[] columnNames;
       
      public MyTableModel(Object [][] data, String[] columnNames)  
      {  
        this.data = data;  
        this.columnNames = columnNames;
      }   
       
           public int getColumnCount() {  
               return columnNames.length;  
           }  
     
           public int getRowCount() {  
               return data.length;  
           }  
     
           public String getColumnName(int col) {  
               return columnNames[col];  
           }  
     
           public Object getValueAt(int row, int col) {  
               return data[row][col];  
           }  
           
           public Class<?> getColumnClass(int c) {  
               return getValueAt(0, c).getClass();  
           }   
             
           public boolean isCellEditable(int row, int col) {  
               return false;      
           }  
        
           public void setValueAt(Object value, int row, int col) {  
                        data[row][col] = value;                
           }  
     
           @SuppressWarnings("unused")
		private void printDebugData() {  
               int numRows = getRowCount();  
               int numCols = getColumnCount();  
     
               for (int i=0; i < numRows; i++) {  
                   System.out.print("    row " + i + ":");  
                   for (int j=0; j < numCols; j++) {  
                       System.out.print("  " + data[i][j]);  
                   }  
               }  
           }  
       }  

Index: FrameHelper.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/helper/FrameHelper.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** FrameHelper.java	15 Oct 2007 16:14:24 -0000	1.17
--- FrameHelper.java	15 Oct 2007 20:09:35 -0000	1.18
***************
*** 17,21 ****
  import java.util.ResourceBundle;
  
- import javax.swing.table.DefaultTableModel;
  import javax.swing.table.TableModel;
  
--- 17,20 ----
***************
*** 148,152 ****
  	public TableModel getTableModel(StockAnalysis stockAnalysis)
  	{
! 		return new DefaultTableModel(getReportMatrix(stockAnalysis), getColumnNames(stockAnalysis));
  	}
  
--- 147,152 ----
  	public TableModel getTableModel(StockAnalysis stockAnalysis)
  	{
! 		TableModel table = new MyTableModel(getReportMatrix(stockAnalysis), getColumnNames(stockAnalysis));
! 		return table;
  	}
  

Index: CompleteReportGenerator.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/helper/CompleteReportGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CompleteReportGenerator.java	11 Oct 2007 00:17:50 -0000	1.2
--- CompleteReportGenerator.java	15 Oct 2007 20:09:35 -0000	1.3
***************
*** 29,32 ****
--- 29,33 ----
  import net.sf.tail.report.html.ReportHTMLGenerator;
  import net.sf.tail.report.xls.WorkbookGenerator;
+ import net.sf.tails.swing.frame.Index;
  
  import org.apache.log4j.Logger;
***************
*** 39,44 ****
  	private static final ResourceBundle folderBundle = ResourceBundle.getBundle("net.sf.tails.i18n.Folders");
  	private transient static Logger LOG = Logger.getLogger(CompleteReportGenerator.class);
  
! 	public  void generateXLSFile(final Report report, final List<AnalysisCriterion> criteria, final Period period, final String filePath, final String fileName){
  		final WorkbookGenerator xlsGenerator = new WorkbookGenerator();
  		
--- 40,51 ----
  	private static final ResourceBundle folderBundle = ResourceBundle.getBundle("net.sf.tails.i18n.Folders");
  	private transient static Logger LOG = Logger.getLogger(CompleteReportGenerator.class);
+ 	private Index index;
  
! 	public CompleteReportGenerator(Index index)
! 	{
! 		this.index = index;
! 	}
! 
! 	public void generateXLSFile(final Report report, final List<AnalysisCriterion> criteria, final Period period, final String filePath, final String fileName){
  		final WorkbookGenerator xlsGenerator = new WorkbookGenerator();
  		
***************
*** 49,56 ****
  				public void run() {
  					try {
  						for (Decision decision : report.getDecisions()) {
  							charts.add(generateImage(decision, filePath));
  						}
! 						charts.add(0, generateImage(report, period, filePath));					
  						
  						HSSFWorkbook workbook = xlsGenerator.generate(report, criteria, period, charts);
--- 56,67 ----
  				public void run() {
  					try {
+ 						index.updateReportProgress(0);
+ 						int percent = 44 / report.getDecisions().size();
  						for (Decision decision : report.getDecisions()) {
  							charts.add(generateImage(decision, filePath));
+ 							index.updateReportProgress(charts.size() * percent);
  						}
! 						charts.add(0, generateImage(report, period, filePath));
! 						index.updateReportProgress(84);
  						
  						HSSFWorkbook workbook = xlsGenerator.generate(report, criteria, period, charts);
***************
*** 58,61 ****
--- 69,73 ----
  						workbook.write(fileOut);
  						fileOut.close();
+ 						index.updateReportProgress(100);
  						
  					} catch (Exception e) {
***************
*** 70,74 ****
  		final ReportHTMLGenerator generator = new ReportHTMLGenerator();
  		final String reportDir = filePath + File.separatorChar + fileName;
- 		System.out.println(fileName+"----------");
  		final String styleDir = reportDir + File.separatorChar + "style";
  		final String chartDir = reportDir + File.separatorChar + "Charts";
--- 82,85 ----
***************
*** 78,81 ****
--- 89,94 ----
  
  			public void run() {
+ 				index.updateReportProgress(0);
+ 				int percent = 43 / report.getDecisions().size();
  				new File(reportDir).mkdir();
  				new File(styleDir).mkdir();
***************
*** 91,102 ****
--- 104,119 ----
  					StringBuffer decisionHtml = generator.generate(decision,
  							criteria, chartFile.getAbsolutePath());
+ 					index.updateReportProgress((urls.size() + 1) * percent);
  					File decisionFile = createHTML(decision.getFileName()
  							+ ".html", decisionHtml, decisionDir);
  					urls.add(decisionFile.getAbsolutePath());
+ 					index.updateReportProgress(urls.size() * percent + 1);
  				}
  				File reportChartFile = generateImage(report, period, chartDir);
+ 				index.updateReportProgress(98);
  				StringBuffer reportHtml = generator.generate(report, criteria,
  						reportChartFile.getAbsolutePath(), urls);
  				createHTML(report.getName() + ".html", reportHtml, reportDir);
+ 				index.updateReportProgress(100);
  				} catch (IOException e) {
  					e.printStackTrace();
***************
*** 134,137 ****
--- 151,155 ----
  	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();
  		List<Indicator<? extends Number>> indicators;
***************
*** 148,151 ****
--- 166,170 ----
  		ChartUtilities.saveChartAsPNG(reportPNG, jfreechart, 800, 300);
  		LOG.info("Ending image generator");
+ 		index.appendConsoleArea("Ending image generator.");
  		return reportPNG;
  	}
***************
*** 153,156 ****
--- 172,176 ----
  	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();
  		Indicator<Double> close = new ClosePriceIndicator(timeSeries);
***************
*** 163,166 ****
--- 183,187 ----
  		ChartUtilities.saveChartAsPNG(reportPNG, jfreechart, 800, 300);
  		LOG.info("Ending image generator");
+ 		index.appendConsoleArea("Ending image generator.");
  		
  		return reportPNG;