Changeset 4507 for vlo/branches/vlo-3.0/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/LanguageCodePostProcessor.java

Timestamp:

02/13/14 10:54:47 (10 years ago)

Author:

twagoo

Message:

turned VloConfig? into a POJO, created factory interface so that multiple ways. Adapted importer and web app to use this - importer still using static (but project-local) config references

File:

• vlo/branches/vlo-3.0/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/LanguageCodePostProcessor.java (modified) (6 diffs)

vlo/branches/vlo-3.0/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/LanguageCodePostProcessor.java

@@ -18 +18 @@
 
 import eu.clarin.cmdi.vlo.CommonUtils;
-import eu.clarin.cmdi.vlo.config.VloConfig;
 
 public class LanguageCodePostProcessor implements PostProcessor{
@@ -98 +97 @@
     private Map<String, String> getTwoLetterCountryCodeMap() {
         if (twoLetterCodesMap == null) {
-            twoLetterCodesMap = createCodeMap(VloConfig.getLanguage2LetterCodeComponentUrl());
+            twoLetterCodesMap = createCodeMap(MetadataImporter.config.getLanguage2LetterCodeComponentUrl());
         }
         return twoLetterCodesMap;
@@ -105 +104 @@
     private Map<String, String> getThreeLetterCountryCodeMap() {
         if (threeLetterCodesMap == null) {
-            threeLetterCodesMap = createCodeMap(VloConfig.getLanguage3LetterCodeComponentUrl());
+            threeLetterCodesMap = createCodeMap(MetadataImporter.config.getLanguage3LetterCodeComponentUrl());
         }
         return threeLetterCodesMap;
@@ -112 +111 @@
     protected Map<String, String> getLanguageNameToIso639Map() {
         if (languageNameToIso639Map == null) {
-                        languageNameToIso639Map = createReverseCodeMap(VloConfig.getLanguage3LetterCodeComponentUrl());
+                        languageNameToIso639Map = createReverseCodeMap(MetadataImporter.config.getLanguage3LetterCodeComponentUrl());
         }
         return languageNameToIso639Map;
@@ -119 +118 @@
     private Map<String, String> getIso639ToLanguageNameMap() {
         if (iso639ToLanguageNameMap == null) {
-                iso639ToLanguageNameMap = createCodeMap(VloConfig.getLanguage3LetterCodeComponentUrl());
+                iso639ToLanguageNameMap = createCodeMap(MetadataImporter.config.getLanguage3LetterCodeComponentUrl());
         }
 
@@ -151 +150 @@
             DocumentBuilderFactory domFactory = DocumentBuilderFactory.newInstance();
             domFactory.setNamespaceAware(true);
-            URL url = new URL(VloConfig.getSilToISO639CodesUrl());
+            URL url = new URL(MetadataImporter.config.getSilToISO639CodesUrl());
             DocumentBuilder builder = domFactory.newDocumentBuilder();
             Document doc = builder.parse(url.openStream());