[Tail-cvs] Tail/src/java/net/sf/tail/series DefaultTimeSeries.java, 1.2 SlicerByTimePeriod.java, 1.2

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

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

Modified Files:
	DefaultTimeSeries.java SlicerByTimePeriod.java 
Log Message:
problemas com o cvs

Index: DefaultTimeSeries.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/series/DefaultTimeSeries.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DefaultTimeSeries.java	20 Aug 2007 18:15:30 -0000	1.1
--- DefaultTimeSeries.java	25 Aug 2007 12:30:02 -0000	1.2
***************
*** 47,51 ****
  
  	public String getPeriod() {
! 		return ticks.get(0).getDate().toString("hh:mm dd/MM/yyyy - ") + ticks.get(this.getEnd()).getDate().toString("hh:mm dd/MM/yyyy"); 
  	}
  }
--- 47,52 ----
  
  	public String getPeriod() {
! 		return ticks.get(0).getDate().toString("hh:mm dd/MM/yyyy - ")
! 				+ ticks.get(this.getEnd()).getDate().toString("hh:mm dd/MM/yyyy");
  	}
  }

Index: SlicerByTimePeriod.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/series/SlicerByTimePeriod.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SlicerByTimePeriod.java	20 Aug 2007 18:15:30 -0000	1.1
--- SlicerByTimePeriod.java	25 Aug 2007 12:30:02 -0000	1.2
***************
*** 22,32 ****
  
  	private DateTime periodBegin;
! 	
  	private transient static Logger LOG = Logger.getLogger(SlicerByTimePeriod.class);
! 	
  	private SlicerType slicerType;
! 	
! 	
! 	
  	public SlicerByTimePeriod(TimeSeries series, Period period, DateTime begin, SlicerType slicerType) {
  		splittedSeries = new ArrayList<TimeSeries>();
--- 22,30 ----
  
  	private DateTime periodBegin;
! 
  	private transient static Logger LOG = Logger.getLogger(SlicerByTimePeriod.class);
! 
  	private SlicerType slicerType;
! 
  	public SlicerByTimePeriod(TimeSeries series, Period period, DateTime begin, SlicerType slicerType) {
  		splittedSeries = new ArrayList<TimeSeries>();
***************
*** 42,52 ****
  	}
  
! 	public TimeSeriesSlicer applyForType(SlicerType type){
  		if (type == this.slicerType) {
  			return this;
  		}
! 		return new SlicerByTimePeriod(this.series,this.period,this.periodBegin ,type);
  	}
! 	
  	private void split() {
  		LOG.debug(String.format("Spliting %s  ", series));
--- 40,50 ----
  	}
  
! 	public TimeSeriesSlicer applyForType(SlicerType type) {
  		if (type == this.slicerType) {
  			return this;
  		}
! 		return new SlicerByTimePeriod(this.series, this.period, this.periodBegin, type);
  	}
! 
  	private void split() {
  		LOG.debug(String.format("Spliting %s  ", series));
***************
*** 72,78 ****
  				LOG.debug(String.format("Interval %s before  %s ", interval, series.getTick(index).getDate()));
  
! 				if(slicerType == SlicerType.REGULAR)
  					sliceBeginIndex = index;
! 								
  				begin = end;
  				end = begin.plus(period);
--- 70,76 ----
  				LOG.debug(String.format("Interval %s before  %s ", interval, series.getTick(index).getDate()));
  
! 				if (slicerType == SlicerType.REGULAR)
  					sliceBeginIndex = index;
! 
  				begin = end;
  				end = begin.plus(period);
***************
*** 123,141 ****
  
  	private String periodToString(String sPeriod) {
! 		if(period.getYears() > 0)
  			sPeriod += period.getYears() + " year(s) ,";
! 		if(period.getMonths() > 0)
  			sPeriod += period.getMonths() + " month(s) ,";
! 		if(period.getDays()> 0 )
  			sPeriod += period.getDays() + " day(s) ,";
! 		if(period.getHours()> 0 )
  			sPeriod += period.getHours() + " day(s) ,";
! 		if(period.getMinutes()> 0 )
  			sPeriod += period.getMinutes() + " day(s) ,";
! 		return sPeriod.substring(0,sPeriod.length()-2);
  	}
  
  	public String getPeriod() {
! 		return this.periodBegin.toString("hh:mm dd/MM/yyyy - ") + series.getTick(series.getEnd()).getDate().toString("hh:mm dd/MM/yyyy");
  	}
  
--- 121,140 ----
  
  	private String periodToString(String sPeriod) {
! 		if (period.getYears() > 0)
  			sPeriod += period.getYears() + " year(s) ,";
! 		if (period.getMonths() > 0)
  			sPeriod += period.getMonths() + " month(s) ,";
! 		if (period.getDays() > 0)
  			sPeriod += period.getDays() + " day(s) ,";
! 		if (period.getHours() > 0)
  			sPeriod += period.getHours() + " day(s) ,";
! 		if (period.getMinutes() > 0)
  			sPeriod += period.getMinutes() + " day(s) ,";
! 		return sPeriod.substring(0, sPeriod.length() - 2);
  	}
  
  	public String getPeriod() {
! 		return this.periodBegin.toString("hh:mm dd/MM/yyyy - ")
! 				+ series.getTick(series.getEnd()).getDate().toString("hh:mm dd/MM/yyyy");
  	}