harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r450001 [1/2] - in /incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java: java/util/regex/ org/apache/harmony/regex/internal/nls/
Date Tue, 26 Sep 2006 11:47:23 GMT
Author: tellison
Date: Tue Sep 26 04:47:21 2006
New Revision: 450001

URL: http://svn.apache.org/viewvc?view=rev&rev=450001
Log:
Apply patch HARMONY-1316 ([classlib][internationalization]Internationalization of the regex module)

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/AbstractCharClass.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/AbstractSet.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/AheadFSet.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/AtomicFSet.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/AtomicJointSet.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/BackReferenceSet.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/BehindFSet.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/CIBackReferenceSet.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/CICharSet.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/CISequenceSet.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/CharSet.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/DecomposedCharSet.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/DotAllSet.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/DotSet.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/EOISet.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/EOLSet.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/EmptySet.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/FSet.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/FinalSet.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/GroupQuantifierSet.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/HangulDecomposedCharSet.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/JointSet.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/LeafQuantifierSet.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/Lexer.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/MatchResultImpl.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/Matcher.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/MultiLineEOLSet.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/MultiLineSOLSet.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/NegativeLookAhead.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/NegativeLookBehind.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/NonCapFSet.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/NonCapJointSet.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/Pattern.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/PatternSyntaxException.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/PositiveLookAhead.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/PositiveLookBehind.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/PreviousMatch.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/Quantifier.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/RangeSet.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/SOLSet.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/SequenceSet.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/UCIBackReferenceSet.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/UCICharSet.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/UCIRangeSet.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/UCISequenceSet.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/UEOLSet.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/UMultiLineEOLSet.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/WordBoundary.java
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/org/apache/harmony/regex/internal/nls/messages.properties

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/AbstractCharClass.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/AbstractCharClass.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/AbstractCharClass.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/AbstractCharClass.java Tue Sep 26 04:47:21 2006
@@ -455,207 +455,207 @@
         static LazyCharClass digit = new LazyDigit();
 
         static final Object[][] contents = {
-                { "Lower", new LazyLower() },
-                { "Upper", new LazyUpper() },
-                { "ASCII", new LazyASCII() },
-                { "Alpha", new LazyAlpha() },
-                { "Digit", digit },
-                { "Alnum", new LazyAlnum() },
-                { "Punct", new LazyPunct() },
-                { "Graph", new LazyGraph() },
-                { "Print", new LazyPrint() },
-                { "Blank", new LazyBlank() },
-                { "Cntrl", new LazyCntrl() },
-                { "XDigit", new LazyXDigit() },
-                { "javaLowerCase", new LazyJavaLowerCase() },
-                { "javaUpperCase", new LazyJavaUpperCase() },
-                { "javaWhitespace", new LazyJavaWhitespace() },
-                { "javaMirrored", new LazyJavaMirrored() },
-                { "javaDefined", new LazyJavaDefined() },
-                { "javaDigit", new LazyJavaDigit() },
-                { "javaIdentifierIgnorable", new LazyJavaIdentifierIgnorable() },
-                { "javaISOControl", new LazyJavaISOControl() },
-                { "javaJavaIdentifierPart", new LazyJavaJavaIdentifierPart() },
-                { "javaJavaIdentifierStart", new LazyJavaJavaIdentifierStart() },
-                { "javaLetter", new LazyJavaLetter() },
-                { "javaLetterOrDigit", new LazyJavaLetterOrDigit() },
-                { "javaSpaceChar", new LazyJavaSpaceChar() },
-                { "javaTitleCase", new LazyJavaTitleCase() },
-                { "javaUnicodeIdentifierPart", new LazyJavaUnicodeIdentifierPart() },
-                { "javaUnicodeIdentifierStart", new LazyJavaUnicodeIdentifierStart() },
-                { "Space", space },
-                { "w", new LazyWord() },
-                { "W", new LazyNonWord() },
-                { "s", space },
-                { "S", new LazyNonSpace() },
-                { "d", digit },
-                { "D", new LazyNonDigit() },
-                { "BasicLatin", new LazyRange(0x0000, 0x007F) },
-                { "Latin-1Supplement", new LazyRange(0x0080, 0x00FF) },
-                { "LatinExtended-A", new LazyRange(0x0100, 0x017F) },
-                { "LatinExtended-B", new LazyRange(0x0180, 0x024F) },
-                { "IPAExtensions", new LazyRange(0x0250, 0x02AF) },
-                { "SpacingModifierLetters", new LazyRange(0x02B0, 0x02FF) },
-                { "CombiningDiacriticalMarks", new LazyRange(0x0300, 0x036F) },
-                { "Greek", new LazyRange(0x0370, 0x03FF) },
-                { "Cyrillic", new LazyRange(0x0400, 0x04FF) },
-                { "CyrillicSupplement", new LazyRange(0x0500, 0x052F) },
-                { "Armenian", new LazyRange(0x0530, 0x058F) },
-                { "Hebrew", new LazyRange(0x0590, 0x05FF) },
-                { "Arabic", new LazyRange(0x0600, 0x06FF) },
-                { "Syriac", new LazyRange(0x0700, 0x074F) },
-                { "ArabicSupplement", new LazyRange(0x0750, 0x077F) },
-                { "Thaana", new LazyRange(0x0780, 0x07BF) },
-                { "Devanagari", new LazyRange(0x0900, 0x097F) },
-                { "Bengali", new LazyRange(0x0980, 0x09FF) },
-                { "Gurmukhi", new LazyRange(0x0A00, 0x0A7F) },
-                { "Gujarati", new LazyRange(0x0A80, 0x0AFF) },
-                { "Oriya", new LazyRange(0x0B00, 0x0B7F) },
-                { "Tamil", new LazyRange(0x0B80, 0x0BFF) },
-                { "Telugu", new LazyRange(0x0C00, 0x0C7F) },
-                { "Kannada", new LazyRange(0x0C80, 0x0CFF) },
-                { "Malayalam", new LazyRange(0x0D00, 0x0D7F) },
-                { "Sinhala", new LazyRange(0x0D80, 0x0DFF) },
-                { "Thai", new LazyRange(0x0E00, 0x0E7F) },
-                { "Lao", new LazyRange(0x0E80, 0x0EFF) },
-                { "Tibetan", new LazyRange(0x0F00, 0x0FFF) },
-                { "Myanmar", new LazyRange(0x1000, 0x109F) },
-                { "Georgian", new LazyRange(0x10A0, 0x10FF) },
-                { "HangulJamo", new LazyRange(0x1100, 0x11FF) },
-                { "Ethiopic", new LazyRange(0x1200, 0x137F) },
-                { "EthiopicSupplement", new LazyRange(0x1380, 0x139F) },
-                { "Cherokee", new LazyRange(0x13A0, 0x13FF) },
-                { "UnifiedCanadianAboriginalSyllabics",
+                { "Lower", new LazyLower() }, //$NON-NLS-1$
+                { "Upper", new LazyUpper() }, //$NON-NLS-1$
+                { "ASCII", new LazyASCII() }, //$NON-NLS-1$
+                { "Alpha", new LazyAlpha() }, //$NON-NLS-1$
+                { "Digit", digit }, //$NON-NLS-1$
+                { "Alnum", new LazyAlnum() }, //$NON-NLS-1$
+                { "Punct", new LazyPunct() }, //$NON-NLS-1$
+                { "Graph", new LazyGraph() }, //$NON-NLS-1$
+                { "Print", new LazyPrint() }, //$NON-NLS-1$
+                { "Blank", new LazyBlank() }, //$NON-NLS-1$
+                { "Cntrl", new LazyCntrl() }, //$NON-NLS-1$
+                { "XDigit", new LazyXDigit() }, //$NON-NLS-1$
+                { "javaLowerCase", new LazyJavaLowerCase() }, //$NON-NLS-1$
+                { "javaUpperCase", new LazyJavaUpperCase() }, //$NON-NLS-1$
+                { "javaWhitespace", new LazyJavaWhitespace() }, //$NON-NLS-1$
+                { "javaMirrored", new LazyJavaMirrored() }, //$NON-NLS-1$
+                { "javaDefined", new LazyJavaDefined() }, //$NON-NLS-1$
+                { "javaDigit", new LazyJavaDigit() }, //$NON-NLS-1$
+                { "javaIdentifierIgnorable", new LazyJavaIdentifierIgnorable() }, //$NON-NLS-1$
+                { "javaISOControl", new LazyJavaISOControl() }, //$NON-NLS-1$
+                { "javaJavaIdentifierPart", new LazyJavaJavaIdentifierPart() }, //$NON-NLS-1$
+                { "javaJavaIdentifierStart", new LazyJavaJavaIdentifierStart() }, //$NON-NLS-1$
+                { "javaLetter", new LazyJavaLetter() }, //$NON-NLS-1$
+                { "javaLetterOrDigit", new LazyJavaLetterOrDigit() }, //$NON-NLS-1$
+                { "javaSpaceChar", new LazyJavaSpaceChar() }, //$NON-NLS-1$
+                { "javaTitleCase", new LazyJavaTitleCase() }, //$NON-NLS-1$
+                { "javaUnicodeIdentifierPart", new LazyJavaUnicodeIdentifierPart() }, //$NON-NLS-1$
+                { "javaUnicodeIdentifierStart", new LazyJavaUnicodeIdentifierStart() }, //$NON-NLS-1$
+                { "Space", space }, //$NON-NLS-1$
+                { "w", new LazyWord() }, //$NON-NLS-1$
+                { "W", new LazyNonWord() }, //$NON-NLS-1$
+                { "s", space }, //$NON-NLS-1$
+                { "S", new LazyNonSpace() }, //$NON-NLS-1$
+                { "d", digit }, //$NON-NLS-1$
+                { "D", new LazyNonDigit() }, //$NON-NLS-1$
+                { "BasicLatin", new LazyRange(0x0000, 0x007F) }, //$NON-NLS-1$
+                { "Latin-1Supplement", new LazyRange(0x0080, 0x00FF) }, //$NON-NLS-1$
+                { "LatinExtended-A", new LazyRange(0x0100, 0x017F) }, //$NON-NLS-1$
+                { "LatinExtended-B", new LazyRange(0x0180, 0x024F) }, //$NON-NLS-1$
+                { "IPAExtensions", new LazyRange(0x0250, 0x02AF) }, //$NON-NLS-1$
+                { "SpacingModifierLetters", new LazyRange(0x02B0, 0x02FF) }, //$NON-NLS-1$
+                { "CombiningDiacriticalMarks", new LazyRange(0x0300, 0x036F) }, //$NON-NLS-1$
+                { "Greek", new LazyRange(0x0370, 0x03FF) }, //$NON-NLS-1$
+                { "Cyrillic", new LazyRange(0x0400, 0x04FF) }, //$NON-NLS-1$
+                { "CyrillicSupplement", new LazyRange(0x0500, 0x052F) }, //$NON-NLS-1$
+                { "Armenian", new LazyRange(0x0530, 0x058F) }, //$NON-NLS-1$
+                { "Hebrew", new LazyRange(0x0590, 0x05FF) }, //$NON-NLS-1$
+                { "Arabic", new LazyRange(0x0600, 0x06FF) }, //$NON-NLS-1$
+                { "Syriac", new LazyRange(0x0700, 0x074F) }, //$NON-NLS-1$
+                { "ArabicSupplement", new LazyRange(0x0750, 0x077F) }, //$NON-NLS-1$
+                { "Thaana", new LazyRange(0x0780, 0x07BF) }, //$NON-NLS-1$
+                { "Devanagari", new LazyRange(0x0900, 0x097F) }, //$NON-NLS-1$
+                { "Bengali", new LazyRange(0x0980, 0x09FF) }, //$NON-NLS-1$
+                { "Gurmukhi", new LazyRange(0x0A00, 0x0A7F) }, //$NON-NLS-1$
+                { "Gujarati", new LazyRange(0x0A80, 0x0AFF) }, //$NON-NLS-1$
+                { "Oriya", new LazyRange(0x0B00, 0x0B7F) }, //$NON-NLS-1$
+                { "Tamil", new LazyRange(0x0B80, 0x0BFF) }, //$NON-NLS-1$
+                { "Telugu", new LazyRange(0x0C00, 0x0C7F) }, //$NON-NLS-1$
+                { "Kannada", new LazyRange(0x0C80, 0x0CFF) }, //$NON-NLS-1$
+                { "Malayalam", new LazyRange(0x0D00, 0x0D7F) }, //$NON-NLS-1$
+                { "Sinhala", new LazyRange(0x0D80, 0x0DFF) }, //$NON-NLS-1$
+                { "Thai", new LazyRange(0x0E00, 0x0E7F) }, //$NON-NLS-1$
+                { "Lao", new LazyRange(0x0E80, 0x0EFF) }, //$NON-NLS-1$
+                { "Tibetan", new LazyRange(0x0F00, 0x0FFF) }, //$NON-NLS-1$
+                { "Myanmar", new LazyRange(0x1000, 0x109F) }, //$NON-NLS-1$
+                { "Georgian", new LazyRange(0x10A0, 0x10FF) }, //$NON-NLS-1$
+                { "HangulJamo", new LazyRange(0x1100, 0x11FF) }, //$NON-NLS-1$
+                { "Ethiopic", new LazyRange(0x1200, 0x137F) }, //$NON-NLS-1$
+                { "EthiopicSupplement", new LazyRange(0x1380, 0x139F) }, //$NON-NLS-1$
+                { "Cherokee", new LazyRange(0x13A0, 0x13FF) }, //$NON-NLS-1$
+                { "UnifiedCanadianAboriginalSyllabics", //$NON-NLS-1$
                         new LazyRange(0x1400, 0x167F) },
-                { "Ogham", new LazyRange(0x1680, 0x169F) },
-                { "Runic", new LazyRange(0x16A0, 0x16FF) },
-                { "Tagalog", new LazyRange(0x1700, 0x171F) },
-                { "Hanunoo", new LazyRange(0x1720, 0x173F) },
-                { "Buhid", new LazyRange(0x1740, 0x175F) },
-                { "Tagbanwa", new LazyRange(0x1760, 0x177F) },
-                { "Khmer", new LazyRange(0x1780, 0x17FF) },
-                { "Mongolian", new LazyRange(0x1800, 0x18AF) },
-                { "Limbu", new LazyRange(0x1900, 0x194F) },
-                { "TaiLe", new LazyRange(0x1950, 0x197F) },
-                { "NewTaiLue", new LazyRange(0x1980, 0x19DF) },
-                { "KhmerSymbols", new LazyRange(0x19E0, 0x19FF) },
-                { "Buginese", new LazyRange(0x1A00, 0x1A1F) },
-                { "PhoneticExtensions", new LazyRange(0x1D00, 0x1D7F) },
-                { "PhoneticExtensionsSupplement", new LazyRange(0x1D80, 0x1DBF) },
-                { "CombiningDiacriticalMarksSupplement",
+                { "Ogham", new LazyRange(0x1680, 0x169F) }, //$NON-NLS-1$
+                { "Runic", new LazyRange(0x16A0, 0x16FF) }, //$NON-NLS-1$
+                { "Tagalog", new LazyRange(0x1700, 0x171F) }, //$NON-NLS-1$
+                { "Hanunoo", new LazyRange(0x1720, 0x173F) }, //$NON-NLS-1$
+                { "Buhid", new LazyRange(0x1740, 0x175F) }, //$NON-NLS-1$
+                { "Tagbanwa", new LazyRange(0x1760, 0x177F) }, //$NON-NLS-1$
+                { "Khmer", new LazyRange(0x1780, 0x17FF) }, //$NON-NLS-1$
+                { "Mongolian", new LazyRange(0x1800, 0x18AF) }, //$NON-NLS-1$
+                { "Limbu", new LazyRange(0x1900, 0x194F) }, //$NON-NLS-1$
+                { "TaiLe", new LazyRange(0x1950, 0x197F) }, //$NON-NLS-1$
+                { "NewTaiLue", new LazyRange(0x1980, 0x19DF) }, //$NON-NLS-1$
+                { "KhmerSymbols", new LazyRange(0x19E0, 0x19FF) }, //$NON-NLS-1$
+                { "Buginese", new LazyRange(0x1A00, 0x1A1F) }, //$NON-NLS-1$
+                { "PhoneticExtensions", new LazyRange(0x1D00, 0x1D7F) }, //$NON-NLS-1$
+                { "PhoneticExtensionsSupplement", new LazyRange(0x1D80, 0x1DBF) }, //$NON-NLS-1$
+                { "CombiningDiacriticalMarksSupplement", //$NON-NLS-1$
                         new LazyRange(0x1DC0, 0x1DFF) },
-                { "LatinExtendedAdditional", new LazyRange(0x1E00, 0x1EFF) },
-                { "GreekExtended", new LazyRange(0x1F00, 0x1FFF) },
-                { "GeneralPunctuation", new LazyRange(0x2000, 0x206F) },
-                { "SuperscriptsandSubscripts", new LazyRange(0x2070, 0x209F) },
-                { "CurrencySymbols", new LazyRange(0x20A0, 0x20CF) },
-                { "CombiningMarksforSymbols", new LazyRange(0x20D0, 0x20FF) },
-                { "LetterlikeSymbols", new LazyRange(0x2100, 0x214F) },
-                { "NumberForms", new LazyRange(0x2150, 0x218F) },
-                { "Arrows", new LazyRange(0x2190, 0x21FF) },
-                { "MathematicalOperators", new LazyRange(0x2200, 0x22FF) },
-                { "MiscellaneousTechnical", new LazyRange(0x2300, 0x23FF) },
-                { "ControlPictures", new LazyRange(0x2400, 0x243F) },
-                { "OpticalCharacterRecognition", new LazyRange(0x2440, 0x245F) },
-                { "EnclosedAlphanumerics", new LazyRange(0x2460, 0x24FF) },
-                { "BoxDrawing", new LazyRange(0x2500, 0x257F) },
-                { "BlockElements", new LazyRange(0x2580, 0x259F) },
-                { "GeometricShapes", new LazyRange(0x25A0, 0x25FF) },
-                { "MiscellaneousSymbols", new LazyRange(0x2600, 0x26FF) },
-                { "Dingbats", new LazyRange(0x2700, 0x27BF) },
-                { "MiscellaneousMathematicalSymbols-A",
+                { "LatinExtendedAdditional", new LazyRange(0x1E00, 0x1EFF) }, //$NON-NLS-1$
+                { "GreekExtended", new LazyRange(0x1F00, 0x1FFF) }, //$NON-NLS-1$
+                { "GeneralPunctuation", new LazyRange(0x2000, 0x206F) }, //$NON-NLS-1$
+                { "SuperscriptsandSubscripts", new LazyRange(0x2070, 0x209F) }, //$NON-NLS-1$
+                { "CurrencySymbols", new LazyRange(0x20A0, 0x20CF) }, //$NON-NLS-1$
+                { "CombiningMarksforSymbols", new LazyRange(0x20D0, 0x20FF) }, //$NON-NLS-1$
+                { "LetterlikeSymbols", new LazyRange(0x2100, 0x214F) }, //$NON-NLS-1$
+                { "NumberForms", new LazyRange(0x2150, 0x218F) }, //$NON-NLS-1$
+                { "Arrows", new LazyRange(0x2190, 0x21FF) }, //$NON-NLS-1$
+                { "MathematicalOperators", new LazyRange(0x2200, 0x22FF) }, //$NON-NLS-1$
+                { "MiscellaneousTechnical", new LazyRange(0x2300, 0x23FF) }, //$NON-NLS-1$
+                { "ControlPictures", new LazyRange(0x2400, 0x243F) }, //$NON-NLS-1$
+                { "OpticalCharacterRecognition", new LazyRange(0x2440, 0x245F) }, //$NON-NLS-1$
+                { "EnclosedAlphanumerics", new LazyRange(0x2460, 0x24FF) }, //$NON-NLS-1$
+                { "BoxDrawing", new LazyRange(0x2500, 0x257F) }, //$NON-NLS-1$
+                { "BlockElements", new LazyRange(0x2580, 0x259F) }, //$NON-NLS-1$
+                { "GeometricShapes", new LazyRange(0x25A0, 0x25FF) }, //$NON-NLS-1$
+                { "MiscellaneousSymbols", new LazyRange(0x2600, 0x26FF) }, //$NON-NLS-1$
+                { "Dingbats", new LazyRange(0x2700, 0x27BF) }, //$NON-NLS-1$
+                { "MiscellaneousMathematicalSymbols-A", //$NON-NLS-1$
                         new LazyRange(0x27C0, 0x27EF) },
-                { "SupplementalArrows-A", new LazyRange(0x27F0, 0x27FF) },
-                { "BraillePatterns", new LazyRange(0x2800, 0x28FF) },
-                { "SupplementalArrows-B", new LazyRange(0x2900, 0x297F) },
-                { "MiscellaneousMathematicalSymbols-B",
+                { "SupplementalArrows-A", new LazyRange(0x27F0, 0x27FF) }, //$NON-NLS-1$
+                { "BraillePatterns", new LazyRange(0x2800, 0x28FF) }, //$NON-NLS-1$
+                { "SupplementalArrows-B", new LazyRange(0x2900, 0x297F) }, //$NON-NLS-1$
+                { "MiscellaneousMathematicalSymbols-B", //$NON-NLS-1$
                         new LazyRange(0x2980, 0x29FF) },
-                { "SupplementalMathematicalOperators",
+                { "SupplementalMathematicalOperators", //$NON-NLS-1$
                         new LazyRange(0x2A00, 0x2AFF) },
-                { "MiscellaneousSymbolsandArrows",
+                { "MiscellaneousSymbolsandArrows", //$NON-NLS-1$
                         new LazyRange(0x2B00, 0x2BFF) },
-                { "Glagolitic", new LazyRange(0x2C00, 0x2C5F) },
-                { "Coptic", new LazyRange(0x2C80, 0x2CFF) },
-                { "GeorgianSupplement", new LazyRange(0x2D00, 0x2D2F) },
-                { "Tifinagh", new LazyRange(0x2D30, 0x2D7F) },
-                { "EthiopicExtended", new LazyRange(0x2D80, 0x2DDF) },
-                { "SupplementalPunctuation", new LazyRange(0x2E00, 0x2E7F) },
-                { "CJKRadicalsSupplement", new LazyRange(0x2E80, 0x2EFF) },
-                { "KangxiRadicals", new LazyRange(0x2F00, 0x2FDF) },
-                { "IdeographicDescriptionCharacters",
+                { "Glagolitic", new LazyRange(0x2C00, 0x2C5F) }, //$NON-NLS-1$
+                { "Coptic", new LazyRange(0x2C80, 0x2CFF) }, //$NON-NLS-1$
+                { "GeorgianSupplement", new LazyRange(0x2D00, 0x2D2F) }, //$NON-NLS-1$
+                { "Tifinagh", new LazyRange(0x2D30, 0x2D7F) }, //$NON-NLS-1$
+                { "EthiopicExtended", new LazyRange(0x2D80, 0x2DDF) }, //$NON-NLS-1$
+                { "SupplementalPunctuation", new LazyRange(0x2E00, 0x2E7F) }, //$NON-NLS-1$
+                { "CJKRadicalsSupplement", new LazyRange(0x2E80, 0x2EFF) }, //$NON-NLS-1$
+                { "KangxiRadicals", new LazyRange(0x2F00, 0x2FDF) }, //$NON-NLS-1$
+                { "IdeographicDescriptionCharacters", //$NON-NLS-1$
                         new LazyRange(0x2FF0, 0x2FFF) },
-                { "CJKSymbolsandPunctuation", new LazyRange(0x3000, 0x303F) },
-                { "Hiragana", new LazyRange(0x3040, 0x309F) },
-                { "Katakana", new LazyRange(0x30A0, 0x30FF) },
-                { "Bopomofo", new LazyRange(0x3100, 0x312F) },
-                { "HangulCompatibilityJamo", new LazyRange(0x3130, 0x318F) },
-                { "Kanbun", new LazyRange(0x3190, 0x319F) },
-                { "BopomofoExtended", new LazyRange(0x31A0, 0x31BF) },
-                { "CJKStrokes", new LazyRange(0x31C0, 0x31EF) },
-                { "KatakanaPhoneticExtensions", new LazyRange(0x31F0, 0x31FF) },
-                { "EnclosedCJKLettersandMonths", new LazyRange(0x3200, 0x32FF) },
-                { "CJKCompatibility", new LazyRange(0x3300, 0x33FF) },
-                { "CJKUnifiedIdeographsExtensionA",
+                { "CJKSymbolsandPunctuation", new LazyRange(0x3000, 0x303F) }, //$NON-NLS-1$
+                { "Hiragana", new LazyRange(0x3040, 0x309F) }, //$NON-NLS-1$
+                { "Katakana", new LazyRange(0x30A0, 0x30FF) }, //$NON-NLS-1$
+                { "Bopomofo", new LazyRange(0x3100, 0x312F) }, //$NON-NLS-1$
+                { "HangulCompatibilityJamo", new LazyRange(0x3130, 0x318F) }, //$NON-NLS-1$
+                { "Kanbun", new LazyRange(0x3190, 0x319F) }, //$NON-NLS-1$
+                { "BopomofoExtended", new LazyRange(0x31A0, 0x31BF) }, //$NON-NLS-1$
+                { "CJKStrokes", new LazyRange(0x31C0, 0x31EF) }, //$NON-NLS-1$
+                { "KatakanaPhoneticExtensions", new LazyRange(0x31F0, 0x31FF) }, //$NON-NLS-1$
+                { "EnclosedCJKLettersandMonths", new LazyRange(0x3200, 0x32FF) }, //$NON-NLS-1$
+                { "CJKCompatibility", new LazyRange(0x3300, 0x33FF) }, //$NON-NLS-1$
+                { "CJKUnifiedIdeographsExtensionA", //$NON-NLS-1$
                         new LazyRange(0x3400, 0x4DB5) },
-                { "YijingHexagramSymbols", new LazyRange(0x4DC0, 0x4DFF) },
-                { "CJKUnifiedIdeographs", new LazyRange(0x4E00, 0x9FFF) },
-                { "YiSyllables", new LazyRange(0xA000, 0xA48F) },
-                { "YiRadicals", new LazyRange(0xA490, 0xA4CF) },
-                { "ModifierToneLetters", new LazyRange(0xA700, 0xA71F) },
-                { "SylotiNagri", new LazyRange(0xA800, 0xA82F) },
-                { "HangulSyllables", new LazyRange(0xAC00, 0xD7A3) },
-                { "HighSurrogates", new LazyRange(0xD800, 0xDB7F) },
-                { "HighPrivateUseSurrogates", new LazyRange(0xDB80, 0xDBFF) },
-                { "LowSurrogates", new LazyRange(0xDC00, 0xDFFF) },
-                { "PrivateUseArea", new LazyRange(0xE000, 0xF8FF) },
-                { "CJKCompatibilityIdeographs", new LazyRange(0xF900, 0xFAFF) },
-                { "AlphabeticPresentationForms", new LazyRange(0xFB00, 0xFB4F) },
-                { "ArabicPresentationForms-A", new LazyRange(0xFB50, 0xFDFF) },
-                { "VariationSelectors", new LazyRange(0xFE00, 0xFE0F) },
-                { "VerticalForms", new LazyRange(0xFE10, 0xFE1F) },
-                { "CombiningHalfMarks", new LazyRange(0xFE20, 0xFE2F) },
-                { "CJKCompatibilityForms", new LazyRange(0xFE30, 0xFE4F) },
-                { "SmallFormVariants", new LazyRange(0xFE50, 0xFE6F) },
-                { "ArabicPresentationForms-B", new LazyRange(0xFE70, 0xFEFF) },
-                { "HalfwidthandFullwidthForms", new LazyRange(0xFF00, 0xFFEF) },
-                { "Specials", new LazySpecialsBlock() },
-                { "Cn", new LazyCategory(Character.UNASSIGNED) },
-                { "IsL", new LazyCategoryScope(0x3E) },
-                { "Lu", new LazyCategory(Character.UPPERCASE_LETTER) },
-                { "Ll", new LazyCategory(Character.LOWERCASE_LETTER) },
-                { "Lt", new LazyCategory(Character.TITLECASE_LETTER) },
-                { "Lm", new LazyCategory(Character.MODIFIER_LETTER) },
-                { "Lo", new LazyCategory(Character.OTHER_LETTER) },
-                { "IsM", new LazyCategoryScope(0x1C0) },
-                { "Mn", new LazyCategory(Character.NON_SPACING_MARK) },
-                { "Me", new LazyCategory(Character.ENCLOSING_MARK) },
-                { "Mc", new LazyCategory(Character.COMBINING_SPACING_MARK) },
-                { "N", new LazyCategoryScope(0xE00) },
-                { "Nd", new LazyCategory(Character.DECIMAL_DIGIT_NUMBER) },
-                { "Nl", new LazyCategory(Character.LETTER_NUMBER) },
-                { "No", new LazyCategory(Character.OTHER_NUMBER) },
-                { "IsZ", new LazyCategoryScope(0x7000) },
-                { "Zs", new LazyCategory(Character.SPACE_SEPARATOR) },
-                { "Zl", new LazyCategory(Character.LINE_SEPARATOR) },
-                { "Zp", new LazyCategory(Character.PARAGRAPH_SEPARATOR) },
-                { "IsC", new LazyCategoryScope(0xF0000) },
-                { "Cc", new LazyCategory(Character.CONTROL) },
-                { "Cf", new LazyCategory(Character.FORMAT) },
-                { "Co", new LazyCategory(Character.PRIVATE_USE) },
-                { "Cs", new LazyCategory(Character.SURROGATE) },
-                { "IsP", new LazyCategoryScope(0xF8000) },
-                { "Pd", new LazyCategory(Character.DASH_PUNCTUATION) },
-                { "Ps", new LazyCategory(Character.START_PUNCTUATION) },
-                { "Pe", new LazyCategory(Character.END_PUNCTUATION) },
-                { "Pc", new LazyCategory(Character.CONNECTOR_PUNCTUATION) },
-                { "Po", new LazyCategory(Character.OTHER_PUNCTUATION) },
-                { "IsS", new LazyCategoryScope(0x7E000000) },
-                { "Sm", new LazyCategory(Character.MATH_SYMBOL) },
-                { "Sc", new LazyCategory(Character.CURRENCY_SYMBOL) },
-                { "Sk", new LazyCategory(Character.MODIFIER_SYMBOL) },
-                { "So", new LazyCategory(Character.OTHER_SYMBOL) },
-                { "Pi", new LazyCategory(Character.INITIAL_QUOTE_PUNCTUATION) },
-                { "Pf", new LazyCategory(Character.FINAL_QUOTE_PUNCTUATION) } };
+                { "YijingHexagramSymbols", new LazyRange(0x4DC0, 0x4DFF) }, //$NON-NLS-1$
+                { "CJKUnifiedIdeographs", new LazyRange(0x4E00, 0x9FFF) }, //$NON-NLS-1$
+                { "YiSyllables", new LazyRange(0xA000, 0xA48F) }, //$NON-NLS-1$
+                { "YiRadicals", new LazyRange(0xA490, 0xA4CF) }, //$NON-NLS-1$
+                { "ModifierToneLetters", new LazyRange(0xA700, 0xA71F) }, //$NON-NLS-1$
+                { "SylotiNagri", new LazyRange(0xA800, 0xA82F) }, //$NON-NLS-1$
+                { "HangulSyllables", new LazyRange(0xAC00, 0xD7A3) }, //$NON-NLS-1$
+                { "HighSurrogates", new LazyRange(0xD800, 0xDB7F) }, //$NON-NLS-1$
+                { "HighPrivateUseSurrogates", new LazyRange(0xDB80, 0xDBFF) }, //$NON-NLS-1$
+                { "LowSurrogates", new LazyRange(0xDC00, 0xDFFF) }, //$NON-NLS-1$
+                { "PrivateUseArea", new LazyRange(0xE000, 0xF8FF) }, //$NON-NLS-1$
+                { "CJKCompatibilityIdeographs", new LazyRange(0xF900, 0xFAFF) }, //$NON-NLS-1$
+                { "AlphabeticPresentationForms", new LazyRange(0xFB00, 0xFB4F) }, //$NON-NLS-1$
+                { "ArabicPresentationForms-A", new LazyRange(0xFB50, 0xFDFF) }, //$NON-NLS-1$
+                { "VariationSelectors", new LazyRange(0xFE00, 0xFE0F) }, //$NON-NLS-1$
+                { "VerticalForms", new LazyRange(0xFE10, 0xFE1F) }, //$NON-NLS-1$
+                { "CombiningHalfMarks", new LazyRange(0xFE20, 0xFE2F) }, //$NON-NLS-1$
+                { "CJKCompatibilityForms", new LazyRange(0xFE30, 0xFE4F) }, //$NON-NLS-1$
+                { "SmallFormVariants", new LazyRange(0xFE50, 0xFE6F) }, //$NON-NLS-1$
+                { "ArabicPresentationForms-B", new LazyRange(0xFE70, 0xFEFF) }, //$NON-NLS-1$
+                { "HalfwidthandFullwidthForms", new LazyRange(0xFF00, 0xFFEF) }, //$NON-NLS-1$
+                { "Specials", new LazySpecialsBlock() }, //$NON-NLS-1$
+                { "Cn", new LazyCategory(Character.UNASSIGNED) }, //$NON-NLS-1$
+                { "IsL", new LazyCategoryScope(0x3E) }, //$NON-NLS-1$
+                { "Lu", new LazyCategory(Character.UPPERCASE_LETTER) }, //$NON-NLS-1$
+                { "Ll", new LazyCategory(Character.LOWERCASE_LETTER) }, //$NON-NLS-1$
+                { "Lt", new LazyCategory(Character.TITLECASE_LETTER) }, //$NON-NLS-1$
+                { "Lm", new LazyCategory(Character.MODIFIER_LETTER) }, //$NON-NLS-1$
+                { "Lo", new LazyCategory(Character.OTHER_LETTER) }, //$NON-NLS-1$
+                { "IsM", new LazyCategoryScope(0x1C0) }, //$NON-NLS-1$
+                { "Mn", new LazyCategory(Character.NON_SPACING_MARK) }, //$NON-NLS-1$
+                { "Me", new LazyCategory(Character.ENCLOSING_MARK) }, //$NON-NLS-1$
+                { "Mc", new LazyCategory(Character.COMBINING_SPACING_MARK) }, //$NON-NLS-1$
+                { "N", new LazyCategoryScope(0xE00) }, //$NON-NLS-1$
+                { "Nd", new LazyCategory(Character.DECIMAL_DIGIT_NUMBER) }, //$NON-NLS-1$
+                { "Nl", new LazyCategory(Character.LETTER_NUMBER) }, //$NON-NLS-1$
+                { "No", new LazyCategory(Character.OTHER_NUMBER) }, //$NON-NLS-1$
+                { "IsZ", new LazyCategoryScope(0x7000) }, //$NON-NLS-1$
+                { "Zs", new LazyCategory(Character.SPACE_SEPARATOR) }, //$NON-NLS-1$
+                { "Zl", new LazyCategory(Character.LINE_SEPARATOR) }, //$NON-NLS-1$
+                { "Zp", new LazyCategory(Character.PARAGRAPH_SEPARATOR) }, //$NON-NLS-1$
+                { "IsC", new LazyCategoryScope(0xF0000) }, //$NON-NLS-1$
+                { "Cc", new LazyCategory(Character.CONTROL) }, //$NON-NLS-1$
+                { "Cf", new LazyCategory(Character.FORMAT) }, //$NON-NLS-1$
+                { "Co", new LazyCategory(Character.PRIVATE_USE) }, //$NON-NLS-1$
+                { "Cs", new LazyCategory(Character.SURROGATE) }, //$NON-NLS-1$
+                { "IsP", new LazyCategoryScope(0xF8000) }, //$NON-NLS-1$
+                { "Pd", new LazyCategory(Character.DASH_PUNCTUATION) }, //$NON-NLS-1$
+                { "Ps", new LazyCategory(Character.START_PUNCTUATION) }, //$NON-NLS-1$
+                { "Pe", new LazyCategory(Character.END_PUNCTUATION) }, //$NON-NLS-1$
+                { "Pc", new LazyCategory(Character.CONNECTOR_PUNCTUATION) }, //$NON-NLS-1$
+                { "Po", new LazyCategory(Character.OTHER_PUNCTUATION) }, //$NON-NLS-1$
+                { "IsS", new LazyCategoryScope(0x7E000000) }, //$NON-NLS-1$
+                { "Sm", new LazyCategory(Character.MATH_SYMBOL) }, //$NON-NLS-1$
+                { "Sc", new LazyCategory(Character.CURRENCY_SYMBOL) }, //$NON-NLS-1$
+                { "Sk", new LazyCategory(Character.MODIFIER_SYMBOL) }, //$NON-NLS-1$
+                { "So", new LazyCategory(Character.OTHER_SYMBOL) }, //$NON-NLS-1$
+                { "Pi", new LazyCategory(Character.INITIAL_QUOTE_PUNCTUATION) }, //$NON-NLS-1$
+                { "Pf", new LazyCategory(Character.FINAL_QUOTE_PUNCTUATION) } }; //$NON-NLS-1$
 
         public Object[][] getContents() {
             return contents;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/AbstractSet.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/AbstractSet.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/AbstractSet.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/AbstractSet.java Tue Sep 26 04:47:21 2006
@@ -156,7 +156,7 @@
     }
 
     protected String getQualifiedName() {
-        return "<" + index + ":" + getName() + ">";
+        return "<" + index + ":" + getName() + ">"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     public String toString() {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/AheadFSet.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/AheadFSet.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/AheadFSet.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/AheadFSet.java Tue Sep 26 04:47:21 2006
@@ -38,6 +38,6 @@
     }
 
     protected String getName() {
-        return "AheadFSet";
+        return "AheadFSet"; //$NON-NLS-1$
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/AtomicFSet.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/AtomicFSet.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/AtomicFSet.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/AtomicFSet.java Tue Sep 26 04:47:21 2006
@@ -47,7 +47,7 @@
     }
 
     protected String getName() {
-        return "AtomicFSet";
+        return "AtomicFSet"; //$NON-NLS-1$
     }
 
     public boolean hasConsumed(MatchResultImpl mr) {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/AtomicJointSet.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/AtomicJointSet.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/AtomicJointSet.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/AtomicJointSet.java Tue Sep 26 04:47:21 2006
@@ -68,6 +68,6 @@
     }
 
     protected String getName() {
-        return "NonCapJointSet";
+        return "NonCapJointSet"; //$NON-NLS-1$
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/BackReferenceSet.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/BackReferenceSet.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/BackReferenceSet.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/BackReferenceSet.java Tue Sep 26 04:47:21 2006
@@ -104,6 +104,6 @@
     }
 
     public String getName() {
-        return "back reference: " + this.groupIndex;
+        return "back reference: " + this.groupIndex; //$NON-NLS-1$
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/BehindFSet.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/BehindFSet.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/BehindFSet.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/BehindFSet.java Tue Sep 26 04:47:21 2006
@@ -43,6 +43,6 @@
     }
 
     protected String getName() {
-        return "BehindFSet";
+        return "BehindFSet"; //$NON-NLS-1$
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/CIBackReferenceSet.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/CIBackReferenceSet.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/CIBackReferenceSet.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/CIBackReferenceSet.java Tue Sep 26 04:47:21 2006
@@ -20,6 +20,8 @@
  */
 package java.util.regex;
 
+import org.apache.harmony.regex.internal.nls.Messages;
+
 
 /**
  * Case Insensitive back reference node;
@@ -42,7 +44,7 @@
     }
 
     public int accepts(int strIndex, CharSequence testString) {
-        throw new PatternSyntaxException(I18n.getMessage("Internal error"), "",
+        throw new PatternSyntaxException(Messages.getString("regex.04"), "", //$NON-NLS-1$ //$NON-NLS-2$
                 0);
     }
 
@@ -81,7 +83,7 @@
     }
 
     public String getName() {
-        return "CI back reference: " + this.groupIndex;
+        return "CI back reference: " + this.groupIndex; //$NON-NLS-1$
     }
 
     public boolean hasConsumed(MatchResultImpl matchResult) {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/CICharSet.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/CICharSet.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/CICharSet.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/CICharSet.java Tue Sep 26 04:47:21 2006
@@ -44,7 +44,7 @@
     }
 
     protected String getName() {
-        return "CI " + ch;
+        return "CI " + ch; //$NON-NLS-1$
     }
 
     protected char getChar() {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/CISequenceSet.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/CISequenceSet.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/CISequenceSet.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/CISequenceSet.java Tue Sep 26 04:47:21 2006
@@ -52,6 +52,6 @@
 	}
 
 	public String getName() {
-		return "CI sequence: " + string;
+		return "CI sequence: " + string; //$NON-NLS-1$
 	}
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/CharSet.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/CharSet.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/CharSet.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/CharSet.java Tue Sep 26 04:47:21 2006
@@ -82,7 +82,7 @@
     }
 
     protected String getName() {
-        return "" + ch;
+        return "" + ch; //$NON-NLS-1$
     }
 
     protected char getChar() {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/DecomposedCharSet.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/DecomposedCharSet.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/DecomposedCharSet.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/DecomposedCharSet.java Tue Sep 26 04:47:21 2006
@@ -205,7 +205,7 @@
     }
 
     protected String getName() {
-        return "decomposed char:" + getDecomposedChar();
+        return "decomposed char:" + getDecomposedChar(); //$NON-NLS-1$
     }
 
     /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/DotAllSet.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/DotAllSet.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/DotAllSet.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/DotAllSet.java Tue Sep 26 04:47:21 2006
@@ -33,7 +33,7 @@
     }
 
     protected String getName() {
-        return "DotAll";
+        return "DotAll"; //$NON-NLS-1$
     }
 
     public int getType() {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/DotSet.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/DotSet.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/DotSet.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/DotSet.java Tue Sep 26 04:47:21 2006
@@ -46,7 +46,7 @@
     }
 
     protected String getName() {
-        return ".";
+        return "."; //$NON-NLS-1$
     }
 
     public int getType() {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/EOISet.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/EOISet.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/EOISet.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/EOISet.java Tue Sep 26 04:47:21 2006
@@ -49,6 +49,6 @@
     }
 
     protected String getName() {
-        return "EOI";
+        return "EOI"; //$NON-NLS-1$
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/EOLSet.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/EOLSet.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/EOLSet.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/EOLSet.java Tue Sep 26 04:47:21 2006
@@ -70,6 +70,6 @@
     }
 
     protected String getName() {
-        return "<EOL>";
+        return "<EOL>"; //$NON-NLS-1$
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/EmptySet.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/EmptySet.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/EmptySet.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/EmptySet.java Tue Sep 26 04:47:21 2006
@@ -44,7 +44,7 @@
      * @see java.util.regex.AbstractSet#getName()
      */
     protected String getName() {
-        return "<Empty set>";
+        return "<Empty set>"; //$NON-NLS-1$
     }
 
     public boolean hasConsumed(MatchResultImpl mr) {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/FSet.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/FSet.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/FSet.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/FSet.java Tue Sep 26 04:47:21 2006
@@ -56,7 +56,7 @@
     }
 
     protected String getName() {
-        return "fSet";
+        return "fSet"; //$NON-NLS-1$
     }
 
     public boolean hasConsumed(MatchResultImpl mr) {
@@ -76,7 +76,7 @@
         }
 
         protected String getName() {
-            return "posFSet";
+            return "posFSet"; //$NON-NLS-1$
         }
 
         public boolean hasConsumed(MatchResultImpl mr) {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/FinalSet.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/FinalSet.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/FinalSet.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/FinalSet.java Tue Sep 26 04:47:21 2006
@@ -44,6 +44,6 @@
     }
 
     protected String getName() {
-        return "FinalSet";
+        return "FinalSet"; //$NON-NLS-1$
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/GroupQuantifierSet.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/GroupQuantifierSet.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/GroupQuantifierSet.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/GroupQuantifierSet.java Tue Sep 26 04:47:21 2006
@@ -51,6 +51,6 @@
     }
 
     protected String getName() {
-        return "<GroupQuant>";
+        return "<GroupQuant>"; //$NON-NLS-1$
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/HangulDecomposedCharSet.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/HangulDecomposedCharSet.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/HangulDecomposedCharSet.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/HangulDecomposedCharSet.java Tue Sep 26 04:47:21 2006
@@ -73,7 +73,7 @@
     }
     
     protected String getName() {
-        return "decomposed Hangul syllable:" + getDecomposedChar();
+        return "decomposed Hangul syllable:" + getDecomposedChar(); //$NON-NLS-1$
     }
     
     public int matches(int strIndex, CharSequence testString, MatchResultImpl matchResult) {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/JointSet.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/JointSet.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/JointSet.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/JointSet.java Tue Sep 26 04:47:21 2006
@@ -75,7 +75,7 @@
     }
 
     protected String getName() {
-        return "JointSet";
+        return "JointSet"; //$NON-NLS-1$
     }
 
     public int getGroup() {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/LeafQuantifierSet.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/LeafQuantifierSet.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/LeafQuantifierSet.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/LeafQuantifierSet.java Tue Sep 26 04:47:21 2006
@@ -20,6 +20,8 @@
  */
 package java.util.regex;
 
+import org.apache.harmony.regex.internal.nls.Messages;
+
 /**
  * @author Nikolay A. Kuznetsov
  * @version $Revision: 1.4.2.2 $
@@ -56,7 +58,7 @@
     }
 
     protected String getName() {
-        return "<Quant>";
+        return "<Quant>"; //$NON-NLS-1$
     }
 
     /**
@@ -66,7 +68,7 @@
      */
     public void setInnerSet(AbstractSet innerSet) {
         if (!(innerSet instanceof LeafSet))
-            throw new RuntimeException("Internal Error");
+            throw new RuntimeException(Messages.getString("regex.04")); //$NON-NLS-1$
         super.setInnerSet(innerSet);
         this.leaf = (LeafSet) innerSet;
     }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/Lexer.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/Lexer.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/Lexer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/Lexer.java Tue Sep 26 04:47:21 2006
@@ -22,6 +22,8 @@
 
 import java.util.MissingResourceException;
 
+import org.apache.harmony.regex.internal.nls.Messages;
+
 /**
  * The purpose of this class is to break given pattern into RE tokens; 
  * 
@@ -540,8 +542,8 @@
                         : -1;
                 switch (lookAhead) {
                 case -1:
-                    throw new PatternSyntaxException(I18n
-                            .getMessage("Trailing \\"), this.toString(), index);
+                    throw new PatternSyntaxException(
+                            Messages.getString("regex.10"), this.toString(), index); //$NON-NLS-1$
                 case 'P':
                 case 'p': {
                     String cs = parseCharClassName();
@@ -554,11 +556,9 @@
                         lookAheadST = AbstractCharClass.getPredefinedClass(cs,
                                 negative);
                     } catch (MissingResourceException mre) {
-                        throw new PatternSyntaxException(I18n
-                                .getFormattedMessage(
-                                        "Character Class \\p'{'{0}'}'"
-                                                + "is not supported", cs), this
-                                .toString(), index);
+                        throw new PatternSyntaxException(
+                                        Messages.getString("regex.11" //$NON-NLS-1$
+                                                , cs), this.toString(), index);
                     }
                     lookAhead = 0;
                     break;
@@ -621,10 +621,10 @@
                     lookAhead = readOctals();
                     break;
                 case 'x':
-                    lookAhead = readHex("hexadecimal", 2);
+                    lookAhead = readHex("hexadecimal", 2); //$NON-NLS-1$
                     break;
                 case 'u':
-                    lookAhead = readHex("Unicode", 4);
+                    lookAhead = readHex("Unicode", 4); //$NON-NLS-1$
                     break;
 
                 case 'b':
@@ -650,8 +650,8 @@
                         lookAhead = (pattern[nextIndex()] & 0x1f);
                         break;
                     } else {
-                        throw new PatternSyntaxException("Illegal unsupported "
-                                + "control sequence", this.toString(), index);
+                        throw new PatternSyntaxException(Messages.getString("regex.12") //$NON-NLS-1$
+                                , this.toString(), index);
                     }
                 }
                 case 'C':
@@ -681,8 +681,8 @@
                 case 'o':
                 case 'q':
                 case 'y':
-                    throw new PatternSyntaxException("Illegal unsupported "
-                            + "escape sequence", this.toString(), index);
+                    throw new PatternSyntaxException(Messages.getString("regex.13") //$NON-NLS-1$
+                            , this.toString(), index);
 
                 default:
                     break;
@@ -783,9 +783,8 @@
                                     nextIndex();
                                     break;
                                 default:
-                                    throw new PatternSyntaxException("Unknown "
-                                            + "look behind", this.toString(),
-                                            index);
+                                    throw new PatternSyntaxException(Messages.getString("regex.14") //$NON-NLS-1$
+                                            , this.toString(), index);
                                 }
                             }
                         } while (behind);
@@ -853,7 +852,7 @@
         if (index < pattern.length - 2) {
             // one symbol family
             if (pattern[index] != '{') {
-                return "Is" + new String(pattern, nextIndex(), 1);
+                return "Is" + new String(pattern, nextIndex(), 1); //$NON-NLS-1$
             }
 
             nextIndex();
@@ -863,21 +862,21 @@
                 sb.append((char) ch);
             }
             if (ch != '}')
-                throw new PatternSyntaxException(I18n
-                        .getMessage("Unclosed character family"), this
+                throw new PatternSyntaxException(
+                        Messages.getString("regex.15"), this //$NON-NLS-1$
                         .toString(), index);
         }
 
         if (sb.length() == 0)
-            throw new PatternSyntaxException(I18n
-                    .getMessage("Empty character family"), this.toString(),
+            throw new PatternSyntaxException(
+                    Messages.getString("regex.16"), this.toString(), //$NON-NLS-1$
                     index);
 
         String res = sb.toString();
         if (res.length() == 1)
-            return "Is" + res;
-        return (res.length() > 3 && (res.startsWith("Is") || res
-                .startsWith("In"))) ? res.substring(2) : res;
+            return "Is" + res; //$NON-NLS-1$
+        return (res.length() > 3 && (res.startsWith("Is") || res //$NON-NLS-1$
+                .startsWith("In"))) ? res.substring(2) : res; //$NON-NLS-1$
     }
 
     /**
@@ -893,8 +892,8 @@
                     min = Integer.parseInt(sb.toString(), 10);
                     sb.delete(0, sb.length());
                 } catch (NumberFormatException nfe) {
-                    throw new PatternSyntaxException(I18n
-                            .getMessage("Incorrect Quantifier Syntax"), this
+                    throw new PatternSyntaxException(
+                            Messages.getString("regex.17"), this //$NON-NLS-1$
                             .toString(), index);
                 }
             } else {
@@ -902,8 +901,8 @@
             }
         }
         if (ch != '}') {
-            throw new PatternSyntaxException(I18n
-                    .getMessage("Incorrect Quantifier Syntax"),
+            throw new PatternSyntaxException(
+                    Messages.getString("regex.17"), //$NON-NLS-1$
                     this.toString(), index);
         }
         if (sb.length() > 0) {
@@ -912,18 +911,18 @@
                 if (min < 0)
                     min = max;
             } catch (NumberFormatException nfe) {
-                throw new PatternSyntaxException(I18n
-                        .getMessage("Incorrect Quantifier Syntax"), this
+                throw new PatternSyntaxException(
+                        Messages.getString("regex.17"), this //$NON-NLS-1$
                         .toString(), index);
             }
         } else if (min < 0) {
-            throw new PatternSyntaxException(I18n
-                    .getMessage("Incorrect Quantifier Syntax"),
+            throw new PatternSyntaxException(
+                    Messages.getString("regex.17"), //$NON-NLS-1$
                     this.toString(), index);
         }
         if ((min | max | max - min) < 0) {
-            throw new PatternSyntaxException(I18n
-                    .getMessage("Incorrect Quantifier Syntax"),
+            throw new PatternSyntaxException(
+                    Messages.getString("regex.17"), //$NON-NLS-1$
                     this.toString(), index);
         }
 
@@ -992,8 +991,8 @@
             }
         }
 
-        throw new PatternSyntaxException(I18n.getMessage("Invalid " + radixName
-                + "escape sequence"), this.toString(), index);
+        throw new PatternSyntaxException(Messages.getString("regex.18", radixName) //$NON-NLS-1$
+                , this.toString(), index);
     }
 
     /**
@@ -1009,8 +1008,8 @@
 
         switch (first = Character.digit((ch = pattern[index]), 8)) {
         case -1:
-            throw new PatternSyntaxException(I18n.getMessage("Invalid "
-                    + "octal escape sequence"), this.toString(), index);
+            throw new PatternSyntaxException(Messages.getString("regex.19") //$NON-NLS-1$
+                    , this.toString(), index);
         default: {
             if (first > 3)
                 max--;
@@ -1042,8 +1041,8 @@
             switch (ch) {
             case '-':
                 if (!pos) {
-                    throw new PatternSyntaxException("Illegal "
-                            + "inline construct", this.toString(), index);
+                    throw new PatternSyntaxException(Messages.getString("regex.1A") //$NON-NLS-1$
+                            , this.toString(), index);
                 }
                 pos = false;
                 break; 
@@ -1093,12 +1092,12 @@
                 return res | (1 << 8);
                 
             default:
-                throw new PatternSyntaxException("Illegal inline construct",
+                throw new PatternSyntaxException(Messages.getString("regex.1A"), //$NON-NLS-1$
                                                this.toString(), index);
             }
             nextIndex();
         }
-        throw new PatternSyntaxException("Illegal inline construct", 
+        throw new PatternSyntaxException(Messages.getString("regex.1A"),  //$NON-NLS-1$
         		                       this.toString(), index);
     }
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/MatchResultImpl.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/MatchResultImpl.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/MatchResultImpl.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/MatchResultImpl.java Tue Sep 26 04:47:21 2006
@@ -22,6 +22,8 @@
 
 import java.util.Arrays;
 
+import org.apache.harmony.regex.internal.nls.Messages;
+
 /**
  * Match result implementaion
  * Note: probably it might make sense to combine this class with Matcher.
@@ -175,12 +177,12 @@
 
     private void checkGroup(int group) {
         if (!valid) {
-            throw new IllegalStateException(I18n.getMessage("No match found"));
+            throw new IllegalStateException(Messages.getString("regex.05")); //$NON-NLS-1$
         }
 
         if (group < 0 || group > groupCount) {
-            throw new IndexOutOfBoundsException(I18n.getFormattedMessage(
-                    "Group index out of bounds: {0}", new Integer(group)));
+            throw new IndexOutOfBoundsException(
+                    Messages.getString("regex.06", group)); //$NON-NLS-1$
         }
     }
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/Matcher.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/Matcher.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/Matcher.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/Matcher.java Tue Sep 26 04:47:21 2006
@@ -22,6 +22,8 @@
 
 import java.util.ArrayList;
 
+import org.apache.harmony.regex.internal.nls.Messages;
+
 /**
  * @com.intel.drl.spec_ref
  * 
@@ -133,8 +135,8 @@
                         } catch (IndexOutOfBoundsException iob) {
                             throw iob;
                         } catch (Exception e) {
-                            throw new IllegalArgumentException(I18n
-                                    .getMessage("Illegal group reference"));
+                            throw new IllegalArgumentException(
+                                    Messages.getString("regex.00")); //$NON-NLS-1$
                         }
                     } else {
                         res.append(repl[index]);
@@ -157,7 +159,7 @@
      */
     public Matcher reset(CharSequence newSequence) {
         if (newSequence == null) {
-            throw new NullPointerException(I18n.getMessage("Incorrect input"));
+            throw new NullPointerException(Messages.getString("regex.01")); //$NON-NLS-1$
         }
         this.string = newSequence;
         return reset();
@@ -183,9 +185,8 @@
 
         if (leftBound > rightBound || leftBound < 0 || rightBound < 0
                 || leftBound > string.length() || rightBound > string.length()) {
-            throw new IndexOutOfBoundsException(I18n.getFormattedMessage(
-                    "Region indices out of bounds: " + "from {0} to {1}",
-                    Integer.toString(leftBound), Integer.toString(rightBound)));
+            throw new IndexOutOfBoundsException( Messages.getString("regex.02", //$NON-NLS-1$
+                            Integer.toString(leftBound), Integer.toString(rightBound)));
         }
 
         this.leftBound = leftBound;
@@ -277,9 +278,8 @@
     public boolean find(int startIndex) {
         int stringLength = string.length();
         if (startIndex < 0 || startIndex > stringLength)
-            throw new IndexOutOfBoundsException(I18n.getFormattedMessage(
-                    "Start index " + "out of bounds: {0}", new Integer(
-                            startIndex)));
+            throw new IndexOutOfBoundsException(Messages.getString("regex.03", //$NON-NLS-1$ 
+                    new Integer(startIndex)));
 
         startIndex = findAt(startIndex);
         if (startIndex >= 0 && matchResult.isValid()) {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/MultiLineEOLSet.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/MultiLineEOLSet.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/MultiLineEOLSet.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/MultiLineEOLSet.java Tue Sep 26 04:47:21 2006
@@ -83,6 +83,6 @@
     }
 
     protected String getName() {
-        return "<MultiLine $>";
+        return "<MultiLine $>"; //$NON-NLS-1$
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/MultiLineSOLSet.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/MultiLineSOLSet.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/MultiLineSOLSet.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/MultiLineSOLSet.java Tue Sep 26 04:47:21 2006
@@ -52,6 +52,6 @@
     }
 
     protected String getName() {
-        return "^";
+        return "^"; //$NON-NLS-1$
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/NegativeLookAhead.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/NegativeLookAhead.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/NegativeLookAhead.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/NegativeLookAhead.java Tue Sep 26 04:47:21 2006
@@ -55,6 +55,6 @@
     }
 
     protected String getName() {
-        return "NegLookaheadJointSet";
+        return "NegLookaheadJointSet"; //$NON-NLS-1$
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/NegativeLookBehind.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/NegativeLookBehind.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/NegativeLookBehind.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/NegativeLookBehind.java Tue Sep 26 04:47:21 2006
@@ -66,6 +66,6 @@
     }
 
     protected String getName() {
-        return "NegBehindJointSet";
+        return "NegBehindJointSet"; //$NON-NLS-1$
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/NonCapFSet.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/NonCapFSet.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/NonCapFSet.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/NonCapFSet.java Tue Sep 26 04:47:21 2006
@@ -42,7 +42,7 @@
     }
 
     protected String getName() {
-        return "NonCapFSet";
+        return "NonCapFSet"; //$NON-NLS-1$
     }
 
     public boolean hasConsumed(MatchResultImpl mr) {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/NonCapJointSet.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/NonCapJointSet.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/NonCapJointSet.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/NonCapJointSet.java Tue Sep 26 04:47:21 2006
@@ -57,7 +57,7 @@
     }
 
     protected String getName() {
-        return "NonCapJointSet";
+        return "NonCapJointSet"; //$NON-NLS-1$
     }
 
     public boolean hasConsumed(MatchResultImpl matchResult) {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/Pattern.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/Pattern.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/Pattern.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/Pattern.java Tue Sep 26 04:47:21 2006
@@ -24,6 +24,8 @@
 
 import java.util.ArrayList;
 
+import org.apache.harmony.regex.internal.nls.Messages;
+
 
 /**
  * Pattern implements a compiler for regular expressions as defined by the J2SE
@@ -143,7 +145,7 @@
         int curPos = 0;       
         
         if (input.length() == 0) {
-            return new String [] {""};
+            return new String [] {""}; //$NON-NLS-1$
         } else {
             while (mat.find() && (index + 1 < limit || limit <= 0)) {
                   res.add(input.subSequence(curPos, mat.start()).toString());
@@ -278,8 +280,8 @@
 
         start = processExpression(-1, this.flags, null);
         if (!lexemes.isEmpty()) {
-            throw new PatternSyntaxException(I18n
-                    .getMessage("Trailing characters"), lexemes.toString(),
+            throw new PatternSyntaxException(
+                    Messages.getString("regex.08"), lexemes.toString(), //$NON-NLS-1$
                     lexemes.getIndex());
         }
         finalizeCompile();
@@ -583,8 +585,8 @@
             }
         } else if (lexemes.peek() == Lexer.CHAR_RIGHT_PARENTHESIS) {
         	if (last instanceof FinalSet) {
-        	    throw new PatternSyntaxException(I18n
-        	      .getMessage("unmatched )"), lexemes.toString(), 
+        	    throw new PatternSyntaxException(
+        	            Messages.getString("regex.09"), lexemes.toString(),  //$NON-NLS-1$
         	         lexemes.getIndex());
         	} else {
         	      cur = new EmptySet(last);
@@ -815,8 +817,8 @@
                                  : flags;
                      term = processExpression(ch, newFlags, last);
                      if (lexemes.peek() != Lexer.CHAR_RIGHT_PARENTHESIS) {
-                         throw new PatternSyntaxException(I18n
-                                 .getMessage("unmatched ("), lexemes.toString(),
+                         throw new PatternSyntaxException(
+                                 Messages.getString("regex.0A"), lexemes.toString(), //$NON-NLS-1$
                                  lexemes.getIndex());
                      }
                      lexemes.next();
@@ -833,8 +835,8 @@
 
                     term = processRange(negative, last);
                     if (lexemes.peek() != Lexer.CHAR_RIGHT_SQUARE_BRACKET)
-                        throw new PatternSyntaxException(I18n
-                                .getMessage("unmatched ["), lexemes.toString(),
+                        throw new PatternSyntaxException(
+                                Messages.getString("regex.0B"), lexemes.toString(), //$NON-NLS-1$
                                 lexemes.getIndex());
                     lexemes.setMode(Lexer.MODE_PATTERN);
                     lexemes.next();
@@ -947,10 +949,9 @@
                         needsBackRefReplacement = true;
                         break;
                     } else {
-                        throw new PatternSyntaxException(I18n
-                                .getMessage("No such group yet exists at "
-                                        + "this point in the pattern"), lexemes
-                                .toString(), lexemes.getIndex());
+                        throw new PatternSyntaxException(
+                                Messages.getString("regex.0C") //$NON-NLS-1$
+                                        , lexemes.toString(), lexemes.getIndex());
                     }
                 }
 
@@ -988,19 +989,18 @@
                     	term = new EmptySet(last);
                     } else if (ch == Lexer.CHAR_RIGHT_PARENTHESIS) {
                         if (last instanceof FinalSet) {
-                        	throw new PatternSyntaxException(I18n
-                    				.getMessage("unmatched )"), lexemes.toString(), 
+                        	throw new PatternSyntaxException(
+                    				Messages.getString("regex.09"), lexemes.toString(),  //$NON-NLS-1$
                     		    	lexemes.getIndex());
                         } else {
                     	    term = new EmptySet(last);
                         }
                     } else {
-                        throw new PatternSyntaxException(I18n
-                                .getMessage("Dangling meta construction")
-                                + ": "
-                                + (lexemes.isSpecial() ? lexemes.peekSpecial()
+                        throw new PatternSyntaxException(
+                                Messages.getString("regex.0D", //$NON-NLS-1$
+                                 (lexemes.isSpecial() ? lexemes.peekSpecial()
                                         .toString() : Character
-                                        .toString((char) ch)), lexemes
+                                        .toString((char) ch))), lexemes
                                 .toString(), lexemes.getIndex());
                     }
                 }
@@ -1097,15 +1097,15 @@
                         try {
                             res.add(buffer, (char) lexemes.peek());
                         } catch (Exception e) {
-                            throw new PatternSyntaxException(I18n
-                                    .getMessage("Illegal character range"),
+                            throw new PatternSyntaxException(
+                                    Messages.getString("regex.0E"), //$NON-NLS-1$
                                     pattern(), lexemes.getIndex());
                         }
                         lexemes.next();
                         buffer = -1;
                     } else {
-                        throw new PatternSyntaxException(I18n
-                                .getMessage("Illegal character range"),
+                        throw new PatternSyntaxException(
+                                Messages.getString("regex.0E"), //$NON-NLS-1$
                                 pattern(), lexemes.getIndex());
                     }
                 }
@@ -1140,7 +1140,7 @@
             firstInClass = false;
         }
         if (notClosed) {
-            throw new PatternSyntaxException(I18n.getMessage("Missing ']'"),
+            throw new PatternSyntaxException(Messages.getString("regex.0F"), //$NON-NLS-1$
                     pattern(), lexemes.getIndex() - 1);
         }
         if (buffer >= 0)
@@ -1178,15 +1178,15 @@
     }
 
     public static String quote(String s) {
-        StringBuffer sb = new StringBuffer().append("\\Q");
+        StringBuffer sb = new StringBuffer().append("\\Q"); //$NON-NLS-1$
         int apos = 0;
         int k;
-        while ((k = s.indexOf("\\E", apos)) >= 0) {
-            sb.append(s.substring(apos, k + 2)).append("\\\\E\\Q");
+        while ((k = s.indexOf("\\E", apos)) >= 0) { //$NON-NLS-1$
+            sb.append(s.substring(apos, k + 2)).append("\\\\E\\Q"); //$NON-NLS-1$
             apos = k + 2;
         }
 
-        return sb.append(s.substring(apos)).append("\\E").toString();
+        return sb.append(s.substring(apos)).append("\\E").toString(); //$NON-NLS-1$
     }
 
     /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/PatternSyntaxException.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/PatternSyntaxException.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/PatternSyntaxException.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/PatternSyntaxException.java Tue Sep 26 04:47:21 2006
@@ -22,6 +22,8 @@
 
 import java.util.Arrays;
 
+import org.apache.harmony.regex.internal.nls.Messages;
+
 /**
  * @com.intel.drl.spec_ref
  * 
@@ -58,15 +60,15 @@
      * @com.intel.drl.spec_ref
      */
     public String getMessage() {
-        String filler = "";
+        String filler = ""; //$NON-NLS-1$
         if (index >= 1) {
             char[] temp = new char[index];
             Arrays.fill(temp, ' ');
             filler = new String(temp);
         }
         return message
-                + ((pattern != null && pattern.length() != 0) ? " near index: "
-                        + index + "\n" + pattern + "\n" + filler + "^" : "");
+                + ((pattern != null && pattern.length() != 0) ? Messages.getString("regex.07", //$NON-NLS-1$
+                        new Object[]{index, pattern, filler}) : ""); //$NON-NLS-1$
     }
 
     /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/PositiveLookAhead.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/PositiveLookAhead.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/PositiveLookAhead.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/PositiveLookAhead.java Tue Sep 26 04:47:21 2006
@@ -59,6 +59,6 @@
     }
 
     protected String getName() {
-        return "PosLookaheadJointSet";
+        return "PosLookaheadJointSet"; //$NON-NLS-1$
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/PositiveLookBehind.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/PositiveLookBehind.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/PositiveLookBehind.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/PositiveLookBehind.java Tue Sep 26 04:47:21 2006
@@ -69,6 +69,6 @@
     }
 
     protected String getName() {
-        return "PosBehindJointSet";
+        return "PosBehindJointSet"; //$NON-NLS-1$
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/PreviousMatch.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/PreviousMatch.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/PreviousMatch.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/PreviousMatch.java Tue Sep 26 04:47:21 2006
@@ -45,6 +45,6 @@
     }
 
     protected String getName() {
-        return "PreviousMatch";
+        return "PreviousMatch"; //$NON-NLS-1$
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/Quantifier.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/Quantifier.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/Quantifier.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/Quantifier.java Tue Sep 26 04:47:21 2006
@@ -66,11 +66,11 @@
     }
 
     public String toString() {
-        return "{"
+        return "{" //$NON-NLS-1$
                 + min
-                + ","
-                + ((max == Integer.MAX_VALUE) ? "" : new Integer(max)
-                        .toString()) + "}";
+                + "," //$NON-NLS-1$
+                + ((max == Integer.MAX_VALUE) ? "" : new Integer(max) //$NON-NLS-1$
+                        .toString()) + "}"; //$NON-NLS-1$
     }
 
     public int getType() {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/RangeSet.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/RangeSet.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/RangeSet.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/RangeSet.java Tue Sep 26 04:47:21 2006
@@ -49,7 +49,7 @@
     }
 
     protected String getName() {
-        return "range:" + (alt ? "^ " : " ") + chars.toString();
+        return "range:" + (alt ? "^ " : " ") + chars.toString(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     public boolean first(AbstractSet set) {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/SOLSet.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/SOLSet.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/SOLSet.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/SOLSet.java Tue Sep 26 04:47:21 2006
@@ -43,6 +43,6 @@
     }
 
     protected String getName() {
-        return "<SOL>";
+        return "<SOL>"; //$NON-NLS-1$
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/SequenceSet.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/SequenceSet.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/SequenceSet.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/SequenceSet.java Tue Sep 26 04:47:21 2006
@@ -98,7 +98,7 @@
     }
 
     public String getName() {
-        return "secuence: " + string;
+        return "secuence: " + string; //$NON-NLS-1$
     }
 
     public boolean first(AbstractSet set) {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/UCIBackReferenceSet.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/UCIBackReferenceSet.java?view=diff&rev=450001&r1=450000&r2=450001
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/UCIBackReferenceSet.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/UCIBackReferenceSet.java Tue Sep 26 04:47:21 2006
@@ -55,6 +55,6 @@
     }
 
     public String getName() {
-        return "UCI back reference: " + this.groupIndex;
+        return "UCI back reference: " + this.groupIndex; //$NON-NLS-1$
     }
 }



Mime
View raw message