tail-cvs

[Márcio V. d. S. <mv...@us...>]

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

Modified Files:
	NewStockAnalysis2.java NewStockAnalysis.java 
	NewStockAnalysis3.java 
Log Message:
refatoração gigante! Stock virou TimeSeries

Index: NewStockAnalysis2.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/stockAnalysis/NewStockAnalysis2.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** NewStockAnalysis2.java	15 Oct 2007 16:14:23 -0000	1.6
--- NewStockAnalysis2.java	15 Oct 2007 20:23:57 -0000	1.7
***************
*** 23,27 ****
  
  import net.sf.tail.AnalysisCriterion;
! import net.sf.tail.analysis.Stock;
  import net.sf.tails.swing.frame.Index;
  import net.sf.tails.swing.helper.FrameHelper;
--- 23,27 ----
  
  import net.sf.tail.AnalysisCriterion;
! import net.sf.tail.analysis.SerializableTimeSeries;
  import net.sf.tails.swing.frame.Index;
  import net.sf.tails.swing.helper.FrameHelper;
***************
*** 38,42 ****
  
  	private static final long serialVersionUID = 1L;
! 	private Stock stock;
  	private String[] communCriteria;
  	private String[] genericCriteria;
--- 38,42 ----
  
  	private static final long serialVersionUID = 1L;
! 	private SerializableTimeSeries stock;
  	private String[] communCriteria;
  	private String[] genericCriteria;
***************
*** 55,59 ****
  	private String defaultCriteria;
  
! 	public NewStockAnalysis2(Index index, Stock stock) {
  		this.index = index;
  		this.stock = stock;
--- 55,59 ----
  	private String defaultCriteria;
  
! 	public NewStockAnalysis2(Index index, SerializableTimeSeries stock) {
  		this.index = index;
  		this.stock = stock;

Index: NewStockAnalysis.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/stockAnalysis/NewStockAnalysis.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** NewStockAnalysis.java	10 Oct 2007 21:28:10 -0000	1.6
--- NewStockAnalysis.java	15 Oct 2007 20:23:58 -0000	1.7
***************
*** 20,24 ****
  import javax.swing.JOptionPane;
  
! import net.sf.tail.analysis.Stock;
  import net.sf.tail.io.StockSerializer;
  import net.sf.tails.swing.frame.Index;
--- 20,24 ----
  import javax.swing.JOptionPane;
  
! import net.sf.tail.analysis.SerializableTimeSeries;
  import net.sf.tail.io.StockSerializer;
  import net.sf.tails.swing.frame.Index;
***************
*** 281,285 ****
  	    {
  			StockSerializer stockSerializer = new StockSerializer();
! 	    	Stock stock = null;
  	    	if (stockButtonGroup.isSelected(newRadioButton.getModel()))
  	    	{
--- 281,285 ----
  	    {
  			StockSerializer stockSerializer = new StockSerializer();
! 	    	SerializableTimeSeries stock = null;
  	    	if (stockButtonGroup.isSelected(newRadioButton.getModel()))
  	    	{
***************
*** 292,296 ****
  					try {
  						helper.generateFolders(folderBundle.getString("STOCK_DIR"));
! 						stock = new Stock(stockNameField.getText(), seriesField.getText(), helper.getSelectedLoader(seriesFormatComboBox.getSelectedItem().toString()));
  						String xmlFile = stockSerializer.toXML(stock);
  		                String filePath = folderBundle.getString("STOCK_DIR") + "/" + stockNameField.getText();
--- 292,296 ----
  					try {
  						helper.generateFolders(folderBundle.getString("STOCK_DIR"));
! 						stock = new SerializableTimeSeries(stockNameField.getText(), seriesField.getText(), helper.getSelectedLoader(seriesFormatComboBox.getSelectedItem().toString()));
  						String xmlFile = stockSerializer.toXML(stock);
  		                String filePath = folderBundle.getString("STOCK_DIR") + "/" + stockNameField.getText();

Index: NewStockAnalysis3.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/stockAnalysis/NewStockAnalysis3.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** NewStockAnalysis3.java	10 Oct 2007 22:08:39 -0000	1.7
--- NewStockAnalysis3.java	15 Oct 2007 20:23:58 -0000	1.8
***************
*** 18,22 ****
  import net.sf.tail.OperationType;
  import net.sf.tail.TimeSeriesSlicer;
! import net.sf.tail.analysis.Stock;
  import net.sf.tail.analysis.StockAnalysis;
  import net.sf.tail.analysis.evaluator.HigherValueEvaluator;
--- 18,22 ----
  import net.sf.tail.OperationType;
  import net.sf.tail.TimeSeriesSlicer;
! import net.sf.tail.analysis.SerializableTimeSeries;
  import net.sf.tail.analysis.StockAnalysis;
  import net.sf.tail.analysis.evaluator.HigherValueEvaluator;
***************
*** 40,44 ****
  	
  	private static final long serialVersionUID = 1L;
! 	private Stock stock;
  	private AnalysisCriterion selectedCriterion;
  	private List<AnalysisCriterion> additionalCriteria;
--- 40,44 ----
  	
  	private static final long serialVersionUID = 1L;
! 	private SerializableTimeSeries stock;
  	private AnalysisCriterion selectedCriterion;
  	private List<AnalysisCriterion> additionalCriteria;
***************
*** 67,71 ****
  	private FrameHelper helper;   
      
!     public NewStockAnalysis3(Index index, Stock stock, AnalysisCriterion selectedCriterion, List<AnalysisCriterion> additionalCriteria) {
          this.index = index;
      	this.stock = stock;
--- 67,71 ----
  	private FrameHelper helper;   
      
!     public NewStockAnalysis3(Index index, SerializableTimeSeries stock, AnalysisCriterion selectedCriterion, List<AnalysisCriterion> additionalCriteria) {
          this.index = index;
      	this.stock = stock;
***************
*** 383,395 ****
  			}
  			
!     		slicer = new PartialMemorizedSlicer(stock.getSeries(), period, startDate, slicesNumber);
      	}
  		else if (slicerTypeComboBox.getSelectedItem().toString().equals("Fully"))
      	{
!     		slicer = new FullyMemorizedSlicer(stock.getSeries(), period, startDate);
      	}
      	else
      	{
!     		slicer = new RegularSlicer(stock.getSeries(), period, startDate);
      	}
  
--- 383,395 ----
  			}
  			
!     		slicer = new PartialMemorizedSlicer(stock, period, startDate, slicesNumber);
      	}
  		else if (slicerTypeComboBox.getSelectedItem().toString().equals("Fully"))
      	{
!     		slicer = new FullyMemorizedSlicer(stock, period, startDate);
      	}
      	else
      	{
!     		slicer = new RegularSlicer(stock, period, startDate);
      	}