[Tail-cvs] TailS/src/java/net/sf/tails/swing/frame/stockAnalysis NewStockAnalysis3.java, 1.7

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

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

Modified Files:
	NewStockAnalysis3.java 
Log Message:
Adicionada opção de ShortSellRunner.

Index: NewStockAnalysis3.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/stockAnalysis/NewStockAnalysis3.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** NewStockAnalysis3.java	10 Oct 2007 21:28:10 -0000	1.6
--- NewStockAnalysis3.java	10 Oct 2007 22:08:39 -0000	1.7
***************
*** 22,25 ****
--- 22,26 ----
  import net.sf.tail.analysis.evaluator.HigherValueEvaluator;
  import net.sf.tail.runner.HistoryRunner;
+ import net.sf.tail.runner.ShortSellRunner;
  import net.sf.tail.series.FullyMemorizedSlicer;
  import net.sf.tail.series.PartialMemorizedSlicer;
***************
*** 61,64 ****
--- 62,67 ----
      private javax.swing.JTextField slicesNumberField;
      private javax.swing.JLabel slicesNumberLabel;
+     private javax.swing.JComboBox runnerTypeComboBox;
+     private javax.swing.JLabel runnerTypeLabel;
  	private Index index;
  	private FrameHelper helper;   
***************
*** 91,95 ****
--- 94,100 ----
          startDateLabel = new javax.swing.JLabel();
          slicerTypeLabel = new javax.swing.JLabel();
+         runnerTypeLabel = new javax.swing.JLabel();
          slicerTypeComboBox = new javax.swing.JComboBox();
+         runnerTypeComboBox = new javax.swing.JComboBox();
          startDateField = new javax.swing.JTextField();
          finishButton = new javax.swing.JButton();
***************
*** 97,100 ****
--- 102,106 ----
          slicesNumberField = new javax.swing.JTextField();
          slicesNumberLabel = new javax.swing.JLabel();
+         
  
          slicesNumberField.setText("1");
***************
*** 194,200 ****
  
          startDateLabel.setText("Start Date:");
  
          slicerTypeLabel.setText("Slicer Type:");
! 
          slicerTypeComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[]{ "Regular", "Fully", "Partial" }));
          slicerTypeComboBox.setMinimumSize(new java.awt.Dimension(178, 23));
--- 200,212 ----
  
          startDateLabel.setText("Start Date:");
+         
+         runnerTypeLabel.setText("Runner Type:");
  
+         runnerTypeComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[]{ "HystoryRunner", "ShortSellRunner" }));
+         runnerTypeComboBox.setMinimumSize(new java.awt.Dimension(178, 23));
+         runnerTypeComboBox.setPreferredSize(new java.awt.Dimension(178, 23));
+         
          slicerTypeLabel.setText("Slicer Type:");
!         
          slicerTypeComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[]{ "Regular", "Fully", "Partial" }));
          slicerTypeComboBox.setMinimumSize(new java.awt.Dimension(178, 23));
***************
*** 232,239 ****
--- 244,253 ----
                                  .addGap(11, 11, 11)
                                  .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                                 	.addComponent(runnerTypeLabel)
                                      .addComponent(startDateLabel)
                                      .addComponent(slicerTypeLabel))
                                  .addGap(20, 20, 20)
                                  .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                                 	.addComponent(runnerTypeComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                                      .addComponent(startDateField, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE)
                                      .addComponent(slicerTypeComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
***************
*** 263,266 ****
--- 277,284 ----
                  .addGap(15, 15, 15)
                  .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                     .addComponent(runnerTypeLabel)
+                     .addComponent(runnerTypeComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                 .addGap(15, 15, 15)
+                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                      .addComponent(slicerTypeLabel)
                      .addComponent(slicerTypeComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
***************
*** 376,381 ****
      	}
  
! 		
!        	StockAnalysis stockAnalysis = new StockAnalysis(stock, selectedCriterion, slicer, new HigherValueEvaluator(new HistoryRunner(OperationType.BUY)));
      	stockAnalysis.addCriteria(additionalCriteria);
          index.loadStockAnalysis(stockAnalysis);
--- 394,406 ----
      	}
  
! 		StockAnalysis stockAnalysis;
! 		if (runnerTypeComboBox.getSelectedItem().toString() == "HystoryRunner")
! 		{
! 			stockAnalysis = new StockAnalysis(stock, selectedCriterion, slicer, new HigherValueEvaluator(new HistoryRunner(OperationType.BUY)));
! 		}
! 		else
! 		{
! 			stockAnalysis = new StockAnalysis(stock, selectedCriterion, slicer, new HigherValueEvaluator(new ShortSellRunner()));
! 		}
      	stockAnalysis.addCriteria(additionalCriteria);
          index.loadStockAnalysis(stockAnalysis);