ASSIGNED - bug 370483: reduce number of warnings

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

Change-Id: I9909e9f7ab4d79ed4fb4e803cf9d9f4698c698c4

15 files changed, 28 insertions, 50 deletions

diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaTaskDataHandler.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaTaskDataHandler.java
index ba65cbd23..f2ad9511a 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaTaskDataHandler.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaTaskDataHandler.java
@@ -596,7 +596,7 @@ public class BugzillaTaskDataHandler extends AbstractTaskDataHandler {
 				for (String option : optionValues) {
 					attributeTargetMilestone.putOption(option, option);
 				}
-				if (repositoryConfiguration != null && product != null && !product.equals("")) { //$NON-NLS-1$
+				if (product != null && !product.equals("")) { //$NON-NLS-1$
 					String defaultMilestone = repositoryConfiguration.getDefaultMilestones(product);
 					if (defaultMilestone != null) {
 						attributeTargetMilestone.setValue(defaultMilestone);
@@ -737,7 +737,6 @@ public class BugzillaTaskDataHandler extends AbstractTaskDataHandler {
 				}
 			}
 		}
-
 		return true;
 	}
 
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/service/BugzillaXmlRpcClient.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/service/BugzillaXmlRpcClient.java
index 240040dc5..712eb626f 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/service/BugzillaXmlRpcClient.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/service/BugzillaXmlRpcClient.java
@@ -501,6 +501,7 @@ public class BugzillaXmlRpcClient extends CommonXmlRpcClient {
 		}).execute();
 	}
 
