[Tail-cvs] Tail/src/java/net/sf/tail/analysis SerializableTimeSeries.java, 1.2

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

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

Modified Files:
	SerializableTimeSeries.java 
Log Message:
refatoração do timeSeries

Index: SerializableTimeSeries.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/SerializableTimeSeries.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SerializableTimeSeries.java	15 Oct 2007 20:23:24 -0000	1.1
--- SerializableTimeSeries.java	17 Oct 2007 16:41:55 -0000	1.2
***************
*** 8,12 ****
  import net.sf.tail.TimeSeries;
  import net.sf.tail.TimeSeriesLoader;
- import net.sf.tail.series.DefaultTimeSeries;
  
  public class SerializableTimeSeries implements TimeSeries {
--- 8,11 ----
***************
*** 16,20 ****
  	private String seriesAdress;
  
! 	private transient DefaultTimeSeries defaultTimeSeries;
  
  	private TimeSeriesLoader loader;
--- 15,19 ----
  	private String seriesAdress;
  
! 	private transient TimeSeries series;
  
  	private TimeSeriesLoader loader;
***************
*** 24,28 ****
  		this.seriesAdress = seriesAdress;
  		this.loader = loader;
! 		this.defaultTimeSeries = loader.load(new FileInputStream(seriesAdress), name);
  	}
  
--- 23,27 ----
  		this.seriesAdress = seriesAdress;
  		this.loader = loader;
! 		this.series = loader.load(new FileInputStream(seriesAdress), name);
  	}
  
***************
*** 35,53 ****
  	}
  	
! 	public DefaultTimeSeries getSeries()
  	{
! 		if(defaultTimeSeries == null) reloadSeries();
! 		return defaultTimeSeries;
  	}
  	
! 	public DefaultTimeSeries reloadSeries()
  	{
  		try {
! 			this.defaultTimeSeries = loader.load(new FileInputStream(seriesAdress), name);
  		} catch (FileNotFoundException e) {
  			e.printStackTrace();
  			throw new RuntimeException(e);
  		}
! 		return defaultTimeSeries;
  	}
  
--- 34,52 ----
  	}
  	
! 	public TimeSeries getSeries()
  	{
! 		if(series == null) reloadSeries();
! 		return series;
  	}
  	
! 	public TimeSeries reloadSeries()
  	{
  		try {
! 			this.series = loader.load(new FileInputStream(seriesAdress), name);
  		} catch (FileNotFoundException e) {
  			e.printStackTrace();
  			throw new RuntimeException(e);
  		}
! 		return series;
  	}