From 0460023ee24e681de8ca5df2353065bcfc2bec84 Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Fri, 22 Oct 2004 17:14:29 +0000 Subject: 2004-10-22 Michael Koch * java/lang/Math.java * java/lang/StackTraceElement.java * java/nio/Buffer.java * java/nio/ByteBuffer.java * java/nio/CharBuffer.java * java/nio/DoubleBuffer.java * java/nio/FloatBuffer.java * java/nio/IntBuffer.java * java/nio/LongBuffer.java * java/nio/ShortBuffer.java * java/nio/charset/Charset.java * java/rmi/server/RMIClassLoader.java * java/rmi/server/RMISocketFactory.java * java/security/Policy.java * java/text/ChoiceFormat.java * java/text/CollationElementIterator.java * java/text/DateFormat.java * java/text/DecimalFormat.java * java/text/DecimalFormatSymbols.java * java/text/MessageFormat.java * java/text/NumberFormat.java * java/text/RuleBasedCollator.java * java/text/SimpleDateFormat.java * java/util/BitSet.java * java/util/Calendar.java * java/util/Collections.java * java/util/IdentityHashMap.java * java/util/Locale.java * java/util/TreeMap.java * java/util/logging/LogRecord.java * java/util/logging/XMLFormatter.java * java/util/prefs/AbstractPreferences.java * java/util/prefs/Preferences.java * javax/crypto/interfaces/DHPrivateKey.java * javax/crypto/interfaces/DHPublicKey.java * javax/crypto/interfaces/PBEKey.java * javax/net/ssl/HandshakeCompletedEvent.java * javax/security/auth/Subject.java From-SVN: r89454 --- libjava/java/text/RuleBasedCollator.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libjava/java/text/RuleBasedCollator.java') diff --git a/libjava/java/text/RuleBasedCollator.java b/libjava/java/text/RuleBasedCollator.java index 8b7fe16..c2cff5a 100644 --- a/libjava/java/text/RuleBasedCollator.java +++ b/libjava/java/text/RuleBasedCollator.java @@ -147,7 +147,7 @@ public class RuleBasedCollator extends Collator * This class describes what rank has a character (or a sequence of characters) * in the lexicographic order. Each element in a rule has a collation element. */ - final static class CollationElement + static final class CollationElement { String key; int primary; @@ -169,7 +169,7 @@ public class RuleBasedCollator extends Collator this.expansion = expansion; } - final int getValue() + int getValue() { return (primary << 16) + (secondary << 8) + tertiary; } @@ -183,7 +183,7 @@ public class RuleBasedCollator extends Collator * {@link #mergeRules(int,java.lang.String,java.util.ArrayList,java.util.ArrayList)}) * as a temporary state while merging two sets of instructions. */ - final static class CollationSorter + static final class CollationSorter { static final int GREATERP = 0; static final int GREATERS = 1; -- cgit v1.1