commit a2a0e97e2b99d7d497dcde96531c06d1decda263
author Pierre-Charles David <pierre-charles.david@obeo.fr> Mon Jun 11 14:25:14 2018 +0200
committer Pierre-Charles David <pierre-charles.david@obeo.fr> Mon Jun 11 14:25:20 2018 +0200
tree 64ba5a657bd02fe52736b54064d98857ed49f9cd
parent 0523591b419d5c30f62f29991098205a35b53d3c

[533553] Fix NPE in LayoutOptionPropertySection for options with no label

Bug: 533553
Change-Id: I93d815c27f7dfde99a162e689056807ace577340
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>

plugins/org.eclipse.sirius.editor.diagram/src/org/eclipse/sirius/editor/properties/sections/description/layoutoption/LayoutOptionPropertySection.java

diff --git a/plugins/org.eclipse.sirius.editor.diagram/src/org/eclipse/sirius/editor/properties/sections/description/layoutoption/LayoutOptionPropertySection.java b/plugins/org.eclipse.sirius.editor.diagram/src/org/eclipse/sirius/editor/properties/sections/description/layoutoption/LayoutOptionPropertySection.java
index 3b9902e..6f460d4 100644
--- a/plugins/org.eclipse.sirius.editor.diagram/src/org/eclipse/sirius/editor/properties/sections/description/layoutoption/LayoutOptionPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor.diagram/src/org/eclipse/sirius/editor/properties/sections/description/layoutoption/LayoutOptionPropertySection.java
@@ -128,7 +128,15 @@
         ECollections.sort(layoutOptions, new Comparator<LayoutOption>() {
             @Override
             public int compare(LayoutOption o1, LayoutOption o2) {
-                return o1.getLabel().compareTo(o2.getLabel());
+                String l1 = o1.getLabel();
+                String l2 = o2.getLabel();
+                if (l1 == null) {
+                    l1 = "";
+                }
+                if (l2 == null) {
+                    l2 = "";
+                }
+                return l1.compareTo(l2);
             }
         });
         for (LayoutOption layoutOption : layoutOptions) {