Menu
▾
▴
fudaa-svn-commit
|
From: <de...@us...> - 2014-10-09 21:06:40
|
Revision: 8868
http://sourceforge.net/p/fudaa/svn/8868
Author: deniger
Date: 2014-10-09 21:06:30 +0000 (Thu, 09 Oct 2014)
Log Message:
-----------
prise en compte d'une valeur null
Modified Paths:
--------------
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/BooleanArrayConverter.java
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/DoubleArrayConverter.java
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/FloatArrayConverter.java
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/IntegerArrayConverter.java
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/BooleanArrayConverter.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/BooleanArrayConverter.java 2014-10-09 20:56:03 UTC (rev 8867)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/BooleanArrayConverter.java 2014-10-09 21:06:30 UTC (rev 8868)
@@ -20,16 +20,30 @@
*/
public class BooleanArrayConverter implements Converter {
+ private String emptyValue = CtuluLibString.getEmptyTableau();
+
+ public String getEmptyValue() {
+ return emptyValue;
+ }
+
+ public void setEmptyValue(String emptyValue) {
+ this.emptyValue = emptyValue;
+ }
+
@Override
public void marshal(Object source, HierarchicalStreamWriter writer, MarshallingContext context) {
boolean[] values = (boolean[]) source;
- writer.setValue(CtuluLibString.arrayToString(values, " "));
+ if (values == null || values.length == 0) {
+ writer.setValue(emptyValue);
+ } else {
+ writer.setValue(CtuluLibString.arrayToString(values, " "));
+ }
}
@Override
public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
String value = reader.getValue();
- if (CtuluLibString.getEmptyTableau().equals(value)) {
+ if (CtuluLibString.getEmptyTableau().equals(value) || emptyValue.equals(value)) {
return FuEmptyArrays.BOOLEAN0;
} else if (CtuluLibString.getNullString().equals(value)) {
return null;
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/DoubleArrayConverter.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/DoubleArrayConverter.java 2014-10-09 20:56:03 UTC (rev 8867)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/DoubleArrayConverter.java 2014-10-09 21:06:30 UTC (rev 8868)
@@ -19,17 +19,31 @@
*/
public class DoubleArrayConverter implements Converter {
+ private String emptyValue = CtuluLibString.getEmptyTableau();
+
+ public String getEmptyValue() {
+ return emptyValue;
+ }
+
+ public void setEmptyValue(String emptyValue) {
+ this.emptyValue = emptyValue;
+ }
+
@Override
public void marshal(Object source, HierarchicalStreamWriter writer, MarshallingContext context) {
double[] values = (double[]) source;
- writer.setValue(CtuluLibString.arrayToString(values, " "));
+ if (values == null || values.length == 0) {
+ writer.setValue(emptyValue);
+ } else {
+ writer.setValue(CtuluLibString.arrayToString(values, " "));
+ }
}
@Override
public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
try {
String value = reader.getValue();
- if (CtuluLibString.getEmptyTableau().equals(value)) {
+ if (CtuluLibString.getEmptyTableau().equals(value) || emptyValue.equals(value)) {
return FuEmptyArrays.DOUBLE0;
} else if (CtuluLibString.getNullString().equals(value)) {
return null;
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/FloatArrayConverter.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/FloatArrayConverter.java 2014-10-09 20:56:03 UTC (rev 8867)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/FloatArrayConverter.java 2014-10-09 21:06:30 UTC (rev 8868)
@@ -19,16 +19,30 @@
*/
public class FloatArrayConverter implements Converter {
+ private String emptyValue = CtuluLibString.getEmptyTableau();
+
+ public String getEmptyValue() {
+ return emptyValue;
+ }
+
+ public void setEmptyValue(String emptyValue) {
+ this.emptyValue = emptyValue;
+ }
+
@Override
public void marshal(Object source, HierarchicalStreamWriter writer, MarshallingContext context) {
float[] values = (float[]) source;
- writer.setValue(CtuluLibString.arrayToString(values, " "));
+ if (values == null || values.length == 0) {
+ writer.setValue(emptyValue);
+ } else {
+ writer.setValue(CtuluLibString.arrayToString(values, " "));
+ }
}
@Override
public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
String valueAsText = reader.getValue();
- if (CtuluLibString.getEmptyTableau().equals(valueAsText)) {
+ if (CtuluLibString.getEmptyTableau().equals(valueAsText) || emptyValue.equals(valueAsText)) {
return FuEmptyArrays.FLOAT0;
} else if (CtuluLibString.getNullString().equals(valueAsText)) {
return null;
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/IntegerArrayConverter.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/IntegerArrayConverter.java 2014-10-09 20:56:03 UTC (rev 8867)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/IntegerArrayConverter.java 2014-10-09 21:06:30 UTC (rev 8868)
@@ -19,16 +19,30 @@
*/
public class IntegerArrayConverter implements Converter {
+ private String emptyValue = CtuluLibString.getEmptyTableau();
+
+ public String getEmptyValue() {
+ return emptyValue;
+ }
+
+ public void setEmptyValue(String emptyValue) {
+ this.emptyValue = emptyValue;
+ }
+
@Override
public void marshal(Object source, HierarchicalStreamWriter writer, MarshallingContext context) {
int[] values = (int[]) source;
- writer.setValue(CtuluLibString.arrayToString(values, " "));
+ if (values == null || values.length == 0) {
+ writer.setValue(emptyValue);
+ } else {
+ writer.setValue(CtuluLibString.arrayToString(values, " "));
+ }
}
@Override
public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
String value = reader.getValue();
- if (CtuluLibString.getEmptyTableau().equals(value)) {
+ if (CtuluLibString.getEmptyTableau().equals(value) || emptyValue.equals(value)) {
return FuEmptyArrays.INT0;
} else if (CtuluLibString.getNullString().equals(value)) {
return null;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-10-09 21:08:40
|
Revision: 8869
http://sourceforge.net/p/fudaa/svn/8869
Author: deniger
Date: 2014-10-09 21:08:28 +0000 (Thu, 09 Oct 2014)
Log Message:
-----------
prise en compte d'une valeur null
Modified Paths:
--------------
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/BooleanArrayConverter.java
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/DoubleArrayConverter.java
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/FloatArrayConverter.java
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/IntegerArrayConverter.java
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/BooleanArrayConverter.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/BooleanArrayConverter.java 2014-10-09 21:06:30 UTC (rev 8868)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/BooleanArrayConverter.java 2014-10-09 21:08:28 UTC (rev 8869)
@@ -22,6 +22,13 @@
private String emptyValue = CtuluLibString.getEmptyTableau();
+ public BooleanArrayConverter() {
+ }
+
+ public BooleanArrayConverter(String emptyValue) {
+ this.emptyValue = emptyValue;
+ }
+
public String getEmptyValue() {
return emptyValue;
}
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/DoubleArrayConverter.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/DoubleArrayConverter.java 2014-10-09 21:06:30 UTC (rev 8868)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/DoubleArrayConverter.java 2014-10-09 21:08:28 UTC (rev 8869)
@@ -21,6 +21,13 @@
private String emptyValue = CtuluLibString.getEmptyTableau();
+ public DoubleArrayConverter() {
+ }
+
+ public DoubleArrayConverter(String emptyValue) {
+ this.emptyValue = emptyValue;
+ }
+
public String getEmptyValue() {
return emptyValue;
}
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/FloatArrayConverter.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/FloatArrayConverter.java 2014-10-09 21:06:30 UTC (rev 8868)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/FloatArrayConverter.java 2014-10-09 21:08:28 UTC (rev 8869)
@@ -21,6 +21,13 @@
private String emptyValue = CtuluLibString.getEmptyTableau();
+ public FloatArrayConverter() {
+ }
+
+ public FloatArrayConverter(String emptyValue) {
+ this.emptyValue = emptyValue;
+ }
+
public String getEmptyValue() {
return emptyValue;
}
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/IntegerArrayConverter.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/IntegerArrayConverter.java 2014-10-09 21:06:30 UTC (rev 8868)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/xml/IntegerArrayConverter.java 2014-10-09 21:08:28 UTC (rev 8869)
@@ -21,6 +21,13 @@
private String emptyValue = CtuluLibString.getEmptyTableau();
+ public IntegerArrayConverter() {
+ }
+
+ public IntegerArrayConverter(String emptyValue) {
+ this.emptyValue = emptyValue;
+ }
+
public String getEmptyValue() {
return emptyValue;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X