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

This reverts commit 0c7924dc3215b1403bf760edc4cf97f4d054c65c.

2 files changed, 41 insertions, 58 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 ad32855fc..970490baf 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,6 +91,14 @@ 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.
 	 */
@@ -136,10 +144,14 @@ public class RepositoryConfiguration implements Serializable {
 		}
 	}
 
+	public void addOS(String os) {
+		operatingSystems.add(os);
+	}
+
 	/**
 	 * Adds a component to the given product.
 	 */
-	private void addComponent(String product, String component) {
+	public void addComponent(String product, String component) {
 		if (!components.contains(component)) {
 			components.add(component);
 		}
@@ -151,7 +163,7 @@ public class RepositoryConfiguration implements Serializable {
 		entry.addComponent(component);
 	}
 
-	private void addVersion(String product, String version) {
+	public void addVersion(String product, String version) {
 		if (!versions.contains(version)) {
 			versions.add(version);
 		}
@@ -163,6 +175,22 @@ 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);
 	}
@@ -171,7 +199,7 @@ public class RepositoryConfiguration implements Serializable {
 		return version;
 	}
 
-	private void addTargetMilestone(String product, String target) {
+	public void addTargetMilestone(String product, String target) {
 		if (!milestones.contains(target)) {
 			milestones.add(target);
 		}
@@ -378,51 +406,6 @@ 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 6feb4d343..a8d1910b1 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.addItem2Configuration(BugzillaAttribute.BUG_STATUS, characters.toString());
+				configuration.addStatus(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.addItem2Configuration(BugzillaAttribute.RESOLUTION, characters.toString());
+				configuration.addResolution(characters.toString());
 			} else if (state == (IN_KEYWORD)) {
-				configuration.addItem2Configuration(BugzillaAttribute.KEYWORDS, characters.toString());
+				configuration.addKeyword(characters.toString());
 			} else if (state == (IN_PLATFORM)) {
-				configuration.addItem2Configuration(BugzillaAttribute.REP_PLATFORM, characters.toString());
+				configuration.addPlatform(characters.toString());
 			} else if (state == (IN_OP_SYS)) {
-				configuration.addItem2Configuration(BugzillaAttribute.OP_SYS, characters.toString());
+				configuration.addOS(characters.toString());
 			} else if (state == (IN_PRIORITY)) {
-				configuration.addItem2Configuration(BugzillaAttribute.PRIORITY, characters.toString());
+				configuration.addPriority(characters.toString());
 			} else if (state == (IN_SEVERITY)) {
-				configuration.addItem2Configuration(BugzillaAttribute.BUG_SEVERITY, characters.toString());
+				configuration.addSeverity(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.addItem2ProductConfiguration(BugzillaAttribute.COMPONENT, product, realName);
+					configuration.addComponent(product, realName);
 				}
 			}
 		}
@@ -580,7 +580,7 @@ public class SaxConfigurationContentHandler extends DefaultHandler {
 			for (String uri : versionURIs) {
 				String realName = versionNames.get(uri);
 				if (realName != null) {
-					configuration.addItem2ProductConfiguration(BugzillaAttribute.VERSION, product, realName);
+					configuration.addVersion(product, realName);
 				}
 			}
 
@@ -591,7 +591,7 @@ public class SaxConfigurationContentHandler extends DefaultHandler {
 			for (String uri : milestoneURIs) {
 				String realName = milestoneNames.get(uri);
 				if (realName != null) {
-					configuration.addItem2ProductConfiguration(BugzillaAttribute.TARGET_MILESTONE, product, realName);
+					configuration.addTargetMilestone(product, realName);
 				}
 			}