[Unicode]   Common Locale Data Repository : Bug Tracking Home | Site Map | Search
 

Changeset 9589


Ignore:
Timestamp:
12/23/13 16:37:01 (5 years ago)
Author:
jali01
Message:

cldrbug 6717: reverting back to branch 9587 temporarily until build is fixed

Location:
trunk/tools
Files:
41 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/cldr-apps/WebContent

    • Property svn:mergeinfo deleted
  • trunk/tools/cldr-apps/src

    • Property svn:mergeinfo deleted
  • trunk/tools/java/org/unicode/cldr/util/Builder.java

    r9588 r9589  
    133133        } 
    134134 
    135         @SuppressWarnings("unchecked") 
    136135        public CBuilder<E, U> addAll(E... items) { 
    137136            for (E item : items) { 
     
    152151        } 
    153152 
    154         @SuppressWarnings("unchecked") 
    155153        public <T> CBuilder<E, U> addAll(Transform<T, E> transform, T... items) { 
    156154            return addAll(Transformer.iterator(transform, items)); 
     
    176174        } 
    177175 
    178         @SuppressWarnings("unchecked") 
    179176        public CBuilder<E, U> removeAll(E... items) { 
    180177            for (E item : items) { 
     
    196193        } 
    197194 
    198         @SuppressWarnings("unchecked") 
    199195        public CBuilder<E, U> retainAll(E... items) { 
    200196            collection.retainAll(Arrays.asList(items)); 
     
    223219        } 
    224220 
    225         @SuppressWarnings("unchecked") 
    226221        public CBuilder<E, U> xor(E... items) { 
    227222            return xor(Arrays.asList(items)); 
     
    241236        } 
    242237 
    243         @SuppressWarnings("unchecked") 
    244238        public CBuilder<E, U> keepNew(E... items) { 
    245239            return keepNew(Arrays.asList(items)); 
     
    338332        } 
    339333 
    340         @SuppressWarnings("unchecked") 
    341334        public MBuilder<K, V, M> on(K... keys) { 
    342335            this.keys = Arrays.asList(keys); 
     
    357350        } 
    358351 
    359         @SuppressWarnings("unchecked") 
    360352        public MBuilder<K, V, M> put(V... values) { 
    361353            int v = 0; 
     
    393385        } 
    394386 
    395         @SuppressWarnings("unchecked") 
    396387        public MBuilder<K, V, M> putAll(K[][] m) { 
    397388            for (K[] pair : m) { 
     
    419410        } 
    420411 
    421         @SuppressWarnings("unchecked") 
    422412        public MBuilder<K, V, M> removeAll(K... keys) { 
    423413            return removeAll(Arrays.asList(keys)); 
     
    439429        } 
    440430 
    441         @SuppressWarnings("unchecked") 
    442431        public MBuilder<K, V, M> retainAll(K... keys) { 
    443432            return retainAll(Arrays.asList(keys)); 
  • trunk/tools/java/org/unicode/cldr/util/CLDRFile.java

    r9588 r9589  
    5757import com.ibm.icu.dev.util.Relation; 
    5858import com.ibm.icu.impl.Utility; 
     59import com.ibm.icu.text.DateTimePatternGenerator; 
    5960import com.ibm.icu.text.MessageFormat; 
    6061import com.ibm.icu.text.PluralRules; 
     
    469470        if (x.size() != 0) { 
    470471            String extras = "Comments without bases" + XPathParts.NEWLINE; 
    471             for (Iterator<String> it = x.iterator(); it.hasNext();) { 
    472                 String key = it.next(); 
     472            for (Iterator it = x.iterator(); it.hasNext();) { 
     473                String key = (String) it.next(); 
    473474                // Log.logln("Writing extra comment: " + key); 
    474475                extras += XPathParts.NEWLINE + key; 
     
    683684        } else if (conflict_resolution == MERGE_REPLACE_MY_DRAFT) { 
    684685            // first find all my alt=..proposed items 
    685             Set<String> hasDraftVersion = new HashSet<String>(); 
    686             for (Iterator<String> it = dataSource.iterator(); it.hasNext();) { 
    687                 String cpath = it.next(); 
     686            Set hasDraftVersion = new HashSet(); 
     687            for (Iterator it = dataSource.iterator(); it.hasNext();) { 
     688                String cpath = (String) it.next(); 
    688689                String fullpath = getFullXPath(cpath); 
    689690                if (fullpath.indexOf("[@draft") >= 0) { 
     
    694695            // this is either an item with draft in the fullpath 
    695696            // or an item with draft and alt in the full path 
    696             for (Iterator<String> it = other.iterator(); it.hasNext();) { 
    697                 String cpath = it.next(); 
     697            for (Iterator it = other.iterator(); it.hasNext();) { 
     698                String cpath = (String) it.next(); 
    698699                // Value otherValueOld = (Value) other.getXpath_value().get(cpath); 
    699700                // fix the data 
     
    722723            } 
    723724        } else if (conflict_resolution == MERGE_ADD_ALTERNATE) { 
    724             for (Iterator<String> it = other.iterator(); it.hasNext();) { 
    725                 String key = it.next(); 
     725            for (Iterator it = other.iterator(); it.hasNext();) { 
     726                String key = (String) it.next(); 
    726727                String otherValue = other.getStringValue(key); 
    727728                String myValue = dataSource.getValueAtPath(key); 
     
    772773        String accummulatedReferences = null; 
    773774        for (int i = 0; i < parts.size(); ++i) { 
    774             Map<String, String> attributes = parts.getAttributes(i); 
    775             String references = attributes.get("references"); 
     775            Map attributes = parts.getAttributes(i); 
     776            String references = (String) attributes.get("references"); 
    776777            if (references == null) continue; 
    777778            if (accummulatedReferences == null) 
     
    782783        if (accummulatedReferences == null) return newFullPath; 
    783784        XPathParts newParts = new XPathParts(null, null).set(newFullPath); 
    784         Map<String, String> attributes = newParts.getAttributes(newParts.size() - 1); 
    785         String references = attributes.get("references"); 
     785        Map attributes = newParts.getAttributes(newParts.size() - 1); 
     786        String references = (String) attributes.get("references"); 
    786787        if (references == null) 
    787788            references = accummulatedReferences; 
     
    817818     * Removes all xpaths from a CLDRFile. 
    818819     */ 
    819     public CLDRFile removeAll(Set<String> xpaths, boolean butComment) { 
     820    public CLDRFile removeAll(Set xpaths, boolean butComment) { 
    820821        if (butComment) appendFinalComment("Illegal attributes removed:"); 
    821         for (Iterator<String> it = xpaths.iterator(); it.hasNext();) { 
    822             remove(it.next(), butComment); 
     822        for (Iterator it = xpaths.iterator(); it.hasNext();) { 
     823            remove((String) it.next(), butComment); 
    823824        } 
    824825        return this; 
     
    879880            removedItems.clear(); 
    880881        } 
    881         for (Iterator<String> it = iterator(); it.hasNext();) { // see what items we have that the other also has 
    882             String xpath = it.next(); 
     882        for (Iterator it = iterator(); it.hasNext();) { // see what items we have that the other also has 
     883            String xpath = (String) it.next(); 
    883884            switch (keepIfMatches.getRetention(xpath)) { 
    884885            case RETAIN: 
     
    942943        Matcher specialPathMatcher = specialsToPushFromRoot.matcher(""); 
    943944        XPathParts parts = new XPathParts(getAttributeOrdering(), defaultSuppressionMap); 
    944         for (Iterator<String> it = rootFile.iterator(); it.hasNext();) { 
    945             String xpath = it.next(); 
     945        for (Iterator it = rootFile.iterator(); it.hasNext();) { 
     946            String xpath = (String) it.next(); 
    946947 
    947948            // skip aliases, choices 
     
    962963            if (!otherFullXPath.contains("[@draft")) { 
    963964                parts.set(otherFullXPath); 
    964                 Map<String, String> attributes = parts.getAttributes(-1); 
     965                Map attributes = parts.getAttributes(-1); 
    965966                attributes.put("draft", "unconfirmed"); 
    966967                otherFullXPath = parts.toString(); 
     
    11911192            XPathParts parts = new XPathParts(null, null).set(xpath); 
    11921193            String restore; 
    1193             HashSet<String> toRemove = new HashSet<String>(); 
     1194            HashSet<String> toRemove = new HashSet(); 
    11941195            for (int i = 0; i < parts.size(); ++i) { 
    11951196                if (parts.getAttributeCount(i) == 0) { 
    11961197                    continue; 
    11971198                } 
    1198                 Map<String, String> attributes = parts.getAttributes(i); 
     1199                String element = parts.getElement(i); 
     1200                Map attributes = parts.getAttributes(i); 
    11991201                toRemove.clear(); 
    12001202                restore = null; 
    1201                 for (Iterator<String> it = attributes.keySet().iterator(); it.hasNext();) { 
    1202                     String attribute = it.next(); 
     1203                for (Iterator it = attributes.keySet().iterator(); it.hasNext();) { 
     1204                    String attribute = (String) it.next(); 
    12031205                    if (attribute.equals("draft")) { 
    12041206                        toRemove.add(attribute); 
     
    15071509        private String currentFullXPath = "/"; 
    15081510        private String comment = null; 
    1509         private Map<String, String> attributeOrder; 
     1511        private Map attributeOrder; 
    15101512        private DtdData dtdData; 
    15111513        private CLDRFile target; 
     
    15741576                    } 
    15751577                } 
    1576                 for (Iterator<String> it = attributeOrder.keySet().iterator(); it.hasNext();) { 
    1577                     String attribute = it.next(); 
    1578                     String value = attributeOrder.get(attribute); 
     1578                for (Iterator it = attributeOrder.keySet().iterator(); it.hasNext();) { 
     1579                    String attribute = (String) it.next(); 
     1580                    String value = (String) attributeOrder.get(attribute); 
    15791581                    String both = "[@" + attribute + "=\"" + value + "\"]"; // TODO quote the value?? 
    15801582                    currentFullXPath += both; 
     
    16361638         * Types which changed from 'type' to 'choice', but not in supplemental data. 
    16371639         */ 
    1638         private static Set<String> changedTypes = new HashSet<String>(Arrays.asList(new String[] { 
     1640        private static Set changedTypes = new HashSet(Arrays.asList(new String[] { 
    16391641            "abbreviationFallback", 
    16401642            "default", "mapping", "measurementSystem", "preferenceOrdering" })); 
     
    18051807            try { 
    18061808                if (isSupplemental < 0) { // set by first element 
    1807                     attributeOrder = new TreeMap<String, String>(dtdData.getAttributeComparator()); 
     1809                    attributeOrder = new TreeMap(dtdData.getAttributeComparator()); 
    18081810                    isSupplemental = target.dtdType == DtdType.ldml ? 0 : 1; 
    18091811                    //                    if (qName.equals("ldml")) 
     
    24122414     */ 
    24132415    public static List<String> getElementOrder() { 
    2414         return Collections.emptyList(); // elementOrdering.getOrder(); // already unmodifiable 
     2416        return Collections.EMPTY_LIST; // elementOrdering.getOrder(); // already unmodifiable 
    24152417    } 
    24162418 
     
    27182720    //    } 
    27192721 
    2720     private final static Map<String, Map<String, String>> defaultSuppressionMap; 
     2722    private final static Map defaultSuppressionMap; 
    27212723    static { 
    27222724        String[][] data = { 
     
    27402742            { "*", "_q", "*" }, 
    27412743        }; 
    2742         Map<String, Map<String, String>> tempmain = asMap(data, true); 
     2744        Map tempmain = asMap(data, true); 
    27432745        defaultSuppressionMap = Collections.unmodifiableMap(tempmain); 
    27442746    } 
    27452747 
    2746     public static Map<String, Map<String, String>> getDefaultSuppressionMap() { 
     2748    public static Map getDefaultSuppressionMap() { 
    27472749        return defaultSuppressionMap; 
    27482750    } 
    27492751 
    2750     @SuppressWarnings({ "rawtypes", "unchecked" }) 
    27512752    private static Map asMap(String[][] data, boolean tree) { 
    27522753        Map tempmain = tree ? (Map) new TreeMap() : new HashMap(); 
     
    28682869                    } 
    28692870                    DtdType type = distinguishingParts.getDtdData().dtdType; 
    2870                     Set<String> toRemove = new HashSet<String>(); 
     2871                    Set<String> toRemove = new HashSet(); 
    28712872 
    28722873                    // first clean up draft and alt 
     
    29122913                            --placementIndex; 
    29132914                        } 
     2915                        Map<String, String> attributes = distinguishingParts.getAttributes(placementIndex); 
    29142916                        if (draft != null) { 
    29152917                            distinguishingParts.putAttributeValue(placementIndex, "draft", draft); 
     
    32143216                throw new IllegalArgumentException("baseFile must be resolved"); 
    32153217            } 
    3216             Relation<String, String> pathMap = Relation.of(new HashMap<String, Set<String>>(), TreeSet.class, 
     3218            Relation<String, String> pathMap = new Relation(new HashMap<String, String>(), TreeSet.class, 
    32173219                new WinningComparator(user)); 
    32183220            for (String path : baseFile) { 
  • trunk/tools/java/org/unicode/cldr/util/CLDRTransforms.java

    r9588 r9589  
    124124        // List<String> extras = new ArrayList<String>(); 
    125125 
    126         Relation<Matcher, String> dependsOn = Relation.of(new LinkedHashMap<Matcher, Set<String>>(), LinkedHashSet.class); 
     126        Relation<Matcher, String> dependsOn = new Relation(new LinkedHashMap(), LinkedHashSet.class); 
    127127        { 
    128128            addDependency("Latin-(Jamo|Hangul)(/.*)?", "Latin-ConjoiningJamo", "ConjoiningJamo-Latin"); 
  • trunk/tools/java/org/unicode/cldr/util/CldrUtility.java

    r9588 r9589  
    373373     * Really, really ugly code, since Java doesn't let us do better. 
    374374     */ 
    375     @SuppressWarnings({ "rawtypes", "unchecked" }) 
    376375    public static <T> T protectCollection(T source) { 
    377376        // TODO - exclude UnmodifiableMap, Set, ... 
     
    417416     * @return 
    418417     */ 
    419     @SuppressWarnings("unchecked") 
    420418    public static <T> T clone(T source) { 
    421419        try { 
     
    483481     * Utility like Arrays.asList() 
    484482     */ 
    485     @SuppressWarnings("unchecked") 
    486483    public static <K, V> Map<K, V> asMap(Object[][] source, Map<K, V> target, boolean reverse) { 
    487484        int from = 0, to = 1; 
     
    690687    } 
    691688 
    692     @SuppressWarnings({ "rawtypes", "unchecked" }) 
    693689    public static void addTreeMapChain(Map coverageData, Object... objects) { 
    694690        Map<Object, Object> base = coverageData; 
  • trunk/tools/java/org/unicode/cldr/util/DelegatingIterator.java

    r9588 r9589  
    99    private int item = 0; 
    1010 
    11     @SuppressWarnings("unchecked") 
    1211    public DelegatingIterator(Iterator<T>... iterators) { 
    1312        this.iterators = iterators; 
     
    4039    } 
    4140 
    42     @SuppressWarnings("unchecked") 
    4341    public static <T> Iterable<T> iterable(Iterable<T>... s) { 
    4442        return new MyIterable<T>(s); 
    4543    } 
    4644 
    47     @SuppressWarnings("unchecked") 
    4845    public static <T> T[] array(T... s) { 
    4946        return s; 
     
    5350        public Iterable<T>[] iterables; 
    5451 
    55         @SuppressWarnings("unchecked") 
    5652        public MyIterable(Iterable<T>... s) { 
    5753            iterables = s; 
  • trunk/tools/java/org/unicode/cldr/util/DiscreteComparator.java

    r9588 r9589  
    173173         * @return this, for chaining 
    174174         */ 
    175         @SuppressWarnings("unchecked") 
    176175        public Builder<T> add(T... items) { 
    177176            if (items.length < 2) { 
     
    333332        } 
    334333 
    335         @SuppressWarnings({ "unchecked", "rawtypes" }) 
     334        @SuppressWarnings("unchecked") 
    336335        public int compareTo(Node<T> o) { 
    337336            return ((Comparable) me).compareTo((Comparable) (o.me)); 
  • trunk/tools/java/org/unicode/cldr/util/DtdDataCheck.java

    r9588 r9589  
    11package org.unicode.cldr.util; 
    22 
     3import java.io.BufferedReader; 
    34import java.io.IOException; 
    45import java.io.PrintWriter; 
    56import java.util.Arrays; 
    67import java.util.Comparator; 
     8import java.util.EnumMap; 
    79import java.util.HashSet; 
    810import java.util.LinkedHashSet; 
     
    1315import java.util.TreeSet; 
    1416 
     17import org.unicode.cldr.draft.FileUtilities; 
    1518import org.unicode.cldr.unittest.TestAll.TestInfo; 
    1619import org.unicode.cldr.util.CLDRFile.DtdType; 
     
    2629import com.ibm.icu.impl.Row; 
    2730import com.ibm.icu.impl.Row.R2; 
     31import com.ibm.icu.impl.Row.R3; 
    2832import com.ibm.icu.impl.Row.R4; 
    2933 
     
    4246        Set<Element> elementsMissingDraft = new LinkedHashSet<Element>(); 
    4347        Set<Element> elementsMissingAlt = new LinkedHashSet<Element>(); 
     48        Set<Element> elementsMissingAlias = new LinkedHashSet<Element>(); 
     49        Set<Element> elementsMissingSpecial = new LinkedHashSet<Element>(); 
    4450        static final Set<String> SKIP_ATTRIBUTES = new HashSet<String>(Arrays.asList( 
    4551            "draft", "alt", "standard", "references")); 
     
    181187            br.append(dtdData.toString()); 
    182188            br.close(); 
    183             timer.stop(); 
     189            long duration = timer.stop(); 
    184190            System.out.println("Time: " + timer); 
    185191            if (true) { 
     
    239245            DtdType type = CLDRFile.DtdType.valueOf(arg); 
    240246            DtdData dtdData = DtdData.getInstance(type); 
    241             timer.stop(); 
     247            long duration = timer.stop(); 
    242248            System.out.println("Time: " + timer); 
    243249        } 
  • trunk/tools/java/org/unicode/cldr/util/ElementAttributeInfo.java

    r9588 r9589  
    2929    private DtdType dtdType; 
    3030    private Map<R2<String, String>, R3<Set<String>, String, String>> elementAttribute2Data = new TreeMap<R2<String, String>, R3<Set<String>, String, String>>(); 
    31     private Relation<String, String> element2children = Relation.of(new LinkedHashMap<String, Set<String>>(), LinkedHashSet.class); 
    32     private Relation<String, String> element2parents = Relation.of(new LinkedHashMap<String, Set<String>>(), LinkedHashSet.class); 
    33     private Relation<String, String> element2attributes = Relation.of(new LinkedHashMap<String, Set<String>>(), LinkedHashSet.class); 
     31    private Relation<String, String> element2children = new Relation(new LinkedHashMap(), LinkedHashSet.class); 
     32    private Relation<String, String> element2parents = new Relation(new LinkedHashMap(), LinkedHashSet.class); 
     33    private Relation<String, String> element2attributes = new Relation(new LinkedHashMap(), LinkedHashSet.class); 
    3434 
    3535    static Map<String, Map<DtdType, ElementAttributeInfo>> cache = new HashMap<String, Map<DtdType, ElementAttributeInfo>>(); // new 
  • trunk/tools/java/org/unicode/cldr/util/ExtractCollationRules.java

    r9588 r9589  
    3333        String lastType = ""; 
    3434        rules.setLength(0); 
     35        int lastLen = 0; 
    3536 
    3637        String context = null; 
     
    4950                type_rules.put(lastType, rules.toString()); 
    5051                rules.setLength(0); 
     52                lastLen = 0; 
    5153            } 
    5254            String mainType = parts.getElement(3); 
     
    126128    } 
    127129 
    128     private void writeSettings(Map<String, String> attributes, StringBuffer results) { 
    129         for (Iterator<String> it = attributes.keySet().iterator(); it.hasNext();) { 
    130             String attribute = it.next(); 
    131             String value = attributes.get(attribute); 
     130    private void writeSettings(Map attributes, StringBuffer results) { 
     131        for (Iterator it = attributes.keySet().iterator(); it.hasNext();) { 
     132            String attribute = (String) it.next(); 
     133            String value = (String) attributes.get(attribute); 
    132134            // TODO fix different cases 
    133135            results.append("[" + attribute + " " + value + "]" + CldrUtility.LINE_SEPARATOR); 
  • trunk/tools/java/org/unicode/cldr/util/FindDTDOrder.java

    r9588 r9589  
    195195    private boolean isAncestorOf(String possibleAncestor, String possibleDescendent) { 
    196196        if (ancestorToDescendant == null) { 
    197             ancestorToDescendant = Relation.of(new TreeMap<String, Set<String>>(), TreeSet.class); 
     197            ancestorToDescendant = new Relation(new TreeMap<String, String>(), TreeSet.class); 
    198198            buildPairwiseRelations(new ArrayList<String>(), "ldml"); 
    199199        } 
     
    230230    Object DONE = new Object(); // marker 
    231231 
    232     Relation<String, String> elementToChildren = Relation.of(new TreeMap<String, Set<String>>(), 
     232    Relation<String, String> elementToChildren = new Relation(new TreeMap(), 
    233233        TreeSet.class); 
    234234 
     
    626626    Map<String, Set<String>> attribEquiv = new TreeMap<String, Set<String>>(); 
    627627 
    628     Relation<String, String> attributeToElements = Relation.of(new TreeMap<String, Set<String>>(), 
     628    Relation<String, String> attributeToElements = new Relation(new TreeMap(), 
    629629        TreeSet.class); 
    630630    private XEquivalenceClass attributeEquivalents; 
  • trunk/tools/java/org/unicode/cldr/util/ICUServiceBuilder.java

    r9588 r9589  
    172172        cacheDateFormats.put(key, result); 
    173173        // System.out.println("created " + key); 
     174        SimpleDateFormat sdf = (SimpleDateFormat) result.clone(); 
    174175        return (SimpleDateFormat) result.clone(); 
    175176    } 
     
    211212        if (result != null) return (DateFormatSymbols) result.clone(); 
    212213 
     214        DateFormatSymbols gregorianBackup = null; 
     215        boolean notGregorian = !calendar.equals("gregorian"); 
    213216        String[] last; 
    214217        // TODO We would also like to be able to set the new symbols leapMonthPatterns & shortYearNames 
     
    232235        int minEras = (calendar.equals("chinese") || calendar.equals("dangi")) ? 0 : 1; 
    233236 
    234         List<String> temp = getArray(prefix + "eras/eraAbbr/era[@type=\"", 0, null, "\"]", minEras); 
     237        List temp = getArray(prefix + "eras/eraAbbr/era[@type=\"", 0, null, "\"]", minEras); 
    235238        formatData.setEras(last = (String[]) temp.toArray(new String[temp.size()])); 
    236239        if (minEras != 0) checkFound(last); 
     
    386389        boolean isDay = type.equals("day"); 
    387390        final int arrayCount = isDay ? 7 : type.equals("month") ? 12 : 4; 
    388         List<String> temp = getArray(prefix, isDay ? 0 : 1, isDay ? Days : null, postfix, arrayCount); 
     391        List temp = getArray(prefix, isDay ? 0 : 1, isDay ? Days : null, postfix, arrayCount); 
    389392        if (isDay) temp.add(0, ""); 
    390393        String[] result = (String[]) temp.toArray(new String[temp.size()]); 
     
    425428 
    426429    private static String[] NumberNames = { "integer", "decimal", "percent", "scientific" }; // // "standard", , "INR", 
     430                                                                                             // "CHF", "GBP" 
     431    private static int firstReal = 1; 
     432    private static int firstCurrency = 4; 
    427433 
    428434    public String getNumberNames(int i) { 
  • trunk/tools/java/org/unicode/cldr/util/IntMap.java

    r9588 r9589  
    7676 
    7777    public static class BasicIntMapFactory<T> implements IntMapFactory<T> { 
    78         @SuppressWarnings("unchecked") 
    7978        public BasicIntMap<T> make(Collection<T> values) { 
    8079            return new BasicIntMap<T>((T[]) new ArrayList<T>(new HashSet<T>(values)).toArray()); 
     
    132131        public CompactStringIntMap make(Collection<String> values) { 
    133132            // first sort, longest first 
    134             Set<String> sorted = new TreeSet<String>(LONGEST_FIRST_COMPARATOR); 
     133            Set<String> sorted = new TreeSet(LONGEST_FIRST_COMPARATOR); 
    135134            sorted.addAll(values); 
    136135 
  • trunk/tools/java/org/unicode/cldr/util/Iso639Data.java

    r9588 r9589  
    273273    }; 
    274274 
     275    private enum Status { 
     276        BASE, BEFORE_CELL, IN_CELL, IN_INSIDE_TABLE 
     277    }; 
     278 
    275279    private static void getData() { 
    276280        try { 
     
    281285            in = CldrUtility.getUTF8Data("iso-639-3.tab"); 
    282286            Pattern tabs = Pattern.compile("\\t"); 
    283             toAlpha3 = new HashMap<String, String>(); 
    284             fromAlpha3 = new HashMap<String, String>(); 
    285             toBiblio3 = new HashMap<String, String>(); 
    286             fromBiblio3 = new HashMap<String, String>(); 
    287             toScope = new HashMap<String, Scope>(); 
    288             toType = new HashMap<String, Type>(); 
    289             toNames = Relation.of(new TreeMap<String, Set<String>>(), LinkedHashSet.class); 
    290             toRetirements = Relation.of(new TreeMap<String, Set<String>>(), LinkedHashSet.class); 
    291             macro_encompassed = Relation.of(new TreeMap<String, Set<String>>(), LinkedHashSet.class); 
    292             encompassed_macro = new HashMap<String, String>(); 
    293             toSource = new HashMap<String, Source>(); 
     287            toAlpha3 = new HashMap(); 
     288            fromAlpha3 = new HashMap(); 
     289            toBiblio3 = new HashMap(); 
     290            fromBiblio3 = new HashMap(); 
     291            toScope = new HashMap(); 
     292            toType = new HashMap(); 
     293            toNames = new Relation(new TreeMap(), LinkedHashSet.class); 
     294            toRetirements = new Relation(new TreeMap(), LinkedHashSet.class); 
     295            macro_encompassed = new Relation(new TreeMap(), LinkedHashSet.class); 
     296            encompassed_macro = new HashMap(); 
     297            toSource = new HashMap(); 
    294298            toSource.put("sh", Source.ISO_639_1); // add deprecated language 
    295299 
     
    403407            // and a French name of a language are all separated by pipe (|) 
    404408            // characters. 
     409            int addCounter = 0; 
    405410            while (true) { 
    406411                String line = in.readLine(); 
  • trunk/tools/java/org/unicode/cldr/util/IsoCurrencyParser.java

    r9588 r9589  
    7474    } 
    7575 
    76     private Relation<String, Data> codeList = Relation.of(new TreeMap<String, Set<Data>>(), TreeSet.class, null); 
    77     private Relation<String, String> countryToCodes = Relation.of(new TreeMap<String, Set<String>>(), TreeSet.class, null); 
     76    private Relation<String, Data> codeList = new Relation(new TreeMap(), TreeSet.class, null); 
     77    private Relation<String, String> countryToCodes = new Relation(new TreeMap(), TreeSet.class, null); 
    7878 
    7979    public static class Data implements Comparable<Object> { 
  • trunk/tools/java/org/unicode/cldr/util/LenientDateParser.java

    r9588 r9589  
    729729        } 
    730730        final BestTimeZone bestTimeZone = new BestTimeZone(locale); 
    731         Relation<String, String> stringToZones = Relation.of(new TreeMap<String, Set<String>>(), TreeSet.class, bestTimeZone); 
     731        Relation<String, String> stringToZones = new Relation(new TreeMap(), TreeSet.class, bestTimeZone); 
    732732 
    733733        // final UTF16.StringComparator stringComparator = new UTF16.StringComparator(true, false, 0); 
     
    793793        // we walk through to see what can come before or after a separator, accumulating them all together 
    794794        FormatParser formatParser = new FormatParser(); 
    795         Map<String, EnumSet<Type>> beforeTypes = new HashMap<String, EnumSet<Type>>(); 
    796         Map<String, EnumSet<Type>> afterTypes = new HashMap<String, EnumSet<Type>>(); 
     795        Map<String, EnumSet<Type>> beforeTypes = new HashMap(); 
     796        Map<String, EnumSet<Type>> afterTypes = new HashMap(); 
    797797        EnumSet<Type> nonDateTypes = EnumSet.allOf(Type.class); 
    798798        nonDateTypes.removeAll(dateTypes); 
     
    811811        add(afterTypes, " ", timeTypes); 
    812812 
    813         Set<String> allSeparators = new HashSet<String>(beforeTypes.keySet()); 
     813        Set<String> allSeparators = new HashSet(beforeTypes.keySet()); 
    814814        allSeparators.addAll(afterTypes.keySet()); 
    815815        for (String item : allSeparators) { 
     
    931931        // add missing Etc zones 
    932932        canonicalZones = new TreeSet<String>(supplementalData.getCanonicalZones()); 
    933         Set<String> zones = getAllGmtZones(); 
     933        Set zones = getAllGmtZones(); 
    934934        zones.removeAll(canonicalZones); 
    935935        System.out.println("Missing GMT Zones: " + zones); 
     
    946946 
    947947    private static Set<String> getFirstMinusSecond(Set<String> first, Set<String> second) { 
    948         Set<String> difference = new TreeSet<String>(first); 
     948        Set<String> difference = new TreeSet(first); 
    949949        difference.removeAll(second); 
    950950        return difference; 
     
    11021102    }; 
    11031103 
    1104     private static LinkedHashSet<String> getIcuEquivalentZones(String zoneID) { 
    1105         LinkedHashSet<String> result = new LinkedHashSet<String>(); 
     1104    private static LinkedHashSet getIcuEquivalentZones(String zoneID) { 
     1105        LinkedHashSet result = new LinkedHashSet(); 
    11061106        final int count = TimeZone.countEquivalentIDs(zoneID); 
    11071107        for (int i = 0; i < count; ++i) { 
     
    11241124        } 
    11251125        formatParser.set(pattern); 
    1126         List<Object> list = formatParser.getItems(); 
     1126        List list = formatParser.getItems(); 
    11271127        List<Type> temp = new ArrayList<Type>(); 
    11281128        for (int i = 0; i < list.size(); ++i) { 
  • trunk/tools/java/org/unicode/cldr/util/LogicalGrouping.java

    r9588 r9589  
    140140 
    141141        PluralRules pluralRules = getPluralInfo(cldrFile).getPluralRules(); 
     142        String lastElement = parts.getElement(-1); 
    142143        parts.setAttribute(-1, "count", "0"); 
    143144        Set<Double> explicits = new HashSet<Double>(); 
  • trunk/tools/java/org/unicode/cldr/util/MapComparator.java

    r9588 r9589  
    8686    } 
    8787 
    88     @SuppressWarnings("unchecked") 
    8988    public MapComparator<K> add(K... data) { 
    9089        for (int i = 0; i < data.length; ++i) { 
     
    9695    private static final UnicodeSet numbers = new UnicodeSet("[\\-0-9.]").freeze(); 
    9796 
    98     @SuppressWarnings({ "unchecked", "rawtypes" }) 
    9997    public int compare(K a, K b) { 
    10098        if (false && (a.equals("lines") || b.equals("lines"))) { 
  • trunk/tools/java/org/unicode/cldr/util/MergeLists.java

    r9588 r9589  
    44import java.util.Arrays; 
    55import java.util.Collection; 
     6import java.util.HashSet; 
    67import java.util.Iterator; 
    78import java.util.LinkedHashMap; 
     
    3637    } 
    3738 
    38     @SuppressWarnings("unchecked") 
    3939    public MergeLists<T> add(T... stuff) { 
    4040        return add(Arrays.asList(stuff)); 
  • trunk/tools/java/org/unicode/cldr/util/Pair.java

    r9588 r9589  
    7979    } 
    8080 
    81     @SuppressWarnings({ "rawtypes", "unchecked" }) 
    8281    public int compareTo(Object other) { 
    8382        Pair that = (Pair) other; 
  • trunk/tools/java/org/unicode/cldr/util/PathHeader.java

    r9588 r9589  
    2727import com.ibm.icu.dev.util.Relation; 
    2828import com.ibm.icu.impl.Row; 
     29import com.ibm.icu.impl.Row.R2; 
    2930import com.ibm.icu.lang.UCharacter; 
    3031import com.ibm.icu.text.Collator; 
  • trunk/tools/java/org/unicode/cldr/util/PluralRanges.java

    r9588 r9589  
    11package org.unicode.cldr.util; 
    22 
     3import java.util.EnumMap; 
    34import java.util.EnumSet; 
    45 
     6import org.unicode.cldr.util.SupplementalDataInfo.PluralInfo; 
    57import org.unicode.cldr.util.SupplementalDataInfo.PluralInfo.Count; 
    68 
    79import com.ibm.icu.impl.Utility; 
     10import com.ibm.icu.text.PluralRules; 
     11import com.ibm.icu.text.PluralRules.FixedDecimal; 
     12import com.ibm.icu.text.PluralRules.FixedDecimalRange; 
     13import com.ibm.icu.text.PluralRules.FixedDecimalSamples; 
     14import com.ibm.icu.text.PluralRules.SampleType; 
    815import com.ibm.icu.util.Freezable; 
    916import com.ibm.icu.util.Output; 
  • trunk/tools/java/org/unicode/cldr/util/PluralSnapshot.java

    r9588 r9589  
    6262 
    6363    Plurals[] plurals = new Plurals[LEN]; 
     64 
     65    private Integral integral; 
    6466 
    6567    private BitSet pluralsTransitionAt; 
     
    146148    PluralSnapshot(PluralRules pluralRules, Integral integral, BitSet pluralsTransitionAt) { 
    147149        this.pluralsTransitionAt = pluralsTransitionAt; 
     150        this.integral = integral; 
    148151        double offset = integral == Integral.integer ? 0 : 0.5; 
    149152        found = EnumSet.noneOf(Plurals.class); 
  • trunk/tools/java/org/unicode/cldr/util/RangeAbbreviator.java

    r9588 r9589  
    5252        // find common initial section 
    5353        int end1 = breaker1.last(); 
     54        int end2 = breaker2.last(); 
    5455        while (true) { 
    5556            breaker1.previous(); 
     
    6768            } 
    6869            end1 = current1; 
     70            end2 = current2; 
    6971        } 
    7072        return buffer.append(firstString.substring(0, end1)).append(separator).append(secondString.substring(start2)) 
  • trunk/tools/java/org/unicode/cldr/util/RegexLookup.java

    r9588 r9589  
    3030public class RegexLookup<T> implements Iterable<Map.Entry<Finder, T>> { 
    3131    private VariableReplacer variables = new VariableReplacer(); 
     32    private static final boolean DEBUG = true; 
    3233    private RegexTree<T> RTEntries; 
    3334    private Map<Finder, T> MEntries; 
  • trunk/tools/java/org/unicode/cldr/util/SimpleEquivalenceClass.java

    r9588 r9589  
    1010public class SimpleEquivalenceClass { 
    1111 
    12     @SuppressWarnings({ "unchecked", "rawtypes" }) 
    1312    public SimpleEquivalenceClass(Comparator c) { 
    1413        comparator = c; 
     
    1615    } 
    1716 
    18     @SuppressWarnings("rawtypes") 
    1917    private Map itemToSet; 
    2018 
    21     @SuppressWarnings("rawtypes") 
    2219    private Comparator comparator; 
    2320 
    24     @SuppressWarnings({ "rawtypes", "unchecked" }) 
    2521    public void add(Object a, Object b) { 
    2622        if (a == b) { 
  • trunk/tools/java/org/unicode/cldr/util/SimpleFactory.java

    r9588 r9589  
    2323    private volatile CLDRFile result; // used in handleMake 
    2424    private File sourceDirectories[]; 
     25    private String matchString; 
    2526    private Set<String> localeList = new TreeSet<String>(); 
    26     @SuppressWarnings("unchecked") 
    2727    private Map<String, CLDRFile>[] mainCache = new Map[DraftStatus.values().length]; 
    28     @SuppressWarnings("unchecked") 
    2928    private Map<String, CLDRFile>[] resolvedCache = new Map[DraftStatus.values().length]; 
    3029    { 
     
    7978    private SimpleFactory(File sourceDirectories[], String matchString, DraftStatus minimalDraftStatus) { 
    8079        this.sourceDirectories = sourceDirectories; 
     80        this.matchString = matchString; 
    8181        this.minimalDraftStatus = minimalDraftStatus; 
    8282        Matcher m = Pattern.compile(matchString).matcher(""); 
  • trunk/tools/java/org/unicode/cldr/util/SimpleXMLSource.java

    r9588 r9589  
    122122        synchronized (VALUE_TO_PATH_MUTEX) { 
    123123            if (VALUE_TO_PATH == null) { 
    124                 VALUE_TO_PATH = Relation.of(new HashMap<String, Set<String>>(), HashSet.class); 
     124                VALUE_TO_PATH = new Relation(new HashMap(), HashSet.class); 
    125125                for (Iterator<String> it = iterator(); it.hasNext();) { 
    126126                    String path = it.next(); 
  • trunk/tools/java/org/unicode/cldr/util/SpreadSheet.java

    r9588 r9589  
    1717    public static List<List<String>> convert(BufferedReader r) throws IOException { 
    1818        List<List<String>> result = new ArrayList<List<String>>(); 
    19         // boolean inQuote = false; 
     19        boolean inQuote = false; 
    2020        while (true) { 
    2121            String line = r.readLine(); 
  • trunk/tools/java/org/unicode/cldr/util/StandardCodes.java

    r9588 r9589  
    3333import org.unicode.cldr.draft.ScriptMetadata.IdUsage; 
    3434import org.unicode.cldr.util.Iso639Data.Type; 
    35 import org.unicode.cldr.util.ZoneParser.RuleLine; 
    3635import org.unicode.cldr.util.ZoneParser.ZoneLine; 
    3736 
     
    170169        if (type.equals("currency")) 
    171170            return null; // no replacement codes for currencies 
    172         List<String> data = getFullData(type, code); 
     171        List data = getFullData(type, code); 
    173172        if (data == null) 
    174173            return null; 
     
    457456    private void loadPlatformLocaleStatus() { 
    458457        LocaleIDParser parser = new LocaleIDParser(); 
    459         platform_locale_level = new TreeMap<String, Map<String, Level>>(caseless); 
     458        platform_locale_level = new TreeMap(caseless); 
    460459        SupplementalDataInfo sd = SupplementalDataInfo.getInstance(); 
    461460        Set<String> defaultContentLocales = sd.getDefaultContentLocales(); 
     
    474473                if (line.length() == 0) 
    475474                    continue; 
    476                 List<String> stuff = CldrUtility.splitList(line, ';', true); 
     475                List stuff = CldrUtility.splitList(line, ';', true); 
    477476                String organization = (String) stuff.get(0); 
    478477 
     
    504503                    System.out.println("Warning: Level unknown on: " + line); 
    505504                } 
    506                 Map<String, Level> locale_status = platform_locale_level.get(organization); 
     505                Map locale_status = (Map) platform_locale_level.get(organization); 
    507506                if (locale_status == null) { 
    508                     platform_locale_level.put(organization, locale_status = new TreeMap<String, Level>()); 
     507                    platform_locale_level.put(organization, locale_status = new TreeMap()); 
    509508                } 
    510509                locale_status.put(locale, status); 
     
    547546        } 
    548547        // backwards compat hack 
    549         platform_locale_levelString = new TreeMap<String, Map<String, String>>(caseless); 
     548        platform_locale_levelString = new TreeMap(caseless); 
    550549        for (String platform : platform_locale_level.keySet()) { 
    551             Map<String, String> locale_levelString = new TreeMap<String, String>(); 
     550            Map<String, String> locale_levelString = new TreeMap(); 
    552551            platform_locale_levelString.put(platform, locale_levelString); 
    553552            Map<String, Level> locale_level = platform_locale_level.get(platform); 
     
    749748        } 
    750749 
    751         Map<String, List<String>> m = getZoneData(); 
    752         for (Iterator<String> it = m.keySet().iterator(); it.hasNext();) { 
    753             String code = it.next(); 
     750        Map m = getZoneData(); 
     751        for (Iterator it = m.keySet().iterator(); it.hasNext();) { 
     752            String code = (String) it.next(); 
    754753            add(CodeType.tzid, code, m.get(code).toString()); 
    755754        } 
     
    838837    } 
    839838 
    840     private List<String> DELETED3166 = Collections.unmodifiableList(Arrays 
     839    private List DELETED3166 = Collections.unmodifiableList(Arrays 
    841840        .asList(new String[] { "BQ", "BU", "CT", "DD", "DY", "FQ", "FX", "HV", 
    842841            "JT", "MI", "NH", "NQ", "NT", "PC", "PU", "PZ", "RH", "SU", "TP", 
    843842            "VD", "WK", "YD", "YU", "ZR" })); 
    844843 
    845     public List<String> getOld3166() { 
     844    public List getOld3166() { 
    846845        return DELETED3166; 
    847846    } 
    848847 
    849     private Map<String, List<String>> WorldBankInfo; 
     848    private Map WorldBankInfo; 
    850849 
    851850    public Map<String, List<String>> getWorldBankInfo() { 
    852851        if (WorldBankInfo == null) { 
    853852            List<String> temp = fillFromCommaFile("WorldBankInfo.txt", false); 
    854             WorldBankInfo = new HashMap<String, List<String>>(); 
     853            WorldBankInfo = new HashMap(); 
    855854            for (String line : temp) { 
    856855                List<String> row = CldrUtility.splitList(line, ';', true); 
     
    864863    } 
    865864 
    866     Set<String> moribundLanguages; 
     865    Set moribundLanguages; 
    867866 
    868867    public Set<String> getMoribundLanguages() { 
    869868        if (moribundLanguages == null) { 
    870             List<String> temp = fillFromCommaFile("moribund_languages.txt", true); 
     869            List temp = fillFromCommaFile("moribund_languages.txt", true); 
    871870            moribundLanguages = new TreeSet<String>(); 
    872871            moribundLanguages.addAll(temp); 
     
    12281227     * @deprecated 
    12291228     */ 
    1230     public Map<String, Set<String>> getCountryToZoneSet() { 
     1229    public Map getCountryToZoneSet() { 
    12311230        return zoneParser.getCountryToZoneSet(); 
    12321231    } 
     
    12351234     * @deprecated 
    12361235     */ 
    1237     public List<String> getDeprecatedZoneIDs() { 
     1236    public List getDeprecatedZoneIDs() { 
    12381237        return zoneParser.getDeprecatedZoneIDs(); 
    12391238    } 
     
    12421241     * @deprecated 
    12431242     */ 
    1244     public Comparator<String> getTZIDComparator() { 
     1243    public Comparator getTZIDComparator() { 
    12451244        return zoneParser.getTZIDComparator(); 
    12461245    } 
     
    12491248     * @deprecated 
    12501249     */ 
    1251     public Map<String, Set<String>> getZoneLinkNew_OldSet() { 
     1250    public Map getZoneLinkNew_OldSet() { 
    12521251        return zoneParser.getZoneLinkNew_OldSet(); 
    12531252    } 
     
    12561255     * @deprecated 
    12571256     */ 
    1258     public Map<String, String> getZoneLinkold_new() { 
     1257    public Map getZoneLinkold_new() { 
    12591258        return zoneParser.getZoneLinkold_new(); 
    12601259    } 
     
    12701269     * @deprecated 
    12711270     */ 
    1272     public Map<String, String> getZoneToCounty() { 
     1271    public Map getZoneToCounty() { 
    12731272        return zoneParser.getZoneToCounty(); 
    12741273    } 
     
    13071306        } 
    13081307        IdUsage idUsage = info.idUsage; 
    1309         return idUsage != IdUsage.EXCLUSION && idUsage != IdUsage.UNKNOWN; 
     1308        return idUsage != IdUsage.EXCLUSION && idUsage != idUsage.UNKNOWN; 
    13101309    } 
    13111310 
  • trunk/tools/java/org/unicode/cldr/util/StateDictionary.java

    r9588 r9589  
    7777        Set<Pair<Integer, String>> sorted = new TreeSet<Pair<Integer, String>>(); 
    7878        for (T item : map.keySet()) { 
    79             sorted.add(new Pair<Integer, String>(map.get(item), item.toString())); 
     79            sorted.add(new Pair(map.get(item), item.toString())); 
    8080        } 
    8181        for (Pair<Integer, String> pair : sorted) { 
     
    518518        public String debugShow() { 
    519519            rowsSeen.clear(); 
    520             Counter<Integer> debugCounter = new Counter<Integer>(); 
     520            Counter debugCounter = new Counter(); 
    521521            getDebugWords(0, 0, builtBaseRow, Integer.MAX_VALUE); 
    522522            for (Row row : builtRows) { 
  • trunk/tools/java/org/unicode/cldr/util/StateDictionaryBuilder.java

    r9588 r9589  
    5858    } 
    5959 
    60     public StateDictionaryBuilder<T> setIntMapFactory(IntMapFactory<T> intMapFactory) { 
     60    public StateDictionaryBuilder setIntMapFactory(IntMapFactory<T> intMapFactory) { 
    6161        this.intMapFactory = intMapFactory; 
    6262        return this; 
     
    7373    } 
    7474 
    75     public StateDictionaryBuilder<T> setByteConverter(StringByteConverter byteConverter) { 
     75    public StateDictionaryBuilder setByteConverter(StringByteConverter byteConverter) { 
    7676        this.byteConverter = byteConverter; 
    7777        return this; 
  • trunk/tools/java/org/unicode/cldr/util/SupplementalData.java

    r9588 r9589  
    3434    private Document supplementalDocument = null; 
    3535    private Document supplementalMetaDocument = null; 
     36    private SupplementalDataInfo sdi = null; 
    3637 
    3738    static final String SPLIT_PATTERN = "[, \t\u00a0\\s]+"; // whitespace 
     
    5758            throw new InternalError("Can't parse metadata: " + pathName + "/supplementalMetadata.xml"); 
    5859        } 
     60        sdi = SupplementalDataInfo.getInstance(pathName); 
    5961    } 
    6062 
  • trunk/tools/java/org/unicode/cldr/util/SupplementalDataInfo.java

    r9588 r9589  
    3737import org.unicode.cldr.util.SupplementalDataInfo.BasicLanguageData.Type; 
    3838import org.unicode.cldr.util.SupplementalDataInfo.NumberingSystemInfo.NumberingSystemType; 
     39import org.unicode.cldr.util.SupplementalDataInfo.PluralInfo; 
    3940import org.unicode.cldr.util.SupplementalDataInfo.PluralInfo.Count; 
    4041 
  • trunk/tools/java/org/unicode/cldr/util/TestStateDictionaryBuilder.java

    r9588 r9589  
    230230    } 
    231231 
    232     @SuppressWarnings("unchecked") 
    233232    private void testWithUnicodeNames() { 
    234233        UnicodeSet testSet = new UnicodeSet( 
     
    386385    } 
    387386 
    388     @SuppressWarnings("unchecked") 
    389387    private void addToBoth(CharSequence string, int i) { 
    390388        baseMapping.put(string, (T) (i + "/" + string)); 
  • trunk/tools/java/org/unicode/cldr/util/Unlocode.java

    r9588 r9589  
    33import java.io.BufferedReader; 
    44import java.io.IOException; 
     5import java.io.Reader; 
    56import java.nio.charset.Charset; 
     7import java.util.ArrayList; 
    68import java.util.Arrays; 
    79import java.util.Collection; 
    810import java.util.Collections; 
     11import java.util.EnumMap; 
    912import java.util.HashMap; 
    1013import java.util.HashSet; 
    1114import java.util.LinkedHashSet; 
     15import java.util.List; 
    1216import java.util.Locale; 
    1317import java.util.Map; 
     
    1822 
    1923import org.unicode.cldr.draft.FileUtilities; 
     24import org.unicode.cldr.tool.CLDRModify; 
     25import org.unicode.cldr.tool.ConvertLanguageData; 
    2026import org.unicode.cldr.tool.CountryCodeConverter; 
    2127import org.unicode.cldr.unittest.TestAll.TestInfo; 
    2228import org.unicode.cldr.util.ChainedMap.M3; 
    2329 
     30import com.ibm.icu.dev.util.BagFormatter; 
    2431import com.ibm.icu.dev.util.CollectionUtilities; 
    2532import com.ibm.icu.dev.util.Relation; 
     
    4350        } 
    4451        public Iso3166_2Data(Collection<String> names) { 
    45             this.names = Collections.unmodifiableSet(new LinkedHashSet<String>(names)); 
     52            this.names = Collections.unmodifiableSet(new LinkedHashSet(names)); 
    4653        } 
    4754        @Override 
     
    5966        @Override 
    6067        public Iso3166_2Data merge(Iso3166_2Data b) { 
    61             LinkedHashSet<String> set = new LinkedHashSet<String>(names); 
     68            LinkedHashSet set = new LinkedHashSet(names); 
    6269            set.addAll(b.names); 
    6370            return new Iso3166_2Data(set); 
     
    7885        public LocodeData(String locode, Collection<String> names, String subdivision, float north, float east) { 
    7986            this.locode = locode; 
    80             this.names = Collections.unmodifiableSet(new LinkedHashSet<String>(names)); 
     87            this.names = Collections.unmodifiableSet(new LinkedHashSet(names)); 
    8188            this.subdivision = subdivision; 
    8289            this.north = north; 
     
    115122                && north == other.north 
    116123                && east == other.east) { 
    117                 LinkedHashSet<String> set = new LinkedHashSet<String>(names); 
     124                LinkedHashSet set = new LinkedHashSet(names); 
    118125                set.addAll(other.names); 
    119126                return new LocodeData(locode, set, subdivision, north, east); 
     
    301308            } 
    302309            line = line.trim(); 
     310            if (line.contains("Hagåtña")) { 
     311                int x = 0; 
     312            } 
    303313            if (line.isEmpty()) { 
    304314                continue; 
     
    389399 
    390400    public static String removeParens(String name, Output<String> tempOutput) { 
     401        String orginal = name; 
    391402        int paren = name.indexOf("("); 
    392403        tempOutput.value = null; 
     
    666677            errors2.add("** No matching record for\t" + countryName + "\t" + countryCode + "\t" + cityName); 
    667678        } else { 
    668             Set<LocodeData> rem = new LinkedHashSet<LocodeData>(); 
     679            Set<LocodeData> rem = new LinkedHashSet(); 
    669680            for (LocodeData x : locodeDatas) { 
    670681                if (x.locode.startsWith(countryCode)) { 
  • trunk/tools/java/org/unicode/cldr/util/VariantFolder.java

    r9588 r9589  
    4747    // {0,3}} 
    4848 
    49     @SuppressWarnings("unchecked") 
    5049    public Set<String> getClosure(String source) { 
    5150        int stringLength = source.length(); 
  • trunk/tools/java/org/unicode/cldr/util/VerifyZones.java

    r9588 r9589  
    7171 
    7272    public static class ZoneFormats { 
     73        private String regionFormat; 
     74        private String fallbackFormat; 
    7375        private String gmtFormat; 
    7476        private String hourFormat; 
     
    9092        public ZoneFormats set(CLDRFile cldrFile) { 
    9193            this.cldrFile = cldrFile; 
     94            regionFormat = cldrFile.getWinningValue("//ldml/dates/timeZoneNames/regionFormat"); 
     95            fallbackFormat = cldrFile.getWinningValue("//ldml/dates/timeZoneNames/fallbackFormat"); 
    9296 
    9397            gmtFormat = cldrFile.getWinningValue("//ldml/dates/timeZoneNames/gmtFormat"); 
     
    216220 
    217221    private static void addRow(String metaZone, String tz_string, int orderInMetazone) { 
     222        if (tz_string.contains("Jamaica") || tz_string.contains("Iqaluit")) { 
     223            int x = 3; 
     224        } 
    218225        TimeZone currentZone = TimeZone.getTimeZone(tz_string); 
    219226        String container = PathHeader.getMetazonePageTerritory(metaZone); 
     
    257264    } 
    258265 
    259     @SuppressWarnings("unused") 
    260266    private static <T> void vennSets(Set<T> first, Set<T> second, Set<T> common) { 
    261267        common.clear(); 
  • trunk/tools/java/org/unicode/cldr/util/VettingViewer.java

    r9588 r9589  
    215215    static final OutdatedPaths outdatedPaths = new OutdatedPaths(); 
    216216 
    217 //    private static final UnicodeSet NEEDS_PERCENT_ESCAPED = new UnicodeSet("[[\\u0000-\\u009F]-[a-zA-z0-9]]"); 
     217    private static final UnicodeSet NEEDS_PERCENT_ESCAPED = new UnicodeSet("[[\\u0000-\\u009F]-[a-zA-z0-9]]"); 
    218218//    private static final Transform<String, String> percentEscape = new Transform<String, String>() { 
    219219//        @Override 
  • trunk/tools/java/org/unicode/cldr/util/With.java

    r9588 r9589  
    106106     * @return Iterable, for use in for loops, etc. 
    107107     */ 
    108     @SuppressWarnings("unchecked") 
    109108    public static <V> V[] array(V... values) { 
    110109        return values; 
     
    155154     * @return Iterable, for use in for loops, etc. 
    156155     */ 
    157     @SuppressWarnings("unchecked") 
    158156    public static <V> With<V> in(Iterator<V>... iterators) { 
    159157        return new With<V>().and(iterators); 
     
    173171     * @return Iterable, for use in for loops, etc. 
    174172     */ 
    175     @SuppressWarnings("unchecked") 
    176173    public static <V> With<V> in(Iterable<V>... iterables) { 
    177174        return new With<V>().and(iterables); 
     
    191188     * @return Iterable, for use in for loops, etc. 
    192189     */ 
    193     @SuppressWarnings("unchecked") 
    194190    public static <V> With<V> in(V... items) { 
    195191        return new With<V>().and(items); 
     
    203199     * @return 
    204200     */ 
    205     @SuppressWarnings("unchecked") 
    206201    public static <T> Iterable<T> in(SimpleIterator<T>... sources) { 
    207202        return new With<T>().and(sources); 
     
    211206    } 
    212207 
    213     @SuppressWarnings("unchecked") 
    214208    public With<V> and(Iterator<V>... iterators) { 
    215209        for (Iterator<V> iterator : iterators) { 
     
    224218    } 
    225219 
    226     @SuppressWarnings("unchecked") 
    227220    public With<V> and(Iterable<V>... iterables) { 
    228221        for (Iterable<V> iterable : iterables) { 
     
    232225    } 
    233226 
    234     @SuppressWarnings("unchecked") 
    235227    public With<V> and(SimpleIterator<V>... iterators) { 
    236228        for (SimpleIterator<V> iterator : iterators) { 
Note: See TracChangeset for help on using the changeset viewer.