tail-cvs

[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-serv26011/src/java/net/sf/tails/swing/frame/report

Modified Files:
	NewReportFrame.java 
Log Message:
dsl improving

Index: NewReportFrame.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report/NewReportFrame.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** NewReportFrame.java	22 Oct 2007 18:10:46 -0000	1.23
--- NewReportFrame.java	24 Oct 2007 21:30:09 -0000	1.24
***************
*** 2,7 ****
  
  import java.awt.Dimension;
! import java.awt.event.KeyEvent;
! import java.awt.event.KeyListener;
  import java.util.ResourceBundle;
  import java.util.Scanner;
--- 2,12 ----
  
  import java.awt.Dimension;
! import java.awt.event.ActionEvent;
! import java.io.BufferedOutputStream;
! import java.io.File;
! import java.io.FileNotFoundException;
! import java.io.FileOutputStream;
! import java.io.OutputStream;
! import java.io.PrintWriter;
  import java.util.ResourceBundle;
  import java.util.Scanner;
***************
*** 9,14 ****
--- 14,22 ----
  
  import javax.script.ScriptException;
+ import javax.swing.ImageIcon;
+ import javax.swing.JFileChooser;
  import javax.swing.JFrame;
  import javax.swing.JOptionPane;
+ import javax.swing.ScrollPaneConstants;
  
  import net.sf.tail.Strategy;
***************
*** 17,23 ****
--- 25,33 ----
  import net.sf.tail.dsl.ruby.RubyDSL;
  import net.sf.tails.dsl.TailSTokenMarker;
+ import net.sf.tails.swing.component.TailButton;
  import net.sf.tails.swing.frame.Index;
  import net.sf.tails.swing.helper.DefaultStrategiesGenerator;
  import net.sf.tails.swing.helper.EnumIndicator;
+ import net.sf.tails.swing.helper.FrameHelper;
  
  import org.gjt.sp.jedit.syntax.JEditTextArea;
***************
*** 28,37 ****
   */
  public class NewReportFrame extends javax.swing.JFrame {
! 	private static final ResourceBundle messageBundle = ResourceBundle
! 			.getBundle("net.sf.tails.i18n.Messages");
! 	private static final ResourceBundle indicatorBundle = ResourceBundle
! 	.getBundle("net.sf.tails.i18n.IndicatorDescription");
  
  	private static final long serialVersionUID = 4704921929974302846L;
  	private javax.swing.ButtonGroup indicatorsButtonGroup;
  	private javax.swing.JButton customStrategyCreateButton;
--- 38,48 ----
   */
  public class NewReportFrame extends javax.swing.JFrame {
! 	private static final ResourceBundle messageBundle = ResourceBundle.getBundle("net.sf.tails.i18n.Messages");
! 	private static final ResourceBundle folderBundle = ResourceBundle.getBundle("net.sf.tails.i18n.Folders");
! 	private static final ResourceBundle indicatorBundle = ResourceBundle.getBundle("net.sf.tails.i18n.IndicatorDescription");
  
  	private static final long serialVersionUID = 4704921929974302846L;
+ 	private FrameHelper helper;
+ 	private javax.swing.JFileChooser directoryFileChooser;
  	private javax.swing.ButtonGroup indicatorsButtonGroup;
  	private javax.swing.JButton customStrategyCreateButton;
***************
*** 39,42 ****
--- 50,55 ----
  	private javax.swing.JButton createButtonDefaultPanel;
  	private javax.swing.JButton cancelButtonDefaultPanel;
+ 	private TailButton openScriptButton;
+ 	private TailButton saveScriptButton;
  	private javax.swing.JPanel customReportPanel;
  	private javax.swing.JPanel defaultReportPanel;
***************
*** 63,66 ****
--- 76,80 ----
  		initComponents();
  		this.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+ 		this.setSize(800, 600);
  		this.setResizable(false);
  		this.setLocationByPlatform(true);
***************
*** 69,72 ****
--- 83,89 ----
  
  	private void initComponents() {
+ 		ResourceBundle iconBundle = ResourceBundle.getBundle("net.sf.tails.i18n.icons");
+ 
+ 		helper = new FrameHelper();
  		indicatorsButtonGroup = new javax.swing.ButtonGroup();
  		newReportTabbedPane = new javax.swing.JTabbedPane();
***************
*** 88,91 ****
--- 105,134 ----
  		reportNameField = new javax.swing.JTextField();
  		reportNameLabel = new javax.swing.JLabel();
+ 		saveScriptButton = new TailButton(new ImageIcon(iconBundle.getString("SAVE")));
+ 		openScriptButton = new TailButton(new ImageIcon(iconBundle.getString("OPEN")));
+ 		directoryFileChooser = new javax.swing.JFileChooser();
+ 
+ 		saveScriptButton.setToolTipText("Save Script as...");
+ 		saveScriptButton.addActionListener(new java.awt.event.ActionListener() {
+ 			public void actionPerformed(java.awt.event.ActionEvent evt) {
+ 				saveScriptButtonItemActionPerformed(evt);
+ 			}
+ 		});
+ 
+ 		openScriptButton.setToolTipText("Open Script...");
+ 		openScriptButton.addActionListener(new java.awt.event.ActionListener() {
+ 			public void actionPerformed(java.awt.event.ActionEvent evt) {
+ 				openScriptButtonItemActionPerformed(evt);
+ 			}
+ 		});
+ 
+ 		customStrategyTextArea.getPainter().setInvalidLinesPainted(false);
+ 		customStrategyTextArea.getPainter().setEOLMarkersPainted(false);
+ 
+ 		directoryFileChooser.setFileSelectionMode(javax.swing.JFileChooser.FILES_ONLY);
+ 		
+ 		
+ 		helper.generateFolders(folderBundle.getString("SCRIPTS_DIR"));
+ 		directoryFileChooser.setCurrentDirectory(new File(folderBundle.getString("SCRIPTS_DIR")));
  
  		reportNameLabel.setText("Report Name: ");
***************
*** 94,114 ****
  
  		createButtonDefaultPanel.setText("Create");
! 		createButtonDefaultPanel
! 				.addActionListener(new java.awt.event.ActionListener() {
! 					public void actionPerformed(java.awt.event.ActionEvent evt) {
! 						defaultPanelCreateButtonActionPerformed(evt);
! 					}
! 				});
  
  		cancelButtonDefaultPanel.setText("Cancel");
! 		cancelButtonDefaultPanel
! 				.addActionListener(new java.awt.event.ActionListener() {
! 					public void actionPerformed(java.awt.event.ActionEvent evt) {
! 						defaultPanelCancelButtonActionPerformed(evt);
! 					}
! 				});
  
! 		radioGroupScrollPane
! 				.setHorizontalScrollBarPolicy(javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
  		indicatorsButtonGroup.add(radioButtonSMA);
  		indicatorsButtonGroup.add(radioButtonEMA);
--- 137,154 ----
  
  		createButtonDefaultPanel.setText("Create");
! 		createButtonDefaultPanel.addActionListener(new java.awt.event.ActionListener() {
! 			public void actionPerformed(java.awt.event.ActionEvent evt) {
! 				defaultPanelCreateButtonActionPerformed(evt);
! 			}
! 		});
  
  		cancelButtonDefaultPanel.setText("Cancel");
! 		cancelButtonDefaultPanel.addActionListener(new java.awt.event.ActionListener() {
! 			public void actionPerformed(java.awt.event.ActionEvent evt) {
! 				defaultPanelCancelButtonActionPerformed(evt);
! 			}
! 		});
  
! 		radioGroupScrollPane.setHorizontalScrollBarPolicy(javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
  		indicatorsButtonGroup.add(radioButtonSMA);
  		indicatorsButtonGroup.add(radioButtonEMA);
***************
*** 116,120 ****
  		indicatorsButtonGroup.add(radioButtonBollingerBands);
  		indicatorsButtonGroup.add(radioButtonParabolicSAR);
! 		
  		radioButtonSMA.setText("SMA - " + indicatorBundle.getString("SMAIndicator"));
  		radioButtonSMA.setMargin(new java.awt.Insets(0, 0, 0, 0));
--- 156,160 ----
  		indicatorsButtonGroup.add(radioButtonBollingerBands);
  		indicatorsButtonGroup.add(radioButtonParabolicSAR);
! 
  		radioButtonSMA.setText("SMA - " + indicatorBundle.getString("SMAIndicator"));
  		radioButtonSMA.setMargin(new java.awt.Insets(0, 0, 0, 0));
***************
*** 124,128 ****
  			}
  		});
! 		
  		radioButtonEMA.setText("EMA - " + indicatorBundle.getString("EMAIndicator"));
  		radioButtonEMA.setMargin(new java.awt.Insets(0, 0, 0, 0));
--- 164,168 ----
  			}
  		});
