Author: sletellier Date: 2008-12-18 13:33:18 +0000 (Thu, 18 Dec 2008) New Revision: 1684 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx Log: Debug vol5 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2008-12-18 13:33:05 UTC (rev 1683) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2008-12-18 13:33:18 UTC (rev 1684) @@ -129,7 +129,7 @@ root.setInfoText(txt); } public void valueChanged(boolean b){ - changed = b; + getParentContainer(StrategyUI.class).setChanged(b); save.setEnabled(b); cancel.setEnabled(b); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2008-12-18 13:33:05 UTC (rev 1683) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2008-12-18 13:33:18 UTC (rev 1684) @@ -48,6 +48,8 @@ protected StrategyMonthInfo strategyMonthInfo = null; Month month = null; + PropertyChangeListener listener = null; + public StrategyOneMonthInfoUI (InputAction action){ setContextValue(action); @@ -95,16 +97,24 @@ protected void setFieldStrategyMonthInfoProportionModel(){ if (strategyMonthInfo != null){ fieldStrategyMonthInfoProportion.setMatrix(strategyMonthInfo.getProportionMetier()); - strategyMonthInfo.addPropertyChangeListener(new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - strategyMonthInfo.setProportionMetier(fieldStrategyMonthInfoProportion.getMatrix()); - valueChanged(true); + if (listener == null){ + strategyMonthInfo.addPropertyChangeListener(getListener()); } - }); } } + protected PropertyChangeListener getListener(){ + listener = new PropertyChangeListener() { + + @Override + public void propertyChange(PropertyChangeEvent evt) { + if (fieldStrategyMonthInfoProportion.getMatrix() != null){ + strategyMonthInfo.setProportionMetier(fieldStrategyMonthInfoProportion.getMatrix()); + valueChanged(true); + } + } + }; + return listener; + } protected void tripTypeChanged(){ Object selected = fieldStrategyMonthInfoTripType.getSelectedItem(); if (selected != null){ @@ -116,6 +126,7 @@ protected void minInactivityDayChanged(){ strategyMonthInfo.setMinInactivityDays(Double.parseDouble(fieldStrategyMonthInfoMinInactivityDays.getText())); valueChanged(true); + refresh(); } protected void valueChanged(boolean b){ getParentContainer(StrategyMonthInfoUI.class).valueChanged(b); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2008-12-18 13:33:05 UTC (rev 1683) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2008-12-18 13:33:18 UTC (rev 1684) @@ -170,7 +170,7 @@ root.setInfoText(txt); } protected void valueChanged(boolean b){ - changed=b; + getParentContainer(StrategyUI.class).setChanged(b); save.setEnabled(b); cancel.setEnabled(b); }