Changeset 2659 for vlo/branches/vlo-2.13-param/vlo_importer/src/main/java/eu/clarin/cmdi/vlo/importer/LanguageCodePostProcessor.java

Timestamp:

03/07/13 08:48:58 (11 years ago)

Author:

keeloo

Message:

Removed VloConfig?.get() and made the member variables static themselves. Cleaned up the VloConfig? class.

File:

• vlo/branches/vlo-2.13-param/vlo_importer/src/main/java/eu/clarin/cmdi/vlo/importer/LanguageCodePostProcessor.java (modified) (5 diffs)

vlo/branches/vlo-2.13-param/vlo_importer/src/main/java/eu/clarin/cmdi/vlo/importer/LanguageCodePostProcessor.java

@@ -98 +98 @@
     private Map<String, String> getTwoLetterCountryCodeMap() {
         if (twoLetterCodesMap == null) {
-            twoLetterCodesMap = createCodeMap(VloConfig.get().getLanguage2LetterCodeComponentUrl());
+            twoLetterCodesMap = createCodeMap(VloConfig.getLanguage2LetterCodeComponentUrl());
         }
         return twoLetterCodesMap;
@@ -105 +105 @@
     private Map<String, String> getThreeLetterCountryCodeMap() {
         if (threeLetterCodesMap == null) {
-            threeLetterCodesMap = createCodeMap(VloConfig.get().getLanguage3LetterCodeComponentUrl());
+            threeLetterCodesMap = createCodeMap(VloConfig.getLanguage3LetterCodeComponentUrl());
         }
         return threeLetterCodesMap;
@@ -112 +112 @@
     protected Map<String, String> getLanguageNameToIso639Map() {
         if (languageNameToIso639Map == null) {
-                        languageNameToIso639Map = createReverseCodeMap(VloConfig.get().getLanguage3LetterCodeComponentUrl());
+                        languageNameToIso639Map = createReverseCodeMap(VloConfig.getLanguage3LetterCodeComponentUrl());
         }
         return languageNameToIso639Map;
@@ -119 +119 @@
     private Map<String, String> getIso639ToLanguageNameMap() {
         if (iso639ToLanguageNameMap == null) {
-                iso639ToLanguageNameMap = createCodeMap(VloConfig.get().getLanguage3LetterCodeComponentUrl());
+                iso639ToLanguageNameMap = createCodeMap(VloConfig.getLanguage3LetterCodeComponentUrl());
         }
 
@@ -151 +151 @@
             DocumentBuilderFactory domFactory = DocumentBuilderFactory.newInstance();
             domFactory.setNamespaceAware(true);
-            URL url = new URL(VloConfig.get().getSilToISO639CodesUrl());
+            URL url = new URL(VloConfig.getSilToISO639CodesUrl());
             DocumentBuilder builder = domFactory.newDocumentBuilder();
             Document doc = builder.parse(url.openStream());