Menu
▾
▴
[Tail-cvs] Tail/src/java/net/sf/tail/report/xls ReportXlsGenerator.java, 1.9 CompleteXlsGenerator.java, 1.14 TimeSeriesXlsGenerator.java, 1.3 SliceXlsGenerator.java, 1.9
|
From: xanaot <xa...@us...> - 2007-10-03 23:56:59
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9108/src/java/net/sf/tail/report/xls Modified Files: ReportXlsGenerator.java CompleteXlsGenerator.java TimeSeriesXlsGenerator.java SliceXlsGenerator.java Log Message: Refatoração na geração e imagens e criação de LOG Index: CompleteXlsGenerator.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls/CompleteXlsGenerator.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** CompleteXlsGenerator.java 3 Oct 2007 19:59:55 -0000 1.13 --- CompleteXlsGenerator.java 3 Oct 2007 23:56:58 -0000 1.14 *************** *** 23,28 **** } ! public HSSFWorkbook generate(Report report, List<AnalysisCriterion> criteria, Period period) ! throws IOException { HSSFWorkbook workbook = new HSSFWorkbook(); --- 23,27 ---- } ! public HSSFWorkbook generate(Report report, List<AnalysisCriterion> criteria, Period period) throws IOException { HSSFWorkbook workbook = new HSSFWorkbook(); *************** *** 30,42 **** XLSReportGenerator slicerXls = new SliceXlsGenerator(workbook); TimeSeriesXlsGenerator seriesXls = new TimeSeriesXlsGenerator(workbook); ! List<AnalysisCriterion> criteria2 = new ArrayList<AnalysisCriterion>(); criteria2 = criteria; ! criteria2.add(0,report.getApplyedCriterion()); ! seriesXls.generate(report); reportXls.generate(report, criteria, period); slicerXls.generate(report, criteria2, period); ! return workbook; } --- 29,41 ---- XLSReportGenerator slicerXls = new SliceXlsGenerator(workbook); TimeSeriesXlsGenerator seriesXls = new TimeSeriesXlsGenerator(workbook); ! List<AnalysisCriterion> criteria2 = new ArrayList<AnalysisCriterion>(); criteria2 = criteria; ! criteria2.add(0, report.getApplyedCriterion()); ! seriesXls.generate(report); reportXls.generate(report, criteria, period); slicerXls.generate(report, criteria2, period); ! return workbook; } Index: TimeSeriesXlsGenerator.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls/TimeSeriesXlsGenerator.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TimeSeriesXlsGenerator.java 3 Oct 2007 19:59:55 -0000 1.2 --- TimeSeriesXlsGenerator.java 3 Oct 2007 23:56:58 -0000 1.3 *************** *** 8,11 **** --- 8,12 ---- import net.sf.tail.report.Report; + import org.apache.log4j.Logger; import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFCellStyle; *************** *** 25,28 **** --- 26,31 ---- private CellStylist stylist; + private static final Logger LOG = Logger.getLogger(TimeSeriesXlsGenerator.class); + public TimeSeriesXlsGenerator(HSSFWorkbook workbook) { this.sheet = workbook.createSheet("Time Series"); *************** *** 31,34 **** --- 34,38 ---- public HSSFSheet generate(Report report) throws IOException { + LOG.info("Initializing Time Series Generator"); int row = INDEX_FIRST_ROW; *************** *** 42,47 **** generateInternalRow(row, series, style); ! stylist.rearrangeSheet(sheet, 10); return this.sheet; } --- 46,52 ---- generateInternalRow(row, series, style); ! stylist.rearrangeSheet(sheet, 11); + LOG.info("Ending Time Series Generator"); return this.sheet; } *************** *** 61,64 **** --- 66,70 ---- createCell(rowHeader, "Quantidade", (short) columnIndex++, style); + LOG.info("Header created"); return firtRow; } *************** *** 66,69 **** --- 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); *************** *** 95,98 **** --- 102,106 ---- createCell(row, tick.getVolume(), (short) indexcolumn++, style); createCell(row, tick.getTrades(), (short) indexcolumn++, style); + LOG.info("Ending Internal rows"); } Index: SliceXlsGenerator.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls/SliceXlsGenerator.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** SliceXlsGenerator.java 3 Oct 2007 19:59:55 -0000 1.8 --- SliceXlsGenerator.java 3 Oct 2007 23:56:59 -0000 1.9 *************** *** 15,18 **** --- 15,19 ---- import net.sf.tail.report.ReportImage; + import org.apache.log4j.Logger; import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFCellStyle; *************** *** 29,35 **** protected static final int INDEX_FIRST_ROW = 18; ! protected static final String FM_REPORT_DIR = "reports/"; ! protected static final String FM_CHART_DIR = "PNGCharts/"; private HSSFWorkbook workbook; --- 30,36 ---- protected static final int INDEX_FIRST_ROW = 18; ! protected static final String FM_REPORT_DIR = "reports" + File.separatorChar; ! protected static final String FM_CHART_DIR = "PNGCharts" + File.separatorChar; private HSSFWorkbook workbook; *************** *** 37,40 **** --- 38,43 ---- private CellStylist stylist; + private static final Logger LOG = Logger.getLogger(SliceXlsGenerator.class); + public SliceXlsGenerator(HSSFWorkbook workbook) { this.workbook = workbook; *************** *** 53,56 **** --- 56,60 ---- public List<HSSFSheet> generate(Decision decision, List<AnalysisCriterion> criteria, Period period) throws IOException { + LOG.info("Initializing Generator for" + decision.getFileName()); int row = INDEX_FIRST_ROW; ReportImage image = new ReportImage(); *************** *** 70,77 **** File reportPNG = image.generateImage(decision); stylist.drawImage(reportPNG, sheet, 1, 7); ! stylist.rearrangeSheet(sheet, criteria.size() + 6); sheets.add(sheet); return sheets; } --- 74,83 ---- File reportPNG = image.generateImage(decision); stylist.drawImage(reportPNG, sheet, 1, 7); ! reportPNG.delete(); ! stylist.rearrangeSheet(sheet, criteria.size() + 6); sheets.add(sheet); + LOG.info("Ending generator"); return sheets; } *************** *** 98,101 **** --- 104,108 ---- createCell(rowHeader, criterium.getClass().getSimpleName(), (short) columnIndex++, style); } + LOG.info("Header created"); return firtRow; } *************** *** 103,107 **** private int generateInternalRow(int firtRow, HSSFWorkbook wb, HSSFSheet sheet, Decision decision, List<AnalysisCriterion> criteria, HSSFCellStyle style) { ! double calculate; int index = firtRow - INDEX_FIRST_ROW; --- 110,114 ---- 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; *************** *** 110,115 **** HSSFRow rowDecision = sheet.createRow((short) firtRow++); createCell(rowDecision, index++, (short) indexcolumn++, style); ! if(trade.getEntry().getType() == OperationType.BUY) ! { createCell(rowDecision, decision.getSeries().getTick(trade.getEntry().getIndex()).getDateName(), (short) indexcolumn++, style); --- 117,121 ---- HSSFRow rowDecision = sheet.createRow((short) firtRow++); createCell(rowDecision, index++, (short) indexcolumn++, style); ! if (trade.getEntry().getType() == OperationType.BUY) { createCell(rowDecision, decision.getSeries().getTick(trade.getEntry().getIndex()).getDateName(), (short) indexcolumn++, style); *************** *** 120,126 **** createCell(rowDecision, decision.getSeries().getTick(trade.getExit().getIndex()).getClosePrice(), (short) indexcolumn++, style); ! } ! else ! { createCell(rowDecision, decision.getSeries().getTick(trade.getExit().getIndex()).getDateName(), (short) indexcolumn++, style); --- 126,130 ---- createCell(rowDecision, decision.getSeries().getTick(trade.getExit().getIndex()).getClosePrice(), (short) indexcolumn++, style); ! } else { createCell(rowDecision, decision.getSeries().getTick(trade.getExit().getIndex()).getDateName(), (short) indexcolumn++, style); *************** *** 130,134 **** (short) indexcolumn++, style); createCell(rowDecision, decision.getSeries().getTick(trade.getEntry().getIndex()).getClosePrice(), ! (short) indexcolumn++, style); } for (AnalysisCriterion criterium : criteria) { --- 134,138 ---- (short) indexcolumn++, style); createCell(rowDecision, decision.getSeries().getTick(trade.getEntry().getIndex()).getClosePrice(), ! (short) indexcolumn++, style); } for (AnalysisCriterion criterium : criteria) { *************** *** 137,140 **** --- 141,145 ---- } } + LOG.info("Ending Internal rows"); return firtRow; } *************** *** 158,161 **** --- 163,167 ---- createCell(rowLast, calculate, (short) indexcolumn++, style); } + LOG.info("Created summary"); } Index: ReportXlsGenerator.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls/ReportXlsGenerator.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ReportXlsGenerator.java 3 Oct 2007 19:59:55 -0000 1.8 --- ReportXlsGenerator.java 3 Oct 2007 23:56:58 -0000 1.9 *************** *** 70,74 **** File reportPNG = image.generateImage(report, period); stylist.drawImage(reportPNG, sheet, 1, 5); ! stylist.rearrangeSheet(sheet, criteria.size() + 5); --- 70,74 ---- File reportPNG = image.generateImage(report, period); stylist.drawImage(reportPNG, sheet, 1, 5); ! reportPNG.delete(); stylist.rearrangeSheet(sheet, criteria.size() + 5); *************** *** 156,160 **** createCell(rowLast, calculate, (short) indexcolumn++, style); } ! LOG.info("created summary"); } --- 156,160 ---- createCell(rowLast, calculate, (short) indexcolumn++, style); } ! LOG.info("Created summary"); } |
