NEW - bug 280161: cleanup fixme and todo comments for 3.3

https://bugs.eclipse.org/bugs/show_bug.cgi?id=280161

6 files changed, 13 insertions, 12 deletions

diff --git a/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF
index 241d02d88..393b6f6d5 100644
--- a/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF
@@ -13,6 +13,7 @@ Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ClassPath: .
 Export-Package: org.eclipse.mylyn.internal.bugzilla.core;x-friends:="org.eclipse.mylyn.bugzilla.ide,org.eclipse.mylyn.bugzilla.ui",
- org.eclipse.mylyn.internal.bugzilla.core.history;x-friends:="org.eclipse.mylyn.bugzilla.ide,org.eclipse.mylyn.bugzilla.ui"
+ org.eclipse.mylyn.internal.bugzilla.core.history;x-friends:="org.eclipse.mylyn.bugzilla.ide,org.eclipse.mylyn.bugzilla.ui",
+ org.eclipse.mylyn.internal.bugzilla.core.service;x-internal:=true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Localization: plugin
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java
index 89fedc05d..e164b7e1c 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java
@@ -584,7 +584,7 @@ public class BugzillaClient {
 						for (String type : VALID_CONFIG_CONTENT_TYPES) {
 							if (responseTypeHeader.getValue().toLowerCase(Locale.ENGLISH).contains(type)) {
 								RepositoryConfigurationFactory configFactory = new RepositoryConfigurationFactory(
-										stream, getCharacterEncoding(), connector);
+										stream, getCharacterEncoding());
 
 								repositoryConfiguration = configFactory.getConfiguration();
 
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java
index caeb3e5a3..9a5a3b7f4 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java
@@ -103,8 +103,6 @@ public class BugzillaRepositoryConnector extends AbstractRepositoryConnector {
 	// A Map from Java's  Platform to Buzilla's
 	private static final Map<String, String> java2buzillaPlatformMap = new HashMap<String, String>();
 
-	private static final String OPTION_ALL = "All"; //$NON-NLS-1$
-
 	static {
 		enSetting = new BugzillaLanguageSettings(IBugzillaConstants.DEFAULT_LANG);
 		enSetting.addLanguageAttribute("error_login", "Login"); //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/RepositoryConfigurationFactory.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/RepositoryConfigurationFactory.java
index f5da73228..76af0840c 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/RepositoryConfigurationFactory.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/RepositoryConfigurationFactory.java
@@ -25,15 +25,18 @@ import org.xml.sax.SAXParseException;
  * @author Rob Elves
  */
 public class RepositoryConfigurationFactory extends AbstractReportFactory {
-	private final BugzillaRepositoryConnector connector;
 
+	@Deprecated
 	public RepositoryConfigurationFactory(InputStream inStream, String encoding, BugzillaRepositoryConnector connector) {
 		super(inStream, encoding);
-		this.connector = connector;
+	}
+
+	public RepositoryConfigurationFactory(InputStream inStream, String encoding) {
+		super(inStream, encoding);
 	}
 
 	public RepositoryConfiguration getConfiguration() throws IOException, CoreException {
-		SaxConfigurationContentHandler contentHandler = new SaxConfigurationContentHandler(connector);
+		SaxConfigurationContentHandler contentHandler = new SaxConfigurationContentHandler();
 		collectResults(contentHandler, true);
 		RepositoryConfiguration config = contentHandler.getConfiguration();
 		return config;
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 292e251ff..7c6803e9e 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
@@ -199,11 +199,7 @@ public class SaxConfigurationContentHandler extends DefaultHandler {
 
 	private String currentCustomOptionName = ""; //$NON-NLS-1$
 
-	private final BugzillaRepositoryConnector connector;
-
-	public SaxConfigurationContentHandler(BugzillaRepositoryConnector connector) {
-		super();
-		this.connector = connector;
+	public SaxConfigurationContentHandler() {
 		configuration = new RepositoryConfiguration();
 	}
 
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/SaxMultiBugReportContentHandler.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/SaxMultiBugReportContentHandler.java
index 3a3458ae4..203414dd1 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/SaxMultiBugReportContentHandler.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/SaxMultiBugReportContentHandler.java
@@ -648,6 +648,7 @@ public class SaxMultiBugReportContentHandler extends DefaultHandler {
 
 	private static class TaskComment {
 
+		@SuppressWarnings("unused")
 		public int number;
 
 		public String author;
@@ -660,8 +661,10 @@ public class SaxMultiBugReportContentHandler extends DefaultHandler {
 
 		public String timeWorked;
 
+		@SuppressWarnings("unused")
 		public boolean hasAttachment;
 
+		@SuppressWarnings("unused")
 		public String attachmentId;
 
 		public TaskComment(int num) {