[Fudaa-svn-commit] SF.net SVN: fudaa:[8562] trunk/soft/fudaa-crue/ui-report/src/main

[<de...@us...>]

Revision: 8562
          http://sourceforge.net/p/fudaa/svn/8562
Author:   deniger
Date:     2014-01-07 21:10:41 +0000 (Tue, 07 Jan 2014)
Log Message:
-----------
CRUE-598

Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalBrancheChooserUI.java
    trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalRightVariableChooser.java
    trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/longitudinal/Bundle.properties

Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalBrancheChooserUI.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalBrancheChooserUI.java	2014-01-07 20:53:57 UTC (rev 8561)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalBrancheChooserUI.java	2014-01-07 21:10:41 UTC (rev 8562)
@@ -65,7 +65,7 @@
         usedBranche.add(name);
       }
       double length = config.getLength();
-      if (length <= 0) {
+      if (length < 0) {
         error.addError(NbBundle.getMessage(ReportLongitudinalBrancheChooserUI.class, "BrancheConfig.BrancheLengthNegativeOrNull.error"), idx, name);
 
       }

Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalRightVariableChooser.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalRightVariableChooser.java	2014-01-07 20:53:57 UTC (rev 8561)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalRightVariableChooser.java	2014-01-07 21:10:41 UTC (rev 8562)
@@ -86,7 +86,8 @@
       createLines.get(0).updateCheckBoxes(runKeys);
     }
 
-    boolean ok = DialogHelper.showQuestionAndSaveDialogConf(NbBundle.getMessage(ReportLongitudinalRightVariableChooser.class, "ChooseRightVariable.DialogTitle"), pn, getClass(), "vueProfilLongitudinalConfigurationAutresVariables", PerspectiveEnum.REPORT);
+    boolean ok = DialogHelper.showQuestionAndSaveDialogConf(NbBundle.getMessage(ReportLongitudinalRightVariableChooser.class,
+            "ChooseRightVariable.DialogTitle"), pn, getClass(), "vueProfilLongitudinalConfigurationAutresVariables", PerspectiveEnum.REPORT);
     if (ok) {
       config.removeAllVariableDrawnOnRightAxis(reportResultProviderService);
       String newVar = (String) cb1.getSelectedItem();
@@ -94,9 +95,11 @@
         newVar = null;
       }
       ReportVariableKey varKey = newVar == null ? null : reportResultProviderService.createVariableKey(newVar);
-      List<ReportRunKey> selectedKeys = createLines.get(0).getSelectedKeys();
-      for (ReportRunKey reportRunKey : selectedKeys) {
-        config.profilVariables.add(new ReportRunVariableKey(reportRunKey, varKey));
+      if (newVar != null) {
+        List<ReportRunKey> selectedKeys = createLines.get(0).getSelectedKeys();
+        for (ReportRunKey reportRunKey : selectedKeys) {
+          config.profilVariables.add(new ReportRunVariableKey(reportRunKey, varKey));
+        }
       }
     }
 

Modified: trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/longitudinal/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/longitudinal/Bundle.properties	2014-01-07 20:53:57 UTC (rev 8561)
+++ trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/longitudinal/Bundle.properties	2014-01-07 21:10:41 UTC (rev 8562)
@@ -15,7 +15,7 @@
 aval_amont.name=(-)
 BrancheConfig.BrancheNameIsEmpty.error=Ligne {0}: le nom de la branche est vide
 BrancheConfig.BrancheNameAlreadyUsed.error=Ligne {0}: la branche {1} est d\u00e9j\u00e0 utilis\u00e9e
-BrancheConfig.BrancheLengthNegativeOrNull.error=Ligne {0}: la longueur d''affichage de la branche {1} est inf\u00e9rieure ou \u00e9gale \u00e0 0
+BrancheConfig.BrancheLengthNegativeOrNull.error=Ligne {0}: la longueur d''affichage de la branche {1} est inf\u00e9rieure \u00e0 0
 ChooseTime.DialogTitle=Choix des pas de temps
 ChooseRightVariable.Label=Variable affich\u00e9e \u00e0 droite
 ChooseRightVariable.DialogTitle=Choix variable

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.