diff options
Diffstat (limited to 'plugins/org.eclipse.sirius.editor.diagram/src/org/eclipse/sirius/editor/properties/sections/description/layoutoption/LayoutOptionPropertySection.java')
-rw-r--r-- | plugins/org.eclipse.sirius.editor.diagram/src/org/eclipse/sirius/editor/properties/sections/description/layoutoption/LayoutOptionPropertySection.java | 10 |
1 files changed, 9 insertions, 1 deletions
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 3b9902e714..6f460d4889 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 @@ public class LayoutOptionPropertySection extends AbstractViewpointPropertySectio 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) { |