Menu
▾
▴
[Tail-cvs] TailS/src/java/net/sf/tails/swing/frame/report NewReportFrame.java, 1.26
|
From: Carlos <ma...@us...> - 2007-10-29 17:22:48
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21349/src/java/net/sf/tails/swing/frame/report Modified Files: NewReportFrame.java Log Message: Adicionado WMA na tela e mais tratamento de excessao. Index: NewReportFrame.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report/NewReportFrame.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** NewReportFrame.java 29 Oct 2007 16:48:36 -0000 1.25 --- NewReportFrame.java 29 Oct 2007 17:22:47 -0000 1.26 *************** *** 21,24 **** --- 21,25 ---- import javax.swing.ImageIcon; import javax.swing.JButton; + import javax.swing.JCheckBox; import javax.swing.JFileChooser; import javax.swing.JFrame; *************** *** 74,77 **** --- 75,80 ---- private JRadioButton radioButtonBollingerBands; private JRadioButton radioButtonParabolicSAR; + private JRadioButton radioButtonWMA; + private JCheckBox notSoFastCheckBox; private JScrollPane customStrategyPane; private JScrollPane radioGroupScrollPane; *************** *** 112,115 **** --- 115,120 ---- radioButtonBollingerBands = new JRadioButton(); radioButtonParabolicSAR = new JRadioButton(); + radioButtonWMA = new JRadioButton(); + notSoFastCheckBox = new JCheckBox(); customReportPanel = new JPanel(); customStrategyPane = new JScrollPane(); *************** *** 170,173 **** --- 175,179 ---- indicatorsButtonGroup.add(radioButtonBollingerBands); indicatorsButtonGroup.add(radioButtonParabolicSAR); + indicatorsButtonGroup.add(radioButtonWMA); radioButtonSMA.setText("SMA - " + indicatorBundle.getString("SMAIndicator")); *************** *** 210,227 **** } }); GroupLayout radioGroupPanelLayout = new GroupLayout(radioGroupPanel); radioGroupPanel.setLayout(radioGroupPanelLayout); ! radioGroupPanelLayout.setHorizontalGroup(radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup( ! radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(radioButtonSMA)).addGroup( ! radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(radioButtonEMA)).addGroup( ! radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(radioButtonRSI)).addGroup( ! radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(radioButtonBollingerBands)) ! .addGroup(radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(radioButtonParabolicSAR)) .addGap(314, 314, 314)); ! radioGroupPanelLayout.setVerticalGroup(radioGroupPanelLayout.createParallelGroup(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(LayoutStyle.ComponentPlacement.RELATED, 82, Short.MAX_VALUE).addContainerGap())); radioGroupScrollPane.setViewportView(radioGroupPanel); --- 216,264 ---- } }); + + radioButtonWMA.setText("WMA - " + indicatorBundle.getString("WMAIndicator")); + radioButtonWMA.setMargin(new Insets(0, 0, 0, 0)); + radioButtonWMA.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent evt) { + selectedEnum = EnumIndicator.WMA; + } + }); + + notSoFastCheckBox.setText("Not So Fast Strategy"); + notSoFastCheckBox.setMargin(new Insets(0, 0, 0, 0)); GroupLayout radioGroupPanelLayout = new GroupLayout(radioGroupPanel); radioGroupPanel.setLayout(radioGroupPanelLayout); ! radioGroupPanelLayout.setHorizontalGroup(radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) ! .addGroup(radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) ! .addComponent(radioButtonSMA)) ! .addGroup(radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) ! .addComponent(radioButtonEMA)) ! .addGroup(radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) ! .addComponent(radioButtonRSI)) ! .addGroup(radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) ! .addComponent(radioButtonBollingerBands)) ! .addGroup(radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) ! .addComponent(radioButtonParabolicSAR)) ! .addGroup(radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) ! .addComponent(radioButtonWMA)) ! .addGroup(radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) ! .addComponent(notSoFastCheckBox)) .addGap(314, 314, 314)); ! radioGroupPanelLayout.setVerticalGroup(radioGroupPanelLayout.createParallelGroup(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) ! .addGap(10, 10, 10) ! .addComponent(radioButtonWMA) ! .addGap(10, 10, 10) ! .addComponent(notSoFastCheckBox) ! .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED, 82, Short.MAX_VALUE).addContainerGap())); radioGroupScrollPane.setViewportView(radioGroupPanel); *************** *** 392,395 **** --- 429,436 ---- private void defaultPanelCreateButtonActionPerformed(ActionEvent evt) { + if (reportNameField.getText().equals("")) { + JOptionPane.showMessageDialog(null, messageBundle.getString("EMPTY_REPORT_NAME"), "Error", 2); + } + else { DefaultStrategiesGenerator defaulStrategies = new DefaultStrategiesGenerator(); Set<Strategy> strategies = defaulStrategies.generate(stockAnalysis.getStock(), selectedEnum, 4, 60); *************** *** 399,402 **** --- 440,444 ---- index.appendConsoleArea("Report " + reportNameField.getText() + " added succesfully."); this.dispose(); + } } *************** *** 406,428 **** private void customStrategyCreateButtonActionPerformed(ActionEvent evt) { ! ! 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.loadStockAnalysis(stockAnalysis); - index.appendConsoleArea("Report " + reportNameField.getText() + " added succesfully."); - this.dispose(); - } catch (ScriptException e) { - e.printStackTrace(); } - } --- 448,473 ---- private void customStrategyCreateButtonActionPerformed(ActionEvent evt) { ! 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.loadStockAnalysis(stockAnalysis); ! index.appendConsoleArea("Report " + reportNameField.getText() + " added succesfully."); ! this.dispose(); ! } catch (ScriptException e) { ! e.printStackTrace(); } } } |