! 
  		radioButtonEMA.setText("EMA - " + indicatorBundle.getString("EMAIndicator"));
  		radioButtonEMA.setMargin(new java.awt.Insets(0, 0, 0, 0));
***************
*** 132,136 ****
  			}
  		});
! 		
  		radioButtonRSI.setText("RSI - " + indicatorBundle.getString("RSIIndicator"));
  		radioButtonRSI.setMargin(new java.awt.Insets(0, 0, 0, 0));
--- 172,176 ----
  			}
  		});
! 
  		radioButtonRSI.setText("RSI - " + indicatorBundle.getString("RSIIndicator"));
  		radioButtonRSI.setMargin(new java.awt.Insets(0, 0, 0, 0));
***************
*** 140,144 ****
  			}
  		});
! 		
  		radioButtonBollingerBands.setText("Bollinger Bands - " + indicatorBundle.getString("BollingerBandsIndicator"));
  		radioButtonBollingerBands.setMargin(new java.awt.Insets(0, 0, 0, 0));
--- 180,184 ----
  			}
  		});
! 
  		radioButtonBollingerBands.setText("Bollinger Bands - " + indicatorBundle.getString("BollingerBandsIndicator"));
  		radioButtonBollingerBands.setMargin(new java.awt.Insets(0, 0, 0, 0));
