Attachment 97913 Details for Bug 168878 – patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch

clipboard.txt (text/plain), 26.46 KB, created by Steffen Pingel

on 2008-04-29 03:02:33 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Steffen Pingel

Created: 2008-04-29 03:02:33 EDT

Size: 26.46 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn.context.ui
>Index: src/org/eclipse/mylyn/internal/context/ui/TaskListInterestFilter.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/TaskListInterestFilter.java,v
>retrieving revision 1.65
>diff -u -r1.65 TaskListInterestFilter.java
>--- src/org/eclipse/mylyn/internal/context/ui/TaskListInterestFilter.java	11 Apr 2008 03:25:28 -0000	1.65
>+++ src/org/eclipse/mylyn/internal/context/ui/TaskListInterestFilter.java	29 Apr 2008 07:01:58 -0000
>@@ -9,7 +9,7 @@
> package org.eclipse.mylyn.internal.context.ui;
> 
> import java.util.Calendar;
>-import java.util.Set;
>+import java.util.Collection;
> 
> import org.eclipse.core.runtime.IStatus;
> import org.eclipse.core.runtime.Status;
>@@ -51,7 +51,7 @@
> 					}
> 				}
> 			} else if (child instanceof AbstractTaskContainer) {
>-				Set<AbstractTask> children = ((AbstractTaskContainer) child).getChildren();
>+				Collection<AbstractTask> children = ((AbstractTaskContainer) child).getChildren();
> 				// Always display empty containers
> 				if (children.size() == 0) {
> 					return false;
>@@ -95,8 +95,8 @@
> 				|| !task.isCompleted()
> 				&& (LocalRepositoryConnector.DEFAULT_SUMMARY.equals(task.getSummary())
> 						|| shouldShowInFocusedWorkweekDateContainer(parent, task)
>-						|| TasksUiPlugin.getTaskActivityManager().isOverdue(task) || isInterestingForThisWeek(parent, task) || hasInterestingSubTasks(
>-						parent, task, depth));
>+						|| TasksUiPlugin.getTaskActivityManager().isOverdue(task)
>+						|| isInterestingForThisWeek(parent, task) || hasInterestingSubTasks(parent, task, depth));
> 	}
> 
> 	private boolean hasInterestingSubTasks(Object parent, AbstractTask task, int depth) {
>#P org.eclipse.mylyn.bugzilla.tests
>Index: src/org/eclipse/mylyn/bugzilla/tests/TaskListStandaloneTest.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListStandaloneTest.java,v
>retrieving revision 1.28
>diff -u -r1.28 TaskListStandaloneTest.java
>--- src/org/eclipse/mylyn/bugzilla/tests/TaskListStandaloneTest.java	11 Apr 2008 03:26:16 -0000	1.28
>+++ src/org/eclipse/mylyn/bugzilla/tests/TaskListStandaloneTest.java	29 Apr 2008 07:01:59 -0000
>@@ -10,9 +10,9 @@
> 
> import java.util.ArrayList;
> import java.util.Calendar;
>+import java.util.Collection;
> import java.util.Date;
> import java.util.List;
>-import java.util.Set;
> 
> import junit.framework.TestCase;
> 
>@@ -63,7 +63,7 @@
> 		manager.resetTaskList();
> 		manager.readExistingOrCreateNewList();
> 		assertEquals(1, manager.getTaskList().getAllTasks().size());
>-		Set<AbstractTask> readList = manager.getTaskList().getDefaultCategory().getChildren();
>+		Collection<AbstractTask> readList = manager.getTaskList().getDefaultCategory().getChildren();
> 		AbstractTask readTask = readList.iterator().next();
> 		assertTrue(readTask.getSummary().equals("task 1"));
> 		assertTrue(readTask.getDueDate().compareTo(dueDate) == 0);
>@@ -108,7 +108,7 @@
> 		// assertNotNull(manager.getTaskList());
> 		assertEquals(1, manager.getTaskList().getDefaultCategory().getChildren().size());
> 
>-		Set<AbstractTask> readList = manager.getTaskList().getDefaultCategory().getChildren();
>+		Collection<AbstractTask> readList = manager.getTaskList().getDefaultCategory().getChildren();
> 		AbstractTask readTask = readList.iterator().next();
> 		assertTrue(readTask.getSummary().equals("task 1"));
> 
>Index: src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskListManagerTest.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskListManagerTest.java,v
>retrieving revision 1.29
>diff -u -r1.29 BugzillaTaskListManagerTest.java
>--- src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskListManagerTest.java	17 Apr 2008 23:32:20 -0000	1.29
>+++ src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskListManagerTest.java	29 Apr 2008 07:01:59 -0000
>@@ -170,7 +170,7 @@
> 		manager.setTaskListFile(originalFile);
> 
> 		Collection<AbstractTask> allTasks = manager.getTaskList().getAllTasks();
>-		Set<AbstractTask> allRootTasks = manager.getTaskList().getDefaultCategory().getChildren();
>+		Collection<AbstractTask> allRootTasks = manager.getTaskList().getDefaultCategory().getChildren();
> 		Set<AbstractTaskCategory> allCategories = manager.getTaskList().getCategories();
> 		Set<AbstractTaskContainer> allRoots = manager.getTaskList().getRootElements();
> 		assertEquals(0, allRootTasks.size());
>#P org.eclipse.mylyn.sandbox.ui
>Index: src/org/eclipse/mylyn/internal/sandbox/bridge/bugs/BugzillaMylynSearchOperation.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/sandbox/org.eclipse.mylyn.sandbox.ui/src/org/eclipse/mylyn/internal/sandbox/bridge/bugs/BugzillaMylynSearchOperation.java,v
>retrieving revision 1.11
>diff -u -r1.11 BugzillaMylynSearchOperation.java
>--- src/org/eclipse/mylyn/internal/sandbox/bridge/bugs/BugzillaMylynSearchOperation.java	25 Apr 2008 06:39:25 -0000	1.11
>+++ src/org/eclipse/mylyn/internal/sandbox/bridge/bugs/BugzillaMylynSearchOperation.java	29 Apr 2008 07:02:00 -0000
>@@ -11,6 +11,7 @@
> package org.eclipse.mylyn.internal.sandbox.bridge.bugs;
> 
> import java.util.ArrayList;
>+import java.util.Collection;
> import java.util.HashSet;
> import java.util.Iterator;
> import java.util.List;
>@@ -210,8 +211,8 @@
> 	 * @param monitor
> 	 *            The progress monitor
> 	 */
>-	private void searchLocal(Set<AbstractTask> tasks, ProgressQueryHitCollector searchCollector, String elementName,
>-			IProgressMonitor monitor) {
>+	private void searchLocal(Collection<AbstractTask> tasks, ProgressQueryHitCollector searchCollector,
>+			String elementName, IProgressMonitor monitor) {
> 		if (tasks == null) {
> 			return;
> 		}
>#P org.eclipse.mylyn.tasks.ui
>Index: src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListContentProvider.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListContentProvider.java,v
>retrieving revision 1.65
>diff -u -r1.65 TaskListContentProvider.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListContentProvider.java	15 Apr 2008 06:30:47 -0000	1.65
>+++ src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListContentProvider.java	29 Apr 2008 07:02:00 -0000
>@@ -9,6 +9,7 @@
> package org.eclipse.mylyn.internal.tasks.ui.views;
> 
> import java.util.ArrayList;
>+import java.util.Collection;
> import java.util.Collections;
> import java.util.HashSet;
> import java.util.Iterator;
>@@ -138,7 +139,7 @@
> 		if (containsNoFilterText((this.taskListView.getFilteredTree().getFilterControl()).getText())) {
> 			List<AbstractTaskContainer> children = new ArrayList<AbstractTaskContainer>();
> 			if (parent instanceof AbstractTask) {
>-				Set<AbstractTask> subTasks = ((AbstractTask) parent).getChildren();
>+				Collection<AbstractTask> subTasks = ((AbstractTask) parent).getChildren();
> 				for (AbstractTask t : subTasks) {
> 					if (!filter(parent, t)) {
> 						children.add(t);
>@@ -164,7 +165,7 @@
> 	private List<AbstractTaskContainer> getFilteredRootChildren(AbstractTaskContainer parent) {
> 		List<AbstractTaskContainer> result = new ArrayList<AbstractTaskContainer>();
> 		if (TasksUiPlugin.getDefault().groupSubtasks(parent)) {
>-			Set<AbstractTask> parentTasks = parent.getChildren();
>+			Collection<AbstractTask> parentTasks = parent.getChildren();
> 			Set<AbstractTaskContainer> parents = new HashSet<AbstractTaskContainer>();
> 			Set<AbstractTask> children = new HashSet<AbstractTask>();
> 			// get all children
>Index: src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultTreeContentProvider.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultTreeContentProvider.java,v
>retrieving revision 1.7
>diff -u -r1.7 SearchResultTreeContentProvider.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultTreeContentProvider.java	28 Apr 2008 22:00:02 -0000	1.7
>+++ src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultTreeContentProvider.java	29 Apr 2008 07:02:00 -0000
>@@ -9,10 +9,10 @@
> package org.eclipse.mylyn.internal.tasks.ui.search;
> 
> import java.util.ArrayList;
>+import java.util.Collection;
> import java.util.HashMap;
> import java.util.List;
> import java.util.Map;
>-import java.util.Set;
> 
> import org.eclipse.jface.viewers.Viewer;
> import org.eclipse.mylyn.internal.tasks.core.Person;
>@@ -75,14 +75,14 @@
> 
> 	public Object[] getChildren(Object parentElement) {
> 		if (selectedGroup == GroupBy.OWNER && parentElement instanceof Person) {
>-			Set<AbstractTask> children = ((Person) parentElement).getChildren();
>+			Collection<AbstractTask> children = ((Person) parentElement).getChildren();
> 			if (children != null) {
> 				return children.toArray();
> 			} else {
> 				return EMPTY_ARR;
> 			}
> 		} else if (selectedGroup == GroupBy.COMPLETION && parentElement instanceof TaskGroup) {
>-			Set<AbstractTask> children = ((TaskGroup) parentElement).getChildren();
>+			Collection<AbstractTask> children = ((TaskGroup) parentElement).getChildren();
> 			if (children != null) {
> 				return children.toArray();
> 			} else {
>@@ -99,7 +99,7 @@
> 
> 	public boolean hasChildren(Object element) {
> 		if (selectedGroup == GroupBy.OWNER && element instanceof String) {
>-			Set<AbstractTask> children = ((Person) element).getChildren();
>+			Collection<AbstractTask> children = ((Person) element).getChildren();
> 			if (children != null) {
> 				return !children.isEmpty();
> 			} else {
>Index: src/org/eclipse/mylyn/internal/tasks/ui/AbstractTaskListFilter.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AbstractTaskListFilter.java,v
>retrieving revision 1.14
>diff -u -r1.14 AbstractTaskListFilter.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/AbstractTaskListFilter.java	11 Apr 2008 03:25:53 -0000	1.14
>+++ src/org/eclipse/mylyn/internal/tasks/ui/AbstractTaskListFilter.java	29 Apr 2008 07:02:00 -0000
>@@ -7,7 +7,7 @@
>  *******************************************************************************/
> package org.eclipse.mylyn.internal.tasks.ui;
> 
>-import java.util.Set;
>+import java.util.Collection;
> 
> import org.eclipse.mylyn.internal.tasks.core.ITasksCoreConstants;
> import org.eclipse.mylyn.tasks.core.AbstractTask;
>@@ -38,7 +38,7 @@
> 	}
> 
> 	private static boolean hasDescendantIncoming(AbstractTaskContainer container, int depth) {
>-		Set<AbstractTask> children = container.getChildren();
>+		Collection<AbstractTask> children = container.getChildren();
> 		if (children == null || depth <= 0) {
> 			return false;
> 		}
>@@ -58,7 +58,7 @@
> 	}
> 
> 	private static boolean hasIncompleteDescendant(AbstractTaskContainer container, int depth) {
>-		Set<AbstractTask> children = container.getChildren();
>+		Collection<AbstractTask> children = container.getChildren();
> 		if (children == null || depth <= 0) {
> 			return false;
> 		}
>#P org.eclipse.mylyn.tasks.tests
>Index: src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java,v
>retrieving revision 1.95
>diff -u -r1.95 TaskListManagerTest.java
>--- src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java	25 Apr 2008 06:39:23 -0000	1.95
>+++ src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java	29 Apr 2008 07:02:01 -0000
>@@ -12,6 +12,7 @@
> import java.io.IOException;
> import java.util.ArrayList;
> import java.util.Calendar;
>+import java.util.Collection;
> import java.util.Date;
> import java.util.HashSet;
> import java.util.Iterator;
>@@ -229,13 +230,15 @@
> 		RepositoryTaskData taskData = new RepositoryTaskData(new MockAttributeFactory(), task.getConnectorKind(),
> 				task.getRepositoryUrl(), task.getTaskId(), task.getTaskKind());
> 		TasksUiPlugin.getTaskDataStorageManager().setNewTaskData(taskData);
>-		assertNotNull(TasksUiPlugin.getTaskDataStorageManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId()));
>+		assertNotNull(TasksUiPlugin.getTaskDataStorageManager().getNewTaskData(task.getRepositoryUrl(),
>+				task.getTaskId()));
> 
> 		RepositoryTaskData taskData2 = new RepositoryTaskData(new MockAttributeFactory(), task2.getConnectorKind(),
> 				task2.getRepositoryUrl(), task2.getTaskId(), task2.getTaskKind());
> 		taskData2.setNewComment("TEST");
> 		TasksUiPlugin.getTaskDataStorageManager().setNewTaskData(taskData2);
>-		assertNotNull(TasksUiPlugin.getTaskDataStorageManager().getNewTaskData(task2.getRepositoryUrl(), task2.getTaskId()));
>+		assertNotNull(TasksUiPlugin.getTaskDataStorageManager().getNewTaskData(task2.getRepositoryUrl(),
>+				task2.getTaskId()));
> 		assertEquals("TEST", TasksUiPlugin.getTaskDataStorageManager().getNewTaskData(task2.getRepositoryUrl(),
> 				task2.getTaskId()).getNewComment());
> 
>@@ -243,8 +246,8 @@
> 		assertNull(manager.getTaskList().getTask("http://a-123"));
> 		assertNotNull(manager.getTaskList().getTask("http://b-123"));
> 		assertNotNull(TasksUiPlugin.getTaskDataStorageManager().getNewTaskData("http://b", "123"));
>-		RepositoryTaskData otherData = TasksUiPlugin.getTaskDataStorageManager().getNewTaskData(task2.getRepositoryUrl(),
>-				task2.getTaskId());
>+		RepositoryTaskData otherData = TasksUiPlugin.getTaskDataStorageManager().getNewTaskData(
>+				task2.getRepositoryUrl(), task2.getTaskId());
> 		assertNotNull(otherData);
> 		assertEquals("TEST", otherData.getNewComment());
> 	}
>@@ -672,7 +675,7 @@
> //		assertTrue(rootTasks.containsAll(manager.getTaskList().getOrphanContainer(
> //				LocalRepositoryConnector.REPOSITORY_URL).getChildren()));
> 
>-		Set<AbstractTask> readList = manager.getTaskList().getDefaultCategory().getChildren();
>+		Collection<AbstractTask> readList = manager.getTaskList().getDefaultCategory().getChildren();
> 		for (AbstractTask task : readList) {
> 			if (task.equals(task1)) {
> 				assertEquals(task1.getSummary(), task.getSummary());
>@@ -737,7 +740,7 @@
> //		assertTrue(rootTasks.containsAll(manager.getTaskList().getOrphanContainer(
> //				LocalRepositoryConnector.REPOSITORY_URL).getChildren()));
> 
>-		Set<AbstractTask> readList = manager.getTaskList().getDefaultCategory().getChildren();
>+		Collection<AbstractTask> readList = manager.getTaskList().getDefaultCategory().getChildren();
> 		for (AbstractTask task : readList) {
> 			if (task.equals(task1)) {
> 				assertEquals(task1.getSummary(), task.getSummary());
>Index: src/org/eclipse/mylyn/tasks/tests/TaskListDnDTest.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListDnDTest.java,v
>retrieving revision 1.13
>diff -u -r1.13 TaskListDnDTest.java
>--- src/org/eclipse/mylyn/tasks/tests/TaskListDnDTest.java	15 Apr 2008 06:30:43 -0000	1.13
>+++ src/org/eclipse/mylyn/tasks/tests/TaskListDnDTest.java	29 Apr 2008 07:02:01 -0000
>@@ -8,7 +8,7 @@
> 
> package org.eclipse.mylyn.tasks.tests;
> 
>-import java.util.Set;
>+import java.util.Collection;
> 
> import junit.framework.TestCase;
> 
>@@ -65,7 +65,7 @@
> 		String urlData = url + "\n" + title;
> 
> 		dropAdapter.performDrop(urlData);
>-		Set<AbstractTask> tasks = manager.getTaskList().getDefaultCategory().getChildren();
>+		Collection<AbstractTask> tasks = manager.getTaskList().getDefaultCategory().getChildren();
> 		assertNotNull(tasks);
> 		assertEquals(1, tasks.size());
> 		assertEquals(url, tasks.iterator().next().getUrl());
>#P org.eclipse.mylyn.tasks.core
>Index: src/org/eclipse/mylyn/tasks/core/AbstractTaskContainer.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTaskContainer.java,v
>retrieving revision 1.40
>diff -u -r1.40 AbstractTaskContainer.java
>--- src/org/eclipse/mylyn/tasks/core/AbstractTaskContainer.java	15 Apr 2008 21:30:56 -0000	1.40
>+++ src/org/eclipse/mylyn/tasks/core/AbstractTaskContainer.java	29 Apr 2008 07:02:02 -0000
>@@ -7,10 +7,11 @@
>  *******************************************************************************/
> package org.eclipse.mylyn.tasks.core;
> 
>+import java.util.Collection;
> import java.util.Collections;
> import java.util.HashSet;
> import java.util.Set;
>-import java.util.concurrent.CopyOnWriteArraySet;
>+import java.util.concurrent.CopyOnWriteArrayList;
> 
> import org.eclipse.core.runtime.Assert;
> import org.eclipse.core.runtime.PlatformObject;
>@@ -27,7 +28,7 @@
> 
> 	private String handleIdentifier = "";
> 
>-	private final Set<AbstractTask> children = new CopyOnWriteArraySet<AbstractTask>();
>+	private final Collection<AbstractTask> children = new CopyOnWriteArrayList<AbstractTask>();
> 
> 	/**
> 	 * Optional URL corresponding to the web resource associated with this container.
>@@ -61,9 +62,11 @@
> 	 * Removes any cyclic dependencies in children.
> 	 * 
> 	 * TODO: review to make sure that this is too expensive, or move to creation.
>+	 * 
>+	 * @since 3.0
> 	 */
>-	public Set<AbstractTask> getChildren() {
>-		return Collections.unmodifiableSet(children);
>+	public Collection<AbstractTask> getChildren() {
>+		return Collections.unmodifiableCollection(children);
> 	}
> 
> 	/**
>@@ -71,10 +74,10 @@
> 	 * 
> 	 * API-3.0: remove this method (bug 207659)
> 	 * 
>-	 * @since 2.2
>+	 * @since 3.0
> 	 */
>-	public Set<AbstractTask> getChildrenInternal() {
>-		return Collections.unmodifiableSet(children);
>+	public Collection<AbstractTask> getChildrenInternal() {
>+		return Collections.unmodifiableCollection(children);
> 	}
> 
> 	/**
>@@ -87,7 +90,7 @@
> 		return containsHelper(getChildrenInternal(), handle, new HashSet<AbstractTaskContainer>());
> 	}
> 
>-	private boolean containsHelper(Set<AbstractTask> children, String handle,
>+	private boolean containsHelper(Collection<AbstractTask> children, String handle,
> 			Set<AbstractTaskContainer> visitedContainers) {
> 		for (AbstractTask child : children) {
> 			if (visitedContainers.contains(child)) {
>@@ -155,7 +158,7 @@
> 
> 	public String getPriority() {
> 		String highestPriority = PriorityLevel.P5.toString();
>-		Set<AbstractTask> tasks = getChildren();
>+		Collection<AbstractTask> tasks = getChildren();
> 		if (tasks.isEmpty()) {
> 			return PriorityLevel.P1.toString();
> 		}
>Index: src/org/eclipse/mylyn/internal/tasks/core/ScheduledTaskDelegate.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/ScheduledTaskDelegate.java,v
>retrieving revision 1.13
>diff -u -r1.13 ScheduledTaskDelegate.java
>--- src/org/eclipse/mylyn/internal/tasks/core/ScheduledTaskDelegate.java	27 Mar 2008 18:27:53 -0000	1.13
>+++ src/org/eclipse/mylyn/internal/tasks/core/ScheduledTaskDelegate.java	29 Apr 2008 07:02:02 -0000
>@@ -9,6 +9,7 @@
> package org.eclipse.mylyn.internal.tasks.core;
> 
> import java.util.Calendar;
>+import java.util.Collection;
> import java.util.Date;
> import java.util.Set;
> 
>@@ -75,7 +76,7 @@
> 	}
> 
> 	@Override
>-	public Set<AbstractTask> getChildren() {
>+	public Collection<AbstractTask> getChildren() {
> 		return task.getChildren();
> 	}
> 
>@@ -303,7 +304,7 @@
> 	}
> 
> 	@Override
>-	public Set<AbstractTask> getChildrenInternal() {
>+	public Collection<AbstractTask> getChildrenInternal() {
> 		return task.getChildrenInternal();
> 	}
> 
>Index: src/org/eclipse/mylyn/internal/tasks/core/ScheduledTaskContainer.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/ScheduledTaskContainer.java,v
>retrieving revision 1.20
>diff -u -r1.20 ScheduledTaskContainer.java
>--- src/org/eclipse/mylyn/internal/tasks/core/ScheduledTaskContainer.java	25 Apr 2008 00:39:09 -0000	1.20
>+++ src/org/eclipse/mylyn/internal/tasks/core/ScheduledTaskContainer.java	29 Apr 2008 07:02:02 -0000
>@@ -9,6 +9,7 @@
> package org.eclipse.mylyn.internal.tasks.core;
> 
> import java.util.Calendar;
>+import java.util.Collection;
> import java.util.Date;
> import java.util.GregorianCalendar;
> import java.util.HashSet;
>@@ -175,7 +176,7 @@
> 	}
> 
> 	@Override
>-	public Set<AbstractTask> getChildren() {
>+	public Collection<AbstractTask> getChildren() {
> 		Set<AbstractTask> children = new HashSet<AbstractTask>();
> 		Calendar beginning = TaskActivityUtil.getCalendar();
> 		beginning.setTimeInMillis(0);
>@@ -229,7 +230,7 @@
> 	}
> 
> 	@Override
>-	public Set<AbstractTask> getChildrenInternal() {
>+	public Collection<AbstractTask> getChildrenInternal() {
> 		return getChildren();
> 	}
> 
>Index: .refactorings/2008/4/18/refactorings.index
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.core/.refactorings/2008/4/18/refactorings.index,v
>retrieving revision 1.1
>diff -u -r1.1 refactorings.index
>--- .refactorings/2008/4/18/refactorings.index	28 Apr 2008 09:14:51 -0000	1.1
>+++ .refactorings/2008/4/18/refactorings.index	29 Apr 2008 07:02:02 -0000
>@@ -1,2 +1,4 @@
> 1209358992572	Rename method 'createWorkingCopy'
> 1209364083738	Rename method 'getStatus'
>+1209451931458	Change method 'getChildren'
>+1209451956451	Change method 'getChildrenInternal'
>Index: .refactorings/2008/4/18/refactorings.history
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.core/.refactorings/2008/4/18/refactorings.history,v
>retrieving revision 1.1
>diff -u -r1.1 refactorings.history
>--- .refactorings/2008/4/18/refactorings.history	28 Apr 2008 09:14:51 -0000	1.1
>+++ .refactorings/2008/4/18/refactorings.history	29 Apr 2008 07:02:02 -0000
>@@ -1,3 +1,3 @@
> <?xml version="1.0" encoding="UTF-8"?>
>-<session version="1.0">&#x0A;<refactoring comment="Rename method &apos;org.eclipse.mylyn.tasks.core.data.ITaskDataManager.createWorkingCopy(...)&apos; to &apos;getWorkingCopy&apos;&#x0A;- Original project: &apos;org.eclipse.mylyn.tasks.core&apos;&#x0A;- Original element: &apos;org.eclipse.mylyn.tasks.core.data.ITaskDataManager.createWorkingCopy(...)&apos;&#x0A;- Renamed element: &apos;org.eclipse.mylyn.tasks.core.data.ITaskDataManager.getWorkingCopy(...)&apos;&#x0A;- Update references to refactored element" delegate="false" deprecate="false" description="Rename method &apos;createWorkingCopy&apos;" flags="589830" id="org.eclipse.jdt.ui.rename.method" input="/src&lt;org.eclipse.mylyn.tasks.core.data{ITaskDataManager.java[ITaskDataManager~createWorkingCopy~QAbstractTask;~QString;" name="getWorkingCopy" references="true" stamp="1209358992572" version="1.0"/>&#x0A;<refactoring comment="Rename method &apos;org.eclipse.mylyn.tasks.core.sync.SubmitJob.getStatus()&apos; to &apos;getError&apos;&#x0A;- Original project: &apos;org.eclipse.mylyn.tasks.core&apos;&#x0A;- Original element: &apos;org.eclipse.mylyn.tasks.core.sync.SubmitJob.getStatus()&apos;&#x0A;- Renamed element: &apos;org.eclipse.mylyn.tasks.core.sync.SubmitJob.getError()&apos;&#x0A;- Update references to refactored element" delegate="false" deprecate="false" description="Rename method &apos;getStatus&apos;" flags="589830" id="org.eclipse.jdt.ui.rename.method" input="/src&lt;org.eclipse.mylyn.tasks.core.sync{SubmitJob.java[SubmitJob~getStatus" name="getError" references="true" stamp="1209364083738" version="1.0"/>
>+<session version="1.0">&#x0A;<refactoring comment="Rename method &apos;org.eclipse.mylyn.tasks.core.data.ITaskDataManager.createWorkingCopy(...)&apos; to &apos;getWorkingCopy&apos;&#x0A;- Original project: &apos;org.eclipse.mylyn.tasks.core&apos;&#x0A;- Original element: &apos;org.eclipse.mylyn.tasks.core.data.ITaskDataManager.createWorkingCopy(...)&apos;&#x0A;- Renamed element: &apos;org.eclipse.mylyn.tasks.core.data.ITaskDataManager.getWorkingCopy(...)&apos;&#x0A;- Update references to refactored element" delegate="false" deprecate="false" description="Rename method &apos;createWorkingCopy&apos;" flags="589830" id="org.eclipse.jdt.ui.rename.method" input="/src&lt;org.eclipse.mylyn.tasks.core.data{ITaskDataManager.java[ITaskDataManager~createWorkingCopy~QAbstractTask;~QString;" name="getWorkingCopy" references="true" stamp="1209358992572" version="1.0"/>&#x0A;<refactoring comment="Rename method &apos;org.eclipse.mylyn.tasks.core.sync.SubmitJob.getStatus()&apos; to &apos;getError&apos;&#x0A;- Original project: &apos;org.eclipse.mylyn.tasks.core&apos;&#x0A;- Original element: &apos;org.eclipse.mylyn.tasks.core.sync.SubmitJob.getStatus()&apos;&#x0A;- Renamed element: &apos;org.eclipse.mylyn.tasks.core.sync.SubmitJob.getError()&apos;&#x0A;- Update references to refactored element" delegate="false" deprecate="false" description="Rename method &apos;getStatus&apos;" flags="589830" id="org.eclipse.jdt.ui.rename.method" input="/src&lt;org.eclipse.mylyn.tasks.core.sync{SubmitJob.java[SubmitJob~getStatus" name="getError" references="true" stamp="1209364083738" version="1.0"/>&#x0A;<refactoring comment="Change method &apos;public Set&lt;AbstractTask&gt; org.eclipse.mylyn.tasks.core.AbstractTaskContainer.getChildren()&apos; to &apos;public Collection&lt;AbstractTask&gt; getChildren()&apos;&#x0A;- Original project: &apos;org.eclipse.mylyn.tasks.core&apos;&#x0A;- Original element: &apos;org.eclipse.mylyn.tasks.core.AbstractTaskContainer.getChildren()&apos;&#x0A;- New return type: &apos;Collection&lt;AbstractTask&gt;&apos;" delegate="false" deprecate="true" description="Change method &apos;getChildren&apos;" flags="589830" id="org.eclipse.jdt.ui.change.method.signature" input="/src&lt;org.eclipse.mylyn.tasks.core{AbstractTaskContainer.java[AbstractTaskContainer~getChildren" name="getChildren" return="Collection&lt;AbstractTask&gt;" stamp="1209451931458" version="1.0"/>&#x0A;<refactoring comment="Change method &apos;public Set&lt;AbstractTask&gt; org.eclipse.mylyn.tasks.core.AbstractTaskContainer.getChildrenInternal()&apos; to &apos;public Collection&lt;AbstractTask&gt; getChildrenInternal()&apos;&#x0A;- Original project: &apos;org.eclipse.mylyn.tasks.core&apos;&#x0A;- Original element: &apos;org.eclipse.mylyn.tasks.core.AbstractTaskContainer.getChildrenInternal()&apos;&#x0A;- New return type: &apos;Collection&lt;AbstractTask&gt;&apos;" delegate="false" deprecate="true" description="Change method &apos;getChildrenInternal&apos;" flags="589830" id="org.eclipse.jdt.ui.change.method.signature" input="/src&lt;org.eclipse.mylyn.tasks.core{AbstractTaskContainer.java[AbstractTaskContainer~getChildrenInternal" name="getChildrenInternal" return="Collection&lt;AbstractTask&gt;" stamp="1209451956451" version="1.0"/>
> </session>
>\ No newline at end of file

Actions: View | Diff

Attachments on bug 168878: 97913 | 97914