r2758 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish/ui/input src/main/resources/i18n - Isis-fish-commits

17 Nov 2009

Author: chatellier
Date: 2009-11-17 10:24:31 +0000 (Tue, 17 Nov 2009)
New Revision: 2758

Modified:
   isis-fish/trunk/changelog.txt
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx
   isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties
   isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties
Log:
Add confirmation message before launching groups creation wizard

Modified: isis-fish/trunk/changelog.txt
===================================================================

--- isis-fish/trunk/changelog.txt	2009-11-16 13:38:26 UTC (rev 2757)
+++ isis-fish/trunk/changelog.txt	2009-11-17 10:24:31 UTC (rev 2758)
@@ -1,5 +1,6 @@
 isis-fish (3.3.0.0) stable; urgency=low
 
+  * Add confirmation message before launching groups creation wizard
   * Fix metierSeasonInfo deletion (#1914)
   * Remove some deprecated unused UI classes
   * Remove all GenericCell reference (now model based implementation)

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx	2009-11-16 13:38:26 UTC (rev 2757)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx	2009-11-17 10:24:31 UTC (rev 2758)
@@ -78,23 +78,33 @@
     getVerifier().setNewButton(create, "Population", false);
     getVerifier().setDeleteButton(remove);
 }
+
+/**
+ * Open creation classe wizard after confirmation.
+ */
+protected void createGroups() {
+
+    int response = JOptionPane.showConfirmDialog(this, _("isisfish.populationBasics.confirmCreateGroups"), _("isisfish.common.confirm"),
+        JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
     
-protected void createClasses(){
-    JFrame wizardFrame = new JFrame();
-    wizardFrame.setLayout(new BorderLayout());
-    WizardGroupCreationUI wizard = new WizardGroupCreationUI(this);
-    wizard.init(this);
-    wizardFrame.add(wizard, BorderLayout.CENTER);
-    wizardFrame.setTitle(_("isisfish.wizardGroupCreation.title"));
-    wizardFrame.setVisible(true);
-    wizardFrame.pack();
-    wizard.setAgeType(getBean().getSpecies().getAgeGroupType());
-    if (wizard.isAgeType()) {
-        wizard.setCard("singleGroupAge");
-    } else {
-        wizard.setCard("beginGroupLength");
+    if (response == JOptionPane.YES_OPTION) {
+        JFrame wizardFrame = new JFrame();
+        wizardFrame.setLayout(new BorderLayout());
+        WizardGroupCreationUI wizard = new WizardGroupCreationUI(this);
+        wizard.init(this);
+        wizardFrame.add(wizard, BorderLayout.CENTER);
+        wizardFrame.setTitle(_("isisfish.wizardGroupCreation.title"));
+        wizard.setAgeType(getBean().getSpecies().getAgeGroupType());
+        if (wizard.isAgeType()) {
+            wizard.setCard("singleGroupAge");
+        } else {
+            wizard.setCard("beginGroupLength");
+        }
+        wizardFrame.pack();
+        wizardFrame.setVisible(true);
+        //refresh();
     }
-    refresh();
+   
 }
 protected void matureClassChanged(){
     Object selected = fieldPopulationBasicsMatureClass.getSelectedItem();
@@ -161,7 +171,7 @@
                                         <JTextField id="fieldPopulationBasicsNbClasses" text='{getBean() == null ? "" : getBean().sizePopulationGroup()}' editable="false" enabled='{isActif()}' decorator='boxed'/>
                                     </cell>
                                     <cell fill='horizontal'>
-                                        <JButton id="buttonPopulationBasicsCreateClasses" text="isisfish.populationBasics.recreateClasses" onActionPerformed='createClasses()' enabled='{isActif()}' decorator='boxed'/>
+                                        <JButton id="buttonPopulationBasicsCreateClasses" text="isisfish.populationBasics.recreateClasses" onActionPerformed='createGroups()' enabled='{isActif()}' decorator='boxed'/>
                                     </cell>
                                 </row>
                                 <row>

Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties
===================================================================
--- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties	2009-11-16 13:38:26 UTC (rev 2757)
+++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties	2009-11-17 10:24:31 UTC (rev 2758)
@@ -93,6 +93,7 @@
 isisfish.common.cancel=Cancel
 isisfish.common.check=Check
 isisfish.common.clear=Clear
+isisfish.common.confirm=Confirm
 isisfish.common.date=Date
 isisfish.common.debug=debug
 isisfish.common.delete=Delete
@@ -633,7 +634,7 @@
 isisfish.message.import.zip=Import zip file
 isisfish.message.launchui.notlaunch=
 isisfish.message.load.finished=load finished
-isisfish.message.load.map=Try to load map file\: %1$s (%2$s, %3$s)
+isisfish.message.load.map=Try to load map file\: %1$s (%2$s)
 isisfish.message.loading.old.simulation=Loading old simulation ...
 isisfish.message.loading.region=Loading region ...
 isisfish.message.name.imported.region=Enter name for imported region
@@ -732,6 +733,7 @@
 isisfish.population.reproduction=Reproduction
 isisfish.population.season=Season
 isisfish.population.zones=Zones
+isisfish.populationBasics.confirmCreateGroups=Warning, running groups creation wizard will delete all existing groups and objects which depend on it.\nDo you want to re-create groups ?
 isisfish.populationBasics.geographicID=Geographic identifier
 isisfish.populationBasics.growth=Growth
 isisfish.populationBasics.growthReverse=Reverse growth

Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties
===================================================================
--- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties	2009-11-16 13:38:26 UTC (rev 2757)
+++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties	2009-11-17 10:24:31 UTC (rev 2758)
@@ -93,6 +93,7 @@
 isisfish.common.cancel=Annuler
 isisfish.common.check=V\u00E9rifier
 isisfish.common.clear=Effacer
+isisfish.common.confirm=Confirmation
 isisfish.common.date=Date
 isisfish.common.debug=Debug
 isisfish.common.delete=Supprimer
@@ -633,7 +634,7 @@
 isisfish.message.import.zip=Import zip file
 isisfish.message.launchui.notlaunch=Interface utilisateur non lanc\u00E9e
 isisfish.message.load.finished=Chargement termin\u00E9
-isisfish.message.load.map=Chargement de la carte \: %1$s (%2$s, %3$s)
+isisfish.message.load.map=Chargement de la carte \: %1$s (%2$s)
 isisfish.message.loading.old.simulation=Chargement d'une ancienne simulation ...
 isisfish.message.loading.region=Chargement de la r\u00E9gion
 isisfish.message.name.imported.region=Entrez le nom de la r\u00E9gion \u00E0 importer
@@ -732,6 +733,7 @@
 isisfish.population.reproduction=Reproduction
 isisfish.population.season=Saison
 isisfish.population.zones=Zones
+isisfish.populationBasics.confirmCreateGroups=Attention, la re-cr\u00E9ation des groupes supprimera les groupes existants et tous les objets qui en d\u00E9pendent.\n\u00CAtes vous sur de vouloir re-cr\u00E9er les groupes ?
 isisfish.populationBasics.geographicID=Identifiant g\u00E9ographique
 isisfish.populationBasics.growth=Croissance
 isisfish.populationBasics.growthReverse=Croissance inverse
@@ -884,7 +886,7 @@
 isisfish.script.cut=Couper
 isisfish.script.cut.tooltip=Couper la s\u00E9lection courante (Ctrl-x)
 isisfish.script.evaluate=\u00C9valuer
-isisfish.script.evaluate.tooltip=Lance le script (doit contenir un methode main() pour fonctionner)
+isisfish.script.evaluate.tooltip=Lance le script (doit contenir une methode main() pour fonctionner)
 isisfish.script.export=Exporter
 isisfish.script.export.checkAll=Tout (d\u00E9-)s\u00E9lectionner
 isisfish.script.export.chooseDir=...

    

r2758 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish/ui/input src/main/resources/i18n

chatellier＠users.labs.libre-entreprise.org

tags

participants (1)