tail-cvs

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

Update of /cvsroot/tail/Tail/src/java/net/sf/tail/io
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21382/src/java/net/sf/tail/io

Modified Files:
	StockSerializer.java StockAnalysisSerializer.java 
Log Message:
refatoração gigante! Stock virou TimeSeries

Index: StockSerializer.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/io/StockSerializer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StockSerializer.java	26 Sep 2007 19:36:21 -0000	1.1
--- StockSerializer.java	15 Oct 2007 20:23:25 -0000	1.2
***************
*** 3,7 ****
  import java.io.IOException;
  
! import net.sf.tail.analysis.Stock;
  
  import com.thoughtworks.xstream.XStream;
--- 3,7 ----
  import java.io.IOException;
  
! import net.sf.tail.analysis.SerializableTimeSeries;
  
  import com.thoughtworks.xstream.XStream;
***************
*** 10,14 ****
  public class StockSerializer {
  
! 	public String toXML(Stock stock) {
  		XStream xstream = new XStream(new DomDriver());
  		xstream.setMode(XStream.NO_REFERENCES);
--- 10,14 ----
  public class StockSerializer {
  
! 	public String toXML(SerializableTimeSeries stock) {
  		XStream xstream = new XStream(new DomDriver());
  		xstream.setMode(XStream.NO_REFERENCES);
***************
*** 18,24 ****
  
  	@SuppressWarnings("unchecked")
! 	public Stock fromXML(String xml) throws IOException {
  		XStream xstream = new XStream(new DomDriver());
! 		Stock stock = (Stock) xstream.fromXML(xml);
  		stock.reloadSeries();
  		return stock;
--- 18,24 ----
  
  	@SuppressWarnings("unchecked")
! 	public SerializableTimeSeries fromXML(String xml) throws IOException {
  		XStream xstream = new XStream(new DomDriver());
! 		SerializableTimeSeries stock = (SerializableTimeSeries) xstream.fromXML(xml);
  		stock.reloadSeries();
  		return stock;

Index: StockAnalysisSerializer.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/io/StockAnalysisSerializer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** StockAnalysisSerializer.java	27 Sep 2007 00:17:18 -0000	1.3
--- StockAnalysisSerializer.java	15 Oct 2007 20:23:25 -0000	1.4
***************
*** 4,8 ****
  
  import net.sf.tail.TimeSeriesSlicer;
! import net.sf.tail.analysis.Stock;
  import net.sf.tail.analysis.StockAnalysis;
  
--- 4,8 ----
  
  import net.sf.tail.TimeSeriesSlicer;
! import net.sf.tail.analysis.SerializableTimeSeries;
  import net.sf.tail.analysis.StockAnalysis;
  
***************
*** 22,32 ****
  		XStream xstream = new XStream(new DomDriver());
  		StockAnalysis analysis = (StockAnalysis) xstream.fromXML(xml);
! 		Stock newStock = analysis.getStock();
  		newStock.reloadSeries();
! 		TimeSeriesSlicer newSlicer = analysis.getSlicer().applyForSeries(newStock.getSeries());
  		StockAnalysis newAnalysis = new StockAnalysis(newStock,analysis.getApplyedCriterion(),newSlicer, analysis.getEvaluator());
  		//TODO Arrebentamos com o encapsulamento !
  		newAnalysis.getReports().addAll(analysis.getReports());
! 		newAnalysis.getAdditionalCriteria().addAll(analysis.getAdditionalCriteria());
  		return newAnalysis;
  
--- 22,36 ----
  		XStream xstream = new XStream(new DomDriver());
  		StockAnalysis analysis = (StockAnalysis) xstream.fromXML(xml);
! 		SerializableTimeSeries newStock = analysis.getStock();
  		newStock.reloadSeries();
! 		
! 		TimeSeriesSlicer newSlicer = analysis.getSlicer().applyForSeries(newStock);
  		StockAnalysis newAnalysis = new StockAnalysis(newStock,analysis.getApplyedCriterion(),newSlicer, analysis.getEvaluator());
+ 		newAnalysis.getAdditionalCriteria().addAll(analysis.getAdditionalCriteria());
+ 		
  		//TODO Arrebentamos com o encapsulamento !
  		newAnalysis.getReports().addAll(analysis.getReports());
! 		newAnalysis.reloadReports();
! 		
  		return newAnalysis;