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

[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-serv12968/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.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** NewReportFrame.java	5 Oct 2007 20:55:40 -0000	1.11
--- NewReportFrame.java	8 Oct 2007 19:38:19 -0000	1.12
***************
*** 4,7 ****
--- 4,8 ----
  import java.awt.event.KeyEvent;
  import java.awt.event.KeyListener;
+ import java.util.Scanner;
  import java.util.Set;
  
***************
*** 9,12 ****
--- 10,14 ----
  import javax.swing.JFrame;
  import javax.swing.JOptionPane;
+ import javax.swing.JTextArea;
  
  import net.sf.tail.Strategy;
***************
*** 14,22 ****
  import net.sf.tail.dsl.TailDSL;
  import net.sf.tail.dsl.ruby.RubyDSL;
- import net.sf.tails.dsl.TailSTokenMarker;
  import net.sf.tails.swing.frame.Index;
- import net.sf.tails.swing.helper.FrameHelper;
- 
- import org.gjt.sp.jedit.syntax.JEditTextArea;
  
  /**
--- 16,20 ----
***************
*** 39,43 ****
  	private javax.swing.JScrollPane radioGroupScrollPane;
  	private javax.swing.JTabbedPane newReportTabbedPane;
! 	private JEditTextArea customStrategyTextArea;
  	private javax.swing.JLabel reportNameLabel;
  	private javax.swing.JTextField reportNameField;
--- 37,41 ----
  	private javax.swing.JScrollPane radioGroupScrollPane;
  	private javax.swing.JTabbedPane newReportTabbedPane;
! 	private JTextArea customStrategyTextArea;
  	private javax.swing.JLabel reportNameLabel;
  	private javax.swing.JTextField reportNameField;
***************
*** 66,70 ****
  		customReportPanel = new javax.swing.JPanel();
  		customStrategyPane = new javax.swing.JScrollPane();
! 		customStrategyTextArea = new JEditTextArea();
  		customStrategyCreateButton = new javax.swing.JButton();
  		customStrategyCancelButton = new javax.swing.JButton();
--- 64,68 ----
  		customReportPanel = new javax.swing.JPanel();
  		customStrategyPane = new javax.swing.JScrollPane();
! 		customStrategyTextArea = new JTextArea();
  		customStrategyCreateButton = new javax.swing.JButton();
  		customStrategyCancelButton = new javax.swing.JButton();
***************
*** 145,149 ****
  		newReportTabbedPane.addTab("Default Report", defaultReportPanel);
  
! 		customStrategyTextArea.setTokenMarker(new TailSTokenMarker());
  		
  		customStrategyTextArea.addKeyListener(new KeyListener(){
--- 143,147 ----
  		newReportTabbedPane.addTab("Default Report", defaultReportPanel);
  
! 		//customStrategyTextArea.setTokenMarker(new TailSTokenMarker());
  		
  		customStrategyTextArea.addKeyListener(new KeyListener(){
***************
*** 258,262 ****
  			TailDSL dsl = null;
  			try {
! 				dsl = new RubyDSL(FrameHelper.readFile("/rubyDSLutils.rb"),stockAnalysis.getStock().getSeries());
  			} catch (Exception e) {
  				JOptionPane.showMessageDialog(null, "File not found: rubyDSLutils.rb .", "Error", 2);
--- 256,261 ----
  			TailDSL dsl = null;
  			try {
! 				String dslHeader = read("/rubyDSLutils.rb");
! 				dsl = new RubyDSL( dslHeader ,stockAnalysis.getStock().getSeries());
  			} catch (Exception e) {
  				JOptionPane.showMessageDialog(null, "File not found: rubyDSLutils.rb .", "Error", 2);
***************
*** 271,275 ****
  		}
  
! 	}                                        
  
  	private void customStrategyCancelButtonActionPerformed(java.awt.event.ActionEvent evt) {                                         
--- 270,283 ----
  		}
  
! 	}                    
! 	
! 	private static String read(String name) {
! 		String text = "";
! 		Scanner scanner = new Scanner(NewReportFrame.class.getResourceAsStream(name));
! 		while (scanner.hasNextLine()) {
! 			text += scanner.nextLine() + "\n";
! 		}
! 		return text;
! 	}
  
  	private void customStrategyCancelButtonActionPerformed(java.awt.event.ActionEvent evt) {