Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Pingel2012-02-09 19:22:03 -0500
committerSteffen Pingel2012-02-09 19:22:03 -0500
commit9f99269112887b9003a6938eb5b59c1eb44f969b (patch)
treed4c79d7b3802222c162697e1e53ce71caf811230 /org.eclipse.mylyn.tasks.core/src/org
parent173c07207e39b2cbbe5af0077b5588be52b09c6c (diff)
downloadorg.eclipse.mylyn.tasks-9f99269112887b9003a6938eb5b59c1eb44f969b.tar.gz
org.eclipse.mylyn.tasks-9f99269112887b9003a6938eb5b59c1eb44f969b.tar.xz
org.eclipse.mylyn.tasks-9f99269112887b9003a6938eb5b59c1eb44f969b.zip
ASSIGNED - bug 349620: improve UI for private comments
https://bugs.eclipse.org/bugs/show_bug.cgi?id=349620 Change-Id: I00b570970980919ae15c6026db859cc1c4ea89fa
Diffstat (limited to 'org.eclipse.mylyn.tasks.core/src/org')
-rw-r--r--org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskComment.java9
-rw-r--r--org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskComment.java5
-rw-r--r--org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/DefaultTaskSchema.java6
-rw-r--r--org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskAttribute.java5
-rw-r--r--org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskCommentMapper.java13
5 files changed, 1 insertions, 37 deletions
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskComment.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskComment.java
index fbfffecf6..33eb8f039 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskComment.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskComment.java
@@ -33,8 +33,6 @@ public class TaskComment implements ITaskComment {
private int number;
- private String commentID;
-
private final ITask task;
private final TaskAttribute taskAttribute;
@@ -124,11 +122,4 @@ public class TaskComment implements ITaskComment {
this.isPrivate = isPrivate;
}
- public void setCommentID(String commentID) {
- this.commentID = commentID;
- }
-
- public String getCommentID() {
- return commentID;
- }
}
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskComment.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskComment.java
index 27606f4fc..38bf89ae8 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskComment.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskComment.java
@@ -110,9 +110,4 @@ public interface ITaskComment {
*/
public abstract void setIsPrivate(Boolean isPrivate);
- /**
- * @since 3.7
- */
- public abstract void setCommentID(String commentID);
-
} \ No newline at end of file
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/DefaultTaskSchema.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/DefaultTaskSchema.java
index 74c9bdc83..a52f294ae 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/DefaultTaskSchema.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/DefaultTaskSchema.java
@@ -154,10 +154,4 @@ public final class DefaultTaskSchema extends AbstractTaskSchema {
public final Field TASK_URL = createField(TaskAttribute.TASK_URL, Messages.DefaultTaskSchema_URL_Label,
TaskAttribute.TYPE_URL, Flag.READ_ONLY);
- /**
- * @since 3.7
- */
- public final Field COMMENT_ID = createField(TaskAttribute.COMMENT_ID, Messages.DefaultTaskSchema_ID, TaskAttribute.TYPE_INTEGER,
- Flag.READ_ONLY);
-
}
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 5ac8f64ae..2f0bc36e5 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
@@ -131,11 +131,6 @@ public final class TaskAttribute {
public static final String COMMENT_ISPRIVATE = "task.common.comment.isprivate"; //$NON-NLS-1$
/**
- * @since 3.7
- */
- public static final String COMMENT_ID = "task.common.comment.id"; //$NON-NLS-1$
-
- /**
* Key for the meta datum that determines if an attribute is disabled. This is used to indicate that an attribute
* should not be modified, e.g. due to work-flow state but it may still be generally writeable.
*
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 185b098e1..f50b43c45 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
@@ -125,10 +125,6 @@ public class TaskCommentMapper {
if (child != null) {
comment.setCreationDate(mapper.getDateValue(child));
}
- child = taskAttribute.getMappedAttribute(TaskAttribute.COMMENT_ID);
- if (child != null) {
- comment.setCommentId(mapper.getValue(child));
- }
child = taskAttribute.getMappedAttribute(TaskAttribute.COMMENT_NUMBER);
if (child != null) {
comment.setNumber(mapper.getIntegerValue(child));
@@ -153,12 +149,8 @@ public class TaskCommentMapper {
TaskData taskData = taskAttribute.getTaskData();
TaskAttributeMapper mapper = taskData.getAttributeMapper();
taskAttribute.getMetaData().defaults().setType(TaskAttribute.TYPE_COMMENT);
- if (getNumber() != null) {
- mapper.setIntegerValue(taskAttribute, getNumber());
- }
if (getCommentId() != null) {
- TaskAttribute child = DefaultTaskSchema.getField(TaskAttribute.COMMENT_ID).createAttribute(taskAttribute);
- mapper.setValue(child, getCommentId());
+ mapper.setValue(taskAttribute, getCommentId());
}
if (getAuthor() != null) {
TaskAttribute child = DefaultTaskSchema.getField(TaskAttribute.COMMENT_AUTHOR).createAttribute(
@@ -201,9 +193,6 @@ public class TaskCommentMapper {
if (getNumber() != null) {
taskComment.setNumber(getNumber());
}
- if (getCommentId() != null) {
- taskComment.setCommentID(getCommentId());
- }
if (getUrl() != null) {
taskComment.setUrl(getUrl());
}

Back to the top