diff --git a/icu4j/build.xml b/icu4j/build.xml index 8a9460a41a1..dcf0caabb2d 100644 --- a/icu4j/build.xml +++ b/icu4j/build.xml @@ -57,6 +57,7 @@ + @@ -956,7 +957,7 @@ encoding="${java.src.encoding}" docencoding="UTF-8" charset="UTF-8" - bottom="<font size=-1>Copyright (c) ${current.year} IBM Corporation and others.</font>" + bottom="${icu4j.api.doc.copyright.footer}" additionalparam="${doclint.option} -breakiterator -use -tagletpath ${icu4j.build-tools.jar}${path.separator}${jcite.libs} -taglet com.ibm.icu.dev.tool.docs.ICUTaglet -taglet ch.arrenbrecht.jcite.JCiteTaglet -J-Djcitesourcepath=${jcite.addl.src} -J-Dfile.encoding=UTF-8" link="${icu4j.api.doc.jdk.link}" source="1.5" @@ -991,7 +992,7 @@ encoding="${java.src.encoding}" docencoding="UTF-8" charset="UTF-8" - bottom="<font size=-1>Copyright (c) ${current.year} IBM Corporation and others.</font>" + bottom="${icu4j.api.doc.copyright.footer}" additionalparam="${doclint.option} -breakiterator -use -tagletpath ${icu4j.build-tools.jar} -taglet com.ibm.icu.dev.tool.docs.ICUTaglet" link="${icu4j.api.doc.jdk.link}" source="1.5" diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/Replaceable.java b/icu4j/main/classes/core/src/com/ibm/icu/text/Replaceable.java index 29226800ead..1f580278dc0 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/text/Replaceable.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/text/Replaceable.java @@ -48,8 +48,6 @@ package com.ibm.icu.text; * * * If this is not the behavior, the subclass should document any differences. - * - *

