replaced static term initialisation methods with newly added cdmCacher driven methods

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/graph/ConceptGraphLabelProvider.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/graph/ConceptGraphLabelProvider.java
index fe431c89c282c052df42fd45a04a43a8bffaf69c..97188ca14805014bd89416af872dcfaa181ff9cf 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/graph/ConceptGraphLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/graph/ConceptGraphLabelProvider.java
@@ -28,7 +28,7 @@ public class ConceptGraphLabelProvider extends LabelProvider implements
                if(element instanceof Taxon){
                        return ((Taxon)element).getTitleCache();
                } else if( element instanceof TaxonRelationship) {
-                       return ((TaxonRelationship)element).getType().getRepresentation(Language.ENGLISH()).getAbbreviatedLabel();
+                       return ((TaxonRelationship)element).getType().getRepresentation(Language.getLanguageFromUuid(Language.uuidEnglish)).getAbbreviatedLabel();
                }
                return "TODO";
        }

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/MoveDescriptionElementsHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/MoveDescriptionElementsHandler.java
index d60354737c9a110beffda000179ad5b4b861ac72..2ccfea94774506665600a3386c94ae94e2af9a57 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/MoveDescriptionElementsHandler.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/MoveDescriptionElementsHandler.java
@@ -91,7 +91,7 @@ public class MoveDescriptionElementsHandler extends AbstractHandler {
                        TaxonDescription targetDescription = TaxonDescription.NewInstance(targetTaxon);
                        String moveMessage = String.format("Elements moved from %s", EditorUtil.getActiveMultiPageTaxonEditor().getTaxon());
                        targetDescription.setTitleCache(moveMessage, true);
-                       Annotation annotation = Annotation.NewInstance(moveMessage, Language.DEFAULT());
+                       Annotation annotation = Annotation.NewInstance(moveMessage, Language.getDefaultLanguage());
                        annotation.setAnnotationType(AnnotationType.TECHNICAL());
                        targetDescription.addAnnotation(annotation);
                        

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/MoveDescriptionToOtherTaxonOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/MoveDescriptionToOtherTaxonOperation.java
index e6fc72bf4cd79d390bbc05a5073a017574bae3b2..8ab3fe60b5235e890a0223edc1650b4aa5361ad5 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/MoveDescriptionToOtherTaxonOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/MoveDescriptionToOtherTaxonOperation.java
@@ -80,7 +80,7 @@ public class MoveDescriptionToOtherTaxonOperation extends
                        }
                        description.setTitleCache(description.getTitleCache() + separator + moveMessage, true);
                }
-               Annotation annotation = Annotation.NewInstance(moveMessage, Language.DEFAULT());
+               Annotation annotation = Annotation.NewInstance(moveMessage, Language.getDefaultLanguage());
                annotation.setAnnotationType(AnnotationType.TECHNICAL());
                description.addAnnotation(annotation);
                newAcceptedTaxonNode.getTaxon().addDescription(description);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/TaxonRelationshipTypeInverseContainer.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/TaxonRelationshipTypeInverseContainer.java
index 8c1c809b485c58d1b4c2146aead91244e7237ee9..23e5c66665b098d825c6072de785d0c79b2bb5f2 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/TaxonRelationshipTypeInverseContainer.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/TaxonRelationshipTypeInverseContainer.java
@@ -84,7 +84,9 @@ public class TaxonRelationshipTypeInverseContainer extends DefinedTermBase<Defin
                Representation result;
                result = inverse ? type.getInverseRepresentation(language) : type.getRepresentation(language);
                if (result == null){
-                       result = inverse ? type.getInverseRepresentation(Language.ENGLISH()) : type.getRepresentation(Language.ENGLISH());
+                       result = inverse ? 
+                                       type.getInverseRepresentation(Language.getLanguageFromUuid(Language.uuidEnglish)) : 
+                                               type.getRepresentation(Language.getLanguageFromUuid(Language.uuidEnglish));
                }
                return result;
        }
