[Fudaa-svn-commit] SF.net SVN: fudaa:[9314] trunk/soft/fudaa-crue

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

Revision: 9314
          http://sourceforge.net/p/fudaa/svn/9314
Author:   deniger
Date:     2016-03-15 22:22:06 +0000 (Tue, 15 Mar 2016)
Log Message:
-----------
CRUE-634 
CRUE-692

Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/DecimalFormatEpsilonEnum.java
    trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyNature.java
    trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/projet/conf/OptionsEnum.java
    trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/DialogHelper.java
    trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/AbstractLoiCourbeModel.java
    trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/loiff/LoiTimeExportDecorator.java

Modified: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/DecimalFormatEpsilonEnum.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/DecimalFormatEpsilonEnum.java	2016-03-14 14:59:20 UTC (rev 9313)
+++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/DecimalFormatEpsilonEnum.java	2016-03-15 22:22:06 UTC (rev 9314)
@@ -8,7 +8,6 @@
  * @author Frederic Deniger
  */
 public enum DecimalFormatEpsilonEnum {
-
   PRESENTATION,
   COMPARISON;
 }

Modified: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyNature.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyNature.java	2016-03-14 14:59:20 UTC (rev 9313)
+++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyNature.java	2016-03-15 22:22:06 UTC (rev 9314)
@@ -75,8 +75,14 @@
   }
 
   public String format(double value, DecimalFormatEpsilonEnum type) {
-    NumberFormat formatter = getFormatter(type);
-    return formatter == null ? Double.toString(value) : formatter.format(value);
+    try {
+      NumberFormat formatter = getFormatter(type);
+      return formatter == null ? Double.toString(value) : formatter.format(value);
+    } catch (Exception e) {
+      e.printStackTrace();
+      System.err.println("yes");
+    }
+    return null;
   }
 
   public String format(Number value, DecimalFormatEpsilonEnum type) {

Modified: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/projet/conf/OptionsEnum.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/projet/conf/OptionsEnum.java	2016-03-14 14:59:20 UTC (rev 9313)
+++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/projet/conf/OptionsEnum.java	2016-03-15 22:22:06 UTC (rev 9314)
@@ -4,7 +4,7 @@
 
 /**
  *
- * @author deniger ( genesis)
+ * @author deniger
  */
 public enum OptionsEnum {
 

Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/DialogHelper.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/DialogHelper.java	2016-03-14 14:59:20 UTC (rev 9313)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/DialogHelper.java	2016-03-15 22:22:06 UTC (rev 9314)
@@ -153,7 +153,8 @@
     NotifyDescriptor nd = new NotifyDescriptor.Message(msg, NotifyDescriptor.ERROR_MESSAGE);
     nd.setTitle(title);
     DialogDisplayer.getDefault().notify(nd);
-    NotificationDisplayer.getDefault().notify(title, CrueIconsProvider.getIcon("org/fudaa/fudaa/crue/common/icons/erreur-bloquante.png"), panelInfo,
+    NotificationDisplayer.getDefault().notify(title, CrueIconsProvider.getIcon("org/fudaa/fudaa/crue/common/icons/erreur-bloquante.png"),
+            panelInfo == null ? title : panelInfo,
             null, NotificationDisplayer.Priority.SILENT);
   }
 

Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/AbstractLoiCourbeModel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/AbstractLoiCourbeModel.java	2016-03-14 14:59:20 UTC (rev 9313)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/AbstractLoiCourbeModel.java	2016-03-15 22:22:06 UTC (rev 9314)
@@ -452,6 +452,10 @@
     return lines.get(idx).ptEvolutionFF;
   }
 
+  public boolean isDefined(int idx) {
+    return idx >= 0 && idx < lines.size();
+  }
+
   protected LoiLine getLoiLine(int idx) {
     return lines.get(idx);
   }

Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/loiff/LoiTimeExportDecorator.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/loiff/LoiTimeExportDecorator.java	2016-03-14 14:59:20 UTC (rev 9313)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/loiff/LoiTimeExportDecorator.java	2016-03-15 22:22:06 UTC (rev 9314)
@@ -42,6 +42,9 @@
     if (col == 1 && table.getModel() instanceof DefaultLoiTableModel) {
       DefaultLoiTableModel model = (DefaultLoiTableModel) table.getModel();
       AbstractLoiCourbeModel loiCourbeModel = (AbstractLoiCourbeModel) model.getCourbe().getModel();
+      if (!loiCourbeModel.isDefined(row)) {
+        return null;
+      }
       ItemVariable varAbscisse = loiCourbeModel.getConfigLoi().getVarAbscisse();
       if (varAbscisse.getNature().isDate() || varAbscisse.getNature().isDuration()) {
         return varAbscisse.format(loiCourbeModel.getX(row), DecimalFormatEpsilonEnum.COMPARISON);

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