***************
*** 148,152 ****
  			}
  		});
! 		
  		radioButtonParabolicSAR.setText("Parabolic SAR - " + indicatorBundle.getString("ParabolicSarIndicator"));
  		radioButtonParabolicSAR.setMargin(new java.awt.Insets(0, 0, 0, 0));
--- 188,192 ----
  			}
  		});
! 
  		radioButtonParabolicSAR.setText("Parabolic SAR - " + indicatorBundle.getString("ParabolicSarIndicator"));
  		radioButtonParabolicSAR.setMargin(new java.awt.Insets(0, 0, 0, 0));
***************
*** 156,424 ****
  			}
  		});
! 		
! 		javax.swing.GroupLayout radioGroupPanelLayout = new javax.swing.GroupLayout(
! 				radioGroupPanel);
  		radioGroupPanel.setLayout(radioGroupPanelLayout);
! 		radioGroupPanelLayout
! 				.setHorizontalGroup(radioGroupPanelLayout
! 						.createParallelGroup(
! 								javax.swing.GroupLayout.Alignment.LEADING)
! 										.addGroup(
! 												radioGroupPanelLayout
! 														.createParallelGroup(
! 																javax.swing.GroupLayout.Alignment.LEADING)
! 														.addComponent(
! 																radioButtonSMA))
! 										.addGroup(
! 												radioGroupPanelLayout
! 														.createParallelGroup(
! 																javax.swing.GroupLayout.Alignment.LEADING)
! 														.addComponent(
! 																radioButtonEMA))
! 										.addGroup(
! 												radioGroupPanelLayout
! 														.createParallelGroup(
! 																javax.swing.GroupLayout.Alignment.LEADING)
! 														.addComponent(
! 																radioButtonRSI))
! 										.addGroup(
! 												radioGroupPanelLayout
! 														.createParallelGroup(
! 																javax.swing.GroupLayout.Alignment.LEADING)
! 														.addComponent(
! 																radioButtonBollingerBands))
! 										.addGroup(
! 												radioGroupPanelLayout
! 														.createParallelGroup(
! 																javax.swing.GroupLayout.Alignment.LEADING)
! 														.addComponent(
! 																radioButtonParabolicSAR))
! 										.addGap(314, 314, 314));
! 		radioGroupPanelLayout
! 				.setVerticalGroup(radioGroupPanelLayout
! 						.createParallelGroup(
! 								javax.swing.GroupLayout.Alignment.LEADING)
! 						.addGroup(
! 								radioGroupPanelLayout
! 										.createSequentialGroup()
! 										.addComponent(radioButtonSMA)
! 										.addGap(10,10,10)
! 										.addComponent(radioButtonEMA)
! 										.addGap(10,10,10)
! 										.addComponent(radioButtonRSI)
! 										.addGap(10,10,10)
! 										.addComponent(radioButtonBollingerBands)
! 										.addGap(10,10,10)
! 										.addComponent(radioButtonParabolicSAR)
! 										.addPreferredGap(
! 												javax.swing.LayoutStyle.ComponentPlacement.RELATED,
! 												82, Short.MAX_VALUE)
! 										.addContainerGap()));
  		radioGroupScrollPane.setViewportView(radioGroupPanel);
  
