Author: sletellier Date: 2012-03-29 11:28:57 +0200 (Thu, 29 Mar 2012) New Revision: 54 Url: http://forge.codelutin.com/repositories/revision/jmexico/54 Log: - fixes #1043 : Enlarge rows in table - fixes #1042 : NPE when no scenario are in model Removed: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ui/ Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditor.jaxx trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/InputDesignXmlWriter.java Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditor.jaxx =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditor.jaxx 2012-03-23 10:45:29 UTC (rev 53) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditor.jaxx 2012-03-29 09:28:57 UTC (rev 54) @@ -68,7 +68,7 @@ </script> <JScrollPane constraints='BorderLayout.CENTER'> - <JTable id='inputDesignTable' model='{getModel()}'/> + <JTable id='inputDesignTable' model='{getModel()}' rowHeight='20'/> </JScrollPane> <JPanel id='factorActionPanel' constraints='BorderLayout.SOUTH'> Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/InputDesignXmlWriter.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/InputDesignXmlWriter.java 2012-03-23 10:45:29 UTC (rev 53) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/InputDesignXmlWriter.java 2012-03-29 09:28:57 UTC (rev 54) @@ -30,6 +30,7 @@ import java.io.File; import java.io.IOException; +import java.util.Collection; import java.util.Date; import java.util.Map; @@ -70,21 +71,24 @@ protected void composeScenarios(XmlNode rootXmlNode) { // scenarios - for (Scenario scenario : model.getScenario()) { - XmlNode scenariosXmlNode = XmlNode.createElement(rootXmlNode, SCENARIO); - addParameter(scenariosXmlNode, SCENARIO_NAME, scenario.getName()); - addParameter(scenariosXmlNode, SCENARIO_ORDER_NUMBER, scenario.getOrderNumber()); + Collection<Scenario> scenarios = model.getScenario(); + if (scenarios != null) { + for (Scenario scenario : scenarios) { + XmlNode scenariosXmlNode = XmlNode.createElement(rootXmlNode, SCENARIO); + addParameter(scenariosXmlNode, SCENARIO_NAME, scenario.getName()); + addParameter(scenariosXmlNode, SCENARIO_ORDER_NUMBER, scenario.getOrderNumber()); - // factor values - Map<Factor, Object> factorValues = scenario.getFactorValues(); - for (Map.Entry<Factor, Object> entry : factorValues.entrySet()) { - Object value = entry.getValue(); - XmlNode factorValueXmlNode = XmlNode.createElement(scenariosXmlNode, SCENARIO_FACTOR_VALUES, String.valueOf(value)); - factorValueXmlNode.addAttribute(FACTOR, entry.getKey().getId()); + // factor values + Map<Factor, Object> factorValues = scenario.getFactorValues(); + for (Map.Entry<Factor, Object> entry : factorValues.entrySet()) { + Object value = entry.getValue(); + XmlNode factorValueXmlNode = XmlNode.createElement(scenariosXmlNode, SCENARIO_FACTOR_VALUES, String.valueOf(value)); + factorValueXmlNode.addAttribute(FACTOR, entry.getKey().getId()); + } + + // features + addAllFeature(scenariosXmlNode, scenario.getFeature()); } - - // features - addAllFeature(scenariosXmlNode, scenario.getFeature()); } } }