+	@SuppressWarnings("unchecked")
 	private HashMap<String, HashMap<String, Object[]>> response2HashMapHashMap(HashMap<?, ?> response, String name)
 			throws XmlRpcException {
 		HashMap<String, HashMap<String, Object[]>> result;
@@ -516,6 +517,7 @@ public class BugzillaXmlRpcClient extends CommonXmlRpcClient {
 		return result;
 	}
 
+	@SuppressWarnings("unchecked")
 	private HashMap<String, Object[]> response2HashMap(HashMap<?, ?> response, String name) throws XmlRpcException {
 		HashMap<String, Object[]> result;
 		if (response == null) {
@@ -724,6 +726,7 @@ public class BugzillaXmlRpcClient extends CommonXmlRpcClient {
 		}
 	}
 
+	@SuppressWarnings("unchecked")
 	private void updateTaskDataFromMap(final TaskAttributeMapper mapper, List<BugzillaCustomField> customFields,
 			Map<?, ?> taskDataResultMap, TaskData taskData) {
 		for (String attrib : (Set<String>) taskDataResultMap.keySet()) {
@@ -823,20 +826,22 @@ public class BugzillaXmlRpcClient extends CommonXmlRpcClient {
 			Object[] attachments) {
 		if (attachments != null) {
 			for (Object attachmentTemp : attachments) {
+				// We have the following information which are not used:
+				// (Date) attachment.get("last_change_time");
+				// (Integer) attachment.get("bug_id");
+				// (Integer) attachment.get("is_private");
+				// (Integer) attachment.get("is_url");
+
 				HashMap<?, ?> attachment = (HashMap<?, ?>) attachmentTemp;
-				Date creation_time = (Date) attachment.get("creation_time");
-				Date last_change_time = (Date) attachment.get("last_change_time");
-				Integer id = (Integer) attachment.get("id");
-				Integer bug_id = (Integer) attachment.get("bug_id");
-				String file_name = (String) attachment.get("file_name");
-				String summary = (String) attachment.get("summary");
-				String content_type = (String) attachment.get("content_type");
-
-				Integer is_private = (Integer) attachment.get("is_private");
-				Integer is_obsolete = (Integer) attachment.get("is_obsolete");
-				Integer is_url = (Integer) attachment.get("is_url");
-				Integer is_patch = (Integer) attachment.get("is_patch");
-				String creator = (String) attachment.get("creator");
+				Date creation_time = (Date) attachment.get("creation_time"); //$NON-NLS-1$
+				Integer id = (Integer) attachment.get("id"); //$NON-NLS-1$
+				String file_name = (String) attachment.get("file_name"); //$NON-NLS-1$
+				String summary = (String) attachment.get("summary"); //$NON-NLS-1$
+				String content_type = (String) attachment.get("content_type"); //$NON-NLS-1$
+
+				Integer is_obsolete = (Integer) attachment.get("is_obsolete"); //$NON-NLS-1$
+				Integer is_patch = (Integer) attachment.get("is_patch"); //$NON-NLS-1$
+				String creator = (String) attachment.get("creator"); //$NON-NLS-1$
 				TaskAttribute attachmentAttribute = taskData.getRoot().createAttribute(
 						TaskAttribute.PREFIX_ATTACHMENT + id);
 				BugzillaAttachmentMapper attachmentMapper = BugzillaAttachmentMapper.createFrom(attachmentAttribute);
@@ -847,15 +852,12 @@ public class BugzillaXmlRpcClient extends CommonXmlRpcClient {
 //				attachmentMapper.setComment(summary);
 				attachmentMapper.setContentType(content_type);
 				attachmentMapper.setCreationDate(creation_time);
-				attachmentMapper.setDeprecated(is_obsolete.equals("1"));
+				attachmentMapper.setDeprecated(is_obsolete.equals("1")); //$NON-NLS-1$
 				attachmentMapper.setDescription(summary);
 				attachmentMapper.setFileName(file_name);
 				attachmentMapper.setLength(-1L);
-				attachmentMapper.setPatch(is_patch.equals("1"));
+				attachmentMapper.setPatch(is_patch.equals("1")); //$NON-NLS-1$
 				attachmentMapper.applyTo(attachmentAttribute);
-				int z = 9;
-				z++;
-
 			}
 		}
 	}
@@ -867,6 +869,7 @@ public class BugzillaXmlRpcClient extends CommonXmlRpcClient {
 			if (commentArray != null) {
 				int commentNum = 0;
 				for (Object object2 : commentArray) {
+					@SuppressWarnings("unchecked")
 					HashMap<String, Object> commentHash = (HashMap<String, Object>) object2;
 					String text = (String) commentHash.get("text"); //$NON-NLS-1$
 					if (commentNum == 0) {
@@ -881,6 +884,7 @@ public class BugzillaXmlRpcClient extends CommonXmlRpcClient {
 					Date time = (Date) commentHash.get("time"); //$NON-NLS-1$
 					String creator = (String) commentHash.get("creator"); //$NON-NLS-1$
 					Boolean is_private = (Boolean) commentHash.get("is_private"); //$NON-NLS-1$
+					@SuppressWarnings("unused")
 					Integer attachment_id = (Integer) commentHash.get("attachment_id"); //$NON-NLS-1$
 
 					taskComment.setCommentId(commentID.toString());
@@ -980,17 +984,11 @@ public class BugzillaXmlRpcClient extends CommonXmlRpcClient {
 					if (object instanceof String || object instanceof Boolean || object instanceof Integer
 							|| object instanceof Date) {
 						attribute.addValue(getValueStringFromObject(object, true));
-					} else {
-						int ii1 = 9;
-						ii1++;
 					}
 				}
 
 			}
 			return attribute;
-		} else {
-			int ii1 = 9;
-			ii1++;
 		}
 		return null;
 	}
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchPage.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchPage.java
index d2d8b2780..0450ab6b2 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchPage.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchPage.java
@@ -83,7 +83,6 @@ import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
  * @author Mik Kersten (hardening of prototype)
  * @author Frank Becker
  */
-@SuppressWarnings("restriction")
 public class BugzillaSearchPage extends AbstractRepositoryQueryPage2 implements Listener {
 
 	private static final int HEIGHT_ATTRIBUTE_COMBO = 30;
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositorySettingsPage.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositorySettingsPage.java
index 1bd517e63..49c8b55e3 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositorySettingsPage.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositorySettingsPage.java
@@ -529,7 +529,6 @@ public class BugzillaRepositorySettingsPage extends AbstractRepositorySettingsPa
 		defaultPlatformCombo.setEnabled(!autodetectPlatformOS.getSelection());
 	}
 
-	@SuppressWarnings({ "restriction" })
 	@Override
 	public void applyTo(final TaskRepository repository) {
 		AuthenticationCredentials repositoryAuth = repository.getCredentials(AuthenticationType.REPOSITORY);
diff --git a/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/wizards/SelectSupportElementPage.java b/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/wizards/SelectSupportElementPage.java
index fe323533d..1a29d9049 100644
--- a/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/wizards/SelectSupportElementPage.java
+++ b/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/wizards/SelectSupportElementPage.java
@@ -58,7 +58,6 @@ import org.eclipse.ui.themes.IThemeManager;
 /**
  * @author Steffen Pingel
  */
-@SuppressWarnings("restriction")
 public class SelectSupportElementPage extends WizardPage {
 
 	private class SupportElementItem extends ControlListItem {
diff --git a/org.eclipse.mylyn.tasks.ui/.settings/.api_filters b/org.eclipse.mylyn.tasks.ui/.settings/.api_filters
index 33f67ce81..52f6c823b 100644
--- a/org.eclipse.mylyn.tasks.ui/.settings/.api_filters
+++ b/org.eclipse.mylyn.tasks.ui/.settings/.api_filters
@@ -24,13 +24,4 @@
             </message_arguments>
         </filter>
     </resource>
-    <resource path="src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositoryQueryPage2.java" type="org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositoryQueryPage2">
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="SectionComposite"/>
-                <message_argument value="AbstractRepositoryQueryPage2"/>
-                <message_argument value="createPageContent(SectionComposite)"/>
-            </message_arguments>
-        </filter>
-    </resource>
 </component>
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java
index 06eef5ea0..ea8cecdf8 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java
@@ -1002,8 +1002,6 @@ public class TasksUiPlugin extends AbstractUIPlugin {
 
 	private final Map<String, List<IDynamicSubMenuContributor>> menuContributors = new HashMap<String, List<IDynamicSubMenuContributor>>();
 
-	private IIdentityService identityService;
-
 	private ServiceTracker identityServiceTracker;
 
 	public Map<String, List<IDynamicSubMenuContributor>> getDynamicMenuMap() {
@@ -1386,7 +1384,7 @@ public class TasksUiPlugin extends AbstractUIPlugin {
 
 	public IIdentityService getIdentityService() {
 		if (identityServiceTracker == null) {
-			identityServiceTracker = new ServiceTracker(getBundle().getBundleContext(),
+			identityServiceTracker = new ServiceTracker<Object, Object>(getBundle().getBundleContext(),
 					IIdentityService.class.getName(), null);
 			identityServiceTracker.open();
 		}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/context/ContextAttachWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/context/ContextAttachWizard.java
index e64fdc822..0da517375 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/context/ContextAttachWizard.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/context/ContextAttachWizard.java
@@ -22,7 +22,6 @@ import org.eclipse.mylyn.tasks.ui.TasksUiImages;
  * @author Rob Elves
  * @author Steffen Pingel
  */
-@SuppressWarnings({ "restriction" })
 public class ContextAttachWizard extends Wizard {
 
 	private final TaskRepository repository;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/context/ContextRetrieveWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/context/ContextRetrieveWizard.java
index 6549b6482..ed0f201cc 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/context/ContextRetrieveWizard.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/context/ContextRetrieveWizard.java
@@ -24,7 +24,6 @@ import org.eclipse.mylyn.tasks.ui.TasksUiImages;
  * @author Mik Kersten
  * @author Steffen Pingel
  */
-@SuppressWarnings({ "restriction" })
 public class ContextRetrieveWizard extends Wizard {
 
 	private final TaskRepository repository;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/context/ContextRetrieveWizardPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/context/ContextRetrieveWizardPage.java
index 535be4748..b8593b260 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/context/ContextRetrieveWizardPage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/context/ContextRetrieveWizardPage.java
@@ -43,7 +43,6 @@ import com.ibm.icu.text.DateFormat;
  * @author Rob Elves
  * @author Mik Kersten
  */
-@SuppressWarnings({ "restriction" })
 public class ContextRetrieveWizardPage extends WizardPage {
 
 	private final TaskRepository repository;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AbstractTaskEditorAttributeSection.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AbstractTaskEditorAttributeSection.java
index 6e6a3db21..eb630127e 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AbstractTaskEditorAttributeSection.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AbstractTaskEditorAttributeSection.java
@@ -332,7 +332,7 @@ public abstract class AbstractTaskEditorAttributeSection extends AbstractTaskEdi
 			String label = getModel().getTaskData().getAttributeMapper().getValueLabel(attribute);
 			if (label != null) {
 				if (sb.length() > 0) {
-					sb.append(" / ");
+					sb.append(" / "); //$NON-NLS-1$
 				}
 			}
 			sb.append(label);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskListNotification.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskListNotification.java
index c768ce4e3..727bc8f26 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskListNotification.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskListNotification.java
@@ -33,7 +33,7 @@ import org.eclipse.ui.PlatformUI;
  */
 public class TaskListNotification extends AbstractUiNotification {
 
-	private final static String ID_EVENT_TASK_CHANGED = "org.eclipse.mylyn.tasks.ui.events.TaskChanged";
+	private final static String ID_EVENT_TASK_CHANGED = "org.eclipse.mylyn.tasks.ui.events.TaskChanged"; //$NON-NLS-1$
 
 	private static DecoratingLabelProvider labelProvider;
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskListNotificationReminder.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskListNotificationReminder.java
index 7624adbdb..e567287d5 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskListNotificationReminder.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskListNotificationReminder.java
@@ -21,7 +21,7 @@ import org.eclipse.swt.graphics.Image;
  */
 public class TaskListNotificationReminder extends TaskListNotification {
 
-	private final static String ID_EVENT_TASK_DUE = "org.eclipse.mylyn.tasks.ui.events.TaskDue";
+	private final static String ID_EVENT_TASK_DUE = "org.eclipse.mylyn.tasks.ui.events.TaskDue"; //$NON-NLS-1$
 
 	public TaskListNotificationReminder(AbstractTask task) {
 		super(ID_EVENT_TASK_DUE, task);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java
index 9f19810b2..8e708cc91 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java
@@ -1015,7 +1015,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener, I
 				.getString(ITasksUiPreferenceConstants.LAST_SERVICE_MESSAGE_ID);
 
 		if (showMessage && lastClosedId.equals("")) { //$NON-NLS-1$
-			ServiceMessage message = new ServiceMessage("welcome");
+			ServiceMessage message = new ServiceMessage("welcome"); //$NON-NLS-1$
 			message.setDescription(Messages.TaskListView_Welcome_Message);
 			message.setTitle(Messages.TaskListView_Welcome_Message_Title);
 			message.setImage(Dialog.DLG_IMG_MESSAGE_INFO);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositoryQueryPage2.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositoryQueryPage2.java
index 1af171e34..da1b20e0d 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositoryQueryPage2.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositoryQueryPage2.java
@@ -62,7 +62,6 @@ public abstract class AbstractRepositoryQueryPage2 extends AbstractRepositoryQue
 
 	private boolean firstTime = true;
 
-	@SuppressWarnings("restriction")
 	private SectionComposite innerComposite;
 
 	/**
@@ -407,7 +406,6 @@ public abstract class AbstractRepositoryQueryPage2 extends AbstractRepositoryQue
 		progressContainer.setCancelButton(cancelButton);
 	}
 
-	@SuppressWarnings("restriction")
 	protected abstract void createPageContent(SectionComposite parent);
 
 	protected void doClearControls() {