! 		javax.swing.GroupLayout defaultTabPanel = new javax.swing.GroupLayout(
! 				defaultReportPanel);
  		defaultReportPanel.setLayout(defaultTabPanel);
! 		defaultTabPanel
! 				.setHorizontalGroup(defaultTabPanel
! 						.createParallelGroup(
! 								javax.swing.GroupLayout.Alignment.LEADING)
! 						.addGroup(
! 								defaultTabPanel
! 										.createSequentialGroup()
! 										.addGap(12)
! 										.addGroup(
! 												defaultTabPanel
! 														.createParallelGroup(
! 																javax.swing.GroupLayout.Alignment.LEADING)
! 														.addGroup(
! 																javax.swing.GroupLayout.Alignment.TRAILING,
! 																defaultTabPanel
! 																		.createSequentialGroup()
! 																		.addComponent(
! 																				cancelButtonDefaultPanel)
! 																		.addPreferredGap(
! 																				javax.swing.LayoutStyle.ComponentPlacement.RELATED)
! 																		.addComponent(
! 																				createButtonDefaultPanel))
! 														.addComponent(
! 																radioGroupScrollPane,
! 																javax.swing.GroupLayout.DEFAULT_SIZE,
! 																385,
! 																Short.MAX_VALUE))
! 										.addContainerGap()));
  
  		defaultTabPanel.linkSize(javax.swing.SwingConstants.HORIZONTAL,
! 				new java.awt.Component[] { createButtonDefaultPanel,
! 						cancelButtonDefaultPanel });
  
! 		defaultTabPanel
! 				.setVerticalGroup(defaultTabPanel
! 						.createParallelGroup(
! 								javax.swing.GroupLayout.Alignment.LEADING)
! 						.addGroup(
! 								javax.swing.GroupLayout.Alignment.TRAILING,
! 								defaultTabPanel
! 										.createSequentialGroup()
! 										.addGap(12)
! 										.addComponent(
! 												radioGroupScrollPane,
! 												javax.swing.GroupLayout.PREFERRED_SIZE,
! 												251,
! 												javax.swing.GroupLayout.PREFERRED_SIZE)
! 										.addGap(6)
! 										.addGroup(
! 												defaultTabPanel
! 														.createParallelGroup(
! 																javax.swing.GroupLayout.Alignment.BASELINE)
! 														.addComponent(
! 																createButtonDefaultPanel)
! 														.addComponent(
! 																cancelButtonDefaultPanel))));
  		newReportTabbedPane.addTab("Default Report", defaultReportPanel);
  
  		customStrategyTextArea.setTokenMarker(new TailSTokenMarker());
  
! 		customStrategyTextArea.addKeyListener(new KeyListener() {
! 			@Override
! 			public void keyPressed(KeyEvent e) {
! 				textAreaTextChanged(e);
! 			}
! 
! 			@Override
! 			public void keyReleased(KeyEvent e) {
! 			}
! 
! 			@Override
! 			public void keyTyped(KeyEvent e) {
! 			}
! 		});
  
  		customStrategyPane.setViewportView(customStrategyTextArea);
  
  		customStrategyCreateButton.setText("Create");
