ICU-12945 Removed redundant IBM copyright embedded in API comments. Also updated...

X-SVN-Rev: 39696

diff --git a/icu4j/build.xml b/icu4j/build.xml
index 8a9460a41a107184806f9b9484d64fba90340772..dcf0caabb2ded3c9290d276df58eaa83e46c449f 100644 (file)
--- a/icu4j/build.xml
+++ b/icu4j/build.xml
@@ -57,6 +57,7 @@
     <property name="icu4j.api.doc.window.title" value="ICU4J ${api.doc.version}"/>
     <property name="icu4j.api.doc.header" value="ICU4J ${api.doc.version}"/>
     <property name="icu4j.api.doc.jdk.link" value="http://docs.oracle.com/javase/8/docs/api/"/>
+    <property name="icu4j.api.doc.copyright.footer" value="&lt;font size=-1&gt;Copyright &#x00A9; ${current.year} Unicode, Inc. and others.&lt;/font&gt;"/>
 
     <!-- directories -->
     <property name="release.dir" value="release"/>
@@ -956,7 +957,7 @@
                 encoding="${java.src.encoding}"
                 docencoding="UTF-8"
                 charset="UTF-8"
-                bottom="&lt;font size=-1&gt;Copyright (c) ${current.year} IBM Corporation and others.&lt;/font&gt;"
+                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="&lt;font size=-1&gt;Copyright (c) ${current.year} IBM Corporation and others.&lt;/font&gt;"
+                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 29226800ead2a37855bb69a0f23966a909ad5621..1f580278dc0f7f439101cee027ae187e2b4d075f 100644 (file)
--- 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;
  *   </li>
  * </ul>
  * If this is not the behavior, the subclass should document any differences.
- * 
- * <p>Copyright &copy; 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 {
      * <pre> char[] text = new char[limit - start];
      * getChars(start, limit, text, 0);
      * replace(dest, dest, text, 0, limit - start);</pre>
-     * 
+     *
      * @param start the beginning index, inclusive; <code>0 &lt;= start &lt;=
      * limit</code>.
      * @param limit the ending index, exclusive; <code>start &lt;= limit &lt;=
@@ -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 cd387a749f9d9d3e550ae9c5f133a494a5f0af3f..61cf47e8a6d56b229c21afb439de501b746395bc 100644 (file)
--- 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.
  *
- * <p>Copyright &copy; 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.
      * <code>Replaceable</code> API.
      * @stable ICU 2.0
-     */ 
+     */
+    @Override
     public int length() {
         return buf.length();
     }
@@ -88,6 +88,7 @@ public class ReplaceableString implements Replaceable {
      * <code>length()</code> - 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 {
      * <code>limit - 1</code>
      * @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 <code>chars</code>.
      * @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; <code>0 &lt;= start &lt;=
      * limit</code>.
      * @param limit the ending index, exclusive; <code>start &lt;= limit &lt;=
@@ -180,6 +185,7 @@ public class ReplaceableString implements Replaceable {
      * dest &gt;= limit</code>.
      * @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 0c42ff82cd5a575f2c2b8394446da1d824fabdcf..97a51fdd2f2b458d4c679c78705904bb9f4a6c59 100644 (file)
--- 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 <em>masks</em> the second rule.
  *
- * <p>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 7e324c9c1ce0a4a1ddb4cfce0360ab309840db67..da25f9b9e118e1c7a60f623bc1ed24fa1227d8b0 100644 (file)
--- 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;
  * <code>transliterate()</code> method taking a <code>String</code> and <code>StringBuffer</code> if the performance of
  * these methods can be improved over the performance obtained by the default implementations in this class.
  *
- * <p>
- * Copyright &copy; 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 ce857455633bd497134efedf7d1ae3858ee6167a..c33f98a94b3776c1bf0e5d22c6067a832d61e8cc 100644 (file)
--- 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