AT: commiting recent merge from trunk

[taxeditor.git] / eu.etaxonomy.taxeditor.editor / src / main / java / eu / etaxonomy / taxeditor / editor / view / uses / UsesLabelProvider.java

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesLabelProvider.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesLabelProvider.java
index c6b9e4aaae2558c1d610b5963ecbbe1e4a5ad21a..127b73c3791e607a76f5a05028d4a8b696aa5b14 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesLabelProvider.java
@@ -17,6 +17,7 @@ import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.description.CategoricalData;\r
 import eu.etaxonomy.cdm.model.description.DescriptionBase;\r
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;\r
+import eu.etaxonomy.cdm.model.description.Modifier;\r
 import eu.etaxonomy.cdm.model.description.State;\r
 import eu.etaxonomy.cdm.model.description.StateData;\r
 import eu.etaxonomy.cdm.model.description.TextData;\r
@@ -47,26 +48,23 @@ public class UsesLabelProvider extends ColumnLabelProvider implements
                else if (element instanceof CategoricalData) {\r
                        //String text = "";\r
                        //TextData textData = categoricalDescriptionBuilder.build((CategoricalData) element, getLanguageList());\r
-                       if (((CategoricalData) element).getStates() != null) {\r
+                       if (!((CategoricalData) element).getStates().isEmpty()) {\r
                                for (StateData statedata : ((CategoricalData) element).getStates()) {\r
                                        if(statedata.getState() != null) {\r
-                                               text = text + statedata.getState().getTitleCache();\r
+                                               text = text + statedata.getState().getTitleCache() + "; ";\r
                                        }\r
-                                       else {\r
+                                       /*else {\r
                                                text = "No data provided";\r
-                                       }\r
+                                       }*/\r
                                }\r
                        }\r
-                       if (((CategoricalData) element).getStatesOnly() != null) {\r
-                               for (State state : ((CategoricalData) element).getStatesOnly()) {\r
-                                       if (state != null) {\r
-                                               text = text + state.getTitleCache();\r
-                                       }\r
-                                       else {\r
-                                               text = "No data provided";\r
-                                       }\r
+                       \r
+                       if (!((CategoricalData) element).getModifiers().isEmpty()) {\r
+                               for (Modifier modifier : ((CategoricalData) element).getModifiers()) {\r
+                                       text = text + modifier.getTitleCache();\r
                                }\r
                        }\r
+\r
                        \r
                        //text = textData.getText(CdmStore.getDefaultLanguage());\r
                        if (text == null || text.length() == 0) {\r