Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[8376] trunk/soft/fudaa-crue/crue-core/src
|
From: <de...@us...> - 2013-04-03 21:09:48
|
Revision: 8376
http://fudaa.svn.sourceforge.net/fudaa/?rev=8376&view=rev
Author: deniger
Date: 2013-04-03 21:09:35 +0000 (Wed, 03 Apr 2013)
Log Message:
-----------
Correction bugs divers
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-core/src/test/java/org/fudaa/dodico/crue/common/transformer/ToStringTransformerMillisTest.java
Added Paths:
-----------
trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/
trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerDate.java
trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerMillis.java
trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerSecond.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/transformer/ToStringTransformerMillis.java
trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/transformer/ToStringTransformerSecond.java
Copied: trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerDate.java (from rev 8335, trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/transformer/ToStringTransformerSecond.java)
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerDate.java (rev 0)
+++ trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerDate.java 2013-04-03 21:09:35 UTC (rev 8376)
@@ -0,0 +1,82 @@
+/*
+ GPL 2
+ */
+package org.fudaa.dodico.crue.common.time;
+
+import org.apache.commons.lang.StringUtils;
+import org.fudaa.ctulu.CtuluNumberFormatI;
+import org.fudaa.dodico.crue.common.transformer.ToStringTransformer;
+import org.fudaa.dodico.crue.common.transformer.ToStringTransformer;
+import org.fudaa.dodico.crue.common.transformer.ToStringTransformer;
+import org.joda.time.LocalDateTime;
+import org.joda.time.format.DateTimeFormatter;
+import org.joda.time.format.ISODateTimeFormat;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class ToStringTransformerDate implements ToStringTransformer, CtuluNumberFormatI {
+
+ private static final DateTimeFormatter XSD_DATE_FORMATTER = ISODateTimeFormat.dateHourMinuteSecondMillis();
+ LocalDateTime date;
+ ToStringTransformerSecond initTransformer = new ToStringTransformerSecond();
+
+ public static String format(LocalDateTime dateTime) {
+ String formatted = dateTime.toString(XSD_DATE_FORMATTER);
+ return StringUtils.removeEnd(formatted, ".000");
+ }
+
+ public ToStringTransformerDate(LocalDateTime date) {
+ this.date = date;
+ }
+
+ public LocalDateTime getDate() {
+ return date;
+ }
+
+ public void setDate(LocalDateTime date) {
+ this.date = date;
+ }
+
+ /**
+ * @param in in est en second.
+ * @return
+ */
+ @Override
+ public String transform(Object in) {
+ if (in == null) {
+ return StringUtils.EMPTY;
+ }
+ if (date == null) {
+ return initTransformer.transform(in);
+ }
+ Number value = (Number) in;
+ LocalDateTime plusMillis = date.plusMillis((int) (value.doubleValue() * 1000));
+ return plusMillis.toString(XSD_DATE_FORMATTER);
+ }
+
+ @Override
+ public CtuluNumberFormatI getCopy() {
+ return this;
+ }
+
+ @Override
+ public String toLocalizedPattern() {
+ return null;
+ }
+
+ @Override
+ public boolean isDecimal() {
+ return true;
+ }
+
+ @Override
+ public String format(double sec) {
+ if (date == null) {
+ return initTransformer.format(sec);
+ }
+ LocalDateTime plusMillis = date.plusMillis((int) (sec * 1000));
+ return plusMillis.toString(XSD_DATE_FORMATTER);
+ }
+}
Copied: trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerMillis.java (from rev 8335, trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/transformer/ToStringTransformerMillis.java)
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerMillis.java (rev 0)
+++ trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerMillis.java 2013-04-03 21:09:35 UTC (rev 8376)
@@ -0,0 +1,61 @@
+/*
+ GPL 2
+ */
+package org.fudaa.dodico.crue.common.time;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.apache.commons.lang.StringUtils;
+import org.fudaa.dodico.crue.common.transformer.ToStringTransformer;
+import org.joda.time.Period;
+import org.joda.time.PeriodType;
+import org.joda.time.format.PeriodFormatter;
+import org.joda.time.format.PeriodFormatterBuilder;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class ToStringTransformerMillis implements ToStringTransformer {
+
+ PeriodFormatter dureeFormater = new PeriodFormatterBuilder()
+ .appendDays().appendSeparatorIfFieldsBefore(":")
+ .printZeroAlways().minimumPrintedDigits(2).
+ appendHours().printZeroAlways().appendSuffix(":")
+ .appendMinutes().minimumPrintedDigits(2).appendSuffix(":")
+ .appendSecondsWithOptionalMillis().minimumPrintedDigits(2).toFormatter();
+
+ @Override
+ public String transform(Object in) {
+ if (in == null) {
+ return StringUtils.EMPTY;
+ }
+ Long value = (Long) in;
+ return dureeFormater.print(createPeriodFromMillis(value.longValue()));
+ }
+
+ public Double parseInSec(String in) {
+ try {
+ if (in.indexOf('.') < 0) {
+ in = in + ".000";
+ }
+ int countMatches = StringUtils.countMatches(in, ":");
+ if (countMatches == 2) {
+ in = "00:" + in;
+ }
+ final Period parsePeriod = dureeFormater.parsePeriod(in);
+ return parsePeriod == null ? null : Double.valueOf(parsePeriod.toStandardDuration().getMillis() / 1000d);
+ } catch (Exception ex) {
+ Logger.getLogger(ToStringTransformerMillis.class.getName()).log(Level.FINE, "message {0}", ex);
+ }
+ return null;
+ }
+
+ public String format(long millis) {
+ return dureeFormater.print(createPeriodFromMillis(millis));
+ }
+
+ public static Period createPeriodFromMillis(long millis) {
+ return new Period(millis).normalizedStandard(PeriodType.dayTime());
+ }
+}
Copied: trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerSecond.java (from rev 8335, trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/transformer/ToStringTransformerSecond.java)
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerSecond.java (rev 0)
+++ trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerSecond.java 2013-04-03 21:09:35 UTC (rev 8376)
@@ -0,0 +1,51 @@
+/*
+ GPL 2
+ */
+package org.fudaa.dodico.crue.common.time;
+
+import org.apache.commons.lang.StringUtils;
+import org.fudaa.ctulu.CtuluNumberFormatI;
+import org.fudaa.dodico.crue.common.transformer.ToStringTransformer;
+import org.fudaa.dodico.crue.common.transformer.ToStringTransformer;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class ToStringTransformerSecond implements ToStringTransformer, CtuluNumberFormatI {
+
+ ToStringTransformerMillis millis = new ToStringTransformerMillis();
+
+ @Override
+ public String transform(Object in) {
+ if (in == null) {
+ return StringUtils.EMPTY;
+ }
+ Number value = (Number) in;
+ return millis.format((long) (value.doubleValue() * 1000L));
+ }
+
+ @Override
+ public CtuluNumberFormatI getCopy() {
+ return this;
+ }
+
+ @Override
+ public String toLocalizedPattern() {
+ return null;
+ }
+
+ @Override
+ public boolean isDecimal() {
+ return true;
+ }
+
+ @Override
+ public String format(double sec) {
+ return millis.format((long) (sec * 1000L));
+ }
+
+ public double parseInSec(String in) {
+ return millis.parseInSec(in);
+ }
+}
Deleted: trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/transformer/ToStringTransformerMillis.java
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/transformer/ToStringTransformerMillis.java 2013-04-03 13:10:39 UTC (rev 8375)
+++ trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/transformer/ToStringTransformerMillis.java 2013-04-03 21:09:35 UTC (rev 8376)
@@ -1,61 +0,0 @@
-/*
- GPL 2
- */
-package org.fudaa.dodico.crue.common.transformer;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.apache.commons.lang.StringUtils;
-import org.joda.time.Period;
-import org.joda.time.PeriodType;
-import org.joda.time.format.PeriodFormatter;
-import org.joda.time.format.PeriodFormatterBuilder;
-
-/**
- *
- * @author Frederic Deniger
- */
-public class ToStringTransformerMillis implements ToStringTransformer {
-
- PeriodFormatter dureeFormater = new PeriodFormatterBuilder()
- .appendDays().appendSeparatorIfFieldsBefore(":")
- .printZeroAlways().minimumPrintedDigits(2).
- appendHours().printZeroAlways().appendSuffix(":")
- .appendMinutes().minimumPrintedDigits(2).appendSuffix(":")
- .appendSecondsWithOptionalMillis().minimumPrintedDigits(2).toFormatter();
-
- @Override
- public String transform(Object in) {
- if (in == null) {
- return StringUtils.EMPTY;
- }
- Long value = (Long) in;
- return dureeFormater.print(createPeriodFromMillis(value.longValue()));
- }
-
- public Double parseInSec(String in) {
- try {
- String toUse = in;
- if (in.indexOf('.') < 0) {
- in = in + ".000";
- }
- int countMatches = StringUtils.countMatches(in, ":");
- if (countMatches == 2) {
- in = "00:" + in;
- }
- final Period parsePeriod = dureeFormater.parsePeriod(in);
- return parsePeriod == null ? null : Double.valueOf(parsePeriod.toStandardDuration().getMillis() / 1000d);
- } catch (Exception ex) {
- Logger.getLogger(ToStringTransformerMillis.class.getName()).log(Level.FINE, "message {0}", ex);
- }
- return null;
- }
-
- public String format(long millis) {
- return dureeFormater.print(createPeriodFromMillis(millis));
- }
-
- public static Period createPeriodFromMillis(long millis) {
- return new Period(millis).normalizedStandard(PeriodType.dayTime());
- }
-}
Deleted: trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/transformer/ToStringTransformerSecond.java
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/transformer/ToStringTransformerSecond.java 2013-04-03 13:10:39 UTC (rev 8375)
+++ trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/transformer/ToStringTransformerSecond.java 2013-04-03 21:09:35 UTC (rev 8376)
@@ -1,49 +0,0 @@
-/*
- GPL 2
- */
-package org.fudaa.dodico.crue.common.transformer;
-
-import org.apache.commons.lang.StringUtils;
-import org.fudaa.ctulu.CtuluNumberFormatI;
-
-/**
- *
- * @author Frederic Deniger
- */
-public class ToStringTransformerSecond implements ToStringTransformer, CtuluNumberFormatI {
-
- ToStringTransformerMillis millis = new ToStringTransformerMillis();
-
- @Override
- public String transform(Object in) {
- if (in == null) {
- return StringUtils.EMPTY;
- }
- Number value = (Number) in;
- return millis.format((long) (value.doubleValue() * 1000L));
- }
-
- @Override
- public CtuluNumberFormatI getCopy() {
- return this;
- }
-
- @Override
- public String toLocalizedPattern() {
- return null;
- }
-
- @Override
- public boolean isDecimal() {
- return true;
- }
-
- @Override
- public String format(double sec) {
- return millis.format((long) (sec * 1000L));
- }
-
- public double parseInSec(String in) {
- return millis.parseInSec(in);
- }
-}
Modified: trunk/soft/fudaa-crue/crue-core/src/test/java/org/fudaa/dodico/crue/common/transformer/ToStringTransformerMillisTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/test/java/org/fudaa/dodico/crue/common/transformer/ToStringTransformerMillisTest.java 2013-04-03 13:10:39 UTC (rev 8375)
+++ trunk/soft/fudaa-crue/crue-core/src/test/java/org/fudaa/dodico/crue/common/transformer/ToStringTransformerMillisTest.java 2013-04-03 21:09:35 UTC (rev 8376)
@@ -3,6 +3,7 @@
*/
package org.fudaa.dodico.crue.common.transformer;
+import org.fudaa.dodico.crue.common.time.ToStringTransformerMillis;
import static org.junit.Assert.*;
import org.junit.Test;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
