1.5 - fix unnecessary else statementsv_150_moved_back_to_HEADJDK_1_5

3 files changed, 4 insertions, 12 deletions

diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/ForeachStatementTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/ForeachStatementTest.java
index 21689257cb..707dd6565d 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/ForeachStatementTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/ForeachStatementTest.java
@@ -52,11 +52,8 @@ static {
 public static Test suite() {
 	if (testsNames != null || testsNumbers!=null || testsRange!=null) {
 		return new RegressionTestSetup(buildTestSuite(testClass()), highestComplianceLevels());
-	} else {
-		// To run a specific test, just uncomment line with testNumbers in static initializer above
-		// and put numbers of tests you want to perform
-		return setupSuite(testClass());
 	}
+	return setupSuite(testClass());
 }
 public void test001() {
 	this.runConformTest(
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeSignatureTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeSignatureTest.java
index e995c88134..5a2146ab69 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeSignatureTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeSignatureTest.java
@@ -73,9 +73,8 @@ public class GenericTypeSignatureTest extends AbstractRegressionTest {
 	public static Test suite() {
 		if (testsNames != null || testsNumbers!=null || testsRange!=null) {
 			return new RegressionTestSetup(buildTestSuite(testClass()), highestComplianceLevels());
-		} else {
-			return setupSuite(testClass());
 		}
+		return setupSuite(testClass());
 	}
 
 	public static Class testClass() {
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeTest.java
index 61b0313d40..fe0df0472c 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeTest.java
@@ -93,11 +93,8 @@ public class GenericTypeTest extends AbstractRegressionTest {
 	public static Test suite() {
 		if (testsNames != null || testsNumbers!=null || testsRange!=null) {
 			return new RegressionTestSetup(buildTestSuite(testClass()), highestComplianceLevels());
-		} else {
-			// To run a specific test, just uncomment line with testNumbers in static initializer above
-			// and put numbers of tests you want to perform
-			return setupSuite(testClass());
 		}
+		return setupSuite(testClass());
 	}
 
 	/*
@@ -108,9 +105,8 @@ public class GenericTypeTest extends AbstractRegressionTest {
 		int idx = fname.indexOf(" - ");
 		if (idx < 0) {
 			return fname;
-		} else {
-			return fname.substring(idx+3);
 		}
+		return fname.substring(idx+3);
 	}
 
 	/*######################################