diff options
| author | cbateman | 2007-10-05 23:01:15 +0000 |
|---|---|---|
| committer | cbateman | 2007-10-05 23:01:15 +0000 |
| commit | 67bcc4f591b10b696410ed26f5769059360925e1 (patch) | |
| tree | 9a4ed5b7c8ecb2aa26ad895019f91f3363317345 /jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors | |
| parent | e524eda4baae415d4f8e41ba1b393c006fc693f2 (diff) | |
| download | webtools.jsf-67bcc4f591b10b696410ed26f5769059360925e1.tar.gz webtools.jsf-67bcc4f591b10b696410ed26f5769059360925e1.tar.xz webtools.jsf-67bcc4f591b10b696410ed26f5769059360925e1.zip | |
Added null checking the comparator.
Diffstat (limited to 'jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors')
| -rw-r--r-- | jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteHelper.java | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteHelper.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteHelper.java index 525578de1..ac2b35288 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteHelper.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteHelper.java @@ -131,6 +131,28 @@ public class PaletteHelper { String label1 = ((PaletteEntry)o1).getLabel(); String label2 = ((PaletteEntry)o2).getLabel(); + if (label1 == null) + { + // if both null, then equal + if (label2 == null) + { + return 0; + } + // otherwise, sort label 2 before + return 1; + } + + + if (label2 == null) + { + // if both null then equal + if (label1 == null) + { + return 0; + } + // if label1 not null, then sort it first + return -1; + } return label1.compareTo(label2); } |