Jmexico-commits

Download

jmexico-commits@list.forge.codelutin.com

April 2012

1 participants
2 discussions

r65 - in trunk: jmexico-editor/src/main/java/fr/reseaumexico/editor jmexico-model/src/main/java/fr/reseaumexico/model/parser
by sletellier＠users.forge.codelutin.com April 30, 2012

April 30, 2012

Author: sletellier Date: 2012-04-30 14:06:54 +0200 (Mon, 30 Apr 2012) New Revision: 65 Url: http://forge.codelutin.com/repositories/revision/jmexico/65 Log: fixes #1187 : Keep order on factor values Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/InputDesignParser.java Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java 2012-04-30 12:06:24 UTC (rev 64) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java 2012-04-30 12:06:54 UTC (rev 65) @@ -89,7 +89,7 @@ // create all empty factor values Collection<Factor> factors = inputDesign.getExperimentDesign().getFactor(); - Map<Factor, Object> factorValues = Maps.newHashMap(); + Map<Factor, Object> factorValues = Maps.newLinkedHashMap(); for (Factor factor : factors) { factorValues.put(factor, null); } Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/InputDesignParser.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/InputDesignParser.java 2012-04-30 12:06:24 UTC (rev 64) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/InputDesignParser.java 2012-04-30 12:06:54 UTC (rev 65) @@ -127,7 +127,7 @@ if (parser.nextTag() == XmlPullParser.START_TAG && parserEqual(parser, SCENARIO_FACTOR_VALUES)) { - Map<Factor, Object> factorValues = Maps.newHashMap(); + Map<Factor, Object> factorValues = Maps.newLinkedHashMap(); while (!(parser.getEventType() == XmlPullParser.END_TAG && parserEqual(parser, SCENARIO))) {

1 0

r64 - trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser
by sletellier＠users.forge.codelutin.com April 30, 2012

April 30, 2012

Author: sletellier Date: 2012-04-30 14:06:24 +0200 (Mon, 30 Apr 2012) New Revision: 64 Url: http://forge.codelutin.com/repositories/revision/jmexico/64 Log: fixes #1186 : ExperimentDesignParser dont parse name of factors Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ExperimentDesignParser.java Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ExperimentDesignParser.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ExperimentDesignParser.java 2012-03-29 16:05:40 UTC (rev 63) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ExperimentDesignParser.java 2012-04-30 12:06:24 UTC (rev 64) @@ -140,6 +140,10 @@ String id = parser.getAttributeValue(null, FACTOR_ID); factor.setId(id); + // parse name + String name = parser.getAttributeValue(null, FACTOR_NAME); + factor.setName(name); + // while all child attributes is not parsed while (!(parser.getEventType() == XmlPullParser.END_TAG && parserEqual(parser, FACTOR))) {

1 0