! 		customStrategyCreateButton
! 				.addActionListener(new java.awt.event.ActionListener() {
! 					public void actionPerformed(java.awt.event.ActionEvent evt) {
! 						customStrategyCreateButtonActionPerformed(evt);
! 					}
! 				});
  
  		customStrategyCancelButton.setText("Cancel");
! 		customStrategyCancelButton
! 				.addActionListener(new java.awt.event.ActionListener() {
! 					public void actionPerformed(java.awt.event.ActionEvent evt) {
! 						customStrategyCancelButtonActionPerformed(evt);
! 					}
! 				});
  
! 		javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(
! 				customReportPanel);
  		customReportPanel.setLayout(jPanel1Layout);
! 		jPanel1Layout
! 				.setHorizontalGroup(jPanel1Layout
! 						.createParallelGroup(
! 								javax.swing.GroupLayout.Alignment.LEADING)
! 						.addGroup(
! 								jPanel1Layout
! 										.createSequentialGroup()
! 										.addContainerGap()
  										.addGroup(
! 												jPanel1Layout
! 														.createParallelGroup(
! 																javax.swing.GroupLayout.Alignment.LEADING)
! 														.addComponent(
! 																customStrategyPane,
! 																javax.swing.GroupLayout.DEFAULT_SIZE,
! 																375,
! 																Short.MAX_VALUE)
! 														.addGroup(
! 																javax.swing.GroupLayout.Alignment.TRAILING,
! 																jPanel1Layout
! 																		.createSequentialGroup()
! 																		.addComponent(
! 																				customStrategyCancelButton)
! 																		.addPreferredGap(
! 																				javax.swing.LayoutStyle.ComponentPlacement.RELATED)
! 																		.addComponent(
! 																				customStrategyCreateButton)))
! 										.addContainerGap()));
  
! 		jPanel1Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL,
! 				new java.awt.Component[] { customStrategyCreateButton,
! 						customStrategyCancelButton });
  
! 		jPanel1Layout
! 				.setVerticalGroup(jPanel1Layout
! 						.createParallelGroup(
! 								javax.swing.GroupLayout.Alignment.LEADING)
! 						.addGroup(
! 								jPanel1Layout
! 										.createSequentialGroup()
! 										.addContainerGap()
! 										.addComponent(
! 												customStrategyPane,
! 												javax.swing.GroupLayout.DEFAULT_SIZE,
! 												251, Short.MAX_VALUE)
! 										.addPreferredGap(
! 												javax.swing.LayoutStyle.ComponentPlacement.RELATED)
! 										.addGroup(
! 												jPanel1Layout
! 														.createParallelGroup(
! 																javax.swing.GroupLayout.Alignment.BASELINE)
! 														.addComponent(
! 																customStrategyCreateButton)
! 														.addComponent(
! 																customStrategyCancelButton))
! 										.addGap(18)));
  		newReportTabbedPane.addTab("Custom Report", customReportPanel);
  
! 		newReportTabbedPane.getAccessibleContext().setAccessibleName(
! 				"Default Report");
  
! 		javax.swing.GroupLayout layout = new javax.swing.GroupLayout(
! 				getContentPane());
  		getContentPane().setLayout(layout);
! 		layout.setHorizontalGroup(layout.createParallelGroup(
! 				javax.swing.GroupLayout.Alignment.LEADING).addGroup(
! 				layout.createSequentialGroup().addGap(10).addComponent(
! 						reportNameLabel).addComponent(reportNameField))
! 				.addGroup(
! 						layout.createSequentialGroup().addGap(10).addComponent(
! 								newReportTabbedPane,
! 								javax.swing.GroupLayout.DEFAULT_SIZE, 400,
! 								Short.MAX_VALUE).addGap(10)));
! 		layout.setVerticalGroup(layout.createParallelGroup(
! 				javax.swing.GroupLayout.Alignment.LEADING).addGroup(
! 				layout.createSequentialGroup().addGap(10).addComponent(
! 						reportNameLabel).addGap(10).addContainerGap()
! 						.addComponent(newReportTabbedPane,
! 								javax.swing.GroupLayout.DEFAULT_SIZE, 327,
! 								Short.MAX_VALUE).addGap(10)).addGroup(
! 				layout.createSequentialGroup().addGap(10).addComponent(
! 						reportNameField)));
  		pack();
  	}
  
