Author: sletellier Date: 2009-02-24 16:05:43 +0000 (Tue, 24 Feb 2009) New Revision: 1873 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.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/PopulationSeasonsUI.jaxx Log: Debug final Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2009-02-24 15:13:12 UTC (rev 1872) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2009-02-24 16:05:43 UTC (rev 1873) @@ -134,8 +134,16 @@ } eq.setName(getName()); + + // Fire + String _oldValue = eq.getContent(); + fireOnPreWrite("content", _oldValue, content); + eq.setContent(content); eq.update(); + + fireOnPostWrite("content", _oldValue, content); + } catch (TopiaException eee) { throw new IsisFishRuntimeException(_("isisfish.error.change.equation"), eee); } 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 15:13:12 UTC (rev 1872) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-02-24 16:05:43 UTC (rev 1873) @@ -43,8 +43,16 @@ import org.codelutin.math.matrix.gui.MatrixPanelEvent; import org.codelutin.math.matrix.gui.MatrixPanelListener; -MatrixPanelListener listener = null; +MatrixPanelListener listener = new MatrixPanelListener() { + @Override + public void matrixChanged(MatrixPanelEvent arg0) { + if (getBean() != null && fieldPopulationCapturability.getMatrix() != null){ + getBean().setCapturability(fieldPopulationCapturability.getMatrix().copy()); + } + } +}; + addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { @@ -68,18 +76,10 @@ setBean((PopulationImpl) population); if (getBean() != null){ if (getBean().getCapturability() != null){ + fieldPopulationCapturability.removeMatrixPanelListener(listener); fieldPopulationCapturability.setMatrix(getBean().getCapturability().copy()); } } - listener = new MatrixPanelListener() { - - @Override - public void matrixChanged(MatrixPanelEvent arg0) { - if (getBean() != null && fieldPopulationCapturability.getMatrix() != null){ - getBean().setCapturability(fieldPopulationCapturability.getMatrix().copy()); - } - } - }; fieldPopulationCapturability.addMatrixListener(listener); } ]]> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-02-24 15:13:12 UTC (rev 1872) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-02-24 16:05:43 UTC (rev 1873) @@ -61,6 +61,7 @@ fieldPopulationGroupMaxLength.setText(""); fieldPopulationGroupComment.setText(""); fieldPopulationGroupNaturalDeathRate.setMatrix(null); + setPopGroupNotNull(false); } if (evt.getNewValue() != null) { // add binding on getBean() @@ -79,7 +80,7 @@ setBean((PopulationImpl) population); if (getBean() != null){ if (getBean().getPopulationGroup() != null){ - jaxx.runtime.SwingUtil.fillComboBox(fieldPopulationGroupPopulationGroup,getBean().getPopulationGroup(), null, true); + jaxx.runtime.SwingUtil.fillComboBox(fieldPopulationGroupPopulationGroup,getBean().getPopulationGroup(), getPopulationGroup(), true); } } } 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 15:13:12 UTC (rev 1872) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-02-24 16:05:43 UTC (rev 1873) @@ -53,7 +53,7 @@ //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); fieldPopulationMonthGapBetweenReproRecrutement.setText(""); fieldPopulationRecruitmentComment.setText(""); - reproductionEquation.init(_("isisfish.populationRecruitment.reproductionEquation"), null, "Reproduction", "ReproductionEquation", "EquationReproductionEquation", fr.ifremer.isisfish.equation.PopulationGrowth.class); + reproductionEquation.init(_("isisfish.populationRecruitment.reproductionEquation"), getBean(), "Reproduction", "ReproductionEquation", "EquationReproductionEquation", fr.ifremer.isisfish.equation.PopulationGrowth.class); } if (evt.getNewValue() != null) { // add binding on getBean() Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-02-24 15:13:12 UTC (rev 1872) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-02-24 16:05:43 UTC (rev 1873) @@ -78,6 +78,7 @@ // remove previous binding on getBean() //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); fieldPopulationSeasonComment.setText(""); + fieldPopulationSeasonReproductionDistribution.setMatrix(null); } if (evt.getNewValue() != null) { // add binding on getBean()