Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormkersten2007-06-23 01:45:19 +0000
committermkersten2007-06-23 01:45:19 +0000
commita4907cc0d72cdc9e6eb7c1e62234edd01214b072 (patch)
treed00f7d5cc76c67787a47ae1b9db301faa2cbd1d4
parent8104b39adcbc0fa7cc24c841fa897b73f430d0a3 (diff)
downloadorg.eclipse.mylyn.tasks-a4907cc0d72cdc9e6eb7c1e62234edd01214b072.tar.gz
org.eclipse.mylyn.tasks-a4907cc0d72cdc9e6eb7c1e62234edd01214b072.tar.xz
org.eclipse.mylyn.tasks-a4907cc0d72cdc9e6eb7c1e62234edd01214b072.zip
NEW - bug 193842: [api] review Mylyn 2.0 APIs
https://bugs.eclipse.org/bugs/show_bug.cgi?id=193842
-rw-r--r--org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaMessages.java (renamed from org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TasksMessages.java)29
-rw-r--r--org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaMessages.properties14
-rw-r--r--org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java5
-rw-r--r--org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaStatus.java19
-rw-r--r--org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/UnrecognizedReponseException.java (renamed from org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/UnrecognizedReponseException.java)2
-rw-r--r--org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java6
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/plugin.xml2
-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/BugzillaConnectorUi.java (renamed from org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositoryUi.java)13
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskEditorFactory.java2
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskListFactory.java6
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/BugzillaProductPage.java2
-rw-r--r--org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/IRepositoryConstants.java (renamed from org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/IRepositoryConstants.java)4
-rw-r--r--org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/LocalTaskListFactory.java3
-rw-r--r--org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/SaxRepositoriesContentHandler.java3
-rw-r--r--org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskExternalizationException.java (renamed from org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskExternalizationException.java)5
-rw-r--r--org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskRepositoryFilter.java (renamed from org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepositoryFilter.java)6
-rw-r--r--org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryConnector.java3
-rw-r--r--org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTaskListFactory.java4
-rw-r--r--org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/MylarMessages.properties16
-rw-r--r--org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryTemplate.java2
-rw-r--r--org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskComment.java5
-rw-r--r--org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskContainerDelta.java3
-rw-r--r--org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskList.java29
-rw-r--r--org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepository.java26
-rw-r--r--org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepositoryManager.java30
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/AttachmentJobTest.java2
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/ProjectRepositoryAssociationTest.java4
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositorySettingsPageTest.java14
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java8
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoriesExternalizerTest.java8
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryManagerTest.java14
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositorySorterTest.java2
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryTest.java2
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockTaskConnectorUi.java (renamed from org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryUi.java)10
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockTaskListFactory.java3
-rw-r--r--org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.mylyn.tasks.ui/plugin.xml6
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AddExistingTaskJob.java2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ContextUiUtil.java (renamed from org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/ContextUiUtil.java)11
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ITaskCommandIds.java (renamed from org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/ITaskCommandIds.java)2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/LocalTaskConnectorUi.java (renamed from org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/LocalRepositoryUi.java)9
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/OpenRepositoryTaskJob.java (renamed from org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/OpenRepositoryTaskJob.java)4
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/RepositorySynchronizationManager.java (renamed from org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/RepositorySynchronizationManager.java)3
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ScheduledTaskListSynchJob.java3
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/SynchronizeQueryJob.java (renamed from org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/SynchronizeQueryJob.java)7
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/SynchronizeTaskJob.java (renamed from org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/SynchronizeTaskJob.java)5
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskFactory.java3
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskLabelDecorator.java2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskSearchPage.java6
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/AbstractTaskRepositoryAction.java2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/AddRepositoryAction.java2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/EditRepositoryPropertiesAction.java2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewTaskAction.java6
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/SynchronizeSelectedAction.java4
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/RemoteTaskSelectionDialog.java4
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryAttachmentEditorInput.java2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/properties/ProjectPropertiesLinkProvider.java (renamed from org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/ProjectPreferencesLinkProvider.java)8
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/properties/ProjectTaskRepositoryPage.java (renamed from org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/properties/ProjectTaskRepositoryPage.java)2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/DelegatingTaskExternalizer.java2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListWriter.java6
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiExtensionReader.java4
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/RepositoryOfflineAction.java2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/ResetRepositoryConfigurationAction.java2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskRepositoriesSorter.java6
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AddExistingTaskWizard.java4
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextAttachWizard.java2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextRetrieveWizard.java2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextRetrieveWizardPage.java2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/EditRepositoryWizard.java2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewAttachmentWizard.java2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewQueryWizard.java4
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewTaskPage.java4
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewTaskWizard.java2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/SelectRepositoryPage.java6
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/AbstractDuplicateDetector.java6
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/AbstractRepositoryConnectorUi.java21
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/AbstractTaskDecorator.java29
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/AbstractTaskRepositoryLinkProvider.java14
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/DatePicker.java1
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskHyperlink.java4
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java5
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiPlugin.java11
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiUtil.java2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskHyperlinkDetector.java2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/AbstractRepositoryQueryPage.java2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractEditQueryWizard.java2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java6
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/NewTaskWizard.java6
-rw-r--r--org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracRepositoryConnector.java4
-rw-r--r--org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositorySettingsPageTest.java6
-rw-r--r--org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTaskDataHandlerTest.java14
-rw-r--r--org.eclipse.mylyn.trac.ui/plugin.xml2
-rw-r--r--org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracConnectorUi.java (renamed from org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracRepositoryUi.java)9
-rw-r--r--org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracTaskListFactory.java6
-rw-r--r--org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorFactory.java2
-rw-r--r--org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/NewTracQueryWizard.java2
-rw-r--r--org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/NewTracTaskPage.java2
100 files changed, 292 insertions, 327 deletions
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TasksMessages.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaMessages.java
index 7a1bf7727..e229e6690 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TasksMessages.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaMessages.java
@@ -9,42 +9,41 @@
* University Of British Columbia - initial API and implementation
*******************************************************************************/
-package org.eclipse.mylyn.tasks.core;
+package org.eclipse.mylyn.internal.bugzilla.core;
import org.eclipse.osgi.util.NLS;
/**
* @author Rob Elves
*/
-public class TasksMessages extends NLS {
+public final class BugzillaMessages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.mylyn.tasks.core.MylarMessages";//$NON-NLS-1$
+ private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.bugzilla.core.BugzillaMessages";//$NON-NLS-1$
static {
- NLS.initializeMessages(BUNDLE_NAME, TasksMessages.class);
+ NLS.initializeMessages(BUNDLE_NAME, BugzillaMessages.class);
}
- private TasksMessages() {
+ private BugzillaMessages() {
// Do not instantiate
}
- public static String repository_login_failure;
+ public static String repositoryLoginFailure;
- public static String repository_not_found;
+ public static String repositoryNotFound;
- public static String repository_comment_reqd;
+ public static String repositoryCommentReqd;
- public static String repository_collision;
+ public static String repositoryCollision;
- public static String operation_cancelled;
+ public static String operationCancelled;
- public static String network_error;
+ public static String errorNetwork;
- public static String io_error;
+ public static String errorIo;
- public static String internal_error;
+ public static String errorInternal;
-
- public static String repository_error;
+ public static String errorRepository;
}
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaMessages.properties b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaMessages.properties
new file mode 100644
index 000000000..27a0dcf88
--- /dev/null
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaMessages.properties
@@ -0,0 +1,14 @@
+### repository
+### {0} generally is the repository url
+errorRepository = Repository error from {0}:\n\n{1}
+repositoryLoginFailure = Unable to login to {0}.\n\n{1}\n\nPlease validate credentials via Task Repositories view.
+repositoryNotFound = Repository {0} could not be found.
+repositoryCommentRequired = You have to specify a new comment when making this change. Please comment on the reason for this change.
+repositoryCollision = Mid-air collision occurred while submitting to {0}.\n\nSynchronize task and re-submit changes.
+### repositoryUrl, class.simpleName, class.getMessage
+errorIo = I/O Error occurred while communicating with {0}.\n\n{1}: {2}
+errorNetwork = A network error occurred connecting to {0}.\n\n{1}
+errorInternal = An internal error has occurred: {0}
+operationCancelled = {0} was canceled by the user.
+
+
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 02e822ba0..69bb9f152 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
@@ -42,7 +42,6 @@ import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
import org.eclipse.mylyn.tasks.core.TaskComment;
import org.eclipse.mylyn.tasks.core.TaskList;
import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.core.UnrecognizedReponseException;
import org.eclipse.mylyn.tasks.core.AbstractTask.PriorityLevel;
/**
@@ -253,14 +252,14 @@ public class BugzillaRepositoryConnector extends AbstractRepositoryConnector {
try {
monitor.beginTask("Checking for changed tasks", IProgressMonitor.UNKNOWN);
- if (repository.getSyncTimeStamp() == null) {
+ if (repository.getSynchronizationTimeStamp() == null) {
for (AbstractTask task : tasks) {
task.setStale(true);
}
return true;
}
- String dateString = repository.getSyncTimeStamp();
+ String dateString = repository.getSynchronizationTimeStamp();
if (dateString == null) {
dateString = "";
}
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaStatus.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaStatus.java
index b81571dda..0b850f182 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaStatus.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaStatus.java
@@ -13,7 +13,6 @@ package org.eclipse.mylyn.internal.bugzilla.core;
import org.eclipse.core.runtime.Status;
import org.eclipse.mylyn.tasks.core.RepositoryStatus;
-import org.eclipse.mylyn.tasks.core.TasksMessages;
/**
* @author Rob Elves
@@ -59,12 +58,12 @@ public class BugzillaStatus extends Status {
switch (getCode()) {
case RepositoryStatus.ERROR_REPOSITORY_LOGIN:
- return TasksMessages
- .bind(TasksMessages.repository_login_failure, this.getRepositoryUrl(), this.errorMessage);
+ return BugzillaMessages
+ .bind(BugzillaMessages.repositoryLoginFailure, this.getRepositoryUrl(), this.errorMessage);
case RepositoryStatus.ERROR_REPOSITORY_NOT_FOUND:
- return TasksMessages.bind(TasksMessages.repository_not_found, this.errorMessage);
+ return BugzillaMessages.bind(BugzillaMessages.repositoryNotFound, this.errorMessage);
case RepositoryStatus.ERROR_REPOSITORY:
- return TasksMessages.bind(TasksMessages.repository_error, this.getRepositoryUrl(), this.errorMessage);
+ return BugzillaMessages.bind(BugzillaMessages.errorRepository, this.getRepositoryUrl(), this.errorMessage);
case RepositoryStatus.ERROR_IO:
String string1 = "Unknown IO error occurred";
String string2 = "No message provided";
@@ -73,16 +72,16 @@ public class BugzillaStatus extends Status {
string2 = getException().getMessage();
}
Object[] strings = { getRepositoryUrl(), string1, string2 };
- return TasksMessages.bind(TasksMessages.io_error, strings);
+ return BugzillaMessages.bind(BugzillaMessages.errorIo, strings);
case RepositoryStatus.ERROR_INTERNAL:
- return TasksMessages.bind(TasksMessages.internal_error, this.errorMessage);
+ return BugzillaMessages.bind(BugzillaMessages.errorInternal, this.errorMessage);
case RepositoryStatus.OPERATION_CANCELLED:
- return TasksMessages.bind(TasksMessages.operation_cancelled, this.errorMessage);
+ return BugzillaMessages.bind(BugzillaMessages.operationCancelled, this.errorMessage);
case RepositoryStatus.REPOSITORY_COLLISION:
- return TasksMessages.bind(TasksMessages.repository_collision, this.errorMessage);
+ return BugzillaMessages.bind(BugzillaMessages.repositoryCollision, this.errorMessage);
case RepositoryStatus.REPOSITORY_COMMENT_REQUIRED:
if (errorMessage == null) {
- return TasksMessages.repository_comment_reqd;
+ return BugzillaMessages.repositoryCommentReqd;
} else {
return errorMessage;
}
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/UnrecognizedReponseException.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/UnrecognizedReponseException.java
index 723bc8a8f..e23408ee7 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/UnrecognizedReponseException.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/UnrecognizedReponseException.java
@@ -9,7 +9,7 @@
* University Of British Columbia - initial API and implementation
*******************************************************************************/
-package org.eclipse.mylyn.tasks.core;
+package org.eclipse.mylyn.internal.bugzilla.core;
import java.io.IOException;
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 46512db21..7dd4e3b2c 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
@@ -377,7 +377,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest {
// AFTER
// task4's
- TasksUiPlugin.getRepositoryManager().setSyncTime(repository, task5.getLastReadTimeStamp(),
+ TasksUiPlugin.getRepositoryManager().setSynchronizationTime(repository, task5.getLastReadTimeStamp(),
TasksUiPlugin.getDefault().getRepositoriesFilePath());
boolean changed = connector.markStaleTasks(repository, tasks, new NullProgressMonitor());
@@ -440,7 +440,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest {
Set<AbstractTask> tasks = new HashSet<AbstractTask>();
tasks.add(task7);
- TasksUiPlugin.getRepositoryManager().setSyncTime(repository, task7.getLastReadTimeStamp(),
+ TasksUiPlugin.getRepositoryManager().setSynchronizationTime(repository, task7.getLastReadTimeStamp(),
TasksUiPlugin.getDefault().getRepositoriesFilePath());
assertNotNull(TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(IBugzillaConstants.TEST_BUGZILLA_222_URL, "7"));
@@ -508,7 +508,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest {
// synchAndAssertState(tasks, RepositoryTaskSyncState.SYNCHRONIZED);
- TasksUiPlugin.getRepositoryManager().setSyncTime(repository, bugtask.getLastReadTimeStamp(),
+ TasksUiPlugin.getRepositoryManager().setSynchronizationTime(repository, bugtask.getLastReadTimeStamp(),
TasksUiPlugin.getDefault().getRepositoriesFilePath());
// connector.synchronizeChanged(repository);
diff --git a/org.eclipse.mylyn.bugzilla.ui/plugin.xml b/org.eclipse.mylyn.bugzilla.ui/plugin.xml
index 2c2c0d19c..b7fe62a0d 100644
--- a/org.eclipse.mylyn.bugzilla.ui/plugin.xml
+++ b/org.eclipse.mylyn.bugzilla.ui/plugin.xml
@@ -15,7 +15,7 @@
<connectorUi
brandingIcon="icons/eview16/bugzilla-logo.gif"
- class="org.eclipse.mylyn.internal.bugzilla.ui.tasklist.BugzillaRepositoryUi"
+ class="org.eclipse.mylyn.internal.bugzilla.ui.tasklist.BugzillaConnectorUi"
name="Bugzilla Repository Ui"
overlayIcon="icons/eview16/overlay-bugzilla.gif"/>
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 c1d495718..b4ca1bf4a 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
@@ -1186,7 +1186,7 @@ public class BugzillaSearchPage extends AbstractRepositoryQueryPage implements L
if (connect) {
final AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector(
- repository.getKind());
+ repository.getConnectorKind());
IRunnableWithProgress updateRunnable = new IRunnableWithProgress() {
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositoryUi.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaConnectorUi.java
index 0e8ea608c..fa125ac7b 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositoryUi.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaConnectorUi.java
@@ -45,7 +45,7 @@ import org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage;
* @author Mik Kersten
* @author Eugene Kuleshov
*/
-public class BugzillaRepositoryUi extends AbstractRepositoryConnectorUi {
+public class BugzillaConnectorUi extends AbstractRepositoryConnectorUi {
@Override
public String getAccountCreationUrl(TaskRepository taskRepository) {
@@ -196,18 +196,13 @@ public class BugzillaRepositoryUi extends AbstractRepositoryConnectorUi {
}
@Override
- public boolean hasRichEditor() {
- return true;
- }
-
- @Override
- public String getRepositoryType() {
+ public String getConnectorKind() {
return BugzillaCorePlugin.REPOSITORY_KIND;
}
@SuppressWarnings("restriction")
@Override
- public boolean handlesDueDates(AbstractTask task) {
+ public boolean supportsDueDates(AbstractTask task) {
if(task instanceof BugzillaTask){
// XXX This is only used in the planning editor, and if its input was set correctly as a RepositoryTaskEditorInput
// we wouldn't have to get the task data this way from here
@@ -215,7 +210,7 @@ public class BugzillaRepositoryUi extends AbstractRepositoryConnectorUi {
if(taskData != null && taskData.getAttribute(BugzillaReportElement.ESTIMATED_TIME.getKeyString()) != null)
return true;
}
- return super.handlesDueDates(task);
+ return super.supportsDueDates(task);
}
}
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskEditorFactory.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskEditorFactory.java
index 236db05d3..555ba7da5 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskEditorFactory.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskEditorFactory.java
@@ -75,7 +75,7 @@ public class BugzillaTaskEditorFactory extends AbstractTaskEditorFactory {
public boolean canCreateEditorFor(IEditorInput input) {
if (input instanceof RepositoryTaskEditorInput) {
return BugzillaCorePlugin.REPOSITORY_KIND.equals(((RepositoryTaskEditorInput) input).getRepository()
- .getKind());
+ .getConnectorKind());
}
return false;
}
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskListFactory.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskListFactory.java
index fe2a76e87..a79b5fafd 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskListFactory.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskListFactory.java
@@ -16,10 +16,10 @@ import java.util.Set;
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaRepositoryQuery;
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaTask;
+import org.eclipse.mylyn.internal.tasks.core.TaskExternalizationException;
import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
import org.eclipse.mylyn.tasks.core.AbstractTask;
import org.eclipse.mylyn.tasks.core.AbstractTaskListFactory;
-import org.eclipse.mylyn.tasks.core.TaskExternalizationException;
import org.w3c.dom.Element;
/**
@@ -75,7 +75,7 @@ public class BugzillaTaskListFactory extends AbstractTaskListFactory {
}
@Override
- public AbstractRepositoryQuery createQuery(String repositoryUrl, String queryString, String label, Element element) throws TaskExternalizationException {
+ public AbstractRepositoryQuery createQuery(String repositoryUrl, String queryString, String label, Element element) {
BugzillaRepositoryQuery query = new BugzillaRepositoryQuery(repositoryUrl, queryString, label);
if (element.getNodeName().equals(TAG_BUGZILLA_CUSTOM_QUERY)) {
query.setCustomQuery(true);
@@ -90,7 +90,7 @@ public class BugzillaTaskListFactory extends AbstractTaskListFactory {
}
@Override
- public AbstractTask createTask(String repositoryUrl, String taskId, String summary, Element element) throws TaskExternalizationException {
+ public AbstractTask createTask(String repositoryUrl, String taskId, String summary, Element element) {
BugzillaTask task = new BugzillaTask(repositoryUrl, taskId, summary);
if (element.hasAttribute(KEY_SEVERITY)) {
task.setSeverity(element.getAttribute(KEY_SEVERITY));
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/BugzillaProductPage.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/BugzillaProductPage.java
index 51ee8309d..30cf4e458 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/BugzillaProductPage.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/BugzillaProductPage.java
@@ -212,7 +212,7 @@ public class BugzillaProductPage extends WizardPage {
public void widgetSelected(SelectionEvent e) {
try {
final AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager()
- .getRepositoryConnector(repository.getKind());
+ .getRepositoryConnector(repository.getConnectorKind());
getContainer().run(true, false, new IRunnableWithProgress() {
public void run(IProgressMonitor monitor) throws InvocationTargetException,
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/internal/tasks/core/IRepositoryConstants.java
index abfa9d132..b502b36e9 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/internal/tasks/core/IRepositoryConstants.java
@@ -6,7 +6,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
-package org.eclipse.mylyn.tasks.core;
+package org.eclipse.mylyn.internal.tasks.core;
/**
* @author Mik Kersten
@@ -24,7 +24,7 @@ public interface IRepositoryConstants {
public static final String PROPERTY_VERSION = "version";
- public static final String PROPERTY_KIND = "kind";
+ public static final String PROPERTY_CONNECTOR_KIND = "kind";
public static final String PROPERTY_URL = "url";
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/LocalTaskListFactory.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/LocalTaskListFactory.java
index d1080b93b..da12f1c63 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/LocalTaskListFactory.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/LocalTaskListFactory.java
@@ -13,7 +13,6 @@ package org.eclipse.mylyn.internal.tasks.core;
import org.eclipse.mylyn.tasks.core.AbstractTask;
import org.eclipse.mylyn.tasks.core.AbstractTaskListFactory;
-import org.eclipse.mylyn.tasks.core.TaskExternalizationException;
import org.w3c.dom.Element;
/**
@@ -27,7 +26,7 @@ public class LocalTaskListFactory extends AbstractTaskListFactory {
}
@Override
- public AbstractTask createTask(String repositoryUrl, String taskId, String summary, Element element) throws TaskExternalizationException {
+ public AbstractTask createTask(String repositoryUrl, String taskId, String summary, Element element) {
LocalTask task = new LocalTask(taskId, summary);
return task;
}
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/SaxRepositoriesContentHandler.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/SaxRepositoriesContentHandler.java
index c1f931848..7b7394e7c 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/SaxRepositoriesContentHandler.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/SaxRepositoriesContentHandler.java
@@ -14,7 +14,6 @@ import java.util.HashSet;
import java.util.Set;
import org.eclipse.mylyn.internal.monitor.core.util.XmlStringConverter;
-import org.eclipse.mylyn.tasks.core.IRepositoryConstants;
import org.eclipse.mylyn.tasks.core.TaskRepository;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
@@ -36,7 +35,7 @@ public class SaxRepositoriesContentHandler extends DefaultHandler {
try {
if (localName.equals(TaskRepositoriesExternalizer.ELEMENT_TASK_REPOSITORY) && attributes != null) {
String kind = XmlStringConverter.convertXmlToString(attributes
- .getValue(IRepositoryConstants.PROPERTY_KIND));
+ .getValue(IRepositoryConstants.PROPERTY_CONNECTOR_KIND));
String url = XmlStringConverter.convertXmlToString(attributes
.getValue(IRepositoryConstants.PROPERTY_URL));
if (kind != null && kind.length() > 0 && url != null && url.length() > 0) {
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskExternalizationException.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskExternalizationException.java
index 63b2eaaf1..9507b95e8 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskExternalizationException.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskExternalizationException.java
@@ -8,10 +8,11 @@
* Contributors:
* University Of British Columbia - initial API and implementation
*******************************************************************************/
-package org.eclipse.mylyn.tasks.core;
+package org.eclipse.mylyn.internal.tasks.core;
/**
- * @author Mik Kersten and Ken Sueda
+ * @author Mik Kersten
+ * @author Ken Sueda
*/
public class TaskExternalizationException extends Exception {
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepositoryFilter.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskRepositoryFilter.java
index 214fb2cba..edeeb18ef 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepositoryFilter.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskRepositoryFilter.java
@@ -9,14 +9,16 @@
* University Of British Columbia - initial API and implementation
*******************************************************************************/
-package org.eclipse.mylyn.tasks.core;
+package org.eclipse.mylyn.internal.tasks.core;
-import org.eclipse.mylyn.internal.tasks.core.LocalRepositoryConnector;
+import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
+import org.eclipse.mylyn.tasks.core.TaskRepository;
/**
* Task repository filter to build list of repositories with required capabilities.
*
* @author Eugene Kleshov
+ * @since 2.0
*/
public interface TaskRepositoryFilter {
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 5931a3e15..3f068326f 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
@@ -28,6 +28,7 @@ import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.mylyn.context.core.ContextCorePlugin;
import org.eclipse.mylyn.internal.monitor.core.util.StatusManager;
+import org.eclipse.mylyn.internal.tasks.core.IRepositoryConstants;
import org.eclipse.mylyn.internal.tasks.core.TaskDataManager;
import org.eclipse.mylyn.tasks.core.AbstractTask.RepositoryTaskSyncState;
@@ -338,7 +339,7 @@ public abstract class AbstractRepositoryConnector {
*/
public String getSynchronizationTimestamp(TaskRepository repository, Set<AbstractTask> changedTasks) {
Date mostRecent = new Date(0);
- String mostRecentTimeStamp = repository.getSyncTimeStamp();
+ String mostRecentTimeStamp = repository.getSynchronizationTimeStamp();
for (AbstractTask task : changedTasks) {
Date taskModifiedDate;
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 ac0957ba8..e4df21618 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
@@ -40,11 +40,11 @@ public abstract class AbstractTaskListFactory {
return false;
}
- public AbstractRepositoryQuery createQuery(String repositoryUrl, String queryString, String label, Element element) throws TaskExternalizationException {
+ public AbstractRepositoryQuery createQuery(String repositoryUrl, String queryString, String label, Element element){
return null;
}
- public abstract AbstractTask createTask(String repositoryUrl, String taskId, String label, Element element) throws TaskExternalizationException;
+ public abstract AbstractTask createTask(String repositoryUrl, String taskId, String label, Element element);
public String getQueryElementName(AbstractRepositoryQuery query) {
return "";
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/MylarMessages.properties b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/MylarMessages.properties
deleted file mode 100644
index 7733bc894..000000000
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/MylarMessages.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-### Mylar messages.
-
-### repository
-### {0} generally is the repository url
-repository_error = Repository error from {0}:\n\n{1}
-repository_login_failure = Unable to login to {0}.\n\n{1}\n\nPlease validate credentials via Task Repositories view.
-repository_not_found = Repository {0} could not be found.
-repository_comment_reqd = You have to specify a new comment when making this change. Please comment on the reason for this change.
-repository_collision = Mid-air collision occurred while submitting to {0}.\n\nSynchronize task and re-submit changes.
-### repositoryUrl, class.simpleName, class.getMessage
-io_error = I/O Error occurred while communicating with {0}.\n\n{1}: {2}
-network_error = A network error occurred connecting to {0}.\n\n{1}
-internal_error = An internal error has occurred: {0}
-operation_cancelled = {0} was canceled by the user.
-
-
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 2e0c64560..4b618d4e8 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
@@ -21,7 +21,7 @@ import java.util.Map;
* @author Steffen Pingel
* @since 2.0
*/
-public class RepositoryTemplate {
+public final class RepositoryTemplate {
public final Map<String, String> genericAttributes = new LinkedHashMap<String, String>();
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskComment.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskComment.java
index a0334205a..61678ef47 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskComment.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskComment.java
@@ -14,9 +14,10 @@ package org.eclipse.mylyn.tasks.core;
import java.io.Serializable;
/**
- * A comment posted on a bug.
+ * A comment posted by a user on a task.
*
- * @author Rob Elves (revisions for bug 136219)
+ * @author Rob Elves
+ * @since 2.0
*/
public class TaskComment extends AttributeContainer implements Serializable {
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskContainerDelta.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskContainerDelta.java
index 5c055d9ce..20c3ae45b 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskContainerDelta.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskContainerDelta.java
@@ -13,9 +13,10 @@ package org.eclipse.mylyn.tasks.core;
/**
- * Immutable.
+ * Immutable. Defines changes to Task List elements.
*
* @author Mik Kersten
+ * @since 2.0
*/
public final class TaskContainerDelta {
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 686ff3e62..8ec3caed9 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
@@ -30,13 +30,14 @@ import org.eclipse.mylyn.internal.tasks.core.TaskCategory;
import org.eclipse.mylyn.internal.tasks.core.UnfiledCategory;
/**
- * TODO: some asymetry left between query containers and other task containers
+ * Stores and manages task list elements and their containment hierarchy.
*
* @author Mik Kersten
+ * @since 2.0
*/
public class TaskList {
- private int lastTaskNum = 0;
+ private int lastLocalTaskId = 0;
private Set<ITaskListChangeListener> changeListeners = new CopyOnWriteArraySet<ITaskListChangeListener>();
@@ -69,7 +70,7 @@ public class TaskList {
defaultCategory = new UnfiledCategory();
activeTasks = new CopyOnWriteArrayList<AbstractTask>();
- lastTaskNum = 0;
+ lastLocalTaskId = 0;
categories.put(defaultCategory.getHandleIdentifier(), defaultCategory);
categories.put(archiveContainer.getHandleIdentifier(), archiveContainer);
}
@@ -656,30 +657,30 @@ public class TaskList {
}
}
- public int getNextTaskNum() {
- return ++lastTaskNum;
+ public int getNextLocalTaskId() {
+ return ++lastLocalTaskId;
}
- public void setLastTaskNum(int lastTaskNum) {
- this.lastTaskNum = lastTaskNum;
+ public void setLastLocalTaskId(int lastTaskNum) {
+ this.lastLocalTaskId = lastTaskNum;
}
/** For tasklist persistence. Use getNextTaskNum for task construction */
- public int getLastTaskNum() {
- return lastTaskNum;
+ public int getLastLocalTaskId() {
+ return lastLocalTaskId;
}
/** Note: use getNextTaskNum for new task construction */
- public int findLargestTaskHandle() {
+ public int findLargestTaskId() {
int max = 0;
- max = Math.max(largestTaskHandleHelper(tasks.values()), max);
+ max = Math.max(largestTaskIdHelper(tasks.values()), max);
for (AbstractTaskCategory cat : getTaskContainers()) {
- max = Math.max(largestTaskHandleHelper(cat.getChildren()), max);
+ max = Math.max(largestTaskIdHelper(cat.getChildren()), max);
}
return max;
}
- private int largestTaskHandleHelper(Collection<AbstractTask> tasks) {
+ private int largestTaskIdHelper(Collection<AbstractTask> tasks) {
int ihandle = 0;
int max = 0;
for (AbstractTask task : tasks) {
@@ -692,7 +693,7 @@ public class TaskList {
}
}
max = Math.max(ihandle, max);
- ihandle = largestTaskHandleHelper(task.getChildren());
+ ihandle = largestTaskIdHelper(task.getChildren());
max = Math.max(ihandle, max);
}
return max;
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepository.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepository.java
index 2e9d914e0..362eb04be 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepository.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepository.java
@@ -23,6 +23,7 @@ import java.util.TimeZone;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.Platform;
import org.eclipse.mylyn.internal.monitor.core.util.StatusManager;
+import org.eclipse.mylyn.internal.tasks.core.IRepositoryConstants;
import org.eclipse.mylyn.web.core.WebClientUtil;
/**
@@ -42,6 +43,7 @@ import org.eclipse.mylyn.web.core.WebClientUtil;
* @author Mik Kersten
* @author Rob Elves
* @author Eugene Kuleshov
+ * @since 2.0
*/
public class TaskRepository {
@@ -121,7 +123,7 @@ public class TaskRepository {
}
public TaskRepository(String kind, String serverUrl, String version, String encoding, String timeZoneId) {
- this.properties.put(IRepositoryConstants.PROPERTY_KIND, kind);
+ this.properties.put(IRepositoryConstants.PROPERTY_CONNECTOR_KIND, kind);
this.properties.put(IRepositoryConstants.PROPERTY_URL, serverUrl);
this.properties.put(IRepositoryConstants.PROPERTY_VERSION, version);
this.properties.put(IRepositoryConstants.PROPERTY_ENCODING, encoding);
@@ -131,7 +133,7 @@ public class TaskRepository {
}
public TaskRepository(String kind, String serverUrl, Map<String, String> properties) {
- this.properties.put(IRepositoryConstants.PROPERTY_KIND, kind);
+ this.properties.put(IRepositoryConstants.PROPERTY_CONNECTOR_KIND, kind);
this.properties.put(IRepositoryConstants.PROPERTY_URL, serverUrl);
this.properties.putAll(properties);
// use platform proxy by default (headless will need to set this to false)
@@ -307,10 +309,10 @@ public class TaskRepository {
return false;
}
}
- if (getKind() == null) {
- return repository.getKind() == null;
+ if (getConnectorKind() == null) {
+ return repository.getConnectorKind() == null;
} else {
- return getKind().equals(repository.getKind());
+ return getConnectorKind().equals(repository.getConnectorKind());
}
} else {
@@ -321,7 +323,7 @@ public class TaskRepository {
@Override
public int hashCode() {
int res = getUrl()==null ? 1 : getUrl().hashCode();
- return res * 31 + (getKind()==null ? 1 : getKind().hashCode());
+ return res * 31 + (getConnectorKind()==null ? 1 : getConnectorKind().hashCode());
}
@Override
@@ -332,8 +334,8 @@ public class TaskRepository {
/**
* @return "<unknown>" if kind is unknown
*/
- public String getKind() {
- String kind = properties.get(IRepositoryConstants.PROPERTY_KIND);
+ public String getConnectorKind() {
+ String kind = properties.get(IRepositoryConstants.PROPERTY_CONNECTOR_KIND);
if (kind != null) {
return kind;
} else {
@@ -373,7 +375,7 @@ public class TaskRepository {
: timeZoneId);
}
- public String getSyncTimeStamp() {
+ public String getSynchronizationTimeStamp() {
return this.properties.get(IRepositoryConstants.PROPERTY_SYNCTIMESTAMP);
}
@@ -381,7 +383,7 @@ public class TaskRepository {
* ONLY for use by IRepositoryConstants. To set the sync time call
* IRepositoryConstants.setSyncTime(repository, date);
*/
- public void setSyncTimeStamp(String syncTime) {
+ public void setSynchronizationTimeStamp(String syncTime) {
this.properties.put(IRepositoryConstants.PROPERTY_SYNCTIMESTAMP, syncTime);
}
@@ -424,7 +426,7 @@ public class TaskRepository {
public Proxy getProxy() {
Proxy proxy = Proxy.NO_PROXY;
- if (useDefaultProxy()) {
+ if (isDefaultProxyEnabled()) {
proxy = WebClientUtil.getPlatformProxy();
} else {
@@ -444,7 +446,7 @@ public class TaskRepository {
/**
* Use platform proxy settings
*/
- public boolean useDefaultProxy() {
+ public boolean isDefaultProxyEnabled() {
return "true".equals(getProperty(PROXY_USEDEFAULT));
}
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepositoryManager.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepositoryManager.java
index 5ec533438..e5606cc65 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepositoryManager.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepositoryManager.java
@@ -26,8 +26,11 @@ import org.eclipse.mylyn.internal.monitor.core.util.StatusManager;
import org.eclipse.mylyn.internal.tasks.core.TaskRepositoriesExternalizer;
/**
+ * Provides facilities for managing the lifecycle of and access to task repositories.
+ *
* @author Mik Kersten
* @author Rob Elves
+ * @since 2.0
*/
public class TaskRepositoryManager {
@@ -87,11 +90,11 @@ public class TaskRepositoryManager {
public void addRepository(TaskRepository repository, String repositoryFilePath) {
Set<TaskRepository> repositories;
- if (!repositoryMap.containsKey(repository.getKind())) {
+ if (!repositoryMap.containsKey(repository.getConnectorKind())) {
repositories = new HashSet<TaskRepository>();
- repositoryMap.put(repository.getKind(), repositories);
+ repositoryMap.put(repository.getConnectorKind(), repositories);
} else {
- repositories = repositoryMap.get(repository.getKind());
+ repositories = repositoryMap.get(repository.getConnectorKind());
}
repositories.add(repository);
saveRepositories(repositoryFilePath);
@@ -101,7 +104,7 @@ public class TaskRepositoryManager {
}
public void removeRepository(TaskRepository repository, String repositoryFilePath) {
- Set<TaskRepository> repositories = repositoryMap.get(repository.getKind());
+ Set<TaskRepository> repositories = repositoryMap.get(repository.getConnectorKind());
if (repositories != null) {
repository.flushAuthenticationCredentials();
repositories.remove(repository);
@@ -266,8 +269,8 @@ public class TaskRepositoryManager {
migration = true;
}
- if (repositoryMap.containsKey(repository.getKind())) {
- repositoryMap.get(repository.getKind()).add(repository);
+ if (repositoryMap.containsKey(repository.getConnectorKind())) {
+ repositoryMap.get(repository.getConnectorKind()).add(repository);
} else {
orphanedRepositories.add(repository);
}
@@ -334,16 +337,9 @@ public class TaskRepositoryManager {
saveRepositories(repositoriesFilePath);
}
- public void setSyncTime(TaskRepository repository, String syncTime, String repositoriesFilePath) {
- repository.setSyncTimeStamp(syncTime);
+ public void setSynchronizationTime(TaskRepository repository, String syncTime, String repositoriesFilePath) {
+ repository.setSynchronizationTimeStamp(syncTime);
saveRepositories(repositoriesFilePath);
-
- // String prefIdSyncTime = repository.getUrl() + PROPERTY_DELIM +
- // PROPERTY_SYNCTIMESTAMP;
- // if (repository.getSyncTimeStamp() != null) {
- // MylarTaskListPlugin.getMylarCorePrefs().setValue(prefIdSyncTime,
- // repository.getSyncTimeStamp());
- // }
}
public synchronized boolean saveRepositories(String destinationPath) {
@@ -360,10 +356,6 @@ public class TaskRepositoryManager {
}
try {
- // String dataDirectory =
- // TasksUiPlugin.getDefault().getDataDirectory();
- // File repositoriesFile = new File(dataDirectory + File.separator +
- // TasksUiPlugin.DEFAULT_REPOSITORIES_FILE);
File repositoriesFile = new File(destinationPath);
externalizer.writeRepositoriesToXML(repositoriesToWrite, repositoriesFile);
} catch (Throwable t) {
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/AttachmentJobTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/AttachmentJobTest.java
index 51b52c0a2..deeedb4fc 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/AttachmentJobTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/AttachmentJobTest.java
@@ -67,7 +67,7 @@ public class AttachmentJobTest extends TestCase {
StatusManager.addStatusHandler(statusHandler);
attachment = new RepositoryAttachment(null);
- attachment.setRepositoryKind(repository.getKind());
+ attachment.setRepositoryKind(repository.getConnectorKind());
attachment.setRepositoryUrl(repository.getUrl());
}
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/ProjectRepositoryAssociationTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/ProjectRepositoryAssociationTest.java
index e68e5a438..f05e89fab 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/ProjectRepositoryAssociationTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/ProjectRepositoryAssociationTest.java
@@ -50,7 +50,7 @@ public class ProjectRepositoryAssociationTest extends TestCase {
TaskRepository returnedRepository = TasksUiPlugin.getDefault().getRepositoryForResource(
projectWrapper.getProject(), true);
assertNotNull(returnedRepository);
- assertEquals(REPOSITORY_KIND, returnedRepository.getKind());
+ assertEquals(REPOSITORY_KIND, returnedRepository.getConnectorKind());
assertEquals(REPOSITORY_URL, returnedRepository.getUrl());
}
@@ -65,7 +65,7 @@ public class ProjectRepositoryAssociationTest extends TestCase {
TaskRepository returnedRepository = TasksUiPlugin.getDefault().getRepositoryForResource(
folder, true);
assertNotNull(returnedRepository);
- assertEquals(REPOSITORY_KIND, returnedRepository.getKind());
+ assertEquals(REPOSITORY_KIND, returnedRepository.getConnectorKind());
assertEquals(REPOSITORY_URL, returnedRepository.getUrl());
}
}
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositorySettingsPageTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositorySettingsPageTest.java
index 0cbca2e47..6b10ce992 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositorySettingsPageTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositorySettingsPageTest.java
@@ -12,7 +12,7 @@ import junit.framework.TestCase;
import org.eclipse.jface.preference.StringFieldEditor;
import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.tests.connector.MockRepositoryUi;
+import org.eclipse.mylyn.tasks.tests.connector.MockTaskConnectorUi;
import org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi;
import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
import org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage;
@@ -32,7 +32,7 @@ public class RepositorySettingsPageTest extends TestCase {
TaskRepository repository = new TaskRepository("kind", "http://localhost/");
repository.setCharacterEncoding("UTF-8");
- MockRepositorySettingsPage page = new MockRepositorySettingsPage(new MockRepositoryUi());
+ MockRepositorySettingsPage page = new MockRepositorySettingsPage(new MockTaskConnectorUi());
page.setNeedsEncoding(true);
Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
@@ -44,7 +44,7 @@ public class RepositorySettingsPageTest extends TestCase {
}
public void testNeedsEncodingFalse() {
- MockRepositorySettingsPage page = new MockRepositorySettingsPage(new MockRepositoryUi());
+ MockRepositorySettingsPage page = new MockRepositorySettingsPage(new MockTaskConnectorUi());
page.setNeedsEncoding(false);
Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
@@ -55,7 +55,7 @@ public class RepositorySettingsPageTest extends TestCase {
}
public void testNeedsAnonyoumousLoginFalse() {
- MockRepositorySettingsPage page = new MockRepositorySettingsPage(new MockRepositoryUi());
+ MockRepositorySettingsPage page = new MockRepositorySettingsPage(new MockTaskConnectorUi());
page.setNeedsAnonymousLogin(false);
Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
@@ -66,7 +66,7 @@ public class RepositorySettingsPageTest extends TestCase {
}
public void testNeedsAnonyoumousLoginNoRepository() {
- MockRepositorySettingsPage page = new MockRepositorySettingsPage(new MockRepositoryUi());
+ MockRepositorySettingsPage page = new MockRepositorySettingsPage(new MockTaskConnectorUi());
page.setNeedsAnonymousLogin(true);
Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
@@ -85,9 +85,9 @@ public class RepositorySettingsPageTest extends TestCase {
public void testNeedsAnonyoumousLogin() {
TaskRepository repository = new TaskRepository("kind", "http://localhost/");
- TasksUiPlugin.addRepositoryConnectorUi(new MockRepositoryUi());
+ TasksUiPlugin.addRepositoryConnectorUi(new MockTaskConnectorUi());
- MockRepositorySettingsPage page = new MockRepositorySettingsPage(new MockRepositoryUi());
+ MockRepositorySettingsPage page = new MockRepositorySettingsPage(new MockTaskConnectorUi());
page.setNeedsAnonymousLogin(true);
page.setRepository(repository);
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 183550b3f..3d3417666 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
@@ -88,21 +88,21 @@ public class TaskListManagerTest extends TestCase {
manager.getTaskList().addTask(task1);
LocalTask task2 = manager.createNewLocalTask("label");
manager.getTaskList().addTask(task2);
- assertEquals(2, manager.getTaskList().getLastTaskNum());
+ assertEquals(2, manager.getTaskList().getLastLocalTaskId());
manager.getTaskList().deleteTask(task2);
LocalTask task3 = manager.createNewLocalTask("label");
manager.getTaskList().addTask(task3);
assertTrue(task3.getHandleIdentifier() + " should end with 3", task3.getHandleIdentifier().endsWith("3"));
- assertEquals(3, manager.getTaskList().getLastTaskNum());
+ assertEquals(3, manager.getTaskList().getLastLocalTaskId());
assertEquals(2, manager.getTaskList().getAllTasks().size());
manager.saveTaskList();
manager.resetTaskList();
assertEquals(0, manager.getTaskList().getAllTasks().size());
- assertEquals(0, manager.getTaskList().getLastTaskNum());
+ assertEquals(0, manager.getTaskList().getLastLocalTaskId());
manager.readExistingOrCreateNewList();
assertEquals(2, manager.getTaskList().getAllTasks().size());
- assertEquals(3, manager.getTaskList().getLastTaskNum());
+ assertEquals(3, manager.getTaskList().getLastLocalTaskId());
AbstractTask task4 = manager.createNewLocalTask("label");
assertTrue(task4.getHandleIdentifier() + " should end with 4", task4.getHandleIdentifier().endsWith("4"));
}
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoriesExternalizerTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoriesExternalizerTest.java
index 16ee0df71..d7acb24d6 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoriesExternalizerTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoriesExternalizerTest.java
@@ -51,13 +51,13 @@ public class TaskRepositoriesExternalizerTest extends TestCase {
repository1.setTimeZoneId(TIMEZONE);
repository1.setVersion(VERSION);
repository1.setCharacterEncoding(ENCODING);
- repository1.setSyncTimeStamp(TIMESTAMP);
+ repository1.setSynchronizationTimeStamp(TIMESTAMP);
taskRepositories.add(repository1);
repository2.setTimeZoneId(TIMEZONE + SUFFIX);
repository2.setVersion(VERSION+ SUFFIX);
repository2.setCharacterEncoding(ENCODING+ SUFFIX);
- repository2.setSyncTimeStamp(TIMESTAMP+ SUFFIX);
+ repository2.setSynchronizationTimeStamp(TIMESTAMP+ SUFFIX);
taskRepositories.add(repository2);
}
@@ -78,12 +78,12 @@ public class TaskRepositoriesExternalizerTest extends TestCase {
assertEquals(TIMEZONE, repository.getTimeZoneId());
assertEquals(VERSION, repository.getVersion());
assertEquals(ENCODING, repository.getCharacterEncoding());
- assertEquals(TIMESTAMP, repository.getSyncTimeStamp());
+ assertEquals(TIMESTAMP, repository.getSynchronizationTimeStamp());
} else if(repository.getUrl().equals(REPURL2)) {
assertEquals(TIMEZONE+ SUFFIX, repository.getTimeZoneId());
assertEquals(VERSION+ SUFFIX, repository.getVersion());
assertEquals(ENCODING+ SUFFIX, repository.getCharacterEncoding());
- assertEquals(TIMESTAMP+ SUFFIX, repository.getSyncTimeStamp());
+ assertEquals(TIMESTAMP+ SUFFIX, repository.getSynchronizationTimeStamp());
}
}
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryManagerTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryManagerTest.java
index df7b172ca..c9b9e4b44 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryManagerTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryManagerTest.java
@@ -129,18 +129,18 @@ public class TaskRepositoryManagerTest extends TestCase {
repository1.setVersion(version);
repository1.setCharacterEncoding(encoding);
repository1.setTimeZoneId(fakeTimeZone);
- repository1.setSyncTimeStamp(dateString);
+ repository1.setSynchronizationTimeStamp(dateString);
repository1.setAnonymous(true);
manager.addRepository(repository1, TasksUiPlugin.getDefault().getRepositoriesFilePath());
manager.readRepositories(TasksUiPlugin.getDefault().getRepositoriesFilePath());
- TaskRepository temp = manager.getRepository(repository1.getKind(), repository1.getUrl());
+ TaskRepository temp = manager.getRepository(repository1.getConnectorKind(), repository1.getUrl());
assertNotNull(temp);
assertEquals(version, temp.getVersion());
assertTrue(temp.isAnonymous());
assertEquals(encoding, temp.getCharacterEncoding());
assertEquals(fakeTimeZone, temp.getTimeZoneId());
- assertEquals(dateString, temp.getSyncTimeStamp());
+ assertEquals(dateString, temp.getSynchronizationTimeStamp());
}
@@ -148,15 +148,15 @@ public class TaskRepositoryManagerTest extends TestCase {
TaskRepository repository = new TaskRepository(DEFAULT_KIND, DEFAULT_URL);
manager.addRepository(repository, TasksUiPlugin.getDefault().getRepositoriesFilePath());
- assertNotNull(manager.getRepository(repository.getKind(), repository.getUrl()));
+ assertNotNull(manager.getRepository(repository.getConnectorKind(), repository.getUrl()));
TaskRepository repository2 = new TaskRepository(DEFAULT_KIND, ANOTHER_URL);
manager.addRepository(repository2, TasksUiPlugin.getDefault().getRepositoriesFilePath());
- assertNotNull(manager.getRepository(repository2.getKind(), repository2.getUrl()));
+ assertNotNull(manager.getRepository(repository2.getConnectorKind(), repository2.getUrl()));
manager.removeRepository(repository2, TasksUiPlugin.getDefault().getRepositoriesFilePath());
- assertNull(manager.getRepository(repository2.getKind(), repository2.getUrl()));
+ assertNull(manager.getRepository(repository2.getConnectorKind(), repository2.getUrl()));
}
public void testRepositoryWithUnnownUrlHandler() {
@@ -182,7 +182,7 @@ public class TaskRepositoryManagerTest extends TestCase {
manager.readRepositories(TasksUiPlugin.getDefault().getRepositoriesFilePath());
- TaskRepository temp = manager.getRepository(repository.getKind(), repository.getUrl());
+ TaskRepository temp = manager.getRepository(repository.getConnectorKind(), repository.getUrl());
assertNotNull(temp);
assertEquals("euxx", temp.getProperty("owner"));
}
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositorySorterTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositorySorterTest.java
index 62fd86226..531448cb4 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositorySorterTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositorySorterTest.java
@@ -8,8 +8,8 @@
package org.eclipse.mylyn.tasks.tests;
+import org.eclipse.mylyn.internal.tasks.core.IRepositoryConstants;
import org.eclipse.mylyn.internal.tasks.ui.views.TaskRepositoriesSorter;
-import org.eclipse.mylyn.tasks.core.IRepositoryConstants;
import org.eclipse.mylyn.tasks.core.TaskRepository;
import junit.framework.TestCase;
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryTest.java
index 7072440f3..9172f9566 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryTest.java
@@ -8,7 +8,7 @@
package org.eclipse.mylyn.tasks.tests;
-import org.eclipse.mylyn.tasks.core.IRepositoryConstants;
+import org.eclipse.mylyn.internal.tasks.core.IRepositoryConstants;
import org.eclipse.mylyn.tasks.core.TaskRepository;
import junit.framework.TestCase;
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryUi.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockTaskConnectorUi.java
index 914e5b8d9..1c6710931 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryUi.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockTaskConnectorUi.java
@@ -17,7 +17,7 @@ import org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage;
/**
* @author Mik Kersten
*/
-public class MockRepositoryUi extends AbstractRepositoryConnectorUi {
+public class MockTaskConnectorUi extends AbstractRepositoryConnectorUi {
@Override
public IWizard getNewTaskWizard(TaskRepository taskRepository) {
@@ -26,7 +26,7 @@ public class MockRepositoryUi extends AbstractRepositoryConnectorUi {
}
@Override
- public String getRepositoryType() {
+ public String getConnectorKind() {
return "mock";
}
@@ -37,12 +37,6 @@ public class MockRepositoryUi extends AbstractRepositoryConnectorUi {
}
@Override
- public boolean hasRichEditor() {
- // ignore
- return false;
- }
-
- @Override
public boolean hasSearchPage() {
return false;
}
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockTaskListFactory.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockTaskListFactory.java
index f9926fd6a..f4569b764 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockTaskListFactory.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockTaskListFactory.java
@@ -13,7 +13,6 @@ package org.eclipse.mylyn.tasks.tests.connector;
import org.eclipse.mylyn.tasks.core.AbstractTask;
import org.eclipse.mylyn.tasks.core.AbstractTaskListFactory;
-import org.eclipse.mylyn.tasks.core.TaskExternalizationException;
import org.w3c.dom.Element;
/**
@@ -27,7 +26,7 @@ public class MockTaskListFactory extends AbstractTaskListFactory {
}
@Override
- public AbstractTask createTask(String repositoryUrl, String taskId, String summary, Element element) throws TaskExternalizationException {
+ public AbstractTask createTask(String repositoryUrl, String taskId, String summary, Element element) {
MockRepositoryTask task = new MockRepositoryTask(repositoryUrl, taskId, summary);
return task;
}
diff --git a/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF
index 7f2fbee22..0220b9098 100644
--- a/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF
@@ -31,13 +31,13 @@ Export-Package: org.eclipse.mylyn.internal.tasks.ui,
org.eclipse.mylyn.internal.tasks.ui.editors,
org.eclipse.mylyn.internal.tasks.ui.planner,
org.eclipse.mylyn.internal.tasks.ui.preferences,
+ org.eclipse.mylyn.internal.tasks.ui.properties,
org.eclipse.mylyn.internal.tasks.ui.search,
org.eclipse.mylyn.internal.tasks.ui.util,
org.eclipse.mylyn.internal.tasks.ui.views,
org.eclipse.mylyn.internal.tasks.ui.wizards,
org.eclipse.mylyn.tasks.ui,
org.eclipse.mylyn.tasks.ui.editors,
- org.eclipse.mylyn.tasks.ui.properties,
org.eclipse.mylyn.tasks.ui.search,
org.eclipse.mylyn.tasks.ui.wizards
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.mylyn.tasks.ui/plugin.xml b/org.eclipse.mylyn.tasks.ui/plugin.xml
index 1bef253d8..67bbec244 100644
--- a/org.eclipse.mylyn.tasks.ui/plugin.xml
+++ b/org.eclipse.mylyn.tasks.ui/plugin.xml
@@ -694,7 +694,7 @@
point="org.eclipse.ui.propertyPages">
<page
adaptable="true"
- class="org.eclipse.mylyn.tasks.ui.properties.ProjectTaskRepositoryPage"
+ class="org.eclipse.mylyn.internal.tasks.ui.properties.ProjectTaskRepositoryPage"
id="org.eclipse.mylyn.tasks.ui.properties.pages.project.repository"
name="Task Repository"
objectClass="org.eclipse.core.resources.IProject"/>
@@ -722,7 +722,7 @@
<extension
point="org.eclipse.mylyn.tasks.ui.projectLinkProviders">
<linkProvider
- class="org.eclipse.mylyn.tasks.ui.ProjectPreferencesLinkProvider"
+ class="org.eclipse.mylyn.internal.tasks.ui.properties.ProjectPropertiesLinkProvider"
name="Default Repository Link"
order="1000"
id="org.eclipse.mylyn.tasks.ui.defaultRepositoryLinkProvider">
@@ -797,7 +797,7 @@
<connectorUi
brandingIcon="icons/etool16/person.gif"
- class="org.eclipse.mylyn.internal.tasks.ui.LocalRepositoryUi"
+ class="org.eclipse.mylyn.internal.tasks.ui.LocalTaskConnectorUi"
name="Local Repository Ui"
overlayIcon="icons/ovr16/overlay-local.gif"/>
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 0b98b8c47..21ef3b36d 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
@@ -61,7 +61,7 @@ public class AddExistingTaskJob extends Job {
@Override
public IStatus run(IProgressMonitor monitor) {
final AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector(
- repository.getKind());
+ repository.getConnectorKind());
try {
final AbstractTask newTask = connector.createTaskFromExistingId(repository, taskId, monitor);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/ContextUiUtil.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ContextUiUtil.java
index 400d26e7d..4d0abc379 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/ContextUiUtil.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ContextUiUtil.java
@@ -6,7 +6,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
-package org.eclipse.mylyn.tasks.ui;
+package org.eclipse.mylyn.internal.tasks.ui;
import java.lang.reflect.InvocationTargetException;
@@ -17,19 +17,20 @@ import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.operation.IRunnableContext;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.mylyn.internal.monitor.core.util.StatusManager;
-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.RepositoryAttachment;
import org.eclipse.mylyn.tasks.core.TaskRepository;
import org.eclipse.mylyn.tasks.core.AbstractTask.RepositoryTaskSyncState;
+import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
import org.eclipse.ui.IViewSite;
import org.eclipse.ui.IWorkbenchSite;
import org.eclipse.ui.PlatformUI;
/**
+ *
+ *
* @author Steffen Pingel
*/
public class ContextUiUtil {
@@ -84,10 +85,10 @@ public class ContextUiUtil {
return true;
}
- public static final boolean uploadContext(final TaskRepository repository, final AbstractTask task,
+ public static boolean uploadContext(final TaskRepository repository, final AbstractTask task,
final String comment, final IRunnableContext context) {
final AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector(
- repository.getKind());
+ repository.getConnectorKind());
try {
final boolean[] result = new boolean[1];
IRunnableWithProgress runnable = new IRunnableWithProgress() {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/ITaskCommandIds.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ITaskCommandIds.java
index e3eff50f0..d874169ab 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/ITaskCommandIds.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ITaskCommandIds.java
@@ -6,7 +6,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
-package org.eclipse.mylyn.tasks.ui;
+package org.eclipse.mylyn.internal.tasks.ui;
/**
* @author Willian Mitsuda
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/LocalRepositoryUi.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/LocalTaskConnectorUi.java
index 4efe6fc4e..8a1ab1f95 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/LocalRepositoryUi.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/LocalTaskConnectorUi.java
@@ -19,7 +19,7 @@ import org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage;
/**
* @author Rob Elves
*/
-public class LocalRepositoryUi extends AbstractRepositoryConnectorUi {
+public class LocalTaskConnectorUi extends AbstractRepositoryConnectorUi {
@Override
public IWizard getNewTaskWizard(TaskRepository taskRepository) {
@@ -33,7 +33,7 @@ public class LocalRepositoryUi extends AbstractRepositoryConnectorUi {
}
@Override
- public String getRepositoryType() {
+ public String getConnectorKind() {
return LocalRepositoryConnector.REPOSITORY_KIND;
}
@@ -43,11 +43,6 @@ public class LocalRepositoryUi extends AbstractRepositoryConnectorUi {
}
@Override
- public boolean hasRichEditor() {
- return false;
- }
-
- @Override
public boolean hasSearchPage() {
return false;
}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/OpenRepositoryTaskJob.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/OpenRepositoryTaskJob.java
index 7d555d965..da2c88777 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/OpenRepositoryTaskJob.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/OpenRepositoryTaskJob.java
@@ -9,7 +9,7 @@
* University Of British Columbia - initial API and implementation
*******************************************************************************/
-package org.eclipse.mylyn.tasks.ui;
+package org.eclipse.mylyn.internal.tasks.ui;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -22,6 +22,8 @@ import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
import org.eclipse.mylyn.tasks.core.AbstractTaskDataHandler;
import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
import org.eclipse.mylyn.tasks.core.TaskRepository;
+import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
+import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
import org.eclipse.mylyn.tasks.ui.editors.AbstractRepositoryTaskEditorInput;
import org.eclipse.mylyn.tasks.ui.editors.RepositoryTaskEditorInput;
import org.eclipse.mylyn.tasks.ui.editors.TaskEditor;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/RepositorySynchronizationManager.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/RepositorySynchronizationManager.java
index 4afe0b434..ab0e9fcae 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/RepositorySynchronizationManager.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/RepositorySynchronizationManager.java
@@ -6,7 +6,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
-package org.eclipse.mylyn.tasks.ui;
+package org.eclipse.mylyn.internal.tasks.ui;
import java.util.Collections;
import java.util.HashSet;
@@ -27,6 +27,7 @@ import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
import org.eclipse.mylyn.tasks.core.TaskList;
import org.eclipse.mylyn.tasks.core.TaskRepository;
import org.eclipse.mylyn.tasks.core.AbstractTask.RepositoryTaskSyncState;
+import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
import org.eclipse.ui.PlatformUI;
/**
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ScheduledTaskListSynchJob.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ScheduledTaskListSynchJob.java
index 3089adb24..01c30ac63 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ScheduledTaskListSynchJob.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ScheduledTaskListSynchJob.java
@@ -24,7 +24,6 @@ import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
import org.eclipse.mylyn.tasks.core.TaskList;
import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.ui.RepositorySynchronizationManager;
import org.eclipse.mylyn.tasks.ui.TaskListManager;
import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
@@ -84,7 +83,7 @@ public class ScheduledTaskListSynchJob extends Job {
}
final AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager()
- .getRepositoryConnector(repository.getKind());
+ .getRepositoryConnector(repository.getConnectorKind());
if (connector == null) {
monitor.worked(1);
continue;
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/internal/tasks/ui/SynchronizeQueryJob.java
index 70badc481..4bc6c36b8 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/internal/tasks/ui/SynchronizeQueryJob.java
@@ -9,7 +9,7 @@
* University Of British Columbia - initial API and implementation
*******************************************************************************/
-package org.eclipse.mylyn.tasks.ui;
+package org.eclipse.mylyn.internal.tasks.ui;
import java.util.Collections;
import java.util.Date;
@@ -24,8 +24,6 @@ import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.mylyn.internal.monitor.core.util.StatusManager;
-import org.eclipse.mylyn.internal.tasks.ui.TaskFactory;
-import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
import org.eclipse.mylyn.monitor.core.DateUtil;
import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
@@ -34,6 +32,7 @@ import org.eclipse.mylyn.tasks.core.QueryHitCollector;
import org.eclipse.mylyn.tasks.core.TaskList;
import org.eclipse.mylyn.tasks.core.TaskRepository;
import org.eclipse.mylyn.tasks.core.AbstractTask.RepositoryTaskSyncState;
+import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.progress.IProgressConstants;
@@ -139,7 +138,7 @@ class SynchronizeQueryJob extends Job {
job.run(new SubProgressMonitor(monitor, 40));
if (Platform.isRunning() && !(TasksUiPlugin.getRepositoryManager() == null)) {
- TasksUiPlugin.getRepositoryManager().setSyncTime(repository,
+ TasksUiPlugin.getRepositoryManager().setSynchronizationTime(repository,
connector.getSynchronizationTimestamp(repository, tasksToBeSynchronized),
TasksUiPlugin.getDefault().getRepositoriesFilePath());
}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/SynchronizeTaskJob.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/SynchronizeTaskJob.java
index ca49d4531..f33b74c4e 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/SynchronizeTaskJob.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/SynchronizeTaskJob.java
@@ -9,7 +9,7 @@
* University Of British Columbia - initial API and implementation
*******************************************************************************/
-package org.eclipse.mylyn.tasks.ui;
+package org.eclipse.mylyn.internal.tasks.ui;
import java.util.Date;
import java.util.HashMap;
@@ -25,14 +25,13 @@ import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.mylyn.internal.monitor.core.util.StatusManager;
-import org.eclipse.mylyn.internal.tasks.ui.TaskFactory;
-import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
import org.eclipse.mylyn.tasks.core.AbstractTask;
import org.eclipse.mylyn.tasks.core.AbstractTaskDataHandler;
import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
import org.eclipse.mylyn.tasks.core.TaskRepository;
import org.eclipse.mylyn.tasks.core.AbstractTask.RepositoryTaskSyncState;
+import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.progress.IProgressConstants;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskFactory.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskFactory.java
index b7efba722..4612fd3c2 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskFactory.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskFactory.java
@@ -19,7 +19,6 @@ import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
import org.eclipse.mylyn.tasks.core.TaskList;
import org.eclipse.mylyn.tasks.core.TaskRepository;
import org.eclipse.mylyn.tasks.core.AbstractTask.RepositoryTaskSyncState;
-import org.eclipse.mylyn.tasks.ui.RepositorySynchronizationManager;
import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
/**
@@ -47,7 +46,7 @@ public class TaskFactory implements ITaskFactory {
this.repository = repository;
this.updateTasklist = updateTasklist;
this.forced = forced;
- connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector(repository.getKind());
+ connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector(repository.getConnectorKind());
synchManager = TasksUiPlugin.getSynchronizationManager();
taskList = TasksUiPlugin.getTaskListManager().getTaskList();
//dataManager = TasksUiPlugin.getDefault().getTaskDataManager();
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskLabelDecorator.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskLabelDecorator.java
index a01360008..fd5f8640e 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskLabelDecorator.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskLabelDecorator.java
@@ -65,7 +65,7 @@ public class TaskLabelDecorator implements ILightweightLabelDecorator {
decoration.addOverlay(TasksUiImages.OVERLAY_OVER_DUE, IDecoration.TOP_RIGHT);
}
} else if (element instanceof TaskRepository) {
- ImageDescriptor overlay = TasksUiPlugin.getDefault().getOverlayIcon(((TaskRepository) element).getKind());
+ ImageDescriptor overlay = TasksUiPlugin.getDefault().getOverlayIcon(((TaskRepository) element).getConnectorKind());
if (overlay != null) {
decoration.addOverlay(overlay, IDecoration.BOTTOM_RIGHT);
}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskSearchPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskSearchPage.java
index d404a5e3e..7b64482f9 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskSearchPage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskSearchPage.java
@@ -152,7 +152,7 @@ public class TaskSearchPage extends DialogPage implements ISearchPage {
searchPage.setContainer(pageContainer);
searchPage.createControl(fParentComposite);
StatusManager.log(e, "Error occurred while constructing search page for " + repository.getUrl() + " ["
- + repository.getKind() + "]");
+ + repository.getConnectorKind() + "]");
searchPage.getControl().setData(PAGE_KEY, searchPage);
return searchPage.getControl();
}
@@ -179,7 +179,7 @@ public class TaskSearchPage extends DialogPage implements ISearchPage {
String repositoryUrl = repositoryCombo.getItem(pageIndex);
repository = TasksUiPlugin.getRepositoryManager().getRepository(repositoryUrl);
if (repository != null) {
- AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryUi(repository.getKind());
+ AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryUi(repository.getConnectorKind());
if (connectorUi != null) {
WizardPage searchPage = connectorUi.getSearchPage(repository, null);
if (searchPage != null && searchPage instanceof ISearchPage) {
@@ -213,7 +213,7 @@ public class TaskSearchPage extends DialogPage implements ISearchPage {
List<TaskRepository> repositories = TasksUiPlugin.getRepositoryManager().getAllRepositories();
List<TaskRepository> searchableRepositories = new ArrayList<TaskRepository>();
for (TaskRepository repository : repositories) {
- AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryUi(repository.getKind());
+ AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryUi(repository.getConnectorKind());
if (connectorUi != null && connectorUi.hasSearchPage()) {
searchableRepositories.add(repository);
}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/AbstractTaskRepositoryAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/AbstractTaskRepositoryAction.java
index d0ae7c135..2e440cab1 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/AbstractTaskRepositoryAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/AbstractTaskRepositoryAction.java
@@ -30,7 +30,7 @@ public abstract class AbstractTaskRepositoryAction extends BaseSelectionListener
if (selectedObject instanceof TaskRepository) {
TaskRepository taskRepository = (TaskRepository) selectedObject;
AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector(
- taskRepository.getKind());
+ taskRepository.getConnectorKind());
if (connector.isUserManaged()) {
return true;
}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/AddRepositoryAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/AddRepositoryAction.java
index edc0da38a..e71287758 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/AddRepositoryAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/AddRepositoryAction.java
@@ -13,8 +13,8 @@ package org.eclipse.mylyn.internal.tasks.ui.actions;
import org.eclipse.jface.action.Action;
import org.eclipse.mylyn.internal.monitor.core.util.StatusManager;
+import org.eclipse.mylyn.internal.tasks.ui.ITaskCommandIds;
import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
-import org.eclipse.mylyn.tasks.ui.ITaskCommandIds;
import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.handlers.IHandlerService;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/EditRepositoryPropertiesAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/EditRepositoryPropertiesAction.java
index 03af015d2..e0cc7aa0c 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/EditRepositoryPropertiesAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/EditRepositoryPropertiesAction.java
@@ -36,7 +36,7 @@ public class EditRepositoryPropertiesAction extends AbstractTaskRepositoryAction
Object selectedObject = selection.getFirstElement();
if(selectedObject instanceof TaskRepository){
TaskRepository taskRepository = (TaskRepository) selectedObject;
- AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector(taskRepository.getKind());
+ AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector(taskRepository.getConnectorKind());
if(connector.isUserManaged()){
return true;
}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewTaskAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewTaskAction.java
index d8cedfa87..77c3785d6 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewTaskAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewTaskAction.java
@@ -18,7 +18,7 @@ import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.wizard.IWizard;
import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.mylyn.internal.tasks.ui.LocalRepositoryUi;
+import org.eclipse.mylyn.internal.tasks.ui.LocalTaskConnectorUi;
import org.eclipse.mylyn.internal.tasks.ui.wizards.NewTaskWizard;
import org.eclipse.mylyn.tasks.core.TaskRepository;
import org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi;
@@ -44,9 +44,9 @@ public class NewTaskAction extends Action implements IViewActionDelegate {
if (repositories.size() == 1) {
// NOTE: this click-saving should be generalized
TaskRepository taskRepository = repositories.get(0);
- AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryUi(taskRepository.getKind());
+ AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryUi(taskRepository.getConnectorKind());
wizard = connectorUi.getNewTaskWizard(taskRepository);
- if (connectorUi instanceof LocalRepositoryUi) {
+ if (connectorUi instanceof LocalTaskConnectorUi) {
wizard.performFinish();
return;
}
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 308ae586b..7457966c0 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
@@ -24,12 +24,12 @@ 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.RepositorySynchronizationManager;
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.TaskRepository;
-import org.eclipse.mylyn.tasks.ui.RepositorySynchronizationManager;
import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
import org.eclipse.ui.IActionBars;
import org.eclipse.ui.IViewActionDelegate;
@@ -106,7 +106,7 @@ public class SynchronizeSelectedAction extends ActionDelegate implements IViewAc
for (Map.Entry<TaskRepository, Set<AbstractRepositoryQuery>> entry : repositoriesToSync.entrySet()) {
TaskRepository repository = entry.getKey();
AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager()
- .getRepositoryConnector(repository.getKind());
+ .getRepositoryConnector(repository.getConnectorKind());
Set<AbstractRepositoryQuery> queries = entry.getValue();
syncManager.synchronize(connector, repository, queries, null, Job.LONG, 0L, true);
}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/RemoteTaskSelectionDialog.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/RemoteTaskSelectionDialog.java
index 07758ffbb..6b32be91d 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/RemoteTaskSelectionDialog.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/RemoteTaskSelectionDialog.java
@@ -35,6 +35,8 @@ import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerFilter;
import org.eclipse.mylyn.internal.monitor.core.util.StatusManager;
+import org.eclipse.mylyn.internal.tasks.core.TaskRepositoryFilter;
+import org.eclipse.mylyn.internal.tasks.ui.ITaskCommandIds;
import org.eclipse.mylyn.internal.tasks.ui.views.TaskElementLabelProvider;
import org.eclipse.mylyn.internal.tasks.ui.views.TaskRepositoryLabelProvider;
import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
@@ -44,9 +46,7 @@ import org.eclipse.mylyn.tasks.core.AbstractTaskCategory;
import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
import org.eclipse.mylyn.tasks.core.TaskList;
import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.core.TaskRepositoryFilter;
import org.eclipse.mylyn.tasks.core.TaskRepositoryManager;
-import org.eclipse.mylyn.tasks.ui.ITaskCommandIds;
import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.KeyAdapter;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryAttachmentEditorInput.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryAttachmentEditorInput.java
index ca6b5e01a..24e39acf7 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryAttachmentEditorInput.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryAttachmentEditorInput.java
@@ -82,7 +82,7 @@ public class RepositoryAttachmentEditorInput extends PlatformObject implements I
public InputStream getContents() throws CoreException {
AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector(
- repository.getKind());
+ repository.getConnectorKind());
AbstractAttachmentHandler handler = connector.getAttachmentHandler();
return handler.getAttachmentAsStream(repository, attachment, new NullProgressMonitor());
}
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 419050cca..75082ce68 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
@@ -631,7 +631,7 @@ public class TaskPlanningEditor extends TaskFormPage {
if (task instanceof AbstractTask && !(task instanceof LocalTask)) {
AbstractRepositoryConnectorUi connector = TasksUiPlugin.getRepositoryUi(((AbstractTask) task).getConnectorKind());
- if (connector != null && connector.handlesDueDates((AbstractTask) task)) {
+ if (connector != null && connector.supportsDueDates((AbstractTask) task)) {
dueDatePicker.setEnabled(false);
clearDueDate.setEnabled(false);
}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/ProjectPreferencesLinkProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/properties/ProjectPropertiesLinkProvider.java
index 4bab59f6f..9c7eb9b5e 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/ProjectPreferencesLinkProvider.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/properties/ProjectPropertiesLinkProvider.java
@@ -6,7 +6,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
-package org.eclipse.mylyn.tasks.ui;
+package org.eclipse.mylyn.internal.tasks.ui.properties;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
@@ -16,6 +16,8 @@ import org.eclipse.core.runtime.preferences.IScopeContext;
import org.eclipse.mylyn.internal.monitor.core.util.StatusManager;
import org.eclipse.mylyn.tasks.core.TaskRepository;
import org.eclipse.mylyn.tasks.core.TaskRepositoryManager;
+import org.eclipse.mylyn.tasks.ui.AbstractTaskRepositoryLinkProvider;
+import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
import org.osgi.service.prefs.BackingStoreException;
/**
@@ -23,7 +25,7 @@ import org.osgi.service.prefs.BackingStoreException;
*
* @author Eugene Kuleshov
*/
-public class ProjectPreferencesLinkProvider extends AbstractTaskRepositoryLinkProvider {
+public class ProjectPropertiesLinkProvider extends AbstractTaskRepositoryLinkProvider {
private static final String PROPERTY_PREFIX = "project.repository";
@@ -64,7 +66,7 @@ public class ProjectPreferencesLinkProvider extends AbstractTaskRepositoryLinkPr
IScopeContext projectScope = new ProjectScope(project);
IEclipsePreferences projectNode = projectScope.getNode(TasksUiPlugin.PLUGIN_ID);
if (projectNode != null) {
- projectNode.put(PROJECT_REPOSITORY_KIND, repository.getKind());
+ projectNode.put(PROJECT_REPOSITORY_KIND, repository.getConnectorKind());
projectNode.put(PROJECT_REPOSITORY_URL, repository.getUrl());
try {
projectNode.flush();
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/properties/ProjectTaskRepositoryPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/properties/ProjectTaskRepositoryPage.java
index d13b817e8..311cee0f9 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/properties/ProjectTaskRepositoryPage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/properties/ProjectTaskRepositoryPage.java
@@ -6,7 +6,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
-package org.eclipse.mylyn.tasks.ui.properties;
+package org.eclipse.mylyn.internal.tasks.ui.properties;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
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 601e4a232..b5c5345c9 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
@@ -23,13 +23,13 @@ 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.TaskExternalizationException;
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.TaskExternalizationException;
import org.eclipse.mylyn.tasks.core.TaskList;
import org.eclipse.mylyn.tasks.core.AbstractTask.PriorityLevel;
import org.eclipse.mylyn.tasks.core.AbstractTask.RepositoryTaskSyncState;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListWriter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListWriter.java
index e67a63e13..7964cafc4 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListWriter.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListWriter.java
@@ -43,12 +43,12 @@ import javax.xml.transform.stream.StreamResult;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.mylyn.internal.monitor.core.util.StatusManager;
import org.eclipse.mylyn.internal.tasks.core.TaskDataManager;
+import org.eclipse.mylyn.internal.tasks.core.TaskExternalizationException;
import org.eclipse.mylyn.internal.tasks.ui.ITasksUiConstants;
import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
import org.eclipse.mylyn.tasks.core.AbstractTask;
import org.eclipse.mylyn.tasks.core.AbstractTaskListFactory;
-import org.eclipse.mylyn.tasks.core.TaskExternalizationException;
import org.eclipse.mylyn.tasks.core.TaskList;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -364,8 +364,8 @@ public class TaskListWriter {
// bug#173710 - task number incorrect resulting in invalid task
// list
// Doing count each time
- int largest = taskList.findLargestTaskHandle();
- taskList.setLastTaskNum(largest);
+ int largest = taskList.findLargestTaskId();
+ taskList.setLastLocalTaskId(largest);
}
} catch (Exception e) {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiExtensionReader.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiExtensionReader.java
index f69496b87..9eea133f3 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiExtensionReader.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiExtensionReader.java
@@ -317,7 +317,7 @@ public class TasksUiExtensionReader {
.getName(), iconPath);
if (descriptor != null) {
TasksUiPlugin.getDefault().addBrandingIcon(
- ((AbstractRepositoryConnectorUi) connectorUi).getRepositoryType(),
+ ((AbstractRepositoryConnectorUi) connectorUi).getConnectorKind(),
TasksUiImages.getImage(descriptor));
}
}
@@ -327,7 +327,7 @@ public class TasksUiExtensionReader {
.getName(), overlayIconPath);
if (descriptor != null) {
TasksUiPlugin.getDefault().addOverlayIcon(
- ((AbstractRepositoryConnectorUi) connectorUi).getRepositoryType(), descriptor);
+ ((AbstractRepositoryConnectorUi) connectorUi).getConnectorKind(), descriptor);
}
}
} else {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/RepositoryOfflineAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/RepositoryOfflineAction.java
index 85d7c4550..290562980 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/RepositoryOfflineAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/RepositoryOfflineAction.java
@@ -49,7 +49,7 @@ public class RepositoryOfflineAction extends Action implements ISelectionChanged
Object selectedObject = ((IStructuredSelection)selection).getFirstElement();
if (selectedObject instanceof TaskRepository) {
AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector(
- ((TaskRepository) selectedObject).getKind());
+ ((TaskRepository) selectedObject).getConnectorKind());
if (connector.isUserManaged()) {
this.repository = (TaskRepository) selectedObject;
setChecked(this.repository.isOffline());
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/ResetRepositoryConfigurationAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/ResetRepositoryConfigurationAction.java
index 3d0daea11..b6012dd93 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/ResetRepositoryConfigurationAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/ResetRepositoryConfigurationAction.java
@@ -45,7 +45,7 @@ public class ResetRepositoryConfigurationAction extends AbstractTaskRepositoryAc
Object selectedObject = iter.next();
if (selectedObject instanceof TaskRepository) {
final TaskRepository repository = (TaskRepository) selectedObject;
- final AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector(repository.getKind());
+ final AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector(repository.getConnectorKind());
if (connector != null) {
final String jobName = "Updating attributes for: " + repository.getUrl();
Job updateJob = new Job(jobName) {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskRepositoriesSorter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskRepositoriesSorter.java
index cbe99957e..005c5b4ed 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskRepositoriesSorter.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskRepositoriesSorter.java
@@ -10,8 +10,8 @@ package org.eclipse.mylyn.internal.tasks.ui.views;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.mylyn.internal.tasks.core.IRepositoryConstants;
import org.eclipse.mylyn.internal.tasks.core.LocalRepositoryConnector;
-import org.eclipse.mylyn.tasks.core.IRepositoryConstants;
import org.eclipse.mylyn.tasks.core.TaskRepository;
/**
@@ -34,8 +34,8 @@ public class TaskRepositoriesSorter extends ViewerSorter {
return 1;
}
- if (!t1.getKind().equals(t2.getKind())) {
- return (t1.getKind()).compareTo(t2.getKind());
+ if (!t1.getConnectorKind().equals(t2.getConnectorKind())) {
+ return (t1.getConnectorKind()).compareTo(t2.getConnectorKind());
} else {
if ((label1 == null || label1.equals("")) && label2 != null) {
return 1;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AddExistingTaskWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AddExistingTaskWizard.java
index 41f56cf2c..b1bce29a4 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AddExistingTaskWizard.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AddExistingTaskWizard.java
@@ -12,8 +12,8 @@
package org.eclipse.mylyn.internal.tasks.ui.wizards;
import org.eclipse.jface.wizard.IWizard;
+import org.eclipse.mylyn.internal.tasks.core.TaskRepositoryFilter;
import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.core.TaskRepositoryFilter;
import org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi;
import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
@@ -40,7 +40,7 @@ public class AddExistingTaskWizard extends MultiRepositoryAwareWizard {
@Override
protected IWizard createWizard(TaskRepository taskRepository) {
AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryUi(
- taskRepository.getKind());
+ taskRepository.getConnectorKind());
return connectorUi.getAddExistingTaskWizard(taskRepository);
}
}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextAttachWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextAttachWizard.java
index 5247a358a..44197e841 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextAttachWizard.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextAttachWizard.java
@@ -12,10 +12,10 @@
package org.eclipse.mylyn.internal.tasks.ui.wizards;
import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.mylyn.internal.tasks.ui.ContextUiUtil;
import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
import org.eclipse.mylyn.tasks.core.AbstractTask;
import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.ui.ContextUiUtil;
import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
/**
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextRetrieveWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextRetrieveWizard.java
index 9733529a9..468a66603 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextRetrieveWizard.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextRetrieveWizard.java
@@ -12,11 +12,11 @@
package org.eclipse.mylyn.internal.tasks.ui.wizards;
import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.mylyn.internal.tasks.ui.ContextUiUtil;
import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
import org.eclipse.mylyn.tasks.core.AbstractTask;
import org.eclipse.mylyn.tasks.core.RepositoryAttachment;
import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.ui.ContextUiUtil;
import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
/**
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextRetrieveWizardPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextRetrieveWizardPage.java
index 643efcf2f..cea500a87 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextRetrieveWizardPage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextRetrieveWizardPage.java
@@ -112,7 +112,7 @@ public class ContextRetrieveWizardPage extends WizardPage {
});
AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector(
- repository.getKind());
+ repository.getConnectorKind());
List<RepositoryAttachment> contextAttachments = new ArrayList<RepositoryAttachment>();
if (connector.getAttachmentHandler() != null) {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/EditRepositoryWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/EditRepositoryWizard.java
index 59088e81a..dd51028ac 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/EditRepositoryWizard.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/EditRepositoryWizard.java
@@ -36,7 +36,7 @@ public class EditRepositoryWizard extends Wizard implements INewWizard {
super();
this.repository = repository;
AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryUi(
- repository.getKind());
+ repository.getConnectorKind());
abstractRepositorySettingsPage = connectorUi.getSettingsPage();
abstractRepositorySettingsPage.setRepository(repository);
abstractRepositorySettingsPage.setVersion(repository.getVersion());
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 7dc546326..ef3028948 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
@@ -121,7 +121,7 @@ public class NewAttachmentWizard extends Wizard {
// upload the attachment
final AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector(
- repository.getKind());
+ repository.getConnectorKind());
final AbstractAttachmentHandler attachmentHandler = connector.getAttachmentHandler();
if (attachmentHandler == null) {
return false;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewQueryWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewQueryWizard.java
index 7476f07d5..2112f7b8f 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewQueryWizard.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewQueryWizard.java
@@ -12,8 +12,8 @@
package org.eclipse.mylyn.internal.tasks.ui.wizards;
import org.eclipse.jface.wizard.IWizard;
+import org.eclipse.mylyn.internal.tasks.core.TaskRepositoryFilter;
import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.core.TaskRepositoryFilter;
import org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi;
import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
@@ -37,7 +37,7 @@ public class NewQueryWizard extends MultiRepositoryAwareWizard {
@Override
protected IWizard createWizard(TaskRepository taskRepository) {
- AbstractRepositoryConnectorUi repositoryUi = TasksUiPlugin.getRepositoryUi(taskRepository.getKind());
+ AbstractRepositoryConnectorUi repositoryUi = TasksUiPlugin.getRepositoryUi(taskRepository.getConnectorKind());
return repositoryUi.getQueryWizard(taskRepository, null);
}
}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewTaskPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewTaskPage.java
index 8a38e941e..98e83a95a 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewTaskPage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewTaskPage.java
@@ -12,8 +12,8 @@
package org.eclipse.mylyn.internal.tasks.ui.wizards;
import org.eclipse.jface.wizard.IWizard;
+import org.eclipse.mylyn.internal.tasks.core.TaskRepositoryFilter;
import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.core.TaskRepositoryFilter;
import org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi;
import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
@@ -30,7 +30,7 @@ public class NewTaskPage extends SelectRepositoryPage {
@Override
protected IWizard createWizard(TaskRepository taskRepository) {
AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryUi(
- taskRepository.getKind());
+ taskRepository.getConnectorKind());
return connectorUi.getNewTaskWizard(taskRepository); // TODO remove unused parameter
}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewTaskWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewTaskWizard.java
index 18d068b68..b6be77bef 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewTaskWizard.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewTaskWizard.java
@@ -11,7 +11,7 @@
package org.eclipse.mylyn.internal.tasks.ui.wizards;
-import org.eclipse.mylyn.tasks.core.TaskRepositoryFilter;
+import org.eclipse.mylyn.internal.tasks.core.TaskRepositoryFilter;
/**
* @author Mik Kersten
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/SelectRepositoryPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/SelectRepositoryPage.java
index 68940b9cb..e78ab6051 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/SelectRepositoryPage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/SelectRepositoryPage.java
@@ -28,12 +28,12 @@ import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.wizard.IWizard;
import org.eclipse.jface.wizard.IWizardNode;
import org.eclipse.jface.wizard.WizardSelectionPage;
+import org.eclipse.mylyn.internal.tasks.core.TaskRepositoryFilter;
import org.eclipse.mylyn.internal.tasks.ui.actions.AddRepositoryAction;
import org.eclipse.mylyn.internal.tasks.ui.views.TaskRepositoriesSorter;
import org.eclipse.mylyn.internal.tasks.ui.views.TaskRepositoryLabelProvider;
import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.core.TaskRepositoryFilter;
import org.eclipse.mylyn.tasks.core.TaskRepositoryManager;
import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
@@ -232,13 +232,13 @@ public abstract class SelectRepositoryPage extends WizardSelectionPage {
return true;
}
- return this.repository.getKind().equals(that.repository.getKind())
+ return this.repository.getConnectorKind().equals(that.repository.getConnectorKind())
&& this.repository.getUrl().equals(that.repository.getUrl());
}
@Override
public int hashCode() {
- return 31 * this.repository.getUrl().hashCode() + this.repository.getKind().hashCode();
+ return 31 * this.repository.getUrl().hashCode() + this.repository.getConnectorKind().hashCode();
}
}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/AbstractDuplicateDetector.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/AbstractDuplicateDetector.java
index 33feaa04c..8af2cf145 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/AbstractDuplicateDetector.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/AbstractDuplicateDetector.java
@@ -12,6 +12,12 @@ import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
import org.eclipse.mylyn.tasks.core.TaskRepository;
import org.eclipse.mylyn.tasks.ui.search.SearchHitCollector;
+/**
+ * Extend to provide task duplicate detection facilities to the task editor (e.g. Java stack trace matching).
+ *
+ * @author Gail Murphy
+ * @since 2.0
+ */
public abstract class AbstractDuplicateDetector {
protected String name;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/AbstractRepositoryConnectorUi.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/AbstractRepositoryConnectorUi.java
index 0bdbe45dc..eea5726fa 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/AbstractRepositoryConnectorUi.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/AbstractRepositoryConnectorUi.java
@@ -19,6 +19,7 @@ import org.eclipse.jface.wizard.IWizard;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.mylyn.internal.monitor.core.util.StatusManager;
+import org.eclipse.mylyn.internal.tasks.ui.OpenRepositoryTaskJob;
import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
import org.eclipse.mylyn.internal.tasks.ui.wizards.CommonAddExistingTaskWizard;
import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
@@ -37,10 +38,13 @@ import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
/**
- * TODO: refactor wizards into extension points
+ * Extend to provide connector-specific UI extensions.
+ *
+ * TODO: consider refactoring into extension points
*
* @author Mik Kersten
* @author Eugene Kuleshov
+ * @since 2.0
*/
public abstract class AbstractRepositoryConnectorUi {
@@ -51,7 +55,7 @@ public abstract class AbstractRepositoryConnectorUi {
/**
* @return the unique type of the repository, e.g. "bugzilla"
*/
- public abstract String getRepositoryType();
+ public abstract String getConnectorKind();
public abstract AbstractRepositorySettingsPage getSettingsPage();
@@ -64,8 +68,6 @@ public abstract class AbstractRepositoryConnectorUi {
public abstract IWizard getNewTaskWizard(TaskRepository taskRepository);
- public abstract boolean hasRichEditor();
-
/**
* Override to return a custom task editor ID. If overriding this method the
* connector becomes responsible for showing the additional pages handled by
@@ -78,6 +80,9 @@ public abstract class AbstractRepositoryConnectorUi {
public abstract boolean hasSearchPage();
+ /**
+ * Contributions to the UI legend.
+ */
public List<AbstractTaskContainer> getLegendItems() {
return Collections.emptyList();
}
@@ -190,7 +195,7 @@ public abstract class AbstractRepositoryConnectorUi {
*/
public boolean openRepositoryTask(String repositoryUrl, String id) {
TaskRepositoryManager repositoryManager = TasksUiPlugin.getRepositoryManager();
- AbstractRepositoryConnector connector = repositoryManager.getRepositoryConnector(getRepositoryType());
+ AbstractRepositoryConnector connector = repositoryManager.getRepositoryConnector(getConnectorKind());
String taskUrl = connector.getTaskUrl(repositoryUrl, id);
if (taskUrl == null) {
return false;
@@ -208,7 +213,7 @@ public abstract class AbstractRepositoryConnectorUi {
}
IWorkbenchPage page = window.getActivePage();
- OpenRepositoryTaskJob job = new OpenRepositoryTaskJob(getRepositoryType(), repositoryUrl, id, taskUrl, page);
+ OpenRepositoryTaskJob job = new OpenRepositoryTaskJob(getConnectorKind(), repositoryUrl, id, taskUrl, page);
job.schedule();
return true;
@@ -222,11 +227,11 @@ public abstract class AbstractRepositoryConnectorUi {
this.customNotificationHandling = customNotifications;
}
- public boolean hasCustomNotificationHandling() {
+ public boolean isCustomNotificationHandling() {
return customNotificationHandling;
}
- public boolean handlesDueDates(AbstractTask task) {
+ public boolean supportsDueDates(AbstractTask task) {
return false;
}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/AbstractTaskDecorator.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/AbstractTaskDecorator.java
deleted file mode 100644
index ff10d2561..000000000
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/AbstractTaskDecorator.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 - 2006 Mylar committers and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-
-package org.eclipse.mylyn.tasks.ui;
-
-import org.eclipse.jface.viewers.IDecoration;
-import org.eclipse.jface.viewers.ILightweightLabelDecorator;
-
-/**
- * Enforces consistency between decorators.
- *
- * @author Mik Kersten
- */
-public abstract class AbstractTaskDecorator implements ILightweightLabelDecorator {
-
- /**
- * Default location for the task kind decoration, used to distinguish
- * between different tasks within a repository (e.g. defect vs.
- * enhancement).
- */
- protected int getQuadrantForKind() {
- return IDecoration.BOTTOM_RIGHT;
- }
-}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/AbstractTaskRepositoryLinkProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/AbstractTaskRepositoryLinkProvider.java
index e212a09f3..c61a6d053 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/AbstractTaskRepositoryLinkProvider.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/AbstractTaskRepositoryLinkProvider.java
@@ -15,16 +15,19 @@ import org.eclipse.mylyn.tasks.core.TaskRepository;
import org.eclipse.mylyn.tasks.core.TaskRepositoryManager;
/**
- * Abstract Task Repository link provider
+ * Extend to provide linking between repositories and tasks.
*
* @author Eugene Kuleshov
+ * @since 2.0
*/
public abstract class AbstractTaskRepositoryLinkProvider implements IExecutableExtension {
private static final int DEFAULT_ORDER = 1000;
-
+
private String id;
+
private String name;
+
private int order;
public void setInitializationData(IConfigurationElement config, String propertyName, Object data) {
@@ -32,13 +35,13 @@ public abstract class AbstractTaskRepositoryLinkProvider implements IExecutableE
name = config.getAttribute("name");
try {
order = Integer.parseInt(config.getAttribute("order"));
- } catch(NumberFormatException ex) {
+ } catch (NumberFormatException ex) {
order = DEFAULT_ORDER;
}
}
-
+
public abstract TaskRepository getTaskRepository(IResource resource, TaskRepositoryManager repositoryManager);
-
+
public boolean canSetTaskRepository(IResource resource) {
return false;
}
@@ -58,5 +61,4 @@ public abstract class AbstractTaskRepositoryLinkProvider implements IExecutableE
public int getOrder() {
return order;
}
-
} \ No newline at end of file
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/DatePicker.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/DatePicker.java
index 8337bcf61..e01a2da94 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/DatePicker.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/DatePicker.java
@@ -48,6 +48,7 @@ import org.eclipse.ui.PlatformUI;
*
* @author Bahadir Yagan
* @author Mik Kersten
+ * @since 1.0
*/
public class DatePicker extends Composite {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskHyperlink.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskHyperlink.java
index d72e001b8..367ca6f02 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskHyperlink.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskHyperlink.java
@@ -16,10 +16,12 @@ import org.eclipse.jface.text.hyperlink.IHyperlink;
import org.eclipse.mylyn.tasks.core.TaskRepository;
/**
+ * Immutable. Encapsulates information for linking to tasks from text.
+ *
* @author Eugene Kuleshov
* @author Steffen Pingel
*/
-public class TaskHyperlink implements IHyperlink {
+public final class TaskHyperlink implements IHyperlink {
private final IRegion region;
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 dbe4bb9f9..384c8a6b3 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
@@ -66,10 +66,13 @@ import org.eclipse.mylyn.tasks.core.AbstractTask.PriorityLevel;
import org.eclipse.swt.widgets.Display;
/**
+ * Provides facilities for using and managing the Task List and task activity information.
+ *
* TODO: pull task activity management out into new TaskActivityManager
*
* @author Mik Kersten
* @author Rob Elves (task activity)
+ * @since 2.0
*/
public class TaskListManager implements IPropertyChangeListener {
@@ -1160,7 +1163,7 @@ public class TaskListManager implements IPropertyChangeListener {
if (summary == null) {
summary = LocalRepositoryConnector.DEFAULT_SUMMARY;
}
- LocalTask newTask = new LocalTask(""+taskList.getNextTaskNum(), summary);
+ LocalTask newTask = new LocalTask(""+taskList.getNextLocalTaskId(), summary);
newTask.setPriority(PriorityLevel.P3.toString());
scheduleNewTask(newTask);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiPlugin.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiPlugin.java
index 19b2ca315..068209813 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiPlugin.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiPlugin.java
@@ -50,6 +50,7 @@ import org.eclipse.mylyn.internal.tasks.ui.ITasksUiConstants;
import org.eclipse.mylyn.internal.tasks.ui.OfflineCachingStorage;
import org.eclipse.mylyn.internal.tasks.ui.OfflineFileStorage;
import org.eclipse.mylyn.internal.tasks.ui.RepositoryAwareStatusHandler;
+import org.eclipse.mylyn.internal.tasks.ui.RepositorySynchronizationManager;
import org.eclipse.mylyn.internal.tasks.ui.TaskListBackupManager;
import org.eclipse.mylyn.internal.tasks.ui.TaskListColorsAndFonts;
import org.eclipse.mylyn.internal.tasks.ui.TaskListNotificationIncoming;
@@ -281,9 +282,9 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup {
// Incoming Changes
for (TaskRepository repository : getRepositoryManager().getAllRepositories()) {
AbstractRepositoryConnector connector = getRepositoryManager().getRepositoryConnector(
- repository.getKind());
- AbstractRepositoryConnectorUi connectorUi = getRepositoryUi(repository.getKind());
- if (connectorUi != null && !connectorUi.hasCustomNotificationHandling()) {
+ repository.getConnectorKind());
+ AbstractRepositoryConnectorUi connectorUi = getRepositoryUi(repository.getConnectorKind());
+ if (connectorUi != null && !connectorUi.isCustomNotificationHandling()) {
for (AbstractTask repositoryTask : TasksUiPlugin.getTaskListManager()
.getTaskList()
.getRepositoryTasks(repository.getUrl())) {
@@ -300,7 +301,7 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup {
// New query hits
for (AbstractRepositoryQuery query : TasksUiPlugin.getTaskListManager().getTaskList().getQueries()) {
AbstractRepositoryConnectorUi connectorUi = getRepositoryUi(query.getRepositoryKind());
- if (!connectorUi.hasCustomNotificationHandling()) {
+ if (!connectorUi.isCustomNotificationHandling()) {
for (AbstractTask hit : query.getChildren()) {
if (hit.isNotified() == false) {
notifications.add(new TaskListNotificationQueryIncoming(hit));
@@ -771,7 +772,7 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup {
public static void addRepositoryConnectorUi(AbstractRepositoryConnectorUi repositoryConnectorUi) {
if (!repositoryConnectorUis.values().contains(repositoryConnectorUi)) {
- repositoryConnectorUis.put(repositoryConnectorUi.getRepositoryType(), repositoryConnectorUi);
+ repositoryConnectorUis.put(repositoryConnectorUi.getConnectorKind(), repositoryConnectorUi);
}
}
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 a096b0ec9..deff241c3 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
@@ -149,7 +149,7 @@ public class TasksUiUtil {
TasksUiUtil.refreshAndOpenTaskListElement(task);
opened = true;
} else {
- AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryUi(repository.getKind());
+ AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryUi(repository.getConnectorKind());
if (connectorUi != null) {
try {
opened = connectorUi.openRepositoryTask(repository.getUrl(), taskId);
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 922b2fb3f..9fc682c0c 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
@@ -438,7 +438,7 @@ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage {
repositoryTask = editorInput.getRepositoryTask();
repository = editorInput.getRepository();
taskData = editorInput.getTaskData();
- connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector(repository.getKind());
+ connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector(repository.getConnectorKind());
setSite(site);
setInput(input);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskHyperlinkDetector.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskHyperlinkDetector.java
index 767b92b73..9e93e6634 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskHyperlinkDetector.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskHyperlinkDetector.java
@@ -63,7 +63,7 @@ public class TaskHyperlinkDetector extends AbstractHyperlinkDetector {
return null;
}
- AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryUi(repository.getKind());
+ AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryUi(repository.getConnectorKind());
if (connectorUi == null) {
return null;
}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/AbstractRepositoryQueryPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/AbstractRepositoryQueryPage.java
index 4a9e79903..b89bfde3f 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/AbstractRepositoryQueryPage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/AbstractRepositoryQueryPage.java
@@ -135,7 +135,7 @@ public abstract class AbstractRepositoryQueryPage extends WizardPage implements
NewSearchUI.activateSearchResultView();
AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector(
- repository.getKind());
+ repository.getConnectorKind());
if (connector != null) {
SearchHitCollector collector = new SearchHitCollector(TasksUiPlugin.getTaskListManager().getTaskList(),
repository, getQuery(), new TaskFactory(repository, false, false));
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractEditQueryWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractEditQueryWizard.java
index 575152719..a9635dfff 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractEditQueryWizard.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractEditQueryWizard.java
@@ -50,7 +50,7 @@ public abstract class AbstractEditQueryWizard extends Wizard {
TasksUiPlugin.getTaskListManager().getTaskList().addQuery(queryToRun);
AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector(
- repository.getKind());
+ repository.getConnectorKind());
if (connector != null) {
TasksUiPlugin.getSynchronizationManager().synchronize(connector, queryToRun, null, true);
}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java
index b61552799..f46be190f 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java
@@ -26,8 +26,8 @@ import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.preference.StringFieldEditor;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.mylyn.internal.monitor.core.util.StatusManager;
+import org.eclipse.mylyn.internal.tasks.core.IRepositoryConstants;
import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
-import org.eclipse.mylyn.tasks.core.IRepositoryConstants;
import org.eclipse.mylyn.tasks.core.TaskRepository;
import org.eclipse.mylyn.tasks.core.TaskRepositoryManager;
import org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi;
@@ -191,7 +191,7 @@ public abstract class AbstractRepositorySettingsPage extends WizardPage {
super.setTitle(title);
super.setDescription(description);
AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector(
- repositoryUi.getRepositoryType());
+ repositoryUi.getConnectorKind());
this.connector = connector;
setNeedsAnonymousLogin(false);
@@ -770,7 +770,7 @@ public abstract class AbstractRepositorySettingsPage extends WizardPage {
setProxyAuth(oldProxyUsername != null && oldProxyPassword != null && !oldProxyUsername.equals("")
&& !oldProxyPassword.equals(""));
- setUseDefaultProxy(repository != null ? repository.useDefaultProxy() : true);
+ setUseDefaultProxy(repository != null ? repository.isDefaultProxyEnabled() : true);
proxyExpComposite.setExpanded(!systemProxyButton.getSelection());
}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/NewTaskWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/NewTaskWizard.java
index 4161d99bb..46291a0f3 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/NewTaskWizard.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/NewTaskWizard.java
@@ -59,7 +59,7 @@ public class NewTaskWizard extends Wizard implements INewWizard {
@Override
public boolean performFinish() {
AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector(
- taskRepository.getKind());
+ taskRepository.getConnectorKind());
final AbstractTaskDataHandler taskDataHandler = (AbstractTaskDataHandler) connector.getTaskDataHandler();
if (taskDataHandler == null) {
@@ -68,9 +68,9 @@ public class NewTaskWizard extends Wizard implements INewWizard {
return false;
}
- AbstractAttributeFactory attributeFactory = taskDataHandler.getAttributeFactory(taskRepository.getUrl(), taskRepository.getKind(), AbstractTask.DEFAULT_TASK_KIND);
+ AbstractAttributeFactory attributeFactory = taskDataHandler.getAttributeFactory(taskRepository.getUrl(), taskRepository.getConnectorKind(), AbstractTask.DEFAULT_TASK_KIND);
- final RepositoryTaskData taskData = new RepositoryTaskData(attributeFactory, taskRepository.getKind(),
+ final RepositoryTaskData taskData = new RepositoryTaskData(attributeFactory, taskRepository.getConnectorKind(),
taskRepository.getUrl(), TasksUiPlugin.getDefault().getNextNewRepositoryTaskId());
taskData.setNew(true);
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 48ed0f098..d08c48e34 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
@@ -158,7 +158,7 @@ public class TracRepositoryConnector extends AbstractRepositoryConnector {
return true;
}
- if (repository.getSyncTimeStamp() == null) {
+ if (repository.getSynchronizationTimeStamp() == null) {
for (AbstractTask task : tasks) {
task.setStale(true);
}
@@ -167,7 +167,7 @@ public class TracRepositoryConnector extends AbstractRepositoryConnector {
Date since = new Date(0);
try {
- since = TracUtils.parseDate(Integer.parseInt(repository.getSyncTimeStamp()));
+ since = TracUtils.parseDate(Integer.parseInt(repository.getSynchronizationTimeStamp()));
} catch (NumberFormatException e) {
}
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositorySettingsPageTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositorySettingsPageTest.java
index 397b75c20..ad2c875ae 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositorySettingsPageTest.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositorySettingsPageTest.java
@@ -17,7 +17,7 @@ import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.mylyn.internal.trac.core.ITracClient;
import org.eclipse.mylyn.internal.trac.core.TracCorePlugin;
import org.eclipse.mylyn.internal.trac.core.ITracClient.Version;
-import org.eclipse.mylyn.internal.trac.ui.TracRepositoryUi;
+import org.eclipse.mylyn.internal.trac.ui.TracConnectorUi;
import org.eclipse.mylyn.internal.trac.ui.wizard.TracRepositorySettingsPage;
import org.eclipse.mylyn.internal.trac.ui.wizard.TracRepositorySettingsPage.TracValidator;
import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
@@ -29,7 +29,7 @@ import org.eclipse.ui.PlatformUI;
*/
public class TracRepositorySettingsPageTest extends AbstractTracClientTest {
- private TracRepositoryUi connector;
+ private TracConnectorUi connector;
private TracRepositorySettingsPage page;
private TracValidator validator;
@@ -41,7 +41,7 @@ public class TracRepositorySettingsPageTest extends AbstractTracClientTest {
protected void setUp() throws Exception {
super.setUp();
- connector = (TracRepositoryUi) TasksUiPlugin.getRepositoryUi(TracCorePlugin.REPOSITORY_KIND);
+ connector = (TracConnectorUi) TasksUiPlugin.getRepositoryUi(TracCorePlugin.REPOSITORY_KIND);
page = new TracRepositorySettingsPage(connector);
Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTaskDataHandlerTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTaskDataHandlerTest.java
index e74c18de6..706ec165d 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTaskDataHandlerTest.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTaskDataHandlerTest.java
@@ -85,14 +85,14 @@ public class TracTaskDataHandlerTest extends TestCase {
Set<AbstractTask> tasks = new HashSet<AbstractTask>();
tasks.add(task);
- assertEquals(null, repository.getSyncTimeStamp());
+ assertEquals(null, repository.getSynchronizationTimeStamp());
boolean changed = connector.markStaleTasks(repository, tasks, new NullProgressMonitor());
assertEquals(true, changed);
- assertEquals(null, repository.getSyncTimeStamp());
+ assertEquals(null, repository.getSynchronizationTimeStamp());
assertFalse(task.isStale());
int time = (int) (System.currentTimeMillis() / 1000) + 1;
- repository.setSyncTimeStamp(time + "");
+ repository.setSynchronizationTimeStamp(time + "");
changed = connector.markStaleTasks(repository, tasks, new NullProgressMonitor());
assertEquals(true, changed);
assertFalse(task.isStale());
@@ -119,20 +119,20 @@ public class TracTaskDataHandlerTest extends TestCase {
Set<AbstractTask> tasks = new HashSet<AbstractTask>();
tasks.add(task);
- assertEquals(null, repository.getSyncTimeStamp());
+ assertEquals(null, repository.getSynchronizationTimeStamp());
boolean changed = connector.markStaleTasks(repository, tasks, new NullProgressMonitor());
assertTrue(changed);
assertTrue(task.isStale());
// always returns the ticket because time comparison mode is >=
task.setStale(false);
- repository.setSyncTimeStamp(lastModified + "");
+ repository.setSynchronizationTimeStamp(lastModified + "");
changed = connector.markStaleTasks(repository, tasks, new NullProgressMonitor());
assertTrue(changed);
assertTrue(task.isStale());
task.setStale(false);
- repository.setSyncTimeStamp((lastModified + 1) + "");
+ repository.setSynchronizationTimeStamp((lastModified + 1) + "");
changed = connector.markStaleTasks(repository, tasks, new NullProgressMonitor());
assertTrue(changed);
assertFalse(task.isStale());
@@ -149,7 +149,7 @@ public class TracTaskDataHandlerTest extends TestCase {
client.updateTicket(ticket, "comment");
task.setStale(false);
- repository.setSyncTimeStamp((lastModified + 1) + "");
+ repository.setSynchronizationTimeStamp((lastModified + 1) + "");
changed = connector.markStaleTasks(repository, tasks, new NullProgressMonitor());
assertTrue(changed);
assertTrue(task.isStale());
diff --git a/org.eclipse.mylyn.trac.ui/plugin.xml b/org.eclipse.mylyn.trac.ui/plugin.xml
index 424279077..cebac63d4 100644
--- a/org.eclipse.mylyn.trac.ui/plugin.xml
+++ b/org.eclipse.mylyn.trac.ui/plugin.xml
@@ -12,7 +12,7 @@
type="trac"/>
<connectorUi
brandingIcon="icons/eview16/trac-icon.gif"
- class="org.eclipse.mylyn.internal.trac.ui.TracRepositoryUi"
+ class="org.eclipse.mylyn.internal.trac.ui.TracConnectorUi"
id="Trac Repository UI"
overlayIcon="icons/eview16/overlay-trac.gif"/>
<taskListFactory
diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracRepositoryUi.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracConnectorUi.java
index 027a0be18..df347d264 100644
--- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracRepositoryUi.java
+++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracConnectorUi.java
@@ -40,7 +40,7 @@ import org.eclipse.mylyn.tasks.ui.wizards.NewWebTaskWizard;
* @author Mik Kersten
* @author Steffen Pingel
*/
-public class TracRepositoryUi extends AbstractRepositoryConnectorUi {
+public class TracConnectorUi extends AbstractRepositoryConnectorUi {
@Override
public IHyperlink[] findHyperlinks(TaskRepository repository, String text, int lineOffset, int regionOffset) {
@@ -62,11 +62,6 @@ public class TracRepositoryUi extends AbstractRepositoryConnectorUi {
}
@Override
- public boolean hasRichEditor() {
- return true;
- }
-
- @Override
public WizardPage getSearchPage(TaskRepository repository, IStructuredSelection selection) {
return new TracCustomQueryPage(repository);
}
@@ -95,7 +90,7 @@ public class TracRepositoryUi extends AbstractRepositoryConnectorUi {
}
@Override
- public String getRepositoryType() {
+ public String getConnectorKind() {
return TracCorePlugin.REPOSITORY_KIND;
}
diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracTaskListFactory.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracTaskListFactory.java
index e51f0742e..89ff1be50 100644
--- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracTaskListFactory.java
+++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracTaskListFactory.java
@@ -14,12 +14,12 @@ package org.eclipse.mylyn.internal.trac.ui;
import java.util.HashSet;
import java.util.Set;
+import org.eclipse.mylyn.internal.tasks.core.TaskExternalizationException;
import org.eclipse.mylyn.internal.trac.core.TracRepositoryQuery;
import org.eclipse.mylyn.internal.trac.core.TracTask;
import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
import org.eclipse.mylyn.tasks.core.AbstractTask;
import org.eclipse.mylyn.tasks.core.AbstractTaskListFactory;
-import org.eclipse.mylyn.tasks.core.TaskExternalizationException;
import org.w3c.dom.Element;
/**
@@ -59,12 +59,12 @@ public class TracTaskListFactory extends AbstractTaskListFactory {
}
@Override
- public AbstractTask createTask(String repositoryUrl, String taskId, String summary, Element element) throws TaskExternalizationException {
+ public AbstractTask createTask(String repositoryUrl, String taskId, String summary, Element element) {
return new TracTask(repositoryUrl, taskId, summary);
}
@Override
- public AbstractRepositoryQuery createQuery(String repositoryUrl, String queryString, String label, Element element) throws TaskExternalizationException {
+ public AbstractRepositoryQuery createQuery(String repositoryUrl, String queryString, String label, Element element) {
return new TracRepositoryQuery(repositoryUrl, queryString, label);
}
}
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 7cc0b428e..e8c58df93 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
@@ -37,7 +37,7 @@ public class TracTaskEditorFactory extends AbstractTaskEditorFactory {
if (input instanceof RepositoryTaskEditorInput) {
RepositoryTaskEditorInput taskInput = (RepositoryTaskEditorInput) input;
return taskInput.getTaskData() != null
- && TracCorePlugin.REPOSITORY_KIND.equals(taskInput.getRepository().getKind());
+ && TracCorePlugin.REPOSITORY_KIND.equals(taskInput.getRepository().getConnectorKind());
} else if (input instanceof TaskEditorInput) {
TaskEditorInput taskInput = (TaskEditorInput) input;
return taskInput.getTask() instanceof TracTask;
diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/NewTracQueryWizard.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/NewTracQueryWizard.java
index fdc9c8f90..8665097c6 100644
--- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/NewTracQueryWizard.java
+++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/NewTracQueryWizard.java
@@ -55,7 +55,7 @@ public class NewTracQueryWizard extends Wizard {
if (query != null) {
TasksUiPlugin.getTaskListManager().getTaskList().addQuery(query);
AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector(
- repository.getKind());
+ repository.getConnectorKind());
if (connector != null) {
TasksUiPlugin.getSynchronizationManager().synchronize(connector, query, null, true);
}
diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/NewTracTaskPage.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/NewTracTaskPage.java
index 93ad80cc6..8a0f878d2 100644
--- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/NewTracTaskPage.java
+++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/NewTracTaskPage.java
@@ -132,7 +132,7 @@ public class NewTracTaskPage extends WizardPage {
}
TracTaskDataHandler offlineHandler = (TracTaskDataHandler) connector.getTaskDataHandler();
- AbstractAttributeFactory attributeFactory = offlineHandler.getAttributeFactory(taskRepository.getUrl(), taskRepository.getKind(), AbstractTask.DEFAULT_TASK_KIND);
+ AbstractAttributeFactory attributeFactory = offlineHandler.getAttributeFactory(taskRepository.getUrl(), taskRepository.getConnectorKind(), AbstractTask.DEFAULT_TASK_KIND);
this.taskData = new RepositoryTaskData(attributeFactory, TracCorePlugin.REPOSITORY_KIND,
taskRepository.getUrl(), TasksUiPlugin.getDefault().getNextNewRepositoryTaskId());
this.taskData.setNew(true);

Back to the top