Author: sletellier Date: 2009-02-24 11:45:48 +0000 (Tue, 24 Feb 2009) New Revision: 1869 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx Log: Matrix update bug fixed Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-02-24 11:37:24 UTC (rev 1868) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-02-24 11:45:48 UTC (rev 1869) @@ -77,8 +77,7 @@ @Override public void matrixChanged(MatrixPanelEvent arg0) { if (getBean() != null && fieldPopulationCapturability.getMatrix() != null){ - getBean().setCapturability(fieldPopulationCapturability.getMatrix()); - System.out.println(getBean().getCapturability() + " " + fieldPopulationCapturability.getMatrix()); + getBean().setCapturability(fieldPopulationCapturability.getMatrix().copy()); } } }; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2009-02-24 11:37:24 UTC (rev 1868) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2009-02-24 11:45:48 UTC (rev 1869) @@ -136,7 +136,7 @@ public void matrixChanged(MatrixPanelEvent arg0) { remove.setEnabled(populationMigrationEmigrationTable.getTable().getSelectedRow() != -1); if (popInfo != null){ - popInfo.setMigrationMatrix(populationMigrationEmigrationTable.getMatrix()); + popInfo.setMigrationMatrix(populationMigrationEmigrationTable.getMatrix().copy()); } } }); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2009-02-24 11:37:24 UTC (rev 1868) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2009-02-24 11:45:48 UTC (rev 1869) @@ -100,7 +100,7 @@ @Override public void matrixChanged(MatrixPanelEvent arg0) { if (getPopInfo() != null){ - getPopInfo().setImmigrationMatrix(populationMigrationImmigrationTable.getMatrix()); + getPopInfo().setImmigrationMatrix(populationMigrationImmigrationTable.getMatrix().copy()); } } }); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2009-02-24 11:37:24 UTC (rev 1868) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2009-02-24 11:45:48 UTC (rev 1869) @@ -100,7 +100,7 @@ @Override public void matrixChanged(MatrixPanelEvent arg0) { if (getPopInfo() != null){ - getPopInfo().setMigrationMatrix(populationMigrationMigrationTable.getMatrix()); + getPopInfo().setMigrationMatrix(populationMigrationMigrationTable.getMatrix().copy()); } } }; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-02-24 11:37:24 UTC (rev 1868) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-02-24 11:45:48 UTC (rev 1869) @@ -67,7 +67,7 @@ public void matrixChanged(MatrixPanelEvent arg0) { if (getBean() != null){ if (fieldPopulationRecruitmentDistribution.getMatrix() != null){ - getBean().setRecruitmentDistribution(fieldPopulationRecruitmentDistribution.getMatrix()); + getBean().setRecruitmentDistribution(fieldPopulationRecruitmentDistribution.getMatrix().copy()); } } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2009-02-24 11:37:24 UTC (rev 1868) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2009-02-24 11:45:48 UTC (rev 1869) @@ -82,7 +82,7 @@ fieldPopulationMappingZoneReproZoneRecru.addMatrixListener(listener); } protected void fieldPopulationMappingZoneReproZoneRecruChanged(){ - getBean().setMappingZoneReproZoneRecru(fieldPopulationMappingZoneReproZoneRecru.getMatrix()); + getBean().setMappingZoneReproZoneRecru(fieldPopulationMappingZoneReproZoneRecru.getMatrix().copy()); } protected void setFieldPopulationMappingZoneReproZoneRecru(){ if (getBean() != null){