[Tail-cvs] Tail/src/java/net/sf/tail/report Report.java, 1.11 ReportGenerator.java, 1.7

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

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

Modified Files:
	Report.java ReportGenerator.java 
Log Message:
problemas com o cvs

Index: ReportGenerator.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/ReportGenerator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ReportGenerator.java	20 Aug 2007 22:25:40 -0000	1.6
--- ReportGenerator.java	25 Aug 2007 12:30:01 -0000	1.7
***************
*** 16,24 ****
  	static final String FM_TEMPLATE_DIR = "src/templates";
  
! 	public StringBuffer generate(Report report) throws IOException{
! 		return generate(report,Collections.<AnalysisCriterion>emptyList());
  	}
! 	
! 	public StringBuffer generate(Report report,List<AnalysisCriterion> criterion) throws IOException {
  		Configuration cfg = new Configuration();
  		cfg.setDirectoryForTemplateLoading(new File(FM_TEMPLATE_DIR));
--- 16,24 ----
  	static final String FM_TEMPLATE_DIR = "src/templates";
  
! 	public StringBuffer generate(Report report) throws IOException {
! 		return generate(report, Collections.<AnalysisCriterion> emptyList());
  	}
! 
! 	public StringBuffer generate(Report report, List<AnalysisCriterion> criterion) throws IOException {
  		Configuration cfg = new Configuration();
  		cfg.setDirectoryForTemplateLoading(new File(FM_TEMPLATE_DIR));
***************
*** 27,35 ****
  
  		Map<String, Object> map = new HashMap<String, Object>();
! 		
! 		map.put("report", report);		
  		map.put("criterions", criterion);
- 		
- 	
  
  		FreemarkerProcessor processor = new FreemarkerProcessor(cfg);
--- 27,33 ----
  
  		Map<String, Object> map = new HashMap<String, Object>();
! 
! 		map.put("report", report);
  		map.put("criterions", criterion);
  
  		FreemarkerProcessor processor = new FreemarkerProcessor(cfg);

Index: Report.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/Report.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Report.java	23 Aug 2007 12:47:26 -0000	1.10
--- Report.java	25 Aug 2007 12:30:01 -0000	1.11
***************
*** 21,26 ****
  	private Number criterionValue;
  
! 	private Map<Number,AnalysisCriterion> additionalCriteria;
! 	
  	public Report(AnalysisCriterion criterion, TimeSeriesSlicer slicer, List<Decision> decisions) {
  		this.applyedCriterion = criterion;
--- 21,26 ----
  	private Number criterionValue;
  
! 	private Map<Number, AnalysisCriterion> additionalCriteria;
! 
  	public Report(AnalysisCriterion criterion, TimeSeriesSlicer slicer, List<Decision> decisions) {
  		this.applyedCriterion = criterion;
***************
*** 30,35 ****
  		criterionValue = criterion.summarize(slicer.getSeries(), decisions);
  	}
! 	
! 	public Number addSummarizedCriteria(AnalysisCriterion criterion){
  		Number result = criterion.summarize(slicer.getSeries(), decisions);
  		additionalCriteria.put(result, criterion);
--- 30,35 ----
  		criterionValue = criterion.summarize(slicer.getSeries(), decisions);
  	}
! 
! 	public Number addSummarizedCriteria(AnalysisCriterion criterion) {
  		Number result = criterion.summarize(slicer.getSeries(), decisions);
  		additionalCriteria.put(result, criterion);
***************
*** 53,57 ****
  	}
  
! 	public List<Trade> getAllTrades(){
  		List<Trade> trades = new ArrayList<Trade>();
  		for (Decision decision : decisions) {
--- 53,57 ----
  	}
  
! 	public List<Trade> getAllTrades() {
  		List<Trade> trades = new ArrayList<Trade>();
  		for (Decision decision : decisions) {
***************
*** 103,106 ****
  		return true;
  	}
! 	
  }
--- 103,106 ----
  		return true;
  	}
! 
  }