NEW - bug 237552: [api] remove deprecated classes

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

5 files changed, 9 insertions, 178 deletions

diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskCompleteAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskCompleteAction.java
deleted file mode 100644
index 3312cccab..000000000
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskCompleteAction.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *     Eugene Kuleshov - improvements
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.tasks.ui.actions;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
-import org.eclipse.mylyn.internal.tasks.core.ITaskList;
-import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiInternal;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.IRepositoryElement;
-import org.eclipse.mylyn.tasks.ui.TasksUiImages;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Mik Kersten
- * @author Eugene Kuleshov
- */
-public class MarkTaskCompleteAction extends AbstractChangeCompletionAction {
-
-	public static final String ID = "org.eclipse.mylyn.tasklist.actions.mark.completed";
-
-	private static final String ACTION_NAME = "Complete";
-
-	private final List<IRepositoryElement> selectedElements;
-
-	public MarkTaskCompleteAction(List<IRepositoryElement> selectedElements) {
-		this.selectedElements = selectedElements;
-		setText(ACTION_NAME);
-		setToolTipText("Mark " + ACTION_NAME);
-		setId(ID);
-		setImageDescriptor(TasksUiImages.TASK_COMPLETE);
-
-		setEnabled(shouldEnable(selectedElements));
-//		if (allLocalTasks) {
-//			setEnabled(selectedElements.size() > 0);
-//		}
-	}
-
-	@Override
-	public void run() {
-		List<AbstractTask> toComplete = new ArrayList<AbstractTask>();
-		for (Object selectedObject : selectedElements) {
-			if (selectedObject instanceof ITask) {
-				AbstractTask task = (AbstractTask) selectedObject;
-				if (task.isLocal()) {
-					toComplete.add(task);
-				}
-			}
-		}
-		if (toComplete.isEmpty()) {
-			return;
-		} else if (toComplete.size() > 1) {
-			String message = generateMessage(toComplete, ACTION_NAME);
-			boolean markConfirmed = MessageDialog.openQuestion(PlatformUI.getWorkbench()
-					.getActiveWorkbenchWindow()
-					.getShell(), "Confirm Mark Completed", message);
-			if (!markConfirmed) {
-				return;
-			}
-		}
-
-		ITaskList taskList = TasksUiInternal.getTaskList();
-		for (AbstractTask task : toComplete) {
-			task.setCompletionDate(new Date());
-			taskList.notifyElementChanged(task);
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskIncompleteAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskIncompleteAction.java
deleted file mode 100644
index ed220460b..000000000
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskIncompleteAction.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *     Ken Sueda - improvements
- *     Eugene Kuleshov - improvements
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.tasks.ui.actions;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
-import org.eclipse.mylyn.internal.tasks.core.ITaskList;
-import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiInternal;
-import org.eclipse.mylyn.tasks.core.IRepositoryElement;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.ui.TasksUiImages;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Mik Kersten
- */
-public class MarkTaskIncompleteAction extends AbstractChangeCompletionAction {
-
-	private static final String ACTION_NAME = "Incomplete";
-
-	public static final String ID = "org.eclipse.mylyn.tasklist.actions.mark.incomplete";
-
-	private final List<IRepositoryElement> selectedElements;
-
-	public MarkTaskIncompleteAction(List<IRepositoryElement> selectedElements) {
-		this.selectedElements = selectedElements;
-		setText(ACTION_NAME);
-		setToolTipText("Mark " + ACTION_NAME);
-		setId(ID);
-		setImageDescriptor(TasksUiImages.TASK_INCOMPLETE);
-
-		setEnabled(shouldEnable(selectedElements));
-	}
-
-	@Override
-	public void run() {
-		List<AbstractTask> toComplete = new ArrayList<AbstractTask>();
-		for (Object selectedObject : selectedElements) {
-			if (selectedObject instanceof ITask) {
-				AbstractTask task = (AbstractTask) selectedObject;
-				if (task.isLocal()) {
-					toComplete.add(task);
-				}
-			}
-		}
-		if (toComplete.isEmpty()) {
-			return;
-		} else if (toComplete.size() > 1) {
-
-			String message = generateMessage(toComplete, ACTION_NAME);
-			boolean markConfirmed = MessageDialog.openQuestion(PlatformUI.getWorkbench()
-					.getActiveWorkbenchWindow()
-					.getShell(), "Confirm Mark Incompleted", message);
-			if (!markConfirmed) {
-				return;
-			}
-		}
-
-		ITaskList taskList = TasksUiInternal.getTaskList();
-		for (AbstractTask task : toComplete) {
-			task.setCompletionDate(null);
-			taskList.notifyElementChanged(task);
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/MarkTaskHandler.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/MarkTaskHandler.java
index e2d960a21..a628bff9c 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/MarkTaskHandler.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/MarkTaskHandler.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2004, 2008 Tasktop Technologies and others.
+ * Copyright (c) 2004, 2008 Tasktop Technologies and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -39,6 +39,9 @@ public abstract class MarkTaskHandler extends AbstractTaskHandler {
 	}
 
 	public static class MarkTaskCompleteHandler extends AbstractTaskHandler {
+
+		public static final String ID_COMMAND = "org.eclipse.mylyn.tasks.ui.command.markTaskComplete";
+
 		@Override
 		protected void execute(ExecutionEvent event, ITask task) throws ExecutionException {
 			if (TasksUiInternal.hasLocalCompletionState(task)) {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskDiffUtil.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskDiffUtil.java
index fb7915e61..9796b69ce 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskDiffUtil.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskDiffUtil.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2004, 2008 Tasktop Technologies and others.
+ * Copyright (c) 2004, 2008 Tasktop Technologies and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -79,7 +79,6 @@ public class TaskDiffUtil {
 			}
 		}
 		return foldSpaces(text);
-
 	}
 
 	public static String listToString(List<String> values) {
@@ -101,7 +100,7 @@ public class TaskDiffUtil {
 	}
 
 	public static String foldSpaces(String value) {
-		return value.replaceAll("\\s", " ").trim();
+		return value.replaceAll("\\s+", " ").trim();
 	}
 
 	public static String trim(String value, int length) {
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 9f36fc38a..dcbe6fa14 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2004, 2008 Tasktop Technologies and others.
+ * Copyright (c) 2004, 2008 Tasktop Technologies and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -72,7 +72,6 @@ import org.eclipse.mylyn.internal.tasks.core.ITaskListChangeListener;
 import org.eclipse.mylyn.internal.tasks.core.TaskCategory;
 import org.eclipse.mylyn.internal.tasks.core.TaskContainerDelta;
 import org.eclipse.mylyn.internal.tasks.core.UncategorizedTaskContainer;
-import org.eclipse.mylyn.internal.tasks.core.UnmatchedTaskContainer;
 import org.eclipse.mylyn.internal.tasks.ui.AbstractTaskListFilter;
 import org.eclipse.mylyn.internal.tasks.ui.CategorizedPresentation;
 import org.eclipse.mylyn.internal.tasks.ui.IDynamicSubMenuContributor;
@@ -94,8 +93,6 @@ import org.eclipse.mylyn.internal.tasks.ui.actions.GoIntoAction;
 import org.eclipse.mylyn.internal.tasks.ui.actions.GoUpAction;
 import org.eclipse.mylyn.internal.tasks.ui.actions.GroupSubTasksAction;
 import org.eclipse.mylyn.internal.tasks.ui.actions.LinkWithEditorAction;
-import org.eclipse.mylyn.internal.tasks.ui.actions.MarkTaskCompleteAction;
-import org.eclipse.mylyn.internal.tasks.ui.actions.MarkTaskIncompleteAction;
 import org.eclipse.mylyn.internal.tasks.ui.actions.OpenTaskListElementAction;
 import org.eclipse.mylyn.internal.tasks.ui.actions.OpenTasksUiPreferencesAction;
 import org.eclipse.mylyn.internal.tasks.ui.actions.OpenWithBrowserAction;
@@ -1405,11 +1402,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 				action.setEnabled(true);
 			}
 		} else if (element != null) {
-			if (action instanceof MarkTaskCompleteAction) {
-				action.setEnabled(false);
-			} else if (action instanceof MarkTaskIncompleteAction) {
-				action.setEnabled(false);
-			} else if (action instanceof DeleteAction) {
+			if (action instanceof DeleteAction) {
 				if (element instanceof UncategorizedTaskContainer) {
 					action.setEnabled(false);
 				} else {
@@ -1555,10 +1548,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 		}
 	}
 
-	/**
-	 * @API-3.0 eliminate parameter from this method
-	 */
-	public void clearFilters(boolean preserveArchiveFilter) {
+	public void clearFilters() {
 		filters.clear();
 		filters.add(filterArchive);
 		filters.add(filterWorkingSet);