From 58e594dca99624eb8d3f97b30e0b1027f58bac96 Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Wed, 24 Nov 2004 13:33:01 +0000 Subject: [PATCH] Character.java, [...]: Reorder "final static" to "static final". 2004-11-24 Michael Koch * java/lang/Character.java, scripts/unicode-blocks.pl: Reorder "final static" to "static final". From-SVN: r91153 --- libjava/ChangeLog | 5 ++ libjava/java/lang/Character.java | 178 +++++++++++++++++++------------------- libjava/scripts/unicode-blocks.pl | 2 +- 3 files changed, 95 insertions(+), 90 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index df0f9d0..becc5f4 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,10 @@ 2004-11-24 Michael Koch + * java/lang/Character.java, scripts/unicode-blocks.pl: + Reorder "final static" to "static final". + +2004-11-24 Michael Koch + * java/util/ResourceBundle.java: Reformatted. (tryBundle): Fixed javadoc. diff --git a/libjava/java/lang/Character.java b/libjava/java/lang/Character.java index c5da892..58ecba7 100644 --- a/libjava/java/lang/Character.java +++ b/libjava/java/lang/Character.java @@ -66,10 +66,10 @@ import java.io.Serializable; *

See http://www.unicode.org * for more information on the Unicode Standard. * - * @author Tom Tromey + * @author Tom Tromey (tromey@cygnus.com) * @author Paul N. Fisher * @author Jochen Hoenicke - * @author Eric Blake + * @author Eric Blake (ebb9@email.byu.edu) * @since 1.0 * @status updated to 1.4 */ @@ -79,7 +79,7 @@ public final class Character implements Serializable, Comparable * A subset of Unicode blocks. * * @author Paul N. Fisher - * @author Eric Blake + * @author Eric Blake (ebb9@email.byu.edu) * @since 1.2 */ public static class Subset @@ -201,7 +201,7 @@ public final class Character implements Serializable, Comparable * Basic Latin. * '\u0000' - '\u007F'. */ - public final static UnicodeBlock BASIC_LATIN + public static final UnicodeBlock BASIC_LATIN = new UnicodeBlock('\u0000', '\u007F', "BASIC_LATIN"); @@ -209,7 +209,7 @@ public final class Character implements Serializable, Comparable * Latin-1 Supplement. * '\u0080' - '\u00FF'. */ - public final static UnicodeBlock LATIN_1_SUPPLEMENT + public static final UnicodeBlock LATIN_1_SUPPLEMENT = new UnicodeBlock('\u0080', '\u00FF', "LATIN_1_SUPPLEMENT"); @@ -217,7 +217,7 @@ public final class Character implements Serializable, Comparable * Latin Extended-A. * '\u0100' - '\u017F'. */ - public final static UnicodeBlock LATIN_EXTENDED_A + public static final UnicodeBlock LATIN_EXTENDED_A = new UnicodeBlock('\u0100', '\u017F', "LATIN_EXTENDED_A"); @@ -225,7 +225,7 @@ public final class Character implements Serializable, Comparable * Latin Extended-B. * '\u0180' - '\u024F'. */ - public final static UnicodeBlock LATIN_EXTENDED_B + public static final UnicodeBlock LATIN_EXTENDED_B = new UnicodeBlock('\u0180', '\u024F', "LATIN_EXTENDED_B"); @@ -233,7 +233,7 @@ public final class Character implements Serializable, Comparable * IPA Extensions. * '\u0250' - '\u02AF'. */ - public final static UnicodeBlock IPA_EXTENSIONS + public static final UnicodeBlock IPA_EXTENSIONS = new UnicodeBlock('\u0250', '\u02AF', "IPA_EXTENSIONS"); @@ -241,7 +241,7 @@ public final class Character implements Serializable, Comparable * Spacing Modifier Letters. * '\u02B0' - '\u02FF'. */ - public final static UnicodeBlock SPACING_MODIFIER_LETTERS + public static final UnicodeBlock SPACING_MODIFIER_LETTERS = new UnicodeBlock('\u02B0', '\u02FF', "SPACING_MODIFIER_LETTERS"); @@ -249,7 +249,7 @@ public final class Character implements Serializable, Comparable * Combining Diacritical Marks. * '\u0300' - '\u036F'. */ - public final static UnicodeBlock COMBINING_DIACRITICAL_MARKS + public static final UnicodeBlock COMBINING_DIACRITICAL_MARKS = new UnicodeBlock('\u0300', '\u036F', "COMBINING_DIACRITICAL_MARKS"); @@ -257,7 +257,7 @@ public final class Character implements Serializable, Comparable * Greek. * '\u0370' - '\u03FF'. */ - public final static UnicodeBlock GREEK + public static final UnicodeBlock GREEK = new UnicodeBlock('\u0370', '\u03FF', "GREEK"); @@ -265,7 +265,7 @@ public final class Character implements Serializable, Comparable * Cyrillic. * '\u0400' - '\u04FF'. */ - public final static UnicodeBlock CYRILLIC + public static final UnicodeBlock CYRILLIC = new UnicodeBlock('\u0400', '\u04FF', "CYRILLIC"); @@ -273,7 +273,7 @@ public final class Character implements Serializable, Comparable * Armenian. * '\u0530' - '\u058F'. */ - public final static UnicodeBlock ARMENIAN + public static final UnicodeBlock ARMENIAN = new UnicodeBlock('\u0530', '\u058F', "ARMENIAN"); @@ -281,7 +281,7 @@ public final class Character implements Serializable, Comparable * Hebrew. * '\u0590' - '\u05FF'. */ - public final static UnicodeBlock HEBREW + public static final UnicodeBlock HEBREW = new UnicodeBlock('\u0590', '\u05FF', "HEBREW"); @@ -289,7 +289,7 @@ public final class Character implements Serializable, Comparable * Arabic. * '\u0600' - '\u06FF'. */ - public final static UnicodeBlock ARABIC + public static final UnicodeBlock ARABIC = new UnicodeBlock('\u0600', '\u06FF', "ARABIC"); @@ -298,7 +298,7 @@ public final class Character implements Serializable, Comparable * '\u0700' - '\u074F'. * @since 1.4 */ - public final static UnicodeBlock SYRIAC + public static final UnicodeBlock SYRIAC = new UnicodeBlock('\u0700', '\u074F', "SYRIAC"); @@ -307,7 +307,7 @@ public final class Character implements Serializable, Comparable * '\u0780' - '\u07BF'. * @since 1.4 */ - public final static UnicodeBlock THAANA + public static final UnicodeBlock THAANA = new UnicodeBlock('\u0780', '\u07BF', "THAANA"); @@ -315,7 +315,7 @@ public final class Character implements Serializable, Comparable * Devanagari. * '\u0900' - '\u097F'. */ - public final static UnicodeBlock DEVANAGARI + public static final UnicodeBlock DEVANAGARI = new UnicodeBlock('\u0900', '\u097F', "DEVANAGARI"); @@ -323,7 +323,7 @@ public final class Character implements Serializable, Comparable * Bengali. * '\u0980' - '\u09FF'. */ - public final static UnicodeBlock BENGALI + public static final UnicodeBlock BENGALI = new UnicodeBlock('\u0980', '\u09FF', "BENGALI"); @@ -331,7 +331,7 @@ public final class Character implements Serializable, Comparable * Gurmukhi. * '\u0A00' - '\u0A7F'. */ - public final static UnicodeBlock GURMUKHI + public static final UnicodeBlock GURMUKHI = new UnicodeBlock('\u0A00', '\u0A7F', "GURMUKHI"); @@ -339,7 +339,7 @@ public final class Character implements Serializable, Comparable * Gujarati. * '\u0A80' - '\u0AFF'. */ - public final static UnicodeBlock GUJARATI + public static final UnicodeBlock GUJARATI = new UnicodeBlock('\u0A80', '\u0AFF', "GUJARATI"); @@ -347,7 +347,7 @@ public final class Character implements Serializable, Comparable * Oriya. * '\u0B00' - '\u0B7F'. */ - public final static UnicodeBlock ORIYA + public static final UnicodeBlock ORIYA = new UnicodeBlock('\u0B00', '\u0B7F', "ORIYA"); @@ -355,7 +355,7 @@ public final class Character implements Serializable, Comparable * Tamil. * '\u0B80' - '\u0BFF'. */ - public final static UnicodeBlock TAMIL + public static final UnicodeBlock TAMIL = new UnicodeBlock('\u0B80', '\u0BFF', "TAMIL"); @@ -363,7 +363,7 @@ public final class Character implements Serializable, Comparable * Telugu. * '\u0C00' - '\u0C7F'. */ - public final static UnicodeBlock TELUGU + public static final UnicodeBlock TELUGU = new UnicodeBlock('\u0C00', '\u0C7F', "TELUGU"); @@ -371,7 +371,7 @@ public final class Character implements Serializable, Comparable * Kannada. * '\u0C80' - '\u0CFF'. */ - public final static UnicodeBlock KANNADA + public static final UnicodeBlock KANNADA = new UnicodeBlock('\u0C80', '\u0CFF', "KANNADA"); @@ -379,7 +379,7 @@ public final class Character implements Serializable, Comparable * Malayalam. * '\u0D00' - '\u0D7F'. */ - public final static UnicodeBlock MALAYALAM + public static final UnicodeBlock MALAYALAM = new UnicodeBlock('\u0D00', '\u0D7F', "MALAYALAM"); @@ -388,7 +388,7 @@ public final class Character implements Serializable, Comparable * '\u0D80' - '\u0DFF'. * @since 1.4 */ - public final static UnicodeBlock SINHALA + public static final UnicodeBlock SINHALA = new UnicodeBlock('\u0D80', '\u0DFF', "SINHALA"); @@ -396,7 +396,7 @@ public final class Character implements Serializable, Comparable * Thai. * '\u0E00' - '\u0E7F'. */ - public final static UnicodeBlock THAI + public static final UnicodeBlock THAI = new UnicodeBlock('\u0E00', '\u0E7F', "THAI"); @@ -404,7 +404,7 @@ public final class Character implements Serializable, Comparable * Lao. * '\u0E80' - '\u0EFF'. */ - public final static UnicodeBlock LAO + public static final UnicodeBlock LAO = new UnicodeBlock('\u0E80', '\u0EFF', "LAO"); @@ -412,7 +412,7 @@ public final class Character implements Serializable, Comparable * Tibetan. * '\u0F00' - '\u0FFF'. */ - public final static UnicodeBlock TIBETAN + public static final UnicodeBlock TIBETAN = new UnicodeBlock('\u0F00', '\u0FFF', "TIBETAN"); @@ -421,7 +421,7 @@ public final class Character implements Serializable, Comparable * '\u1000' - '\u109F'. * @since 1.4 */ - public final static UnicodeBlock MYANMAR + public static final UnicodeBlock MYANMAR = new UnicodeBlock('\u1000', '\u109F', "MYANMAR"); @@ -429,7 +429,7 @@ public final class Character implements Serializable, Comparable * Georgian. * '\u10A0' - '\u10FF'. */ - public final static UnicodeBlock GEORGIAN + public static final UnicodeBlock GEORGIAN = new UnicodeBlock('\u10A0', '\u10FF', "GEORGIAN"); @@ -437,7 +437,7 @@ public final class Character implements Serializable, Comparable * Hangul Jamo. * '\u1100' - '\u11FF'. */ - public final static UnicodeBlock HANGUL_JAMO + public static final UnicodeBlock HANGUL_JAMO = new UnicodeBlock('\u1100', '\u11FF', "HANGUL_JAMO"); @@ -446,7 +446,7 @@ public final class Character implements Serializable, Comparable * '\u1200' - '\u137F'. * @since 1.4 */ - public final static UnicodeBlock ETHIOPIC + public static final UnicodeBlock ETHIOPIC = new UnicodeBlock('\u1200', '\u137F', "ETHIOPIC"); @@ -455,7 +455,7 @@ public final class Character implements Serializable, Comparable * '\u13A0' - '\u13FF'. * @since 1.4 */ - public final static UnicodeBlock CHEROKEE + public static final UnicodeBlock CHEROKEE = new UnicodeBlock('\u13A0', '\u13FF', "CHEROKEE"); @@ -464,7 +464,7 @@ public final class Character implements Serializable, Comparable * '\u1400' - '\u167F'. * @since 1.4 */ - public final static UnicodeBlock UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS + public static final UnicodeBlock UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS = new UnicodeBlock('\u1400', '\u167F', "UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS"); @@ -473,7 +473,7 @@ public final class Character implements Serializable, Comparable * '\u1680' - '\u169F'. * @since 1.4 */ - public final static UnicodeBlock OGHAM + public static final UnicodeBlock OGHAM = new UnicodeBlock('\u1680', '\u169F', "OGHAM"); @@ -482,7 +482,7 @@ public final class Character implements Serializable, Comparable * '\u16A0' - '\u16FF'. * @since 1.4 */ - public final static UnicodeBlock RUNIC + public static final UnicodeBlock RUNIC = new UnicodeBlock('\u16A0', '\u16FF', "RUNIC"); @@ -491,7 +491,7 @@ public final class Character implements Serializable, Comparable * '\u1780' - '\u17FF'. * @since 1.4 */ - public final static UnicodeBlock KHMER + public static final UnicodeBlock KHMER = new UnicodeBlock('\u1780', '\u17FF', "KHMER"); @@ -500,7 +500,7 @@ public final class Character implements Serializable, Comparable * '\u1800' - '\u18AF'. * @since 1.4 */ - public final static UnicodeBlock MONGOLIAN + public static final UnicodeBlock MONGOLIAN = new UnicodeBlock('\u1800', '\u18AF', "MONGOLIAN"); @@ -508,7 +508,7 @@ public final class Character implements Serializable, Comparable * Latin Extended Additional. * '\u1E00' - '\u1EFF'. */ - public final static UnicodeBlock LATIN_EXTENDED_ADDITIONAL + public static final UnicodeBlock LATIN_EXTENDED_ADDITIONAL = new UnicodeBlock('\u1E00', '\u1EFF', "LATIN_EXTENDED_ADDITIONAL"); @@ -516,7 +516,7 @@ public final class Character implements Serializable, Comparable * Greek Extended. * '\u1F00' - '\u1FFF'. */ - public final static UnicodeBlock GREEK_EXTENDED + public static final UnicodeBlock GREEK_EXTENDED = new UnicodeBlock('\u1F00', '\u1FFF', "GREEK_EXTENDED"); @@ -524,7 +524,7 @@ public final class Character implements Serializable, Comparable * General Punctuation. * '\u2000' - '\u206F'. */ - public final static UnicodeBlock GENERAL_PUNCTUATION + public static final UnicodeBlock GENERAL_PUNCTUATION = new UnicodeBlock('\u2000', '\u206F', "GENERAL_PUNCTUATION"); @@ -532,7 +532,7 @@ public final class Character implements Serializable, Comparable * Superscripts and Subscripts. * '\u2070' - '\u209F'. */ - public final static UnicodeBlock SUPERSCRIPTS_AND_SUBSCRIPTS + public static final UnicodeBlock SUPERSCRIPTS_AND_SUBSCRIPTS = new UnicodeBlock('\u2070', '\u209F', "SUPERSCRIPTS_AND_SUBSCRIPTS"); @@ -540,7 +540,7 @@ public final class Character implements Serializable, Comparable * Currency Symbols. * '\u20A0' - '\u20CF'. */ - public final static UnicodeBlock CURRENCY_SYMBOLS + public static final UnicodeBlock CURRENCY_SYMBOLS = new UnicodeBlock('\u20A0', '\u20CF', "CURRENCY_SYMBOLS"); @@ -548,7 +548,7 @@ public final class Character implements Serializable, Comparable * Combining Marks for Symbols. * '\u20D0' - '\u20FF'. */ - public final static UnicodeBlock COMBINING_MARKS_FOR_SYMBOLS + public static final UnicodeBlock COMBINING_MARKS_FOR_SYMBOLS = new UnicodeBlock('\u20D0', '\u20FF', "COMBINING_MARKS_FOR_SYMBOLS"); @@ -556,7 +556,7 @@ public final class Character implements Serializable, Comparable * Letterlike Symbols. * '\u2100' - '\u214F'. */ - public final static UnicodeBlock LETTERLIKE_SYMBOLS + public static final UnicodeBlock LETTERLIKE_SYMBOLS = new UnicodeBlock('\u2100', '\u214F', "LETTERLIKE_SYMBOLS"); @@ -564,7 +564,7 @@ public final class Character implements Serializable, Comparable * Number Forms. * '\u2150' - '\u218F'. */ - public final static UnicodeBlock NUMBER_FORMS + public static final UnicodeBlock NUMBER_FORMS = new UnicodeBlock('\u2150', '\u218F', "NUMBER_FORMS"); @@ -572,7 +572,7 @@ public final class Character implements Serializable, Comparable * Arrows. * '\u2190' - '\u21FF'. */ - public final static UnicodeBlock ARROWS + public static final UnicodeBlock ARROWS = new UnicodeBlock('\u2190', '\u21FF', "ARROWS"); @@ -580,7 +580,7 @@ public final class Character implements Serializable, Comparable * Mathematical Operators. * '\u2200' - '\u22FF'. */ - public final static UnicodeBlock MATHEMATICAL_OPERATORS + public static final UnicodeBlock MATHEMATICAL_OPERATORS = new UnicodeBlock('\u2200', '\u22FF', "MATHEMATICAL_OPERATORS"); @@ -588,7 +588,7 @@ public final class Character implements Serializable, Comparable * Miscellaneous Technical. * '\u2300' - '\u23FF'. */ - public final static UnicodeBlock MISCELLANEOUS_TECHNICAL + public static final UnicodeBlock MISCELLANEOUS_TECHNICAL = new UnicodeBlock('\u2300', '\u23FF', "MISCELLANEOUS_TECHNICAL"); @@ -596,7 +596,7 @@ public final class Character implements Serializable, Comparable * Control Pictures. * '\u2400' - '\u243F'. */ - public final static UnicodeBlock CONTROL_PICTURES + public static final UnicodeBlock CONTROL_PICTURES = new UnicodeBlock('\u2400', '\u243F', "CONTROL_PICTURES"); @@ -604,7 +604,7 @@ public final class Character implements Serializable, Comparable * Optical Character Recognition. * '\u2440' - '\u245F'. */ - public final static UnicodeBlock OPTICAL_CHARACTER_RECOGNITION + public static final UnicodeBlock OPTICAL_CHARACTER_RECOGNITION = new UnicodeBlock('\u2440', '\u245F', "OPTICAL_CHARACTER_RECOGNITION"); @@ -612,7 +612,7 @@ public final class Character implements Serializable, Comparable * Enclosed Alphanumerics. * '\u2460' - '\u24FF'. */ - public final static UnicodeBlock ENCLOSED_ALPHANUMERICS + public static final UnicodeBlock ENCLOSED_ALPHANUMERICS = new UnicodeBlock('\u2460', '\u24FF', "ENCLOSED_ALPHANUMERICS"); @@ -620,7 +620,7 @@ public final class Character implements Serializable, Comparable * Box Drawing. * '\u2500' - '\u257F'. */ - public final static UnicodeBlock BOX_DRAWING + public static final UnicodeBlock BOX_DRAWING = new UnicodeBlock('\u2500', '\u257F', "BOX_DRAWING"); @@ -628,7 +628,7 @@ public final class Character implements Serializable, Comparable * Block Elements. * '\u2580' - '\u259F'. */ - public final static UnicodeBlock BLOCK_ELEMENTS + public static final UnicodeBlock BLOCK_ELEMENTS = new UnicodeBlock('\u2580', '\u259F', "BLOCK_ELEMENTS"); @@ -636,7 +636,7 @@ public final class Character implements Serializable, Comparable * Geometric Shapes. * '\u25A0' - '\u25FF'. */ - public final static UnicodeBlock GEOMETRIC_SHAPES + public static final UnicodeBlock GEOMETRIC_SHAPES = new UnicodeBlock('\u25A0', '\u25FF', "GEOMETRIC_SHAPES"); @@ -644,7 +644,7 @@ public final class Character implements Serializable, Comparable * Miscellaneous Symbols. * '\u2600' - '\u26FF'. */ - public final static UnicodeBlock MISCELLANEOUS_SYMBOLS + public static final UnicodeBlock MISCELLANEOUS_SYMBOLS = new UnicodeBlock('\u2600', '\u26FF', "MISCELLANEOUS_SYMBOLS"); @@ -652,7 +652,7 @@ public final class Character implements Serializable, Comparable * Dingbats. * '\u2700' - '\u27BF'. */ - public final static UnicodeBlock DINGBATS + public static final UnicodeBlock DINGBATS = new UnicodeBlock('\u2700', '\u27BF', "DINGBATS"); @@ -661,7 +661,7 @@ public final class Character implements Serializable, Comparable * '\u2800' - '\u28FF'. * @since 1.4 */ - public final static UnicodeBlock BRAILLE_PATTERNS + public static final UnicodeBlock BRAILLE_PATTERNS = new UnicodeBlock('\u2800', '\u28FF', "BRAILLE_PATTERNS"); @@ -670,7 +670,7 @@ public final class Character implements Serializable, Comparable * '\u2E80' - '\u2EFF'. * @since 1.4 */ - public final static UnicodeBlock CJK_RADICALS_SUPPLEMENT + public static final UnicodeBlock CJK_RADICALS_SUPPLEMENT = new UnicodeBlock('\u2E80', '\u2EFF', "CJK_RADICALS_SUPPLEMENT"); @@ -679,7 +679,7 @@ public final class Character implements Serializable, Comparable * '\u2F00' - '\u2FDF'. * @since 1.4 */ - public final static UnicodeBlock KANGXI_RADICALS + public static final UnicodeBlock KANGXI_RADICALS = new UnicodeBlock('\u2F00', '\u2FDF', "KANGXI_RADICALS"); @@ -688,7 +688,7 @@ public final class Character implements Serializable, Comparable * '\u2FF0' - '\u2FFF'. * @since 1.4 */ - public final static UnicodeBlock IDEOGRAPHIC_DESCRIPTION_CHARACTERS + public static final UnicodeBlock IDEOGRAPHIC_DESCRIPTION_CHARACTERS = new UnicodeBlock('\u2FF0', '\u2FFF', "IDEOGRAPHIC_DESCRIPTION_CHARACTERS"); @@ -696,7 +696,7 @@ public final class Character implements Serializable, Comparable * CJK Symbols and Punctuation. * '\u3000' - '\u303F'. */ - public final static UnicodeBlock CJK_SYMBOLS_AND_PUNCTUATION + public static final UnicodeBlock CJK_SYMBOLS_AND_PUNCTUATION = new UnicodeBlock('\u3000', '\u303F', "CJK_SYMBOLS_AND_PUNCTUATION"); @@ -704,7 +704,7 @@ public final class Character implements Serializable, Comparable * Hiragana. * '\u3040' - '\u309F'. */ - public final static UnicodeBlock HIRAGANA + public static final UnicodeBlock HIRAGANA = new UnicodeBlock('\u3040', '\u309F', "HIRAGANA"); @@ -712,7 +712,7 @@ public final class Character implements Serializable, Comparable * Katakana. * '\u30A0' - '\u30FF'. */ - public final static UnicodeBlock KATAKANA + public static final UnicodeBlock KATAKANA = new UnicodeBlock('\u30A0', '\u30FF', "KATAKANA"); @@ -720,7 +720,7 @@ public final class Character implements Serializable, Comparable * Bopomofo. * '\u3100' - '\u312F'. */ - public final static UnicodeBlock BOPOMOFO + public static final UnicodeBlock BOPOMOFO = new UnicodeBlock('\u3100', '\u312F', "BOPOMOFO"); @@ -728,7 +728,7 @@ public final class Character implements Serializable, Comparable * Hangul Compatibility Jamo. * '\u3130' - '\u318F'. */ - public final static UnicodeBlock HANGUL_COMPATIBILITY_JAMO + public static final UnicodeBlock HANGUL_COMPATIBILITY_JAMO = new UnicodeBlock('\u3130', '\u318F', "HANGUL_COMPATIBILITY_JAMO"); @@ -736,7 +736,7 @@ public final class Character implements Serializable, Comparable * Kanbun. * '\u3190' - '\u319F'. */ - public final static UnicodeBlock KANBUN + public static final UnicodeBlock KANBUN = new UnicodeBlock('\u3190', '\u319F', "KANBUN"); @@ -745,7 +745,7 @@ public final class Character implements Serializable, Comparable * '\u31A0' - '\u31BF'. * @since 1.4 */ - public final static UnicodeBlock BOPOMOFO_EXTENDED + public static final UnicodeBlock BOPOMOFO_EXTENDED = new UnicodeBlock('\u31A0', '\u31BF', "BOPOMOFO_EXTENDED"); @@ -753,7 +753,7 @@ public final class Character implements Serializable, Comparable * Enclosed CJK Letters and Months. * '\u3200' - '\u32FF'. */ - public final static UnicodeBlock ENCLOSED_CJK_LETTERS_AND_MONTHS + public static final UnicodeBlock ENCLOSED_CJK_LETTERS_AND_MONTHS = new UnicodeBlock('\u3200', '\u32FF', "ENCLOSED_CJK_LETTERS_AND_MONTHS"); @@ -761,7 +761,7 @@ public final class Character implements Serializable, Comparable * CJK Compatibility. * '\u3300' - '\u33FF'. */ - public final static UnicodeBlock CJK_COMPATIBILITY + public static final UnicodeBlock CJK_COMPATIBILITY = new UnicodeBlock('\u3300', '\u33FF', "CJK_COMPATIBILITY"); @@ -770,7 +770,7 @@ public final class Character implements Serializable, Comparable * '\u3400' - '\u4DB5'. * @since 1.4 */ - public final static UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A + public static final UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A = new UnicodeBlock('\u3400', '\u4DB5', "CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A"); @@ -778,7 +778,7 @@ public final class Character implements Serializable, Comparable * CJK Unified Ideographs. * '\u4E00' - '\u9FFF'. */ - public final static UnicodeBlock CJK_UNIFIED_IDEOGRAPHS + public static final UnicodeBlock CJK_UNIFIED_IDEOGRAPHS = new UnicodeBlock('\u4E00', '\u9FFF', "CJK_UNIFIED_IDEOGRAPHS"); @@ -787,7 +787,7 @@ public final class Character implements Serializable, Comparable * '\uA000' - '\uA48F'. * @since 1.4 */ - public final static UnicodeBlock YI_SYLLABLES + public static final UnicodeBlock YI_SYLLABLES = new UnicodeBlock('\uA000', '\uA48F', "YI_SYLLABLES"); @@ -796,7 +796,7 @@ public final class Character implements Serializable, Comparable * '\uA490' - '\uA4CF'. * @since 1.4 */ - public final static UnicodeBlock YI_RADICALS + public static final UnicodeBlock YI_RADICALS = new UnicodeBlock('\uA490', '\uA4CF', "YI_RADICALS"); @@ -804,7 +804,7 @@ public final class Character implements Serializable, Comparable * Hangul Syllables. * '\uAC00' - '\uD7A3'. */ - public final static UnicodeBlock HANGUL_SYLLABLES + public static final UnicodeBlock HANGUL_SYLLABLES = new UnicodeBlock('\uAC00', '\uD7A3', "HANGUL_SYLLABLES"); @@ -812,7 +812,7 @@ public final class Character implements Serializable, Comparable * Surrogates Area. * '\uD800' - '\uDFFF'. */ - public final static UnicodeBlock SURROGATES_AREA + public static final UnicodeBlock SURROGATES_AREA = new UnicodeBlock('\uD800', '\uDFFF', "SURROGATES_AREA"); @@ -820,7 +820,7 @@ public final class Character implements Serializable, Comparable * Private Use Area. * '\uE000' - '\uF8FF'. */ - public final static UnicodeBlock PRIVATE_USE_AREA + public static final UnicodeBlock PRIVATE_USE_AREA = new UnicodeBlock('\uE000', '\uF8FF', "PRIVATE_USE_AREA"); @@ -828,7 +828,7 @@ public final class Character implements Serializable, Comparable * CJK Compatibility Ideographs. * '\uF900' - '\uFAFF'. */ - public final static UnicodeBlock CJK_COMPATIBILITY_IDEOGRAPHS + public static final UnicodeBlock CJK_COMPATIBILITY_IDEOGRAPHS = new UnicodeBlock('\uF900', '\uFAFF', "CJK_COMPATIBILITY_IDEOGRAPHS"); @@ -836,7 +836,7 @@ public final class Character implements Serializable, Comparable * Alphabetic Presentation Forms. * '\uFB00' - '\uFB4F'. */ - public final static UnicodeBlock ALPHABETIC_PRESENTATION_FORMS + public static final UnicodeBlock ALPHABETIC_PRESENTATION_FORMS = new UnicodeBlock('\uFB00', '\uFB4F', "ALPHABETIC_PRESENTATION_FORMS"); @@ -844,7 +844,7 @@ public final class Character implements Serializable, Comparable * Arabic Presentation Forms-A. * '\uFB50' - '\uFDFF'. */ - public final static UnicodeBlock ARABIC_PRESENTATION_FORMS_A + public static final UnicodeBlock ARABIC_PRESENTATION_FORMS_A = new UnicodeBlock('\uFB50', '\uFDFF', "ARABIC_PRESENTATION_FORMS_A"); @@ -852,7 +852,7 @@ public final class Character implements Serializable, Comparable * Combining Half Marks. * '\uFE20' - '\uFE2F'. */ - public final static UnicodeBlock COMBINING_HALF_MARKS + public static final UnicodeBlock COMBINING_HALF_MARKS = new UnicodeBlock('\uFE20', '\uFE2F', "COMBINING_HALF_MARKS"); @@ -860,7 +860,7 @@ public final class Character implements Serializable, Comparable * CJK Compatibility Forms. * '\uFE30' - '\uFE4F'. */ - public final static UnicodeBlock CJK_COMPATIBILITY_FORMS + public static final UnicodeBlock CJK_COMPATIBILITY_FORMS = new UnicodeBlock('\uFE30', '\uFE4F', "CJK_COMPATIBILITY_FORMS"); @@ -868,7 +868,7 @@ public final class Character implements Serializable, Comparable * Small Form Variants. * '\uFE50' - '\uFE6F'. */ - public final static UnicodeBlock SMALL_FORM_VARIANTS + public static final UnicodeBlock SMALL_FORM_VARIANTS = new UnicodeBlock('\uFE50', '\uFE6F', "SMALL_FORM_VARIANTS"); @@ -876,7 +876,7 @@ public final class Character implements Serializable, Comparable * Arabic Presentation Forms-B. * '\uFE70' - '\uFEFE'. */ - public final static UnicodeBlock ARABIC_PRESENTATION_FORMS_B + public static final UnicodeBlock ARABIC_PRESENTATION_FORMS_B = new UnicodeBlock('\uFE70', '\uFEFE', "ARABIC_PRESENTATION_FORMS_B"); @@ -884,7 +884,7 @@ public final class Character implements Serializable, Comparable * Halfwidth and Fullwidth Forms. * '\uFF00' - '\uFFEF'. */ - public final static UnicodeBlock HALFWIDTH_AND_FULLWIDTH_FORMS + public static final UnicodeBlock HALFWIDTH_AND_FULLWIDTH_FORMS = new UnicodeBlock('\uFF00', '\uFFEF', "HALFWIDTH_AND_FULLWIDTH_FORMS"); @@ -892,7 +892,7 @@ public final class Character implements Serializable, Comparable * Specials. * '\uFEFF', '\uFFF0' - '\uFFFD'. */ - public final static UnicodeBlock SPECIALS + public static final UnicodeBlock SPECIALS = new UnicodeBlock('\uFFF0', '\uFFFD', "SPECIALS"); @@ -2080,7 +2080,7 @@ public final class Character implements Serializable, Comparable public static char forDigit(int digit, int radix) { if (radix < MIN_RADIX || radix > MAX_RADIX - || digit < 0 || digit >= radix) + || digit < 0 || digit >= radix) return '\0'; return (char) (digit < 10 ? ('0' + digit) : ('a' - 10 + digit)); } diff --git a/libjava/scripts/unicode-blocks.pl b/libjava/scripts/unicode-blocks.pl index 22e58ec..cb60b1d8 100755 --- a/libjava/scripts/unicode-blocks.pl +++ b/libjava/scripts/unicode-blocks.pl @@ -186,7 +186,7 @@ while () { * $block. * $extra'\\u$start' - '\\u$end'.$since */ - public final static UnicodeBlock $name + public static final UnicodeBlock $name = new UnicodeBlock('\\u$start', '\\u$end', "$name"); EOF -- 2.7.4