Projects >> jsword >>6c4f573807be35835a0d378d35c9280e5297b907

Chunk
Conflicting content
        return ResourceBundle.getBundle("iso639full", locale, CWClassLoader.instance());
    }

<<<<<<< HEAD
    /**
     * Provide a fallback lookup against a huge list of all languages.
     * The basic list has a few hundred languages. The full list has
     * over 7000. As a fallback, this file is not internationalized.
     */
    private static class AllLanguages {
        /**
         * This is a singleton class. Do not allow construction.
         */
        private AllLanguages() {}

        /**
         * Get the language name for the code. If the language name is not known
         * then return the code.
         * 
         * @param languageCode
         * @return the name for the language.
         */
        public static String getLanguageName(String languageCode) {
            String name = instance.get(languageCode);
            if (name != null) {
                return name;
            }
            return languageCode;
        }

        /**
         * Do lazy loading of the huge file of languages.
         */
        private static PropertyMap instance;
        static {
            try {
                instance = ResourceUtil.getProperties("iso639full");
                log.debug("Loading iso639full.properties file");
            } catch (IOException e) {
                log.fatal("Unable to load iso639full.properties", e);
            }
        }
    }
    
    public static final String DEFAULT_LANG_CODE = "en";
    private static final String UNKNOWN_LANG_CODE = "und";
    private static final Logger log = Logger.getLogger(Books.class);
    private static volatile Map localisedCommonLanguages = new HashMap();
=======
    public static final String DEFAULT_LANG_CODE = "en";
    private static final String UNKNOWN_LANG_CODE = "und";
    private static final Logger log = Logger.getLogger(Books.class);
    private static/* final */ResourceBundle allLangs;
    private static Map localisedCommonLanguages = new HashMap();
>>>>>>> f78e2fc4dbbeec2c0c1b47a5c2c7c34324f19646
}
Solution content
        return ResourceBundle.getBundle("iso639full", locale, CWClassLoader.instance());
    }

    /**
     * Provide a fallback lookup against a huge list of all languages.
     * The basic list has a few hundred languages. The full list has
     * over 7000. As a fallback, this file is not internationalized.
     */
    private static class AllLanguages {
        /**
         * This is a singleton class. Do not allow construction.
         */
        private AllLanguages() {}

        /**
         * Get the language name for the code. If the language name is not known
         * then return the code.
         * 
         * @param languageCode
         * @return the name for the language.
         */
        public static String getLanguageName(String languageCode) {
            String name = instance.get(languageCode);
            if (name != null) {
                return name;
            }
            return languageCode;
        }

        /**
         * Do lazy loading of the huge file of languages.
         */
        private static PropertyMap instance;
        static {
            try {
                instance = ResourceUtil.getProperties("iso639full");
                log.debug("Loading iso639full.properties file");
            } catch (IOException e) {
                log.fatal("Unable to load iso639full.properties", e);
            }
        }
    }

    public static final String DEFAULT_LANG_CODE = "en";
    private static final String UNKNOWN_LANG_CODE = "und";
    private static final Logger log = Logger.getLogger(Books.class);
    private static Map localisedCommonLanguages = new HashMap();
}
File
Languages.java
Developer's decision
Combination
Kind of conflict
Attribute
Class declaration
Comment
Method invocation