update jdt.core to I20190220-1800 for 2019-03 M3
- avoid type ArrayList in tests (not in jclMin)
- still more consistently configure tests for 1.8
diff --git a/othersrc/JCLMin1.8/src/java/util/WeakHashMap.java b/othersrc/JCLMin1.8/src/java/util/WeakHashMap.java
index 1df4e1d..b282edc 100644
--- a/othersrc/JCLMin1.8/src/java/util/WeakHashMap.java
+++ b/othersrc/JCLMin1.8/src/java/util/WeakHashMap.java
@@ -1,5 +1,12 @@
package java.util;
public class WeakHashMap<K, V> implements Map<K, V> {
-
+ public WeakHashMap() { }
+ public WeakHashMap(int initialCapacity) { }
+ public V put(K k, V v) { return v; }
+ public void clear() {}
+ public boolean isEmpty() { return true; }
+ public boolean containsKey(Object k) { return true; }
+ public V get(Object o) { return null; }
+ public V remove(Object o) { return null; }
}
diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/workspace/Hierarchy/analysis/teamhierarchy/Team6.java b/testplugins/org.eclipse.objectteams.otdt.tests/workspace/Hierarchy/analysis/teamhierarchy/Team6.java
index 8e70e0b..7b7cf42 100644
--- a/testplugins/org.eclipse.objectteams.otdt.tests/workspace/Hierarchy/analysis/teamhierarchy/Team6.java
+++ b/testplugins/org.eclipse.objectteams.otdt.tests/workspace/Hierarchy/analysis/teamhierarchy/Team6.java
@@ -1,4 +1,4 @@
import java.util.*;
-public team class Team6 extends ArrayList<String> {
+public team class Team6 extends WeakHashMap<String,Integer> {
protected class R {}
}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/workspace/Hierarchy/src/test004/T20.java b/testplugins/org.eclipse.objectteams.otdt.tests/workspace/Hierarchy/src/test004/T20.java
index bcd548e..243c526 100644
--- a/testplugins/org.eclipse.objectteams.otdt.tests/workspace/Hierarchy/src/test004/T20.java
+++ b/testplugins/org.eclipse.objectteams.otdt.tests/workspace/Hierarchy/src/test004/T20.java
@@ -1,6 +1,6 @@
package test004;
-public team class T20 extends java.util.ArrayList
+public team class T20 extends java.util.WeakHashMap
{
public team class T10
{
diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test1/in/A.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test1/in/A.java
index 9e3de83..3ac167c 100644
--- a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test1/in/A.java
+++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test1/in/A.java
@@ -1,10 +1,9 @@
package p;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
+import java.util.Map;
+import java.util.WeakHashMap;
public class A {
- public static Set set;
- public static List m() {
- return new ArrayList(set);
+ public static int size;
+ public static Map m() {
+ return new WeakHashMap(size);
}
}
diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test1/out/A.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test1/out/A.java
index e90d632..4cf51b2 100644
--- a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test1/out/A.java
+++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test1/out/A.java
@@ -1,5 +1,5 @@
package p;
-import java.util.Set;
+
public class A {
- public static Set set;
+ public static int size;
}
diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test1/out/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test1/out/B.java
index c64b134..8959678 100644
--- a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test1/out/B.java
+++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test1/out/B.java
@@ -1,11 +1,11 @@
package p;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Map;
+import java.util.WeakHashMap;
class B{
- public static List m() {
- return new ArrayList(A.set);
+ public static Map m() {
+ return new WeakHashMap(A.size);
}
}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/workspace/ExtractMethodRefactoringUtil/.classpath b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/workspace/ExtractMethodRefactoringUtil/.classpath
index fe2dab6..6a83912 100644
--- a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/workspace/ExtractMethodRefactoringUtil/.classpath
+++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/workspace/ExtractMethodRefactoringUtil/.classpath
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="var" path="CONVERTER_JCL_LIB" sourcepath="CONVERTER_JCL_SRC" rootpath="CONVERTER_JCL_SRCROOT"/>
- <classpathentry kind="var" path="JCL17_LIB" sourcepath="JCL17_SRC" rootpath="JCL_SRCROOT"/>
+ <classpathentry kind="var" path="JCL18_LIB" sourcepath="JCL18_SRC" rootpath="JCL_SRCROOT"/>
<classpathentry kind="output" path="bin"/>
<classpathentry kind="lib" sourcepath="src" path="bins"/>
diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/workspace/RefactoringUtil/.classpath b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/workspace/RefactoringUtil/.classpath
index fe2dab6..6a83912 100644
--- a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/workspace/RefactoringUtil/.classpath
+++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/workspace/RefactoringUtil/.classpath
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="var" path="CONVERTER_JCL_LIB" sourcepath="CONVERTER_JCL_SRC" rootpath="CONVERTER_JCL_SRCROOT"/>
- <classpathentry kind="var" path="JCL17_LIB" sourcepath="JCL17_SRC" rootpath="JCL_SRCROOT"/>
+ <classpathentry kind="var" path="JCL18_LIB" sourcepath="JCL18_SRC" rootpath="JCL_SRCROOT"/>
<classpathentry kind="output" path="bin"/>
<classpathentry kind="lib" sourcepath="src" path="bins"/>
diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/JavaQuickFixTests.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/JavaQuickFixTests.java
index 83b87ce..de8af3c 100644
--- a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/JavaQuickFixTests.java
+++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/JavaQuickFixTests.java
@@ -234,9 +234,6 @@
buf.append("public team class T2 extends T1 {\n");
buf.append(" protected class R {\n");
buf.append("\n");
- buf.append(" /* (non-Javadoc)\n");
- buf.append(" * @see test1.T1.R#foo()\n");
- buf.append(" */\n");
buf.append(" @Override\n");
buf.append(" void foo() {\n");
buf.append(" // TODO Auto-generated method stub\n");
@@ -297,9 +294,6 @@
buf.append("public team class T2 extends T1 {\n");
buf.append(" protected class R {\n");
buf.append("\n");
- buf.append(" /* (non-Javadoc)\n");
- buf.append(" * @see test1.T1.R#foo()\n");
- buf.append(" */\n");
buf.append(" @Override\n");
buf.append(" static void foo() {\n");
buf.append(" // TODO Auto-generated method stub\n");