Combine "feature" and "question" column

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 0ae611584cf96969a625d487198e20035dd14c91..5f83fbe2387a330bfd97db0e71a2e95517761c19 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
@@ -74,16 +74,14 @@ public class PolytomousKeyListLabelProvider extends StyledCellLabelProvider {
                case 0:
                        return getItemNumber(node);
                case 1:
-                       return getFeature(node);
-               case 2:
                    return getItemQuestion(node);
-               case 3:
+               case 2:
                        return getItemEdgeNumber(node);
-               case 4:
+               case 3:
                        return getItemStatement(node);
-               case 5:
+               case 4:
                        return getItemLink(node);
-               case 6:
+               case 5:
             return getItemTaxon(node);
                }
                return EMPTY;
@@ -149,27 +147,26 @@ public class PolytomousKeyListLabelProvider extends StyledCellLabelProvider {
        }
 
        private String getItemQuestion(PolytomousKeyNode node) {
-               if (isParentRoot(node)) {
-                       return ""; //$NON-NLS-1$
-               } else {
+           String questionString = EMPTY;
+               if (!isParentRoot(node)) {
                        KeyStatement question = getParent(node).getQuestion();
-                       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()){
-                       for (LanguageString langString: labels.values()){
-                           if (StringUtils.isNotBlank(langString.getText())){
-                               statementLabel = langString.getText();
-                               break;
-                           }
+                       if (question != null){
+                           questionString = CdmUtils.Nz(question.getLabelText(CdmStore.getDefaultLanguage()));
+                           if (StringUtils.isBlank(questionString)){
+                               Map<Language, LanguageString> labels = question.getLabel();
+                               if (labels != null && !labels.isEmpty()){
+                                   for (LanguageString langString: labels.values()){
+                                       if (StringUtils.isNotBlank(langString.getText())){
+                                           questionString = langString.getText();
+                                           break;
+                                       }
+                                   }
                        }
                    }
                }
-                       return statementLabel;
                }
+               String featureString = getFeature(node);
+               return StringUtils.join(new String[]{questionString, featureString});
        }
 
        private String getItemStatement(PolytomousKeyNode node) {

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/e4/PolytomousKeyListEditorE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/e4/PolytomousKeyListEditorE4.java
index 15f6eca72c715b7a0acbe3a92ec4492cc6019b73..fd191a7cf96799a298dc9300515549f74f5df4a8 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/e4/PolytomousKeyListEditorE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/e4/PolytomousKeyListEditorE4.java
@@ -264,8 +264,8 @@ public class PolytomousKeyListEditorE4 implements
        // This will create the columns for the table
        private void createColumns(TableViewer viewer) {
                Table table = viewer.getTable();
-               String[] titles = { Messages.PolytomousKeyListEditor_NODE, Messages.PolytomousKeyListEditor_FEATURE, Messages.PolytomousKeyListEditor_QUESTION, Messages.PolytomousKeyListEditor_EDGE,  Messages.PolytomousKeyListEditor_STATEMENT, Messages.PolytomousKeyListEditor_LINK, Messages.PolytomousKeyListEditor_TAXON };
-               int[] bounds = { 50, 200, 200, 50, 200, 100, 200 };
+               String[] titles = { Messages.PolytomousKeyListEditor_NODE, Messages.PolytomousKeyListEditor_QUESTION, Messages.PolytomousKeyListEditor_EDGE,  Messages.PolytomousKeyListEditor_STATEMENT, Messages.PolytomousKeyListEditor_LINK, Messages.PolytomousKeyListEditor_TAXON };
+               int[] bounds = { 50, 200, 50, 200, 100, 200 };
 
                for (int i = 0; i < titles.length; i++) {
                        TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/Messages.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/Messages.java
index 96d06823f44f3982f5a6fbfd1108dfbe880b6736..e7cd2d8a69aeb786b0b61b5c94592f2bef51c803 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/Messages.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/Messages.java
@@ -247,7 +247,6 @@ public class Messages extends NLS {
     public static String PolytomousKeyLabelProvider_NO_NODE_NUMBER_SET;
     public static String PolytomousKeyListEditor_EDGE;
     public static String PolytomousKeyListEditor_LINK;
-    public static String PolytomousKeyListEditor_FEATURE;
     public static String PolytomousKeyListEditor_NODE;
     public static String PolytomousKeyListEditor_QUESTION;
     public static String PolytomousKeyListEditor_STATEMENT;

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages.properties b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages.properties
index 79cbf6610ecb7047b947fe3071acb2b8f669355a..0e5a2f10266b56f04ac6a207c5bc7f561a6922d3 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages.properties
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages.properties
@@ -92,8 +92,7 @@ PolytomousKeyLabelProvider_NO_NODE_NUMBER_SET=No node number set
 PolytomousKeyListEditor_EDGE=Edge
 PolytomousKeyListEditor_LINK=Link
 PolytomousKeyListEditor_NODE=Node
-PolytomousKeyListEditor_FEATURE=Feature
-PolytomousKeyListEditor_QUESTION=Question
+PolytomousKeyListEditor_QUESTION=Question / Character
 PolytomousKeyListEditor_STATEMENT=Statement
 PolytomousKeyListEditor_TAXON=Taxon
 PolytomousKeyListItem_NO_STATEMENT=No statement

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages_de.properties b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages_de.properties
index befc69cc66b6de24673002434aaee35725a0cbee..f898210c8d87ccdbb599e91edd86a02f6dbe5c72 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages_de.properties
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages_de.properties
@@ -92,8 +92,7 @@ PolytomousKeyLabelProvider_NO_NODE_NUMBER_SET=Keine Knotennummer angegeben
 PolytomousKeyListEditor_EDGE=Kante
 PolytomousKeyListEditor_LINK=Link
 PolytomousKeyListEditor_NODE=Knoten
-PolytomousKeyListEditor_FEATURE=Merkmal
-PolytomousKeyListEditor_QUESTION=Frage
+PolytomousKeyListEditor_QUESTION=Frage / Merkmal
 PolytomousKeyListEditor_STATEMENT=Aussage
 PolytomousKeyListEditor_TAXON=Taxon
 PolytomousKeyListItem_NO_STATEMENT=Keine Aussage