@@ -105,7 +107,7 @@ public class TaxonRelationshipTypeInverseContainer extends DefinedTermBase<Defin
        }
        
        public String getAbbreviatedLabel(){
-               return getRepresentation(Language.ENGLISH()).getAbbreviatedLabel();
+               return getRepresentation(Language.getLanguageFromUuid(Language.uuidEnglish)).getAbbreviatedLabel();
        }
        
        public void setInverse(boolean inverse) {

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
index 0d96ea053a24f394643add22c6cee84d021ae262..6ac38fab5c6ef33835d156109bb16aaf935cbdf2 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
@@ -490,8 +490,8 @@ public class PreferencesUtil implements IPreferenceKeys {
                String languageUuidString = getPreferenceStore().getString(
                                GLOBAL_LANGUAGE_UUID);
 
-               if (CdmUtils.isEmpty(languageUuidString)) {
-                       return Language.DEFAULT();
+               if (CdmUtils.isBlank(languageUuidString)) {
+                       return Language.getDefaultLanguage();
                }
 
                UUID languageUuid = UUID.fromString(languageUuidString);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/MediaSpecimenGeneralDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/MediaSpecimenGeneralDetailElement.java
index 3a31a39b6364fd7237712819288542dac036c738..5dd71f15a0230ee21283ebe1ad960528882b96dd 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/MediaSpecimenGeneralDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/MediaSpecimenGeneralDetailElement.java
@@ -85,7 +85,7 @@ public class MediaSpecimenGeneralDetailElement extends AbstractCdmDetailElement<
             date.initController(formFactory, formElement);
 
 
-            textMethodLanguageString = formFactory.createLanguageStringWithLabelElement(formElement, "Method", media.getDescription(Language.DEFAULT()), style);
+            textMethodLanguageString = formFactory.createLanguageStringWithLabelElement(formElement, "Method", media.getDescription(Language.getDefaultLanguage()), style);
             selection_collection = formFactory.createSelectionElement(Collection.class, getConversationHolder(), formElement, "Collection", entity.getCollection(), EntitySelectionElement.ALL, style);
             text_accessionNumber = formFactory.createTextWithLabelElement(formElement, "Accession Number", entity.getAccessionNumber(), style);
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/NamedAreaDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/NamedAreaDetailElement.java
index a3431c3308d362a7b59d8eb5bcdd37557a2468df..2e1d746c62b4e12b47c3a64d7a704112926785f2 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/NamedAreaDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/NamedAreaDetailElement.java
@@ -67,7 +67,7 @@ public class NamedAreaDetailElement extends DefinedTermDetailElement<NamedArea>
                        getEntity().setTitleCache(null);\r
                } else if (eventSource == text_description) {\r
 \r
-                       getEntity().getRepresentation(Language.DEFAULT()).setText(text_description.getText());\r
+                       getEntity().getRepresentation(Language.getDefaultLanguage()).setText(text_description.getText());\r
 \r
                } else if (eventSource == uri_uri) {\r
 \r
@@ -78,7 +78,7 @@ public class NamedAreaDetailElement extends DefinedTermDetailElement<NamedArea>
                                e.printStackTrace();\r
                        }\r
                } else if (eventSource == text_abbreviatedLabel) {\r
-                       getEntity().getRepresentation(Language.DEFAULT()).setAbbreviatedLabel(text_abbreviatedLabel.getText());\r
+                       getEntity().getRepresentation(Language.getDefaultLanguage()).setAbbreviatedLabel(text_abbreviatedLabel.getText());\r
                } else if (eventSource == timePeriod_validPeriod) {\r
                        getEntity().setValidPeriod(timePeriod_validPeriod.getTimePeriod());\r
                } else if (eventSource == combo_namedAreaType) {\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/GoogleLanguageApiWrapper.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/GoogleLanguageApiWrapper.java
index c2699cbba507c3372fdcc90c36618b8a6b3ecfe2..602b653427dea146d157612ab38dc01f49618159 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/GoogleLanguageApiWrapper.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/GoogleLanguageApiWrapper.java
@@ -20,6 +20,7 @@ import eu.etaxonomy.cdm.model.common.Language;
  * @author n.hoffmann
  * @created Oct 21, 2010
  * @version 1.0
+ * @deprecated Should not be used as the Google translation service is not free anymore
  */
 public class GoogleLanguageApiWrapper implements ITranslationServiceWrapper {