Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[7728] trunk/framework
|
From: <de...@us...> - 2012-10-09 16:58:05
|
Revision: 7728
http://fudaa.svn.sourceforge.net/fudaa/?rev=7728&view=rev
Author: deniger
Date: 2012-10-09 16:57:53 +0000 (Tue, 09 Oct 2012)
Log Message:
-----------
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/BooleanToStringTransformer.java
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/ColorToStringTransformer.java
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/CtuluRangeToStringTransformer.java
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/DoubleToStringTransformer.java
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/FloatToStringTransformer.java
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/FontToStringTransformer.java
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/IntegerToStringTransformer.java
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/Point2DDoubleArrayToStringTransformer.java
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/Point2DDoubleToStringTransformer.java
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/PropertyToStringCacheDecorator.java
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/StringToStringTransformer.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeHorizontalPersist.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeVerticalPersist.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbePersist.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/convert/EGAxePersistConverter.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/convert/EGCourbePersistConverter.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/convert/EGPersistHelper.java
trunk/framework/ebli-1d/src/test/java/org/fudaa/ebli/courbe/convert/EGAxePersistConverterTest.java
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/converter/ToStringTransfomerXstreamConverter.java
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/converter/TraceBoxToStringTransformer.java
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/converter/TraceIconModelToStringTransformer.java
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/converter/TraceLigneModelToStringTransformer.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-08 20:22:12 UTC (rev 7727)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/AbstractPropertyToStringTransformer.java 2012-10-09 16:57:53 UTC (rev 7728)
@@ -7,7 +7,16 @@
public abstract class AbstractPropertyToStringTransformer<T> {
public static final String NULL_STRING = "null";
+ private final Class supportedClass;
+ public AbstractPropertyToStringTransformer(Class supportedClass) {
+ this.supportedClass = supportedClass;
+ }
+
+ public Class getSupportedClass() {
+ return supportedClass;
+ }
+
public String toString(T in) {
if (in == null) {
return "null";
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/BooleanToStringTransformer.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/BooleanToStringTransformer.java 2012-10-08 20:22:12 UTC (rev 7727)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/BooleanToStringTransformer.java 2012-10-09 16:57:53 UTC (rev 7728)
@@ -12,6 +12,10 @@
*/
public class BooleanToStringTransformer extends AbstractPropertyToStringTransformer<Boolean> {
+ public BooleanToStringTransformer() {
+ super(Boolean.class);
+ }
+
@Override
public Boolean fromStringSafe(String in) {
try {
@@ -31,5 +35,4 @@
public String toStringSafe(Boolean in) {
return in.toString();
}
-
}
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-08 20:22:12 UTC (rev 7727)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/ColorToStringTransformer.java 2012-10-09 16:57:53 UTC (rev 7728)
@@ -15,6 +15,7 @@
public class ColorToStringTransformer extends AbstractPropertyToStringTransformer<Color> {
public ColorToStringTransformer() {
+ super(Color.class);
}
@Override
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/CtuluRangeToStringTransformer.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/CtuluRangeToStringTransformer.java 2012-10-08 20:22:12 UTC (rev 7727)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/CtuluRangeToStringTransformer.java 2012-10-09 16:57:53 UTC (rev 7728)
@@ -15,6 +15,10 @@
*/
public class CtuluRangeToStringTransformer extends AbstractPropertyToStringTransformer<CtuluRange> {
+ public CtuluRangeToStringTransformer() {
+ super(CtuluRange.class);
+ }
+
@Override
public CtuluRange fromStringSafe(String in) {
String[] split = FuLib.split(in, ' ');
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/DoubleToStringTransformer.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/DoubleToStringTransformer.java 2012-10-08 20:22:12 UTC (rev 7727)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/DoubleToStringTransformer.java 2012-10-09 16:57:53 UTC (rev 7728)
@@ -12,6 +12,10 @@
*/
public class DoubleToStringTransformer extends AbstractPropertyToStringTransformer<Double> {
+ public DoubleToStringTransformer() {
+ super(Double.class);
+ }
+
@Override
public Double fromStringSafe(String in) {
try {
@@ -36,5 +40,4 @@
public String toStringSafe(Double in) {
return in.toString();
}
-
}
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/FloatToStringTransformer.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/FloatToStringTransformer.java 2012-10-08 20:22:12 UTC (rev 7727)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/FloatToStringTransformer.java 2012-10-09 16:57:53 UTC (rev 7728)
@@ -11,7 +11,10 @@
* @author Frederic Deniger
*/
public class FloatToStringTransformer extends AbstractPropertyToStringTransformer<Float> {
-
+ public FloatToStringTransformer() {
+ super(Float.class);
+ }
+
@Override
public Float fromStringSafe(String in) {
try {
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/FontToStringTransformer.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/FontToStringTransformer.java 2012-10-08 20:22:12 UTC (rev 7727)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/FontToStringTransformer.java 2012-10-09 16:57:53 UTC (rev 7728)
@@ -5,8 +5,6 @@
import com.memoire.fu.FuLib;
import java.awt.Font;
-import java.util.HashMap;
-import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -17,6 +15,7 @@
public class FontToStringTransformer extends AbstractPropertyToStringTransformer<Font> {
public FontToStringTransformer() {
+ super(Font.class);
}
@Override
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/IntegerToStringTransformer.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/IntegerToStringTransformer.java 2012-10-08 20:22:12 UTC (rev 7727)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/IntegerToStringTransformer.java 2012-10-09 16:57:53 UTC (rev 7728)
@@ -12,6 +12,10 @@
*/
public class IntegerToStringTransformer extends AbstractPropertyToStringTransformer<Integer> {
+ public IntegerToStringTransformer() {
+ super(Integer.class);
+ }
+
@Override
public Integer fromStringSafe(String in) {
try {
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/Point2DDoubleArrayToStringTransformer.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/Point2DDoubleArrayToStringTransformer.java 2012-10-08 20:22:12 UTC (rev 7727)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/Point2DDoubleArrayToStringTransformer.java 2012-10-09 16:57:53 UTC (rev 7728)
@@ -12,6 +12,10 @@
*/
public class Point2DDoubleArrayToStringTransformer extends AbstractPropertyToStringTransformer<Point2D.Double[]> {
+ public Point2DDoubleArrayToStringTransformer() {
+ super(Point2D.Double[].class);
+ }
+
@Override
public Point2D.Double[] fromStringSafe(String in) {
Point2DDoubleToStringTransformer elemTransformer = new Point2DDoubleToStringTransformer();
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/Point2DDoubleToStringTransformer.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/Point2DDoubleToStringTransformer.java 2012-10-08 20:22:12 UTC (rev 7727)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/Point2DDoubleToStringTransformer.java 2012-10-09 16:57:53 UTC (rev 7728)
@@ -14,6 +14,10 @@
*/
public class Point2DDoubleToStringTransformer extends AbstractPropertyToStringTransformer<Point2D.Double> {
+ public Point2DDoubleToStringTransformer() {
+ super(Point2D.Double.class);
+ }
+
@Override
public Point2D.Double fromStringSafe(String in) {
String[] split = FuLib.split(in, ' ');
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/PropertyToStringCacheDecorator.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/PropertyToStringCacheDecorator.java 2012-10-08 20:22:12 UTC (rev 7727)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/PropertyToStringCacheDecorator.java 2012-10-09 16:57:53 UTC (rev 7728)
@@ -16,6 +16,7 @@
Map<String, T> cache = new HashMap<String, T>();
public PropertyToStringCacheDecorator(AbstractPropertyToStringTransformer<T> decorated) {
+ super(decorated.getSupportedClass());
this.decorated = decorated;
}
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/StringToStringTransformer.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/StringToStringTransformer.java 2012-10-08 20:22:12 UTC (rev 7727)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/converter/StringToStringTransformer.java 2012-10-09 16:57:53 UTC (rev 7728)
@@ -9,6 +9,10 @@
*/
public class StringToStringTransformer extends AbstractPropertyToStringTransformer<String> {
+ public StringToStringTransformer() {
+ super(String.class);
+ }
+
@Override
public String fromStringSafe(String in) {
return in;
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeHorizontalPersist.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeHorizontalPersist.java 2012-10-08 20:22:12 UTC (rev 7727)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeHorizontalPersist.java 2012-10-09 16:57:53 UTC (rev 7728)
@@ -13,61 +13,61 @@
*
* @author Adrien Hadoux
*/
-@XStreamAlias("horizontalAxis")
+@XStreamAlias("HorizontalAxis")
public class EGAxeHorizontalPersist {
- @XStreamAlias("title")
+ @XStreamAlias("Title")
String titre;
- @XStreamAlias("visibleTitle")
+ @XStreamAlias("VisibleTitle")
boolean titreVisible = true;
- @XStreamAlias("unit")
+ @XStreamAlias("Unit")
String unite;
- @XStreamAlias("grid")
+ @XStreamAlias("Grid")
TraceLigne grille;
- @XStreamAlias("visible")
+ @XStreamAlias("Visible")
boolean visible;
- @XStreamAlias("font")
+ @XStreamAlias("Font")
Font font;
- @XStreamAlias("graduations")
+ @XStreamAlias("Graduations")
boolean graduations;
- @XStreamAlias("isIteratorUptodate")
+ @XStreamAlias("IsIteratorUptodate")
boolean isIteratorUptodate;
- @XStreamAlias("lineColor")
+ @XStreamAlias("LineColor")
Color lineColor;
- @XStreamAlias("axisRange")
+ @XStreamAlias("AxisRange")
CtuluRange range;
/**
* Booleen qui indique si l'on trace ou non la graduation
*/
- @XStreamAlias("gridPainted")
+ @XStreamAlias("GridPainted")
boolean traceGrille_ = false;
/**
* Booleen qui indique si l'on trcae
*/
- @XStreamAlias("minorGridPainted")
+ @XStreamAlias("MinorGridPainted")
boolean traceSousGrille_ = false;
- @XStreamAlias("markLine")
+ @XStreamAlias("MarkLine")
TraceLigneModel traceGraduations_ = null;
- @XStreamAlias("minorMarkLine")
+ @XStreamAlias("MinorMarkLine")
TraceLigneModel traceSousGraduations_ = null;
/**
* Mode nb graduations
*/
- @XStreamAlias("step")
+ @XStreamAlias("Step")
int nbPas_;
/**
* Mode on donne la longueur des pas
*/
- @XStreamAlias("stepLength")
+ @XStreamAlias("StepLength")
double longueurPas_;
/**
* le mode de graduation
*/
- @XStreamAlias("modeGraduation")
+ @XStreamAlias("ModeGraduation")
int modeGraduations_;
- @XStreamAlias("sizeMinorGraduation")
+ @XStreamAlias("SizeMinorGraduation")
int nbSousGraduations_;
- @XStreamAlias("extremDisplayed")
+ @XStreamAlias("ExtremDisplayed")
private boolean isExtremiteDessinee_;
public EGAxeHorizontalPersist(final EGAxeHorizontal axeX) {
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeVerticalPersist.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeVerticalPersist.java 2012-10-08 20:22:12 UTC (rev 7727)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeVerticalPersist.java 2012-10-09 16:57:53 UTC (rev 7728)
@@ -14,73 +14,74 @@
* @author Adrien Hadoux
*
*/
-@XStreamAlias("verticalAxis")
+@XStreamAlias("VerticalAxis")
public class EGAxeVerticalPersist {
- @XStreamAlias("right")
+ @XStreamAlias("Right")
boolean droite;
- @XStreamAlias("verticalTitle")
+ @XStreamAlias("VerticalTitle")
boolean titreVertical;
- @XStreamAlias("verticalRightTitle")
+ @XStreamAlias("VerticalRightTitle")
boolean titreVerticalDroite;
- @XStreamAlias("title")
+ @XStreamAlias("Title")
String titre;
- @XStreamAlias("titleIsVisible")
+ @XStreamAlias("TitleIsVisible")
boolean titreVisible = true;
- @XStreamAlias("unit")
+ @XStreamAlias("Unit")
String unite;
- @XStreamAlias("visible")
+ @XStreamAlias("Visible")
boolean visible;
- @XStreamAlias("font")
+ @XStreamAlias("Font")
Font font;
- @XStreamAlias("graduations")
+ @XStreamAlias("Graduations")
boolean graduations;
- @XStreamAlias("grille")
+ @XStreamAlias("Grille")
TraceLigne grille;
- @XStreamAlias("isIteratorUptodate")
+ @XStreamAlias("IsIteratorUptodate")
boolean isIteratorUptodate;
- @XStreamAlias("lineColor")
+ @XStreamAlias("LineColor")
Color lineColor;
- @XStreamAlias("axisRange")
+ @XStreamAlias("AxisRange")
CtuluRange range;
/**
* Booleen qui indique si l'on trace ou non la graduation
*/
- @XStreamAlias("gridPainted")
+ @XStreamAlias("GridPainted")
boolean traceGrille_ = false;
/**
* Booleen qui indique si l'on trcae
*/
- @XStreamAlias("minorGridPainted")
+ @XStreamAlias("MinorGridPainted")
boolean traceSousGrille_ = false;
- @XStreamAlias("markLine")
+ @XStreamAlias("MarkLine")
TraceLigneModel traceGraduations_ = null;
- @XStreamAlias("minorMarkLine")
+ @XStreamAlias("MinorMarkLine")
TraceLigneModel traceSousGraduations_ = null;
/**
* Mode nb graduations
*/
- @XStreamAlias("step")
+ @XStreamAlias("Step")
int nbPas_;
/**
* Mode on donne la longueur des pas
*/
- @XStreamAlias("stepLength")
+ @XStreamAlias("StepLength")
double longueurPas_;
/**
* le mode de graduation
*/
- @XStreamAlias("modeGraduation")
+ @XStreamAlias("ModeGraduation")
int modeGraduations_;
- @XStreamAlias("sizeMinorGraduation")
+ @XStreamAlias("SizeMinorGraduation")
int nbSousGraduations_;
- @XStreamAlias("extremDisplayed")
+ @XStreamAlias("ExtremDisplayed")
private boolean isExtremiteDessinee_;
public EGAxeVerticalPersist(EGAxeVertical axeY) {
// TODO Auto-generated constructor stub
fillInfoWith(axeY);
}
+
public EGAxeVerticalPersist() {
}
@@ -259,8 +260,6 @@
public void setIsExtremiteDessinee(boolean isExtremiteDessinee_) {
this.isExtremiteDessinee_ = isExtremiteDessinee_;
}
-
-
private void fillInfoWith(EGAxeVertical axeY) {
this.droite = axeY.droite_;
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbePersist.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbePersist.java 2012-10-08 20:22:12 UTC (rev 7727)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbePersist.java 2012-10-09 16:57:53 UTC (rev 7728)
@@ -14,16 +14,16 @@
*
* @author Adrien Hadoux
*/
-@XStreamAlias("curve")
+@XStreamAlias("Curve")
public class EGCourbePersist extends EGPersist {
- @XStreamAlias("title")
+ @XStreamAlias("Title")
String title_;
- @XStreamAlias("idGroup")
+ @XStreamAlias("IdGroup")
int Idgroup;
- @XStreamAlias("id")
+ @XStreamAlias("Id")
int id = -1;
- @XStreamAlias("nuagePoint")
+ @XStreamAlias("NuagePoint")
boolean nuagePoints = false;
// /-- les min et max sont purement informatifs --//
@XStreamOmitField
@@ -49,13 +49,13 @@
@XStreamOmitField
double[] ordonnees;
// -- proprietes graphiques --//
- @XStreamAlias("traceBox")
+ @XStreamAlias("TraceBox")
TraceBox tracebox;
- @XStreamAlias("line")
+ @XStreamAlias("Line")
TraceLigneModel lineModel_;
- @XStreamAlias("markLine")
+ @XStreamAlias("MarkLine")
TraceLigneModel tLigneMarqueur_;
- @XStreamAlias("icon")
+ @XStreamAlias("Icon")
TraceIconModel iconeModel;
// -- data specifiques --//
@XStreamOmitField
@@ -63,18 +63,18 @@
@XStreamOmitField
String classeModel;
// -- liste des marqueurs --//
- @XStreamImplicit(itemFieldName = "marks")
+ @XStreamImplicit(itemFieldName = "Marks")
List<EGCourbeMarqueur> listeMarqueurs_;
- @XStreamAlias("surface")
+ @XStreamAlias("Surface")
EGCourbeSurfacePersist surfacePainter;
// -- inverse ou non les x et y --//
- @XStreamAlias("inverse")
+ @XStreamAlias("Inverse")
boolean inverse = false;
- @XStreamAlias("displayLabels")
+ @XStreamAlias("DisplayLabels")
boolean displayLabels = false;
- @XStreamAlias("displayTitle")
+ @XStreamAlias("DisplayTitle")
boolean displayTitle = false;
- @XStreamAlias("verticalLabels")
+ @XStreamAlias("VerticalLabels")
boolean verticalLabels = false;
public EGCourbePersist() {
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/convert/EGAxePersistConverter.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/convert/EGAxePersistConverter.java 2012-10-08 20:22:12 UTC (rev 7727)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/convert/EGAxePersistConverter.java 2012-10-09 16:57:53 UTC (rev 7728)
@@ -8,9 +8,6 @@
import org.fudaa.ebli.converter.TraceToStringConverter;
import org.fudaa.ebli.courbe.EGAxeHorizontalPersist;
import org.fudaa.ebli.courbe.EGAxeVerticalPersist;
-import org.fudaa.ebli.courbe.EGCourbeMarqueur;
-import org.fudaa.ebli.courbe.EGCourbePersist;
-import org.fudaa.ebli.courbe.EGPersist;
/**
*
@@ -39,13 +36,16 @@
public void init() {
if (xstream == null) {
- xstream = EGPersistHelper.initXstream(traceToStringConverter);
+ xstream = EGPersistHelper.createXstream();
+ initXstream(xstream);
}
+ }
+
+ public void initXstream(XStream xstream) {
+ EGPersistHelper.registerDefaultConverters(xstream, traceToStringConverter);
xstream.processAnnotations(EGAxeHorizontalPersist.class);
xstream.processAnnotations(EGAxeVerticalPersist.class);
xstream.alias("range", CtuluRange.class);
- xstream.alias("range", CtuluRange.class);
-
}
public String toXml(EGAxeHorizontalPersist in) {
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/convert/EGCourbePersistConverter.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/convert/EGCourbePersistConverter.java 2012-10-08 20:22:12 UTC (rev 7727)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/convert/EGCourbePersistConverter.java 2012-10-09 16:57:53 UTC (rev 7728)
@@ -36,12 +36,9 @@
public void init() {
if (xstream == null) {
- xstream = EGPersistHelper.initXstream(traceToStringConverter);
+ xstream = EGPersistHelper.createXstream();
+ initXstream(xstream);
}
- xstream.omitField(EGPersist.class, "builderClass");
- xstream.omitField(EGPersist.class, "specificValues");
- xstream.processAnnotations(EGCourbePersist.class);
- xstream.processAnnotations(EGCourbeMarqueur.class);
}
public String toXml(EGCourbePersist in) {
@@ -57,4 +54,14 @@
}
return (EGCourbePersist) xstream.fromXML(in);
}
+
+ public void initXstream(final XStream xstream) {
+ EGPersistHelper.registerDefaultConverters(xstream, traceToStringConverter);
+ xstream.omitField(EGPersist.class, "builderClass");
+ xstream.omitField(EGCourbePersist.class, "id");
+ xstream.omitField(EGCourbePersist.class, "Idgroup");
+ xstream.omitField(EGCourbePersist.class, "specificValues");
+ xstream.processAnnotations(EGCourbePersist.class);
+ xstream.processAnnotations(EGCourbeMarqueur.class);
+ }
}
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/convert/EGPersistHelper.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/convert/EGPersistHelper.java 2012-10-08 20:22:12 UTC (rev 7727)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/convert/EGPersistHelper.java 2012-10-09 16:57:53 UTC (rev 7728)
@@ -8,6 +8,7 @@
import com.thoughtworks.xstream.io.xml.XmlFriendlyNameCoder;
import java.awt.Color;
import java.awt.Font;
+import javax.swing.plaf.FontUIResource;
import org.fudaa.ctulu.CtuluRange;
import org.fudaa.ctulu.converter.CtuluRangeToStringTransformer;
import org.fudaa.ebli.converter.ToStringTransfomerXstreamConverter;
@@ -27,6 +28,7 @@
public static void registerDefaultConverters(XStream xstream, TraceToStringConverter traceToStringConverter) {
xstream.registerConverter(new ToStringTransfomerXstreamConverter(traceToStringConverter.getColorToStringTransformer(), Color.class));
xstream.registerConverter(new ToStringTransfomerXstreamConverter(traceToStringConverter.getFontToStringTransformer(), Font.class));
+ xstream.registerConverter(new ToStringTransfomerXstreamConverter(traceToStringConverter.getFontToStringTransformer(), FontUIResource.class));
xstream.registerConverter(new ToStringTransfomerXstreamConverter(traceToStringConverter.getTraceBoxToStringTransformer(), TraceBox.class));
xstream.registerConverter(new ToStringTransfomerXstreamConverter(traceToStringConverter.getTraceIconModelToStringTransformer(), TraceIconModel.class));
final TraceLigneModelToStringTransformer traceLigneModelToStringTransformer = traceToStringConverter.getTraceLigneModelToStringTransformer();
@@ -35,11 +37,10 @@
xstream.registerConverter(new TraceLigneToStringXstreamConverter(traceLigneModelToStringTransformer));
}
- public static XStream initXstream(TraceToStringConverter traceToStringConverter) {
+ public static XStream createXstream() {
final XmlFriendlyNameCoder replacer = new XmlFriendlyNameCoder("#", "_");
final StaxDriver staxDriver = new StaxDriver(replacer);
final XStream xstream = new XStream(staxDriver);
- registerDefaultConverters(xstream, traceToStringConverter);
return xstream;
}
}
Modified: trunk/framework/ebli-1d/src/test/java/org/fudaa/ebli/courbe/convert/EGAxePersistConverterTest.java
===================================================================
--- trunk/framework/ebli-1d/src/test/java/org/fudaa/ebli/courbe/convert/EGAxePersistConverterTest.java 2012-10-08 20:22:12 UTC (rev 7727)
+++ trunk/framework/ebli-1d/src/test/java/org/fudaa/ebli/courbe/convert/EGAxePersistConverterTest.java 2012-10-09 16:57:53 UTC (rev 7728)
@@ -3,6 +3,7 @@
*/
package org.fudaa.ebli.courbe.convert;
+import com.memoire.bu.BuLib;
import java.awt.Color;
import junit.framework.TestCase;
import org.fudaa.ctulu.CtuluRange;
@@ -16,22 +17,23 @@
* @author Frederic Deniger
*/
public class EGAxePersistConverterTest extends TestCase {
-
+
public EGAxePersistConverterTest(String testName) {
super(testName);
}
-
+
public void testToStringVertical() {
try {
EGAxeVerticalPersist verticalPersist = new EGAxeVerticalPersist();
verticalPersist.setDroite(true);
verticalPersist.setRange(new CtuluRange(0, 10));
+ verticalPersist.setFont(BuLib.DEFAULT_FONT);
EGAxePersistConverter converter = new EGAxePersistConverter();
String toXml = converter.toXml(verticalPersist);
EGAxeVerticalPersist fromXml = converter.fromXmlVertical(toXml);
assertNotNull(fromXml);
assertEquals(verticalPersist.isDroite(), fromXml.isDroite());
-
+
verticalPersist.setGrille(new TraceLigne(new TraceLigneModel(4, 4, Color.DARK_GRAY)));
toXml = converter.toXml(verticalPersist);
fromXml = converter.fromXmlVertical(toXml);
@@ -42,7 +44,7 @@
fail(e.getMessage());
}
}
-
+
public void testToStringHorizontal() {
try {
EGAxeHorizontalPersist hPersist = new EGAxeHorizontalPersist();
Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/converter/ToStringTransfomerXstreamConverter.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/converter/ToStringTransfomerXstreamConverter.java 2012-10-08 20:22:12 UTC (rev 7727)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/converter/ToStringTransfomerXstreamConverter.java 2012-10-09 16:57:53 UTC (rev 7728)
@@ -3,11 +3,13 @@
*/
package org.fudaa.ebli.converter;
+import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.converters.Converter;
import com.thoughtworks.xstream.converters.MarshallingContext;
import com.thoughtworks.xstream.converters.UnmarshallingContext;
import com.thoughtworks.xstream.io.HierarchicalStreamReader;
import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
+import java.util.Collection;
import org.fudaa.ctulu.converter.AbstractPropertyToStringTransformer;
/**
@@ -16,18 +18,22 @@
*
* @author Frederic Deniger
*/
-public class ToStringTransfomerXstreamConverter implements Converter {
+public class ToStringTransfomerXstreamConverter<T> implements Converter {
- private final AbstractPropertyToStringTransformer toStringTransformer;
+ private final AbstractPropertyToStringTransformer<T> toStringTransformer;
private final Class supportedClass;
- public ToStringTransfomerXstreamConverter(AbstractPropertyToStringTransformer toStringTransformer, Class supportedClass) {
+ public ToStringTransfomerXstreamConverter(AbstractPropertyToStringTransformer<T> toStringTransformer, Class supportedClass) {
this.toStringTransformer = toStringTransformer;
this.supportedClass = supportedClass;
}
+ public AbstractPropertyToStringTransformer<T> getToStringTransformer() {
+ return toStringTransformer;
+ }
+
public void marshal(Object source, HierarchicalStreamWriter writer, MarshallingContext context) {
- writer.setValue(toStringTransformer.toString(source));
+ writer.setValue(toStringTransformer.toString((T) source));
}
public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
@@ -37,4 +43,11 @@
public boolean canConvert(Class type) {
return supportedClass.equals(type);
}
+
+ public static void register(Collection<? extends AbstractPropertyToStringTransformer> transformers, XStream xstream) {
+ for (AbstractPropertyToStringTransformer transformer : transformers) {
+ xstream.registerConverter(new ToStringTransfomerXstreamConverter(transformer, transformer.getSupportedClass()));
+
+ }
+ }
}
Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/converter/TraceBoxToStringTransformer.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/converter/TraceBoxToStringTransformer.java 2012-10-08 20:22:12 UTC (rev 7727)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/converter/TraceBoxToStringTransformer.java 2012-10-09 16:57:53 UTC (rev 7728)
@@ -26,6 +26,7 @@
}
public TraceBoxToStringTransformer(AbstractPropertyToStringTransformer<Color> toStringTransformer) {
+ super(TraceBox.class);
this.colorToStringTransformer = toStringTransformer;
traceLigneModelToStringTransformer = new TraceLigneModelToStringTransformer();
}
Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/converter/TraceIconModelToStringTransformer.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/converter/TraceIconModelToStringTransformer.java 2012-10-08 20:22:12 UTC (rev 7727)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/converter/TraceIconModelToStringTransformer.java 2012-10-09 16:57:53 UTC (rev 7728)
@@ -19,10 +19,12 @@
AbstractPropertyToStringTransformer<Color> colorToStringTransformer;
public TraceIconModelToStringTransformer(AbstractPropertyToStringTransformer<Color> toStringTransformer) {
+ super(TraceIconModel.class);
this.colorToStringTransformer = toStringTransformer;
}
public TraceIconModelToStringTransformer() {
+ super(TraceIconModel.class);
colorToStringTransformer = new PropertyToStringCacheDecorator<Color>(new ColorToStringTransformer());
}
Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/converter/TraceLigneModelToStringTransformer.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/converter/TraceLigneModelToStringTransformer.java 2012-10-08 20:22:12 UTC (rev 7727)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/converter/TraceLigneModelToStringTransformer.java 2012-10-09 16:57:53 UTC (rev 7728)
@@ -19,10 +19,12 @@
AbstractPropertyToStringTransformer<Color> colorToStringTransformer;
public TraceLigneModelToStringTransformer(AbstractPropertyToStringTransformer<Color> toStringTransformer) {
+ super(TraceLigneModel.class);
this.colorToStringTransformer = toStringTransformer;
}
public TraceLigneModelToStringTransformer() {
+ super(TraceLigneModel.class);
colorToStringTransformer = new PropertyToStringCacheDecorator<Color>(new ColorToStringTransformer());
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
