Previous changes made via commit

cc1c110e9641a2cecfab702ac9383376aefe030a no longer required with latest
JDK

1 files changed, 28 insertions, 68 deletions

diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForClass.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForClass.java
index a815e76463..13375e6e70 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForClass.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForClass.java
@@ -4,10 +4,6 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
- * This is an implementation of an early-draft specification developed under the Java
- * Community Process (JCP) and is made available for testing and evaluation purposes
- * only. The code is not compatible with any specification of the JCP.
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
@@ -1026,29 +1022,17 @@ public class JavadocTestForClass extends JavadocTest {
 						"	int i = 0;\n" +
 						"}\n",
 						},
-						IS_JRE_8 ? 		
-								"----------\n" + 
-								"1. ERROR in X.java (at line 6)\n" + 
-								"	* <li> {@link Entry} </li>\n" + 
-								"	              ^^^^^\n" + 
-								"Javadoc: Invalid member type qualification\n" + 
-								"----------\n" + 
-								"2. ERROR in X.java (at line 9)\n" + 
-								"	public interface X extends Map {\n" + 
-								"	                 ^\n" + 
-								"The return types are incompatible for the inherited methods MapStream.values(), Map.values()\n" + 
-								"----------\n" : 
-									"----------\n" + 
-									"1. WARNING in X.java (at line 2)\n"+
-									"	import java.util.Map.Entry;\n"+
-									"	       ^^^^^^^^^^^^^^^^^^^\n"+
-									"The import java.util.Map.Entry is never used\n"+
-									"----------\n"+
-									"2. ERROR in X.java (at line 6)\n" + 
-									"	* <li> {@link Entry} </li>\n" + 
-									"	              ^^^^^\n" + 
-									"Javadoc: Invalid member type qualification\n" + 
-									"----------\n");
+						"----------\n" + 
+						"1. WARNING in X.java (at line 2)\n"+
+						"	import java.util.Map.Entry;\n"+
+						"	       ^^^^^^^^^^^^^^^^^^^\n"+
+						"The import java.util.Map.Entry is never used\n"+
+						"----------\n"+
+						"2. ERROR in X.java (at line 6)\n" + 
+						"	* <li> {@link Entry} </li>\n" + 
+						"	              ^^^^^\n" + 
+						"Javadoc: Invalid member type qualification\n" + 
+						"----------\n");
 			return;
 		}
 		runNegativeTest(
@@ -1089,24 +1073,12 @@ public class JavadocTestForClass extends JavadocTest {
 				"	Entry e = null;\n" + 
 				"}\n",
 				},
-				!IS_JRE_8 || (IS_JRE_8 && this.complianceLevel >= ClassFileConstants.JDK1_5) ? 
-						"----------\n" + 
-						"1. ERROR in X.java (at line 5)\n" + 
-						"	* <li> {@link Entry} </li>\n" + 
-						"	              ^^^^^\n" + 
-						"Javadoc: Invalid member type qualification\n" + 
-						"----------\n":
-							"----------\n" + 
-							"1. ERROR in X.java (at line 5)\n" + 
-							"	* <li> {@link Entry} </li>\n" + 
-							"	              ^^^^^\n" + 
-							"Javadoc: Invalid member type qualification\n" + 
-							"----------\n" + 
-							"2. ERROR in X.java (at line 8)\n" + 
-							"	public interface X extends Map {\n" + 
-							"	                 ^\n" + 
-							"The return types are incompatible for the inherited methods MapStream.values(), Map.values()\n" + 
-							"----------\n");
+				"----------\n" + 
+				"1. ERROR in X.java (at line 5)\n" + 
+				"	* <li> {@link Entry} </li>\n" + 
+				"	              ^^^^^\n" + 
+				"Javadoc: Invalid member type qualification\n" + 
+				"----------\n");
 	}	
 
 	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=253750
@@ -1127,29 +1099,17 @@ public class JavadocTestForClass extends JavadocTest {
 						"	Entry e = null;\n" + 
 						"}\n",
 						},
-						IS_JRE_8 ? 
-								"----------\n" + 
-								"1. ERROR in X.java (at line 6)\n" + 
-								"	* <li> {@link Entry} </li>\n" + 
-								"	              ^^^^^\n" + 
-								"Javadoc: Invalid member type qualification\n" + 
-								"----------\n" + 
-								"2. ERROR in X.java (at line 9)\n" + 
-								"	public interface X extends Map {\n" + 
-								"	                 ^\n" + 
-								"The return types are incompatible for the inherited methods MapStream.values(), Map.values()\n" + 
-								"----------\n" : 
-									"----------\n" + 
-									"1. WARNING in X.java (at line 2)\n"+
-									"	import java.util.Map.Entry;\n"+
-									"	       ^^^^^^^^^^^^^^^^^^^\n"+
-									"The import java.util.Map.Entry is never used\n"+
-									"----------\n"+
-									"2. ERROR in X.java (at line 6)\n" + 
-									"	* <li> {@link Entry} </li>\n" + 
-									"	              ^^^^^\n" + 
-									"Javadoc: Invalid member type qualification\n" + 
-									"----------\n");
+						"----------\n" + 
+						"1. WARNING in X.java (at line 2)\n"+
+						"	import java.util.Map.Entry;\n"+
+						"	       ^^^^^^^^^^^^^^^^^^^\n"+
+						"The import java.util.Map.Entry is never used\n"+
+						"----------\n"+
+						"2. ERROR in X.java (at line 6)\n" + 
+						"	* <li> {@link Entry} </li>\n" + 
+						"	              ^^^^^\n" + 
+						"Javadoc: Invalid member type qualification\n" + 
+						"----------\n");
 			return;
 		}
 		runNegativeTest(