! 	private void textAreaTextChanged(KeyEvent keyEvent) {
! 		if(keyEvent.isControlDown() == true){
! 			switch (keyEvent.getKeyCode()) {
! 			case KeyEvent.VK_SPACE:
! 				
! 				//new AutoCompleteForm(customStrategyTextArea).setVisible(true);
! 				break;
  
! 			default:
! 				break;
  			}
  		}
! 		//customStrategyTextArea.paste();
  	}
  
! 	private void defaultPanelCreateButtonActionPerformed(
! 			java.awt.event.ActionEvent evt) {
  		DefaultStrategiesGenerator defaulStrategies = new DefaultStrategiesGenerator();
! 		Set<Strategy> strategies = defaulStrategies.generate(stockAnalysis
! 				.getStock(), selectedEnum, 4, 60);
  		// TODO: Acertas os parametros assim que a tela for finalizada
  		stockAnalysis.addReport(reportNameField.getText(), strategies);
--- 196,383 ----
  			}
  		});
! 
! 		javax.swing.GroupLayout radioGroupPanelLayout = new javax.swing.GroupLayout(radioGroupPanel);
  		radioGroupPanel.setLayout(radioGroupPanelLayout);
! 		radioGroupPanelLayout.setHorizontalGroup(radioGroupPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addGroup(
! 				radioGroupPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addComponent(radioButtonSMA)).addGroup(
! 				radioGroupPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addComponent(radioButtonEMA)).addGroup(
! 				radioGroupPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addComponent(radioButtonRSI)).addGroup(
! 				radioGroupPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addComponent(radioButtonBollingerBands))
! 				.addGroup(radioGroupPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addComponent(radioButtonParabolicSAR))
! 				.addGap(314, 314, 314));
! 		radioGroupPanelLayout.setVerticalGroup(radioGroupPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addGroup(
! 				radioGroupPanelLayout.createSequentialGroup().addComponent(radioButtonSMA).addGap(10, 10, 10).addComponent(radioButtonEMA).addGap(10,
! 						10, 10).addComponent(radioButtonRSI).addGap(10, 10, 10).addComponent(radioButtonBollingerBands).addGap(10, 10, 10)
! 						.addComponent(radioButtonParabolicSAR).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 82,
! 								Short.MAX_VALUE).addContainerGap()));
  		radioGroupScrollPane.setViewportView(radioGroupPanel);
  
! 		javax.swing.GroupLayout defaultTabPanel = new javax.swing.GroupLayout(defaultReportPanel);
  		defaultReportPanel.setLayout(defaultTabPanel);
! 		defaultTabPanel.setHorizontalGroup(defaultTabPanel.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addGroup(
! 				defaultTabPanel.createSequentialGroup().addGap(12).addGroup(
! 						defaultTabPanel.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addGroup(
! 								javax.swing.GroupLayout.Alignment.TRAILING,
! 								defaultTabPanel.createSequentialGroup().addComponent(cancelButtonDefaultPanel).addPreferredGap(
! 										javax.swing.LayoutStyle.ComponentPlacement.RELATED).addComponent(createButtonDefaultPanel)).addComponent(
! 								radioGroupScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 385, Short.MAX_VALUE)).addContainerGap()));
  
  		defaultTabPanel.linkSize(javax.swing.SwingConstants.HORIZONTAL,
! 				new java.awt.Component[] { createButtonDefaultPanel, cancelButtonDefaultPanel });
  
! 		defaultTabPanel.setVerticalGroup(defaultTabPanel.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addGroup(
! 				javax.swing.GroupLayout.Alignment.TRAILING,
! 				defaultTabPanel.createSequentialGroup().addGap(12).addComponent(radioGroupScrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, 251,
! 						javax.swing.GroupLayout.PREFERRED_SIZE).addGap(6).addGroup(
! 						defaultTabPanel.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE).addComponent(createButtonDefaultPanel)
! 								.addComponent(cancelButtonDefaultPanel))));
  		newReportTabbedPane.addTab("Default Report", defaultReportPanel);
  
  		customStrategyTextArea.setTokenMarker(new TailSTokenMarker());
  
