Author: sletellier Date: 2011-12-22 17:52:06 +0100 (Thu, 22 Dec 2011) New Revision: 11 Url: http://forge.codelutin.com/repositories/revision/jmexico/11 Log: - Add exit menu - Fix table model for empty input design Modified: trunk/jmexico-swing-editor/src/main/java/fr/reseaumexico/editor/ui/MexicoMainUI.css trunk/jmexico-swing-editor/src/main/java/fr/reseaumexico/editor/ui/MexicoMainUI.jaxx trunk/jmexico-swing-editor/src/main/java/fr/reseaumexico/editor/ui/model/InputDesignTableModel.java Modified: trunk/jmexico-swing-editor/src/main/java/fr/reseaumexico/editor/ui/MexicoMainUI.css =================================================================== --- trunk/jmexico-swing-editor/src/main/java/fr/reseaumexico/editor/ui/MexicoMainUI.css 2011-12-21 17:35:27 UTC (rev 10) +++ trunk/jmexico-swing-editor/src/main/java/fr/reseaumexico/editor/ui/MexicoMainUI.css 2011-12-22 16:52:06 UTC (rev 11) @@ -33,4 +33,7 @@ #menuFileSave { text:"jmexico.menu.file.save"; mnemonic:S; +} +#exit { + text:"masc.menu.exit"; } \ No newline at end of file Modified: trunk/jmexico-swing-editor/src/main/java/fr/reseaumexico/editor/ui/MexicoMainUI.jaxx =================================================================== --- trunk/jmexico-swing-editor/src/main/java/fr/reseaumexico/editor/ui/MexicoMainUI.jaxx 2011-12-21 17:35:27 UTC (rev 10) +++ trunk/jmexico-swing-editor/src/main/java/fr/reseaumexico/editor/ui/MexicoMainUI.jaxx 2011-12-22 16:52:06 UTC (rev 11) @@ -47,6 +47,11 @@ enabled='{selectedFile != null}' onActionPerformed="getHandler().saveFile(this)"/> + <JSeparator/> + + <JMenuItem id='exit' + onActionPerformed="getHandler().closeApplication(this)"/> + </JMenu> </JMenuBar> <InputDesignEditor id='inputDesignEditor' constraints='BorderLayout.CENTER'/> Modified: trunk/jmexico-swing-editor/src/main/java/fr/reseaumexico/editor/ui/model/InputDesignTableModel.java =================================================================== --- trunk/jmexico-swing-editor/src/main/java/fr/reseaumexico/editor/ui/model/InputDesignTableModel.java 2011-12-21 17:35:27 UTC (rev 10) +++ trunk/jmexico-swing-editor/src/main/java/fr/reseaumexico/editor/ui/model/InputDesignTableModel.java 2011-12-22 16:52:06 UTC (rev 11) @@ -84,13 +84,17 @@ return inputDesign.getScenarios(i); } + public Factor getFactor(int i) { + return inputDesign.getExperimentDesign().getFactors(i); + } + @Override public int getRowCount() { if (inputDesign == null) { return delegate.getRowCount(); } - Map<Factor, Object> factorValues = getScenario(0).getFactorValues(); - return factorValues == null ? 0 : factorValues.size(); + Collection<Factor> factors = inputDesign.getExperimentDesign().getFactors(); + return factors == null ? 0 : factors.size(); } @Override @@ -142,23 +146,22 @@ return delegate.getValueAt(rowIndex, columnIndex); } - boolean isFirstColumn = columnIndex == 0; - if (!isFirstColumn) { - columnIndex = columnIndex - 1; + // get key on rowIndex + Factor factor = getFactor(rowIndex); + + // first column is factors + if (columnIndex == 0) { + return factor; } + + // others are scenarios + columnIndex = columnIndex - 1; Scenario scenario = getScenario(columnIndex); if (scenario == null) { return null; } Map<Factor,Object> factorValues = scenario.getFactorValues(); - // get key if rowIndex - Set<Factor> factors = factorValues.keySet(); - List<Factor> factorsList = new ArrayList<Factor>(factors); - Factor factor = factorsList.get(rowIndex); - if (isFirstColumn) { - return factor; - } return factorValues.get(factor); }