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

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

Revision: 9184
          http://sourceforge.net/p/fudaa/svn/9184
Author:   deniger
Date:     2015-10-09 19:53:32 +0000 (Fri, 09 Oct 2015)
Log Message:
-----------
CRUE-644

Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbesUiController.java
    trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalCourbesUiResController.java
    trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/temporal/ReportTemporalCourbesUiResController.java
    trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/TableExportCommentSupplier.java

Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbesUiController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbesUiController.java	2015-10-09 19:53:24 UTC (rev 9183)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbesUiController.java	2015-10-09 19:53:32 UTC (rev 9184)
@@ -203,6 +203,8 @@
     toolbar.add(new CourbeVisibiltyUIAction(graphe).buildToolButton(EbliComponentFactory.INSTANCE));
     EGTableAction tableAction = (EGTableAction) getActions("TABLE").get(0);
     tableAction.setAddOptions(false);
+    tableAction.setAddCheckbox(true);
+    tableAction.setShowColumnToExport(false);
     tableAction.setDisplayAll(true);
     PopupMenuReceiver popupTable = createLoiPoupReceiver();
     popupTable.install(tableGraphePanel.getTable(), CtuluUIForNetbeans.DEFAULT);

Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalCourbesUiResController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalCourbesUiResController.java	2015-10-09 19:53:24 UTC (rev 9183)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalCourbesUiResController.java	2015-10-09 19:53:32 UTC (rev 9184)
@@ -21,6 +21,8 @@
   public ReportLongitudinalCourbesUiResController() {
     EGTableAction tableAction = (EGTableAction) getActions("TABLE").get(0);
     tableAction.setAddOptions(false);
+    tableAction.setAddCheckbox(true);
+    tableAction.setShowColumnToExport(false);
     tableAction.setDisplayAll(true);
     tableAction.setShowLabel(true);
     setUseVariableForAxeH(true);

Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/temporal/ReportTemporalCourbesUiResController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/temporal/ReportTemporalCourbesUiResController.java	2015-10-09 19:53:24 UTC (rev 9183)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/temporal/ReportTemporalCourbesUiResController.java	2015-10-09 19:53:32 UTC (rev 9184)
@@ -21,6 +21,8 @@
   public ReportTemporalCourbesUiResController() {
     EGTableAction tableAction = (EGTableAction) getActions("TABLE").get(0);
     tableAction.setAddOptions(false);
+    tableAction.setAddCheckbox(true);
+    tableAction.setShowColumnToExport(false);
     tableAction.setDisplayAll(true);
     tableAction.setShowLabel(true);
   }

Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/TableExportCommentSupplier.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/TableExportCommentSupplier.java	2015-10-09 19:53:24 UTC (rev 9183)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/TableExportCommentSupplier.java	2015-10-09 19:53:32 UTC (rev 9184)
@@ -4,10 +4,10 @@
 package org.fudaa.fudaa.crue.study.services;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import org.fudaa.dodico.crue.common.BusinessMessages;
 import org.openide.util.Lookup;
-import org.openide.util.NbBundle;
 
 /**
  *
@@ -23,6 +23,10 @@
   }
 
   public List<String> getComments(String type) {
+    //pour tests uniquement
+    if (crueService == null) {
+      return Collections.emptyList();
+    }
     if (post) {
       return Arrays.asList(
               BusinessMessages.getString("ExportFichierEtu") + ": " + crueService.getEtuFileLoaded().getAbsolutePath(),

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