! //		customStrategyTextArea.addKeyListener(new KeyListener() {
! //			@Override
! //			public void keyPressed(KeyEvent e) {
! //				textAreaTextChanged(e);
! //			}
! //
! //			@Override
! //			public void keyReleased(KeyEvent e) {
! //			}
! //
! //			@Override
! //			public void keyTyped(KeyEvent e) {
! //			}
! //		});
  
  		customStrategyPane.setViewportView(customStrategyTextArea);
+ 		customStrategyPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+ 		customStrategyPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED);
  
  		customStrategyCreateButton.setText("Create");
! 		customStrategyCreateButton.addActionListener(new java.awt.event.ActionListener() {
! 			public void actionPerformed(java.awt.event.ActionEvent evt) {
! 				customStrategyCreateButtonActionPerformed(evt);
! 			}
! 		});
  
  		customStrategyCancelButton.setText("Cancel");
! 		customStrategyCancelButton.addActionListener(new java.awt.event.ActionListener() {
! 			public void actionPerformed(java.awt.event.ActionEvent evt) {
! 				customStrategyCancelButtonActionPerformed(evt);
! 			}
! 		});
  
! 		javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(customReportPanel);
  		customReportPanel.setLayout(jPanel1Layout);
! 		jPanel1Layout.setHorizontalGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addGroup(
! 				jPanel1Layout.createSequentialGroup().addContainerGap().addGroup(
! 						jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addGroup(
! 								javax.swing.GroupLayout.Alignment.TRAILING,
! 								jPanel1Layout.createParallelGroup().addComponent(customStrategyPane, javax.swing.GroupLayout.DEFAULT_SIZE, 375,
! 										Short.MAX_VALUE)
  										.addGroup(
! 												jPanel1Layout.createSequentialGroup().addComponent(saveScriptButton).addGap(4).addComponent(
! 														openScriptButton))).addGroup(
! 								javax.swing.GroupLayout.Alignment.TRAILING,
! 								jPanel1Layout.createSequentialGroup().addComponent(customStrategyCancelButton).addPreferredGap(
! 										javax.swing.LayoutStyle.ComponentPlacement.RELATED).addComponent(customStrategyCreateButton)))
! 						.addContainerGap()));
  
! 		jPanel1Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] { customStrategyCreateButton,
! 				customStrategyCancelButton });
  
! 		jPanel1Layout.setVerticalGroup(jPanel1Layout.createSequentialGroup().addGap(10).addGroup(
! 				jPanel1Layout.createParallelGroup().addComponent(openScriptButton).addComponent(saveScriptButton)).addGap(7).addGroup(
! 				jPanel1Layout.createSequentialGroup().addContainerGap().addComponent(customStrategyPane, javax.swing.GroupLayout.DEFAULT_SIZE, 251,
! 						Short.MAX_VALUE).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).addGroup(
! 						jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE).addComponent(customStrategyCreateButton)
! 								.addComponent(customStrategyCancelButton)).addGap(18)));
  		newReportTabbedPane.addTab("Custom Report", customReportPanel);
  
! 		newReportTabbedPane.getAccessibleContext().setAccessibleName("Default Report");
  
! 		javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
  		getContentPane().setLayout(layout);
! 		layout.setHorizontalGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addGroup(
! 				layout.createSequentialGroup().addGap(10).addComponent(reportNameLabel).addComponent(reportNameField)).addGroup(
! 				layout.createSequentialGroup().addGap(10).addComponent(newReportTabbedPane, javax.swing.GroupLayout.DEFAULT_SIZE, 400,
! 						Short.MAX_VALUE).addGap(10)));
! 		layout.setVerticalGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addGroup(
! 				layout.createSequentialGroup().addGap(10).addComponent(reportNameLabel).addGap(10).addContainerGap().addComponent(
! 						newReportTabbedPane, javax.swing.GroupLayout.DEFAULT_SIZE, 327, Short.MAX_VALUE).addGap(10)).addGroup(
! 				layout.createSequentialGroup().addGap(10).addComponent(reportNameField)));
  		pack();
  	}
  
