ref #9984: add areaLabel to common name label - continue

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java
index c49f3ed0c5218cf1a799a75c3946b92de247a171..5d57510df83a326e5b26be91397a7d6bd0e9d242 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java
@@ -232,16 +232,17 @@ public class DescriptionHelper {
                String languageLabel = null;
                if (area != null){
                        areaLabel = area.getPreferredRepresentation(CdmStore.getDefaultLanguage()).getLabel();                  
-               } else {                        
+               } 
+               if (language != null){                  
                        languageLabel = language.getPreferredRepresentation(CdmStore.getDefaultLanguage()).getLabel();
                }
                if (areaLabel != null || languageLabel != null){
-                       name += " (" + languageLabel;
+                       name += " (" ;
                        if (languageLabel != null){
                                name += languageLabel;
                        }
                        if (areaLabel != null){
-                               if (language != null){
+                               if (languageLabel != null){
                                        name += ", ";
                                }
                                name += areaLabel;