Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/helper
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17803/src/java/net/sf/tails/swing/helper
Modified Files:
CompleteReportGenerator.java
Log Message:
Index: CompleteReportGenerator.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/helper/CompleteReportGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CompleteReportGenerator.java 10 Oct 2007 19:04:48 -0000 1.1
--- CompleteReportGenerator.java 11 Oct 2007 00:17:50 -0000 1.2
***************
*** 55,65 ****
HSSFWorkbook workbook = xlsGenerator.generate(report, criteria, period, charts);
! FileOutputStream fileOut = new FileOutputStream(filePath + "/" + fileName);
workbook.write(fileOut);
fileOut.close();
- for (File file : charts) {
- file.delete();
- }
} catch (Exception e) {
e.printStackTrace();
--- 55,62 ----
HSSFWorkbook workbook = xlsGenerator.generate(report, criteria, period, charts);
! FileOutputStream fileOut = new FileOutputStream(filePath + File.separatorChar + fileName);
workbook.write(fileOut);
fileOut.close();
} catch (Exception e) {
e.printStackTrace();
***************
*** 72,79 ****
final ReportHTMLGenerator generator = new ReportHTMLGenerator();
! final String reportDir = filePath + "/" + fileName;
! final String styleDir = reportDir + "/style";
! final String chartDir = reportDir + "/Charts";
! final String decisionDir = reportDir + "/Decisions";
final List<String> urls = new ArrayList<String>();
new Thread(new Runnable() {
--- 69,77 ----
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";
! final String decisionDir = reportDir + File.separatorChar + "Decisions";
final List<String> urls = new ArrayList<String>();
new Thread(new Runnable() {
***************
*** 110,116 ****
private void createStyle(String styleDir) throws IOException {
! File inputFile = new File(folderBundle.getString("STYLE_DIR") + "/style.css");
! File outputFile = new File(styleDir + "/style.css");
!
FileReader in = new FileReader(inputFile);
FileWriter out = new FileWriter(outputFile);
--- 108,113 ----
private void createStyle(String styleDir) throws IOException {
! File inputFile = new File(folderBundle.getString("STYLE_DIR")+ File.separatorChar + "style.css");
! File outputFile = new File(styleDir + File.separatorChar + "style.css");
FileReader in = new FileReader(inputFile);
FileWriter out = new FileWriter(outputFile);
***************
*** 125,129 ****
private File createHTML(String name, StringBuffer html, String directory) throws FileNotFoundException {
! String htmlPath = directory + "/" + name;
File reportHtml = new File(htmlPath);
OutputStream out = new BufferedOutputStream(new FileOutputStream(reportHtml));
--- 122,126 ----
private File createHTML(String name, StringBuffer html, String directory) throws FileNotFoundException {
! String htmlPath = directory + File.separatorChar + name;
File reportHtml = new File(htmlPath);
OutputStream out = new BufferedOutputStream(new FileOutputStream(reportHtml));
***************
*** 139,143 ****
TimeSeries timeSeries = decision.getSeries();
List<Indicator<? extends Number>> indicators;
! String imagePath = chartDir + "/" + decision.getFileName() + ".png";
Indicator<Double> close = new ClosePriceIndicator(timeSeries);
--- 136,140 ----
TimeSeries timeSeries = decision.getSeries();
List<Indicator<? extends Number>> indicators;
! String imagePath = chartDir + File.separatorChar + decision.getFileName() + ".png";
Indicator<Double> close = new ClosePriceIndicator(timeSeries);
***************
*** 159,163 ****
Indicator<Double> close = new ClosePriceIndicator(timeSeries);
CashFlow cashflow = new CashFlow(timeSeries, report.getAllTrades());
! String imagePath = chartDir + "/" + report.getFileName() + ".png";
StockAndCashFlowDataset stockData = new StockAndCashFlowDataset(timeSeries, close, cashflow, period);
StockAndCashFlowChart stockChart = new StockAndCashFlowChart(stockData, false);
--- 156,160 ----
Indicator<Double> close = new ClosePriceIndicator(timeSeries);
CashFlow cashflow = new CashFlow(timeSeries, report.getAllTrades());
! String imagePath = chartDir + File.separatorChar + report.getFileName() + ".png";
StockAndCashFlowDataset stockData = new StockAndCashFlowDataset(timeSeries, close, cashflow, period);
StockAndCashFlowChart stockChart = new StockAndCashFlowChart(stockData, false);
|
