372600: redesign of RepositoryConfiguration

create new creation api
Change-Id: If45d6c1daaedeed9771f2aad4bf94775e4da69cb
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=372600

2 files changed, 58 insertions, 41 deletions

diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/RepositoryConfiguration.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/RepositoryConfiguration.java
index 970490baf..ad32855fc 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/RepositoryConfiguration.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/RepositoryConfiguration.java
@@ -91,14 +91,6 @@ public class RepositoryConfiguration implements Serializable {
 	public RepositoryConfiguration() {
 	}
 
-	public void addStatus(String status) {
-		bugStatus.add(status);
-	}
-
-	public void addResolution(String res) {
-		resolutionValues.add(res);
-	}
-
 	/**
 	 * Adds a product to the configuration.
 	 */
@@ -144,14 +136,10 @@ public class RepositoryConfiguration implements Serializable {
 		}
 	}
 
-	public void addOS(String os) {
-		operatingSystems.add(os);
-	}
-
 	/**
 	 * Adds a component to the given product.
 	 */
-	public void addComponent(String product, String component) {
+	private void addComponent(String product, String component) {
 		if (!components.contains(component)) {
 			components.add(component);
 		}
@@ -163,7 +151,7 @@ public class RepositoryConfiguration implements Serializable {
 		entry.addComponent(component);
 	}
 
-	public void addVersion(String product, String version) {
+	private void addVersion(String product, String version) {
 		if (!versions.contains(version)) {
 			versions.add(version);
 		}
@@ -175,22 +163,6 @@ public class RepositoryConfiguration implements Serializable {
 		entry.addVersion(version);
 	}
 
-	public void addKeyword(String keyword) {
-		keywords.add(keyword);
-	}
-
-	public void addPlatform(String platform) {
-		platforms.add(platform);
-	}
-
-	public void addPriority(String priority) {
-		priorities.add(priority);
-	}
-
-	public void addSeverity(String severity) {
-		severities.add(severity);
-	}
-
 	public void setInstallVersion(String version) {
 		this.version = new BugzillaVersion(version);
 	}
@@ -199,7 +171,7 @@ public class RepositoryConfiguration implements Serializable {
 		return version;
 	}
 
-	public void addTargetMilestone(String product, String target) {
+	private void addTargetMilestone(String product, String target) {
 		if (!milestones.contains(target)) {
 			milestones.add(target);
 		}
@@ -406,6 +378,51 @@ public class RepositoryConfiguration implements Serializable {
 		}
 	}
 
+	public void addItem2Configuration(BugzillaAttribute element, String value) {
+		switch (element) {
+		case BUG_STATUS:
+			bugStatus.add(value);
+			break;
+		case RESOLUTION:
+			resolutionValues.add(value);
+			break;
+		case KEYWORDS:
+			keywords.add(value);
+			break;
+		case REP_PLATFORM:
+			platforms.add(value);
+		case OP_SYS:
+			operatingSystems.add(value);
+			break;
+		case PRIORITY:
+			priorities.add(value);
+			break;
+		case BUG_SEVERITY:
+			severities.add(value);
+			break;
+		case PRODUCT:
+			addProduct(value);
+			break;
+		default:
+			break;
+		}
+	}
+
+	public void addItem2ProductConfiguration(BugzillaAttribute element, String product, String value) {
+		switch (element) {
+		case COMPONENT:
+			addComponent(product, value);
+			break;
+		case VERSION:
+			addVersion(product, value);
+			break;
+		case TARGET_MILESTONE:
+			addTargetMilestone(product, value);
+		default:
+			break;
+		}
+	}
+
 	/**
 	 * Adds a field to the configuration.
 	 */
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/SaxConfigurationContentHandler.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/SaxConfigurationContentHandler.java
index a8d1910b1..6feb4d343 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/SaxConfigurationContentHandler.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/SaxConfigurationContentHandler.java
@@ -307,23 +307,23 @@ public class SaxConfigurationContentHandler extends DefaultHandler {
 				return;
 			}
 			if (state == (IN_STATUS)) {
-				configuration.addStatus(characters.toString());
+				configuration.addItem2Configuration(BugzillaAttribute.BUG_STATUS, characters.toString());
 			} else if (state == (IN_STATUS_OPEN)) {
 				configuration.addOpenStatusValue(characters.toString());
 			} else if (state == (IN_STATUS_CLOSED)) {
 				configuration.addClosedStatusValue(characters.toString());
 			} else if (state == (IN_RESOLUTION)) {
-				configuration.addResolution(characters.toString());
+				configuration.addItem2Configuration(BugzillaAttribute.RESOLUTION, characters.toString());
 			} else if (state == (IN_KEYWORD)) {
-				configuration.addKeyword(characters.toString());
+				configuration.addItem2Configuration(BugzillaAttribute.KEYWORDS, characters.toString());
 			} else if (state == (IN_PLATFORM)) {
-				configuration.addPlatform(characters.toString());
+				configuration.addItem2Configuration(BugzillaAttribute.REP_PLATFORM, characters.toString());
 			} else if (state == (IN_OP_SYS)) {
-				configuration.addOS(characters.toString());
+				configuration.addItem2Configuration(BugzillaAttribute.OP_SYS, characters.toString());
 			} else if (state == (IN_PRIORITY)) {
-				configuration.addPriority(characters.toString());
+				configuration.addItem2Configuration(BugzillaAttribute.PRIORITY, characters.toString());
 			} else if (state == (IN_SEVERITY)) {
-				configuration.addSeverity(characters.toString());
+				configuration.addItem2Configuration(BugzillaAttribute.BUG_SEVERITY, characters.toString());
 			} else if (state == (IN_CUSTOM_OPTION)) {
 				// Option for CutstomFields
 				if (currentCustomOptionName != null) {
@@ -570,7 +570,7 @@ public class SaxConfigurationContentHandler extends DefaultHandler {
 			for (String uri : componentURIs) {
 				String realName = componentNames.get(uri);
 				if (realName != null) {
-					configuration.addComponent(product, realName);
+					configuration.addItem2ProductConfiguration(BugzillaAttribute.COMPONENT, product, realName);
 				}
 			}
 		}
@@ -580,7 +580,7 @@ public class SaxConfigurationContentHandler extends DefaultHandler {
 			for (String uri : versionURIs) {
 				String realName = versionNames.get(uri);
 				if (realName != null) {
-					configuration.addVersion(product, realName);
+					configuration.addItem2ProductConfiguration(BugzillaAttribute.VERSION, product, realName);
 				}
 			}
 
@@ -591,7 +591,7 @@ public class SaxConfigurationContentHandler extends DefaultHandler {
 			for (String uri : milestoneURIs) {
 				String realName = milestoneNames.get(uri);
 				if (realName != null) {
-					configuration.addTargetMilestone(product, realName);
+					configuration.addItem2ProductConfiguration(BugzillaAttribute.TARGET_MILESTONE, product, realName);
 				}
 			}