r3311 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input
Author: chatellier Date: 2011-05-02 14:39:03 +0000 (Mon, 02 May 2011) New Revision: 3311 Log: Fix migration edition Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2011-05-02 14:38:48 UTC (rev 3310) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2011-05-02 14:39:03 UTC (rev 3311) @@ -52,7 +52,7 @@ populationMigrationEmigrationTable.setMatrix(null); } if (evt.getNewValue() != null) { - + refreshPanel(); } } }); @@ -78,18 +78,7 @@ public void refreshPanel() { setFieldPopulationMigrationMigrationGroupChooserModel(); setFieldPopulationMigrationMigrationDepartureZoneChooserModel(); - remove.setEnabled(false); setAddButton(); - - /*populationMigrationEmigrationTable.addMatrixListener(new MatrixPanelListener() { - @Override - public void matrixChanged(MatrixPanelEvent arg0) { - remove.setEnabled(populationMigrationEmigrationTable.getTable().getSelectedRow() != -1); - if (popInfo != null){ - popInfo.setMigrationMatrix(populationMigrationEmigrationTable.getMatrix().clone()); - } - } - });*/ } protected void populationMigrationEmigrationMatrixChanged(MatrixPanelEvent event) { @@ -119,18 +108,15 @@ } protected void remove() { - log.debug("removeEmigration called"); - try { - int row = populationMigrationEmigrationTable.getTable().getSelectedRow(); + int row = populationMigrationEmigrationTable.getTable().getSelectedRow(); + if (row != -1) { Object group = populationMigrationEmigrationTable.getTable().getValueAt(row, 0); - Object departure = populationMigrationEmigrationTable.getTable().getValueAt(row, 1); - + Object arrival = populationMigrationEmigrationTable.getTable().getValueAt(row, 1); + MatrixND mat = popInfo.getEmigrationMatrix().clone(); - mat.setValue(group, departure, 0); + mat.setValue(group, arrival, 0); popInfo.setEmigrationMatrix(mat); - remove.setEnabled(false); - } catch(Exception eee) { - log.error("Can't remove migration", eee); + populationMigrationEmigrationTable.setMatrix(getPopInfo().getEmigrationMatrix().copy()); } } protected void groupChanged() { @@ -178,20 +164,21 @@ </row> <row columns='4'> <cell fill='horizontal' weightx='1.0'> - <JButton id="add" text="isisfish.common.add" onActionPerformed='add()' enabled='{isActive()}'/> + <JButton id="add" text="isisfish.common.add" onActionPerformed='add()' + enabled='false'/> </cell> </row> <row columns='4'> <cell fill='both' weightx='1.0' weighty='1.0'> <org.nuiton.math.matrix.gui.MatrixPanelEditor id='populationMigrationEmigrationTable' linearModel="true" enabled='{isActive()}' - onMatrixChanged="populationMigrationEmigrationMatrixChanged(event)" - onMouseReleased="remove.setEnabled(populationMigrationEmigrationTable.getTable().getSelectedRow() != -1)"/> + onMatrixChanged="populationMigrationEmigrationMatrixChanged(event)"/> </cell> </row> <row> <cell columns='4' fill='horizontal' weightx='1.0'> - <JButton id="remove" text="isisfish.common.remove" onActionPerformed='remove()' enabled='{isActive()}'/> + <JButton id="remove" text="isisfish.common.remove" + onActionPerformed='remove()' enabled='{isActive()}'/> </cell> </row> </Table> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2011-05-02 14:38:48 UTC (rev 3310) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2011-05-02 14:39:03 UTC (rev 3311) @@ -52,7 +52,7 @@ populationMigrationImmigrationTable.setMatrix(null); } if (evt.getNewValue() != null) { - + refreshPanel(); } } }); @@ -83,8 +83,6 @@ public void refreshPanel(){ setFieldPopulationMigrationMigrationGroupChooserModel(); setFieldPopulationMigrationMigrationArrivalZoneChooserModel(); - - remove.setEnabled(false); setAddButton(); } protected void setFieldPopulationMigrationMigrationGroupChooserModel(){ @@ -97,23 +95,24 @@ jaxx.runtime.SwingUtil.fillComboBox(fieldPopulationMigrationImmigrationArrivalZoneChooser, getBean().getPopulationZone(), null, true); } } -protected void add(){ +protected void add() { getContextValue(InputAction.class).addImmigration(getPopInfo(), (PopulationGroup) fieldPopulationMigrationImmigrationGroupChooser.getSelectedItem(), (Zone) fieldPopulationMigrationImmigrationArrivalZoneChooser.getSelectedItem(), Double.parseDouble(fieldPopulationMigrationImmigrationCoefficient.getText())); populationMigrationImmigrationTable.setMatrix(getPopInfo().getImmigrationMatrix().clone()); } -protected void remove(){ +protected void remove() { int row = populationMigrationImmigrationTable.getTable().getSelectedRow(); - Object group = populationMigrationImmigrationTable.getTable().getValueAt(row, 0); - Object departure = populationMigrationImmigrationTable.getTable().getValueAt(row, 1); - Object arrival = populationMigrationImmigrationTable.getTable().getValueAt(row, 2); - - MatrixND mat = getPopInfo().getImmigrationMatrix().clone(); - mat.setValue(group, departure, arrival, 0); - getPopInfo().setImmigrationMatrix(mat); - remove.setEnabled(false); + if (row != -1) { + Object group = populationMigrationImmigrationTable.getTable().getValueAt(row, 0); + Object departure = populationMigrationImmigrationTable.getTable().getValueAt(row, 1); + + MatrixND mat = getPopInfo().getImmigrationMatrix().clone(); + mat.setValue(group, departure, 0); + getPopInfo().setImmigrationMatrix(mat); + populationMigrationImmigrationTable.setMatrix(getPopInfo().getImmigrationMatrix().copy()); + } } protected void groupChanged(){ setGPopSelected(fieldPopulationMigrationImmigrationGroupChooser.getSelectedItem() != null); @@ -161,20 +160,21 @@ </row> <row columns='4'> <cell fill='horizontal' weightx='1.0'> - <JButton id="add" text="isisfish.common.add" onActionPerformed='add()' enabled='{isActive()}'/> + <JButton id="add" text="isisfish.common.add" onActionPerformed='add()' + enabled='false'/> </cell> </row> <row columns='4'> <cell fill='both' weightx='1.0' weighty='1.0'> <org.nuiton.math.matrix.gui.MatrixPanelEditor id='populationMigrationImmigrationTable' linearModel="true" enabled='{isActive()}' - onMatrixChanged="populationMigrationImmigrationMatrixChanged(event)" - onMouseReleased="remove.setEnabled(populationMigrationImmigrationTable.getTable().getSelectedRow() != -1)"/> + onMatrixChanged="populationMigrationImmigrationMatrixChanged(event)"/> </cell> </row> <row> <cell columns='4' fill='horizontal' weightx='1.0'> - <JButton id="remove" text="isisfish.common.remove" onActionPerformed='remove()' enabled='{isActive()}'/> + <JButton id="remove" text="isisfish.common.remove" + onActionPerformed='remove()' enabled='{isActive()}'/> </cell> </row> </Table> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2011-05-02 14:38:48 UTC (rev 3310) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2011-05-02 14:39:03 UTC (rev 3311) @@ -72,9 +72,7 @@ //setPopInfo(null); //setPopInfo(pi); - if (getPopInfo() != null && getPopInfo().getMigrationMatrix() != null){ - populationMigrationMigrationTable.setMatrix(getPopInfo().getMigrationMatrix().copy()); - } + populationMigrationMigrationTable.setMatrix(getPopInfo().getMigrationMatrix().copy()); } /*public void refresh() { @@ -90,9 +88,6 @@ setFieldPopulationMigrationMigrationDepartureZoneChooserModel(); setFieldPopulationMigrationMigrationArrivalZoneChooserModel(); - //populationMigrationMigrationTable.addMatrixListener(listener); - - //remove.setEnabled(false); //setAddButton(); } protected void setFieldPopulationMigrationMigrationGroupChooserModel(){ @@ -118,16 +113,18 @@ Double.parseDouble(fieldPopulationMigrationMigrationCoefficient.getText())); populationMigrationMigrationTable.setMatrix(getPopInfo().getMigrationMatrix().clone()); } -protected void remove(){ +protected void remove() { int row = populationMigrationMigrationTable.getTable().getSelectedRow(); - Object group = populationMigrationMigrationTable.getTable().getValueAt(row, 0); - Object departure = populationMigrationMigrationTable.getTable().getValueAt(row, 1); - Object arrival = populationMigrationMigrationTable.getTable().getValueAt(row, 2); - - MatrixND mat = getPopInfo().getMigrationMatrix().clone(); - mat.setValue(group, departure, arrival, 0); - getPopInfo().setMigrationMatrix(mat); - remove.setEnabled(false); + if (row != -1) { + Object group = populationMigrationMigrationTable.getTable().getValueAt(row, 0); + Object departure = populationMigrationMigrationTable.getTable().getValueAt(row, 1); + Object arrival = populationMigrationMigrationTable.getTable().getValueAt(row, 2); + + MatrixND mat = getPopInfo().getMigrationMatrix().clone(); + mat.setValue(group, departure, arrival, 0); + getPopInfo().setMigrationMatrix(mat); + populationMigrationMigrationTable.setMatrix(getPopInfo().getMigrationMatrix().copy()); + } } /*protected void groupChanged(){ setGPopSelected(fieldPopulationMigrationMigrationGroupChooser.getSelectedItem() != null); @@ -197,15 +194,15 @@ </row> <row columns='4'> <cell fill='both' weightx='1.0' weighty='1.0'> - <org.nuiton.math.matrix.gui.MatrixPanelEditor id ='populationMigrationMigrationTable' + <org.nuiton.math.matrix.gui.MatrixPanelEditor id='populationMigrationMigrationTable' linearModel='{true}' enabled='{isActive()}' - onMatrixChanged="populationMigrationMigrationMatrixChanged(event)" - onMouseReleased="remove.setEnabled(isActive() && populationMigrationMigrationTable.getTable().getSelectedRow() != -1)"/> + onMatrixChanged="populationMigrationMigrationMatrixChanged(event)" /> </cell> </row> <row> <cell columns='4' fill='horizontal' weightx='1.0'> - <JButton id="remove" text="isisfish.common.remove" onActionPerformed='remove()' /> + <JButton id="remove" text="isisfish.common.remove" + onActionPerformed='remove()' enabled='{isActive()}' /> </cell> </row> </Table> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2011-05-02 14:38:48 UTC (rev 3310) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2011-05-02 14:39:03 UTC (rev 3311) @@ -43,7 +43,15 @@ bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Population' uiClass="jaxx.runtime.validator.swing.ui.ImageValidationUI"> </BeanValidator> + + <BeanValidator id='validatorSeason' context="migration" + bean='{getPopInfo()}' beanClass='fr.ifremer.isisfish.entities.PopulationSeasonInfo' + uiClass="jaxx.runtime.validator.swing.ui.ImageValidationUI"> + </BeanValidator> + <ChangeModel id="changeModel" changed="{validator.isChanged() || validatorSeason.isChanged()}" + valid="{validator.isValid() && validatorSeason.isValid()}" /> + <script><
chatellierï¼ users.labs.libre-entreprise.org