jdk-sandbox: comparison jdk/src/java.base/share/classes/java/text/CollationElementIterator.java

equal deleted inserted replaced

-:1fa861caf840
+:2ee9017c7597
 {
 /**
 * Null order which indicates the end of string is reached by the
 * cursor.
 */
-public final static int NULLORDER = 0xffffffff;
+public static final int NULLORDER = 0xffffffff;
 /**
 * CollationElementIterator constructor.  This takes the source string and
 * the collation object.  The cursor will walk thru the source string based
 * on the predefined collation rules.  If the source string is empty,
 /**
 * Return the primary component of a collation element.
 * @param order the collation element
 * @return the element's primary component
 */
-public final static int primaryOrder(int order)
+public static final int primaryOrder(int order)
 {
 order &= RBCollationTables.PRIMARYORDERMASK;
 return (order >>> RBCollationTables.PRIMARYORDERSHIFT);
 }
 /**
 * Return the secondary component of a collation element.
 * @param order the collation element
 * @return the element's secondary component
 */
-public final static short secondaryOrder(int order)
+public static final short secondaryOrder(int order)
 {
 order = order & RBCollationTables.SECONDARYORDERMASK;
 return ((short)(order >> RBCollationTables.SECONDARYORDERSHIFT));
 }
 /**
 * Return the tertiary component of a collation element.
 * @param order the collation element
 * @return the element's tertiary component
 */
-public final static short tertiaryOrder(int order)
+public static final short tertiaryOrder(int order)
 {
 return ((short)(order &= RBCollationTables.TERTIARYORDERMASK));
 }
 /**
 /**
 * Determine if a character is a Thai vowel (which sorts after
 * its base consonant).
 */
-private final static boolean isThaiPreVowel(int ch) {
+private static final boolean isThaiPreVowel(int ch) {
 return (ch >= 0x0e40) && (ch <= 0x0e44);
 }
 /**
 * Determine if a character is a Thai base consonant
 */
-private final static boolean isThaiBaseConsonant(int ch) {
+private static final boolean isThaiBaseConsonant(int ch) {
 return (ch >= 0x0e01) && (ch <= 0x0e2e);
 }
 /**
 * Determine if a character is a Lao vowel (which sorts after
 * its base consonant).
 */
-private final static boolean isLaoPreVowel(int ch) {
+private static final boolean isLaoPreVowel(int ch) {
 return (ch >= 0x0ec0) && (ch <= 0x0ec4);
 }
 /**
 * Determine if a character is a Lao base consonant
 */
-private final static boolean isLaoBaseConsonant(int ch) {
+private static final boolean isLaoBaseConsonant(int ch) {
 return (ch >= 0x0e81) && (ch <= 0x0eae);
 }
 /**
 * This method produces a buffer which contains the collation
 /**
 *  Check if a comparison order is ignorable.
 *  @return true if a character is ignorable, false otherwise.
 */
-final static boolean isIgnorable(int order)
+static final boolean isIgnorable(int order)
 {
 return ((primaryOrder(order) == 0) ? true : false);
 }
 /**
 maxLength -= Character.charCount(c);
 }
 return order;
 }
-final static int UNMAPPEDCHARVALUE = 0x7FFF0000;
+static final int UNMAPPEDCHARVALUE = 0x7FFF0000;
 private NormalizerBase text = null;
 private int[] buffer = null;
 private int expIndex = 0;
 private StringBuffer key = new StringBuffer(5);

changeset 32649	2ee9017c7597
parent 25859	3317bb8137f4
child 45434	4582657c7260