Copyright © IBM Corporation 1999. All rights reserved. * * @author Alan Liu * @stable ICU 2.0 @@ -59,7 +57,7 @@ public interface Replaceable { * Returns the number of 16-bit code units in the text. * @return number of 16-bit code units in text * @stable ICU 2.0 - */ + */ int length(); /** @@ -163,7 +161,7 @@ public interface Replaceable { *

 char[] text = new char[limit - start];
      * getChars(start, limit, text, 0);
      * replace(dest, dest, text, 0, limit - start);
- * + * * @param start the beginning index, inclusive; 0 <= start <= * limit. * @param limit the ending index, exclusive; start <= limit <= @@ -175,7 +173,7 @@ public interface Replaceable { * @stable ICU 2.0 */ void copy(int start, int limit, int dest); - + /**R * Returns true if this object contains metadata. If a * Replaceable object has metadata, calls to the Replaceable API diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/ReplaceableString.java b/icu4j/main/classes/core/src/com/ibm/icu/text/ReplaceableString.java index cd387a749f9..61cf47e8a6d 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/text/ReplaceableString.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/text/ReplaceableString.java @@ -16,8 +16,6 @@ package com.ibm.icu.text; * intended for general use. Most clients will need to implement * {@link Replaceable} in their text representation class. * - *

Copyright © IBM Corporation 1999. All rights reserved. - * * @see Replaceable * @author Alan Liu * @stable ICU 2.0 @@ -60,6 +58,7 @@ public class ReplaceableString implements Replaceable { * @return string contents of this object * @stable ICU 2.0 */ + @Override public String toString() { return buf.toString(); } @@ -76,7 +75,8 @@ public class ReplaceableString implements Replaceable { * Return the number of characters contained in this object. * Replaceable API. * @stable ICU 2.0 - */ + */ + @Override public int length() { return buf.length(); } @@ -88,6 +88,7 @@ public class ReplaceableString implements Replaceable { * length() - 1 * @stable ICU 2.0 */ + @Override public char charAt(int offset) { return buf.charAt(offset); } @@ -103,6 +104,7 @@ public class ReplaceableString implements Replaceable { * @return 32-bit code point of text at given offset * @stable ICU 2.0 */ + @Override public int char32At(int offset) { return UTF16.charAt(buf, offset); } @@ -125,6 +127,7 @@ public class ReplaceableString implements Replaceable { * @param dstStart the start offset in the destination array. * @stable ICU 2.0 */ + @Override public void getChars(int srcStart, int srcLimit, char dst[], int dstStart) { if (srcStart != srcLimit) { buf.getChars(srcStart, srcLimit, dst, dstStart); @@ -142,6 +145,7 @@ public class ReplaceableString implements Replaceable { * limit - 1 * @stable ICU 2.0 */ + @Override public void replace(int start, int limit, String text) { buf.replace(start, limit, text); } @@ -159,6 +163,7 @@ public class ReplaceableString implements Replaceable { * @param charsLen the number of characters of chars. * @stable ICU 2.0 */ + @Override public void replace(int start, int limit, char[] chars, int charsStart, int charsLen) { buf.delete(start, limit); @@ -169,7 +174,7 @@ public class ReplaceableString implements Replaceable { * Copy a substring of this object, retaining attribute (out-of-band) * information. This method is used to duplicate or reorder substrings. * The destination index must not overlap the source range. - * + * * @param start the beginning index, inclusive; 0 <= start <= * limit. * @param limit the ending index, exclusive; start <= limit <= @@ -180,6 +185,7 @@ public class ReplaceableString implements Replaceable { * dest >= limit. * @stable ICU 2.0 */ + @Override public void copy(int start, int limit, int dest) { if (start == limit && start >= 0 && start <= buf.length()) { return; @@ -188,11 +194,12 @@ public class ReplaceableString implements Replaceable { getChars(start, limit, text, 0); replace(dest, dest, text, 0, limit - start); } - + /** * Implements Replaceable * @stable ICU 2.0 */ + @Override public boolean hasMetaData() { return false; } diff --git a/icu4j/main/classes/translit/src/com/ibm/icu/text/RuleBasedTransliterator.java b/icu4j/main/classes/translit/src/com/ibm/icu/text/RuleBasedTransliterator.java index 0c42ff82cd5..97a51fdd2f2 100644 --- a/icu4j/main/classes/translit/src/com/ibm/icu/text/RuleBasedTransliterator.java +++ b/icu4j/main/classes/translit/src/com/ibm/icu/text/RuleBasedTransliterator.java @@ -267,8 +267,6 @@ import java.util.Map; * always matches anything it matches. In other words, the first * rule masks the second rule. * - *

Copyright (c) IBM Corporation 1999-2000. All rights reserved. - * * @author Alan Liu * @internal * @deprecated This API is ICU internal only. diff --git a/icu4j/main/classes/translit/src/com/ibm/icu/text/Transliterator.java b/icu4j/main/classes/translit/src/com/ibm/icu/text/Transliterator.java index 7e324c9c1ce..da25f9b9e11 100644 --- a/icu4j/main/classes/translit/src/com/ibm/icu/text/Transliterator.java +++ b/icu4j/main/classes/translit/src/com/ibm/icu/text/Transliterator.java @@ -221,9 +221,6 @@ import com.ibm.icu.util.UResourceBundle; * transliterate() method taking a String and StringBuffer if the performance of * these methods can be improved over the performance obtained by the default implementations in this class. * - *

- * Copyright © IBM Corporation 1999. All rights reserved. - * * @author Alan Liu * @stable ICU 2.0 */ diff --git a/icu4j/main/shared/build/common.properties b/icu4j/main/shared/build/common.properties index ce857455633..c33f98a94b3 100644 --- a/icu4j/main/shared/build/common.properties +++ b/icu4j/main/shared/build/common.properties @@ -9,7 +9,7 @@ icu4j.spec.version = 59 icu4j.impl.version = 59.0.1 icu4j.data.version = 59 -current.year = 2016 +current.year = 2017 default.exec.env = JavaSE-1.6 corp = IBM Corporation