diff options
| author | Till Brychcy | 2017-03-19 18:56:38 +0000 |
|---|---|---|
| committer | Stefan Xenos | 2017-03-24 00:49:34 +0000 |
| commit | f06f1295ac189b0e2cfbdb95c154467d2b2214c1 (patch) | |
| tree | 718073787e8a193be053d853d01b092e7a0ebf0b | |
| parent | 823c9ddd71537118b17b028f2c504b1e97c6e35c (diff) | |
| download | eclipse.jdt.core-f06f1295ac189b0e2cfbdb95c154467d2b2214c1.tar.gz eclipse.jdt.core-f06f1295ac189b0e2cfbdb95c154467d2b2214c1.tar.xz eclipse.jdt.core-f06f1295ac189b0e2cfbdb95c154467d2b2214c1.zip | |
Bug 513875 - [newindex][null][1.8] Bogus Warning about Contradictory
null annotations only in the editor
Change-Id: I524c962173ba71c3b7470e66315f1051b6e73f2f
2 files changed, 3 insertions, 2 deletions
diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/nd/indexer/IndexerTest.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/nd/indexer/IndexerTest.java index 4940d07cba..a5a181da94 100644 --- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/nd/indexer/IndexerTest.java +++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/nd/indexer/IndexerTest.java @@ -158,6 +158,7 @@ public class IndexerTest extends AbstractJavaModelTests { "p/Outer.java", "import java.lang.annotation.*;\n" + "\n" + + "@Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE_USE) @interface A0 {}\n" + "@Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE_USE) @interface A {}\n" + "@Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) @interface M {}\n" + "@Retention(RetentionPolicy.RUNTIME) @Target(ElementType.PARAMETER) @interface P {}\n" + @@ -175,7 +176,7 @@ public class IndexerTest extends AbstractJavaModelTests { " Middle1.@A Inner e1;\n" + " Middle2.@A Inner e2;\n" + " Middle2.Middle3.@A Inner2 e3;\n" + - " @M void foo(@P Middle2.Middle3.@A Inner2 e3) {};\n" + + " @M void foo(@A0 Object p0, @P Middle2.Middle3.@A Inner2 e3) {};\n" + " class Middle4 extends @A Middle1 {}\n" + "}\n", }, "1.8"); diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/nd/java/model/IndexBinaryType.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/nd/java/model/IndexBinaryType.java index aaa7576a2b..4d5023b4de 100644 --- a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/nd/java/model/IndexBinaryType.java +++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/nd/java/model/IndexBinaryType.java @@ -423,7 +423,7 @@ public class IndexBinaryType implements IBinaryType { case AnnotationTargetTypeConstants.METHOD_RECEIVER: break; case AnnotationTargetTypeConstants.METHOD_FORMAL_PARAMETER : - info = next.getTargetInfoArg0(); + info = next.getTarget(); break; case AnnotationTargetTypeConstants.THROWS : info = next.getTarget(); |