r491 - in trunk/tutti-ui-swing: . src/main/java/fr/ifremer/tutti/ui/swing/content/operation src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches src/main/resources/i18n - Tutti-commits

27 Feb 2013

Author: kmorin
Date: 2013-02-27 11:26:29 +0100 (Wed, 27 Feb 2013)
New Revision: 491

Url: http://forge.codelutin.com/projects/tutti/repository/revisions/491

Log:
fixes #2040 [TRAIT] - Comportement de l'annulation

Added:
   trunk/tutti-ui-swing/tutti.config
Modified:
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/CancelEditFishingOperationAction.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/CancelEditCatchBatchAction.java
   trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/CancelEditFishingOperationAction.java
===================================================================

--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/CancelEditFishingOperationAction.java	2013-02-27 09:25:47 UTC (rev 490)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/CancelEditFishingOperationAction.java	2013-02-27 10:26:29 UTC (rev 491)
@@ -30,6 +30,8 @@
 import org.apache.commons.logging.LogFactory;
 
 import java.awt.event.ActionEvent;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 
 import static org.nuiton.i18n.I18n._;
 
@@ -61,6 +63,21 @@
               _("tutti.action.cancel.editFishingOperation.tip"),
               true
         );
+        
+        getModel().addPropertyChangeListener(EditFishingOperationUIModel.PROPERTY_ID,
+                new PropertyChangeListener() {
+
+            public void propertyChange(PropertyChangeEvent evt) {
+                if (evt.getNewValue() == null) {
+                    putValue(NAME, _("tutti.action.cancel.editFishingOperation"));
+                    putValue(SHORT_DESCRIPTION, _("tutti.action.cancel.editFishingOperation.tip"));
+                    
+                } else {
+                    putValue(NAME, _("tutti.action.reset.editFishingOperation"));
+                    putValue(SHORT_DESCRIPTION, _("tutti.action.reset.editFishingOperation.tip"));
+                }
+            }
+        });
     }
 
     public EditFishingOperationAction getEditAction() {

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/CancelEditCatchBatchAction.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/CancelEditCatchBatchAction.java	2013-02-27 09:25:47 UTC (rev 490)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/CancelEditCatchBatchAction.java	2013-02-27 10:26:29 UTC (rev 491)
@@ -63,8 +63,8 @@
         super(handler,
               "cancelEditCatchBatch",
               "cancel",
-              _("tutti.action.cancelEditCatchBatch"),
-              _("tutti.action.cancelEditCatchBatch.tip"),
+              _("tutti.action.reset.editCatchBatch"),
+              _("tutti.action.reset.editCatchBatch.tip"),
               true
         );
     }

Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties
===================================================================
--- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties	2013-02-27 09:25:47 UTC (rev 490)
+++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties	2013-02-27 10:26:29 UTC (rev 491)
@@ -11,13 +11,11 @@
 tutti.action.cancel.editCruise=Annuler
 tutti.action.cancel.editCruise.tip=Annuler l'édition (ou la création) de la campagne
 tutti.action.cancel.editFishingOperation=Annuler
-tutti.action.cancel.editFishingOperation.tip=Annuler l'édition (ou la création) du trait
+tutti.action.cancel.editFishingOperation.tip=Annuler la création du trait
 tutti.action.cancel.editProgram=Annuler
 tutti.action.cancel.editProgram.tip=Annuler l'édition (ou la création) de la série de campagne
 tutti.action.cancel.editProtocol=Annuler
 tutti.action.cancel.editProtocol.tip=Annuler l'édition (ou la création) du protocole
-tutti.action.cancelEditCatchBatch=Annuler
-tutti.action.cancelEditCatchBatch.tip=Annuler l'édition de la capture
 tutti.action.chooseProtocolCaracteristicFile=Choisir le fichier des caractéristiques
 tutti.action.chooseProtocolFile=Choisir le fichier de protocole
 tutti.action.chooseProtocolSpeciesFile=Choisir le fichier des espèces
@@ -133,6 +131,10 @@
 tutti.action.removeSpeciesSubBatch.tip=Supprimer tous les lots fils du lot sélectionné
 tutti.action.renameSpeciesBatch=Corriger l'espèce
 tutti.action.renameSpeciesBatch.tip=Corriger l'espèce sur tout le lot sélectionné
+tutti.action.reset.editCatchBatch=Réinitialiser
+tutti.action.reset.editCatchBatch.tip=Réinitialiser l'édition de la capture
+tutti.action.reset.editFishingOperation=Réinitialiser
+tutti.action.reset.editFishingOperation.tip=Réinitialiser l'édition du trait
 tutti.action.reset.fishingOperationValidState=Réinitialiser
 tutti.action.save=Enregistrer
 tutti.action.saveCatchBatch=Sauver

Added: trunk/tutti-ui-swing/tutti.config
===================================================================
--- trunk/tutti-ui-swing/tutti.config	                        (rev 0)
+++ trunk/tutti-ui-swing/tutti.config	2013-02-27 10:26:29 UTC (rev 491)
@@ -0,0 +1,6 @@
+#Last saved Mon Feb 11 18:03:07 CET 2013
+#Mon Feb 11 18:03:07 CET 2013
+tutti.cruiseId=100001
+tutti.programId=CAM-PELGAS
+tutti.protocolId=15cf939f-cf87-42d2-9999-25222d1d823f
+tutti.ui.coordinateEditorType=DD

    

r491 - in trunk/tutti-ui-swing: . src/main/java/fr/ifremer/tutti/ui/swing/content/operation src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches src/main/resources/i18n

kmorin＠users.forge.codelutin.com

tags

participants (1)