RESOLVED - bug 194138: cleanup unnecesary casts and null checks

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

12 files changed, 70 insertions, 43 deletions

diff --git a/org.eclipse.mylyn.tasks.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.tasks.core/.settings/org.eclipse.jdt.core.prefs
index 4f6160a5e..888de1277 100644
--- a/org.eclipse.mylyn.tasks.core/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.mylyn.tasks.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Wed Jun 06 17:09:48 EDT 2007
+#Sun Jun 24 11:52:58 EDT 2007
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
@@ -36,6 +36,7 @@ org.eclipse.jdt.core.compiler.problem.nullReference=error
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
@@ -45,7 +46,7 @@ org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
diff --git a/org.eclipse.mylyn.tasks.core/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.tasks.core/.settings/org.eclipse.mylyn.tasks.ui.prefs
new file mode 100644
index 000000000..d8c6d26af
--- /dev/null
+++ b/org.eclipse.mylyn.tasks.core/.settings/org.eclipse.mylyn.tasks.ui.prefs
@@ -0,0 +1,4 @@
+#Mon Jun 25 03:02:37 GMT 2007
+eclipse.preferences.version=1
+project.repository.kind=bugzilla
+project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/LocalTask.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/LocalTask.java
index f3c199b45..9dd34d916 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/LocalTask.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/LocalTask.java
@@ -34,14 +34,17 @@ public class LocalTask extends AbstractTask {
 		return LocalRepositoryConnector.REPOSITORY_KIND;
 	}
 
+	@Override
 	public boolean isNotified() {
 		return true;
 	}
 	
+	@Override
 	public String getLastReadTimeStamp() {
 		return SYNC_DATE_NOW;
 	}
 	
+	@Override
 	public String getOwner() {
 		return LocalRepositoryConnector.REPOSITORY_KIND;
 	}
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/ScheduledTaskContainer.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/ScheduledTaskContainer.java
index cf870711e..c408b349b 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/ScheduledTaskContainer.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/ScheduledTaskContainer.java
@@ -81,6 +81,7 @@ public class ScheduledTaskContainer extends AbstractTaskCategory {
 				&& (endDate.getTimeInMillis() >= cal.getTimeInMillis());
 	}
 
