Skip to content

Commit d38875c

Browse files
eric-milleseric-milles
committed
Eclipse 4.9 (P20180926) JDT Patch for Groovy-Eclipse: JDT commit 926d18c
#686
1 parent 57164be commit d38875c

File tree

361 files changed

+6051
-1816
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

361 files changed

+6051
-1816
lines changed

‎base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/GroovyCompilerTestSuite.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@
6464
@RunWith(Parameterized.class)
6565
public abstract class GroovyCompilerTestSuite {
6666

67-
protected static final long JDK6 = ClassFileConstants.JDK1_6;
6867
protected static final long JDK7 = ClassFileConstants.JDK1_7;
6968
protected static final long JDK8 = ClassFileConstants.JDK1_8;
7069
protected static final long JDK9 = ClassFileConstants.JDK9 ;
7170
protected static final long JDK10 = ClassFileConstants.JDK10 ;
72-
protected static final List<Long> JDKs = Collections.unmodifiableList(Arrays.asList(JDK6, JDK7, JDK8, JDK9, JDK10));
71+
protected static final long JDK11 = ClassFileConstants.JDK11 ;
72+
protected static final List<Long> JDKs = Collections.unmodifiableList(Arrays.asList(JDK7, JDK8, JDK9, JDK10, JDK11));
7373

7474
@Parameters(name = "Java {1}")
7575
public static Iterable<Object[]> params() {

‎base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/TraitsTests.java

-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package org.eclipse.jdt.groovy.core.tests.basic;
1717

1818
import static org.junit.Assert.assertTrue;
19-
import static org.junit.Assume.assumeTrue;
2019

2120
import org.codehaus.groovy.ast.ClassNode;
2221
import org.codehaus.groovy.control.CompilationUnit;
@@ -28,8 +27,6 @@ public final class TraitsTests extends GroovyCompilerTestSuite {
2827

2928
@Before
3029
public void setUp() {
31-
assumeTrue(isAtLeastJava(JDK6));
32-
3330
if (Float.parseFloat(System.getProperty("java.specification.version")) > 8) {
3431
vmArguments = new String[] {"--add-modules=java.xml.bind"};
3532
}

‎base/org.eclipse.jdt.groovy.core/src/org/eclipse/jdt/groovy/core/util/JavaConstants.java

+8-1
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,12 @@
2020
public abstract class JavaConstants {
2121

2222
/** Highest supported Java Language Specification (JLS) level. */
23-
public static final int AST_LEVEL = AST.JLS10;
23+
public static int AST_LEVEL = AST.JLS10;
24+
static {
25+
try {
26+
AST.class.getDeclaredField("JLS11");
27+
AST_LEVEL = 11;
28+
} catch (NoSuchFieldException ignore) {
29+
}
30+
}
2431
}

‎jdt-patch/e49/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/AbstractMethodTests.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
/*******************************************************************************
22
* Copyright (c) 2000, 2015 IBM Corporation and others.
3-
* All rights reserved. This program and the accompanying materials
4-
* are made available under the terms of the Eclipse Public License v1.0
3+
*
4+
* This program and the accompanying materials
5+
* are made available under the terms of the Eclipse Public License 2.0
56
* which accompanies this distribution, and is available at
6-
* http://www.eclipse.org/legal/epl-v10.html
7+
* https://www.eclipse.org/legal/epl-2.0/
8+
*
9+
* SPDX-License-Identifier: EPL-2.0
710
*
811
* Contributors:
912
* IBM Corporation - initial API and implementation

‎jdt-patch/e49/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/AnnotationDependencyTests.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
/*******************************************************************************
22
* Copyright (c) 2009, 2014 Walter Harley and others.
3-
* All rights reserved. This program and the accompanying materials
4-
* are made available under the terms of the Eclipse Public License v1.0
3+
*
4+
* This program and the accompanying materials
5+
* are made available under the terms of the Eclipse Public License 2.0
56
* which accompanies this distribution, and is available at
6-
* http://www.eclipse.org/legal/epl-v10.html
7+
* https://www.eclipse.org/legal/epl-2.0/
8+
*
9+
* SPDX-License-Identifier: EPL-2.0
710
*
811
* Contributors:
912
* Walter Harley ([email protected]) - initial implementation

‎jdt-patch/e49/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/BasicBuildTests.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
/*******************************************************************************
22
* Copyright (c) 2000, 2016 IBM Corporation and others.
3-
* All rights reserved. This program and the accompanying materials
4-
* are made available under the terms of the Eclipse Public License v1.0
3+
*
4+
* This program and the accompanying materials
5+
* are made available under the terms of the Eclipse Public License 2.0
56
* which accompanies this distribution, and is available at
6-
* http://www.eclipse.org/legal/epl-v10.html
7+
* https://www.eclipse.org/legal/epl-2.0/
8+
*
9+
* SPDX-License-Identifier: EPL-2.0
710
*
811
* Contributors:
912
* IBM Corporation - initial API and implementation

‎jdt-patch/e49/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/Bug530366Test.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
/*******************************************************************************
22
* Copyright (c) 2018 Simeon Andreev and others.
3-
* All rights reserved. This program and the accompanying materials
4-
* are made available under the terms of the Eclipse Public License v1.0
3+
*
4+
* This program and the accompanying materials
5+
* are made available under the terms of the Eclipse Public License 2.0
56
* which accompanies this distribution, and is available at
6-
* http://www.eclipse.org/legal/epl-v10.html
7+
* https://www.eclipse.org/legal/epl-2.0/
8+
*
9+
* SPDX-License-Identifier: EPL-2.0
710
*
811
* Contributors:
912
* Simeon Andreev - initial API and implementation

‎jdt-patch/e49/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/Bug531382Test.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
/*******************************************************************************
22
* Copyright (c) 2018 Simeon Andreev and others.
3-
* All rights reserved. This program and the accompanying materials
4-
* are made available under the terms of the Eclipse Public License v1.0
3+
*
4+
* This program and the accompanying materials
5+
* are made available under the terms of the Eclipse Public License 2.0
56
* which accompanies this distribution, and is available at
6-
* http://www.eclipse.org/legal/epl-v10.html
7+
* https://www.eclipse.org/legal/epl-2.0/
8+
*
9+
* SPDX-License-Identifier: EPL-2.0
710
*
811
* Contributors:
912
* Simeon Andreev - initial API and implementation

‎jdt-patch/e49/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/BuilderTests.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
/*******************************************************************************
22
* Copyright (c) 2000, 2015 IBM Corporation and others.
3-
* All rights reserved. This program and the accompanying materials
4-
* are made available under the terms of the Eclipse Public License v1.0
3+
*
4+
* This program and the accompanying materials
5+
* are made available under the terms of the Eclipse Public License 2.0
56
* which accompanies this distribution, and is available at
6-
* http://www.eclipse.org/legal/epl-v10.html
7+
* https://www.eclipse.org/legal/epl-2.0/
8+
*
9+
* SPDX-License-Identifier: EPL-2.0
710
*
811
* Contributors:
912
* IBM Corporation - initial API and implementation

‎jdt-patch/e49/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/BuildpathTests.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
/*******************************************************************************
22
* Copyright (c) 2000, 2016 IBM Corporation and others.
3-
* All rights reserved. This program and the accompanying materials
4-
* are made available under the terms of the Eclipse Public License v1.0
3+
*
4+
* This program and the accompanying materials
5+
* are made available under the terms of the Eclipse Public License 2.0
56
* which accompanies this distribution, and is available at
6-
* http://www.eclipse.org/legal/epl-v10.html
7+
* https://www.eclipse.org/legal/epl-2.0/
8+
*
9+
* SPDX-License-Identifier: EPL-2.0
710
*
811
* Contributors:
912
* IBM Corporation - initial API and implementation

‎jdt-patch/e49/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/CopyResourceTests.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
/*******************************************************************************
22
* Copyright (c) 2000, 2015 IBM Corporation and others.
3-
* All rights reserved. This program and the accompanying materials
4-
* are made available under the terms of the Eclipse Public License v1.0
3+
*
4+
* This program and the accompanying materials
5+
* are made available under the terms of the Eclipse Public License 2.0
56
* which accompanies this distribution, and is available at
6-
* http://www.eclipse.org/legal/epl-v10.html
7+
* https://www.eclipse.org/legal/epl-2.0/
8+
*
9+
* SPDX-License-Identifier: EPL-2.0
710
*
811
* Contributors:
912
* IBM Corporation - initial API and implementation

‎jdt-patch/e49/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/DependencyTests.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
/*******************************************************************************
22
* Copyright (c) 2000, 2015 IBM Corporation and others.
3-
* All rights reserved. This program and the accompanying materials
4-
* are made available under the terms of the Eclipse Public License v1.0
3+
*
4+
* This program and the accompanying materials
5+
* are made available under the terms of the Eclipse Public License 2.0
56
* which accompanies this distribution, and is available at
6-
* http://www.eclipse.org/legal/epl-v10.html
7+
* https://www.eclipse.org/legal/epl-2.0/
8+
*
9+
* SPDX-License-Identifier: EPL-2.0
710
*
811
* Contributors:
912
* IBM Corporation - initial API and implementation

‎jdt-patch/e49/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/EfficiencyCompilerRequestor.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
/*******************************************************************************
22
* Copyright (c) 2000, 2018 IBM Corporation and others.
3-
* All rights reserved. This program and the accompanying materials
4-
* are made available under the terms of the Eclipse Public License v1.0
3+
*
4+
* This program and the accompanying materials
5+
* are made available under the terms of the Eclipse Public License 2.0
56
* which accompanies this distribution, and is available at
6-
* http://www.eclipse.org/legal/epl-v10.html
7+
* https://www.eclipse.org/legal/epl-2.0/
8+
*
9+
* SPDX-License-Identifier: EPL-2.0
710
*
811
* Contributors:
912
* IBM Corporation - initial API and implementation

‎jdt-patch/e49/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/EfficiencyTests.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
/*******************************************************************************
22
* Copyright (c) 2000, 2009 IBM Corporation and others.
3-
* All rights reserved. This program and the accompanying materials
4-
* are made available under the terms of the Eclipse Public License v1.0
3+
*
4+
* This program and the accompanying materials
5+
* are made available under the terms of the Eclipse Public License 2.0
56
* which accompanies this distribution, and is available at
6-
* http://www.eclipse.org/legal/epl-v10.html
7+
* https://www.eclipse.org/legal/epl-2.0/
8+
*
9+
* SPDX-License-Identifier: EPL-2.0
710
*
811
* Contributors:
912
* IBM Corporation - initial API and implementation

‎jdt-patch/e49/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/ErrorsTests.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
/*******************************************************************************
22
* Copyright (c) 2000, 2015 IBM Corporation and others.
3-
* All rights reserved. This program and the accompanying materials
4-
* are made available under the terms of the Eclipse Public License v1.0
3+
*
4+
* This program and the accompanying materials
5+
* are made available under the terms of the Eclipse Public License 2.0
56
* which accompanies this distribution, and is available at
6-
* http://www.eclipse.org/legal/epl-v10.html
7+
* https://www.eclipse.org/legal/epl-2.0/
8+
*
9+
* SPDX-License-Identifier: EPL-2.0
710
*
811
* Contributors:
912
* IBM Corporation - initial API and implementation

‎jdt-patch/e49/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/ExecutionTests.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
/*******************************************************************************
22
* Copyright (c) 2000, 2009 IBM Corporation and others.
3-
* All rights reserved. This program and the accompanying materials
4-
* are made available under the terms of the Eclipse Public License v1.0
3+
*
4+
* This program and the accompanying materials
5+
* are made available under the terms of the Eclipse Public License 2.0
56
* which accompanies this distribution, and is available at
6-
* http://www.eclipse.org/legal/epl-v10.html
7+
* https://www.eclipse.org/legal/epl-2.0/
8+
*
9+
* SPDX-License-Identifier: EPL-2.0
710
*
811
* Contributors:
912
* IBM Corporation - initial API and implementation

‎jdt-patch/e49/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/FriendDependencyTests.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
/*******************************************************************************
22
* Copyright (c) 2000, 2015 IBM Corporation and others.
3-
* All rights reserved. This program and the accompanying materials
4-
* are made available under the terms of the Eclipse Public License v1.0
3+
*
4+
* This program and the accompanying materials
5+
* are made available under the terms of the Eclipse Public License 2.0
56
* which accompanies this distribution, and is available at
6-
* http://www.eclipse.org/legal/epl-v10.html
7+
* https://www.eclipse.org/legal/epl-2.0/
8+
*
9+
* SPDX-License-Identifier: EPL-2.0
710
*
811
* Contributors:
912
* IBM Corporation - initial API and implementation

‎jdt-patch/e49/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/GetResourcesTests.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
/*******************************************************************************
22
* Copyright (c) 2000, 2015 IBM Corporation and others.
3-
* All rights reserved. This program and the accompanying materials
4-
* are made available under the terms of the Eclipse Public License v1.0
3+
*
4+
* This program and the accompanying materials
5+
* are made available under the terms of the Eclipse Public License 2.0
56
* which accompanies this distribution, and is available at
6-
* http://www.eclipse.org/legal/epl-v10.html
7+
* https://www.eclipse.org/legal/epl-2.0/
8+
*
9+
* SPDX-License-Identifier: EPL-2.0
710
*
811
* Contributors:
912
* IBM Corporation - initial API and implementation

‎jdt-patch/e49/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/IncrementalTests.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
/*******************************************************************************
22
* Copyright (c) 2000, 2015 IBM Corporation and others.
3-
* All rights reserved. This program and the accompanying materials
4-
* are made available under the terms of the Eclipse Public License v1.0
3+
*
4+
* This program and the accompanying materials
5+
* are made available under the terms of the Eclipse Public License 2.0
56
* which accompanies this distribution, and is available at
6-
* http://www.eclipse.org/legal/epl-v10.html
7+
* https://www.eclipse.org/legal/epl-2.0/
8+
*
9+
* SPDX-License-Identifier: EPL-2.0
710
*
811
* Contributors:
912
* IBM Corporation - initial API and implementation

‎jdt-patch/e49/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/IncrementalTests18.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
/*******************************************************************************
22
* Copyright (c) 2013, 2015 IBM Corporation and others.
3-
* All rights reserved. This program and the accompanying materials
4-
* are made available under the terms of the Eclipse Public License v1.0
3+
*
4+
* This program and the accompanying materials
5+
* are made available under the terms of the Eclipse Public License 2.0
56
* which accompanies this distribution, and is available at
6-
* http://www.eclipse.org/legal/epl-v10.html
7+
* https://www.eclipse.org/legal/epl-2.0/
8+
*
9+
* SPDX-License-Identifier: EPL-2.0
710
*
811
* Contributors:
912
* IBM Corporation - initial API and implementation

‎jdt-patch/e49/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/Java50Tests.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
/*******************************************************************************
22
* Copyright (c) 2000, 2010 IBM Corporation and others.
3-
* All rights reserved. This program and the accompanying materials
4-
* are made available under the terms of the Eclipse Public License v1.0
3+
*
4+
* This program and the accompanying materials
5+
* are made available under the terms of the Eclipse Public License 2.0
56
* which accompanies this distribution, and is available at
6-
* http://www.eclipse.org/legal/epl-v10.html
7+
* https://www.eclipse.org/legal/epl-2.0/
8+
*
9+
* SPDX-License-Identifier: EPL-2.0
710
*
811
* Contributors:
912
* IBM Corporation - initial API and implementation

‎jdt-patch/e49/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/MultiProjectTests.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
/*******************************************************************************
22
* Copyright (c) 2000, 2016 IBM Corporation and others.
3-
* All rights reserved. This program and the accompanying materials
4-
* are made available under the terms of the Eclipse Public License v1.0
3+
*
4+
* This program and the accompanying materials
5+
* are made available under the terms of the Eclipse Public License 2.0
56
* which accompanies this distribution, and is available at
6-
* http://www.eclipse.org/legal/epl-v10.html
7+
* https://www.eclipse.org/legal/epl-2.0/
8+
*
9+
* SPDX-License-Identifier: EPL-2.0
710
*
811
* Contributors:
912
* IBM Corporation - initial API and implementation

‎jdt-patch/e49/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/MultiSourceFolderAndOutputFolderTests.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
/*******************************************************************************
22
* Copyright (c) 2000, 2009 IBM Corporation and others.
3-
* All rights reserved. This program and the accompanying materials
4-
* are made available under the terms of the Eclipse Public License v1.0
3+
*
4+
* This program and the accompanying materials
5+
* are made available under the terms of the Eclipse Public License 2.0
56
* which accompanies this distribution, and is available at
6-
* http://www.eclipse.org/legal/epl-v10.html
7+
* https://www.eclipse.org/legal/epl-2.0/
8+
*
9+
* SPDX-License-Identifier: EPL-2.0
710
*
811
* Contributors:
912
* IBM Corporation - initial API and implementation

‎jdt-patch/e49/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/OutputFolderTests.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
/*******************************************************************************
22
* Copyright (c) 2000, 2010 IBM Corporation and others.
3-
* All rights reserved. This program and the accompanying materials
4-
* are made available under the terms of the Eclipse Public License v1.0
3+
*
4+
* This program and the accompanying materials
5+
* are made available under the terms of the Eclipse Public License 2.0
56
* which accompanies this distribution, and is available at
6-
* http://www.eclipse.org/legal/epl-v10.html
7+
* https://www.eclipse.org/legal/epl-2.0/
8+
*
9+
* SPDX-License-Identifier: EPL-2.0
710
*
811
* Contributors:
912
* IBM Corporation - initial API and implementation

‎jdt-patch/e49/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/PackageInfoTest.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
/*******************************************************************************
22
* Copyright (c) 2000, 2018 IBM Corporation and others.
3-
* All rights reserved. This program and the accompanying materials
4-
* are made available under the terms of the Eclipse Public License v1.0
3+
*
4+
* This program and the accompanying materials
5+
* are made available under the terms of the Eclipse Public License 2.0
56
* which accompanies this distribution, and is available at
6-
* http://www.eclipse.org/legal/epl-v10.html
7+
* https://www.eclipse.org/legal/epl-2.0/
8+
*
9+
* SPDX-License-Identifier: EPL-2.0
710
*
811
* Contributors:
912
* IBM Corporation - initial API and implementation

0 commit comments

Comments
 (0)