[Tail-cvs] Tail/src/java/net/sf/tail/graphics SeriesDataset.java, 1.2

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

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

Modified Files:
	SeriesDataset.java 
Log Message:
Aperfeiçoado o gráfico e criado testes para o dataset


Index: SeriesDataset.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/graphics/SeriesDataset.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SeriesDataset.java	7 Jul 2007 18:45:23 -0000	1.1
--- SeriesDataset.java	21 Jul 2007 15:13:45 -0000	1.2
***************
*** 13,16 ****
--- 13,17 ----
  import org.jfree.data.general.AbstractDataset;
  
+ @SuppressWarnings("unchecked")
  public class SeriesDataset extends AbstractDataset implements CategoryDataset {
  
***************
*** 22,26 ****
  	private SimpleDateFormat dateFormat;
  
! 	private final int DATASET_SIZE = 50;
  
  	private List<Indicator<? extends Number>> indicators;
--- 23,27 ----
  	private SimpleDateFormat dateFormat;
  
! 	private final int DATASET_SIZE;
  
  	private List<Indicator<? extends Number>> indicators;
***************
*** 40,43 ****
--- 41,45 ----
  		this.lastIndex = lastIndex;
  		this.series = series;
+ 		this.DATASET_SIZE = lastIndex - firstIndex;
  
  		dateFormat = new SimpleDateFormat("hh:mm d/M/yyyy");
***************
*** 75,79 ****
  		for (int i = 0; i < indicators.size(); i++) {
  			for (int j = firstIndex; j <= lastIndex; j++) {
! 				data.addValue(indicators.get(i).getValue(j), indicators.get(i).getClass().getSimpleName() ,dateFormat.format(series.getTick(j).getData().getTime()));
  			}
  		}
--- 77,81 ----
  		for (int i = 0; i < indicators.size(); i++) {
  			for (int j = firstIndex; j <= lastIndex; j++) {
! 				data.addValue(indicators.get(i).getValue(j), indicators.get(i).getName() ,dateFormat.format(series.getTick(j).getData().getTime()));
  			}
  		}
***************
*** 125,129 ****
  			lastIndex++;
  			for (Indicator<? extends Number> indicator : indicators) {
! 				data.addValue(indicator.getValue(lastIndex), indicator.getClass().getSimpleName() ,dateFormat.format(series.getTick(lastIndex).getData().getTime()));
  			}
  
--- 127,131 ----
  			lastIndex++;
  			for (Indicator<? extends Number> indicator : indicators) {
! 				data.addValue(indicator.getValue(lastIndex), indicator.getName() ,dateFormat.format(series.getTick(lastIndex).getData().getTime()));
  			}
  
***************
*** 139,143 ****
  	}
  
- 
  	public void moveLeft() {
  		if(firstIndex > 0){
--- 141,144 ----
***************
*** 152,156 ****
  		}
  	}
- 	
- 
  }
--- 153,155 ----