diff options
83 files changed, 174 insertions, 206 deletions
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java index 89836e6c6..a0bccbc8a 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java @@ -454,7 +454,7 @@ public class BugzillaClient { RepositoryQueryResultsFactory queryFactory = new RepositoryQueryResultsFactory( method.getResponseBodyAsStream(), characterEncoding); queryFactory.performQuery(repositoryUrl.toString(), collector, QueryHitCollector.MAX_HITS); - return !collector.getTaskHits().isEmpty(); + return !collector.getTasks().isEmpty(); } } } diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java index da1bb30a1..02e822ba0 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java @@ -186,7 +186,7 @@ public class BugzillaRepositoryConnector extends AbstractRepositoryConnector { // Task Web Url String url = getTaskUrl(repository.getUrl(), taskData.getId()); if (url != null) { - bugzillaTask.setTaskUrl(url); + bugzillaTask.setUrl(url); } // Bugzilla Specific Attributes @@ -328,7 +328,7 @@ public class BugzillaRepositoryConnector extends AbstractRepositoryConnector { BugzillaRepositoryQuery query = new BugzillaRepositoryQuery(repository.getUrl(), urlQueryString, ""); performQuery(query, repository, new NullProgressMonitor(), collector); - changedTasks.addAll(collector.getTaskHits()); + changedTasks.addAll(collector.getTasks()); // for (AbstractTask taskHit : collector.getTaskHits()) { // // String handle = 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 ced46f50d..05d4e04a6 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 @@ -27,7 +27,7 @@ public class BugzillaTask extends AbstractTask { public BugzillaTask(String repositoryUrl, String id, String label) { super(repositoryUrl, id, label); - setTaskUrl(BugzillaClient.getBugUrlWithoutLogin(repositoryUrl, id)); + setUrl(BugzillaClient.getBugUrlWithoutLogin(repositoryUrl, id)); } @Override 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 901b93bb3..46512db21 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 @@ -29,8 +29,8 @@ import org.eclipse.mylyn.internal.bugzilla.core.BugzillaRepositoryQuery; import org.eclipse.mylyn.internal.bugzilla.core.BugzillaTask; import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants; import org.eclipse.mylyn.internal.bugzilla.core.RepositoryConfiguration; +import org.eclipse.mylyn.internal.tasks.core.LocalAttachment; import org.eclipse.mylyn.tasks.core.AbstractTask; -import org.eclipse.mylyn.tasks.core.LocalAttachment; import org.eclipse.mylyn.tasks.core.RepositoryAttachment; import org.eclipse.mylyn.tasks.core.RepositoryTaskAttribute; import org.eclipse.mylyn.tasks.core.RepositoryTaskData; @@ -119,7 +119,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest { collector.run(new NullProgressMonitor()); assertEquals(2, result.getElements().length); - for (AbstractTask hit : collector.getTaskHits()) { + for (AbstractTask hit : collector.getTasks()) { assertTrue(hit.getSummary().contains("search-match-test")); } @@ -143,7 +143,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest { // assertEquals("2007-04-18 14:21:40", // task.getCompletionDate().toString()); assertFalse(task.isCompleted()); - assertEquals("http://mylyn.eclipse.org/bugs222/show_bug.cgi?id=3", task.getTaskUrl()); + assertEquals("http://mylyn.eclipse.org/bugs222/show_bug.cgi?id=3", task.getUrl()); } public void testUpdateWithSubTasks() throws Exception { diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaSearchEngineTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaSearchEngineTest.java index 196bdb49a..90dbb83f8 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaSearchEngineTest.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaSearchEngineTest.java @@ -123,7 +123,7 @@ public class BugzillaSearchEngineTest extends TestCase { // results.addAll(connector.performQuery(repositoryQuery, new // NullProgressMonitor(), new MultiStatus(TasksUiPlugin.PLUGIN_ID, // IStatus.OK, "Query result", null))); - return collector.getTaskHits(); + return collector.getTasks(); } } diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskReportGeneratorTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskReportGeneratorTest.java index a02c39f95..8f6774227 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskReportGeneratorTest.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskReportGeneratorTest.java @@ -21,11 +21,11 @@ import junit.framework.TestCase; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.mylyn.internal.bugzilla.core.BugzillaRepositoryQuery; import org.eclipse.mylyn.internal.bugzilla.core.BugzillaTask; +import org.eclipse.mylyn.internal.tasks.core.TaskCategory; import org.eclipse.mylyn.internal.tasks.ui.planner.CompletedTaskCollector; import org.eclipse.mylyn.internal.tasks.ui.planner.TaskReportGenerator; import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.AbstractTaskContainer; -import org.eclipse.mylyn.tasks.core.TaskCategory; import org.eclipse.mylyn.tasks.ui.TaskListManager; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; 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 f0242efdf..1f5a3e093 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 @@ -137,8 +137,8 @@ public class BugzillaQueryTest extends TestCase { connector.init(taskList); BugzillaRepositoryQuery query = new BugzillaRepositoryQuery(repository.getUrl(), queryUrlString, "summary"); connector.performQuery(query, repository, new NullProgressMonitor(), collector); - assertEquals(2, collector.getTaskHits().size()); - for (AbstractTask hit : collector.getTaskHits()) { + assertEquals(2, collector.getTasks().size()); + for (AbstractTask hit : collector.getTasks()) { assertTrue(hit.getSummary().contains("search-match-test")); } } diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaCompareNode.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaCompareNode.java index 3a7257d40..1b0da2b4d 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaCompareNode.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaCompareNode.java @@ -211,7 +211,7 @@ public class BugzillaCompareNode implements IStreamContentAccessor, IStructureCo topNode.addChild(new BugzillaCompareNode("New Comment", bug.getNewComment(), defaultImage)); BugzillaCompareNode ccList = new BugzillaCompareNode("CC List", null, defaultImage); - for (Iterator<String> iter = bug.getCC().iterator(); iter.hasNext();) { + for (Iterator<String> iter = bug.getCc().iterator(); iter.hasNext();) { String cc = iter.next(); ccList.addChild(new BugzillaCompareNode("CC", cc, defaultImage)); } 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 9ca3fd100..c1d495718 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 @@ -1493,7 +1493,7 @@ public class BugzillaSearchPage extends AbstractRepositoryQueryPage implements L try { originalQuery.setUrl(getQueryURL(repository, getQueryParameters())); // originalQuery.setMaxHits(Integer.parseInt(getMaxHits())); - originalQuery.setDescription(getQueryTitle()); + originalQuery.setHandleIdentifier(getQueryTitle()); } catch (UnsupportedEncodingException e) { return null; } 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 d01368511..c4868e410 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 @@ -125,7 +125,7 @@ public class BugzillaCustomQueryWizardPage extends AbstractRepositoryQueryPage { query = new BugzillaRepositoryQuery(repository.getUrl(), queryText.getText(), this.getQueryTitle()); query.setCustomQuery(true); } else { - query.setDescription(this.getQueryTitle()); + query.setHandleIdentifier(this.getQueryTitle()); query.setUrl(queryText.getText()); } return query; diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskEditorInput.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskEditorInput.java index 82204f794..50fb1c72a 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskEditorInput.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskEditorInput.java @@ -34,7 +34,7 @@ public class BugzillaTaskEditorInput extends RepositoryTaskEditorInput { private BugzillaTask bugTask; public BugzillaTaskEditorInput(TaskRepository repository, BugzillaTask bugzillaTask, boolean offline) { - super(repository, bugzillaTask.getTaskId(), bugzillaTask.getTaskUrl()); + super(repository, bugzillaTask.getTaskId(), bugzillaTask.getUrl()); this.bugTask = bugzillaTask; updateOptions(getTaskData()); updateOptions(getOldTaskData()); diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/LocalAttachment.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/LocalAttachment.java index b45f1584b..d8ed3448e 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/LocalAttachment.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/LocalAttachment.java @@ -9,7 +9,7 @@ * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylyn.tasks.core; +package org.eclipse.mylyn.internal.tasks.core; import java.io.ByteArrayInputStream; import java.io.File; @@ -18,10 +18,14 @@ import java.io.IOException; import java.io.InputStream; import java.io.Serializable; +import org.eclipse.mylyn.tasks.core.ITaskAttachment; +import org.eclipse.mylyn.tasks.core.RepositoryTaskData; + /** * A class representing a local attachment. * * @author Jeff Pound + * @since 2.0 */ public class LocalAttachment implements Serializable, ITaskAttachment { diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/ScheduledTaskDelegate.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/ScheduledTaskDelegate.java index f77be2d42..23b0132d8 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/ScheduledTaskDelegate.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/ScheduledTaskDelegate.java @@ -146,8 +146,8 @@ public class ScheduledTaskDelegate extends AbstractTask { return task.getScheduledForDate(); } - public String getTaskUrl() { - return task.getTaskUrl(); + public String getUrl() { + return task.getUrl(); } public boolean isReminded() { @@ -224,8 +224,8 @@ public class ScheduledTaskDelegate extends AbstractTask { task.setScheduledForDate(date); } - public void setTaskUrl(String url) { - task.setTaskUrl(url); + public void setUrl(String url) { + task.setUrl(url); } public int compareTo(AbstractTaskContainer taskListElement) { diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskCategory.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskCategory.java index 656e498b1..eeedb78ca 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskCategory.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskCategory.java @@ -11,7 +11,9 @@ /* * Created on Dec 26, 2004 */ -package org.eclipse.mylyn.tasks.core; +package org.eclipse.mylyn.internal.tasks.core; + +import org.eclipse.mylyn.tasks.core.AbstractTaskCategory; /** diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryConnector.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryConnector.java index 9b3ad09de..5931a3e15 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryConnector.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryConnector.java @@ -244,8 +244,8 @@ public abstract class AbstractRepositoryConnector { existingTask.setPriority(queryHit.getPriority()); changed = true; } - if (hasTaskPropertyChanged(existingTask.getTaskUrl(), queryHit.getTaskUrl())) { - existingTask.setTaskUrl(queryHit.getTaskUrl()); + if (hasTaskPropertyChanged(existingTask.getUrl(), queryHit.getUrl())) { + existingTask.setUrl(queryHit.getUrl()); changed = true; } diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryQuery.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryQuery.java index 2a4913b56..e4c925532 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryQuery.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryQuery.java @@ -14,7 +14,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.mylyn.tasks.core.AbstractTask.PriorityLevel; /** - * Extend to provide a repository query that can be used in the Task List. + * A container that stores tasks from a specific repository. * * @author Mik Kersten * @author Eugene Kuleshov diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTask.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTask.java index 813f00bcc..1dc12c49d 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTask.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTask.java @@ -52,8 +52,6 @@ public abstract class AbstractTask extends AbstractTaskContainer { private boolean reminded = false; - private String taskUrl = ""; - private Set<AbstractTaskContainer> containers = new HashSet<AbstractTaskContainer>(); // ************ Synch **************** @@ -308,18 +306,7 @@ public abstract class AbstractTask extends AbstractTaskContainer { public void setPriority(String priority) { this.priority = priority; } - - /** - * TODO: consider removing - */ - public void setTaskUrl(String url) { - this.taskUrl = url; - } - - public String getTaskUrl() { - return taskUrl; - } - + public String getNotes() { // TODO: removed check for null once xml updated. if (notes == null) { @@ -412,7 +399,7 @@ public abstract class AbstractTask extends AbstractTaskContainer { } public boolean hasValidUrl() { - String taskUrl = getTaskUrl(); + String taskUrl = getUrl(); if (taskUrl != null && !taskUrl.equals("") && !taskUrl.equals("http://") && !taskUrl.equals("https://")) { try { new URL(taskUrl); diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTaskCategory.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTaskCategory.java index 3ebd3324d..074c7a992 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTaskCategory.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTaskCategory.java @@ -12,7 +12,10 @@ package org.eclipse.mylyn.tasks.core; /** + * A container that stores tasks from any repository. + * * @author Mik Kersten + * @since 2.0 */ public abstract class AbstractTaskCategory extends AbstractTaskContainer { 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 d2c41e21a..a6342484f 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 @@ -18,10 +18,11 @@ import org.eclipse.core.runtime.PlatformObject; import org.eclipse.mylyn.tasks.core.AbstractTask.PriorityLevel; /** - * Manipulate containers via TaskListManager + * Top-level Task List element that can contain other Task List elements. * * @author Mik Kersten - */ + * @since 2.0 + */ public abstract class AbstractTaskContainer extends PlatformObject implements Comparable<AbstractTaskContainer> { private String handle = ""; @@ -29,8 +30,7 @@ public abstract class AbstractTaskContainer extends PlatformObject implements Co private Set<AbstractTask> children = new CopyOnWriteArraySet<AbstractTask>(); /** - * Optional URL corresponding to the web resource associated with this - * container. + * Optional URL corresponding to the web resource associated with this container. */ protected String url = null; @@ -38,7 +38,7 @@ public abstract class AbstractTaskContainer extends PlatformObject implements Co assert handle != null; this.handle = handleAndDescription; } - + /** * Use {@link TaskList} methods instead. */ @@ -61,7 +61,7 @@ public abstract class AbstractTaskContainer extends PlatformObject implements Co public void clear() { children.clear(); } - + public Set<AbstractTask> getChildren() { return Collections.unmodifiableSet(children); } @@ -79,9 +79,6 @@ public abstract class AbstractTaskContainer extends PlatformObject implements Co return handle; } - /** - * @since 2.0 - */ public boolean isEmpty() { return children.isEmpty(); } @@ -90,10 +87,6 @@ public abstract class AbstractTaskContainer extends PlatformObject implements Co return handle; } - public void setDescription(String description) { - this.handle = description; - } - public void setHandleIdentifier(String handle) { this.handle = handle; } @@ -108,7 +101,7 @@ public abstract class AbstractTaskContainer extends PlatformObject implements Co } /** - * @return can be null + * @return can be null */ public String getUrl() { return url; @@ -130,7 +123,7 @@ public abstract class AbstractTaskContainer extends PlatformObject implements Co public String toString() { return "container: " + handle; } - + public String getPriority() { String highestPriority = PriorityLevel.P5.toString(); Set<AbstractTask> tasks = getChildren(); @@ -144,10 +137,9 @@ public abstract class AbstractTaskContainer extends PlatformObject implements Co } return highestPriority; } - + /** - * The handle for most containers is their summary. Override to specify a - * different natural ordering. + * The handle for most containers is their summary. Override to specify a different natural ordering. */ public int compareTo(AbstractTaskContainer taskListElement) { return getHandleIdentifier().compareTo(((AbstractTaskContainer) taskListElement).getHandleIdentifier()); diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTaskDataHandler.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTaskDataHandler.java index 7688ea517..02a3e3c69 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTaskDataHandler.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTaskDataHandler.java @@ -17,8 +17,11 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; /** + * Responsible for retrieving and posting task data to a repository. + * * @author Mik Kersten * @author Rob Elves + * @since 2.0 */ public abstract class AbstractTaskDataHandler { diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTaskElement.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTaskElement.java deleted file mode 100644 index e69de29bb..000000000 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTaskElement.java +++ /dev/null diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTaskListFactory.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTaskListFactory.java index be1e8707c..ac0957ba8 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTaskListFactory.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTaskListFactory.java @@ -17,13 +17,14 @@ import java.util.Set; import org.w3c.dom.Element; /** - * When overriding these methods be sure not to perform network access since the Task List is read and written - * frequently. + * Responsible for storing and creating task list elements. + * + * When overriding these methods be sure not to perform network access since the Task List is + * read and written frequently. * * @author Mik Kersten * @author Ken Sueda - * - * TODO: consider merging tasks and categories + * @since 2.0 */ public abstract class AbstractTaskListFactory { diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AttributeContainer.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AttributeContainer.java index 33f0ade10..c54a2c40b 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AttributeContainer.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AttributeContainer.java @@ -20,7 +20,10 @@ import java.util.List; import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; /** + * Encapsulates attributes for task data. + * * @author Rob Elves + * @since 2.0 */ public class AttributeContainer implements Serializable { diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/FileAttachment.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/FileAttachment.java index a89a3139c..8228720b1 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/FileAttachment.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/FileAttachment.java @@ -17,7 +17,10 @@ import java.io.IOException; import java.io.InputStream; /** + * Proxy for a file attachment. + * * @author Steffen Pingel + * @since 2.0 */ public class FileAttachment implements ITaskAttachment { diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ILinkedTaskInfo.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ILinkedTaskInfo.java index 8d911b020..635378796 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ILinkedTaskInfo.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ILinkedTaskInfo.java @@ -12,15 +12,16 @@ package org.eclipse.mylyn.tasks.core; /** - * Task information linked to artifacts from version control integration + * Task information linking tasks to resources. * * @author Eugene Kuleshov + * @since 2.0 */ public interface ILinkedTaskInfo { public abstract String getTaskId(); - public abstract String getTaskFullUrl(); + public abstract String getTaskUrl(); public abstract String getRepositoryUrl(); diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/IRepositoryConstants.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/IRepositoryConstants.java index 71a1b73ae..abfa9d132 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/IRepositoryConstants.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/IRepositoryConstants.java @@ -10,6 +10,7 @@ package org.eclipse.mylyn.tasks.core; /** * @author Mik Kersten + * @since 2.0 */ public interface IRepositoryConstants { diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskActivityListener.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskActivityListener.java index aec96dfbc..06dad72d1 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskActivityListener.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskActivityListener.java @@ -13,10 +13,12 @@ package org.eclipse.mylyn.tasks.core; import org.eclipse.mylyn.internal.tasks.core.ScheduledTaskContainer; - /** + * Notified of task activity changes. + * * @author Mik Kersten * @author Rob Elves + * @since 2.0 */ public interface ITaskActivityListener { diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskAttachment.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskAttachment.java index 507ef9a31..2c23bb304 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskAttachment.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskAttachment.java @@ -15,7 +15,10 @@ import java.io.IOException; import java.io.InputStream; /** + * Encapsualtes resources that can be attached to a task. + * * @author Steffen Pingel + * @since 2.0 */ public interface ITaskAttachment { diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskCollector.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskCollector.java index a950c22b7..586cc8c71 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskCollector.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskCollector.java @@ -16,13 +16,16 @@ import java.util.Set; import org.eclipse.core.runtime.CoreException; /** + * Abstraction used for collecting tasks, e.g. when performing queries on the repository. + * * @author Rob Elves + * @since 2.0 */ public interface ITaskCollector { - void accept(AbstractTask task); + public void accept(AbstractTask task); - void accept(RepositoryTaskData taskData) throws CoreException; + public void accept(RepositoryTaskData taskData) throws CoreException; - public Set<AbstractTask> getTaskHits(); + public Set<AbstractTask> getTasks(); } diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskFactory.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskFactory.java index 68583a7ad..baa6e06f5 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskFactory.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskFactory.java @@ -13,7 +13,10 @@ import org.eclipse.core.runtime.IProgressMonitor; /** + * Used for creating tasks from repository task data. + * * @author Rob Elves + * @since 2.0 */ public interface ITaskFactory { diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskListChangeListener.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskListChangeListener.java index b12af7eeb..9be1beb1d 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskListChangeListener.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskListChangeListener.java @@ -18,6 +18,7 @@ import java.util.Set; * Listener for task list modifications and task content modifications. * * @author Mik Kersten + * @since 2.0 */ public interface ITaskListChangeListener { diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskListExternalizer.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskListExternalizer.java deleted file mode 100644 index febdc5cd2..000000000 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskListExternalizer.java +++ /dev/null @@ -1,63 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 - 2006 University Of British Columbia 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 - * - * Contributors: - * University Of British Columbia - initial API and implementation - *******************************************************************************/ - -package org.eclipse.mylyn.tasks.core; - -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; - -/** - * Used to externalize things like tasks and bug reports along with the task - * list so that information about them can be persisted across invocations. - * - * @author Mik Kersten - * @author Ken Sueda - * - * TODO: consider merging tasks and categories - */ -public interface ITaskListExternalizer { - - public abstract String getCategoryTagName(); - - public abstract String getTaskTagName(); - - public abstract String getQueryTagNameForElement(AbstractRepositoryQuery query); - - /** - * @return the element that was created, null if failed - */ - public abstract Element createCategoryElement(AbstractTaskContainer category, Document doc, Element parent); - - public abstract boolean canCreateElementFor(AbstractTask task); - - /** - * @return the element that was created, null if failed - */ - public abstract Element createTaskElement(AbstractTask task, Document doc, Element parent); - - public abstract boolean canReadCategory(Node node); - - public abstract void readCategory(Node node, TaskList taskList) throws TaskExternalizationException; - - public abstract boolean canReadTask(Node node); - - public abstract AbstractTask createTask(String repositoryUrl, String taskId, String summary, Element element, - TaskList tlist, AbstractTaskContainer category, AbstractTask parent) throws TaskExternalizationException; - - public abstract boolean canCreateElementFor(AbstractRepositoryQuery category); - - public abstract Element createQueryElement(AbstractRepositoryQuery query, Document doc, Element parent); - - public abstract boolean canReadQuery(Node node); - - public abstract AbstractRepositoryQuery readQuery(Node node, TaskList tlist) throws TaskExternalizationException; -} diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskRepositoryListener.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskRepositoryListener.java index fccb69c9b..9880e59b3 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskRepositoryListener.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskRepositoryListener.java @@ -13,7 +13,10 @@ package org.eclipse.mylyn.tasks.core; /** + * Notified of change to task repositories. + * * @author Mik Kersten + * @since 2.0 */ public interface ITaskRepositoryListener { diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/QueryHitCollector.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/QueryHitCollector.java index b22fba5e1..844c9503a 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/QueryHitCollector.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/QueryHitCollector.java @@ -17,11 +17,12 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; /** - * Collects QueryHits resulting from repository search + * Collects QueryHits resulting from repository search. * * @author Shawn Minto * @author Rob Elves (generalized from bugzilla) * @author Steffen Pingel + * @since 2.0 */ public class QueryHitCollector implements ITaskCollector { @@ -57,7 +58,7 @@ public class QueryHitCollector implements ITaskCollector { } } - public Set<AbstractTask> getTaskHits() { + public Set<AbstractTask> getTasks() { return taskResults; } diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryAttachment.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryAttachment.java index 5a46347a6..e25cf83e3 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryAttachment.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryAttachment.java @@ -14,8 +14,11 @@ package org.eclipse.mylyn.tasks.core; import java.io.Serializable; /** + * Encapsulates a file or other resource attached to a task. + * * @author Rob Elves * @author Mik Kersten + * @since 2.0 */ public class RepositoryAttachment extends AttributeContainer implements Serializable { diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryOperation.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryOperation.java index c09cb20d8..f51f00da8 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryOperation.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryOperation.java @@ -21,7 +21,10 @@ import java.util.Map; * A representation of an operation that can be done to the bug when it is * submitted * + * NOTE: likely to change for 3.0 + * * @author Shawn Minto + * @since 2.0 */ public class RepositoryOperation implements Serializable { /** @@ -214,5 +217,4 @@ public class RepositoryOperation implements Serializable { public void setInputValue(String inputValue) { this.inputValue = inputValue; } - } diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryStatus.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryStatus.java index 4f512f2d6..a4f668ba5 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryStatus.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryStatus.java @@ -16,8 +16,11 @@ import org.eclipse.core.runtime.Status; import org.eclipse.osgi.util.NLS; /** + * Utility for working and capturing status specific to repository connections. + * * @author Rob Elves * @author Steffen Pingel + * @since 2.0 */ public class RepositoryStatus extends Status { diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryTaskAttribute.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryTaskAttribute.java index c7e8fea36..e4163766f 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryTaskAttribute.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryTaskAttribute.java @@ -19,10 +19,10 @@ import java.util.List; import java.util.Map; /** - * Class representing a report attribute + * Encapsulates common task attributes. * * @author Rob Elves - * + * @since 2.0 */ public class RepositoryTaskAttribute implements Serializable { diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryTaskData.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryTaskData.java index b2af155e5..4fcda62d3 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryTaskData.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryTaskData.java @@ -25,6 +25,7 @@ import org.eclipse.mylyn.internal.tasks.core.RepositoryTaskHandleUtil; * * @author Mik Kersten * @author Rob Elves + * @since 2.0 */ public final class RepositoryTaskData extends AttributeContainer implements Serializable { @@ -204,11 +205,11 @@ public final class RepositoryTaskData extends AttributeContainer implements Seri repositoryOperations.add(o); } - public List<String> getCC() { + public List<String> getCc() { return getAttributeValues(RepositoryTaskAttribute.USER_CC); } - public void removeCC(String email) { + public void removeCc(String email) { removeAttributeValue(RepositoryTaskAttribute.USER_CC, email); } diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryTemplate.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryTemplate.java index e3f537925..2e0c64560 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryTemplate.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryTemplate.java @@ -15,8 +15,11 @@ import java.util.LinkedHashMap; import java.util.Map; /** + * Specifies attributes for a task repository. + * * @author Eugene Kuleshov * @author Steffen Pingel + * @since 2.0 */ public class RepositoryTemplate { diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskList.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskList.java index 0b29b1242..686ff3e62 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskList.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskList.java @@ -26,6 +26,7 @@ import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.core.LocalTask; import org.eclipse.mylyn.internal.tasks.core.RepositoryTaskHandleUtil; import org.eclipse.mylyn.internal.tasks.core.TaskArchive; +import org.eclipse.mylyn.internal.tasks.core.TaskCategory; import org.eclipse.mylyn.internal.tasks.core.UnfiledCategory; /** @@ -178,9 +179,9 @@ public class TaskList { repositoryTask.setRepositoryUrl(newRepositoryUrl); tasks.put(repositoryTask.getHandleIdentifier(), repositoryTask); - String taskUrl = repositoryTask.getTaskUrl(); + String taskUrl = repositoryTask.getUrl(); if (taskUrl.startsWith(oldRepositoryUrl)) { - repositoryTask.setTaskUrl(newRepositoryUrl + taskUrl.substring(oldRepositoryUrl.length())); + repositoryTask.setUrl(newRepositoryUrl + taskUrl.substring(oldRepositoryUrl.length())); } } } @@ -235,12 +236,14 @@ public class TaskList { return; } else if (!(container instanceof TaskArchive) && !(container instanceof UnfiledCategory)) { if (queries.remove(container.getHandleIdentifier()) != null) { - container.setDescription(newDescription); - if (container instanceof AbstractRepositoryQuery) { + if (container instanceof AbstractTaskCategory) { + ((AbstractTaskCategory)container).setHandleIdentifier(newDescription); + } else if (container instanceof AbstractRepositoryQuery) { + ((AbstractRepositoryQuery)container).setHandleIdentifier(newDescription); this.addQuery((AbstractRepositoryQuery) container); } } else if (container instanceof TaskCategory && categories.remove(container.getHandleIdentifier()) != null) { - container.setDescription(newDescription); + ((TaskCategory)container).setHandleIdentifier(newDescription); this.addCategory((TaskCategory) container); } } @@ -494,7 +497,7 @@ public class TaskList { public AbstractTask getRepositoryTask(String taskUrl) { for (AbstractTask currTask : tasks.values()) { if (currTask instanceof AbstractTask) { - String currUrl = ((AbstractTask) currTask).getTaskUrl(); + String currUrl = ((AbstractTask) currTask).getUrl(); if (currUrl != null && !currUrl.equals("") && currUrl.equals(taskUrl)) { return (AbstractTask) currTask; } diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TableSorterTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TableSorterTest.java index 004a52e2a..9e03b08e3 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TableSorterTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TableSorterTest.java @@ -14,10 +14,10 @@ package org.eclipse.mylyn.tasks.tests; import junit.framework.TestCase; import org.eclipse.mylyn.internal.tasks.core.LocalTask; +import org.eclipse.mylyn.internal.tasks.core.TaskCategory; import org.eclipse.mylyn.internal.tasks.ui.views.TaskListTableSorter; import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView; import org.eclipse.mylyn.tasks.core.AbstractTask; -import org.eclipse.mylyn.tasks.core.TaskCategory; /** * @author Mik Kersten diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListDnDTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListDnDTest.java index 8f8a381a9..6a0bd978f 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListDnDTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListDnDTest.java @@ -69,7 +69,7 @@ public class TaskListDnDTest extends TestCase { Set<AbstractTask> tasks = manager.getTaskList().getDefaultCategory().getChildren(); assertNotNull(tasks); assertEquals(1, tasks.size()); - assertEquals(url, tasks.iterator().next().getTaskUrl()); + assertEquals(url, tasks.iterator().next().getUrl()); // TODO: Failing due to asynchronous retrieval of title from url // assertEquals(title, tasks.get(0).getDescription(false)); 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 15d4c43ba..183550b3f 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 @@ -28,6 +28,7 @@ import junit.framework.TestCase; import org.eclipse.mylyn.context.core.ContextCorePlugin; import org.eclipse.mylyn.internal.tasks.core.LocalTask; import org.eclipse.mylyn.internal.tasks.core.RepositoryTaskHandleUtil; +import org.eclipse.mylyn.internal.tasks.core.TaskCategory; import org.eclipse.mylyn.internal.tasks.core.UnfiledCategory; import org.eclipse.mylyn.internal.tasks.ui.ScheduledTaskListSynchJob; import org.eclipse.mylyn.internal.tasks.ui.TaskListSynchronizationScheduler; @@ -39,7 +40,6 @@ import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.AbstractTaskCategory; import org.eclipse.mylyn.tasks.core.AbstractTaskContainer; import org.eclipse.mylyn.tasks.core.RepositoryTaskData; -import org.eclipse.mylyn.tasks.core.TaskCategory; import org.eclipse.mylyn.tasks.core.TaskList; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.core.AbstractTask.RepositoryTaskSyncState; @@ -215,12 +215,12 @@ public class TaskListManagerTest extends TestCase { public void testMigrateTaskHandlesWithExplicitSet() { AbstractTask task = new MockRepositoryTask("http://a", "123"); - task.setTaskUrl("http://a/task/123"); + task.setUrl("http://a/task/123"); manager.getTaskList().addTask(task); manager.refactorRepositoryUrl("http://a", "http://b"); assertNull(manager.getTaskList().getTask("http://a-123")); assertNotNull(manager.getTaskList().getTask("http://b-123")); - assertEquals("http://b/task/123", task.getTaskUrl()); + assertEquals("http://b/task/123", task.getUrl()); } public void testIsActiveToday() { diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListTest.java index 8eca69ff1..0b5ffec98 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListTest.java @@ -10,7 +10,7 @@ package org.eclipse.mylyn.tasks.tests; import junit.framework.TestCase; -import org.eclipse.mylyn.tasks.core.TaskCategory; +import org.eclipse.mylyn.internal.tasks.core.TaskCategory; import org.eclipse.mylyn.tasks.core.TaskList; diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListUiTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListUiTest.java index 518d2535d..62a225344 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListUiTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListUiTest.java @@ -21,6 +21,7 @@ import junit.framework.TestCase; import org.eclipse.jface.action.IContributionItem; import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.mylyn.internal.tasks.core.TaskCategory; import org.eclipse.mylyn.internal.tasks.ui.MoveToCategoryMenuContributor; import org.eclipse.mylyn.internal.tasks.ui.TaskPriorityFilter; import org.eclipse.mylyn.internal.tasks.ui.actions.MarkTaskCompleteAction; @@ -30,7 +31,6 @@ import org.eclipse.mylyn.internal.web.tasks.WebTask; import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.AbstractTaskContainer; import org.eclipse.mylyn.tasks.core.ITaskListChangeListener; -import org.eclipse.mylyn.tasks.core.TaskCategory; import org.eclipse.mylyn.tasks.core.AbstractTask.PriorityLevel; import org.eclipse.mylyn.tasks.tests.connector.MockRepositoryQuery; import org.eclipse.mylyn.tasks.ui.TaskListManager; diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskTest.java index dfb665227..87ff08114 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskTest.java @@ -34,19 +34,19 @@ public class TaskTest extends TestCase { public void testUrl() { AbstractTask task = new LocalTask("handle", "label"); - task.setTaskUrl("http://eclipse.org/mylar/doc.php"); + task.setUrl("http://eclipse.org/mylar/doc.php"); assertTrue(task.hasValidUrl()); - task.setTaskUrl("http://"); + task.setUrl("http://"); assertFalse(task.hasValidUrl()); - task.setTaskUrl("https://"); + task.setUrl("https://"); assertFalse(task.hasValidUrl()); - task.setTaskUrl(""); + task.setUrl(""); assertFalse(task.hasValidUrl()); - task.setTaskUrl(null); + task.setUrl(null); assertFalse(task.hasValidUrl()); } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AddExistingTaskJob.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AddExistingTaskJob.java index 860a37856..0b98b8c47 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AddExistingTaskJob.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AddExistingTaskJob.java @@ -11,11 +11,11 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; +import org.eclipse.mylyn.internal.tasks.core.TaskCategory; import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView; import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.AbstractTaskCategory; -import org.eclipse.mylyn.tasks.core.TaskCategory; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; import org.eclipse.mylyn.tasks.ui.TasksUiUtil; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/PersonProposalProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/PersonProposalProvider.java index 8e44f3dbe..0977e29d6 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/PersonProposalProvider.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/PersonProposalProvider.java @@ -144,7 +144,7 @@ public class PersonProposalProvider implements IContentProposalProvider { if (data != null) { // addressSet.add(data.getAssignedTo()); // owner addAddress(data.getReporter(), addressSet); // ?? - for (String address : data.getCC()) { + for (String address : data.getCc()) { addAddress(address, addressSet); } for (TaskComment comment : currentTaskData.getComments()) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/CopyTaskDetailsAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/CopyTaskDetailsAction.java index d455e0ff9..d74630755 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/CopyTaskDetailsAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/CopyTaskDetailsAction.java @@ -75,7 +75,7 @@ public class CopyTaskDetailsAction extends BaseSelectionListenerAction { text += task.getSummary(); if (task.hasValidUrl()) { - text += "\n" + task.getTaskUrl(); + text += "\n" + task.getUrl(); } } } else if (object instanceof AbstractRepositoryQuery) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/DeleteAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/DeleteAction.java index c509ed4f9..fe8b2b87f 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/DeleteAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/DeleteAction.java @@ -18,11 +18,11 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.mylyn.context.core.ContextCorePlugin; +import org.eclipse.mylyn.internal.tasks.core.TaskCategory; import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView; import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.AbstractTaskContainer; -import org.eclipse.mylyn.tasks.core.TaskCategory; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; import org.eclipse.mylyn.tasks.ui.TasksUiUtil; import org.eclipse.ui.ISharedImages; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewCategoryAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewCategoryAction.java index 3af213ec6..dd277c98f 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewCategoryAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewCategoryAction.java @@ -16,8 +16,8 @@ import org.eclipse.jface.action.IAction; import org.eclipse.jface.dialogs.InputDialog; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.window.Window; +import org.eclipse.mylyn.internal.tasks.core.TaskCategory; import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages; -import org.eclipse.mylyn.tasks.core.TaskCategory; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; import org.eclipse.ui.IViewActionDelegate; import org.eclipse.ui.IViewPart; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTaskAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTaskAction.java index 58133686a..e8a986760 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTaskAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTaskAction.java @@ -59,7 +59,7 @@ public class OpenTaskAction extends ActionDelegate implements IWorkbenchWindowAc AbstractTask task = (AbstractTask) result; if (dlg.getOpenInBrowser()) { if (task.hasValidUrl()) { - TasksUiUtil.openUrl(task.getTaskUrl(), false); + TasksUiUtil.openUrl(task.getUrl(), false); TasksUiPlugin.getTaskListManager().getTaskActivationHistory().addTask(task); } } else { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenWithBrowserAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenWithBrowserAction.java index 72c7b7b64..32cd9203f 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenWithBrowserAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenWithBrowserAction.java @@ -49,7 +49,7 @@ public class OpenWithBrowserAction extends BaseSelectionListenerAction { if (selectedObject instanceof AbstractTask) { AbstractTask task = (AbstractTask)selectedObject; if (task != null && task.hasValidUrl()) { - urlString = task.getTaskUrl(); + urlString = task.getUrl(); } } else if (selectedObject instanceof AbstractTaskContainer) { AbstractTaskContainer query = (AbstractTaskContainer) selectedObject; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RemoveFromCategoryAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RemoveFromCategoryAction.java index ab3d8829b..a87d1114c 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RemoveFromCategoryAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RemoveFromCategoryAction.java @@ -16,11 +16,11 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; +import org.eclipse.mylyn.internal.tasks.core.TaskCategory; import org.eclipse.mylyn.internal.tasks.ui.ITasksUiConstants; import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages; import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView; import org.eclipse.mylyn.tasks.core.AbstractTask; -import org.eclipse.mylyn.tasks.core.TaskCategory; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; import org.eclipse.swt.widgets.TreeItem; import org.eclipse.ui.PlatformUI; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/SynchronizeSelectedAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/SynchronizeSelectedAction.java index 9627c4fe0..308ae586b 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/SynchronizeSelectedAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/SynchronizeSelectedAction.java @@ -23,11 +23,11 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.mylyn.internal.tasks.core.TaskCategory; import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView; import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylyn.tasks.core.AbstractTask; -import org.eclipse.mylyn.tasks.core.TaskCategory; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.ui.RepositorySynchronizationManager; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskListElementPropertiesAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskListElementPropertiesAction.java index d7d5d7f6a..3e196da3f 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskListElementPropertiesAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskListElementPropertiesAction.java @@ -15,9 +15,9 @@ import org.eclipse.jface.action.Action; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredViewer; +import org.eclipse.mylyn.internal.tasks.core.TaskCategory; import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylyn.tasks.core.AbstractTaskContainer; -import org.eclipse.mylyn.tasks.core.TaskCategory; import org.eclipse.mylyn.tasks.ui.TasksUiUtil; /** diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/CategoryEditorInput.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/CategoryEditorInput.java index 46d58ad9a..7db7d2bf7 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/CategoryEditorInput.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/CategoryEditorInput.java @@ -15,8 +15,8 @@ import java.util.HashSet; import java.util.Set; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.mylyn.internal.tasks.core.TaskCategory; import org.eclipse.mylyn.tasks.core.AbstractTaskContainer; -import org.eclipse.mylyn.tasks.core.TaskCategory; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IPersistableElement; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java index a9966bdd3..419050cca 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java @@ -217,7 +217,7 @@ public class TaskPlanningEditor extends TaskFormPage { TasksUiPlugin.getTaskListManager().getTaskList().renameTask((AbstractTask) task, label); // TODO: refactor mutation into TaskList? - task.setTaskUrl(issueReportURL.getText()); + task.setUrl(issueReportURL.getText()); String priorityDescription = priorityCombo.getItem(priorityCombo.getSelectionIndex()); PriorityLevel level = PriorityLevel.fromDescription(priorityDescription); if (level != null) { @@ -444,7 +444,7 @@ public class TaskPlanningEditor extends TaskFormPage { Label label = toolkit.createLabel(urlComposite, "URL:"); label.setForeground(toolkit.getColors().getColor(IFormColors.TITLE)); - issueReportURL = toolkit.createText(urlComposite, task.getTaskUrl(), SWT.FLAT); + issueReportURL = toolkit.createText(urlComposite, task.getUrl(), SWT.FLAT); issueReportURL.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); if (!(task instanceof LocalTask)) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityEditorPart.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityEditorPart.java index 4c7c4a3a2..0f92ce6a8 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityEditorPart.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityEditorPart.java @@ -744,7 +744,7 @@ public class TaskActivityEditorPart extends EditorPart { writer.write("<td width=\"59\">ICON</td><td width=\"55\">" + currentTask.getPriority() + "</td><td width=\"495\">"); if (currentTask.hasValidUrl()) { - writer.write("<a href='" + currentTask.getTaskUrl() + "'>" + currentTask.getSummary() + "</a>"); + writer.write("<a href='" + currentTask.getUrl() + "'>" + currentTask.getSummary() + "</a>"); } else { writer.write(currentTask.getSummary()); } @@ -801,7 +801,7 @@ public class TaskActivityEditorPart extends EditorPart { + "</td><td width=\"495\">"); if (currentTask.hasValidUrl()) { - writer.write("<a href='" + currentTask.getTaskUrl() + "'>" + currentTask.getSummary() + "</a>"); + writer.write("<a href='" + currentTask.getUrl() + "'>" + currentTask.getSummary() + "</a>"); } else { writer.write(currentTask.getSummary()); } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/OpenSearchResultAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/OpenSearchResultAction.java index 76bdfd9ae..bdd1487e4 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/OpenSearchResultAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/OpenSearchResultAction.java @@ -55,7 +55,7 @@ public class OpenSearchResultAction extends Action { // go through each of the selected items and show it in an editor for (Iterator<AbstractTask> it = selection.iterator(); it.hasNext();) { AbstractTask repositoryHit = it.next(); - TasksUiUtil.openRepositoryTask(repositoryHit.getRepositoryUrl(), repositoryHit.getTaskId(), repositoryHit.getTaskUrl()); + TasksUiUtil.openRepositoryTask(repositoryHit.getRepositoryUrl(), repositoryHit.getTaskId(), repositoryHit.getUrl()); // try { // int taskId = Integer.parseInt(repositoryHit.getId()); // String bugUrl = diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/RepositorySearchResultView.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/RepositorySearchResultView.java index 1d14918ad..65f4c0416 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/RepositorySearchResultView.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/RepositorySearchResultView.java @@ -213,7 +213,7 @@ public class RepositorySearchResultView extends AbstractTextSearchViewPage imple AbstractTask repositoryHit = (AbstractTask) match.getElement(); TasksUiUtil.openRepositoryTask(repositoryHit.getRepositoryUrl(), repositoryHit.getTaskId(), repositoryHit - .getTaskUrl()); + .getUrl()); } @Override diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/DelegatingTaskExternalizer.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/DelegatingTaskExternalizer.java index eab2faf18..601e4a232 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/DelegatingTaskExternalizer.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/DelegatingTaskExternalizer.java @@ -22,13 +22,13 @@ import java.util.Locale; import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.core.RepositoryTaskHandleUtil; import org.eclipse.mylyn.internal.tasks.core.TaskArchive; +import org.eclipse.mylyn.internal.tasks.core.TaskCategory; import org.eclipse.mylyn.internal.tasks.core.UnfiledCategory; import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.AbstractTaskCategory; import org.eclipse.mylyn.tasks.core.AbstractTaskContainer; import org.eclipse.mylyn.tasks.core.AbstractTaskListFactory; -import org.eclipse.mylyn.tasks.core.TaskCategory; import org.eclipse.mylyn.tasks.core.TaskExternalizationException; import org.eclipse.mylyn.tasks.core.TaskList; import org.eclipse.mylyn.tasks.core.AbstractTask.PriorityLevel; @@ -210,8 +210,8 @@ final class DelegatingTaskExternalizer { node.setAttribute(KEY_ACTIVE, VAL_FALSE); } - if (task.getTaskUrl() != null) { - node.setAttribute(KEY_ISSUEURL, task.getTaskUrl()); + if (task.getUrl() != null) { + node.setAttribute(KEY_ISSUEURL, task.getUrl()); } node.setAttribute(KEY_NOTES, stripControlCharacters(task.getNotes())); node.setAttribute(KEY_TIME_ESTIMATED, "" + task.getEstimateTimeHours()); @@ -432,9 +432,9 @@ final class DelegatingTaskExternalizer { task.setActive(false); } if (element.hasAttribute(KEY_ISSUEURL)) { - task.setTaskUrl(element.getAttribute(KEY_ISSUEURL)); + task.setUrl(element.getAttribute(KEY_ISSUEURL)); } else { - task.setTaskUrl(""); + task.setUrl(""); } if (element.hasAttribute(KEY_NOTES)) { task.setNotes(element.getAttribute(KEY_NOTES)); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskElementLabelProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskElementLabelProvider.java index 7cf857f73..38c25e20f 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskElementLabelProvider.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskElementLabelProvider.java @@ -19,6 +19,7 @@ import org.eclipse.jface.viewers.IFontProvider; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.mylyn.internal.tasks.core.ScheduledTaskContainer; import org.eclipse.mylyn.internal.tasks.core.TaskArchive; +import org.eclipse.mylyn.internal.tasks.core.TaskCategory; import org.eclipse.mylyn.internal.tasks.core.UnfiledCategory; import org.eclipse.mylyn.internal.tasks.ui.ITaskHighlighter; import org.eclipse.mylyn.internal.tasks.ui.TaskListColorsAndFonts; @@ -26,7 +27,6 @@ import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages; import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.AbstractTaskContainer; -import org.eclipse.mylyn.tasks.core.TaskCategory; import org.eclipse.mylyn.tasks.core.AbstractTask.PriorityLevel; import org.eclipse.mylyn.tasks.core.AbstractTask.RepositoryTaskSyncState; import org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java index 5e5de28f5..b0af3d7ea 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java @@ -28,6 +28,7 @@ import org.eclipse.jface.viewers.ViewerDropAdapter; import org.eclipse.mylyn.context.core.ContextCorePlugin; import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.core.ScheduledTaskContainer; +import org.eclipse.mylyn.internal.tasks.core.TaskCategory; import org.eclipse.mylyn.internal.tasks.ui.ITasksUiConstants; import org.eclipse.mylyn.internal.tasks.ui.RetrieveTitleFromUrlJob; import org.eclipse.mylyn.internal.tasks.ui.actions.TaskActivateAction; @@ -35,7 +36,6 @@ import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.AbstractTaskContainer; -import org.eclipse.mylyn.tasks.core.TaskCategory; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.ui.TaskTransfer; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; @@ -233,7 +233,7 @@ public class TaskListDropAdapter extends ViewerDropAdapter { if (newTask == null) { return false; } - newTask.setTaskUrl(url); + newTask.setUrl(url); // NOTE: setting boolean param as false so that we go directly to // the diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java index 3b196b471..d73544868 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java @@ -54,6 +54,7 @@ import org.eclipse.jface.window.Window; import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.core.ScheduledTaskContainer; import org.eclipse.mylyn.internal.tasks.core.TaskArchive; +import org.eclipse.mylyn.internal.tasks.core.TaskCategory; import org.eclipse.mylyn.internal.tasks.core.UnfiledCategory; import org.eclipse.mylyn.internal.tasks.ui.AbstractTaskListFilter; import org.eclipse.mylyn.internal.tasks.ui.IDynamicSubMenuContributor; @@ -97,7 +98,6 @@ import org.eclipse.mylyn.tasks.core.AbstractTaskCategory; import org.eclipse.mylyn.tasks.core.AbstractTaskContainer; import org.eclipse.mylyn.tasks.core.ITaskActivityListener; import org.eclipse.mylyn.tasks.core.ITaskListChangeListener; -import org.eclipse.mylyn.tasks.core.TaskCategory; import org.eclipse.mylyn.tasks.core.TaskContainerDelta; import org.eclipse.mylyn.tasks.core.AbstractTask.PriorityLevel; import org.eclipse.mylyn.tasks.ui.TaskTransfer; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewAttachmentPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewAttachmentPage.java index b2e218982..79fbf9ac8 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewAttachmentPage.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewAttachmentPage.java @@ -20,8 +20,8 @@ import java.util.Map; import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.WizardPage; +import org.eclipse.mylyn.internal.tasks.core.LocalAttachment; import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages; -import org.eclipse.mylyn.tasks.core.LocalAttachment; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewAttachmentWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewAttachmentWizard.java index 577dea5a5..7dc546326 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewAttachmentWizard.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewAttachmentWizard.java @@ -29,13 +29,13 @@ import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.Wizard; import org.eclipse.mylyn.context.core.ContextCorePlugin; import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; +import org.eclipse.mylyn.internal.tasks.core.LocalAttachment; import org.eclipse.mylyn.internal.tasks.core.RepositoryTaskHandleUtil; import org.eclipse.mylyn.internal.tasks.ui.ITasksUiConstants; import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages; import org.eclipse.mylyn.tasks.core.AbstractAttachmentHandler; import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylyn.tasks.core.AbstractTask; -import org.eclipse.mylyn.tasks.core.LocalAttachment; import org.eclipse.mylyn.tasks.core.RepositoryStatus; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.core.AbstractTask.RepositoryTaskSyncState; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/PreviewAttachmentPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/PreviewAttachmentPage.java index 988b86a14..c3ff84528 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/PreviewAttachmentPage.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/PreviewAttachmentPage.java @@ -18,7 +18,7 @@ import java.util.HashMap; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.layout.GridLayoutFactory; import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.mylyn.tasks.core.LocalAttachment; +import org.eclipse.mylyn.internal.tasks.core.LocalAttachment; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.ScrolledComposite; import org.eclipse.swt.events.ControlAdapter; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetUpdater.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetUpdater.java index d655ea616..c7d2c440a 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetUpdater.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetUpdater.java @@ -17,10 +17,10 @@ import java.util.Set; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.mylyn.internal.tasks.core.TaskCategory; import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylyn.tasks.core.AbstractTaskContainer; import org.eclipse.mylyn.tasks.core.ITaskListChangeListener; -import org.eclipse.mylyn.tasks.core.TaskCategory; import org.eclipse.mylyn.tasks.core.TaskContainerDelta; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; import org.eclipse.ui.IWorkingSet; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/SynchronizeQueryJob.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/SynchronizeQueryJob.java index b700bf3d8..70badc481 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/SynchronizeQueryJob.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/SynchronizeQueryJob.java @@ -178,13 +178,13 @@ class SynchronizeQueryJob extends Job { if (resultingStatus.getSeverity() == IStatus.CANCEL) { // do nothing } else if (resultingStatus.isOK()) { - if (collector.getTaskHits().size() >= QueryHitCollector.MAX_HITS) { + if (collector.getTasks().size() >= QueryHitCollector.MAX_HITS) { StatusManager.log(QueryHitCollector.MAX_HITS_REACHED + "\n" + repositoryQuery.getSummary(), this); } repositoryQuery.clear(); - for (AbstractTask hit : collector.getTaskHits()) { + for (AbstractTask hit : collector.getTasks()) { AbstractTask task = taskList.getTask(hit.getHandleIdentifier()); if (task != null) { // update the existing task from the query hit diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java index 339095c92..dbe4bb9f9 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java @@ -43,6 +43,7 @@ import org.eclipse.mylyn.internal.tasks.core.LocalTask; import org.eclipse.mylyn.internal.tasks.core.RepositoryTaskHandleUtil; import org.eclipse.mylyn.internal.tasks.core.ScheduledTaskContainer; import org.eclipse.mylyn.internal.tasks.core.ScheduledTaskDelegate; +import org.eclipse.mylyn.internal.tasks.core.TaskCategory; import org.eclipse.mylyn.internal.tasks.core.TaskDataManager; import org.eclipse.mylyn.internal.tasks.ui.ITasksUiConstants; import org.eclipse.mylyn.internal.tasks.ui.TasksUiPreferenceConstants; @@ -58,7 +59,6 @@ import org.eclipse.mylyn.tasks.core.ITaskActivityListener; import org.eclipse.mylyn.tasks.core.ITaskListChangeListener; import org.eclipse.mylyn.tasks.core.RepositoryTaskAttribute; import org.eclipse.mylyn.tasks.core.RepositoryTaskData; -import org.eclipse.mylyn.tasks.core.TaskCategory; import org.eclipse.mylyn.tasks.core.TaskContainerDelta; import org.eclipse.mylyn.tasks.core.TaskList; import org.eclipse.mylyn.tasks.core.TaskRepository; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiUtil.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiUtil.java index 6d0d5fbbe..a096b0ec9 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiUtil.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiUtil.java @@ -40,6 +40,7 @@ import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.core.LocalTask; import org.eclipse.mylyn.internal.tasks.core.ScheduledTaskDelegate; +import org.eclipse.mylyn.internal.tasks.core.TaskCategory; import org.eclipse.mylyn.internal.tasks.ui.TasksUiPreferenceConstants; import org.eclipse.mylyn.internal.tasks.ui.editors.CategoryEditor; import org.eclipse.mylyn.internal.tasks.ui.editors.CategoryEditorInput; @@ -50,7 +51,6 @@ import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.AbstractTaskContainer; import org.eclipse.mylyn.tasks.core.RepositoryTaskData; -import org.eclipse.mylyn.tasks.core.TaskCategory; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.core.AbstractTask.RepositoryTaskSyncState; import org.eclipse.mylyn.tasks.ui.editors.TaskEditor; @@ -311,7 +311,7 @@ public class TasksUiUtil { IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); if (window != null) { if (openWithBrowser) { - openUrl(task.getTaskUrl(), false); + openUrl(task.getUrl(), false); } else { IWorkbenchPage page = window.getActivePage(); wasOpen = refreshIfOpen(task, editorInput); @@ -358,7 +358,7 @@ public class TasksUiUtil { IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); if (window != null) { if (openWithBrowser) { - openUrl(task.getTaskUrl(), false); + openUrl(task.getUrl(), false); } else { IWorkbenchPage page = window.getActivePage(); openEditor(editorInput, taskEditorId, page); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractNewRepositoryTaskEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractNewRepositoryTaskEditor.java index de0188818..62c8d6238 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractNewRepositoryTaskEditor.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractNewRepositoryTaskEditor.java @@ -25,6 +25,7 @@ import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.mylyn.internal.tasks.core.TaskCategory; import org.eclipse.mylyn.internal.tasks.core.UnfiledCategory; import org.eclipse.mylyn.internal.tasks.ui.TaskListColorsAndFonts; import org.eclipse.mylyn.internal.tasks.ui.TasksUiPreferenceConstants; @@ -33,7 +34,6 @@ import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.AbstractTaskCategory; import org.eclipse.mylyn.tasks.core.AbstractTaskContainer; import org.eclipse.mylyn.tasks.core.RepositoryTaskAttribute; -import org.eclipse.mylyn.tasks.core.TaskCategory; import org.eclipse.mylyn.tasks.core.TaskList; import org.eclipse.mylyn.tasks.ui.DatePicker; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java index 0d6bd89c5..922b2fb3f 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java @@ -607,7 +607,7 @@ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage { openBrowserAction = new Action() { @Override public void run() { - TasksUiUtil.openUrl(repositoryTask.getTaskUrl(), false); + TasksUiUtil.openUrl(repositoryTask.getUrl(), false); } }; @@ -1664,7 +1664,7 @@ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage { if (hasChanged(taskData.getAttribute(RepositoryTaskAttribute.USER_CC))) { ccList.setBackground(colorIncoming); } - java.util.List<String> ccs = taskData.getCC(); + java.util.List<String> ccs = taskData.getCc(); if (ccs != null) { for (Iterator<String> it = ccs.iterator(); it.hasNext();) { String cc = it.next(); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/SearchHitCollector.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/SearchHitCollector.java index 9509edeea..e36fb52da 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/SearchHitCollector.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/SearchHitCollector.java @@ -220,7 +220,7 @@ public class SearchHitCollector implements ISearchQuery, ITaskCollector { return MessageFormat.format(MATCHES, messageFormatArgs); } - public Set<AbstractTask> getTaskHits() { + public Set<AbstractTask> getTasks() { return taskResults; } diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracRepositoryConnector.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracRepositoryConnector.java index 8c398972c..48ed0f098 100644 --- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracRepositoryConnector.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracRepositoryConnector.java @@ -230,7 +230,7 @@ public class TracRepositoryConnector extends AbstractRepositoryConnector { repositoryTask.setSummary(taskData.getSummary()); repositoryTask.setOwner(taskData.getAttributeValue(RepositoryTaskAttribute.USER_ASSIGNED)); repositoryTask.setCompleted(TracTask.isCompleted(taskData.getStatus())); - repositoryTask.setTaskUrl(repository.getUrl() + ITracClient.TICKET_URL + taskData.getId()); + repositoryTask.setUrl(repository.getUrl() + ITracClient.TICKET_URL + taskData.getId()); repositoryTask.setPriority(TracTask.getMylarPriority(taskData.getAttributeValue(Attribute.PRIORITY .getTracKey()))); Kind kind = TracTask.Kind.fromType(taskData.getAttributeValue(Attribute.TYPE.getTracKey())); diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracTask.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracTask.java index a5a3b7cab..aa653d15b 100644 --- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracTask.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracTask.java @@ -136,7 +136,7 @@ public class TracTask extends AbstractTask { public TracTask(String repositoryUrl, String id, String label) { super(repositoryUrl, id, label); - setTaskUrl(repositoryUrl + ITracClient.TICKET_URL + id); + setUrl(repositoryUrl + ITracClient.TICKET_URL + id); } @Override diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/RepositorySearchQueryTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/RepositorySearchQueryTest.java index 4cd9b40ba..2b6a991d1 100644 --- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/RepositorySearchQueryTest.java +++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/RepositorySearchQueryTest.java @@ -81,10 +81,10 @@ public class RepositorySearchQueryTest extends TestCase { .getTaskList(), repository, query, new TaskFactory(repository, false, false)); collector.run(new NullProgressMonitor()); - for (AbstractTask task : collector.getTaskHits()) { + for (AbstractTask task : collector.getTasks()) { assertEquals(TracTestConstants.TEST_TRAC_096_URL, task.getRepositoryUrl()); } - assertEquals(data.tickets.size(), collector.getTaskHits().size()); + assertEquals(data.tickets.size(), collector.getTasks().size()); } } 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 2375d2364..3981c8789 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 @@ -142,7 +142,7 @@ public class TracRepositoryConnectorTest extends TestCase { assertNotNull(task); assertEquals(TracTask.class, task.getClass()); assertTrue(task.getSummary().contains("summary1")); - assertEquals(repository.getUrl() + ITracClient.TICKET_URL + id, task.getTaskUrl()); + assertEquals(repository.getUrl() + ITracClient.TICKET_URL + id, task.getUrl()); try { task = connector.createTaskFromExistingId(repository, "does not exist", new NullProgressMonitor()); @@ -236,11 +236,11 @@ public class TracRepositoryConnectorTest extends TestCase { ticket.putBuiltinValue(Key.TYPE, "mytype"); TracTask task = new TracTask(TracTestConstants.TEST_TRAC_010_URL, ""+123, "desc"); - assertEquals(TracTestConstants.TEST_TRAC_010_URL + ITracClient.TICKET_URL + "123", task.getTaskUrl()); + assertEquals(TracTestConstants.TEST_TRAC_010_URL + ITracClient.TICKET_URL + "123", task.getUrl()); assertEquals("desc", task.getSummary()); connector.updateTaskFromTicket(task, ticket, false); - assertEquals(TracTestConstants.TEST_TRAC_010_URL + ITracClient.TICKET_URL + "123", task.getTaskUrl()); + assertEquals(TracTestConstants.TEST_TRAC_010_URL + ITracClient.TICKET_URL + "123", task.getUrl()); assertEquals("123", task.getTaskKey()); assertEquals("mysummary", task.getSummary()); assertEquals("P3", task.getPriority()); @@ -256,7 +256,7 @@ public class TracRepositoryConnectorTest extends TestCase { TracTask task = new TracTask(TracTestConstants.TEST_TRAC_010_URL, ""+456, "desc"); connector.updateTaskFromTicket(task, ticket, false); - assertEquals(TracTestConstants.TEST_TRAC_010_URL + ITracClient.TICKET_URL + "456", task.getTaskUrl()); + assertEquals(TracTestConstants.TEST_TRAC_010_URL + ITracClient.TICKET_URL + "456", task.getUrl()); assertEquals("456", task.getTaskKey()); assertEquals("mysummary", task.getSummary()); assertEquals("P3", task.getPriority()); diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryQueryTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryQueryTest.java index c78785ec4..3b22a9341 100644 --- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryQueryTest.java +++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryQueryTest.java @@ -53,7 +53,7 @@ public class TracRepositoryQueryTest extends TestCase { assertEquals(newUrl, query.getRepositoryUrl()); assertEquals(newUrl + ITracClient.QUERY_URL + search.toUrl(), query.getUrl()); - assertEquals(newUrl + ITracClient.TICKET_URL + 123, task.getTaskUrl()); + assertEquals(newUrl + ITracClient.TICKET_URL + 123, task.getUrl()); } public void testGetFilterList() { diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/BrowserFormPage.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/BrowserFormPage.java index 92a503873..61415c9e1 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/BrowserFormPage.java +++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/BrowserFormPage.java @@ -43,7 +43,7 @@ public class BrowserFormPage extends FormPage { form.getBody().setLayout(new FillLayout()); browser = new Browser(form.getBody(), SWT.NONE); managedForm.getForm().setContent(browser); - browser.setUrl(task.getTaskUrl()); + browser.setUrl(task.getUrl()); } catch (SWTError e) { StatusManager.fail(e, "Could not create Browser page: " + e.getMessage(), true); } catch (RuntimeException e) { diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorFactory.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorFactory.java index 77fcb8546..7cc0b428e 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorFactory.java +++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorFactory.java @@ -72,7 +72,7 @@ public class TracTaskEditorFactory extends AbstractTaskEditorFactory { TaskRepository repository = TasksUiPlugin.getRepositoryManager().getRepository(TracCorePlugin.REPOSITORY_KIND, tracTask.getRepositoryUrl()); if (TracRepositoryConnector.hasRichEditor(repository)) { - return new RepositoryTaskEditorInput(repository, tracTask.getTaskId(), tracTask.getTaskUrl()); + return new RepositoryTaskEditorInput(repository, tracTask.getTaskId(), tracTask.getUrl()); } else { return new TaskEditorInput(task, false) { @Override |