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, 49 insertions, 29 deletions

diff --git a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/persistence/CompositeParser.java b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/persistence/CompositeParser.java
index db404cd50..c61d47c11 100644
--- a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/persistence/CompositeParser.java
+++ b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/persistence/CompositeParser.java
@@ -136,20 +136,26 @@ public class CompositeParser extends XMLParser implements XMLConstants {
 
 		@Override
 		public void startElement(String name, Attributes attributes) {
-			if (PROPERTIES_ELEMENT.equals(name)) {
-				if (propertiesHandler == null) {
-					propertiesHandler = new PropertiesHandler(this, attributes);
-				} else {
-					duplicateElement(this, name, attributes);
-				}
-			} else if (CHILDREN_ELEMENT.equals(name)) {
-				if (childrenHandler == null) {
-					childrenHandler = new ChildrenHandler(this, attributes);
-				} else {
-					duplicateElement(this, name, attributes);
-				}
-			} else {
+			if (name==null) {
 				invalidElement(name, attributes);
+			} else switch (name) {
+				case PROPERTIES_ELEMENT:
+					if (propertiesHandler == null) {
+						propertiesHandler = new PropertiesHandler(this, attributes);
+					} else {
+						duplicateElement(this, name, attributes);
+					}
+					break;
+				case CHILDREN_ELEMENT:
+					if (childrenHandler == null) {
+						childrenHandler = new ChildrenHandler(this, attributes);
+					} else {
+						duplicateElement(this, name, attributes);
+					}
+					break;
+				default:
+					invalidElement(name, attributes);
+					break;
 			}
 		}
 
diff --git a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/AbstractRepositoryManager.java b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/AbstractRepositoryManager.java
index 60325fd62..c2001ef91 100644
--- a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/AbstractRepositoryManager.java
+++ b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/AbstractRepositoryManager.java
@@ -561,14 +561,19 @@ public abstract class AbstractRepositoryManager<T> implements IRepositoryManager
 			RepositoryInfo<T> info = repositories.get(getKey(location));
 			if (info == null)
 				return null;// Repository not found
-			if (IRepository.PROP_DESCRIPTION.equals(key))
-				return info.description;
-			else if (IRepository.PROP_NAME.equals(key))
-				return info.name;
-			else if (IRepository.PROP_SYSTEM.equals(key))
-				return Boolean.toString(info.isSystem);
-			else if (IRepository.PROP_NICKNAME.equals(key))
-				return info.nickname;
+			if (null != key)
+				switch (key) {
+					case IRepository.PROP_DESCRIPTION:
+						return info.description;
+					case IRepository.PROP_NAME:
+						return info.name;
+					case IRepository.PROP_SYSTEM:
+						return Boolean.toString(info.isSystem);
+					case IRepository.PROP_NICKNAME:
+						return info.nickname;
+					default:
+						break;
+				}
 			// Key not known, return null
 			return null;
 		}
@@ -583,15 +588,24 @@ public abstract class AbstractRepositoryManager<T> implements IRepositoryManager
 			RepositoryInfo<T> info = repositories.get(getKey(location));
 			if (info == null)
 				return;// Repository not found
-			if (IRepository.PROP_DESCRIPTION.equals(key))
-				info.description = value;
-			else if (IRepository.PROP_NAME.equals(key))
-				info.name = value;
-			else if (IRepository.PROP_NICKNAME.equals(key))
-				info.nickname = value;
-			else if (IRepository.PROP_SYSTEM.equals(key))
-				//only true if value.equals("true") which is OK because a repository is only system if it's explicitly set to system.
+			if (null != key)
+				switch (key) {
+		    	case IRepository.PROP_DESCRIPTION:
+			    info.description = value;
+			    break;
+		    	case IRepository.PROP_NAME:
+			    info.name = value;
+			    break;
+		    	case IRepository.PROP_NICKNAME:
+			    info.nickname = value;
+			    break;
+		    	case IRepository.PROP_SYSTEM:
+			    //only true if value.equals("true") which is OK because a repository is only system if it's explicitly set to system.
 				info.isSystem = Boolean.parseBoolean(value);
+			    break;
+		    	default:
+			    break;
+		    }
 			remember(info, true);
 		}
 	}