[Fudaa-svn-commit] SF.net SVN: fudaa:[9492] trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/ fudaa/piv/PivExportGaugingReportFillValuesPanel.java

[<bma...@us...>]

Revision: 9492
          http://sourceforge.net/p/fudaa/svn/9492
Author:   bmarchan
Date:     2016-12-29 17:30:29 +0000 (Thu, 29 Dec 2016)
Log Message:
-----------
Fix LSPIV : Utilisation API 1.8 au lieu de 1.7

Modified Paths:
--------------
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivExportGaugingReportFillValuesPanel.java

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivExportGaugingReportFillValuesPanel.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivExportGaugingReportFillValuesPanel.java	2016-12-20 14:46:54 UTC (rev 9491)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivExportGaugingReportFillValuesPanel.java	2016-12-29 17:30:29 UTC (rev 9492)
@@ -11,6 +11,7 @@
 import java.awt.Dimension;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Set;
@@ -101,16 +102,26 @@
    */
   public PivExportGaugingReportFillValuesPanel(CtuluUI _ui, Collection<PivExportGaugingReportAction.UserCellData> _userVars, Set<String> _systemVars) {
     ArrayList<PivExportGaugingReportAction.UserCellData> userVars=new ArrayList<>(_userVars);
-    userVars.sort(new Comparator<PivExportGaugingReportAction.UserCellData>() {
-
+    Collections.sort(userVars,new Comparator<PivExportGaugingReportAction.UserCellData>() {
       @Override
       public int compare(PivExportGaugingReportAction.UserCellData c1, PivExportGaugingReportAction.UserCellData c2) {
-        return c1.name.compareTo(c2.name);
+        if (c1.description == null && c2.description == null) {
+          return 0;
+        }
+        else if (c1.description == null) {
+          return -1;
+        }
+        else if (c2.description == null) {
+          return 1;
+        }
+        else {
+          return c1.description.compareTo(c2.description);
+        }
       }
     });
     
     ArrayList<String> systemVars=new ArrayList<>(_systemVars);
-    systemVars.sort(null);
+    Collections.sort(systemVars);
     
     StringBuilder sb=new StringBuilder();
     sb.append(PivResource.getS("Les champs de la table sont les zones nomm\xE9es inconnues du syst\xE8me,\nissues du mod\xE8le Excel de rapport. Les zones nomm\xE9es connues sont :\n\n"));

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