Menu
▾
▴
[Tail-cvs] TailS/src/java/net/sf/tails/swing/frame/report NewReportFrame.java, 1.39
|
From: Thies <tg...@us...> - 2007-11-05 23:18:25
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1677/src/java/net/sf/tails/swing/frame/report Modified Files: NewReportFrame.java Log Message: Mudancas na serelização Index: NewReportFrame.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report/NewReportFrame.java,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** NewReportFrame.java 5 Nov 2007 17:30:51 -0000 1.38 --- NewReportFrame.java 5 Nov 2007 23:18:28 -0000 1.39 *************** *** 11,24 **** import java.io.BufferedOutputStream; import java.io.File; - import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.OutputStream; import java.io.PrintWriter; import java.util.ResourceBundle; - import java.util.Scanner; - import java.util.Set; ! import javax.script.ScriptException; import javax.swing.BorderFactory; import javax.swing.ButtonGroup; --- 11,22 ---- 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.Enumeration; import java.util.ResourceBundle; ! import javax.swing.AbstractButton; import javax.swing.BorderFactory; import javax.swing.ButtonGroup; *************** *** 40,52 **** import javax.swing.SwingConstants; - import net.sf.tail.Strategy; import net.sf.tail.analysis.StockAnalysis; - import net.sf.tail.dsl.TailDSL; - import net.sf.tail.dsl.ruby.RubyDSL; import net.sf.tail.report.Report; 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; --- 38,47 ---- import javax.swing.SwingConstants; import net.sf.tail.analysis.StockAnalysis; import net.sf.tail.report.Report; + import net.sf.tails.dsl.CodeSnippetLoader; 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.EnumIndicator; import net.sf.tails.swing.helper.FrameHelper; *************** *** 60,64 **** public class NewReportFrame extends JFrame { private static final ResourceBundle messageBundle = ResourceBundle.getBundle("net.sf.tails.i18n.Messages"); - private static final ResourceBundle fileBundle = ResourceBundle.getBundle("net.sf.tails.i18n.Files"); private static final ResourceBundle folderBundle = ResourceBundle.getBundle("net.sf.tails.i18n.Folders"); private static final ResourceBundle indicatorBundle = ResourceBundle.getBundle("net.sf.tails.i18n.IndicatorDescription"); --- 55,58 ---- *************** *** 185,188 **** --- 179,183 ---- radioButtonSMA.setToolTipText(indicatorBundle.getString("SMAIndicator")); radioButtonSMA.setText("SMA"); + radioButtonSMA.setName("Default_SMA"); radioButtonSMA.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { *************** *** 193,196 **** --- 188,192 ---- radioButtonEMA.setToolTipText(indicatorBundle.getString("EMAIndicator")); radioButtonEMA.setText("EMA"); + radioButtonEMA.setName("Default_EMA"); radioButtonEMA.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { *************** *** 201,204 **** --- 197,201 ---- radioButtonRSI.setToolTipText(indicatorBundle.getString("RSIIndicator")); radioButtonRSI.setText("RSI"); + radioButtonRSI.setName("Default_RSI"); radioButtonRSI.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { *************** *** 217,220 **** --- 214,218 ---- radioButtonParabolicSAR.setToolTipText(indicatorBundle.getString("ParabolicSarIndicator")); radioButtonParabolicSAR.setText("Parabolic SAR"); + radioButtonParabolicSAR.setName("Default_ParabolicSAR"); radioButtonParabolicSAR.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { *************** *** 225,228 **** --- 223,227 ---- radioButtonWMA.setToolTipText(indicatorBundle.getString("WMAIndicator")); radioButtonWMA.setText("WMA"); + radioButtonWMA.setName("Default_WMA"); radioButtonWMA.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { *************** *** 406,413 **** setCursor( cursor ); ! DefaultStrategiesGenerator defaulStrategies = new DefaultStrategiesGenerator(); ! Set<Strategy> strategies = defaulStrategies.generate(stockAnalysis.getStock(), selectedEnum, 4, 60, notSoFastCheckBox.isSelected()); // TODO: Acertas os parametros assim que a tela for finalizada ! stockAnalysis.addReport(reportNameField.getText(), strategies); index.loadReport(stockAnalysis); index.appendConsoleArea("Report " + reportNameField.getText() + " added succesfully."); --- 405,428 ---- setCursor( cursor ); ! ! AbstractButton selectedButton = null; ! Enumeration<AbstractButton> buttons = indicatorsButtonGroup.getElements(); ! while(buttons.hasMoreElements()) { ! AbstractButton button = buttons.nextElement(); ! if(button.isSelected()) { ! selectedButton = button; ! break; ! } ! ! } ! String value = selectedButton.getName(); ! if(notSoFastCheckBox.isSelected()) ! value += "_NotSoFast.rb"; ! else ! value += ".rb"; ! CodeSnippetLoader loader = new CodeSnippetLoader(); ! String script = loader.loadFileByName(value); // TODO: Acertas os parametros assim que a tela for finalizada ! stockAnalysis.addReport(reportNameField.getText(), script); index.loadReport(stockAnalysis); index.appendConsoleArea("Report " + reportNameField.getText() + " added succesfully."); *************** *** 439,456 **** try { ! TailDSL dsl = null; ! try { ! String dslHeader = read(fileBundle.getString("RUBY_UTILS_FILE")); ! 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(); --- 454,463 ---- try { ! ! stockAnalysis.addReport(reportNameField.getText(), customStrategyTextArea.getText()); index.loadReport(stockAnalysis); index.appendConsoleArea("Report " + reportNameField.getText() + " added succesfully."); this.dispose(); ! } catch (Exception e) { JOptionPane.showMessageDialog(null, messageBundle.getString("INVALID_CUSTOM"), "Error", 2); e.printStackTrace(); *************** *** 461,478 **** } ! private static String read(String name) { ! String text = ""; ! Scanner scanner; ! try { ! scanner = new Scanner(new FileInputStream(name)); ! while (scanner.hasNextLine()) { ! text += scanner.nextLine() + "\n"; ! } ! } catch (FileNotFoundException e) { ! e.printStackTrace(); ! } ! ! return text; ! } private void customStrategyCancelButtonActionPerformed(ActionEvent evt) { --- 468,472 ---- } ! private void customStrategyCancelButtonActionPerformed(ActionEvent evt) { |
