[Tail-cvs] TailS/src/java/net/sf/tails/swing/frame/report NewReportFrame.java, 1.2

[Márcio V. d. S. <mv...@us...>]

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

Modified Files:
	NewReportFrame.java 
Log Message:


Index: NewReportFrame.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report/NewReportFrame.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NewReportFrame.java	24 Sep 2007 22:18:41 -0000	1.1
--- NewReportFrame.java	26 Sep 2007 20:19:03 -0000	1.2
***************
*** 10,15 ****
  import net.sf.tail.dsl.TailDSL;
  import net.sf.tail.dsl.ruby.RubyDSL;
- import net.sf.tail.dsl.ruby.RubyDSLTest;
- import net.sf.tail.report.Report;
  import net.sf.tails.swing.frame.OpenStockAnalysis;
  
--- 10,13 ----
***************
*** 209,213 ****
  		pack();
  	} 
! 	
  	private void defaultPanelCreateButtonActionPerformed(java.awt.event.ActionEvent evt) {                                         
  //		TODO adicione seu código de manipulação aqui:
--- 207,211 ----
  		pack();
  	} 
! 
  	private void defaultPanelCreateButtonActionPerformed(java.awt.event.ActionEvent evt) {                                         
  //		TODO adicione seu código de manipulação aqui:
***************
*** 219,234 ****
  
  	private void customStrategyCreateButtonActionPerformed(java.awt.event.ActionEvent evt) {                                         
! 		TailDSL dsl = new RubyDSL(read("/rubyDSLutils.rb"),stockAnalysis.getStock().getSeries());
! 		Set<Strategy> strategies;
  		try {
! 			 strategies =  dsl.evalStrategies(customStrategyTextArea.getText());
! 			 Report report = stockAnalysis.createReport(strategies);
! 			 new OpenStockAnalysis(stockAnalysis);
! 			 this.dispose();
  		} catch (ScriptException e) {
- 			// TODO Auto-generated catch block
  			e.printStackTrace();
  		}
! 		
  	}                                        
  
--- 217,232 ----
  
  	private void customStrategyCreateButtonActionPerformed(java.awt.event.ActionEvent evt) {                                         
! 
  		try {
! 			TailDSL dsl = new RubyDSL(read("/rubyDSLutils.rb"),stockAnalysis.getStock().getSeries());
! 			Set<Strategy> strategies;
! 			strategies =  dsl.evalStrategies(customStrategyTextArea.getText());
! 			stockAnalysis.createReport(strategies);
! 			new OpenStockAnalysis(stockAnalysis);
! 			this.dispose();
  		} catch (ScriptException e) {
  			e.printStackTrace();
  		}
! 
  	}                                        
  
***************
*** 239,243 ****
  	private static String read(String name) {
  		String text = "";
! 		Scanner scanner = new Scanner(RubyDSLTest.class.getResourceAsStream(name));
  		while (scanner.hasNextLine()) {
  			text += scanner.nextLine() + "\n";
--- 237,241 ----
  	private static String read(String name) {
  		String text = "";
! 		Scanner scanner = new Scanner(NewReportFrame.class.getResourceAsStream(name));
  		while (scanner.hasNextLine()) {
  			text += scanner.nextLine() + "\n";
***************
*** 245,249 ****
  		return text;
  	}
! 	
  	public static void main(String args[]) {
  		java.awt.EventQueue.invokeLater(new Runnable() {
--- 243,247 ----
  		return text;
  	}
! 
  	public static void main(String args[]) {
  		java.awt.EventQueue.invokeLater(new Runnable() {