Menu
▾
▴
[Tail-cvs] TailS/src/java/net/sf/tails/swing/frame/report NewReportFrame.java, 1.7
|
From: Carlos <ma...@us...> - 2007-10-03 18:51:51
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv23168/src/java/net/sf/tails/swing/frame/report Modified Files: NewReportFrame.java Log Message: Adicionado o campo para o usuario colocar o nome do report, ajeitado o posicionamento dos componentes na tela. Index: NewReportFrame.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report/NewReportFrame.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** NewReportFrame.java 1 Oct 2007 23:54:08 -0000 1.6 --- NewReportFrame.java 3 Oct 2007 18:51:52 -0000 1.7 *************** *** 1,11 **** package net.sf.tails.swing.frame.report; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; - import java.util.Scanner; import java.util.Set; import javax.script.ScriptException; import javax.swing.JFrame; import net.sf.tail.Strategy; --- 1,12 ---- package net.sf.tails.swing.frame.report; + import java.awt.Dimension; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; import java.util.Set; import javax.script.ScriptException; import javax.swing.JFrame; + import javax.swing.JOptionPane; import net.sf.tail.Strategy; *************** *** 14,17 **** --- 15,19 ---- import net.sf.tail.dsl.ruby.RubyDSL; import net.sf.tails.swing.frame.Index; + import net.sf.tails.swing.helper.FrameHelper; /** *************** *** 27,40 **** private javax.swing.JButton createButtonDefaultPanel; private javax.swing.JButton cancelButtonDefaultPanel; ! private javax.swing.JPanel jPanel1; private javax.swing.JPanel defaultReportPanel; ! private javax.swing.JPanel jPanel3; ! private javax.swing.JRadioButton jRadioButton10; private javax.swing.JRadioButton jRadioButton8; ! private javax.swing.JRadioButton jRadioButton9; ! private javax.swing.JScrollPane customStrategyJPane; ! private javax.swing.JScrollPane jScrollPane2; private javax.swing.JTabbedPane newReportTabbedPane; private javax.swing.JTextArea customStrategyTextArea; private StockAnalysis stockAnalysis; private Index index; --- 29,42 ---- private javax.swing.JButton createButtonDefaultPanel; private javax.swing.JButton cancelButtonDefaultPanel; ! private javax.swing.JPanel customReportPanel; private javax.swing.JPanel defaultReportPanel; ! private javax.swing.JPanel radioGroupPanel; private javax.swing.JRadioButton jRadioButton8; ! private javax.swing.JScrollPane customStrategyPane; ! private javax.swing.JScrollPane radioGroupScrollPane; private javax.swing.JTabbedPane newReportTabbedPane; private javax.swing.JTextArea customStrategyTextArea; + private javax.swing.JLabel reportNameLabel; + private javax.swing.JTextField reportNameField; private StockAnalysis stockAnalysis; private Index index; *************** *** 56,70 **** createButtonDefaultPanel = new javax.swing.JButton(); cancelButtonDefaultPanel = new javax.swing.JButton(); ! jScrollPane2 = new javax.swing.JScrollPane(); ! jPanel3 = new javax.swing.JPanel(); jRadioButton8 = new javax.swing.JRadioButton(); ! jRadioButton9 = new javax.swing.JRadioButton(); ! jRadioButton10 = new javax.swing.JRadioButton(); ! jPanel1 = new javax.swing.JPanel(); ! customStrategyJPane = new javax.swing.JScrollPane(); customStrategyTextArea = new javax.swing.JTextArea(); customStrategyCreateButton = new javax.swing.JButton(); customStrategyCancelButton = new javax.swing.JButton(); createButtonDefaultPanel.setText("Create"); createButtonDefaultPanel.addActionListener(new java.awt.event.ActionListener() { --- 58,76 ---- createButtonDefaultPanel = new javax.swing.JButton(); cancelButtonDefaultPanel = new javax.swing.JButton(); ! radioGroupScrollPane = new javax.swing.JScrollPane(); ! radioGroupPanel = new javax.swing.JPanel(); jRadioButton8 = new javax.swing.JRadioButton(); ! customReportPanel = new javax.swing.JPanel(); ! customStrategyPane = new javax.swing.JScrollPane(); customStrategyTextArea = new javax.swing.JTextArea(); customStrategyCreateButton = new javax.swing.JButton(); customStrategyCancelButton = new javax.swing.JButton(); + reportNameField = new javax.swing.JTextField(); + reportNameLabel = new javax.swing.JLabel(); + reportNameLabel.setText("Report Name: "); + reportNameField.setSize(170, 20); + reportNameField.setMaximumSize(new Dimension(170, 20)); + createButtonDefaultPanel.setText("Create"); createButtonDefaultPanel.addActionListener(new java.awt.event.ActionListener() { *************** *** 81,85 **** }); ! jScrollPane2.setHorizontalScrollBarPolicy(javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); indicatorsButtonGroup.add(jRadioButton8); jRadioButton8.setText("SMA"); --- 87,91 ---- }); ! radioGroupScrollPane.setHorizontalScrollBarPolicy(javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); indicatorsButtonGroup.add(jRadioButton8); jRadioButton8.setText("SMA"); *************** *** 88,151 **** jRadioButton8.setMargin(new java.awt.Insets(0, 0, 0, 0)); ! indicatorsButtonGroup.add(jRadioButton9); ! jRadioButton9.setText("SMA"); ! jRadioButton9.setBorder(javax.swing.BorderFactory.createTitledBorder("")); ! jRadioButton9.setBorderPainted(true); ! jRadioButton9.setMargin(new java.awt.Insets(0, 0, 0, 0)); ! ! indicatorsButtonGroup.add(jRadioButton10); ! jRadioButton10.setText("SMA"); ! jRadioButton10.setBorder(javax.swing.BorderFactory.createTitledBorder("")); ! jRadioButton10.setBorderPainted(true); ! jRadioButton10.setMargin(new java.awt.Insets(0, 0, 0, 0)); ! ! javax.swing.GroupLayout jPanel3Layout = new javax.swing.GroupLayout(jPanel3); ! jPanel3.setLayout(jPanel3Layout); ! jPanel3Layout.setHorizontalGroup( ! jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) ! .addGroup(jPanel3Layout.createSequentialGroup() ! .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) ! .addComponent(jRadioButton8) ! .addComponent(jRadioButton9) ! .addComponent(jRadioButton10)) .addGap(314, 314, 314)) ); ! jPanel3Layout.setVerticalGroup( ! jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) ! .addGroup(jPanel3Layout.createSequentialGroup() .addComponent(jRadioButton8) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 82, Short.MAX_VALUE) - .addComponent(jRadioButton9) - .addGap(65, 65, 65) - .addComponent(jRadioButton10) .addContainerGap()) ); ! jScrollPane2.setViewportView(jPanel3); ! javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(defaultReportPanel); ! defaultReportPanel.setLayout(jPanel2Layout); ! jPanel2Layout.setHorizontalGroup( ! jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) ! .addGroup(jPanel2Layout.createSequentialGroup() ! .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) ! .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup() .addComponent(cancelButtonDefaultPanel) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(createButtonDefaultPanel)) ! .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 385, Short.MAX_VALUE)) .addContainerGap()) ); ! jPanel2Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {createButtonDefaultPanel, cancelButtonDefaultPanel}); ! jPanel2Layout.setVerticalGroup( ! jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) ! .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup() ! .addComponent(jScrollPane2, javax.swing.GroupLayout.PREFERRED_SIZE, 218, javax.swing.GroupLayout.PREFERRED_SIZE) ! .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 50, Short.MAX_VALUE) ! .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(createButtonDefaultPanel) .addComponent(cancelButtonDefaultPanel)) ! .addContainerGap()) ); newReportTabbedPane.addTab("Default Report", defaultReportPanel); --- 94,142 ---- jRadioButton8.setMargin(new java.awt.Insets(0, 0, 0, 0)); ! javax.swing.GroupLayout radioGroupPanelLayout = new javax.swing.GroupLayout(radioGroupPanel); ! radioGroupPanel.setLayout(radioGroupPanelLayout); ! radioGroupPanelLayout.setHorizontalGroup( ! radioGroupPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) ! .addGroup(radioGroupPanelLayout.createSequentialGroup() ! .addGroup(radioGroupPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) ! .addComponent(jRadioButton8)) .addGap(314, 314, 314)) ); ! radioGroupPanelLayout.setVerticalGroup( ! radioGroupPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) ! .addGroup(radioGroupPanelLayout.createSequentialGroup() .addComponent(jRadioButton8) .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); *************** *** 166,170 **** }); ! customStrategyJPane.setViewportView(customStrategyTextArea); customStrategyCreateButton.setText("Create"); --- 157,161 ---- }); ! customStrategyPane.setViewportView(customStrategyTextArea); customStrategyCreateButton.setText("Create"); *************** *** 182,187 **** }); ! javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1); ! jPanel1.setLayout(jPanel1Layout); jPanel1Layout.setHorizontalGroup( jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) --- 173,178 ---- }); ! javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(customReportPanel); ! customReportPanel.setLayout(jPanel1Layout); jPanel1Layout.setHorizontalGroup( jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) *************** *** 189,193 **** .addContainerGap() .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) ! .addComponent(customStrategyJPane, javax.swing.GroupLayout.DEFAULT_SIZE, 375, Short.MAX_VALUE) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel1Layout.createSequentialGroup() .addComponent(customStrategyCancelButton) --- 180,184 ---- .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) *************** *** 203,214 **** .addGroup(jPanel1Layout.createSequentialGroup() .addContainerGap() ! .addComponent(customStrategyJPane, 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)) ! .addContainerGap()) ); ! newReportTabbedPane.addTab("Custom Report", jPanel1); newReportTabbedPane.getAccessibleContext().setAccessibleName("Default Report"); --- 194,205 ---- .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"); *************** *** 218,228 **** layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) ! .addComponent(newReportTabbedPane, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 400, Short.MAX_VALUE) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() .addContainerGap() ! .addComponent(newReportTabbedPane, javax.swing.GroupLayout.DEFAULT_SIZE, 327, Short.MAX_VALUE)) ); pack(); --- 209,233 ---- 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(); *************** *** 244,251 **** try { ! TailDSL dsl = new RubyDSL(read("/rubyDSLutils.rb"),stockAnalysis.getStock().getSeries()); Set<Strategy> strategies; strategies = dsl.evalStrategies(customStrategyTextArea.getText()); ! stockAnalysis.createReport(strategies); index.loadReports(stockAnalysis); this.dispose(); --- 249,261 ---- try { ! 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); ! } Set<Strategy> strategies; strategies = dsl.evalStrategies(customStrategyTextArea.getText()); ! stockAnalysis.createReport(reportNameField.getText(), strategies); index.loadReports(stockAnalysis); this.dispose(); *************** *** 260,270 **** } ! 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; ! } } --- 270,273 ---- } ! } |
