jdk-sandbox: comparison jdk/make/tools/src/build/tools/generatecharacter/SpecialCaseMap.java

equal deleted inserted replaced

-:76e1595342e5
+:75674d930b1f
 /*
-* Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 * <p>
 * A single SpecialCaseMap contains the mapping for one character.
 * <p>
 * @author John O'Conner
 */
-public class SpecialCaseMap implements Comparable {
+public class SpecialCaseMap implements Comparable<SpecialCaseMap> {
 SpecialCaseMap() {
 chSource = 0xFFFF;
 }
 * @return  an array of SpecialCaseMap objects, one for each line of the
 *          special case map data file that could be successfully parsed
 */
 public static SpecialCaseMap[] readSpecFile(File file, int plane) throws FileNotFoundException {
-ArrayList caseMaps = new ArrayList(150);
+ArrayList<SpecialCaseMap> caseMaps = new ArrayList<>(150);
 int count = 0;
 BufferedReader f = new BufferedReader(new FileReader(file));
 String line = null;
 loop:
 while(true) {
 catch (IOException e) { break loop; }
 if (line == null) break loop;
 SpecialCaseMap item = parse(line.trim());
 if (item != null) {
 if(item.getCharSource() >> 16 < plane) continue;
-if((int)(item.getCharSource() >> 16) > plane) break;
+if(item.getCharSource() >> 16 > plane) break;
 caseMaps.add(item);
 ++count;
 }
 }
 Arrays.sort(result);
 return result;
 }
 /**
 * Given one line of a Unicode special casing data file as a String, parse the line
 * and return a SpecialCaseMap object that contains the case mapping.
 *
 * @param s a line of the Unicode special case map data file to be parsed
 * @return a SpecialCaseMap object, or null if the parsing process failed for some reason
 }
 if (ch == map[current].getCharSource()) return current;
 else return -1;
 }
 /*
 * Extracts and returns the high surrogate value from a UTF-32 code point.
 * If argument is a BMP character, then it is converted to a char and returned;
 * otherwise the high surrogate value is extracted.
 * @param codePoint a UTF-32 codePoint with value greater than 0xFFFF.
 * @return the high surrogate value that helps create <code>codePoint</code>; else
 *         the char representation of <code>codePoint</code> if it is a BMP character.
 * @since 1.5
 */
 static char getHighSurrogate(int codePoint) {
 char high = (char)codePoint;
 if (codePoint > 0xFFFF) {
 high = (char)((codePoint - 0x10000)/0x0400 + 0xD800);
 }
 return high;
 }
 /*
 * Extracts and returns the low surrogate value from a UTF-32 code point.
 * If argument is a BMP character, then it is converted to a char and returned;
 * otherwise the high surrogate value is extracted.
 * @param codePoint a UTF-32 codePoint with value greater than 0xFFFF.
 * @return the low surrogate value that helps create <code>codePoint</code>; else
 *         the char representation of <code>codePoint</code> if it is a BMP character.
 * @since 1.5
 */
 static char getLowSurrogate(int codePoint) {
 char low = (char)codePoint;
 if(codePoint > 0xFFFF) {
 low = (char)((codePoint - 0x10000)%0x0400 + 0xDC00);
 }
 return low;
 }
 static String hex6(int n) {
 String str = Integer.toHexString(n & 0xFFFFFF).toUpperCase();
 return "000000".substring(Math.min(6, str.length())) + str;
+}
-}
+static String hex6(char[] map){
-static String hex6(char[] map){
+StringBuffer buff = new StringBuffer();
-StringBuffer buff = new StringBuffer();
+int x=0;
-int x=0;
+buff.append(hex6(map[x++]));
-buff.append(hex6(map[x++]));
+while(x<map.length) {
-while(x<map.length) {
+buff.append(" " + hex6(map[x++]));
-buff.append(" " + hex6(map[x++]));
+}
-}
+return buff.toString();
-return buff.toString();
+}
-}
 void setCharSource(int ch) {
 chSource = ch;
 }
 static String CONTEXT_FINAL = "FINAL";
 static String CONTEXT_NONFINAL = "NON_FINAL";
 static String CONTEXT_MODERN = "MODERN";
 static String CONTEXT_NONMODERN = "NON_MODERN";
-public int compareTo(Object otherObject) {
+public int compareTo(SpecialCaseMap otherObject) {
-SpecialCaseMap other = (SpecialCaseMap)otherObject;
+if (chSource < otherObject.chSource) {
-if (chSource < other.chSource) {
 return -1;
 }
-else if (chSource > other.chSource) {
+else if (chSource > otherObject.chSource) {
 return 1;
 }
 else return 0;
 }
 public boolean equals(Object o1) {
-boolean bEqual = false;
+if (this == o1) {
-if (0 == compareTo(o1)) {
+return true;
-bEqual = true;
+}
+if (o1 == null || !(o1 instanceof SpecialCaseMap)) {
+return false;
+}
+SpecialCaseMap other = (SpecialCaseMap)o1;
+boolean bEqual = false;
+if (0 == compareTo(other)) {
+bEqual = true;
+}
+return bEqual;
+}
+public String toString() {
+StringBuffer buff = new StringBuffer();
+buff.append(hex6(getCharSource()));
+buff.append("|" + hex6(lowerCaseMap));
+buff.append("|" + hex6(upperCaseMap));
+buff.append("|" + hex6(titleCaseMap));
+buff.append("|" + context);
+return buff.toString();
+}
+public int hashCode() {
+return chSource;
+}
+public static void main(String[] args) {
+SpecialCaseMap[] spec = null;
+if (args.length == 2 ) {
+try {
+File file = new File(args[0]);
+int plane = Integer.parseInt(args[1]);
+spec = SpecialCaseMap.readSpecFile(file, plane);
+System.out.println("SpecialCaseMap[" + spec.length + "]:");
+for (int x=0; x<spec.length; x++) {
+System.out.println(spec[x].toString());
 }
-return bEqual;
+}
-}
+catch(Exception e) {
+e.printStackTrace();
-public String toString() {
+}
-StringBuffer buff = new StringBuffer();
+}
-buff.append(hex6(getCharSource()));
-buff.append("|" + hex6(lowerCaseMap));
+}
-buff.append("|" + hex6(upperCaseMap));
-buff.append("|" + hex6(titleCaseMap));
-buff.append("|" + context);
-return buff.toString();
-}
-public int hashCode() {
-return (int)chSource;
-}
-public static void main(String[] args) {
-SpecialCaseMap[] spec = null;
-if (args.length == 2 ) {
-try {
-File file = new File(args[0]);
-int plane = Integer.parseInt(args[1]);
-spec = SpecialCaseMap.readSpecFile(file, plane);
-System.out.println("SpecialCaseMap[" + spec.length + "]:");
-for (int x=0; x<spec.length; x++) {
-System.out.println(spec[x].toString());
-}
-}
-catch(Exception e) {
-e.printStackTrace();
-}
-}
-}
 }

changeset 10110	75674d930b1f
parent 5506	202f599c92aa