tail-cvs

[Thies <tg...@us...>]

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

Modified Files:
	CedroTimeSeriesLoader.java 
Log Message:
Refatoração da leitura de data

Index: CedroTimeSeriesLoader.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/reader/CedroTimeSeriesLoader.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** CedroTimeSeriesLoader.java	8 Aug 2007 18:53:05 -0000	1.13
--- CedroTimeSeriesLoader.java	8 Aug 2007 19:56:19 -0000	1.14
***************
*** 4,8 ****
--- 4,11 ----
  import java.io.InputStream;
  import java.nio.charset.Charset;
+ import java.text.ParseException;
+ import java.text.SimpleDateFormat;
  import java.util.ArrayList;
+ import java.util.Date;
  import java.util.List;
  
***************
*** 13,18 ****
  import org.apache.log4j.Logger;
  import org.joda.time.DateTime;
- import org.joda.time.format.DateTimeFormat;
- import org.joda.time.format.DateTimeFormatter;
  
  import com.csvreader.CsvReader;
--- 16,19 ----
***************
*** 30,43 ****
  
  		while (reader.readRecord()) {
! 			DateTimeFormatter dateTimeFormart;
  
  			if (reader.get(0).length() > 10)
! 				dateTimeFormart = DateTimeFormat.forPattern("D/M/yyyy HH:mm:ss");
  			else
! 				dateTimeFormart = DateTimeFormat.forPattern("D/M/yyyy");
! 
! 			DateTime date = null;
! 
! 			date = dateTimeFormart.parseDateTime(reader.get(0));
  			
  			double open = java.lang.Double.parseDouble(reader.get(1));
--- 31,49 ----
  
  		while (reader.readRecord()) {
! 			SimpleDateFormat simpleDate;
  
  			if (reader.get(0).length() > 10)
! 				simpleDate = new SimpleDateFormat("dd/M/yyyy HH:mm:ss");
  			else
! 				simpleDate = new SimpleDateFormat("dd/M/yyyy");
! 			
! 			Date dateUtil;
! 			try {
! 				dateUtil = simpleDate.parse(reader.get(0));
! 			} catch (ParseException e) {
! 				throw new RuntimeException(e);
! 			}
! 			
! 			DateTime date = new DateTime(dateUtil.getTime());
  			
  			double open = java.lang.Double.parseDouble(reader.get(1));