From a8aee841c936f34085e8f6ddbd17e4bc1e3d6398 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 2 Jul 2012 23:51:24 +0400 Subject: [PATCH] Temporarily added external annotations for ArrayList.clone() method and updated test data. Alternative signature annotations should be parsed for overridden methods, too. --- .../diagnostics/tests/alt-headers/ArrayListClone.jet | 2 +- jdk-annotations/java/util/annotations.xml | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/compiler/testData/diagnostics/tests/alt-headers/ArrayListClone.jet b/compiler/testData/diagnostics/tests/alt-headers/ArrayListClone.jet index e33c2a3c3fb..f6837fa6174 100644 --- a/compiler/testData/diagnostics/tests/alt-headers/ArrayListClone.jet +++ b/compiler/testData/diagnostics/tests/alt-headers/ArrayListClone.jet @@ -4,5 +4,5 @@ import java.util.* fun main(args : Array) { val al : ArrayList = ArrayList() - al.clone() : Object // A type mismatch on this line means that alt-headers were not loaded + al.clone() : Any // A type mismatch on this line means that jdk-annotations were not loaded } diff --git a/jdk-annotations/java/util/annotations.xml b/jdk-annotations/java/util/annotations.xml index cb01630c8a8..c3a7b68a23e 100644 --- a/jdk-annotations/java/util/annotations.xml +++ b/jdk-annotations/java/util/annotations.xml @@ -734,4 +734,11 @@ + + + + + + +