X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2Fengine%2FLanguage.java;h=2dd88d34845102ee8f222e336141dd8d1b909ab0;hb=2a18ab8b97ba0254a0655d595f05c492eb0eecd4;hp=78085f6a26eb498d38b8b7d26cfa9da6440b6d1d;hpb=f1bd215a3fe170da6132f4f4e4254f4903d6b146;p=Dictionary.git diff --git a/src/com/hughes/android/dictionary/engine/Language.java b/src/com/hughes/android/dictionary/engine/Language.java index 78085f6..2dd88d3 100644 --- a/src/com/hughes/android/dictionary/engine/Language.java +++ b/src/com/hughes/android/dictionary/engine/Language.java @@ -1,127 +1,117 @@ -// Copyright 2011 Google Inc. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package com.hughes.android.dictionary.engine; - -import com.hughes.android.dictionary.DictionaryApplication; -import com.ibm.icu.text.Collator; - -import java.util.Comparator; -import java.util.LinkedHashMap; -import java.util.Locale; -import java.util.Map; -import java.util.regex.Pattern; - -public class Language { - - public static final class LanguageResources { - public final String englishName; - public final int nameId; - public final int flagId; - - public LanguageResources(final String englishName, int nameId, int flagId) { - this.englishName = englishName; - this.nameId = nameId; - this.flagId = flagId; - } - - public LanguageResources(final String englishName, int nameId) { - this(englishName, nameId, 0); - } - } - - private static final Map registry = new LinkedHashMap(); - - final String isoCode; - final Locale locale; - - private Collator collator; - - private Language(final Locale locale, final String isoCode) { - this.locale = locale; - this.isoCode = isoCode; - - registry.put(isoCode.toLowerCase(), this); - } - - @Override - public String toString() { - return locale.toString(); - } - - public String getIsoCode() { - return isoCode; - } - - public synchronized Comparator getCollator() { - if (!DictionaryApplication.USE_COLLATOR) - return String.CASE_INSENSITIVE_ORDER; - // Don't think this is thread-safe... - // if (collator == null) { - this.collator = Collator.getInstance(locale); - this.collator.setStrength(Collator.IDENTICAL); - // } - return collator; - } - - public String getDefaultNormalizerRules() { - return ":: Any-Latin; ' ' > ; :: Lower; :: NFD; :: [:Nonspacing Mark:] Remove; :: NFC ;"; - } - - /** - * A practical pattern to identify strong RTL characters. This pattern is - * not completely correct according to the Unicode standard. It is - * simplified for performance and small code size. - */ - private static final String rtlChars = - "\u0591-\u07FF\uFB1D-\uFDFD\uFE70-\uFEFC"; - - private static final String puncChars = - "\\[\\]\\(\\)\\{\\}\\="; - - private static final Pattern RTL_LEFT_BOUNDARY = Pattern.compile("([" + puncChars + "])([" - + rtlChars + "])"); - private static final Pattern RTL_RIGHT_BOUNDARY = Pattern.compile("([" + rtlChars + "])([" - + puncChars + "])"); - - public static String fixBidiText(String text) { - // text = RTL_LEFT_BOUNDARY.matcher(text).replaceAll("$1\u200e $2"); - // text = RTL_RIGHT_BOUNDARY.matcher(text).replaceAll("$1 \u200e$2"); - return text; - } - - // ---------------------------------------------------------------- - - public static final Language en = new Language(Locale.ENGLISH, "EN"); - public static final Language fr = new Language(Locale.FRENCH, "FR"); - public static final Language it = new Language(Locale.ITALIAN, "IT"); - - public static final Language de = new Language(Locale.GERMAN, "DE") { - @Override - public String getDefaultNormalizerRules() { - return ":: Lower; 'ae' > 'ä'; 'oe' > 'ö'; 'ue' > 'ü'; 'ß' > 'ss'; "; - } - }; - - // ---------------------------------------------------------------- - - public static synchronized Language lookup(final String isoCode) { - Language lang = registry.get(isoCode.toLowerCase()); - if (lang == null) { - lang = new Language(new Locale(isoCode), isoCode); - } - return lang; - } - -} +// Copyright 2011 Google Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package com.hughes.android.dictionary.engine; + +import java.util.Comparator; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; + +import com.hughes.android.dictionary.CollatorWrapper; +import com.hughes.android.dictionary.DictionaryApplication; + +public class Language { + + public static final class LanguageResources { + final String englishName; + public final int nameId; + public final int flagId; + + public LanguageResources(final String englishName, int nameId, int flagId) { + this.englishName = englishName; + this.nameId = nameId; + this.flagId = flagId; + } + + public LanguageResources(final String englishName, int nameId) { + this(englishName, nameId, 0); + } + } + + private static final Map registry = new HashMap<>(); + + private final String isoCode; + private final Locale locale; + + private Language(final Locale locale, final String isoCode) { + this.locale = locale; + this.isoCode = isoCode; + + registry.put(isoCode.toLowerCase(), this); + } + + @Override + public String toString() { + return locale.toString(); + } + + public String getIsoCode() { + return isoCode; + } + + public synchronized Comparator getCollator() { + if (!DictionaryApplication.USE_COLLATOR) + return new Comparator() { + @Override + public int compare(Object o, Object t1) { + return ((String) o).compareToIgnoreCase((String) t1); + } + }; + // TODO: consider if this should be cached - but must be thread-safe + return CollatorWrapper.getInstanceStrengthIdentical(locale); + } + + public String getDefaultNormalizerRules() { + return ":: Any-Latin; ' ' > ; :: Lower; :: NFD; :: [:Nonspacing Mark:] Remove; :: NFC ;"; + } + + /** + * A practical pattern to identify strong RTL characters. This pattern is + * not completely correct according to the Unicode standard. It is + * simplified for performance and small code size. + */ + private static final String rtlChars = + "\u0591-\u07FF\uFB1D-\uFDFD\uFE70-\uFEFC"; + + @SuppressWarnings("unused") + public static String fixBidiText(String text) { + // TODO: RTL text (e.g. arabic) in parenthesis might need extra + // \u200e markers sometimes - check what exactly is going on there. + return text; + } + + // ---------------------------------------------------------------- + + public static final Language en = new Language(Locale.ENGLISH, "EN"); + public static final Language it = new Language(Locale.ITALIAN, "IT"); + + public static final Language de = new Language(Locale.GERMAN, "DE") { + @Override + public String getDefaultNormalizerRules() { + return ":: Lower; 'ae' > 'ä'; 'oe' > 'ö'; 'ue' > 'ü'; 'ß' > 'ss'; "; + } + }; + + // ---------------------------------------------------------------- + + public static synchronized Language lookup(final String isoCode) { + Language lang = registry.get(isoCode.toLowerCase()); + if (lang == null) { + lang = new Language(new Locale(isoCode), isoCode); + } + return lang; + } + +}