! 	protected void openScriptButtonItemActionPerformed(ActionEvent evt) {
! 		int value = directoryFileChooser.showOpenDialog(this);
! 		switch (value) {
! 		case JFileChooser.APPROVE_OPTION:
! 			String filePath = directoryFileChooser.getSelectedFile().getAbsolutePath();
  
! 			try {
! 				String script = helper.readLinedFile(filePath);
! 				
!                 customStrategyTextArea.setText(script);
! 				
! 				
! 			} catch (Exception e) {
! 				e.printStackTrace();
! 				System.out.println(e.getMessage());
! 				return;
  			}
+ 			break;
  		}
! 
  	}
  
! 	protected void saveScriptButtonItemActionPerformed(ActionEvent evt) {
! 		int value = directoryFileChooser.showSaveDialog(this);        
!         switch(value)
!         {
!             case JFileChooser.APPROVE_OPTION:
!                 String filePath = directoryFileChooser.getSelectedFile().getAbsolutePath();
!                 if(!filePath.endsWith(".rb"))
!                 {
!                 	filePath += ".rb";
!                 }
!             	File scriptFile = new File(filePath);
!         		OutputStream out;
! 				try {
! 					out = new BufferedOutputStream(new FileOutputStream(scriptFile));
! 				} catch (FileNotFoundException e) {
! 					return;
! 				}
!         		PrintWriter write = new PrintWriter(out);
!         		for (int i = 0; i < customStrategyTextArea.getLineCount(); i++) {
! 					write.println(customStrategyTextArea.getLineText(i));
! 				}
!         		write.close();
!                 break;
!         }
! 
! 
! 	}
! 
! //	private void textAreaTextChanged(KeyEvent keyEvent) {
! //		if (keyEvent.isControlDown() == true) {
! //			switch (keyEvent.getKeyCode()) {
! //			case KeyEvent.VK_SPACE:
! //
! //				// new
! //				// AutoCompleteForm(customStrategyTextArea).setVisible(true);
! //				break;
! //
! //			default:
! //				break;
! //			}
! //		}
! //		// customStrategyTextArea.paste();
! //	}
! 
! 	private void defaultPanelCreateButtonActionPerformed(java.awt.event.ActionEvent evt) {
  		DefaultStrategiesGenerator defaulStrategies = new DefaultStrategiesGenerator();
! 		Set<Strategy> strategies = defaulStrategies.generate(stockAnalysis.getStock(), selectedEnum, 4, 60);
  		// TODO: Acertas os parametros assim que a tela for finalizada
  		stockAnalysis.addReport(reportNameField.getText(), strategies);
***************
*** 428,438 ****
  	}
  
! 	private void defaultPanelCancelButtonActionPerformed(
! 			java.awt.event.ActionEvent evt) {
  		this.dispose();
  	}
  
! 	private void customStrategyCreateButtonActionPerformed(
! 			java.awt.event.ActionEvent evt) {
  
  		try {
--- 387,395 ----
  	}
  
! 	private void defaultPanelCancelButtonActionPerformed(java.awt.event.ActionEvent evt) {
  		this.dispose();
  	}
  
! 	private void customStrategyCreateButtonActionPerformed(java.awt.event.ActionEvent evt) {
  
  		try {
***************
*** 442,447 ****
  				dsl = new RubyDSL(dslHeader, stockAnalysis.getStock());
  			} catch (Exception e) {
! 				JOptionPane.showMessageDialog(null,
! 						"File not found: rubyDSLutils.rb .", "Error", 2);
  			}
  			Set<Strategy> strategies;
--- 399,403 ----
  				dsl = new RubyDSL(dslHeader, stockAnalysis.getStock());
  			} catch (Exception e) {
! 				JOptionPane.showMessageDialog(null, "File not found: rubyDSLutils.rb .", "Error", 2);
  			}
  			Set<Strategy> strategies;
***************
*** 459,464 ****
  	private static String read(String name) {
  		String text = "";
! 		Scanner scanner = new Scanner(NewReportFrame.class
! 				.getResourceAsStream(name));
  		while (scanner.hasNextLine()) {
  			text += scanner.nextLine() + "\n";
--- 415,419 ----
  	private static String read(String name) {
  		String text = "";
! 		Scanner scanner = ne...
 
[truncated message content]