Author: kmorin Date: 2013-04-11 18:50:23 +0200 (Thu, 11 Apr 2013) New Revision: 771 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/771 Log: refs #2276 [ERGO] - Non rafraichissement du libell?\195?\169 de la campgne quand on change le protocole cf pi?\195?\168ce jointe Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java 2013-04-11 16:29:57 UTC (rev 770) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java 2013-04-11 16:50:23 UTC (rev 771) @@ -606,6 +606,10 @@ return scientificGears; } + public void resetCruise() { + cruise = null; + } + public void resetProtocol() { protocol = null; lengthStepCaracteristics = null; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2013-04-11 16:29:57 UTC (rev 770) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2013-04-11 16:50:23 UTC (rev 771) @@ -109,6 +109,16 @@ String propertyName = evt.getPropertyName(); if (TuttiUIContext.PROPERTIES_TO_SAVE.contains(propertyName)) { + // reset cruise in case the listener which is supposed to reset + // the cruise is called after this one (cf #2276) + if (TuttiUIContext.PROPERTY_CRUISE_ID.equals(propertyName)) { + getDataContext().resetCruise(); + } + // reset protocol in case the listener which is supposed to reset + // the protocol is called after this one (cf #2276) + if (TuttiUIContext.PROPERTY_PROTOCOL_ID.equals(propertyName)) { + getDataContext().resetProtocol(); + } // change the ui title changeTitle();