NEW - bug 225033: [api] ensure consistent naming of API classes and methods

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

5 files changed, 20 insertions, 148 deletions

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 304a8c9f5..dd3bfd8de 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
@@ -295,7 +295,7 @@ public final class TaskAttribute {
 		attributeById = null;
 	}
 
-	void clearMetaData() {
+	void clearMetaDataMap() {
 		metaData = null;
 	}
 
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskAttributeMetaData.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskAttributeMetaData.java
index 09f385c7e..55f7f35ea 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskAttributeMetaData.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskAttributeMetaData.java
@@ -31,6 +31,11 @@ public class TaskAttributeMetaData {
 		return this;
 	}
 
+	public TaskAttributeMetaData clear() {
+		taskAttribute.clearMetaDataMap();
+		return this;
+	}
+
 	public String getDefaultOption() {
 		return taskAttribute.getMetaDatum(TaskAttribute.META_DEFAULT_OPTION);
 	}
@@ -55,11 +60,6 @@ public class TaskAttributeMetaData {
 		return taskAttribute.getMetaDataMap();
 	}
 
-	public TaskAttributeMetaData putValue(String key, String value) {
-		taskAttribute.putMetaDatum(key, value);
-		return this;
-	}
-
 	public boolean isReadOnly() {
 		return Boolean.parseBoolean(taskAttribute.getMetaDatum(TaskAttribute.META_READ_ONLY));
 	}
@@ -68,6 +68,11 @@ public class TaskAttributeMetaData {
 		return Boolean.parseBoolean(taskAttribute.getMetaDatum(TaskAttribute.META_SHOW_IN_TOOL_TIP));
 	}
 
+	public TaskAttributeMetaData putValue(String key, String value) {
+		taskAttribute.putMetaDatum(key, value);
+		return this;
+	}
+
 	public TaskAttributeMetaData setDefaultOption(String defaultOption) {
 		if (getDefaultOption() != null) {
 			taskAttribute.putMetaDatum(TaskAttribute.META_DEFAULT_OPTION, defaultOption);
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskAttributeProperties.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskAttributeProperties.java
deleted file mode 100644
index 947e4a173..000000000
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskAttributeProperties.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Mylyn project committers 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
- *******************************************************************************/
-
-package org.eclipse.mylyn.tasks.core.data;
-
-/**
- * @author Steffen Pingel
- * @since 3.0
- */
-public class TaskAttributeProperties {
-
-	//public boolean showInAttributesSection;
-
-	public static TaskAttributeProperties from(TaskAttribute taskAttribute) {
-		TaskAttributeProperties properties = new TaskAttributeProperties();
-		properties.setKind(taskAttribute.getMetaData(TaskAttribute.META_ATTRIBUTE_KIND));
-		properties.setLabel(taskAttribute.getMetaData(TaskAttribute.META_LABEL));
-		properties.setReadOnly(Boolean.parseBoolean(taskAttribute.getMetaData(TaskAttribute.META_READ_ONLY)));
-		properties.setShowInToolTip(Boolean.parseBoolean(taskAttribute.getMetaData(TaskAttribute.META_SHOW_IN_TOOL_TIP)));
-		properties.setType(taskAttribute.getMetaData(TaskAttribute.META_ATTRIBUTE_TYPE));
-		properties.setDefaultOption(taskAttribute.getMetaData(TaskAttribute.META_DEFAULT_OPTION));
-		return properties;
-	}
-
-	public static TaskAttributeProperties defaults() {
-		TaskAttributeProperties properties = new TaskAttributeProperties();
-		properties.setLabel(null);
-		properties.setKind(null);
-		properties.setReadOnly(true);
-		properties.setShowInToolTip(false);
-		properties.setType(TaskAttribute.TYPE_SHORT_TEXT);
-		return properties;
-	}
-
-	private String kind;
-
-	private String label;
-
-	private boolean readOnly;
-
-	private boolean showInToolTip;
-
-	private String type;
-
-	private String defaultOption;
-
-	private TaskAttributeProperties() {
-	}
-
-	public void applyTo(TaskAttribute attribute) {
-		if (getKind() != null) {
-			attribute.putMetaDataValue(TaskAttribute.META_ATTRIBUTE_KIND, getKind());
-		} else {
-			attribute.removeMetaDataValue(TaskAttribute.META_ATTRIBUTE_KIND);
-		}
-		attribute.putMetaDataValue(TaskAttribute.META_READ_ONLY, Boolean.toString(isReadOnly()));
-		attribute.putMetaDataValue(TaskAttribute.META_SHOW_IN_TOOL_TIP, Boolean.toString(isShowInToolTip()));
-		if (getType() != null) {
-			attribute.putMetaDataValue(TaskAttribute.META_ATTRIBUTE_TYPE, getType());
-		} else {
-			attribute.removeMetaDataValue(TaskAttribute.META_ATTRIBUTE_TYPE);
-		}
-		if (getLabel() != null) {
-			attribute.putMetaDataValue(TaskAttribute.META_LABEL, getLabel());
-		} else {
-			attribute.removeMetaDataValue(TaskAttribute.META_LABEL);
-		}
-		if (getDefaultOption() != null) {
-			attribute.putMetaDataValue(TaskAttribute.META_DEFAULT_OPTION, getLabel());
-		} else {
-			attribute.removeMetaDataValue(TaskAttribute.META_DEFAULT_OPTION);
-		}
-	}
-
-	public String getKind() {
-		return kind;
-	}
-
-	public String getLabel() {
-		return label;
-	}
-
-	public String getType() {
-		return type;
-	}
-
-	public boolean isReadOnly() {
-		return readOnly;
-	}
-
-	public boolean isShowInToolTip() {
-		return showInToolTip;
-	}
-
-	public TaskAttributeProperties setKind(String value) {
-		this.kind = value;
-		return this;
-	}
-
-	public TaskAttributeProperties setLabel(String value) {
-		this.label = value;
-		return this;
-	}
-
-	public TaskAttributeProperties setReadOnly(boolean value) {
-		this.readOnly = value;
-		return this;
-	}
-
-	public void setShowInToolTip(boolean showInToolTip) {
-		this.showInToolTip = showInToolTip;
-	}
-
-	public TaskAttributeProperties setType(String value) {
-		this.type = value;
-		return this;
-	}
-
-	public String getDefaultOption() {
-		return defaultOption;
-	}
-
-	public void setDefaultOption(String defaultOption) {
-		this.defaultOption = defaultOption;
-	}
-
-}
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskCommentMapper.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskCommentMapper.java
index f60e68187..956ef7edf 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskCommentMapper.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskCommentMapper.java
@@ -127,35 +127,35 @@ public class TaskCommentMapper {
 		Assert.isNotNull(taskAttribute);
 		TaskData taskData = taskAttribute.getTaskData();
 		TaskAttributeMapper mapper = taskData.getAttributeMapper();
-		TaskAttributeProperties.defaults().setType(TaskAttribute.TYPE_COMMENT).applyTo(taskAttribute);
+		taskAttribute.getMetaData().defaults().setType(TaskAttribute.TYPE_COMMENT);
 		if (getCommentId() != null) {
 			mapper.setValue(taskAttribute, getCommentId());
 		}
 		if (getAuthor() != null) {
 			TaskAttribute child = taskAttribute.createAttribute(TaskAttribute.COMMENT_AUTHOR);
-			TaskAttributeProperties.defaults().setType(TaskAttribute.TYPE_PERSON).applyTo(child);
+			child.getMetaData().setType(TaskAttribute.TYPE_PERSON);
 			mapper.setRepositoryPerson(child, getAuthor());
 		}
 		if (getCreationDate() != null) {
 			TaskAttribute child = taskAttribute.createAttribute(TaskAttribute.COMMENT_DATE);
-			TaskAttributeProperties.defaults().setType(TaskAttribute.TYPE_DATE).applyTo(child);
+			child.getMetaData().setType(TaskAttribute.TYPE_DATE);
 			mapper.setDateValue(child, getCreationDate());
 		}
 		if (getNumber() != null) {
 			TaskAttribute child = taskAttribute.createAttribute(TaskAttribute.COMMENT_NUMBER);
-			TaskAttributeProperties.defaults().setType(TaskAttribute.TYPE_INTEGER).applyTo(child);
+			child.getMetaData().setType(TaskAttribute.TYPE_INTEGER);
 			mapper.setIntegerValue(child, getNumber());
 		}
 		if (getUrl() != null) {
 			TaskAttribute child = taskAttribute.createAttribute(TaskAttribute.COMMENT_URL);
-			TaskAttributeProperties.defaults().setType(TaskAttribute.TYPE_URL).applyTo(child);
+			child.getMetaData().setType(TaskAttribute.TYPE_URL);
 			mapper.setValue(child, getUrl());
 		}
 		if (getText() != null) {
 			TaskAttribute child = taskAttribute.createAttribute(TaskAttribute.COMMENT_TEXT);
-			TaskAttributeProperties.defaults().setType(TaskAttribute.TYPE_LONG_RICH_TEXT).applyTo(child);
+			child.getMetaData().setType(TaskAttribute.TYPE_LONG_RICH_TEXT);
 			mapper.setValue(child, getText());
-			taskAttribute.putMetaDataValue(TaskAttribute.META_ASSOCIATED_ATTRIBUTE_ID, TaskAttribute.COMMENT_TEXT);
+			taskAttribute.putMetaDatum(TaskAttribute.META_ASSOCIATED_ATTRIBUTE_ID, TaskAttribute.COMMENT_TEXT);
 		}
 	}
 
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskOperation.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskOperation.java
index 45aa6e9bd..d89bb183f 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskOperation.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskOperation.java
@@ -20,7 +20,7 @@ public class TaskOperation {
 	public static void applyTo(TaskAttribute taskAttribute, String operationId, String label) {
 		TaskData taskData = taskAttribute.getTaskData();
 		taskData.getAttributeMapper().setValue(taskAttribute, operationId);
-		TaskAttributeProperties.defaults().setType(TaskAttribute.TYPE_OPERATION).setLabel(label).applyTo(taskAttribute);
+		taskAttribute.getMetaData().defaults().setType(TaskAttribute.TYPE_OPERATION).setLabel(label);
 	}
 
 	public static TaskOperation createFrom(TaskAttribute taskAttribute) {
@@ -28,8 +28,7 @@ public class TaskOperation {
 		TaskData taskData = taskAttribute.getTaskData();
 		TaskOperation operation = new TaskOperation(taskData.getRepositoryUrl(), taskData.getConnectorKind(),
 				taskData.getTaskId(), taskAttribute.getValue());
-		TaskAttributeProperties properties = TaskAttributeProperties.from(taskAttribute);
-		operation.setLabel(properties.getLabel());
+		operation.setLabel(taskAttribute.getMetaData().getLabel());
 		operation.setTaskAttribute(taskAttribute);
 		return operation;
 	}