|
From: xanaot <xa...@us...> - 2007-10-17 21:40:51
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7305/src/java/net/sf/tail/report/xls Modified Files: WorkbookGenerator.java ReportXlsGenerator.java TimeSeriesXlsGenerator.java SliceXlsGenerator.java Log Message: Melhorando o logging do XLS Index: TimeSeriesXlsGenerator.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls/TimeSeriesXlsGenerator.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TimeSeriesXlsGenerator.java 3 Oct 2007 23:56:58 -0000 1.3 --- TimeSeriesXlsGenerator.java 17 Oct 2007 21:40:53 -0000 1.4 *************** *** 35,38 **** --- 35,39 ---- public HSSFSheet generate(Report report) throws IOException { LOG.info("Initializing Time Series Generator"); + long time = System.currentTimeMillis(); int row = INDEX_FIRST_ROW; *************** *** 48,52 **** stylist.rearrangeSheet(sheet, 11); ! LOG.info("Ending Time Series Generator"); return this.sheet; } --- 49,55 ---- stylist.rearrangeSheet(sheet, 11); ! ! LOG.info("Time Series generated (" + (System.currentTimeMillis() - time )+ " miliseconds)"); ! return this.sheet; } *************** *** 72,76 **** private void generateInternalRow(int firtRow, TimeSeries series, HSSFCellStyle style) { int i; ! LOG.info("Initializing Internal rows"); for (i = series.getBegin(); i < series.getEnd(); i++) { Tick tick = series.getTick(i); --- 75,80 ---- private void generateInternalRow(int firtRow, TimeSeries series, HSSFCellStyle style) { int i; ! LOG.info("Initializing Internal rows of the Time Series"); ! long time = System.currentTimeMillis(); for (i = series.getBegin(); i < series.getEnd(); i++) { Tick tick = series.getTick(i); *************** *** 102,106 **** createCell(row, tick.getVolume(), (short) indexcolumn++, style); createCell(row, tick.getTrades(), (short) indexcolumn++, style); ! LOG.info("Ending Internal rows"); } --- 106,111 ---- createCell(row, tick.getVolume(), (short) indexcolumn++, style); createCell(row, tick.getTrades(), (short) indexcolumn++, style); ! ! LOG.info("Ending Internal of the Time Series (" + (System.currentTimeMillis() - time) + " miliseconds)"); } Index: SliceXlsGenerator.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls/SliceXlsGenerator.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** SliceXlsGenerator.java 10 Oct 2007 19:04:10 -0000 1.10 --- SliceXlsGenerator.java 17 Oct 2007 21:40:53 -0000 1.11 *************** *** 55,59 **** public List<HSSFSheet> generate(Decision decision, List<AnalysisCriterion> criteria, Period period, File chart) throws IOException { ! LOG.info("Initializing Generator for" + decision.getFileName()); int row = INDEX_FIRST_ROW; --- 55,60 ---- public List<HSSFSheet> generate(Decision decision, List<AnalysisCriterion> criteria, Period period, File chart) throws IOException { ! LOG.info("Initializing XLS Decision for " + decision.getFileName()); ! long time = System.currentTimeMillis(); int row = INDEX_FIRST_ROW; *************** *** 75,79 **** sheets.add(sheet); ! LOG.info("Ending generator"); return sheets; } --- 76,81 ---- sheets.add(sheet); ! ! LOG.info("Decision "+ decision.getFileName() +" generated (" + (System.currentTimeMillis() - time) + " miliseconds)"); return sheets; } *************** *** 106,110 **** private int generateInternalRow(int firtRow, HSSFWorkbook wb, HSSFSheet sheet, Decision decision, List<AnalysisCriterion> criteria, HSSFCellStyle style) { ! LOG.info("Initializing Internal rows"); double calculate; int index = firtRow - INDEX_FIRST_ROW; --- 108,113 ---- private int generateInternalRow(int firtRow, HSSFWorkbook wb, HSSFSheet sheet, Decision decision, List<AnalysisCriterion> criteria, HSSFCellStyle style) { ! LOG.info("Initializing Internal rows of the Decision " + decision.getFileName()); ! long time = System.currentTimeMillis(); double calculate; int index = firtRow - INDEX_FIRST_ROW; *************** *** 137,141 **** } } ! LOG.info("Ending Internal rows"); return firtRow; } --- 140,145 ---- } } ! ! LOG.info("Ending Internal rows of the Decision " + decision.getFileName() + " (" + (System.currentTimeMillis() - time) + " miliseconds)"); return firtRow; } *************** *** 159,163 **** createCell(rowLast, calculate, (short) indexcolumn++, style); } ! LOG.info("Created summary"); } --- 163,167 ---- createCell(rowLast, calculate, (short) indexcolumn++, style); } ! LOG.info("Summary created"); } Index: WorkbookGenerator.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls/WorkbookGenerator.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** WorkbookGenerator.java 11 Oct 2007 00:17:20 -0000 1.2 --- WorkbookGenerator.java 17 Oct 2007 21:40:53 -0000 1.3 *************** *** 12,15 **** --- 12,16 ---- import net.sf.tail.report.Report; + import org.apache.log4j.Logger; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.joda.time.Period; *************** *** 17,20 **** --- 18,23 ---- public class WorkbookGenerator { + private static final Logger LOG = Logger.getLogger(WorkbookGenerator.class); + public HSSFWorkbook generate(Report report, Period period, List<File> charts) throws IOException { List<AnalysisCriterion> criteria = new LinkedList<AnalysisCriterion>(); *************** *** 24,28 **** } ! public HSSFWorkbook generate(Report report, List<AnalysisCriterion> criteria, Period period, List<File> charts) throws IOException { List<File> chartFile = new ArrayList<File>(); chartFile.add(charts.remove(0)); --- 27,35 ---- } ! public HSSFWorkbook generate(Report report, List<AnalysisCriterion> criteria, Period period, List<File> charts) ! throws IOException { ! long time = System.currentTimeMillis(); ! LOG.info("Initializing the generation of the XLS"); ! List<File> chartFile = new ArrayList<File>(); chartFile.add(charts.remove(0)); *************** *** 39,43 **** reportXls.generate(report, criteria, period, chartFile); slicerXls.generate(report, criteria2, period, charts); ! for (File file : charts) { file.delete(); --- 46,50 ---- reportXls.generate(report, criteria, period, chartFile); slicerXls.generate(report, criteria2, period, charts); ! for (File file : charts) { file.delete(); *************** *** 47,50 **** --- 54,58 ---- } + LOG.info("XLS generated (" + (System.currentTimeMillis() - time) + " miliseconds)"); return workbook; } Index: ReportXlsGenerator.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls/ReportXlsGenerator.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ReportXlsGenerator.java 10 Oct 2007 19:04:10 -0000 1.10 --- ReportXlsGenerator.java 17 Oct 2007 21:40:53 -0000 1.11 *************** *** 30,34 **** private CellStylist stylist; ! private static final Logger LOG = Logger.getLogger(ReportXlsGenerator.class); --- 30,34 ---- private CellStylist stylist; ! private static final Logger LOG = Logger.getLogger(ReportXlsGenerator.class); *************** *** 47,52 **** } ! public List<HSSFSheet> generate(Report report, List<AnalysisCriterion> criteria, Period period, List<File> charts) throws IOException { ! LOG.info("Initializing Report Generator"); int row = INDEX_FIRST_ROW; --- 47,54 ---- } ! public List<HSSFSheet> generate(Report report, List<AnalysisCriterion> criteria, Period period, List<File> charts) ! throws IOException { ! LOG.info("Initializing XLS Report"); ! long time = System.currentTimeMillis(); int row = INDEX_FIRST_ROW; *************** *** 71,75 **** sheets.add(sheet); ! LOG.info("Ending Report Generator"); return sheets; } --- 73,77 ---- sheets.add(sheet); ! LOG.info("XLS Report generated (" + (System.currentTimeMillis() - time) + " miliseconds)"); return sheets; } *************** *** 104,109 **** createCell(rowFirst, " - ", (short) indexcolumn++, style); ! for (int i=0; i < criteria.size(); i++) ! { createCell(rowFirst, " - ", (short) indexcolumn++, style); } --- 106,110 ---- createCell(rowFirst, " - ", (short) indexcolumn++, style); ! for (int i = 0; i < criteria.size(); i++) { createCell(rowFirst, " - ", (short) indexcolumn++, style); } *************** *** 114,118 **** private int generateInternalRow(int firtRow, HSSFSheet sheet, Report report, List<AnalysisCriterion> criteria, HSSFCellStyle style) { ! LOG.info("Initializing Internal rows"); double calculate; int index = firtRow - INDEX_FIRST_ROW; --- 115,120 ---- private int generateInternalRow(int firtRow, HSSFSheet sheet, Report report, List<AnalysisCriterion> criteria, HSSFCellStyle style) { ! LOG.info("Initializing Internal rows of the Report"); ! long time = System.currentTimeMillis(); double calculate; int index = firtRow - INDEX_FIRST_ROW; *************** *** 120,124 **** int indexcolumn = 1; HSSFRow rowDecision = sheet.createRow((short) firtRow++); ! createCell(rowDecision, index++, (short) indexcolumn++, style); createCell(rowDecision, decision.getSeries().getTick(decision.getSeries().getBegin()).getDateName(), --- 122,126 ---- int indexcolumn = 1; HSSFRow rowDecision = sheet.createRow((short) firtRow++); ! createCell(rowDecision, index++, (short) indexcolumn++, style); createCell(rowDecision, decision.getSeries().getTick(decision.getSeries().getBegin()).getDateName(), *************** *** 132,136 **** } } ! LOG.info("Ending Internal rows"); return firtRow; } --- 134,138 ---- } } ! LOG.info("Ending Internal rows of the Report (" + (System.currentTimeMillis() - time) + " miliseconds)"); return firtRow; } *************** *** 153,157 **** createCell(rowLast, calculate, (short) indexcolumn++, style); } ! LOG.info("Created summary"); } --- 155,159 ---- createCell(rowLast, calculate, (short) indexcolumn++, style); } ! LOG.info("Summary created"); } |