+	@Override
 	public void clear() {
 		totalEstimated = 0;
 		totalElapsed = 0;
@@ -147,6 +148,7 @@ public class ScheduledTaskContainer extends AbstractTaskCategory {
 		// ignore
 	}
 
+	@Override
 	public String getPriority() {
 		return "";
 	}
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/ScheduledTaskDelegate.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/ScheduledTaskDelegate.java
index 23b0132d8..1a7782cbc 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/ScheduledTaskDelegate.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/ScheduledTaskDelegate.java
@@ -40,9 +40,6 @@ public class ScheduledTaskDelegate extends AbstractTask {
 
 	public ScheduledTaskDelegate(ScheduledTaskContainer parent, AbstractTask task, Calendar start, Calendar end, long activity) {
 		super(task.getRepositoryUrl(), task.getTaskId(), task.getSummary());
-		if (task == null) {
-			throw new RuntimeException("attempted to instantiated with null task: " + parent);
-		}
 		this.task = task;
 		if (start != null) {
 			this.startMili = start.getTimeInMillis();
@@ -110,66 +107,82 @@ public class ScheduledTaskDelegate extends AbstractTask {
 		return task.getParentContainers();
 	}
 
+	@Override
 	public Set<AbstractTask> getChildren() {
 		return task.getChildren();
 	}
 
+	@Override
 	public Date getCompletionDate() {
 		return task.getCompletionDate();
 	}
 
+	@Override
 	public Date getCreationDate() {
 		return task.getCreationDate();
 	}
 
+	@Override
 	public String getSummary() {
 		return task.getSummary();
 	}
 
+	@Override
 	public int getEstimateTimeHours() {
 		return task.getEstimateTimeHours();
 	}
 
+	@Override
 	public String getTaskKind() {
 		return task.getTaskKind();
 	}
 
+	@Override
 	public String getNotes() {
 		return task.getNotes();
 	}
 
+	@Override
 	public String getPriority() {
 		return task.getPriority();
 	}
 
+	@Override
 	public Date getScheduledForDate() {
 		return task.getScheduledForDate();
 	}
 
+	@Override
 	public String getUrl() {
 		return task.getUrl();
 	}
 
+	@Override
 	public boolean isReminded() {
 		return task.isReminded();
 	}
 
+	@Override
 	public boolean hasValidUrl() {
 		return task.hasValidUrl();
 	}
 
+	@Override
 	public boolean isActive() {
 		return task.isActive();
 	}
 
+	@Override
 	public boolean isCompleted() {
 		return task.isCompleted();
 	}
 
+	@Override
 	public boolean isPastReminder() {
 		return task.isPastReminder();
 	}
 
+	@Override
 	public void setActive(boolean active) {
 		task.setActive(active);
 	}
@@ -184,18 +197,22 @@ public class ScheduledTaskDelegate extends AbstractTask {
 		task.removeParentContainer(container);
 	}
 
+	@Override
 	public void setCompleted(boolean completed) {
 		task.setCompleted(completed);
 	}
 
+	@Override
 	public void setCompletionDate(Date date) {
 		task.setCompletionDate(date);
 	}
 
+	@Override
 	public void setCreationDate(Date date) {
 		task.setCreationDate(date);
 	}
 
+	@Override
 	public void setEstimatedTimeHours(int estimated) {
 		task.setEstimatedTimeHours(estimated);
 	}
@@ -204,49 +221,59 @@ public class ScheduledTaskDelegate extends AbstractTask {
 	// task.setHandleIdentifier(taskId);
 	// }
 
+	@Override
 	public void setTaskKind(String kind) {
 		task.setTaskKind(kind);
 	}
 
+	@Override
 	public void setNotes(String notes) {
 		task.setNotes(notes);
 	}
 
+	@Override
 	public void setPriority(String priority) {
 		task.setPriority(priority);
 	}
 
+	@Override
 	public void setReminded(boolean reminded) {
 		task.setReminded(reminded);
 	}
 
+	@Override
 	public void setScheduledForDate(Date date) {
 		task.setScheduledForDate(date);
 	}
 
+	@Override
 	public void setUrl(String url) {
 		task.setUrl(url);
 	}
 
+	@Override
 	public int compareTo(AbstractTaskContainer taskListElement) {
 		return task.toString().compareTo(((AbstractTask) taskListElement).toString());
 	}
 
+	@Override
 	public void setSummary(String description) {
 		task.setSummary(description);
 	}
 
+	@Override
 	public Date getDueDate() {
 		return task.getDueDate();
 	}
 
+	@Override
 	public void setDueDate(Date date) {
 		task.setDueDate(date);
 	}
 
 	@Override
 	public boolean isLocal() {
-		return ((AbstractTask)task).isLocal();
+		return task.isLocal();
 	}
 
 	@Override
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskArchive.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskArchive.java
index 78f994361..629e979a7 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskArchive.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskArchive.java
@@ -27,6 +27,7 @@ public class TaskArchive extends AbstractTaskCategory {
 		super(HANDLE);
 	}
 
+	@Override
 	public String getPriority() {
 		return PriorityLevel.P5.toString();
 	}
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/UnfiledCategory.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/UnfiledCategory.java
index 1148a6bc7..e1392c1e5 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/UnfiledCategory.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/UnfiledCategory.java
@@ -29,6 +29,7 @@ public class UnfiledCategory extends AbstractTaskCategory {
 		super(HANDLE);
 	}
 	
+	@Override
 	public String getPriority() {
 		return PriorityLevel.P1.toString();
 	}
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryConnector.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryConnector.java
index 0162d9ba9..d450077b1 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryConnector.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryConnector.java
@@ -93,11 +93,8 @@ public abstract class AbstractRepositoryConnector {
 	 */
 	public AbstractTask createTaskFromExistingId(TaskRepository repository, String id, boolean retrieveSubTasks,
 			IProgressMonitor monitor) throws CoreException {
-		AbstractTask task = taskList.getTask(repository.getUrl(), id);
-		AbstractTask repositoryTask = null;
-		if (task instanceof AbstractTask) {
-			repositoryTask = (AbstractTask) task;
-		} else if (task == null && getTaskDataHandler() != null) {
+		AbstractTask repositoryTask = taskList.getTask(repository.getUrl(), id);
+		if (repositoryTask == null && getTaskDataHandler() != null) {
 			RepositoryTaskData taskData = null;
 			taskData = getTaskDataHandler().getTaskData(repository, id, new SubProgressMonitor(monitor, 1));
 			if (taskData != null) {
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryQuery.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryQuery.java
index e4c925532..2a2661b88 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryQuery.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryQuery.java
@@ -37,6 +37,7 @@ public abstract class AbstractRepositoryQuery extends AbstractTaskContainer {
 		super(description);
 	}
 
+	@Override
 	public String getPriority() {
 		if (super.isEmpty()) {
 			return PriorityLevel.P1.toString();
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryStatus.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryStatus.java
index a4f668ba5..a507eb9d2 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryStatus.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryStatus.java
@@ -93,6 +93,7 @@ public class RepositoryStatus extends Status {
 	/**
 	 * Returns the message that is relevant to the code of this status.
 	 */
+	@Override
 	public String getMessage() {
 		String message = super.getMessage();
 		if (message != null && !"".equals(message)) {
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskList.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskList.java
index b8be7f83a..2f059356d 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskList.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskList.java
@@ -173,17 +173,14 @@ public class TaskList {
 
 	public void refactorRepositoryUrl(String oldRepositoryUrl, String newRepositoryUrl) {
 		for (AbstractTask task : tasks.values()) {
-			if (task instanceof AbstractTask) {
-				AbstractTask repositoryTask = (AbstractTask) task;
-				if (oldRepositoryUrl.equals(RepositoryTaskHandleUtil.getRepositoryUrl(repositoryTask.getHandleIdentifier()))) {
-					tasks.remove(repositoryTask.getHandleIdentifier());
-					repositoryTask.setRepositoryUrl(newRepositoryUrl);
-					tasks.put(repositoryTask.getHandleIdentifier(), repositoryTask);
-
-					String taskUrl = repositoryTask.getUrl();
-					if (taskUrl != null && taskUrl.startsWith(oldRepositoryUrl)) {
-						repositoryTask.setUrl(newRepositoryUrl + taskUrl.substring(oldRepositoryUrl.length()));
-					}
+			if (oldRepositoryUrl.equals(RepositoryTaskHandleUtil.getRepositoryUrl(task.getHandleIdentifier()))) {
+				tasks.remove(task.getHandleIdentifier());
+				task.setRepositoryUrl(newRepositoryUrl);
+				tasks.put(task.getHandleIdentifier(), task);
+
+				String taskUrl = task.getUrl();
+				if (taskUrl != null && taskUrl.startsWith(oldRepositoryUrl)) {
+					task.setUrl(newRepositoryUrl + taskUrl.substring(oldRepositoryUrl.length()));
 				}
 			}
 		}
@@ -378,7 +375,7 @@ public class TaskList {
 	}
 
 	/**
-	 * @return	First in set of all active tasks.  Normal user operations only supports a single active task.
+	 * @return First in set of all active tasks. Normal user operations only supports a single active task.
 	 */
 	public AbstractTask getActiveTask() {
 		if (activeTasks.size() > 0) {
@@ -470,14 +467,10 @@ public class TaskList {
 		if (!RepositoryTaskHandleUtil.isValidTaskId(taskId)) {
 			return null;
 		}
-		
+
 		String handle = RepositoryTaskHandleUtil.getHandle(repositoryUrl, taskId);
 		AbstractTask task = getTask(handle);
-		if (task instanceof AbstractTask) {
-			return (AbstractTask) task;
-		} else {
-			return null;
-		}
+		return task;
 	}
 
 	/**
@@ -488,11 +481,9 @@ public class TaskList {
 	 */
 	public AbstractTask getRepositoryTask(String taskUrl) {
 		for (AbstractTask currTask : tasks.values()) {
-			if (currTask instanceof AbstractTask) {
-				String currUrl = ((AbstractTask) currTask).getUrl();
-				if (currUrl != null && !currUrl.equals("") && currUrl.equals(taskUrl)) {
-					return (AbstractTask) currTask;
-				}
+			String currUrl = currTask.getUrl();
+			if (currUrl != null && !currUrl.equals("") && currUrl.equals(taskUrl)) {
+				return currTask;
 			}
 		}
 		return null;
@@ -507,7 +498,8 @@ public class TaskList {
 	public AbstractTask getTaskByKey(String repositoryUrl, String taskKey) {
 		for (AbstractTask task : tasks.values()) {
 			String currentTaskKey = task.getTaskKey();
-			if (currentTaskKey != null && currentTaskKey.equals(taskKey) && task.getRepositoryUrl().equals(repositoryUrl)) {
+			if (currentTaskKey != null && currentTaskKey.equals(taskKey)
+					&& task.getRepositoryUrl().equals(repositoryUrl)) {
 				return task;
 			}
 		}
@@ -516,7 +508,7 @@ public class TaskList {
 
 	public AbstractTaskCategory getContainerForHandle(String categoryHandle) {
 		for (AbstractTaskCategory cat : categories.values()) {
-			if (cat instanceof AbstractTaskCategory) {
+			if (cat != null) {
 				if (cat.getHandleIdentifier().equals(categoryHandle)) {
 					return cat;
 				}
@@ -602,11 +594,8 @@ public class TaskList {
 		Set<AbstractTask> repositoryTasks = new HashSet<AbstractTask>();
 		if (repositoryUrl != null) {
 			for (AbstractTask task : tasks.values()) {
-				if (task instanceof AbstractTask) {
-					AbstractTask repositoryTask = (AbstractTask) task;
-					if (repositoryTask.getRepositoryUrl().equals(repositoryUrl)) {
-						repositoryTasks.add(repositoryTask);
-					}
+				if (task.getRepositoryUrl().equals(repositoryUrl)) {
+					repositoryTasks.add(task);
 				}
 			}
 		}
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepositoryManager.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepositoryManager.java
index 43c49fef9..e7fdc156e 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepositoryManager.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepositoryManager.java
@@ -195,8 +195,8 @@ public class TaskRepositoryManager {
 
 	public TaskRepository getRepositoryForActiveTask(String repositoryKind, TaskList taskList) {
 		AbstractTask activeTask = taskList.getActiveTask();
-		if (activeTask instanceof AbstractTask) {
-			String repositoryUrl = ((AbstractTask) activeTask).getRepositoryUrl();
+		if (activeTask != null) {
+			String repositoryUrl = activeTask.getRepositoryUrl();
 			for (TaskRepository repository : getRepositories(repositoryKind)) {
 				if (repository.getUrl().equals(repositoryUrl)) {
 					return repository;