tail-cvs

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

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

Modified Files:
	CellStylist.java TimeSeriesXlsGenerator.java 
Log Message:


Index: TimeSeriesXlsGenerator.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls/TimeSeriesXlsGenerator.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TimeSeriesXlsGenerator.java	21 Nov 2007 21:55:20 -0000	1.8
--- TimeSeriesXlsGenerator.java	3 Dec 2007 18:24:20 -0000	1.9
***************
*** 2,5 ****
--- 2,7 ----
  
  import java.io.IOException;
+ import java.util.ArrayList;
+ import java.util.List;
  
  import net.sf.tail.ConstrainedTimeSeries;
***************
*** 16,19 ****
--- 18,22 ----
  import org.apache.poi.hssf.usermodel.HSSFSheet;
  import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+ import org.apache.poi.hssf.util.Region;
  
  public class TimeSeriesXlsGenerator {
***************
*** 46,56 ****
  		row = generateTitle(row, title, style);
  		
! 		style = stylist.createSubTitleCellStyle();
! 		String[] subtitle = new String[4];
! 		subtitle[0] = "Stock:";
! 		subtitle[1] = report.getSlicer().getSeries().getName();
! 		subtitle[2] = "for:";
! 		subtitle[3] = report.getSlicer().getSeries().getPeriodName();
! 		row = generateSubTitle(row, subtitle, style);
  		
  		style = stylist.createHeaderCellStyle();
--- 49,68 ----
  		row = generateTitle(row, title, style);
  		
! 		List<HSSFCellStyle> styles = new ArrayList<HSSFCellStyle>();
! 		styles.add(stylist.createHeaderCellStyle());
! 		styles.add(stylist.createScriptStyle());
! 		styles.add(stylist.createHeaderCellStyle());
! 		styles.add(stylist.createScriptStyle());
! 		
! 		List<String> line = new ArrayList<String>();
! 		line.add("Stock:");
! 		line.add(report.getSlicer().getSeries().getName());
! 		line.add("for:");
! 		line.add(report.getSlicer().getSeries().getPeriodName());
! 		row = generateLine(row, line, styles);
! 
! 		int flag = row++;
! 		
! 		row++;
  		
  		style = stylist.createHeaderCellStyle();
***************
*** 62,65 ****
--- 74,89 ----
  
  		stylist.rearrangeSheet(sheet, 11);
+ 
+ 		
+ 		
+ 		this.sheet.addMergedRegion(new Region(4,(short)2,3,(short)8));
+ 		
+ 		style = stylist.createScriptStyle();
+ 		
+ 		line = new ArrayList<String>();
+ 		line.add("Script:");
+ 		line.add(report.getStrategiesScript());
+ 		
+ 		row = generateLine(flag, line, styles);
  		
  		LOG.info("Time Series generated (" + (System.currentTimeMillis() - time )+ " miliseconds)");
***************
*** 78,91 ****
  	}
  	
! 	private int generateSubTitle(int firstRow, String[] title,  HSSFCellStyle style) {
  		HSSFRow rowHeader = sheet.createRow((short) firstRow);
  		int columnIndex = INDEX_FIRST_COLUMN;
  
! 		createCell(rowHeader, title[0], (short) columnIndex++, style);
! 		createCell(rowHeader, title[1], (short) columnIndex++, style);
! 		createCell(rowHeader, title[2], (short) columnIndex++, style);
! 		createCell(rowHeader, title[3], (short) columnIndex++, style);
  
! 		LOG.info("Subtitle created");
  		return firstRow+2;
  	}
--- 102,114 ----
  	}
  	
! 	private int generateLine(int firstRow, List<String> title,List<HSSFCellStyle> styles) {
  		HSSFRow rowHeader = sheet.createRow((short) firstRow);
  		int columnIndex = INDEX_FIRST_COLUMN;
  
! 		for (int i = 0; i < title.size(); i++) {
! 			createCell(rowHeader, title.get(i), (short) columnIndex++, styles.get(i));
! 		}
  
! 		LOG.info("Line created");
  		return firstRow+2;
  	}

Index: CellStylist.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls/CellStylist.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** CellStylist.java	5 Nov 2007 23:25:59 -0000	1.9
--- CellStylist.java	3 Dec 2007 18:24:20 -0000	1.10
***************
*** 226,229 ****
--- 226,241 ----
  		return style;
  	}
+ 	
+ 	public HSSFCellStyle createScriptStyle() {
+ 		HSSFCellStyle style = workbook.createCellStyle();
+ 		style.setAlignment(HSSFCellStyle.ALIGN_LEFT);
+ 		
+ 		HSSFFont font = workbook.createFont();
+ 		font.setFontName("Arial");
+ 		font.setFontHeightInPoints((short) 12);
+ 		font.setColor(HSSFColor.BLACK.index);
+ 		style.setFont(font);
+ 		return style;
+ 	}
  
  }
\ No newline at end of file