From 8dc5142641a747372e8042d93161a9a64cb5388a Mon Sep 17 00:00:00 2001
From: spingel
Date: Sat, 24 May 2008 08:11:31 +0000
Subject: NEW - bug 225033: [api] ensure consistent naming of API classes and
 methods https://bugs.eclipse.org/bugs/show_bug.cgi?id=225033

---
 .../eclipse/mylyn/internal/tasks/core/data/TaskDataState.java  | 10 ++++++++--
 .../src/org/eclipse/mylyn/tasks/core/data/TaskAttribute.java   |  9 ---------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/data/TaskDataState.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/data/TaskDataState.java
index 732f1336a..16d27549b 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/data/TaskDataState.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/data/TaskDataState.java
@@ -128,9 +128,9 @@ public class TaskDataState implements ITaskDataWorkingCopy {
 	public void revert() {
 		localTaskData = new TaskData(repositoryTaskData.getAttributeMapper(), repositoryTaskData.getConnectorKind(),
 				repositoryTaskData.getRepositoryUrl(), repositoryTaskData.getTaskId());
-		localTaskData.getRoot().deepCopyFrom(repositoryTaskData.getRoot());
+		deepCopyChildren(repositoryTaskData.getRoot(), localTaskData.getRoot());
 		if (editsTaskData != null) {
-			localTaskData.getRoot().deepCopyFrom(editsTaskData.getRoot());
+			deepCopyChildren(editsTaskData.getRoot(), localTaskData.getRoot());
 		} else {
 			editsTaskData = new TaskData(repositoryTaskData.getAttributeMapper(),
 					repositoryTaskData.getConnectorKind(), repositoryTaskData.getRepositoryUrl(),
@@ -138,6 +138,12 @@ public class TaskDataState implements ITaskDataWorkingCopy {
 		}
 	}
 
+	private void deepCopyChildren(TaskAttribute source, TaskAttribute target) {
+		for (TaskAttribute child : source.getAttributes().values()) {
+			target.deepAddCopy(child);
+		}
+	}
+
 	public void save(IProgressMonitor monitor, Set<TaskAttribute> edits) throws CoreException {
 		for (TaskAttribute edit : edits) {
 			editsTaskData.getRoot().deepAddCopy(edit);
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskAttribute.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskAttribute.java
index e9e9e2180..4735e2b1c 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskAttribute.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskAttribute.java
@@ -327,15 +327,6 @@ public final class TaskAttribute {
 		}
 	}
 
-	// API 3.0 remove
-	public void deepCopyFrom(TaskAttribute source) {
-		if (source.attributeById != null) {
-			for (TaskAttribute child : source.attributeById.values()) {
-				deepAddCopy(child);
-			}
-		}
-	}
-
 	@Override
 	public boolean equals(Object obj) {
 		if (this == obj) {
-- 
cgit v1.2.3