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

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

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

Modified Files:
	NewReportFrame.java 
Log Message:
Incluidos tratamentos de erro.

Index: NewReportFrame.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report/NewReportFrame.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** NewReportFrame.java	31 Oct 2007 21:04:06 -0000	1.34
--- NewReportFrame.java	31 Oct 2007 21:55:03 -0000	1.35
***************
*** 105,109 ****
  	private void initComponents() {
  		ResourceBundle iconBundle = ResourceBundle.getBundle("net.sf.tails.i18n.icons");
! 
  		helper = new FrameHelper();
  		indicatorsButtonGroup = new ButtonGroup();
--- 105,109 ----
  	private void initComponents() {
  		ResourceBundle iconBundle = ResourceBundle.getBundle("net.sf.tails.i18n.icons");
! 		selectedEnum = null;
  		helper = new FrameHelper();
  		indicatorsButtonGroup = new ButtonGroup();
***************
*** 381,388 ****
  	}
  
! 	private void defaultPanelCreateButtonActionPerformed(ActionEvent evt) {
! 		Cursor cursor = Cursor.getPredefinedCursor( Cursor.WAIT_CURSOR );  
! 		setCursor( cursor );
! 		
  		if (reportNameField.getText().equals("")) {
  			JOptionPane.showMessageDialog(null, messageBundle.getString("EMPTY_REPORT_NAME"), "Error", 2);
--- 381,385 ----
  	}
  
! 	private void defaultPanelCreateButtonActionPerformed(ActionEvent evt) {	
  		if (reportNameField.getText().equals("")) {
  			JOptionPane.showMessageDialog(null, messageBundle.getString("EMPTY_REPORT_NAME"), "Error", 2);
***************
*** 397,400 ****
--- 394,405 ----
  		}
  		
+ 		if (selectedEnum == null)
+ 		{
+ 			JOptionPane.showMessageDialog(null, messageBundle.getString("NODEFAULT_SELECTED"), "Error", 2);
+ 			return;
+ 		}
+ 		Cursor cursor = Cursor.getPredefinedCursor( Cursor.WAIT_CURSOR );  
+ 		setCursor( cursor );
+ 		
  		DefaultStrategiesGenerator defaulStrategies = new DefaultStrategiesGenerator();
  		Set<Strategy> strategies = defaulStrategies.generate(stockAnalysis.getStock(), selectedEnum, 4, 60, notSoFastCheckBox.isSelected());
***************
*** 414,441 ****
  
  	private void customStrategyCreateButtonActionPerformed(ActionEvent evt) {
- 		Cursor cursor = Cursor.getPredefinedCursor( Cursor.WAIT_CURSOR );  
- 		setCursor( cursor );
  		
  		if (reportNameField.getText().equals("")) {
  			JOptionPane.showMessageDialog(null, messageBundle.getString("EMPTY_REPORT_NAME"), "Error", 2);
  		}
! 		else {
  			try {
! 				TailDSL dsl = null;
! 				try {
! 					String dslHeader = read("/rubyDSLutils.rb");
! 					dsl = new RubyDSL(dslHeader, stockAnalysis.getStock());
! 				} catch (Exception e) {
! 					JOptionPane.showMessageDialog(null, "File not found: rubyDSLutils.rb .", "Error", 2);
! 				}
! 				Set<Strategy> strategies;
! 				strategies = dsl.evalStrategies(customStrategyTextArea.getText());
! 				stockAnalysis.addReport(reportNameField.getText(), strategies);
! 				index.loadReport(stockAnalysis);
! 				index.appendConsoleArea("Report " + reportNameField.getText() + " added succesfully.");
! 				this.dispose();
! 			} catch (ScriptException e) {
! 				e.printStackTrace();
  			}
  		}
  		
--- 419,454 ----
  
  	private void customStrategyCreateButtonActionPerformed(ActionEvent evt) {
  		
  		if (reportNameField.getText().equals("")) {
  			JOptionPane.showMessageDialog(null, messageBundle.getString("EMPTY_REPORT_NAME"), "Error", 2);
+ 			return;
  		}
! 		for (Report report : stockAnalysis.getReports()) {
! 			if (reportNameField.getText().equals(report.getName())) {
! 				JOptionPane.showMessageDialog(null, messageBundle.getString("SAME_REPORT_NAME"), "Error", 2);
! 				return;
! 			}
! 		}
! 
! 		Cursor cursor = Cursor.getPredefinedCursor( Cursor.WAIT_CURSOR );  
! 		setCursor( cursor );
! 		
! 		try {
! 			TailDSL dsl = null;
  			try {
! 				String dslHeader = read("/rubyDSLutils.rb");
! 				dsl = new RubyDSL(dslHeader, stockAnalysis.getStock());
! 			} catch (Exception e) {
! 				JOptionPane.showMessageDialog(null, "File not found: rubyDSLutils.rb .", "Error", 2);
  			}
+ 			Set<Strategy> strategies;
+ 			strategies = dsl.evalStrategies(customStrategyTextArea.getText());
+ 			stockAnalysis.addReport(reportNameField.getText(), strategies);
+ 			index.loadReport(stockAnalysis);
+ 			index.appendConsoleArea("Report " + reportNameField.getText() + " added succesfully.");
+ 			this.dispose();
+ 		} catch (ScriptException e) {
+ 			JOptionPane.showMessageDialog(null, messageBundle.getString("INVALID_CUSTOM"), "Error", 2);
+ 			e.printStackTrace();
  		}