[Tail-cvs] TailS/src/java/net/sf/tails/swing/frame Index.java, 1.16

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

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

Modified Files:
	Index.java 
Log Message:
Consertado um problema que estava acontecendo ao dar load em um stock analysis 2 vezes...

Index: Index.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/Index.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Index.java	3 Oct 2007 21:10:19 -0000	1.15
--- Index.java	3 Oct 2007 22:59:04 -0000	1.16
***************
*** 306,310 ****
  								FrameHelper.generateFolders(folderBundle.getString("XLS_DIR"));
  								HSSFWorkbook workbook = xlsGenerator.generate(report, stockAnalysis.getAdditionalCriteria(), stockAnalysis.getSlicer().getPeriod());
! 								FileOutputStream fileOut = new FileOutputStream(xlsFileChooser.getSelectedFile().getAbsolutePath() + ".xls");
  								workbook.write(fileOut);
  								fileOut.close();
--- 306,315 ----
  								FrameHelper.generateFolders(folderBundle.getString("XLS_DIR"));
  								HSSFWorkbook workbook = xlsGenerator.generate(report, stockAnalysis.getAdditionalCriteria(), stockAnalysis.getSlicer().getPeriod());
! 				                String filePath = xlsFileChooser.getSelectedFile().getAbsolutePath();
! 				                if(!filePath.endsWith(".xls"))
! 				                {
! 				                	filePath += ".xls";
! 				                }
! 								FileOutputStream fileOut = new FileOutputStream(xlsFileChooser.getSelectedFile().getAbsolutePath());
  								workbook.write(fileOut);
  								fileOut.close();
***************
*** 379,389 ****
  
  	public void loadStockAnalysis(StockAnalysis analysis) {
! 		stockNameLabel.setText(stockNameLabel.getText() + analysis.getStock().getName());
! 		seriesIntervalLabel.setText(seriesIntervalLabel.getText() + analysis.getSlicer().getSeries().getTick(analysis.getSlicer().getSeries().getBegin()).getDateName() +
  														    " - " + analysis.getSlicer().getSeries().getTick(analysis.getSlicer().getSeries().getEnd()).getDateName());
- 		loadReports(analysis);
- 	}
- 	
- 	public void loadReports(StockAnalysis analysis) {	
  		reportTable.setVisible(true);
  		reportTable.setAutoCreateRowSorter(true);
--- 384,390 ----
  
  	public void loadStockAnalysis(StockAnalysis analysis) {
! 		stockNameLabel.setText("Stock Name: " + analysis.getStock().getName());
! 		seriesIntervalLabel.setText("Series Interval: " + analysis.getSlicer().getSeries().getTick(analysis.getSlicer().getSeries().getBegin()).getDateName() +
  														    " - " + analysis.getSlicer().getSeries().getTick(analysis.getSlicer().getSeries().getEnd()).getDateName());
  		reportTable.setVisible(true);
  		reportTable.setAutoCreateRowSorter(true);
***************
*** 396,400 ****
  		this.stockAnalysis = analysis;
  		this.pack();
- 		
  	}
      
--- 397,400 ----