[Tail-cvs] Tail/src/java/net/sf/tail TimeSeriesSlicer.java, 1.12 TimeSeries.java, 1.11 ConstrainedTimeSeries.java, 1.8

[xanaot <xa...@us...>]

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

Modified Files:
	TimeSeriesSlicer.java TimeSeries.java 
	ConstrainedTimeSeries.java 
Log Message:
Preparando para a tela INFO do Report

Index: ConstrainedTimeSeries.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/ConstrainedTimeSeries.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ConstrainedTimeSeries.java	25 Aug 2007 12:30:01 -0000	1.7
--- ConstrainedTimeSeries.java	17 Oct 2007 23:23:35 -0000	1.8
***************
*** 1,4 ****
--- 1,6 ----
  package net.sf.tail;
  
+ import org.joda.time.Period;
+ 
  public class ConstrainedTimeSeries implements TimeSeries {
  
***************
*** 45,51 ****
  	}
  
! 	public String getPeriod() {
  		return series.getTick(begin).getDate().toString("hh:mm dd/MM/yyyy - ")
  				+ series.getTick(end).getDate().toString("hh:mm dd/MM/yyyy");
  	}
  }
--- 47,58 ----
  	}
  
! 	public String getPeriodName() {
  		return series.getTick(begin).getDate().toString("hh:mm dd/MM/yyyy - ")
  				+ series.getTick(end).getDate().toString("hh:mm dd/MM/yyyy");
  	}
+ 
+ 	public Period getPeriod() {
+ 		return new Period(Math.min(series.getTick(series.getBegin() + 1).getDate().getMillis() - series.getTick(series.getBegin()).getDate().getMillis(), 
+ 				series.getTick(series.getBegin() + 2).getDate().getMillis() - series.getTick(series.getBegin() + 1).getDate().getMillis()));
+ 	}
  }

Index: TimeSeries.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/TimeSeries.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** TimeSeries.java	15 Oct 2007 20:23:25 -0000	1.10
--- TimeSeries.java	17 Oct 2007 23:23:35 -0000	1.11
***************
*** 1,4 ****
--- 1,6 ----
  package net.sf.tail;
  
+ import org.joda.time.Period;
+ 
  
  /**
***************
*** 21,24 ****
  	String getName();
  
! 	String getPeriod();	
  }
--- 23,28 ----
  	String getName();
  
! 	String getPeriodName();	
! 	
! 	Period getPeriod();
  }

Index: TimeSeriesSlicer.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/TimeSeriesSlicer.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** TimeSeriesSlicer.java	8 Oct 2007 19:15:28 -0000	1.11
--- TimeSeriesSlicer.java	17 Oct 2007 23:23:35 -0000	1.12
***************
*** 18,22 ****
  	Period getPeriod();
  	
! 	DateTime getPeriodBegin();
  	
  	TimeSeriesSlicer applyForSeries(TimeSeries series);
--- 18,26 ----
  	Period getPeriod();
  	
! 	DateTime getDateBegin();
! 	
! 	int getNumberOfSlices();
! 	
! 	double getAverageTicksPerSlice();
  	
  	TimeSeriesSlicer applyForSeries(TimeSeries series);