Use switch over strings where possibleI20190620-1800I20190620-0130I20190619-1820I20190619-1800I20190618-1805I20190618-0225I20190617-1800I20190616-1800I20190615-1800I20190614-1800I20190614-0330I20190613-1800I20190613-0210I20190612-1800I20190612-0115

Change cascades of ifs which can be converted to switch over Strings.

Change-Id: Id86536ada5cc4a916fbd5aa31123d1b45d7b5225
Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>

2 files changed, 20 insertions, 12 deletions

diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/ant/CompositeRepositoryTaskTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/ant/CompositeRepositoryTaskTest.java
index b7dea435c..3ec31922a 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/ant/CompositeRepositoryTaskTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/ant/CompositeRepositoryTaskTest.java
@@ -446,12 +446,15 @@ public class CompositeRepositoryTaskTest extends AbstractAntProvisioningTest {
 	 */
 	protected ICompositeRepository getCompositeRepository(String type) {
 		try {
-			if (type == TYPE_ARTIFACT) {
-				return (ICompositeRepository) getArtifactRepositoryManager().loadRepository(compositeSite, null);
-			} else if (type == TYPE_METADATA)
-				return (ICompositeRepository) getMetadataRepositoryManager().loadRepository(compositeSite, null);
-			else
-				fail("No type specified");
+			if (null == type) fail("No type specified"); else switch (type) {
+				case TYPE_ARTIFACT:
+					return (ICompositeRepository) getArtifactRepositoryManager().loadRepository(compositeSite, null);
+				case TYPE_METADATA:
+					return (ICompositeRepository) getMetadataRepositoryManager().loadRepository(compositeSite, null);
+				default:
+					fail("No type specified");
+					break;
+			}
 		} catch (ProvisionException e) {
 			fail("Failed to load repository", e);
 		} catch (ClassCastException e) {
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Counter.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Counter.java
index eb524b293..d24ef622c 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Counter.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Counter.java
@@ -62,12 +62,17 @@ public class Counter extends ProcessingStep {
 		if (data == null)
 			return;
 		try {
-			if (data.equals("download"))
-				size = Long.parseLong(context.getProperty(IArtifactDescriptor.DOWNLOAD_SIZE));
-			else if (data.equals("artifact"))
-				size = Long.parseLong(context.getProperty(IArtifactDescriptor.ARTIFACT_SIZE));
-			else
-				size = Long.parseLong(data);
+			switch (data) {
+				case "download":
+					size = Long.parseLong(context.getProperty(IArtifactDescriptor.DOWNLOAD_SIZE));
+					break;
+				case "artifact":
+					size = Long.parseLong(context.getProperty(IArtifactDescriptor.ARTIFACT_SIZE));
+					break;
+				default:
+					size = Long.parseLong(data);
+					break;
+			}
 		} catch (NumberFormatException e) {
 			int code = descriptor.isRequired() ? IStatus.ERROR : IStatus.INFO;
 			setStatus(new Status(code, Activator.ID, "Counter size specification invalid", e));