Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormkersten2006-11-22 19:32:54 +0000
committermkersten2006-11-22 19:32:54 +0000
commitec77cffc1535ed84f2f5f66fcf44a0b9753c54e8 (patch)
treee03fea3199d2a778fbae07fd52cc2e0c7aca8fd2
parentce3096f827195cdd19d6843eba637dd0b2c09cb0 (diff)
downloadorg.eclipse.mylyn.tasks-ec77cffc1535ed84f2f5f66fcf44a0b9753c54e8.tar.gz
org.eclipse.mylyn.tasks-ec77cffc1535ed84f2f5f66fcf44a0b9753c54e8.tar.xz
org.eclipse.mylyn.tasks-ec77cffc1535ed84f2f5f66fcf44a0b9753c54e8.zip
RESOLVED - bug 165491: Case insensitive sorting in Task List
https://bugs.eclipse.org/bugs/show_bug.cgi?id=165491
-rw-r--r--org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaTask.java8
-rw-r--r--org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java4
-rw-r--r--org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskListManagerTest.java2
-rw-r--r--org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/EncodingTest.java8
-rw-r--r--org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryTaskHandleTest.java2
-rw-r--r--org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListStandaloneTest.java2
-rw-r--r--org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaQueryTest.java2
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditor.java2
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchPage.java2
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaCustomQueryWizardPage.java2
-rw-r--r--org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractQueryHit.java4
-rw-r--r--org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTaskContainer.java2
-rw-r--r--org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DateRangeActivityDelegate.java4
-rw-r--r--org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DelegatingTaskExternalizer.java8
-rw-r--r--org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskListElement.java9
-rw-r--r--org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/Task.java6
-rw-r--r--org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskArchive.java2
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java10
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskPlanningEditorTest.java6
-rw-r--r--org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracQueryHit.java2
-rw-r--r--org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryConnectorTest.java8
-rw-r--r--org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracTaskExternalizer.java2
-rw-r--r--org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracCustomQueryPage.java2
-rw-r--r--org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracQueryWizardPage.java2
24 files changed, 47 insertions, 54 deletions
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaTask.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaTask.java
index ce992e2c3..e5d1477bb 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaTask.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaTask.java
@@ -40,7 +40,7 @@ public class BugzillaTask extends AbstractRepositoryTask {
}
public BugzillaTask(BugzillaQueryHit hit, boolean newTask) {
- this(hit.getHandleIdentifier(), hit.getDescription(), newTask);
+ this(hit.getHandleIdentifier(), hit.getSummary(), newTask);
setPriority(hit.getPriority());
initFromHandle();
}
@@ -60,9 +60,9 @@ public class BugzillaTask extends AbstractRepositoryTask {
}
@Override
- public String getDescription() {
- if (this.isDownloaded() || !super.getDescription().startsWith("<")) {
- return super.getDescription();
+ public String getSummary() {
+ if (this.isDownloaded() || !super.getSummary().startsWith("<")) {
+ return super.getSummary();
} else {
if (isSynchronizing()) {
//return AbstractRepositoryTask.getTaskId(getHandleIdentifier()) + ": <synchronizing>";
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java
index dc2dd8719..d587e325f 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java
@@ -110,7 +110,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest {
assertEquals(2, collector.getHits().size());
for (AbstractQueryHit hit : collector.getHits()) {
- assertTrue(hit.getDescription().contains("search-match-test"));
+ assertTrue(hit.getSummary().contains("search-match-test"));
}
// test anonymous update of configuration
@@ -219,7 +219,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest {
BugzillaQueryHit hit1Twin = new BugzillaQueryHit(taskList, "description", "P1", repositoryURL, "1", null,
"status");
ITask task2 = hit1Twin.getOrCreateCorrespondingTask();
- assertEquals(task1.getDescription(), task2.getDescription());
+ assertEquals(task1.getSummary(), task2.getSummary());
}
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskListManagerTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskListManagerTest.java
index c7fd07133..a14cc97b7 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskListManagerTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskListManagerTest.java
@@ -103,7 +103,7 @@ public class BugzillaTaskListManagerTest extends TestCase {
.next();
assertEquals(repositoryTask.getHandleIdentifier(), readTask.getHandleIdentifier());
- assertEquals(repositoryTask.getDescription(), readTask.getDescription());
+ assertEquals(repositoryTask.getSummary(), readTask.getSummary());
assertEquals(repositoryTask.getTaskType(), readTask.getTaskType());
}
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/EncodingTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/EncodingTest.java
index 2b7b0eb7a..e42ae82cb 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/EncodingTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/EncodingTest.java
@@ -59,7 +59,7 @@ public class EncodingTest extends AbstractBugzillaTest {
BugzillaTask task = (BugzillaTask) connector.createTaskFromExistingKey(repository, "57", null);
assertNotNull(task);
//TasksUiPlugin.getSynchronizationManager().synchronize(connector, task, true, null);
- assertTrue(task.getDescription().equals("\u05D0"));
+ assertTrue(task.getSummary().equals("\u05D0"));
taskList.deleteTask(task);
connector.getClientManager().repositoryRemoved(repository);
repository.setCharacterEncoding("ISO-8859-1");
@@ -67,7 +67,7 @@ public class EncodingTest extends AbstractBugzillaTest {
assertNotNull(task);
//TasksUiPlugin.getSynchronizationManager().synchronize(connector, task, true, null);
// iso-8859-1 'incorrect' interpretation
- assertFalse(task.getDescription().equals("\u05D0"));
+ assertFalse(task.getSummary().equals("\u05D0"));
}
public void testProperEncodingUponPost() throws MalformedURLException, IOException, BugzillaException, PossibleBugzillaFailureException, GeneralSecurityException, CoreException {
@@ -75,7 +75,7 @@ public class EncodingTest extends AbstractBugzillaTest {
repository.setCharacterEncoding("UTF-8");
BugzillaTask task = (BugzillaTask) connector.createTaskFromExistingKey(repository, "57", null);
assertNotNull(task);
- assertTrue(task.getDescription().equals("\u05D0"));
+ assertTrue(task.getSummary().equals("\u05D0"));
String priority = null;
if (task.getPriority().equals("P1")) {
priority = "P2";
@@ -91,7 +91,7 @@ public class EncodingTest extends AbstractBugzillaTest {
taskList.deleteTask(task);
task = (BugzillaTask) connector.createTaskFromExistingKey(repository, "57", null);
assertNotNull(task);
- assertTrue(task.getDescription().equals("\u05D0"));
+ assertTrue(task.getSummary().equals("\u05D0"));
}
}
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryTaskHandleTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryTaskHandleTest.java
index 4a50490fd..94b9522f5 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryTaskHandleTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryTaskHandleTest.java
@@ -63,7 +63,7 @@ public class RepositoryTaskHandleTest extends TestCase {
manager.readExistingOrCreateNewList();
BugzillaTask readReport = (BugzillaTask) manager.getTaskList().getRootTasks().iterator().next();
- assertEquals(readReport.getDescription(), readReport.getDescription());
+ assertEquals(readReport.getSummary(), readReport.getSummary());
assertEquals(readReport.getRepositoryUrl(), readReport.getRepositoryUrl());
}
}
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListStandaloneTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListStandaloneTest.java
index e17f334df..0736fdd6b 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListStandaloneTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListStandaloneTest.java
@@ -97,7 +97,7 @@ public class TaskListStandaloneTest extends TestCase {
Set<ITask> readList = manager.getTaskList().getRootTasks();
ITask readTask = readList.iterator().next();
- assertTrue(readTask.getDescription().equals("task 1"));
+ assertTrue(readTask.getSummary().equals("task 1"));
assertEquals("should be: " + creation, task.getCreationDate(), readTask.getCreationDate());
assertEquals(task.getCompletionDate(), readTask.getCompletionDate());
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaQueryTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaQueryTest.java
index 8725bf8a4..544c35856 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaQueryTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaQueryTest.java
@@ -119,7 +119,7 @@ public class BugzillaQueryTest extends TestCase {
connector.performQuery(query, repository, new NullProgressMonitor(), collector);
assertEquals(2, collector.getHits().size());
for (AbstractQueryHit hit : collector.getHits()) {
- assertTrue(hit.getDescription().contains("search-match-test"));
+ assertTrue(hit.getSummary().contains("search-match-test"));
}
}
} \ No newline at end of file
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditor.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditor.java
index f3c5da23e..d7592d4c8 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditor.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditor.java
@@ -535,7 +535,7 @@ public class BugzillaTaskEditor extends AbstractRepositoryTaskEditor {
final ITask task = TasksUiPlugin.getTaskListManager().getTaskList().getTask(
AbstractRepositoryTask.getHandle(repository.getUrl(), bugId));
if (task != null) {
- hyperlink.setToolTipText(task.getDescription());
+ hyperlink.setToolTipText(task.getSummary());
}
hyperlink.addHyperlinkListener(new HyperlinkAdapter() {
public void linkActivated(HyperlinkEvent e) {
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchPage.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchPage.java
index 1683bf588..6f4dcdb0e 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchPage.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchPage.java
@@ -153,7 +153,7 @@ public class BugzillaSearchPage extends AbstractRepositoryQueryPage implements L
}
public BugzillaSearchPage(TaskRepository repository, BugzillaRepositoryQuery origQuery) {
- super(TITLE_BUGZILLA_QUERY, origQuery.getDescription());
+ super(TITLE_BUGZILLA_QUERY, origQuery.getSummary());
originalQuery = origQuery;
this.repository = repository;
setDescription("Select the Bugzilla query parameters. Use the Update Attributes button to retrieve "
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaCustomQueryWizardPage.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaCustomQueryWizardPage.java
index e2a7d3847..e5e66b079 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaCustomQueryWizardPage.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaCustomQueryWizardPage.java
@@ -44,7 +44,7 @@ public class BugzillaCustomQueryWizardPage extends AbstractRepositoryQueryPage {
private BugzillaRepositoryQuery query;
public BugzillaCustomQueryWizardPage(TaskRepository repository, BugzillaRepositoryQuery query) {
- super(TITLE, query.getDescription());
+ super(TITLE, query.getSummary());
this.query = query;
this.repository = repository;
setTitle(LABEL_CUSTOM_QUERY);
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractQueryHit.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractQueryHit.java
index 40a5634a5..a5cf5f19f 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractQueryHit.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractQueryHit.java
@@ -57,9 +57,9 @@ public abstract class AbstractQueryHit implements ITaskListElement {
this.repositoryUrl = repositoryUrl;
}
- public String getDescription() {
+ public String getSummary() {
if (task != null) {
- return task.getDescription();
+ return task.getSummary();
} else {
return description;
}
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTaskContainer.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTaskContainer.java
index 4dda7ca1e..1898df5b9 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTaskContainer.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTaskContainer.java
@@ -50,7 +50,7 @@ public abstract class AbstractTaskContainer implements ITaskListElement {
return children;
}
- public String getDescription() {
+ public String getSummary() {
return handle;
}
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DateRangeActivityDelegate.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DateRangeActivityDelegate.java
index aa528f4c2..489f97711 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DateRangeActivityDelegate.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DateRangeActivityDelegate.java
@@ -129,8 +129,8 @@ public class DateRangeActivityDelegate implements ITask {
return task.getCreationDate();
}
- public String getDescription() {
- return task.getDescription();
+ public String getSummary() {
+ return task.getSummary();
}
public int getEstimateTimeHours() {
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DelegatingTaskExternalizer.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DelegatingTaskExternalizer.java
index 01d63cd58..7ac081339 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DelegatingTaskExternalizer.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DelegatingTaskExternalizer.java
@@ -123,7 +123,7 @@ public class DelegatingTaskExternalizer implements ITaskListExternalizer {
return parent;
} else {
Element node = doc.createElement(getCategoryTagName());
- node.setAttribute(KEY_NAME, category.getDescription());
+ node.setAttribute(KEY_NAME, category.getSummary());
parent.appendChild(node);
return node;
}
@@ -138,7 +138,7 @@ public class DelegatingTaskExternalizer implements ITaskListExternalizer {
public Element createTaskElement(ITask task, Document doc, Element parent) {
Element node = doc.createElement(getTaskTagName());
- node.setAttribute(KEY_LABEL, task.getDescription());
+ node.setAttribute(KEY_LABEL, task.getSummary());
node.setAttribute(KEY_HANDLE, task.getHandleIdentifier());
if (task.getContainer() != null) {
@@ -461,7 +461,7 @@ public class DelegatingTaskExternalizer implements ITaskListExternalizer {
public Element createQueryElement(AbstractRepositoryQuery query, Document doc, Element parent) {
String queryTagName = getQueryTagNameForElement(query);
Element node = doc.createElement(queryTagName);
- node.setAttribute(KEY_NAME, query.getDescription());
+ node.setAttribute(KEY_NAME, query.getSummary());
node.setAttribute(KEY_QUERY_MAX_HITS, query.getMaxHits() + "");
node.setAttribute(KEY_QUERY_STRING, query.getUrl());
node.setAttribute(KEY_REPOSITORY_URL, query.getRepositoryUrl());
@@ -508,7 +508,7 @@ public class DelegatingTaskExternalizer implements ITaskListExternalizer {
public Element createQueryHitElement(AbstractQueryHit queryHit, Document doc, Element parent) {
Element node = doc.createElement(getQueryHitTagName());
- node.setAttribute(KEY_NAME, queryHit.getDescription());
+ node.setAttribute(KEY_NAME, queryHit.getSummary());
node.setAttribute(KEY_HANDLE, queryHit.getHandleIdentifier());
node.setAttribute(KEY_PRIORITY, queryHit.getPriority());
if (queryHit.isCompleted()) {
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskListElement.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskListElement.java
index 6dadf126c..ac3b8503e 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskListElement.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskListElement.java
@@ -18,18 +18,11 @@ public interface ITaskListElement {
public abstract String getPriority();
- public abstract String getDescription();
-
-// public abstract void setDescription(String description);
+ public abstract String getSummary();
public abstract String getHandleIdentifier();
public abstract void setHandleIdentifier(String id);
- /**
- * TODO: refactor to use repository kinds?
- */
-// public abstract boolean isLocal();
-
}
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/Task.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/Task.java
index 6cd5816df..5cd38e50a 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/Task.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/Task.java
@@ -178,7 +178,7 @@ public class Task implements ITask {
}
public String getToolTipText() {
- return getDescription();
+ return getSummary();
}
@Override
@@ -252,7 +252,7 @@ public class Task implements ITask {
if (elapsedTime >= 0) {
this.timeActive = elapsedTime;
} else {
- MylarStatusHandler.log("Attempt to set negative time on task: " + getDescription(), this);
+ MylarStatusHandler.log("Attempt to set negative time on task: " + getSummary(), this);
}
}
@@ -284,7 +284,7 @@ public class Task implements ITask {
return parentCategory;
}
- public String getDescription() {
+ public String getSummary() {
return description;
}
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskArchive.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskArchive.java
index bce3c0b36..603e64330 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskArchive.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskArchive.java
@@ -35,7 +35,7 @@ public class TaskArchive extends AbstractTaskContainer {
return HANDLE;
}
- public String getDescription() {
+ public String getSummary() {
return LABEL_ARCHIVE;
}
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java
index 35481edef..c2502318a 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java
@@ -321,7 +321,7 @@ public class TaskListManagerTest extends TestCase {
manager.getTaskList().renameContainer(category, newDesc);
AbstractTaskContainer container = manager.getTaskList().getContainerForHandle(newDesc);
assertNotNull(container);
- assertEquals(newDesc, container.getDescription());
+ assertEquals(newDesc, container.getSummary());
manager.getTaskList().deleteCategory(container);
assertEquals(1, manager.getTaskList().getCategories().size());
}
@@ -396,9 +396,9 @@ public class TaskListManagerTest extends TestCase {
TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList();
taskList.moveToRoot(task);
MockRepositoryQuery query = new MockRepositoryQuery("query", taskList);
- MockQueryHit hit = new MockQueryHit(taskList, repositoryUrl, task.getDescription(), "1");
+ MockQueryHit hit = new MockQueryHit(taskList, repositoryUrl, task.getSummary(), "1");
hit.setCorrespondingTask(task);
- query.addHit(new MockQueryHit(taskList, repositoryUrl, task.getDescription(), "1"));
+ query.addHit(new MockQueryHit(taskList, repositoryUrl, task.getSummary(), "1"));
taskList.addQuery(query);
assertEquals(1, taskList.getAllTasks().size());
assertEquals(1, taskList.getRootTasks().size());
@@ -514,11 +514,11 @@ public class TaskListManagerTest extends TestCase {
Set<ITask> readList = manager.getTaskList().getRootTasks();
for (ITask task : readList) {
if (task.equals(task1)) {
- assertEquals(task1.getDescription(), task.getDescription());
+ assertEquals(task1.getSummary(), task.getSummary());
assertEquals(1, task.getChildren().size());
}
if (task.equals(reportInRoot)) {
- assertEquals(reportInRoot.getDescription(), task.getDescription());
+ assertEquals(reportInRoot.getSummary(), task.getSummary());
}
}
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskPlanningEditorTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskPlanningEditorTest.java
index 8e67fa1b3..508394485 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskPlanningEditorTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskPlanningEditorTest.java
@@ -68,7 +68,7 @@ public class TaskPlanningEditorTest extends TestCase {
editor.setDescription(NEW_DESCRIPTION);
assertTrue(editor.isDirty());
editor.doSave(new NullProgressMonitor());
- assertEquals(NEW_DESCRIPTION, task.getDescription());
+ assertEquals(NEW_DESCRIPTION, task.getSummary());
assertFalse(editor.isDirty());
}
@@ -85,7 +85,7 @@ public class TaskPlanningEditorTest extends TestCase {
assertFalse(editor.isDirty());
assertEquals(DESCRIPTION, editor.getDescription());
TasksUiPlugin.getTaskListManager().getTaskList().renameTask(task, NEW_DESCRIPTION);
- assertEquals(NEW_DESCRIPTION, task.getDescription());
+ assertEquals(NEW_DESCRIPTION, task.getSummary());
editor.updateTaskData(task);
assertEquals(NEW_DESCRIPTION, editor.getFormTitle());
assertEquals(NEW_DESCRIPTION, editor.getDescription());
@@ -110,7 +110,7 @@ public class TaskPlanningEditorTest extends TestCase {
editor.setDescription(NEW_DESCRIPTION);
assertTrue(editor.isDirty());
TasksUiPlugin.getTaskListManager().getTaskList().renameTask(task, NEW_DESCRIPTION+"2");
- assertEquals(NEW_DESCRIPTION+"2", task.getDescription());
+ assertEquals(NEW_DESCRIPTION+"2", task.getSummary());
editor.updateTaskData(task);
assertEquals(NEW_DESCRIPTION+"2", editor.getFormTitle());
assertEquals(NEW_DESCRIPTION+"2", editor.getDescription());
diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracQueryHit.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracQueryHit.java
index 8fdb3948b..802dfd7e2 100644
--- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracQueryHit.java
+++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracQueryHit.java
@@ -29,7 +29,7 @@ public class TracQueryHit extends AbstractQueryHit {
}
protected AbstractRepositoryTask createTask() {
- TracTask newTask = new TracTask(getHandleIdentifier(), getDescription(), true);
+ TracTask newTask = new TracTask(getHandleIdentifier(), getSummary(), true);
newTask.setPriority(priority);
return newTask;
}
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryConnectorTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryConnectorTest.java
index d09937f3b..5958519d3 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryConnectorTest.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryConnectorTest.java
@@ -134,7 +134,7 @@ public class TracRepositoryConnectorTest extends TestCase {
ITask task = connector.createTaskFromExistingKey(repository, id, null);
assertNotNull(task);
assertEquals(TracTask.class, task.getClass());
- assertTrue(task.getDescription().contains("summary1"));
+ assertTrue(task.getSummary().contains("summary1"));
assertEquals(repository.getUrl() + ITracClient.TICKET_URL + id, task.getUrl());
try {
@@ -218,11 +218,11 @@ public class TracRepositoryConnectorTest extends TestCase {
TracTask task = new TracTask(AbstractRepositoryTask.getHandle(Constants.TEST_TRAC_010_URL, 123), "desc", true);
assertEquals(Constants.TEST_TRAC_010_URL + ITracClient.TICKET_URL + "123", task.getUrl());
- assertEquals("desc", task.getDescription());
+ assertEquals("desc", task.getSummary());
connector.updateTaskDetails(task, ticket, false);
assertEquals(Constants.TEST_TRAC_010_URL + ITracClient.TICKET_URL + "123", task.getUrl());
- assertEquals("123: mysummary", task.getDescription());
+ assertEquals("123: mysummary", task.getSummary());
assertEquals("P3", task.getPriority());
assertEquals("mytype", task.getTaskType());
}
@@ -237,7 +237,7 @@ public class TracRepositoryConnectorTest extends TestCase {
connector.updateTaskDetails(task, ticket, false);
assertEquals(Constants.TEST_TRAC_010_URL + ITracClient.TICKET_URL + "456", task.getUrl());
- assertEquals("456: mysummary", task.getDescription());
+ assertEquals("456: mysummary", task.getSummary());
assertEquals("P3", task.getPriority());
assertEquals(null, task.getTaskType());
}
diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracTaskExternalizer.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracTaskExternalizer.java
index 788e654a9..8b3a9a657 100644
--- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracTaskExternalizer.java
+++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracTaskExternalizer.java
@@ -133,7 +133,7 @@ public class TracTaskExternalizer extends DelegatingTaskExternalizer {
String queryTagName = getQueryTagNameForElement(query);
Element node = doc.createElement(queryTagName);
- node.setAttribute(KEY_LABEL, query.getDescription());
+ node.setAttribute(KEY_LABEL, query.getSummary());
node.setAttribute(KEY_REPOSITORY_URL, query.getRepositoryUrl());
node.setAttribute(KEY_QUERY, query.getUrl());
diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracCustomQueryPage.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracCustomQueryPage.java
index dc6c1dbc9..0b9a00712 100644
--- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracCustomQueryPage.java
+++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracCustomQueryPage.java
@@ -147,7 +147,7 @@ public class TracCustomQueryPage extends AbstractRepositoryQueryPage {
createOptionsGroup(control);
if (query != null) {
- titleText.setText(query.getDescription());
+ titleText.setText(query.getSummary());
restoreSearchFilterFromQuery(query);
}
diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracQueryWizardPage.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracQueryWizardPage.java
index 0d8925598..fcfc8a0a5 100644
--- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracQueryWizardPage.java
+++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracQueryWizardPage.java
@@ -99,7 +99,7 @@ public class TracQueryWizardPage extends WizardPage {
createAddFilterGroup(composite);
if (query != null) {
- titleText.setText(query.getDescription());
+ titleText.setText(query.getSummary());
restoreSearchFilterFromQuery(query);
}

Back to the top