Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Arthanareeswaran2017-05-22 06:00:43 -0400
committerJay Arthanareeswaran2017-05-22 06:59:09 -0400
commitcf1a35ef6ef9f64528efd8acdfaee1132412e665 (patch)
tree8081713c8fe49438be420bbc7187234f1d5a684c /org.eclipse.jdt.apt.tests
parent7642a2d4343932d4cf7e487984926d928e114617 (diff)
parent34337e2078da6ee9eff6d9ed3144e9836eec04f2 (diff)
downloadeclipse.jdt.core-cf1a35ef6ef9f64528efd8acdfaee1132412e665.tar.gz
eclipse.jdt.core-cf1a35ef6ef9f64528efd8acdfaee1132412e665.tar.xz
eclipse.jdt.core-cf1a35ef6ef9f64528efd8acdfaee1132412e665.zip
Merge branch 'master' into BETA_JAVA9Y20170523-0000P20170523-0000
# Conflicts: # org.eclipse.jdt.core.tests.compiler/src/EvalTestsTarget.zip # org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionParser.java # org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/impl/AssistParser.java # org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/DefaultCodeFormatter.java # org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClasspathEntry.java # org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/NamedMember.java Change-Id: Ica9e9ccc4ff370554100c545310fba1c66adeed2
Diffstat (limited to 'org.eclipse.jdt.apt.tests')
-rw-r--r--org.eclipse.jdt.apt.tests/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.jdt.apt.tests/pom.xml2
-rw-r--r--org.eclipse.jdt.apt.tests/src-annotations/org/eclipse/jdt/apt/tests/annotations/apitest/APIAnnotationProcessorFactory.java4
-rw-r--r--org.eclipse.jdt.apt.tests/src/org/eclipse/jdt/apt/tests/FactoryPathTests.java2
4 files changed, 5 insertions, 5 deletions
diff --git a/org.eclipse.jdt.apt.tests/META-INF/MANIFEST.MF b/org.eclipse.jdt.apt.tests/META-INF/MANIFEST.MF
index b73d6eb98c..ca8c494f5f 100644
--- a/org.eclipse.jdt.apt.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.apt.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.apt.tests; singleton:=true
-Bundle-Version: 3.4.0.qualifier
+Bundle-Version: 3.4.100.qualifier
Bundle-ClassPath: apt.jar,
aptext.jar,
.
diff --git a/org.eclipse.jdt.apt.tests/pom.xml b/org.eclipse.jdt.apt.tests/pom.xml
index f996a84eb5..7f31d1eb73 100644
--- a/org.eclipse.jdt.apt.tests/pom.xml
+++ b/org.eclipse.jdt.apt.tests/pom.xml
@@ -20,7 +20,7 @@
</parent>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.apt.tests</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.100-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
<testSuite>${project.artifactId}</testSuite>
diff --git a/org.eclipse.jdt.apt.tests/src-annotations/org/eclipse/jdt/apt/tests/annotations/apitest/APIAnnotationProcessorFactory.java b/org.eclipse.jdt.apt.tests/src-annotations/org/eclipse/jdt/apt/tests/annotations/apitest/APIAnnotationProcessorFactory.java
index 0ff313140a..53f08a4be1 100644
--- a/org.eclipse.jdt.apt.tests/src-annotations/org/eclipse/jdt/apt/tests/annotations/apitest/APIAnnotationProcessorFactory.java
+++ b/org.eclipse.jdt.apt.tests/src-annotations/org/eclipse/jdt/apt/tests/annotations/apitest/APIAnnotationProcessorFactory.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2007 BEA Systems, Inc.
+ * Copyright (c) 2005, 2017 BEA Systems, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -173,7 +173,7 @@ public class APIAnnotationProcessorFactory extends BaseFactory {
*/
private AnnotationMirror findMirror(Declaration decl, AnnotationTypeDeclaration at) {
for (AnnotationMirror mirror : decl.getAnnotationMirrors()) {
- if (mirror.getAnnotationType().equals(at)) {
+ if (mirror.getAnnotationType().getDeclaration().equals(at)) {
return mirror;
}
}
diff --git a/org.eclipse.jdt.apt.tests/src/org/eclipse/jdt/apt/tests/FactoryPathTests.java b/org.eclipse.jdt.apt.tests/src/org/eclipse/jdt/apt/tests/FactoryPathTests.java
index b92a4feca1..5ce02a803c 100644
--- a/org.eclipse.jdt.apt.tests/src/org/eclipse/jdt/apt/tests/FactoryPathTests.java
+++ b/org.eclipse.jdt.apt.tests/src/org/eclipse/jdt/apt/tests/FactoryPathTests.java
@@ -108,7 +108,7 @@ public class FactoryPathTests extends TestCase {
// Will throw an exception if the newly added jar isn't first
WkspJarFactoryContainer fc = (WkspJarFactoryContainer) path.getAllContainers().keySet().iterator().next();
- assertTrue(fc.getJarFile().toString().endsWith(toAdd.toString()));
+ assertTrue(fc.getJarFile().toString().endsWith(toAdd.toOSString()));
path.removeWkspJar(toAdd);

Back to the top