Author: tchemit Date: 2012-10-06 21:11:43 +0200 (Sat, 06 Oct 2012) New Revision: 81 Url: http://forge.codelutin.com/repositories/revision/jmexico/81 Log: fix NPE Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.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-10-06 14:56:19 UTC (rev 80) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java 2012-10-06 19:11:43 UTC (rev 81) @@ -32,6 +32,7 @@ import fr.reseaumexico.model.Scenario; import fr.reseaumexico.model.ScenarioImpl; import jaxx.runtime.swing.renderer.DecoratorProviderTableCellRenderer; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import javax.swing.JOptionPane; @@ -270,9 +271,11 @@ protected int getMaxOrder(Collection<Scenario> scenarios) { int maxOrder = 0; - for (Scenario scenario : scenarios) { - int orderNumber = scenario.getOrderNumber(); - maxOrder = Math.max(maxOrder, orderNumber); + if (CollectionUtils.isNotEmpty(scenarios)) { + for (Scenario scenario : scenarios) { + int orderNumber = scenario.getOrderNumber(); + maxOrder = Math.max(maxOrder, orderNumber); + } } return maxOrder; }