AT: committing changes to the TaxEditor Post second round of code review

[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 95390d8668b0c93dccbedd2fe615fe7c3d3d2184..0cea6eab7433d1cbe38f7e80dad50ff329905f15 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
@@ -24,6 +24,7 @@ import eu.etaxonomy.cdm.model.description.StateData;
 import eu.etaxonomy.cdm.model.description.TextData;\r
 import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;\r
 import eu.etaxonomy.taxeditor.store.CdmStore;\r
+import eu.etaxonomy.taxeditor.editor.UsageTermCollection;\r
 \r
 /**\r
  * UsesLabelProvider Class\r
@@ -49,46 +50,84 @@ public class UsesLabelProvider extends ColumnLabelProvider implements
                }\r
                else if (element instanceof CategoricalData) {\r
                        if (!((CategoricalData) element).getStates().isEmpty()) {\r
+                               boolean isUseCategoryAbsent = true;\r
                                for (StateData statedata : ((CategoricalData) element).getStates()) {\r
                                        if(statedata.getState() != null && statedata.getModifyingText().get(CdmStore.getDefaultLanguage()) !=null && statedata.getModifyingText().get(CdmStore.getDefaultLanguage()).getText().equals("Use Category")) {\r
                                                text = text + statedata.getState().getTitleCache() + ";";\r
+                                               isUseCategoryAbsent = false;\r
                                        }\r
                                }\r
+                               if(isUseCategoryAbsent) {\r
+                                       text = text + UsageTermCollection.notAvailableLabel + ";";\r
+                               }\r
+                               \r
+                               boolean isUseSubCategoryAbsent = true;\r
                                for (StateData statedata : ((CategoricalData) element).getStates()) {\r
                                        if(statedata.getState() != null && statedata.getModifyingText().get(CdmStore.getDefaultLanguage()) !=null && statedata.getModifyingText().get(CdmStore.getDefaultLanguage()).getText().equals("Use SubCategory")) {\r
                                                text = text + statedata.getState().getTitleCache() + ";";\r
+                                               isUseSubCategoryAbsent = false;\r
                                        }\r
                                }\r
+                               if(isUseSubCategoryAbsent) {\r
+                                       text = text + UsageTermCollection.notAvailableLabel + ";";\r
+                               }\r
+                       }\r
+                       else {\r
+                               text = text + UsageTermCollection.notAvailableLabel + ";" + UsageTermCollection.notAvailableLabel + ";";\r
                        }\r
                        if (!((CategoricalData) element).getModifiers().isEmpty()) {\r
                                for (Modifier modifier: ((CategoricalData) element).getModifiers()){\r
                                        modifier.getPartOf();\r
                                        modifier.getVocabulary();\r
                                }\r
+                               \r
+                               boolean isPlantPartAbsent = true;\r
                                for (Modifier modifier: ((CategoricalData) element).getModifiers()){\r
-                                       if(GetVocabularyType(modifier, "Plant Part")) {\r
+                                       if(GetVocabularyType(modifier, UsageTermCollection.plantPartLabel)) {\r
                                                text = text +  modifier.getTitleCache()+ ";";\r
+                                               isPlantPartAbsent = false;\r
                                        }\r
                                        \r
                                }\r
+                               if (isPlantPartAbsent) {\r
+                                       text = text + UsageTermCollection.notAvailableLabel + ";";\r
+                               }\r
+                               \r
+                               boolean isHumanGroupAbsent = true;\r
                                for (Modifier modifier: ((CategoricalData) element).getModifiers()){\r
-                                       if(GetVocabularyType(modifier, "Human Group")) {\r
+                                       if(GetVocabularyType(modifier, UsageTermCollection.humanGroupLabel)) {\r
                                                text = text +  modifier.getTitleCache()+ ";";\r
+                                               isHumanGroupAbsent = false;\r
                                        }\r
-                                       \r
                                }\r
+                               if (isHumanGroupAbsent) {\r
+                                       text = text + UsageTermCollection.notAvailableLabel + ";";\r
+                               }\r
+                               \r
+                               boolean isEthnicGroupAbsent = true;\r
                                for (Modifier modifier: ((CategoricalData) element).getModifiers()){\r
-                                       if(GetVocabularyType(modifier, "Ethnic Group")) {\r
+                                       if(GetVocabularyType(modifier, UsageTermCollection.ethnicGroupLabel)) {\r
                                                text = text +  modifier.getTitleCache()+ ";";\r
+                                               isEthnicGroupAbsent = false;\r
                                        }\r
-                                       \r
                                }\r
+                               if (isEthnicGroupAbsent) {\r
+                                       text = text + UsageTermCollection.notAvailableLabel + ";";\r
+                               }\r
+                               \r
+                               boolean isCountryAbsent = true;\r
                                for (Modifier modifier: ((CategoricalData) element).getModifiers()){\r
-                                       if(GetVocabularyType(modifier, "Country")) {\r
+                                       if(GetVocabularyType(modifier, UsageTermCollection.countryLabel)) {\r
                                                text = text +  modifier.getTitleCache()+ ";";\r
+                                               isCountryAbsent = false;\r
                                        }\r
-                                       \r
                                }\r
+                               if (isCountryAbsent) {\r
+                                       text = text + UsageTermCollection.notAvailableLabel + ";";\r
+                               }\r
+                       }\r
+                       else {\r
+                               text = text + UsageTermCollection.notAvailableLabel + ";" + UsageTermCollection.notAvailableLabel + ";" + UsageTermCollection.notAvailableLabel + ";" + UsageTermCollection.notAvailableLabel + ";";\r
                        }\r
                \r
                        if (text == null || text.length() == 0) {\r