Author: echatellier Date: 2012-08-20 12:09:05 +0200 (Mon, 20 Aug 2012) New Revision: 1056 Url: http://forge.codelutin.com/repositories/revision/coser/1056 Log: Correction de la mise ?\195?\160 jour de la frise Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeModel.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeHandler.java 2012-08-20 09:41:28 UTC (rev 1055) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeHandler.java 2012-08-20 10:09:05 UTC (rev 1056) @@ -37,6 +37,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import fr.ifremer.coser.bean.Control; import fr.ifremer.coser.bean.Project; import fr.ifremer.coser.bean.Selection; import fr.ifremer.coser.ui.CoserFrame; @@ -86,11 +87,31 @@ } if (FreizeModel.PROPERTY_PROJECT.equals(propertyName)) { + Project oldProject = (Project)evt.getOldValue(); + if (oldProject != null) { + oldProject.getControl().removePropertyChangeListener(this); + } + Project newProject = (Project)evt.getNewValue(); + if (newProject != null) { + newProject.getControl().addPropertyChangeListener(this); + } updateUi(); } else if (FreizeModel.PROPERTY_SELECTION.equals(propertyName)) { + Selection oldSelection = (Selection)evt.getOldValue(); + if (oldSelection != null) { + oldSelection.removePropertyChangeListener(this); + } + Selection newSelection = (Selection)evt.getNewValue(); + if (newSelection != null) { + newSelection.addPropertyChangeListener(this); + } updateUi(); - } else if (FreizeModel.PROPERTY_R_SUFI_RESULT.equals(propertyName)) { + } else if (Selection.PROPERTY_RSUFI_RESULTS.equals(propertyName)) { updateUi(); + } else if (Control.PROPERTY_VALIDATED.equals(propertyName) || + Selection.PROPERTY_VALIDATED.equals(propertyName)) { + // c'est les même propriétés, mais ca ne pose pas de pbs + updateUi(); } } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeModel.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeModel.java 2012-08-20 09:41:28 UTC (rev 1055) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeModel.java 2012-08-20 10:09:05 UTC (rev 1056) @@ -35,7 +35,6 @@ public static final String PROPERTY_PROJECT = "project"; public static final String PROPERTY_SELECTION = "selection"; - public static final String PROPERTY_R_SUFI_RESULT = "rSufiResult"; public static final String PROPERTY_STEP0_ENABLED = "step0Enabled"; public static final String PROPERTY_STEP1_ENABLED = "step1Enabled"; public static final String PROPERTY_STEP2_ENABLED = "step2Enabled"; @@ -75,16 +74,6 @@ this.selection = selection; pcs.firePropertyChange(PROPERTY_SELECTION, oldValue, selection); } - - public RSufiResult getrSufiResult() { - return rSufiResult; - } - - public void setrSufiResult(RSufiResult rSufiResult) { - RSufiResult oldValue = this.rSufiResult; - this.rSufiResult = rSufiResult; - pcs.firePropertyChange(PROPERTY_R_SUFI_RESULT, oldValue, rSufiResult); - } public boolean isStep0Enabled() { return step0Enabled;