[Fudaa-svn-commit] SF.net SVN: fudaa:[7721] trunk/framework/ctulu-common/src/main/java/org/ fudaa/ctulu/converter

[<de...@us...>]

Revision: 7721
          http://fudaa.svn.sourceforge.net/fudaa/?rev=7721&view=rev
Author:   deniger
Date:     2012-10-05 22:32:57 +0000 (Fri, 05 Oct 2012)
Log Message:
-----------
support fichier externe

Modified Paths:
--------------
    trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/AbstractPropertyToStringTransformer.java
    trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/ColorToStringTransformer.java

Added Paths:
-----------
    trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/CtuluRangeToStringTransformer.java

Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/AbstractPropertyToStringTransformer.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/AbstractPropertyToStringTransformer.java	2012-10-05 21:19:13 UTC (rev 7720)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/AbstractPropertyToStringTransformer.java	2012-10-05 22:32:57 UTC (rev 7721)
@@ -5,31 +5,33 @@
  * @author deniger ( genesis)
  */
 public abstract class AbstractPropertyToStringTransformer<T> {
-  
+
+  public static final String NULL_STRING = "null";
+
   public String toString(T in) {
     if (in == null) {
       return "null";
     }
     return toStringSafe(in);
   }
-  
+
   public abstract String toStringSafe(T in);
-  
+
   public abstract boolean isValidSafe(String in);
-  
+
   public boolean isValid(String in) {
     if (in == null) {
       return false;
     }
     return isValidSafe(in);
   }
-  
+
   public T fromString(String in) {
-    if (in == null || "null".equals(in)) {
+    if (in == null || NULL_STRING.equals(in)) {
       return null;
     }
     return fromStringSafe(in);
   }
-  
+
   public abstract T fromStringSafe(String in);
 }

Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/ColorToStringTransformer.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/ColorToStringTransformer.java	2012-10-05 21:19:13 UTC (rev 7720)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/ColorToStringTransformer.java	2012-10-05 22:32:57 UTC (rev 7721)
@@ -5,8 +5,6 @@
 
 import com.memoire.fu.FuLib;
 import java.awt.Color;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -45,6 +43,6 @@
 
   @Override
   public boolean isValidSafe(String in) {
-    return fromString(in) != null;
+    return in == null || NULL_STRING.equals(in) || fromString(in) != null;
   }
 }

Copied: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/CtuluRangeToStringTransformer.java (from rev 7718, trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/Point2DDoubleToStringTransformer.java)
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/CtuluRangeToStringTransformer.java	                        (rev 0)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/CtuluRangeToStringTransformer.java	2012-10-05 22:32:57 UTC (rev 7721)
@@ -0,0 +1,42 @@
+/*
+ GPL 2
+ */
+package org.fudaa.ctulu.converter;
+
+import com.memoire.fu.FuLib;
+import java.awt.geom.Point2D;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.fudaa.ctulu.CtuluRange;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class CtuluRangeToStringTransformer extends AbstractPropertyToStringTransformer<CtuluRange> {
+
+  @Override
+  public CtuluRange fromStringSafe(String in) {
+    String[] split = FuLib.split(in, ' ');
+    if (split != null && split.length == 2) {
+      try {
+        double x = Double.parseDouble(split[0]);
+        double y = Double.parseDouble(split[1]);
+        return new CtuluRange(x, y);
+      } catch (NumberFormatException numberFormatException) {
+        Logger.getLogger(CtuluRangeToStringTransformer.class.getName()).log(Level.INFO, "message {0}", numberFormatException);
+      }
+    }
+    return null;
+  }
+
+  @Override
+  public boolean isValidSafe(String in) {
+    return fromString(in) != null;
+  }
+
+  @Override
+  public String toStringSafe(CtuluRange in) {
+    return in.getMin() + " " + in.getMax();
+  }
+}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.