ref #7321 fix NPE in PolytomousKeyListLabelProvider (II)

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyListLabelProvider.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyListLabelProvider.java
index 765114c8e2041607638c5db1fdf7b3b428281ac8..16289c7984336b97264ff19391a912b9e64e27a2 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyListLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyListLabelProvider.java
@@ -144,7 +144,10 @@ public class PolytomousKeyListLabelProvider extends StyledCellLabelProvider {
                        return ""; //$NON-NLS-1$
                } else {
                        KeyStatement question = getParent(node).getQuestion();
-                       String statementLabel = question != null ? CdmUtils.Nz(question.getLabelText(CdmStore.getDefaultLanguage())): null;
+                       if (question == null){
+                           return EMPTY;
+                       }
+                       String statementLabel = CdmUtils.Nz(question.getLabelText(CdmStore.getDefaultLanguage()));
                        if (StringUtils.isBlank(statementLabel)){
                    Map<Language, LanguageString> labels = question.getLabel();
                    if (labels != null && !labels.isEmpty()){
@@ -156,12 +159,8 @@ public class PolytomousKeyListLabelProvider extends StyledCellLabelProvider {
                        }
                    }
                }
-
-
-                       return question != null ?  statementLabel: EMPTY;
-
+                       return statementLabel;
                }
-
        }
 
        private String getItemStatement(PolytomousKeyNode node) {