diff --git a/icu4j/.classpath b/icu4j/.classpath index 1fb2bc7b8ab..c4fe0b66e05 100644 --- a/icu4j/.classpath +++ b/icu4j/.classpath @@ -1,6 +1,6 @@ - + diff --git a/icu4j/.settings/org.eclipse.jdt.core.prefs b/icu4j/.settings/org.eclipse.jdt.core.prefs index 2ca9d5c27b1..2c527dee568 100644 --- a/icu4j/.settings/org.eclipse.jdt.core.prefs +++ b/icu4j/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,5 @@ -#Thu Jul 17 14:46:50 EDT 2008 +#Wed Jan 21 15:00:59 EST 2009 eclipse.preferences.version=1 -instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true org.eclipse.jdt.core.codeComplete.argumentPrefixes= org.eclipse.jdt.core.codeComplete.argumentSuffixes= org.eclipse.jdt.core.codeComplete.fieldPrefixes= @@ -26,6 +25,7 @@ org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=warning org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning @@ -49,6 +49,7 @@ org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warnin org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled @@ -61,14 +62,18 @@ org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled org.eclipse.jdt.core.compiler.problem.unusedImport=warning org.eclipse.jdt.core.compiler.problem.unusedLabel=warning org.eclipse.jdt.core.compiler.problem.unusedLocal=warning org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.source=1.3 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false diff --git a/icu4j/build.properties b/icu4j/build.properties index e39f28ace1c..fa06125a3c4 100644 --- a/icu4j/build.properties +++ b/icu4j/build.properties @@ -24,7 +24,7 @@ current.year=2009 api.report.out=${api.dir}/icu4j_compare_${icu4j.previous.version.number}_${icu4j.version.number}.html copyright=Copyright (c) 2000-2009, International Business Machines Corporation and others. All Rights Reserved. corp=IBM Corporation -default.target.rt.version=J2SE15 +default.target.rt.version=J2SE16 icu4j.plugin.impl.version.string=4.1.2 copyright.eclipse=Licensed Materials - Property of IBM \n (C) Copyright IBM Corp. 2000, 2009. All Rights Reserved. \n IBM is a registered trademark of IBM Corp. \ No newline at end of file diff --git a/icu4j/build.xml b/icu4j/build.xml index ba7ef399ecb..6d787f17c71 100644 --- a/icu4j/build.xml +++ b/icu4j/build.xml @@ -251,8 +251,7 @@ - - + @@ -260,8 +259,7 @@ depends="buildMangle" description="Run the preprocessor to normalize Java sources to the ICU source repository target JDK version"> - - + @@ -272,10 +270,9 @@ - + - - + @@ -1652,8 +1649,7 @@ - - + @@ -1875,8 +1871,7 @@ - - + diff --git a/icu4j/src/com/ibm/icu/dev/test/ResourceModule.java b/icu4j/src/com/ibm/icu/dev/test/ResourceModule.java index 1ed1ca07383..ddea8da3ed1 100644 --- a/icu4j/src/com/ibm/icu/dev/test/ResourceModule.java +++ b/icu4j/src/com/ibm/icu/dev/test/ResourceModule.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /* ********************************************************************** - * Copyright (c) 2006-2007, International Business Machines + * Copyright (c) 2006-2009, International Business Machines * Corporation and others. All Rights Reserved. ********************************************************************** * Created on 2006-4-21 diff --git a/icu4j/src/com/ibm/icu/dev/test/TestAll.java b/icu4j/src/com/ibm/icu/dev/test/TestAll.java index 4343097ad90..8efd5b2fa01 100644 --- a/icu4j/src/com/ibm/icu/dev/test/TestAll.java +++ b/icu4j/src/com/ibm/icu/dev/test/TestAll.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /* ******************************************************************************* - * Copyright (C) 1996-2007, International Business Machines Corporation and * + * Copyright (C) 1996-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/dev/test/TestDataModule.java b/icu4j/src/com/ibm/icu/dev/test/TestDataModule.java index 648bd0d9dea..2e8eea16b2f 100644 --- a/icu4j/src/com/ibm/icu/dev/test/TestDataModule.java +++ b/icu4j/src/com/ibm/icu/dev/test/TestDataModule.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /** ******************************************************************************* - * Copyright (C) 2001-2007, International Business Machines Corporation and * + * Copyright (C) 2001-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/dev/test/TestFmwk.java b/icu4j/src/com/ibm/icu/dev/test/TestFmwk.java index ad05a9de956..9c4d06a4985 100644 --- a/icu4j/src/com/ibm/icu/dev/test/TestFmwk.java +++ b/icu4j/src/com/ibm/icu/dev/test/TestFmwk.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /* ******************************************************************************* - * Copyright (C) 1996-2008, International Business Machines Corporation and * + * Copyright (C) 1996-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/dev/test/TestUtil.java b/icu4j/src/com/ibm/icu/dev/test/TestUtil.java index eda7b11e7e9..d2c64bc5ba0 100644 --- a/icu4j/src/com/ibm/icu/dev/test/TestUtil.java +++ b/icu4j/src/com/ibm/icu/dev/test/TestUtil.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /** ******************************************************************************* - * Copyright (C) 2001-2006, International Business Machines Corporation and * + * Copyright (C) 2001-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/dev/test/bidi/TestAll.java b/icu4j/src/com/ibm/icu/dev/test/bidi/TestAll.java index e5ec5eb6f52..83ed3c7b627 100644 --- a/icu4j/src/com/ibm/icu/dev/test/bidi/TestAll.java +++ b/icu4j/src/com/ibm/icu/dev/test/bidi/TestAll.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /* ******************************************************************************* -* Copyright (C) 2001-2007, International Business Machines +* Copyright (C) 2001-2009, International Business Machines * Corporation and others. All Rights Reserved. ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/dev/test/bidi/TestCompatibility.java b/icu4j/src/com/ibm/icu/dev/test/bidi/TestCompatibility.java index 65c1b9a3147..02699b82e29 100644 --- a/icu4j/src/com/ibm/icu/dev/test/bidi/TestCompatibility.java +++ b/icu4j/src/com/ibm/icu/dev/test/bidi/TestCompatibility.java @@ -1,9 +1,9 @@ -//##header J2SE15 +//##header //#if defined(FOUNDATION10) || defined(J2SE13) //#else /* ******************************************************************************* -* Copyright (C) 2007, International Business Machines +* Copyright (C) 2007-2009, International Business Machines * Corporation and others. All Rights Reserved. ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/dev/test/bigdec/DiagBigDecimal.java b/icu4j/src/com/ibm/icu/dev/test/bigdec/DiagBigDecimal.java index 87498e9f72e..96de652f398 100644 --- a/icu4j/src/com/ibm/icu/dev/test/bigdec/DiagBigDecimal.java +++ b/icu4j/src/com/ibm/icu/dev/test/bigdec/DiagBigDecimal.java @@ -1,4 +1,4 @@ -//##header J2SE15 +//##header /* Generated from 'DiagBigDecimal.nrx' 27 Mar 2000 22:38:44 [v1.162] */ /* Options: Binary Comments Crossref Format Java Logo Trace1 Verbose3 */ package com.ibm.icu.dev.test.bigdec; @@ -9,7 +9,7 @@ import com.ibm.icu.util.VersionInfo; /* ------------------------------------------------------------------ */ /* Decimal diagnostic tests mfc */ -/* Copyright (c) IBM Corporation 1996-2007. All Rights Reserved. */ +/* Copyright (c) IBM Corporation 1996-2009. All Rights Reserved. */ /* ------------------------------------------------------------------ */ /* DiagBigDecimal */ /* */ diff --git a/icu4j/src/com/ibm/icu/dev/test/calendar/CalendarRegression.java b/icu4j/src/com/ibm/icu/dev/test/calendar/CalendarRegression.java index 125d4bf795c..504c7b2308a 100644 --- a/icu4j/src/com/ibm/icu/dev/test/calendar/CalendarRegression.java +++ b/icu4j/src/com/ibm/icu/dev/test/calendar/CalendarRegression.java @@ -1,4 +1,4 @@ -//##header J2SE15 +//##header /** ******************************************************************************* * Copyright (C) 2000-2009, International Business Machines Corporation and * diff --git a/icu4j/src/com/ibm/icu/dev/test/calendar/CompatibilityTest.java b/icu4j/src/com/ibm/icu/dev/test/calendar/CompatibilityTest.java index cad7a16d0e6..40e0a292af8 100644 --- a/icu4j/src/com/ibm/icu/dev/test/calendar/CompatibilityTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/calendar/CompatibilityTest.java @@ -1,4 +1,4 @@ -//##header J2SE15 +//##header /** ******************************************************************************* * Copyright (C) 2000-2009, International Business Machines Corporation and * diff --git a/icu4j/src/com/ibm/icu/dev/test/charsetdet/TestCharsetDetector.java b/icu4j/src/com/ibm/icu/dev/test/charsetdet/TestCharsetDetector.java index 2e61023f1b2..d25ccc04288 100644 --- a/icu4j/src/com/ibm/icu/dev/test/charsetdet/TestCharsetDetector.java +++ b/icu4j/src/com/ibm/icu/dev/test/charsetdet/TestCharsetDetector.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /** ******************************************************************************* - * Copyright (C) 2005-2008, International Business Machines Corporation and * + * Copyright (C) 2005-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/dev/test/cldr/TestCLDRVsICU.java b/icu4j/src/com/ibm/icu/dev/test/cldr/TestCLDRVsICU.java index ecdc59564dd..e68d098a734 100644 --- a/icu4j/src/com/ibm/icu/dev/test/cldr/TestCLDRVsICU.java +++ b/icu4j/src/com/ibm/icu/dev/test/cldr/TestCLDRVsICU.java @@ -1,9 +1,9 @@ -//##header J2SE15 +//##header //#if defined(FOUNDATION10) || defined(J2SE13) //#else /* ********************************************************************** -* Copyright (c) 2002-2008, International Business Machines +* Copyright (c) 2002-2009, International Business Machines * Corporation and others. All Rights Reserved. ********************************************************************** * Author: Mark Davis diff --git a/icu4j/src/com/ibm/icu/dev/test/collator/IndexCharactersTest.java b/icu4j/src/com/ibm/icu/dev/test/collator/IndexCharactersTest.java index 3316a4bf69f..74d25bd0220 100644 --- a/icu4j/src/com/ibm/icu/dev/test/collator/IndexCharactersTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/collator/IndexCharactersTest.java @@ -1,9 +1,9 @@ -//##header J2SE15 +//##header //#if defined(FOUNDATION10) || defined(J2SE13) //#else /* ******************************************************************************* - * Copyright (C) 2008, International Business Machines Corporation and * + * Copyright (C) 2008-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/dev/test/collator/RandomCollator.java b/icu4j/src/com/ibm/icu/dev/test/collator/RandomCollator.java index 05120fb0beb..fcba6b60db2 100644 --- a/icu4j/src/com/ibm/icu/dev/test/collator/RandomCollator.java +++ b/icu4j/src/com/ibm/icu/dev/test/collator/RandomCollator.java @@ -1,9 +1,9 @@ -//##header J2SE15 +//##header //#if defined(FOUNDATION10) || defined(J2SE13) //#else /* ******************************************************************************* - * Copyright (C) 2002-2008, International Business Machines Corporation and * + * Copyright (C) 2002-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/dev/test/duration/ICUDurationTest.java b/icu4j/src/com/ibm/icu/dev/test/duration/ICUDurationTest.java index 9a6e37e75ae..3465aaebaed 100644 --- a/icu4j/src/com/ibm/icu/dev/test/duration/ICUDurationTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/duration/ICUDurationTest.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /* ******************************************************************************* - * Copyright (C) 2007-2008, International Business Machines Corporation and * + * Copyright (C) 2007-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/dev/test/format/BigNumberFormatTest.java b/icu4j/src/com/ibm/icu/dev/test/format/BigNumberFormatTest.java index cf8fe6b2a2d..191413988fd 100644 --- a/icu4j/src/com/ibm/icu/dev/test/format/BigNumberFormatTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/format/BigNumberFormatTest.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /* ******************************************************************************* - * Copyright (C) 1996-2008, International Business Machines Corporation and * + * Copyright (C) 1996-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/dev/test/format/DateFormatTest.java b/icu4j/src/com/ibm/icu/dev/test/format/DateFormatTest.java index c5f03b45f47..7cfb8edffad 100644 --- a/icu4j/src/com/ibm/icu/dev/test/format/DateFormatTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/format/DateFormatTest.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /* ******************************************************************************* - * Copyright (C) 2001-2008, International Business Machines Corporation and * + * Copyright (C) 2001-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDecimalFormatAPI.java b/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDecimalFormatAPI.java index 1a1a987951a..4153e181d2c 100644 --- a/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDecimalFormatAPI.java +++ b/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDecimalFormatAPI.java @@ -1,4 +1,4 @@ -//##header J2SE15 +//##header /***************************************************************************************** * * Copyright (C) 1996-2009, International Business Machines diff --git a/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDecimalFormatAPIC.java b/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDecimalFormatAPIC.java index 88e3fd8fc2a..f12e2fe072a 100644 --- a/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDecimalFormatAPIC.java +++ b/icu4j/src/com/ibm/icu/dev/test/format/IntlTestDecimalFormatAPIC.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /* ******************************************************************************* - * Copyright (C) 2001-2007, International Business Machines Corporation and * + * Copyright (C) 2001-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/dev/test/format/IntlTestNumberFormatAPI.java b/icu4j/src/com/ibm/icu/dev/test/format/IntlTestNumberFormatAPI.java index 386b0e950d9..6374f743e86 100644 --- a/icu4j/src/com/ibm/icu/dev/test/format/IntlTestNumberFormatAPI.java +++ b/icu4j/src/com/ibm/icu/dev/test/format/IntlTestNumberFormatAPI.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /***************************************************************************************** * - * Copyright (C) 1996-2008, International Business Machines + * Copyright (C) 1996-2009, International Business Machines * Corporation and others. All Rights Reserved. **/ /** diff --git a/icu4j/src/com/ibm/icu/dev/test/format/NumberFormatRegressionTest.java b/icu4j/src/com/ibm/icu/dev/test/format/NumberFormatRegressionTest.java index 4893c7ec40c..56a4f6ffbac 100644 --- a/icu4j/src/com/ibm/icu/dev/test/format/NumberFormatRegressionTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/format/NumberFormatRegressionTest.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /* ******************************************************************************* - * Copyright (C) 2001-2008, International Business Machines Corporation and * + * Copyright (C) 2001-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/dev/test/format/NumberFormatTest.java b/icu4j/src/com/ibm/icu/dev/test/format/NumberFormatTest.java index ef26ed54afd..1760fda2e8a 100644 --- a/icu4j/src/com/ibm/icu/dev/test/format/NumberFormatTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/format/NumberFormatTest.java @@ -1,4 +1,4 @@ -//##header J2SE15 +//##header /* ******************************************************************************* * Copyright (C) 2001-2009, International Business Machines Corporation and * diff --git a/icu4j/src/com/ibm/icu/dev/test/format/NumberRegression.java b/icu4j/src/com/ibm/icu/dev/test/format/NumberRegression.java index 6eeb130999d..fe5a1757585 100644 --- a/icu4j/src/com/ibm/icu/dev/test/format/NumberRegression.java +++ b/icu4j/src/com/ibm/icu/dev/test/format/NumberRegression.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /***************************************************************************************** * - * Copyright (C) 1996-2008, International Business Machines + * Copyright (C) 1996-2009, International Business Machines * Corporation and others. All Rights Reserved. **/ diff --git a/icu4j/src/com/ibm/icu/dev/test/format/RbnfTest.java b/icu4j/src/com/ibm/icu/dev/test/format/RbnfTest.java index 03a8e22cd68..a4d55882729 100644 --- a/icu4j/src/com/ibm/icu/dev/test/format/RbnfTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/format/RbnfTest.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /* ******************************************************************************* - * Copyright (C) 1996-2008, International Business Machines Corporation and * + * Copyright (C) 1996-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/dev/test/format/TestMessageFormat.java b/icu4j/src/com/ibm/icu/dev/test/format/TestMessageFormat.java index 64a08135c8d..6386355624c 100644 --- a/icu4j/src/com/ibm/icu/dev/test/format/TestMessageFormat.java +++ b/icu4j/src/com/ibm/icu/dev/test/format/TestMessageFormat.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /* ********************************************************************** -* Copyright (c) 2004-2008, International Business Machines +* Copyright (c) 2004-2009, International Business Machines * Corporation and others. All Rights Reserved. ********************************************************************** * Author: Alan Liu diff --git a/icu4j/src/com/ibm/icu/dev/test/perf/NormalizerPerformanceTest.java b/icu4j/src/com/ibm/icu/dev/test/perf/NormalizerPerformanceTest.java index ddcce34a94c..8c0bed75c30 100644 --- a/icu4j/src/com/ibm/icu/dev/test/perf/NormalizerPerformanceTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/perf/NormalizerPerformanceTest.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /* ********************************************************************** -* Copyright (c) 2002-2007, International Business Machines * +* Copyright (c) 2002-2009, International Business Machines * * Corporation and others. All Rights Reserved. * ********************************************************************** */ @@ -694,13 +694,13 @@ public class NormalizerPerformanceTest extends PerfTest { void normalizerTest(String line, boolean compose) { //#if defined(FOUNDATION10) || defined(J2SE13) || defined(J2SE14) || defined(J2SE15) - sun.text.Normalizer.normalize(line, compose - ? sun.text.Normalizer.COMPOSE - : sun.text.Normalizer.DECOMP, 0); +//## sun.text.Normalizer.normalize(line, compose +//## ? sun.text.Normalizer.COMPOSE +//## : sun.text.Normalizer.DECOMP, 0); //#else -//## java.text.Normalizer.normalize(line, compose -//## ? java.text.Normalizer.Form.NFC -//## : java.text.Normalizer.Form.NFD); + java.text.Normalizer.normalize(line, compose + ? java.text.Normalizer.Form.NFC + : java.text.Normalizer.Form.NFD); //#endif } } diff --git a/icu4j/src/com/ibm/icu/dev/test/serializable/FormatTests.java b/icu4j/src/com/ibm/icu/dev/test/serializable/FormatTests.java index d58c4a05f55..125b4bf38e0 100644 --- a/icu4j/src/com/ibm/icu/dev/test/serializable/FormatTests.java +++ b/icu4j/src/com/ibm/icu/dev/test/serializable/FormatTests.java @@ -1,4 +1,4 @@ -//##header J2SE15 +//##header /* ******************************************************************************* * Copyright (C) 1996-2009, International Business Machines Corporation and * diff --git a/icu4j/src/com/ibm/icu/dev/test/serializable/SerializableTest.java b/icu4j/src/com/ibm/icu/dev/test/serializable/SerializableTest.java index 6d612d71ebd..1fd2b32d22f 100644 --- a/icu4j/src/com/ibm/icu/dev/test/serializable/SerializableTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/serializable/SerializableTest.java @@ -1,4 +1,4 @@ -//##header J2SE15 +//##header /* ******************************************************************************* * Copyright (C) 1996-2009, International Business Machines Corporation and * diff --git a/icu4j/src/com/ibm/icu/dev/test/timezone/TimeZoneAliasTest.java b/icu4j/src/com/ibm/icu/dev/test/timezone/TimeZoneAliasTest.java index cbc8d6fdc4d..a715d0d2d9f 100644 --- a/icu4j/src/com/ibm/icu/dev/test/timezone/TimeZoneAliasTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/timezone/TimeZoneAliasTest.java @@ -1,9 +1,9 @@ -//##header J2SE15 +//##header //#if defined(FOUNDATION10) || defined(J2SE13) //#else /* ******************************************************************************* - * Copyright (C) 2002-2008, International Business Machines Corporation and * + * Copyright (C) 2002-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/dev/test/timezone/TimeZoneRegression.java b/icu4j/src/com/ibm/icu/dev/test/timezone/TimeZoneRegression.java index 8b0fcc7f4ff..ab10b0f019e 100644 --- a/icu4j/src/com/ibm/icu/dev/test/timezone/TimeZoneRegression.java +++ b/icu4j/src/com/ibm/icu/dev/test/timezone/TimeZoneRegression.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /** ******************************************************************************* - * Copyright (C) 2000-2007, International Business Machines Corporation and * + * Copyright (C) 2000-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/dev/test/translit/UnicodeMapTest.java b/icu4j/src/com/ibm/icu/dev/test/translit/UnicodeMapTest.java index 17a60e5546e..03640867bb8 100644 --- a/icu4j/src/com/ibm/icu/dev/test/translit/UnicodeMapTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/translit/UnicodeMapTest.java @@ -1,9 +1,9 @@ -//##header J2SE15 +//##header //#if defined(FOUNDATION10) || defined(J2SE13) //#else /* ******************************************************************************* - * Copyright (C) 1996-2007, International Business Machines Corporation and * + * Copyright (C) 1996-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/dev/test/util/BNF.java b/icu4j/src/com/ibm/icu/dev/test/util/BNF.java index 67ac90636d8..1eabc50eb1f 100644 --- a/icu4j/src/com/ibm/icu/dev/test/util/BNF.java +++ b/icu4j/src/com/ibm/icu/dev/test/util/BNF.java @@ -1,9 +1,9 @@ -//##header J2SE15 +//##header //#if defined(FOUNDATION10) || defined(J2SE13) //#else /* ******************************************************************************* - * Copyright (C) 2002-2006, International Business Machines Corporation and * + * Copyright (C) 2002-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/dev/test/util/BagFormatter.java b/icu4j/src/com/ibm/icu/dev/test/util/BagFormatter.java index 9296e99cdb0..8660524f0ad 100644 --- a/icu4j/src/com/ibm/icu/dev/test/util/BagFormatter.java +++ b/icu4j/src/com/ibm/icu/dev/test/util/BagFormatter.java @@ -1,9 +1,9 @@ -//##header J2SE15 +//##header //#if defined(FOUNDATION10) || defined(J2SE13) //#else /* ******************************************************************************* - * Copyright (C) 2002-2008, International Business Machines Corporation and * + * Copyright (C) 2002-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/dev/test/util/CollectionUtilities.java b/icu4j/src/com/ibm/icu/dev/test/util/CollectionUtilities.java index 33eb43d5db9..f58f5e334fb 100644 --- a/icu4j/src/com/ibm/icu/dev/test/util/CollectionUtilities.java +++ b/icu4j/src/com/ibm/icu/dev/test/util/CollectionUtilities.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /* ******************************************************************************* - * Copyright (C) 1996-2007, International Business Machines Corporation and * + * Copyright (C) 1996-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/dev/test/util/DataInputCompressor.java b/icu4j/src/com/ibm/icu/dev/test/util/DataInputCompressor.java index 9c75b1edb3f..88c8b80fbeb 100644 --- a/icu4j/src/com/ibm/icu/dev/test/util/DataInputCompressor.java +++ b/icu4j/src/com/ibm/icu/dev/test/util/DataInputCompressor.java @@ -1,9 +1,9 @@ -//##header J2SE15 +//##header //#if defined(FOUNDATION10) || defined(J2SE13) //#else /* ******************************************************************************* - * Copyright (C) 1996-2006, International Business Machines Corporation and * + * Copyright (C) 1996-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/dev/test/util/DataOutputCompressor.java b/icu4j/src/com/ibm/icu/dev/test/util/DataOutputCompressor.java index 76ef2ae97ab..0d29a940b9a 100644 --- a/icu4j/src/com/ibm/icu/dev/test/util/DataOutputCompressor.java +++ b/icu4j/src/com/ibm/icu/dev/test/util/DataOutputCompressor.java @@ -1,9 +1,9 @@ -//##header J2SE15 +//##header //#if defined(FOUNDATION10) || defined(J2SE13) //#else /* ******************************************************************************* - * Copyright (C) 1996-2007, International Business Machines Corporation and * + * Copyright (C) 1996-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/dev/test/util/FileUtilities.java b/icu4j/src/com/ibm/icu/dev/test/util/FileUtilities.java index 61aea3206eb..3588d31b67a 100644 --- a/icu4j/src/com/ibm/icu/dev/test/util/FileUtilities.java +++ b/icu4j/src/com/ibm/icu/dev/test/util/FileUtilities.java @@ -1,9 +1,9 @@ -//##header J2SE15 +//##header //#if defined(FOUNDATION10) || defined(J2SE13) //#else /* ******************************************************************************* - * Copyright (C) 2002-2008, International Business Machines Corporation and * + * Copyright (C) 2002-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/dev/test/util/ICUPropertyFactory.java b/icu4j/src/com/ibm/icu/dev/test/util/ICUPropertyFactory.java index 7bc46bea146..2924a14cba4 100644 --- a/icu4j/src/com/ibm/icu/dev/test/util/ICUPropertyFactory.java +++ b/icu4j/src/com/ibm/icu/dev/test/util/ICUPropertyFactory.java @@ -1,9 +1,9 @@ -//##header J2SE15 +//##header //#if defined(FOUNDATION10) || defined(J2SE13) //#else /* ******************************************************************************* - * Copyright (C) 2002-2008, International Business Machines Corporation and * + * Copyright (C) 2002-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/dev/test/util/ICUResourceBundleTest.java b/icu4j/src/com/ibm/icu/dev/test/util/ICUResourceBundleTest.java index 897d938ba2e..133f1db33dd 100644 --- a/icu4j/src/com/ibm/icu/dev/test/util/ICUResourceBundleTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/util/ICUResourceBundleTest.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /** ******************************************************************************* - * Copyright (C) 2001-2008, International Business Machines Corporation and * + * Copyright (C) 2001-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/dev/test/util/TestBNF.java b/icu4j/src/com/ibm/icu/dev/test/util/TestBNF.java index 7e9e739a615..d9781a311d4 100644 --- a/icu4j/src/com/ibm/icu/dev/test/util/TestBNF.java +++ b/icu4j/src/com/ibm/icu/dev/test/util/TestBNF.java @@ -1,9 +1,9 @@ -//##header J2SE15 +//##header //#if defined(FOUNDATION10) || defined(J2SE13) //#else /* ******************************************************************************* - * Copyright (C) 2002-2007, International Business Machines Corporation and * + * Copyright (C) 2002-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/dev/test/util/TestBagFormatter.java b/icu4j/src/com/ibm/icu/dev/test/util/TestBagFormatter.java index 6fd6e04833e..ed7e5006d20 100644 --- a/icu4j/src/com/ibm/icu/dev/test/util/TestBagFormatter.java +++ b/icu4j/src/com/ibm/icu/dev/test/util/TestBagFormatter.java @@ -1,9 +1,9 @@ -//##header J2SE15 +//##header //#if defined(FOUNDATION10) || defined(J2SE13) //#else /* ******************************************************************************* - * Copyright (C) 2002-2007, International Business Machines Corporation and * + * Copyright (C) 2002-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/dev/test/util/TestUtilities.java b/icu4j/src/com/ibm/icu/dev/test/util/TestUtilities.java index 33250fc8d99..34ad70b9b80 100644 --- a/icu4j/src/com/ibm/icu/dev/test/util/TestUtilities.java +++ b/icu4j/src/com/ibm/icu/dev/test/util/TestUtilities.java @@ -1,9 +1,9 @@ -//##header J2SE15 +//##header //#if defined(FOUNDATION10) || defined(J2SE13) //#else /* ******************************************************************************* - * Copyright (C) 1996-2008, International Business Machines Corporation and * + * Copyright (C) 1996-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/dev/test/util/Tokenizer.java b/icu4j/src/com/ibm/icu/dev/test/util/Tokenizer.java index 265175a986b..07ef57e4908 100644 --- a/icu4j/src/com/ibm/icu/dev/test/util/Tokenizer.java +++ b/icu4j/src/com/ibm/icu/dev/test/util/Tokenizer.java @@ -1,9 +1,9 @@ -//##header J2SE15 +//##header //#if defined(FOUNDATION10) || defined(J2SE13) //#else /* ******************************************************************************* - * Copyright (C) 2002-2007, International Business Machines Corporation and * + * Copyright (C) 2002-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/dev/test/util/TransliteratorUtilities.java b/icu4j/src/com/ibm/icu/dev/test/util/TransliteratorUtilities.java index 3f76a9157cd..6bfa8de881d 100644 --- a/icu4j/src/com/ibm/icu/dev/test/util/TransliteratorUtilities.java +++ b/icu4j/src/com/ibm/icu/dev/test/util/TransliteratorUtilities.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /* ******************************************************************************* - * Copyright (C) 2002-2007, International Business Machines Corporation and * + * Copyright (C) 2002-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/dev/test/util/UnicodeMap.java b/icu4j/src/com/ibm/icu/dev/test/util/UnicodeMap.java index 715181dfd4c..e1489dcda8e 100644 --- a/icu4j/src/com/ibm/icu/dev/test/util/UnicodeMap.java +++ b/icu4j/src/com/ibm/icu/dev/test/util/UnicodeMap.java @@ -1,9 +1,9 @@ -//##header J2SE15 +//##header //#if defined(FOUNDATION10) || defined(J2SE13) //#else /* ******************************************************************************* - * Copyright (C) 1996-2007, International Business Machines Corporation and * + * Copyright (C) 1996-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/dev/test/util/UnicodeProperty.java b/icu4j/src/com/ibm/icu/dev/test/util/UnicodeProperty.java index 74b65bb607e..c28028b8db5 100644 --- a/icu4j/src/com/ibm/icu/dev/test/util/UnicodeProperty.java +++ b/icu4j/src/com/ibm/icu/dev/test/util/UnicodeProperty.java @@ -1,9 +1,9 @@ -//##header J2SE15 +//##header //#if defined(FOUNDATION10) || defined(J2SE13) //#else /* ******************************************************************************* - * Copyright (C) 1996-2008, International Business Machines Corporation and * + * Copyright (C) 1996-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/dev/test/util/UtilityTest.java b/icu4j/src/com/ibm/icu/dev/test/util/UtilityTest.java index 61e1c9ad4e2..1dacb3dfa13 100644 --- a/icu4j/src/com/ibm/icu/dev/test/util/UtilityTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/util/UtilityTest.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /* ********************************************************************** -* Copyright (c) 2003-2008, International Business Machines +* Copyright (c) 2003-2009, International Business Machines * Corporation and others. All Rights Reserved. ********************************************************************** * Author: Alan Liu diff --git a/icu4j/src/com/ibm/icu/dev/tool/docs/CodeMangler.java b/icu4j/src/com/ibm/icu/dev/tool/docs/CodeMangler.java index 7a618441d19..ee50d03d09e 100644 --- a/icu4j/src/com/ibm/icu/dev/tool/docs/CodeMangler.java +++ b/icu4j/src/com/ibm/icu/dev/tool/docs/CodeMangler.java @@ -1,6 +1,6 @@ /** ******************************************************************************* -* Copyright (C) 2004-2007, International Business Machines Corporation and * +* Copyright (C) 2004-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -38,6 +38,7 @@ public class CodeMangler { private boolean force; // true if force reprocess of files private boolean clean; // true if output is to be cleaned private boolean timestamp; // true if we read/write timestamp + private boolean nonames; // true if no names in header private HashMap map; // defines private ArrayList names; // files/directories to process private String header; // sorted list of defines passed in @@ -62,6 +63,7 @@ public class CodeMangler { "-t[imestamp] - expect/write timestamp in header\n" + "-dNAME[=VALUE] - define NAME with optional value VALUE\n" + " (or -d NAME[=VALUE])\n" + + "-n - do not put NAME/VALUE in header\n" + "-help - print this usage message and exit.\n" + "\n" + "For file arguments, output '.java' files using the same path/name under the output directory.\n" + @@ -125,6 +127,8 @@ public class CodeMangler { break; // stop before processing arguments, so we will do nothing } else if (arg.startsWith("-v")) { verbose = true; + } else if (arg.startsWith("-n")) { + nonames = true; } else { System.err.println("Error: unrecognized argument '" + arg + "'"); System.err.println(usage); @@ -225,16 +229,18 @@ public class CodeMangler { sort.putAll(map); Iterator iter = sort.entrySet().iterator(); StringBuffer buf = new StringBuffer(); - while (iter.hasNext()) { - Map.Entry e = (Map.Entry)iter.next(); - if (buf.length() > 0) { - buf.append(", "); - } - buf.append(e.getKey()); - String v = (String)e.getValue(); - if (v != null && v.length() > 0) { - buf.append('='); - buf.append(v); + if (!nonames) { + while (iter.hasNext()) { + Map.Entry e = (Map.Entry)iter.next(); + if (buf.length() > 0) { + buf.append(", "); + } + buf.append(e.getKey()); + String v = (String)e.getValue(); + if (v != null && v.length() > 0) { + buf.append('='); + buf.append(v); + } } } header = buf.toString(); @@ -350,9 +356,15 @@ public class CodeMangler { boolean hasHeader = line.startsWith(HEADER_PREFIX); if (hasHeader && !force) { long expectLastModified = ((infile.lastModified() + 999)/1000)*1000; - String headerline = HEADER_PREFIX + ' ' + header + ' ' + - (timestamp ? String.valueOf(expectLastModified) : ""); - headerline = headerline.trim(); + String headerline = HEADER_PREFIX; + if (header.length() > 0) { + headerline += " "; + headerline += header; + } + if (timestamp) { + headerline += " "; + headerline += String.valueOf(expectLastModified); + } if (line.equals(headerline)) { if (verbose) System.out.println("no changes necessary to " + infile.getCanonicalPath()); instream.close(); @@ -388,9 +400,15 @@ public class CodeMangler { outModTime = ((outfile.lastModified()+999)/1000)*1000; // round up outstream = new PrintStream(new FileOutputStream(outfile)); - String headerline = HEADER_PREFIX + ' ' + header + ' ' + - (timestamp ? String.valueOf(outModTime) : ""); - headerline = headerline.trim(); + String headerline = HEADER_PREFIX; + if (header.length() > 0) { + headerline += " "; + headerline += header; + } + if (timestamp) { + headerline += " "; + headerline += String.valueOf(outModTime); + } outstream.println(headerline); if (verbose) System.out.println("header: " + headerline); diff --git a/icu4j/src/com/ibm/icu/dev/tool/docs/ICUTaglet.java b/icu4j/src/com/ibm/icu/dev/tool/docs/ICUTaglet.java index 7d5045a504c..7ce50174f24 100644 --- a/icu4j/src/com/ibm/icu/dev/tool/docs/ICUTaglet.java +++ b/icu4j/src/com/ibm/icu/dev/tool/docs/ICUTaglet.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /** ******************************************************************************* -* Copyright (C) 2002-2008, International Business Machines Corporation and * +* Copyright (C) 2002-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/impl/ByteBuffer.java b/icu4j/src/com/ibm/icu/impl/ByteBuffer.java index 085db621c96..39f3ddaf255 100644 --- a/icu4j/src/com/ibm/icu/impl/ByteBuffer.java +++ b/icu4j/src/com/ibm/icu/impl/ByteBuffer.java @@ -1,8 +1,8 @@ -//##header J2SE15 +//##header //#if defined(FOUNDATION10) || defined(J2SE13) || defined(ECLIPSE_FRAGMENT) //##/* //## * ***************************************************************************** -//## * Copyright (C) 2006-2007, International Business Machines +//## * Copyright (C) 2006-2009, International Business Machines //## * Corporation and others. All Rights Reserved. //## * ***************************************************************************** //## */ diff --git a/icu4j/src/com/ibm/icu/impl/DateNumberFormat.java b/icu4j/src/com/ibm/icu/impl/DateNumberFormat.java index 63fc8e7f9cc..f141a114177 100644 --- a/icu4j/src/com/ibm/icu/impl/DateNumberFormat.java +++ b/icu4j/src/com/ibm/icu/impl/DateNumberFormat.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /* ******************************************************************************* -* Copyright (C) 2007-2008, International Business Machines +* Copyright (C) 2007-2009, International Business Machines * Corporation and others. All Rights Reserved. ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/impl/ICUResourceBundleImpl.java b/icu4j/src/com/ibm/icu/impl/ICUResourceBundleImpl.java index 52c48fb0eb6..6da155240e7 100644 --- a/icu4j/src/com/ibm/icu/impl/ICUResourceBundleImpl.java +++ b/icu4j/src/com/ibm/icu/impl/ICUResourceBundleImpl.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /* ******************************************************************************* - * Copyright (C) 2004-2008, International Business Machines Corporation and * + * Copyright (C) 2004-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/impl/JavaTimeZone.java b/icu4j/src/com/ibm/icu/impl/JavaTimeZone.java index 1b21ce1bcc5..00a1a6522ee 100644 --- a/icu4j/src/com/ibm/icu/impl/JavaTimeZone.java +++ b/icu4j/src/com/ibm/icu/impl/JavaTimeZone.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /* ******************************************************************************* - * Copyright (C) 2008, International Business Machines Corporation and * + * Copyright (C) 2008-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/impl/PatternTokenizer.java b/icu4j/src/com/ibm/icu/impl/PatternTokenizer.java index 5361898a97d..21c955c719c 100644 --- a/icu4j/src/com/ibm/icu/impl/PatternTokenizer.java +++ b/icu4j/src/com/ibm/icu/impl/PatternTokenizer.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /* ******************************************************************************* - * Copyright (C) 2006-2008, Google, International Business Machines Corporation * + * Copyright (C) 2006-2009, Google, International Business Machines Corporation * * and others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/impl/Utility.java b/icu4j/src/com/ibm/icu/impl/Utility.java index 37cdb16c76c..4da882c8830 100644 --- a/icu4j/src/com/ibm/icu/impl/Utility.java +++ b/icu4j/src/com/ibm/icu/impl/Utility.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /* ******************************************************************************* - * Copyright (C) 1996-2008, International Business Machines Corporation and * + * Copyright (C) 1996-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/impl/duration/BasicDurationFormat.java b/icu4j/src/com/ibm/icu/impl/duration/BasicDurationFormat.java index ec2a229df73..f734574fe77 100644 --- a/icu4j/src/com/ibm/icu/impl/duration/BasicDurationFormat.java +++ b/icu4j/src/com/ibm/icu/impl/duration/BasicDurationFormat.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /* ******************************************************************************* - * Copyright (C) 2007-2008, International Business Machines Corporation and * + * Copyright (C) 2007-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/lang/UCharacter.java b/icu4j/src/com/ibm/icu/lang/UCharacter.java index 5d7d893ef72..357709fc8ca 100644 --- a/icu4j/src/com/ibm/icu/lang/UCharacter.java +++ b/icu4j/src/com/ibm/icu/lang/UCharacter.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /** ******************************************************************************* -* Copyright (C) 1996-2008, International Business Machines Corporation and * +* Copyright (C) 1996-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/math/BigDecimal.java b/icu4j/src/com/ibm/icu/math/BigDecimal.java index 87142e10d0e..d6d75627c22 100644 --- a/icu4j/src/com/ibm/icu/math/BigDecimal.java +++ b/icu4j/src/com/ibm/icu/math/BigDecimal.java @@ -1,4 +1,4 @@ -//##header J2SE15 +//##header /* Generated from 'BigDecimal.nrx' 8 Sep 2000 11:10:50 [v2.00] */ /* Options: Binary Comments Crossref Format Java Logo Strictargs Strictcase Trace2 Verbose3 */ package com.ibm.icu.math; @@ -9,7 +9,7 @@ import com.ibm.icu.lang.UCharacter; /* ------------------------------------------------------------------ */ /* BigDecimal -- Decimal arithmetic for Java */ /* ------------------------------------------------------------------ */ -/* Copyright IBM Corporation, 1996-2008. All Rights Reserved. */ +/* Copyright IBM Corporation, 1996-2009. All Rights Reserved. */ /* */ /* The BigDecimal class provides immutable arbitrary-precision */ /* floating point (including integer) decimal numbers. */ diff --git a/icu4j/src/com/ibm/icu/text/Bidi.java b/icu4j/src/com/ibm/icu/text/Bidi.java index eabf2fa4760..8b26ae28206 100644 --- a/icu4j/src/com/ibm/icu/text/Bidi.java +++ b/icu4j/src/com/ibm/icu/text/Bidi.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /* ******************************************************************************* -* Copyright (C) 2001-2008, International Business Machines +* Copyright (C) 2001-2009, International Business Machines * Corporation and others. All Rights Reserved. ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/text/ChineseDateFormat.java b/icu4j/src/com/ibm/icu/text/ChineseDateFormat.java index 206d5ac5d65..7b8c000f058 100644 --- a/icu4j/src/com/ibm/icu/text/ChineseDateFormat.java +++ b/icu4j/src/com/ibm/icu/text/ChineseDateFormat.java @@ -1,6 +1,6 @@ -//##header J2SE15 +//##header /********************************************************************* - * Copyright (C) 2000-2008, International Business Machines Corporation and + * Copyright (C) 2000-2009, International Business Machines Corporation and * others. All Rights Reserved. ********************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/text/DateFormat.java b/icu4j/src/com/ibm/icu/text/DateFormat.java index 4276131c194..1063b91b7b6 100644 --- a/icu4j/src/com/ibm/icu/text/DateFormat.java +++ b/icu4j/src/com/ibm/icu/text/DateFormat.java @@ -1,6 +1,6 @@ -//##header J2SE15 +//##header /* -* Copyright (C) 1996-2008, International Business Machines +* Copyright (C) 1996-2009, International Business Machines * Corporation and others. All Rights Reserved. */ diff --git a/icu4j/src/com/ibm/icu/text/DateTimePatternGenerator.java b/icu4j/src/com/ibm/icu/text/DateTimePatternGenerator.java index ad76149fc2d..62817795471 100644 --- a/icu4j/src/com/ibm/icu/text/DateTimePatternGenerator.java +++ b/icu4j/src/com/ibm/icu/text/DateTimePatternGenerator.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /* ******************************************************************************** - * Copyright (C) 2006-2008, Google, International Business Machines Corporation * + * Copyright (C) 2006-2009, Google, International Business Machines Corporation * * and others. All Rights Reserved. * ******************************************************************************** */ diff --git a/icu4j/src/com/ibm/icu/text/DecimalFormat.java b/icu4j/src/com/ibm/icu/text/DecimalFormat.java index cacdde9c269..6dd97130336 100644 --- a/icu4j/src/com/ibm/icu/text/DecimalFormat.java +++ b/icu4j/src/com/ibm/icu/text/DecimalFormat.java @@ -1,4 +1,4 @@ -//##header J2SE15 +//##header /* ******************************************************************************* * Copyright (C) 1996-2009, International Business Machines Corporation and * diff --git a/icu4j/src/com/ibm/icu/text/DigitList.java b/icu4j/src/com/ibm/icu/text/DigitList.java index e5b240a823b..50c5a7bd183 100644 --- a/icu4j/src/com/ibm/icu/text/DigitList.java +++ b/icu4j/src/com/ibm/icu/text/DigitList.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /* ******************************************************************************* - * Copyright (C) 1996-2008, International Business Machines Corporation and * + * Copyright (C) 1996-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/text/IndexCharacters.java b/icu4j/src/com/ibm/icu/text/IndexCharacters.java index db5cdaeb8ad..d68139f5fa0 100644 --- a/icu4j/src/com/ibm/icu/text/IndexCharacters.java +++ b/icu4j/src/com/ibm/icu/text/IndexCharacters.java @@ -1,9 +1,9 @@ -//##header J2SE15 +//##header //#if defined(FOUNDATION10) || defined(J2SE13) //#else /* ******************************************************************************* - * Copyright (C) 2008, Google Inc, International Business Machines Corporation + * Copyright (C) 2008-2009, Google Inc, International Business Machines Corporation * and others. All Rights Reserved. ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/text/MessageFormat.java b/icu4j/src/com/ibm/icu/text/MessageFormat.java index 70fd74cb2f6..49109de5f31 100644 --- a/icu4j/src/com/ibm/icu/text/MessageFormat.java +++ b/icu4j/src/com/ibm/icu/text/MessageFormat.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /* ********************************************************************** -* Copyright (c) 2004-2008, International Business Machines +* Copyright (c) 2004-2009, International Business Machines * Corporation and others. All Rights Reserved. ********************************************************************** * Author: Alan Liu diff --git a/icu4j/src/com/ibm/icu/text/NumberFormat.java b/icu4j/src/com/ibm/icu/text/NumberFormat.java index f00cf3d4da8..b15a4451e79 100644 --- a/icu4j/src/com/ibm/icu/text/NumberFormat.java +++ b/icu4j/src/com/ibm/icu/text/NumberFormat.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /* ******************************************************************************* - * Copyright (C) 1996-2008, International Business Machines Corporation and * + * Copyright (C) 1996-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/text/RuleBasedCollator.java b/icu4j/src/com/ibm/icu/text/RuleBasedCollator.java index b076fc9724d..427e1355b96 100644 --- a/icu4j/src/com/ibm/icu/text/RuleBasedCollator.java +++ b/icu4j/src/com/ibm/icu/text/RuleBasedCollator.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /** ******************************************************************************* -* Copyright (C) 1996-2008, International Business Machines Corporation and * +* Copyright (C) 1996-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/text/RuleBasedNumberFormat.java b/icu4j/src/com/ibm/icu/text/RuleBasedNumberFormat.java index ebbfca4fe20..67fa4b46e6f 100644 --- a/icu4j/src/com/ibm/icu/text/RuleBasedNumberFormat.java +++ b/icu4j/src/com/ibm/icu/text/RuleBasedNumberFormat.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /* ******************************************************************************* - * Copyright (C) 1996-2008, International Business Machines Corporation and * + * Copyright (C) 1996-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/text/SimpleDateFormat.java b/icu4j/src/com/ibm/icu/text/SimpleDateFormat.java index 37f2b9a7f33..fe702202fa2 100644 --- a/icu4j/src/com/ibm/icu/text/SimpleDateFormat.java +++ b/icu4j/src/com/ibm/icu/text/SimpleDateFormat.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /* ******************************************************************************* - * Copyright (C) 1996-2008, International Business Machines Corporation and * + * Copyright (C) 1996-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/text/UTF16.java b/icu4j/src/com/ibm/icu/text/UTF16.java index b1fd699b849..3f2c2b04edf 100644 --- a/icu4j/src/com/ibm/icu/text/UTF16.java +++ b/icu4j/src/com/ibm/icu/text/UTF16.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /** ******************************************************************************* - * Copyright (C) 1996-2007, International Business Machines Corporation and * + * Copyright (C) 1996-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/text/UnicodeSet.java b/icu4j/src/com/ibm/icu/text/UnicodeSet.java index 1641d08704e..67fcf999624 100644 --- a/icu4j/src/com/ibm/icu/text/UnicodeSet.java +++ b/icu4j/src/com/ibm/icu/text/UnicodeSet.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /* ******************************************************************************* - * Copyright (C) 1996-2008, International Business Machines Corporation and * + * Copyright (C) 1996-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/util/ByteArrayWrapper.java b/icu4j/src/com/ibm/icu/util/ByteArrayWrapper.java index 9dbd039f701..88b863ea523 100644 --- a/icu4j/src/com/ibm/icu/util/ByteArrayWrapper.java +++ b/icu4j/src/com/ibm/icu/util/ByteArrayWrapper.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /** ******************************************************************************* - * Copyright (C) 1996-2008, International Business Machines Corporation and * + * Copyright (C) 1996-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ diff --git a/icu4j/src/com/ibm/icu/util/UResourceBundle.java b/icu4j/src/com/ibm/icu/util/UResourceBundle.java index 243b047e3b5..a9e00b90372 100644 --- a/icu4j/src/com/ibm/icu/util/UResourceBundle.java +++ b/icu4j/src/com/ibm/icu/util/UResourceBundle.java @@ -1,7 +1,7 @@ -//##header J2SE15 +//##header /* ******************************************************************************* - * Copyright (C) 2004-2008, International Business Machines Corporation and * + * Copyright (C) 2004-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */