diff --git a/.gitattributes b/.gitattributes index d6e56e46faa..aaa448fa3de 100644 --- a/.gitattributes +++ b/.gitattributes @@ -498,10 +498,6 @@ icu4j/samples/src/com/ibm/icu/samples/iuc/data/reshello/es.res -text icu4j/samples/src/com/ibm/icu/samples/iuc/data/reshello/mt.res -text icu4j/samples/src/com/ibm/icu/samples/iuc/data/reshello/res_index.res -text icu4j/samples/src/com/ibm/icu/samples/iuc/data/reshello/root.res -text -icu4j/tools/build/icu4j48.api3.gz -text -icu4j/tools/build/icu4j49.api3.gz -text -icu4j/tools/build/icu4j50.api3.gz -text -icu4j/tools/build/icu4j51.api3.gz -text icu4j/tools/build/icu4j52.api3.gz -text icu4j/tools/build/icu4j53.api3.gz -text icu4j/tools/build/icu4j54.api3.gz -text @@ -511,6 +507,7 @@ icu4j/tools/build/icu4j57.api3.gz -text icu4j/tools/build/icu4j58.api3.gz -text icu4j/tools/build/icu4j59.api3.gz -text icu4j/tools/build/icu4j60.api3.gz -text +icu4j/tools/build/icu4j61.api3.gz -text tools/multi/c/Makefile-c.inc -text tools/multi/c/patch/3_0 -text tools/multi/c/patch/3_2 -text diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/RBBIDataWrapper.java b/icu4j/main/classes/core/src/com/ibm/icu/text/RBBIDataWrapper.java index 6b3a9e9e38c..d881946895a 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/text/RBBIDataWrapper.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/text/RBBIDataWrapper.java @@ -76,6 +76,9 @@ public final class RBBIDataWrapper { @Deprecated public short[] fTable; + RBBIStateTable() { + } + static RBBIStateTable get(ByteBuffer bytes, int length) throws IOException { if (length == 0) { return null; @@ -111,6 +114,12 @@ public final class RBBIDataWrapper { return bytesWritten; } + /** + * {@inheritDoc} + * @internal + * @deprecated This API is ICU internal only. + */ + @Deprecated @Override public boolean equals (Object other) { if (other == this) { diff --git a/icu4j/tools/build/.settings/org.eclipse.jdt.core.prefs b/icu4j/tools/build/.settings/org.eclipse.jdt.core.prefs index 4421badc58a..cb972096a48 100644 --- a/icu4j/tools/build/.settings/org.eclipse.jdt.core.prefs +++ b/icu4j/tools/build/.settings/org.eclipse.jdt.core.prefs @@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -98,7 +98,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.source=1.6 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 diff --git a/icu4j/tools/build/icu4j48.api3.gz b/icu4j/tools/build/icu4j48.api3.gz deleted file mode 100644 index c0fb82b4d3c..00000000000 --- a/icu4j/tools/build/icu4j48.api3.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b4c263a9350500e99226792ed7d9ba76e60d0f43201a1bf59750aa04209a9ad0 -size 44237 diff --git a/icu4j/tools/build/icu4j49.api3.gz b/icu4j/tools/build/icu4j49.api3.gz deleted file mode 100644 index 2913f1807af..00000000000 --- a/icu4j/tools/build/icu4j49.api3.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a26350a7dc6ca1c8f26fe50d500214b416c7372b731b0cec8beaf9bfeb3900c4 -size 46534 diff --git a/icu4j/tools/build/icu4j50.api3.gz b/icu4j/tools/build/icu4j50.api3.gz deleted file mode 100644 index 266708b0edc..00000000000 --- a/icu4j/tools/build/icu4j50.api3.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:24256cbbd5596894932fe489e3715a1c165cd10cd6fc291e4edcdb5dd2cf27e3 -size 46977 diff --git a/icu4j/tools/build/icu4j51.api3.gz b/icu4j/tools/build/icu4j51.api3.gz deleted file mode 100644 index 94eb1f7ab7f..00000000000 --- a/icu4j/tools/build/icu4j51.api3.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:262d338ee506cfafa069a9d0e7ad1867df887195d4f7f43cc97844c0beef105e -size 47785 diff --git a/icu4j/tools/build/icu4j61.api3.gz b/icu4j/tools/build/icu4j61.api3.gz new file mode 100644 index 00000000000..1a0e2a568e5 --- /dev/null +++ b/icu4j/tools/build/icu4j61.api3.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e7f22b2a70f93ff866c5fe72b9fe24cf686332d952081017aae03b559f023ae +size 58505 diff --git a/icu4j/tools/build/src/com/ibm/icu/dev/tool/docs/DeprecatedAPIChecker.java b/icu4j/tools/build/src/com/ibm/icu/dev/tool/docs/DeprecatedAPIChecker.java index c7ae792707d..61abf722360 100644 --- a/icu4j/tools/build/src/com/ibm/icu/dev/tool/docs/DeprecatedAPIChecker.java +++ b/icu4j/tools/build/src/com/ibm/icu/dev/tool/docs/DeprecatedAPIChecker.java @@ -364,16 +364,18 @@ public class DeprecatedAPIChecker { // erase generic args if (paramsSegment.indexOf('<') >= 0) { StringBuilder buf = new StringBuilder(); - boolean inGenericsParams = false; + int genericsNestLevel = 0; for (int i = 0; i < paramsSegment.length(); i++) { char c = paramsSegment.charAt(i); - if (inGenericsParams) { - if (c == '>') { - inGenericsParams = false; + if (genericsNestLevel > 0) { + if (c == '<') { + genericsNestLevel++; + } else if (c == '>') { + genericsNestLevel--; } } else { if (c == '<') { - inGenericsParams = true; + genericsNestLevel++; } else { buf.append(c); }