Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormkersten2007-06-07 21:24:44 -0400
committermkersten2007-06-07 21:24:44 -0400
commit4c59aae8ab1306de5af04d4ecb68c8e0bafaa3fa (patch)
tree2cc34fad102030bdf4b07bdf6709be244f3563cd
parentb0d5e7eaa955c4fcd86eb7096ba5753abbe65a7a (diff)
downloadorg.eclipse.mylyn.tasks-4c59aae8ab1306de5af04d4ecb68c8e0bafaa3fa.tar.gz
org.eclipse.mylyn.tasks-4c59aae8ab1306de5af04d4ecb68c8e0bafaa3fa.tar.xz
org.eclipse.mylyn.tasks-4c59aae8ab1306de5af04d4ecb68c8e0bafaa3fa.zip
NEW - bug 191406: rename Mylar project to Mylyn
https://bugs.eclipse.org/bugs/show_bug.cgi?id=191406
-rw-r--r--org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/DuplicateDetetionTest.java19
-rw-r--r--org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskEditorTest.java3
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/NewBugzillaTaskWizard.java4
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListBackupManagerTest.java18
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListContentProviderTest.java4
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java8
-rw-r--r--org.eclipse.mylyn.tasks.ui/plugin.xml70
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskCompletionFilter.java2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListBackupManager.java12
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationManager.java4
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListSynchronizationScheduler.java10
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskPriorityFilter.java2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPreferenceConstants.java (renamed from org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListPreferenceConstants.java)57
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/FilterArchiveContainerAction.java6
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/FilterCompletedTasksAction.java6
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/FilterSubTasksAction.java6
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewLocalTaskAction.java4
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/SynchronizeAutomaticallyAction.java6
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/CategoryEditor.java7
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java8
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityWizard.java4
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/preferences/TasksPreferencePage.java82
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/CustomTaskListDecorationDrawer.java4
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/PriorityDropDownAction.java12
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListContentProvider.java6
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java14
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskRepositoriesView.java2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/AbstractRepositoryConnectorUi.java4
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/OpenRepositoryTaskJob.java4
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java10
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiPlugin.java46
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiUtil.java9
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractNewRepositoryTaskEditor.java4
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java8
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/NewTaskWizard.java4
-rw-r--r--org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/NewTracTaskWizard.java4
36 files changed, 228 insertions, 245 deletions
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/DuplicateDetetionTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/DuplicateDetetionTest.java
index fd36c7e78..1e4ed64dd 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/DuplicateDetetionTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/DuplicateDetetionTest.java
@@ -17,7 +17,6 @@ import org.eclipse.mylyn.internal.bugzilla.core.BugzillaAttributeFactory;
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin;
import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants;
import org.eclipse.mylyn.internal.bugzilla.ui.editor.NewBugzillaTaskEditor;
-import org.eclipse.mylyn.internal.tasks.ui.TaskListPreferenceConstants;
import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
import org.eclipse.mylyn.tasks.core.Task;
import org.eclipse.mylyn.tasks.core.TaskRepository;
@@ -53,7 +52,7 @@ public class DuplicateDetetionTest extends TestCase {
model.setNew(true);
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
NewTaskEditorInput input = new NewTaskEditorInput(repository, model);
- TasksUiUtil.openEditor(input, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
+ TasksUiUtil.openEditor(input, TaskEditor.ID_EDITOR, page);
TaskEditor taskEditor = (TaskEditor) page.getActiveEditor();
NewBugzillaTaskEditor editor = (NewBugzillaTaskEditor) taskEditor.getActivePageInstance();
@@ -71,7 +70,7 @@ public class DuplicateDetetionTest extends TestCase {
model.setNew(true);
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
NewTaskEditorInput input = new NewTaskEditorInput(repository, model);
- TasksUiUtil.openEditor(input, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
+ TasksUiUtil.openEditor(input, TaskEditor.ID_EDITOR, page);
TaskEditor taskEditor = (TaskEditor) page.getActiveEditor();
NewBugzillaTaskEditor editor = (NewBugzillaTaskEditor) taskEditor.getActivePageInstance();
@@ -93,7 +92,7 @@ public class DuplicateDetetionTest extends TestCase {
model.setNew(true);
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
NewTaskEditorInput input = new NewTaskEditorInput(repository, model);
- TasksUiUtil.openEditor(input, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
+ TasksUiUtil.openEditor(input, TaskEditor.ID_EDITOR, page);
TaskEditor taskEditor = (TaskEditor) page.getActiveEditor();
NewBugzillaTaskEditor editor = (NewBugzillaTaskEditor) taskEditor.getActivePageInstance();
@@ -123,7 +122,7 @@ public class DuplicateDetetionTest extends TestCase {
model.setNew(true);
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
NewTaskEditorInput input = new NewTaskEditorInput(repository, model);
- TasksUiUtil.openEditor(input, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
+ TasksUiUtil.openEditor(input, TaskEditor.ID_EDITOR, page);
TaskEditor taskEditor = (TaskEditor) page.getActiveEditor();
NewBugzillaTaskEditor editor = (NewBugzillaTaskEditor) taskEditor.getActivePageInstance();
@@ -152,7 +151,7 @@ public class DuplicateDetetionTest extends TestCase {
model.setNew(true);
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
NewTaskEditorInput input = new NewTaskEditorInput(repository, model);
- TasksUiUtil.openEditor(input, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
+ TasksUiUtil.openEditor(input, TaskEditor.ID_EDITOR, page);
TaskEditor taskEditor = (TaskEditor) page.getActiveEditor();
NewBugzillaTaskEditor editor = (NewBugzillaTaskEditor) taskEditor.getActivePageInstance();
@@ -177,7 +176,7 @@ public class DuplicateDetetionTest extends TestCase {
model.setNew(true);
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
NewTaskEditorInput input = new NewTaskEditorInput(repository, model);
- TasksUiUtil.openEditor(input, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
+ TasksUiUtil.openEditor(input, TaskEditor.ID_EDITOR, page);
TaskEditor taskEditor = (TaskEditor) page.getActiveEditor();
NewBugzillaTaskEditor editor = (NewBugzillaTaskEditor) taskEditor.getActivePageInstance();
@@ -201,7 +200,7 @@ public class DuplicateDetetionTest extends TestCase {
model.setNew(true);
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
NewTaskEditorInput input = new NewTaskEditorInput(repository, model);
- TasksUiUtil.openEditor(input, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
+ TasksUiUtil.openEditor(input, TaskEditor.ID_EDITOR, page);
TaskEditor taskEditor = (TaskEditor) page.getActiveEditor();
NewBugzillaTaskEditor editor = (NewBugzillaTaskEditor) taskEditor.getActivePageInstance();
@@ -227,7 +226,7 @@ public class DuplicateDetetionTest extends TestCase {
model.setNew(true);
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
NewTaskEditorInput input = new NewTaskEditorInput(repository, model);
- TasksUiUtil.openEditor(input, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
+ TasksUiUtil.openEditor(input, TaskEditor.ID_EDITOR, page);
TaskEditor taskEditor = (TaskEditor) page.getActiveEditor();
NewBugzillaTaskEditor editor = (NewBugzillaTaskEditor) taskEditor.getActivePageInstance();
@@ -252,7 +251,7 @@ public class DuplicateDetetionTest extends TestCase {
model.setNew(true);
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
NewTaskEditorInput input = new NewTaskEditorInput(repository, model);
- TasksUiUtil.openEditor(input, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
+ TasksUiUtil.openEditor(input, TaskEditor.ID_EDITOR, page);
TaskEditor taskEditor = (TaskEditor) page.getActiveEditor();
NewBugzillaTaskEditor editor = (NewBugzillaTaskEditor) taskEditor.getActivePageInstance();
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskEditorTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskEditorTest.java
index 5b95d7f22..f3656cb67 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskEditorTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskEditorTest.java
@@ -14,7 +14,6 @@ import org.eclipse.mylyn.internal.bugzilla.core.BugzillaAttributeFactory;
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin;
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaRepositoryConnector;
import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants;
-import org.eclipse.mylyn.internal.tasks.ui.TaskListPreferenceConstants;
import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
import org.eclipse.mylyn.tasks.core.Task;
import org.eclipse.mylyn.tasks.core.TaskRepository;
@@ -65,7 +64,7 @@ public class TaskEditorTest extends TestCase {
BugzillaRepositoryConnector.setupNewBugAttributes(repository, model);
NewTaskEditorInput editorInput = new NewTaskEditorInput(repository, model);
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- TasksUiUtil.openEditor(editorInput, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
+ TasksUiUtil.openEditor(editorInput, TaskEditor.ID_EDITOR, page);
assertTrue(page.getActiveEditor() instanceof TaskEditor);
TaskEditor taskEditor = (TaskEditor) page.getActiveEditor();
assertTrue(taskEditor.getActivePageInstance() instanceof AbstractRepositoryTaskEditor);
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/NewBugzillaTaskWizard.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/NewBugzillaTaskWizard.java
index 6404ee155..26efac534 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/NewBugzillaTaskWizard.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/NewBugzillaTaskWizard.java
@@ -17,13 +17,13 @@ import org.eclipse.jface.wizard.Wizard;
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaAttributeFactory;
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin;
import org.eclipse.mylyn.internal.bugzilla.ui.BugzillaUiPlugin;
-import org.eclipse.mylyn.internal.tasks.ui.TaskListPreferenceConstants;
import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
import org.eclipse.mylyn.tasks.core.Task;
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.NewTaskEditorInput;
+import org.eclipse.mylyn.tasks.ui.editors.TaskEditor;
import org.eclipse.ui.INewWizard;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPage;
@@ -93,7 +93,7 @@ public class NewBugzillaTaskWizard extends Wizard implements INewWizard {
productPage.saveDataToModel();
NewTaskEditorInput editorInput = new NewTaskEditorInput(repository, taskData);
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- TasksUiUtil.openEditor(editorInput, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
+ TasksUiUtil.openEditor(editorInput, TaskEditor.ID_EDITOR, page);
return true;
} catch (Exception e) {
productPage.applyToStatusLine(new Status(IStatus.ERROR, "not_used", 0,
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListBackupManagerTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListBackupManagerTest.java
index 2ffa44d41..a4be8eb4e 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListBackupManagerTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListBackupManagerTest.java
@@ -18,7 +18,7 @@ import java.lang.reflect.InvocationTargetException;
import junit.framework.TestCase;
import org.eclipse.mylyn.internal.tasks.ui.TaskListBackupManager;
-import org.eclipse.mylyn.internal.tasks.ui.TaskListPreferenceConstants;
+import org.eclipse.mylyn.internal.tasks.ui.TasksUiPreferenceConstants;
import org.eclipse.mylyn.tasks.core.Task;
import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
@@ -50,14 +50,14 @@ public class TaskListBackupManagerTest extends TestCase {
TaskListBackupManager backupManager = TasksUiPlugin.getDefault().getBackupManager();
// MylarTaskListPlugin.getMylarCorePrefs().setValue(TaskListPreferenceConstants.BACKUP_AUTOMATICALLY,
// false);
- TasksUiPlugin.getDefault().getPreferenceStore().setValue(TaskListPreferenceConstants.BACKUP_SCHEDULE, 1);
- TasksUiPlugin.getDefault().getPreferenceStore().setValue(TaskListPreferenceConstants.BACKUP_LAST, 0f);
+ TasksUiPlugin.getDefault().getPreferenceStore().setValue(TasksUiPreferenceConstants.BACKUP_SCHEDULE, 1);
+ TasksUiPlugin.getDefault().getPreferenceStore().setValue(TasksUiPreferenceConstants.BACKUP_LAST, 0f);
assertEquals(0, TasksUiPlugin.getDefault().getPreferenceStore()
- .getLong(TaskListPreferenceConstants.BACKUP_LAST));
+ .getLong(TasksUiPreferenceConstants.BACKUP_LAST));
backupManager.start(5);
Thread.sleep(3000);
assertEquals(0, TasksUiPlugin.getDefault().getPreferenceStore()
- .getLong(TaskListPreferenceConstants.BACKUP_LAST));
+ .getLong(TasksUiPreferenceConstants.BACKUP_LAST));
}
public void testAutoBackupEnabled() throws InterruptedException, InvocationTargetException, IOException {
@@ -70,18 +70,18 @@ public class TaskListBackupManagerTest extends TestCase {
deleteBackupFolder(backupFileFolder);
// MylarTaskListPlugin.getMylarCorePrefs().setValue(TaskListPreferenceConstants.BACKUP_FOLDER,
// backupFolder);
- TasksUiPlugin.getDefault().getPreferenceStore().setValue(TaskListPreferenceConstants.BACKUP_SCHEDULE, 1);
- TasksUiPlugin.getDefault().getPreferenceStore().setValue(TaskListPreferenceConstants.BACKUP_LAST, 0f);
+ TasksUiPlugin.getDefault().getPreferenceStore().setValue(TasksUiPreferenceConstants.BACKUP_SCHEDULE, 1);
+ TasksUiPlugin.getDefault().getPreferenceStore().setValue(TasksUiPreferenceConstants.BACKUP_LAST, 0f);
// MylarTaskListPlugin.getMylarCorePrefs().setValue(TaskListPreferenceConstants.BACKUP_AUTOMATICALLY,
// true);
backupManager.backupNow(true);
- assertFalse(TasksUiPlugin.getDefault().getPreferenceStore().getLong(TaskListPreferenceConstants.BACKUP_LAST) == 0);
+ assertFalse(TasksUiPlugin.getDefault().getPreferenceStore().getLong(TasksUiPreferenceConstants.BACKUP_LAST) == 0);
assertTrue(backupFileFolder.exists());
assertTrue(backupFileFolder.isDirectory());
assertTrue(backupFileFolder.listFiles().length == 1);
// Test removal of old backups
- TasksUiPlugin.getDefault().getPreferenceStore().setValue(TaskListPreferenceConstants.BACKUP_MAXFILES, 0);
+ TasksUiPlugin.getDefault().getPreferenceStore().setValue(TasksUiPreferenceConstants.BACKUP_MAXFILES, 0);
backupManager.removeOldBackups(backupFileFolder);
assertEquals(0, backupFileFolder.listFiles().length);
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListContentProviderTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListContentProviderTest.java
index 9f5292c28..9d4c94b58 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListContentProviderTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListContentProviderTest.java
@@ -10,7 +10,7 @@ package org.eclipse.mylyn.tasks.tests;
import junit.framework.TestCase;
-import org.eclipse.mylyn.internal.tasks.ui.TaskListPreferenceConstants;
+import org.eclipse.mylyn.internal.tasks.ui.TasksUiPreferenceConstants;
import org.eclipse.mylyn.internal.tasks.ui.views.TaskListContentProvider;
import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView;
import org.eclipse.mylyn.tasks.core.Task;
@@ -34,7 +34,7 @@ public class TaskListContentProviderTest extends TestCase {
TaskListView.openInActivePerspective();
view = TaskListView.getFromActivePerspective();
provider = (TaskListContentProvider) view.getViewer().getContentProvider();
- TasksUiPlugin.getDefault().getPreferenceStore().setValue(TaskListPreferenceConstants.FILTER_SUBTASKS, false);
+ TasksUiPlugin.getDefault().getPreferenceStore().setValue(TasksUiPreferenceConstants.FILTER_SUBTASKS, false);
view.clearFilters(true);
view.addFilter(view.getCompleteFilter());
taskList = TasksUiPlugin.getTaskListManager().getTaskList();
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 3dfcc9343..6ca2e9410 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java
@@ -28,7 +28,7 @@ import junit.framework.TestCase;
import org.eclipse.mylyn.context.core.ContextCorePlugin;
import org.eclipse.mylyn.internal.tasks.core.RepositoryTaskHandleUtil;
import org.eclipse.mylyn.internal.tasks.ui.ScheduledTaskListSynchJob;
-import org.eclipse.mylyn.internal.tasks.ui.TaskListPreferenceConstants;
+import org.eclipse.mylyn.internal.tasks.ui.TasksUiPreferenceConstants;
import org.eclipse.mylyn.internal.tasks.ui.TaskListSynchronizationScheduler;
import org.eclipse.mylyn.internal.tasks.ui.actions.MarkTaskReadAction;
import org.eclipse.mylyn.internal.tasks.ui.actions.MarkTaskUnreadAction;
@@ -601,9 +601,9 @@ public class TaskListManagerTest extends TestCase {
int counter = 3;
ScheduledTaskListSynchJob.resetCount();
TasksUiPlugin.getDefault().getPreferenceStore().setValue(
- TaskListPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_ENABLED, true);
+ TasksUiPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_ENABLED, true);
TasksUiPlugin.getDefault().getPreferenceStore().setValue(
- TaskListPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_MILISECONDS, 1000L);
+ TasksUiPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_MILISECONDS, 1000L);
assertEquals(0, ScheduledTaskListSynchJob.getCount());
TaskListSynchronizationScheduler manager = new TaskListSynchronizationScheduler(false);
manager.startSynchJob();
@@ -612,7 +612,7 @@ public class TaskListManagerTest extends TestCase {
.getCount() >= counter);
manager.cancelAll();
TasksUiPlugin.getDefault().getPreferenceStore().setValue(
- TaskListPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_ENABLED, false);
+ TasksUiPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_ENABLED, false);
}
public void testgetQueriesAndHitsForHandle() {
diff --git a/org.eclipse.mylyn.tasks.ui/plugin.xml b/org.eclipse.mylyn.tasks.ui/plugin.xml
index 2c95f763f..b9f7af716 100644
--- a/org.eclipse.mylyn.tasks.ui/plugin.xml
+++ b/org.eclipse.mylyn.tasks.ui/plugin.xml
@@ -43,22 +43,22 @@
</extension>
<extension point="org.eclipse.ui.views">
- <category name="Mylar" id="org.eclipse.mylar"/>
+ <category name="Mylyn" id="org.eclipse.mylyn.ui"/>
</extension>
<extension
point="org.eclipse.ui.views">
<view
allowMultiple="true"
- category="org.eclipse.mylar"
+ category="org.eclipse.mylyn.ui"
class="org.eclipse.mylyn.internal.tasks.ui.views.TaskListView"
icon="icons/eview16/task-list.gif"
- id="org.eclipse.mylyn.tasks.ui.views.TaskListView"
+ id="org.eclipse.mylyn.tasks.ui.views.tasks"
name="Task List"/>
<view
- id="org.eclipse.mylyn.tasklist.repositories"
+ id="org.eclipse.mylyn.tasks.ui.views.repositories"
allowMultiple="false"
- category="org.eclipse.mylar"
+ category="org.eclipse.mylyn.ui"
class="org.eclipse.mylyn.internal.tasks.ui.views.TaskRepositoriesView"
icon="icons/eview16/repositories.gif"
name="Task Repositories">
@@ -66,7 +66,7 @@
</extension>
<extension point="org.eclipse.ui.newWizards">
- <category name="Mylar" id="org.eclipse.mylyn.wizards"/>
+ <category name="Mylyn" id="org.eclipse.mylyn.ui.wizards"/>
</extension>
<extension
@@ -77,7 +77,7 @@
<!--
<extension
id="org.eclipse.mylyn.helpDocs"
- name="Mylar Help"
+ name="Mylyn Help"
point="org.eclipse.help.toc">
<toc
file="doc/toc.xml"
@@ -89,7 +89,7 @@
point="org.eclipse.ui.elementFactories">
<factory
class="org.eclipse.mylyn.internal.tasks.ui.editors.TaskEditorInputFactory"
- id="org.eclipse.mylyn.internal.tasks.ui.editors.TaskEditorInputFactory">
+ id="org.eclipse.mylyn.tasks.ui.editors.TaskEditorInputFactory">
</factory>
</extension>
<extension point="org.eclipse.ui.newWizards">
@@ -99,7 +99,7 @@
class="org.eclipse.mylyn.internal.tasks.ui.wizards.NewLocalTaskWizard"
hasPages="false"
icon="icons/etool16/task-new.gif"
- id="org.eclipse.mylyn.tasks.ui.wizard.new.task"
+ id="org.eclipse.mylyn.tasks.ui.wizards.new.task"
name="Task"/>
<wizard
canFinishEarly="true"
@@ -107,26 +107,26 @@
class="org.eclipse.mylyn.internal.tasks.ui.wizards.NewLocalCategoryWizard"
hasPages="false"
icon="icons/etool16/category-new.gif"
- id="org.eclipse.mylyn.tasks.ui.wizard.new.category"
+ id="org.eclipse.mylyn.tasks.ui.wizards.new.category"
name="Category">
</wizard>
<wizard
category="org.eclipse.mylyn.wizards"
class="org.eclipse.mylyn.internal.tasks.ui.wizards.NewRepositoryTaskWizard"
icon="icons/etool16/task-repository-new.gif"
- id="org.eclipse.mylyn.tasks.ui.wizard.new.repository.task"
+ id="org.eclipse.mylyn.tasks.ui.wizards.new.repository.task"
name="Repository Task"/>
<wizard
category="org.eclipse.mylyn.wizards"
class="org.eclipse.mylyn.internal.tasks.ui.wizards.NewQueryWizard"
icon="icons/etool16/query-new.gif"
- id="org.eclipse.mylyn.tasks.ui.wizard.new.query"
+ id="org.eclipse.mylyn.tasks.ui.wizards.new.query"
name="Query"/>
<wizard
category="org.eclipse.mylyn.wizards"
class="org.eclipse.mylyn.internal.tasks.ui.planner.TaskActivityWizard"
icon="icons/eview16/task-list.gif"
- id="org.eclipse.mylyn.tasks.ui.activity.report"
+ id="org.eclipse.mylyn.tasks.ui.wizards.activity.report"
name="Task Activity Report">
</wizard>
</extension>
@@ -134,41 +134,41 @@
<extension
point="org.eclipse.ui.importWizards">
<wizard
- category="org.eclipse.mylyn.tasklist.importcategory"
+ category="org.eclipse.mylyn.tasks.ui.wizards.import.category"
class="org.eclipse.mylyn.internal.tasks.ui.wizards.TaskDataImportWizard"
icon="icons/eview16/task-list.gif"
- id="org.eclipse.mylyn.tasklist.ui.importWizard"
+ id="org.eclipse.mylyn.tasks.ui.wizards.import"
name="Task List">
<description>
Import task data files from file system.
</description>
</wizard>
<category
- id="org.eclipse.mylyn.tasklist.importcategory"
- name="Mylar"/>
+ id="org.eclipse.mylyn.tasks.ui.wizards.import.category"
+ name="Mylyn"/>
</extension>
<extension point="org.eclipse.ui.exportWizards">
<wizard
- category="org.eclipse.mylyn.tasklist.exportcategory"
+ category="org.eclipse.mylyn.tasks.ui.wizards.export.category"
class="org.eclipse.mylyn.internal.tasks.ui.wizards.TaskDataExportWizard"
icon="icons/eview16/task-list.gif"
- id="org.eclipse.mylyn.tasklist.ui.exportWizard"
+ id="org.eclipse.mylyn.tasks.ui.wizards.export"
name="Task Data">
<description>
Export Task List data files to the file system.
</description>
</wizard>
<category
- id="org.eclipse.mylyn.tasklist.exportcategory"
- name="Mylar"/>
+ id="org.eclipse.mylyn.tasks.ui.wizards.export.category"
+ name="Mylyn"/>
</extension>
<extension point="org.eclipse.ui.decorators">
<decorator
class="org.eclipse.mylyn.internal.tasks.ui.TaskLabelDecorator"
- id="org.eclipse.mylyn.tasklist.ui.decorator.repositories"
- label="Mylar Task Decorator"
+ id="org.eclipse.mylyn.tasks.ui.decorators.task"
+ label="Mylyn Task Decorator"
lightweight="true"
state="true">
<description>
@@ -193,7 +193,7 @@
class="org.eclipse.mylyn.tasks.ui.editors.TaskEditor"
contributorClass="org.eclipse.mylyn.internal.tasks.ui.editors.TaskEditorActionContributor"
icon="icons/etool16/task.gif"
- id="org.eclipse.mylyn.tasklist.ui.taskEditor"
+ id="org.eclipse.mylyn.tasks.ui.editors.task"
name="Task Editor"/>
<editor
icon="icons/etool16/task.gif"
@@ -445,7 +445,7 @@
<extension point="org.eclipse.ui.preferencePages">
<page
- name="Mylar"
+ name="Mylyn"
class="org.eclipse.mylyn.internal.tasks.ui.preferences.MylarPreferencePage"
id="org.eclipse.mylyn.ui.preferences">
<keywordReference id="org.eclipse.mylyn.tasks.keywords"/>
@@ -462,22 +462,10 @@
<extension
point="org.eclipse.ui.keywords">
<keyword
- label="mylar tasks"
+ label="mylyn tasks"
id="org.eclipse.mylyn.tasks.keywords"/>
</extension>
-
-
-<!--
- <extension point="org.eclipse.ui.commands">
- <command
- name="Mylar Tasks"
- description="Open Mylar Tasks View"
- categoryId="org.eclipse.ui.category.views"
- id="org.eclipse.mylyn.tasklist.ui.views.TaskListView">
- </command>
- </extension>
- -->
<extension point="org.eclipse.ui.bindings">
<key
sequence="M2+M3+Q K"
@@ -802,14 +790,14 @@
<hyperlinkDetector
class="org.eclipse.mylyn.tasks.ui.editors.TaskHyperlinkDetector"
id="org.eclipse.mylyn.tasks.ui.taskhyperlinkdetector"
- name="Mylar Task"
+ name="Mylyn Tasks"
targetId="org.eclipse.ui.DefaultTextEditor">
</hyperlinkDetector>
<hyperlinkDetector
class="org.eclipse.mylyn.tasks.ui.editors.MylarUrlHyperlinkDetector"
- description="Mylar enabled URL hyperlink detector"
+ description="Mylyn enabled URL hyperlink detector"
id="org.eclipse.mylyn.tasks.ui.mylarurlhyperlink"
- name="Mylar URL"
+ name="Mylyn URLs"
targetId="org.eclipse.ui.DefaultTextEditor">
</hyperlinkDetector>
</extension>
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskCompletionFilter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskCompletionFilter.java
index fb1e4060c..262c30782 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskCompletionFilter.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskCompletionFilter.java
@@ -21,7 +21,7 @@ public class TaskCompletionFilter extends AbstractTaskListFilter {
@Override
public boolean select(Object parent, Object element) {
boolean exposeSubTasks = !TasksUiPlugin.getDefault().getPreferenceStore().getBoolean(
- TaskListPreferenceConstants.FILTER_SUBTASKS);
+ TasksUiPreferenceConstants.FILTER_SUBTASKS);
if (element instanceof ITask) {
ITask task = (ITask) element;
if (shouldAlwaysShow(parent, task, exposeSubTasks)) {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListBackupManager.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListBackupManager.java
index 7360d15fc..e58d1e34e 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListBackupManager.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListBackupManager.java
@@ -59,7 +59,7 @@ public class TaskListBackupManager implements IPropertyChangeListener {
// boolean enabled = MylarTaskListPlugin.getMylarCorePrefs().getBoolean(
// TaskListPreferenceConstants.BACKUP_AUTOMATICALLY);
// if (enabled) {
- int days = TasksUiPlugin.getDefault().getPreferenceStore().getInt(TaskListPreferenceConstants.BACKUP_SCHEDULE);
+ int days = TasksUiPlugin.getDefault().getPreferenceStore().getInt(TasksUiPreferenceConstants.BACKUP_SCHEDULE);
if (days > 0) {
start(MINUTE);
}
@@ -110,7 +110,7 @@ public class TaskListBackupManager implements IPropertyChangeListener {
IProgressService service = PlatformUI.getWorkbench().getProgressService();
try {
service.run(true, false, backupJob);
- TasksUiPlugin.getDefault().getPreferenceStore().setValue(TaskListPreferenceConstants.BACKUP_LAST,
+ TasksUiPlugin.getDefault().getPreferenceStore().setValue(TasksUiPreferenceConstants.BACKUP_LAST,
new Date().getTime());
} catch (InterruptedException e) {
// ignore
@@ -124,7 +124,7 @@ public class TaskListBackupManager implements IPropertyChangeListener {
/** public for testing purposes */
public void removeOldBackups(File folder) {
- int maxBackups = TasksUiPlugin.getDefault().getPreferenceStore().getInt(TaskListPreferenceConstants.BACKUP_MAXFILES);
+ int maxBackups = TasksUiPlugin.getDefault().getPreferenceStore().getInt(TasksUiPreferenceConstants.BACKUP_MAXFILES);
File[] files = folder.listFiles();
ArrayList<File> backupFiles = new ArrayList<File>();
@@ -194,8 +194,8 @@ public class TaskListBackupManager implements IPropertyChangeListener {
return;
} else {
long lastBackup = TasksUiPlugin.getDefault().getPreferenceStore().getLong(
- TaskListPreferenceConstants.BACKUP_LAST);
- int days = TasksUiPlugin.getDefault().getPreferenceStore().getInt(TaskListPreferenceConstants.BACKUP_SCHEDULE);
+ TasksUiPreferenceConstants.BACKUP_LAST);
+ int days = TasksUiPlugin.getDefault().getPreferenceStore().getInt(TasksUiPreferenceConstants.BACKUP_SCHEDULE);
long waitPeriod = days * DAY;
final long now = new Date().getTime();
@@ -224,7 +224,7 @@ public class TaskListBackupManager implements IPropertyChangeListener {
try {
if (Platform.isRunning()) {
backupJob.run(monitor);
- TasksUiPlugin.getDefault().getPreferenceStore().setValue(TaskListPreferenceConstants.BACKUP_LAST,
+ TasksUiPlugin.getDefault().getPreferenceStore().setValue(TasksUiPreferenceConstants.BACKUP_LAST,
new Date().getTime());
}
} catch (InvocationTargetException e) {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationManager.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationManager.java
index dc0a261bb..6a881f3b7 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationManager.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationManager.java
@@ -158,7 +158,7 @@ public class TaskListNotificationManager implements IPropertyChangeListener {
}
public void startNotification(long initialStartupTime) {
- if (TasksUiPlugin.getDefault().getPreferenceStore().getBoolean(TaskListPreferenceConstants.NOTIFICATIONS_ENABLED)) {
+ if (TasksUiPlugin.getDefault().getPreferenceStore().getBoolean(TasksUiPreferenceConstants.NOTIFICATIONS_ENABLED)) {
if (!openJob.cancel()) {
try {
openJob.join();
@@ -197,7 +197,7 @@ public class TaskListNotificationManager implements IPropertyChangeListener {
}
public void propertyChange(PropertyChangeEvent event) {
- if (event.getProperty().equals(TaskListPreferenceConstants.NOTIFICATIONS_ENABLED)) {
+ if (event.getProperty().equals(TasksUiPreferenceConstants.NOTIFICATIONS_ENABLED)) {
Object newValue = event.getNewValue();
if (!(newValue instanceof Boolean)) {
// default if no preference value
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListSynchronizationScheduler.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListSynchronizationScheduler.java
index 9339b9115..0200d6a47 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListSynchronizationScheduler.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListSynchronizationScheduler.java
@@ -42,7 +42,7 @@ public class TaskListSynchronizationScheduler implements IPropertyChangeListener
public TaskListSynchronizationScheduler(boolean refreshOnStartup) {
boolean enabled = TasksUiPlugin.getDefault().getPreferenceStore().getBoolean(
- TaskListPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_ENABLED);
+ TasksUiPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_ENABLED);
if (refreshOnStartup && enabled) {
addJobToQueue(new ScheduledTaskListSynchJob(DELAY_QUERY_REFRESH_ON_STARTUP, TasksUiPlugin
.getTaskListManager()));
@@ -64,10 +64,10 @@ public class TaskListSynchronizationScheduler implements IPropertyChangeListener
return;
}
boolean enabled = TasksUiPlugin.getDefault().getPreferenceStore().getBoolean(
- TaskListPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_ENABLED);
+ TasksUiPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_ENABLED);
if (enabled) {
long miliseconds = TasksUiPlugin.getDefault().getPreferenceStore().getLong(
- TaskListPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_MILISECONDS);
+ TasksUiPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_MILISECONDS);
refreshJob = new ScheduledTaskListSynchJob(miliseconds, TasksUiPlugin.getTaskListManager());
refreshJob.setRule(rule);
addJobToQueue(refreshJob);
@@ -102,8 +102,8 @@ public class TaskListSynchronizationScheduler implements IPropertyChangeListener
}
public void propertyChange(PropertyChangeEvent event) {
- if (event.getProperty().equals(TaskListPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_ENABLED)
- || event.getProperty().equals(TaskListPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_MILISECONDS)) {
+ if (event.getProperty().equals(TasksUiPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_ENABLED)
+ || event.getProperty().equals(TasksUiPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_MILISECONDS)) {
cancelAll();
startSynchJob();
}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskPriorityFilter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskPriorityFilter.java
index cd3cdf60d..6efe80d9b 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskPriorityFilter.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskPriorityFilter.java
@@ -37,7 +37,7 @@ public class TaskPriorityFilter extends AbstractTaskListFilter {
@Override
public boolean select(Object parent, Object element) {
boolean exposeSubTasks = !TasksUiPlugin.getDefault().getPreferenceStore().getBoolean(
- TaskListPreferenceConstants.FILTER_SUBTASKS);
+ TasksUiPreferenceConstants.FILTER_SUBTASKS);
if (element instanceof ITaskListElement) {
if (element instanceof ITask) {
ITask task = (ITask) element;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListPreferenceConstants.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPreferenceConstants.java
index b5c5362fa..857b0bae3 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListPreferenceConstants.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPreferenceConstants.java
@@ -14,60 +14,49 @@ package org.eclipse.mylyn.internal.tasks.ui;
/**
* @author Mik Kersten
*/
-public class TaskListPreferenceConstants {
+@Deprecated
+public final class TasksUiPreferenceConstants {
- public static final String PLANNER_WIZARD_ID = "org.eclipse.mylyn.tasklist.ui.planner.wizard";
-
- public static final String PLANNER_EDITOR_ID = "org.eclipse.mylyn.tasklist.ui.planner.editor";
-
- public static final String REPORT_OPEN_EDITOR = "org.eclipse.mylyn.tasklist.report.open.editor";
-
- public static final String REPORT_OPEN_INTERNAL = "org.eclipse.mylyn.tasklist.report.open.internal";
+ public static final String ACTIVATE_ON_OPEN = "org.eclipse.mylyn.tasks.ui.activate.onopen";
- public static final String REPORT_DISABLE_INTERNAL = "org.eclipse.mylyn.tasklist.report.disable.internal";
+ public static final String BACKUP_LAST = "org.eclipse.mylyn.tasks.ui.backup.last";
- public static final String REPORT_OPEN_EXTERNAL = "org.eclipse.mylyn.tasklist.report.open.external";
+ public static final String BACKUP_MAXFILES = "org.eclipse.mylyn.tasks.ui.backup.maxfiles";
- public static final String MULTIPLE_ACTIVE_TASKS = "org.eclipse.mylyn.tasklist.active.multipe";
+ public static final String BACKUP_SCHEDULE = "org.eclipse.mylyn.tasks.ui.backup.schedule";
- public static final String COPY_TASK_DATA = "org.eclipse.mylyn.tasklist.preferences.copyTaskData";
+ public static final String FILTER_ARCHIVE_MODE = "org.eclipse.mylyn.tasks.ui.filters.archive";
- public static final String TASK_EDITOR_ID = "org.eclipse.mylyn.tasklist.ui.taskEditor";
+ public static final String FILTER_COMPLETE_MODE = "org.eclipse.mylyn.tasks.ui.filters.complete";
- public static final String CATEGORY_EDITOR_ID = "org.eclipse.mylyn.tasklist.ui.catEditor";
-
- public static final String SELECTED_PRIORITY = "org.eclipse.mylyn.tasklist.filter.priority";
+ public static final String FILTER_PRIORITY = "org.eclipse.mylyn.tasks.ui.filters.priority";
- public static final String FILTER_SUBTASKS = "org.eclipse.mylyn.tasklist.filter.subtasks";
-
- public static final String FILTER_COMPLETE_MODE = "org.eclipse.mylyn.tasklist.filter.complete";
+ public static final String FILTER_SUBTASKS = "org.eclipse.mylyn.tasks.ui.filters.subtasks";
- public static final String FILTER_ARCHIVE_MODE = "org.eclipse.mylyn.tasklist.filter.archive";
-
- public static final String FILTER_INCOMPLETE_MODE = "org.eclipse.mylyn.tasklist.filter.incomplete";
+ public static final String INCOMING_OVERLAID = "org.eclipse.mylyn.tasks.ui.incoming.overlaid";
- public static final String SAVE_TASKLIST_MODE = "org.eclipse.mylyn.tasklist.save.mode";
+ public static final String MULTIPLE_ACTIVE_TASKS = "org.eclipse.mylyn.tasks.ui.activation.multipe";
- public static final String PREVIOUS_SAVE_DATE = "org.eclipse.mylyn.tasklist.save.last";
+ public static final String NOTIFICATIONS_ENABLED = "org.eclipse.mylyn.tasks.ui.notifications.enabled";
- public static final String REPOSITORY_SYNCH_SCHEDULE_ENABLED = "org.eclipse.mylyn.tasklist.repositories.synch.schedule";
+ public static final String PLANNER_WIZARD_ID = "org.eclipse.mylyn.tasks.ui.planning.wizard";
- public static final String REPOSITORY_SYNCH_SCHEDULE_MILISECONDS = "org.eclipse.mylyn.tasklist.repositories.synch.schedule.miliseconds";
+ public static final String PLANNING_ENDHOUR = "org.eclipse.mylyn.tasks.ui.planning.end.hour";
- public static final String NOTIFICATIONS_ENABLED = "org.eclipse.mylyn.tasklist.notifications.enabled";
+ public static final String PLANNING_STARTHOUR = "org.eclipse.mylyn.tasks.ui.planning.start.hour";
- public static final String INCOMING_OVERLAID = "org.eclipse.mylyn.tasks.ui.incoming.overlaid";
+ public static final String REPORT_DISABLE_INTERNAL = "org.eclipse.mylyn.tasks.ui.reporting.disable.internal";
- public static final String BACKUP_SCHEDULE = "org.eclipse.mylyn.tasklist.backup.schedule";
+ public static final String REPORT_OPEN_EDITOR = "org.eclipse.mylyn.tasks.ui.reporting.open.editor";
- public static final String BACKUP_LAST = "org.eclipse.mylyn.tasklist.backup.lastarchived";
+ public static final String REPORT_OPEN_EXTERNAL = "org.eclipse.mylyn.tasks.ui.reporting.open.external";
- public static final String BACKUP_MAXFILES = "org.eclipse.mylyn.tasklist.backup.maxfiles";
+ public static final String REPORT_OPEN_INTERNAL = "org.eclipse.mylyn.tasks.ui.reporting.open.internal";
- public static final String PLANNING_STARTHOUR = "org.eclipse.mylyn.tasklist.planning.starthour";
+ public static final String REPOSITORY_SYNCH_SCHEDULE_ENABLED = "org.eclipse.mylyn.tasks.ui.repositories.synch.schedule";
- public static final String PLANNING_ENDHOUR = "org.eclipse.mylyn.tasklist.planning.endhour";
+ public static final String REPOSITORY_SYNCH_SCHEDULE_MILISECONDS = "org.eclipse.mylyn.tasks.ui.repositories.synch.schedule.miliseconds";
- public static final String ACTIVATE_ON_OPEN = "org.eclipse.mylyn.tasks.ui.activate.onopen";
+ public static final String SAVE_TASKLIST_MODE = "org.eclipse.mylyn.tasks.ui.save.mode";
}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/FilterArchiveContainerAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/FilterArchiveContainerAction.java
index 4927db8ab..422e6f708 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/FilterArchiveContainerAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/FilterArchiveContainerAction.java
@@ -13,7 +13,7 @@ package org.eclipse.mylyn.internal.tasks.ui.actions;
import org.eclipse.jface.action.Action;
import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
-import org.eclipse.mylyn.internal.tasks.ui.TaskListPreferenceConstants;
+import org.eclipse.mylyn.internal.tasks.ui.TasksUiPreferenceConstants;
import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView;
import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
@@ -34,12 +34,12 @@ public class FilterArchiveContainerAction extends Action {
setToolTipText(LABEL);
setId(ID);
setImageDescriptor(TasksUiImages.FILTER_ARCHIVE);
- setChecked(TasksUiPlugin.getDefault().getPreferenceStore().contains(TaskListPreferenceConstants.FILTER_ARCHIVE_MODE));
+ setChecked(TasksUiPlugin.getDefault().getPreferenceStore().contains(TasksUiPreferenceConstants.FILTER_ARCHIVE_MODE));
}
@Override
public void run() {
- TasksUiPlugin.getDefault().getPreferenceStore().setValue(TaskListPreferenceConstants.FILTER_ARCHIVE_MODE, isChecked());
+ TasksUiPlugin.getDefault().getPreferenceStore().setValue(TasksUiPreferenceConstants.FILTER_ARCHIVE_MODE, isChecked());
if (isChecked()) {
view.addFilter(view.getArchiveFilter());
} else {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/FilterCompletedTasksAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/FilterCompletedTasksAction.java
index 6575b5cc5..9a971a981 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/FilterCompletedTasksAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/FilterCompletedTasksAction.java
@@ -13,7 +13,7 @@ package org.eclipse.mylyn.internal.tasks.ui.actions;
import org.eclipse.jface.action.Action;
import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
-import org.eclipse.mylyn.internal.tasks.ui.TaskListPreferenceConstants;
+import org.eclipse.mylyn.internal.tasks.ui.TasksUiPreferenceConstants;
import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView;
import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
@@ -34,12 +34,12 @@ public class FilterCompletedTasksAction extends Action {
setToolTipText(LABEL);
setId(ID);
setImageDescriptor(TasksUiImages.FILTER_COMPLETE);
- setChecked(TasksUiPlugin.getDefault().getPreferenceStore().contains(TaskListPreferenceConstants.FILTER_COMPLETE_MODE));
+ setChecked(TasksUiPlugin.getDefault().getPreferenceStore().contains(TasksUiPreferenceConstants.FILTER_COMPLETE_MODE));
}
@Override
public void run() {
- TasksUiPlugin.getDefault().getPreferenceStore().setValue(TaskListPreferenceConstants.FILTER_COMPLETE_MODE, isChecked());
+ TasksUiPlugin.getDefault().getPreferenceStore().setValue(TasksUiPreferenceConstants.FILTER_COMPLETE_MODE, isChecked());
if (isChecked()) {
view.addFilter(view.getCompleteFilter());
} else {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/FilterSubTasksAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/FilterSubTasksAction.java
index 7ec6c29a9..3433e12cb 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/FilterSubTasksAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/FilterSubTasksAction.java
@@ -12,7 +12,7 @@
package org.eclipse.mylyn.internal.tasks.ui.actions;
import org.eclipse.jface.action.Action;
-import org.eclipse.mylyn.internal.tasks.ui.TaskListPreferenceConstants;
+import org.eclipse.mylyn.internal.tasks.ui.TasksUiPreferenceConstants;
import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView;
import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
@@ -34,12 +34,12 @@ public class FilterSubTasksAction extends Action {
setId(ID);
// setImageDescriptor(TasksUiImages.FILTER_COMPLETE);
setChecked(TasksUiPlugin.getDefault().getPreferenceStore().getBoolean(
- TaskListPreferenceConstants.FILTER_SUBTASKS));
+ TasksUiPreferenceConstants.FILTER_SUBTASKS));
}
@Override
public void run() {
- TasksUiPlugin.getDefault().getPreferenceStore().setValue(TaskListPreferenceConstants.FILTER_SUBTASKS,
+ TasksUiPlugin.getDefault().getPreferenceStore().setValue(TasksUiPreferenceConstants.FILTER_SUBTASKS,
isChecked());
// TODO: refresh not getting rid of subtasks
try {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewLocalTaskAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewLocalTaskAction.java
index b75d343c8..a3c275ba4 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewLocalTaskAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewLocalTaskAction.java
@@ -20,7 +20,7 @@ import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.mylyn.internal.tasks.ui.ITasksUiConstants;
-import org.eclipse.mylyn.internal.tasks.ui.TaskListPreferenceConstants;
+import org.eclipse.mylyn.internal.tasks.ui.TasksUiPreferenceConstants;
import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
import org.eclipse.mylyn.internal.tasks.ui.views.TaskInputDialog;
import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView;
@@ -111,7 +111,7 @@ public class NewLocalTaskAction extends Action implements IViewActionDelegate {
Calendar newTaskSchedule = Calendar.getInstance();
int scheduledEndHour = TasksUiPlugin.getDefault().getPreferenceStore().getInt(
- TaskListPreferenceConstants.PLANNING_ENDHOUR);
+ TasksUiPreferenceConstants.PLANNING_ENDHOUR);
// If past scheduledEndHour set for following day
if (newTaskSchedule.get(Calendar.HOUR_OF_DAY) >= scheduledEndHour) {
TasksUiPlugin.getTaskListManager().setSecheduledIn(newTaskSchedule, 1);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/SynchronizeAutomaticallyAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/SynchronizeAutomaticallyAction.java
index 4a7415ce8..511ea155a 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/SynchronizeAutomaticallyAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/SynchronizeAutomaticallyAction.java
@@ -9,7 +9,7 @@
package org.eclipse.mylyn.internal.tasks.ui.actions;
import org.eclipse.jface.action.Action;
-import org.eclipse.mylyn.internal.tasks.ui.TaskListPreferenceConstants;
+import org.eclipse.mylyn.internal.tasks.ui.TasksUiPreferenceConstants;
import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
/**
@@ -25,12 +25,12 @@ public class SynchronizeAutomaticallyAction extends Action {
setText(LABEL);
setToolTipText(LABEL);
setId(ID);
- setChecked(TasksUiPlugin.getDefault().getPreferenceStore().getBoolean(TaskListPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_ENABLED));
+ setChecked(TasksUiPlugin.getDefault().getPreferenceStore().getBoolean(TasksUiPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_ENABLED));
}
@Override
public void run() {
- TasksUiPlugin.getDefault().getPreferenceStore().setValue(TaskListPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_ENABLED,
+ TasksUiPlugin.getDefault().getPreferenceStore().setValue(TasksUiPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_ENABLED,
isChecked());
}
}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/CategoryEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/CategoryEditor.java
index 9512ca468..1f272e9a1 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/CategoryEditor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/CategoryEditor.java
@@ -34,7 +34,10 @@ import org.eclipse.ui.part.EditorPart;
*/
public class CategoryEditor extends EditorPart {
+ public static final String ID_EDITOR = "org.eclipse.mylyn.tasks.ui.editors.category";
+
private Text url;
+
private CategoryEditorInput input = null;
private boolean isDirty = false;
@@ -94,7 +97,7 @@ public class CategoryEditor extends EditorPart {
summarySection.setText("Category Summary");
summarySection.setLayout(new TableWrapLayout());
summarySection.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
-
+
Composite summaryContainer = toolkit.createComposite(summarySection);
summarySection.setClient(summaryContainer);
TableWrapLayout layout = new TableWrapLayout();
@@ -119,7 +122,7 @@ public class CategoryEditor extends EditorPart {
url = toolkit.createText(summaryContainer, input.getUrl(), SWT.FLAT);
url.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP));
url.addModifyListener(modifyListener);
-
+
toolkit.paintBordersFor(summaryContainer);
}
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 c05f108db..08daffd1c 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
@@ -78,12 +78,12 @@ import org.eclipse.ui.forms.widgets.Section;
*/
public class TaskPlanningEditor extends TaskFormPage {
+ public static final String ID_EDITOR = "org.eclipse.mylyn.tasks.ui.editors.planning";
+
private static final String CLEAR = "Clear";
private static final String LABEL_DUE = "Due:";
- public static final String PLANNING_EDITOR_ID = "org.eclipse.mylyn.editors.planning";
-
private static final String LABEL_SCHEDULE = "Scheduled for:";
private static final String DESCRIPTION_ESTIMATED = "Time that the task has been actively worked on in Eclipse.\n Inactivity timeout is "
@@ -182,8 +182,10 @@ public class TaskPlanningEditor extends TaskFormPage {
private FormToolkit toolkit;
+ public static final String ID_EDITOR_PLANNING = "org.eclipse.mylyn.tasks.ui.planning.editor";
+
public TaskPlanningEditor(FormEditor editor) {
- super(editor, PLANNING_EDITOR_ID, "Planning");
+ super(editor, ID_EDITOR, "Planning");
TasksUiPlugin.getTaskListManager().getTaskList().addChangeListener(TASK_LIST_LISTENER);
}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityWizard.java
index 2a9640d66..69ed2598f 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityWizard.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityWizard.java
@@ -14,7 +14,7 @@ package org.eclipse.mylyn.internal.tasks.ui.planner;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.mylyn.core.MylarStatusHandler;
-import org.eclipse.mylyn.internal.tasks.ui.TaskListPreferenceConstants;
+import org.eclipse.mylyn.internal.tasks.ui.editors.TaskPlanningEditor;
import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.INewWizard;
@@ -47,7 +47,7 @@ public class TaskActivityWizard extends Wizard implements INewWizard {
return false;
IEditorInput input = new TaskActivityEditorInput(planningGamePage.getReportStartDate(), planningGamePage
.getSelectedFilters(), TasksUiPlugin.getTaskListManager().getTaskList());
- page.openEditor(input, TaskListPreferenceConstants.PLANNER_EDITOR_ID);
+ page.openEditor(input, TaskPlanningEditor.ID_EDITOR_PLANNING);
} catch (PartInitException ex) {
MylarStatusHandler.log(ex, "couldn't open summary editor");
}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/preferences/TasksPreferencePage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/preferences/TasksPreferencePage.java
index 3cdd8f7bb..d09ed2b31 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/preferences/TasksPreferencePage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/preferences/TasksPreferencePage.java
@@ -17,7 +17,7 @@ import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.preference.PreferencePage;
import org.eclipse.mylyn.internal.tasks.ui.ITasksUiConstants;
-import org.eclipse.mylyn.internal.tasks.ui.TaskListPreferenceConstants;
+import org.eclipse.mylyn.internal.tasks.ui.TasksUiPreferenceConstants;
import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView;
import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
import org.eclipse.swt.SWT;
@@ -150,29 +150,29 @@ public class TasksPreferencePage extends PreferencePage implements IWorkbenchPre
// shouldn't get here
}
}
- getPreferenceStore().setValue(TaskListPreferenceConstants.NOTIFICATIONS_ENABLED,
+ getPreferenceStore().setValue(TasksUiPreferenceConstants.NOTIFICATIONS_ENABLED,
notificationEnabledButton.getSelection());
- getPreferenceStore().setValue(TaskListPreferenceConstants.BACKUP_SCHEDULE, backupScheduleTimeText.getText());
+ getPreferenceStore().setValue(TasksUiPreferenceConstants.BACKUP_SCHEDULE, backupScheduleTimeText.getText());
- getPreferenceStore().setValue(TaskListPreferenceConstants.REPORT_OPEN_EDITOR, reportEditor.getSelection());
- getPreferenceStore().setValue(TaskListPreferenceConstants.REPORT_OPEN_INTERNAL, reportInternal.getSelection());
- getPreferenceStore().setValue(TaskListPreferenceConstants.REPORT_DISABLE_INTERNAL,
+ getPreferenceStore().setValue(TasksUiPreferenceConstants.REPORT_OPEN_EDITOR, reportEditor.getSelection());
+ getPreferenceStore().setValue(TasksUiPreferenceConstants.REPORT_OPEN_INTERNAL, reportInternal.getSelection());
+ getPreferenceStore().setValue(TasksUiPreferenceConstants.REPORT_DISABLE_INTERNAL,
disableInternal.getSelection());
- getPreferenceStore().setValue(TaskListPreferenceConstants.ACTIVATE_ON_OPEN, activateOnOpen.getSelection());
+ getPreferenceStore().setValue(TasksUiPreferenceConstants.ACTIVATE_ON_OPEN, activateOnOpen.getSelection());
// getPreferenceStore().setValue(TaskListPreferenceConstants.REPOSITORY_SYNCH_ON_STARTUP,
// synchQueries.getSelection());
- getPreferenceStore().setValue(TaskListPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_ENABLED,
+ getPreferenceStore().setValue(TasksUiPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_ENABLED,
enableBackgroundSynch.getSelection());
long miliseconds = 60000 * Long.parseLong(synchScheduleTime.getText());
- getPreferenceStore().setValue(TaskListPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_MILISECONDS,
+ getPreferenceStore().setValue(TasksUiPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_MILISECONDS,
"" + miliseconds);
- getPreferenceStore().setValue(TaskListPreferenceConstants.PLANNING_STARTHOUR, hourDayStart.getSelection());
- getPreferenceStore().setValue(TaskListPreferenceConstants.PLANNING_ENDHOUR, hourDayEnd.getSelection());
+ getPreferenceStore().setValue(TasksUiPreferenceConstants.PLANNING_STARTHOUR, hourDayStart.getSelection());
+ getPreferenceStore().setValue(TasksUiPreferenceConstants.PLANNING_ENDHOUR, hourDayEnd.getSelection());
backupNow.setEnabled(true);
- getPreferenceStore().setValue(TaskListPreferenceConstants.INCOMING_OVERLAID,
+ getPreferenceStore().setValue(TasksUiPreferenceConstants.INCOMING_OVERLAID,
incomingOverlaysButton.getSelection());
TaskListView view = TaskListView.getFromActivePerspective();
if (view != null) {
@@ -186,23 +186,23 @@ public class TasksPreferencePage extends PreferencePage implements IWorkbenchPre
public boolean performCancel() {
taskDirectoryText.setText(TasksUiPlugin.getDefault().getDefaultDataDirectory());
notificationEnabledButton.setSelection(getPreferenceStore().getBoolean(
- TaskListPreferenceConstants.NOTIFICATIONS_ENABLED));
- backupScheduleTimeText.setText(getPreferenceStore().getString(TaskListPreferenceConstants.BACKUP_SCHEDULE));
+ TasksUiPreferenceConstants.NOTIFICATIONS_ENABLED));
+ backupScheduleTimeText.setText(getPreferenceStore().getString(TasksUiPreferenceConstants.BACKUP_SCHEDULE));
backupFolderText.setText(TasksUiPlugin.getDefault().getBackupFolderPath());
- reportEditor.setSelection(getPreferenceStore().getBoolean(TaskListPreferenceConstants.REPORT_OPEN_EDITOR));
- reportInternal.setSelection(getPreferenceStore().getBoolean(TaskListPreferenceConstants.REPORT_OPEN_INTERNAL));
+ reportEditor.setSelection(getPreferenceStore().getBoolean(TasksUiPreferenceConstants.REPORT_OPEN_EDITOR));
+ reportInternal.setSelection(getPreferenceStore().getBoolean(TasksUiPreferenceConstants.REPORT_OPEN_INTERNAL));
disableInternal.setSelection(getPreferenceStore().getBoolean(
- TaskListPreferenceConstants.REPORT_DISABLE_INTERNAL));
- activateOnOpen.setSelection(getPreferenceStore().getBoolean(TaskListPreferenceConstants.ACTIVATE_ON_OPEN));
+ TasksUiPreferenceConstants.REPORT_DISABLE_INTERNAL));
+ activateOnOpen.setSelection(getPreferenceStore().getBoolean(TasksUiPreferenceConstants.ACTIVATE_ON_OPEN));
// synchQueries.setSelection(getPreferenceStore().getBoolean(
// TaskListPreferenceConstants.REPOSITORY_SYNCH_ON_STARTUP));
enableBackgroundSynch.setSelection(getPreferenceStore().getBoolean(
- TaskListPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_ENABLED));
+ TasksUiPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_ENABLED));
synchScheduleTime.setText(getMinutesString());
- hourDayStart.setSelection(getPreferenceStore().getInt(TaskListPreferenceConstants.PLANNING_STARTHOUR));
- hourDayEnd.setSelection(getPreferenceStore().getInt(TaskListPreferenceConstants.PLANNING_ENDHOUR));
+ hourDayStart.setSelection(getPreferenceStore().getInt(TasksUiPreferenceConstants.PLANNING_STARTHOUR));
+ hourDayEnd.setSelection(getPreferenceStore().getInt(TasksUiPreferenceConstants.PLANNING_ENDHOUR));
backupNow.setEnabled(true);
return true;
}
@@ -227,30 +227,30 @@ public class TasksPreferencePage extends PreferencePage implements IWorkbenchPre
}
notificationEnabledButton.setSelection(getPreferenceStore().getDefaultBoolean(
- TaskListPreferenceConstants.NOTIFICATIONS_ENABLED));
+ TasksUiPreferenceConstants.NOTIFICATIONS_ENABLED));
backupScheduleTimeText.setText(getPreferenceStore().getDefaultString(
- TaskListPreferenceConstants.BACKUP_SCHEDULE));
+ TasksUiPreferenceConstants.BACKUP_SCHEDULE));
reportEditor.setSelection(getPreferenceStore()
- .getDefaultBoolean(TaskListPreferenceConstants.REPORT_OPEN_EDITOR));
+ .getDefaultBoolean(TasksUiPreferenceConstants.REPORT_OPEN_EDITOR));
reportInternal.setSelection(getPreferenceStore().getDefaultBoolean(
- TaskListPreferenceConstants.REPORT_OPEN_INTERNAL));
+ TasksUiPreferenceConstants.REPORT_OPEN_INTERNAL));
reportInternal.setSelection(getPreferenceStore().getDefaultBoolean(
- TaskListPreferenceConstants.REPORT_DISABLE_INTERNAL));
+ TasksUiPreferenceConstants.REPORT_DISABLE_INTERNAL));
// synchQueries.setSelection(getPreferenceStore().getDefaultBoolean(
// TaskListPreferenceConstants.REPOSITORY_SYNCH_ON_STARTUP));
enableBackgroundSynch.setSelection(getPreferenceStore().getDefaultBoolean(
- TaskListPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_ENABLED));
+ TasksUiPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_ENABLED));
// userRefreshOnly.setSelection(!enableBackgroundSynch.getSelection());
long miliseconds = getPreferenceStore().getDefaultLong(
- TaskListPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_MILISECONDS);
+ TasksUiPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_MILISECONDS);
long minutes = miliseconds / 60000;
synchScheduleTime.setText("" + minutes);
- hourDayStart.setSelection(getPreferenceStore().getDefaultInt(TaskListPreferenceConstants.PLANNING_STARTHOUR));
- hourDayEnd.setSelection(getPreferenceStore().getDefaultInt(TaskListPreferenceConstants.PLANNING_ENDHOUR));
+ hourDayStart.setSelection(getPreferenceStore().getDefaultInt(TasksUiPreferenceConstants.PLANNING_STARTHOUR));
+ hourDayEnd.setSelection(getPreferenceStore().getDefaultInt(TasksUiPreferenceConstants.PLANNING_ENDHOUR));
updateRefreshGroupEnablements();
}
@@ -269,7 +269,7 @@ public class TasksPreferencePage extends PreferencePage implements IWorkbenchPre
enableBackgroundSynch = new Button(enableSynch, SWT.CHECK);
enableBackgroundSynch.setText("Synchronize with repositories every");
enableBackgroundSynch.setSelection(getPreferenceStore().getBoolean(
- TaskListPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_ENABLED));
+ TasksUiPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_ENABLED));
enableBackgroundSynch.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
updateRefreshGroupEnablements();
@@ -294,7 +294,7 @@ public class TasksPreferencePage extends PreferencePage implements IWorkbenchPre
notificationEnabledButton = new Button(group, SWT.CHECK);
notificationEnabledButton.setText("Display notifications for overdue tasks and incoming changes");
notificationEnabledButton.setSelection(getPreferenceStore().getBoolean(
- TaskListPreferenceConstants.NOTIFICATIONS_ENABLED));
+ TasksUiPreferenceConstants.NOTIFICATIONS_ENABLED));
// synchQueries = new Button(group, SWT.CHECK);
// synchQueries.setText("Synchronize on startup");
@@ -311,21 +311,21 @@ public class TasksPreferencePage extends PreferencePage implements IWorkbenchPre
container.setText("Open Repository Tasks with");
reportEditor = new Button(container, SWT.RADIO);
reportEditor.setText("Editor if available (Recommended)");
- reportEditor.setSelection(getPreferenceStore().getBoolean(TaskListPreferenceConstants.REPORT_OPEN_EDITOR));
+ reportEditor.setSelection(getPreferenceStore().getBoolean(TasksUiPreferenceConstants.REPORT_OPEN_EDITOR));
reportInternal = new Button(container, SWT.RADIO);
reportInternal.setText("Internal browser");
- reportInternal.setSelection(getPreferenceStore().getBoolean(TaskListPreferenceConstants.REPORT_OPEN_INTERNAL));
+ reportInternal.setSelection(getPreferenceStore().getBoolean(TasksUiPreferenceConstants.REPORT_OPEN_INTERNAL));
disableInternal = new Button(container, SWT.CHECK);
disableInternal.setText("Disable internal browser");
disableInternal.setEnabled(!reportInternal.getSelection());
disableInternal.setSelection(getPreferenceStore().getBoolean(
- TaskListPreferenceConstants.REPORT_DISABLE_INTERNAL));
+ TasksUiPreferenceConstants.REPORT_DISABLE_INTERNAL));
activateOnOpen = new Button(container, SWT.CHECK);
activateOnOpen.setText("Active on double-click");
activateOnOpen.setEnabled(!reportInternal.getSelection());
- activateOnOpen.setSelection(getPreferenceStore().getBoolean(TaskListPreferenceConstants.ACTIVATE_ON_OPEN));
+ activateOnOpen.setSelection(getPreferenceStore().getBoolean(TasksUiPreferenceConstants.ACTIVATE_ON_OPEN));
reportInternal.addListener(SWT.Selection, new Listener() {
@@ -408,7 +408,7 @@ public class TasksPreferencePage extends PreferencePage implements IWorkbenchPre
gridData_1.widthHint = 13;
backupScheduleTimeText.setLayoutData(gridData_1);
- backupScheduleTimeText.setText("" + getPreferenceStore().getInt(TaskListPreferenceConstants.BACKUP_SCHEDULE));
+ backupScheduleTimeText.setText("" + getPreferenceStore().getInt(TasksUiPreferenceConstants.BACKUP_SCHEDULE));
backupScheduleTimeText.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
updateRefreshGroupEnablements();
@@ -445,7 +445,7 @@ public class TasksPreferencePage extends PreferencePage implements IWorkbenchPre
incomingOverlaysButton = new Button(group, SWT.CHECK);
incomingOverlaysButton.setText("Use Synchronize View style incoming overlays and placement");
incomingOverlaysButton.setSelection(getPreferenceStore().getBoolean(
- TaskListPreferenceConstants.INCOMING_OVERLAID));
+ TasksUiPreferenceConstants.INCOMING_OVERLAID));
}
private void createSchedulingGroup(Composite container) {
@@ -488,7 +488,7 @@ public class TasksPreferencePage extends PreferencePage implements IWorkbenchPre
hourDayStart.setIncrement(1);
hourDayStart.setMaximum(23);
hourDayStart.setMinimum(0);
- hourDayStart.setSelection(getPreferenceStore().getInt(TaskListPreferenceConstants.PLANNING_STARTHOUR));
+ hourDayStart.setSelection(getPreferenceStore().getInt(TasksUiPreferenceConstants.PLANNING_STARTHOUR));
hourDayStart.addSelectionListener(new SelectionAdapter() {
@Override
@@ -509,7 +509,7 @@ public class TasksPreferencePage extends PreferencePage implements IWorkbenchPre
hourDayEnd.setIncrement(1);
hourDayEnd.setMaximum(23);
hourDayEnd.setMinimum(0);
- hourDayEnd.setSelection(getPreferenceStore().getInt(TaskListPreferenceConstants.PLANNING_ENDHOUR));
+ hourDayEnd.setSelection(getPreferenceStore().getInt(TasksUiPreferenceConstants.PLANNING_ENDHOUR));
hourDayEnd.addSelectionListener(new SelectionAdapter() {
@Override
@@ -573,7 +573,7 @@ public class TasksPreferencePage extends PreferencePage implements IWorkbenchPre
private String getMinutesString() {
long miliseconds = getPreferenceStore().getLong(
- TaskListPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_MILISECONDS);
+ TasksUiPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_MILISECONDS);
long minutes = miliseconds / 60000;
return "" + minutes;
}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/CustomTaskListDecorationDrawer.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/CustomTaskListDecorationDrawer.java
index cc799193c..36d6dc536 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/CustomTaskListDecorationDrawer.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/CustomTaskListDecorationDrawer.java
@@ -11,7 +11,7 @@ package org.eclipse.mylyn.internal.tasks.ui.views;
import java.util.Arrays;
import org.eclipse.mylyn.context.core.ContextCorePlugin;
-import org.eclipse.mylyn.internal.tasks.ui.TaskListPreferenceConstants;
+import org.eclipse.mylyn.internal.tasks.ui.TasksUiPreferenceConstants;
import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
@@ -47,7 +47,7 @@ class CustomTaskListDecorationDrawer implements Listener {
this.taskListView = taskListView;
this.activationImageOffset = activationImageOffset;
this.taskListView.synchronizationOverlaid = TasksUiPlugin.getDefault().getPluginPreferences().getBoolean(
- TaskListPreferenceConstants.INCOMING_OVERLAID);
+ TasksUiPreferenceConstants.INCOMING_OVERLAID);
if (SWT.getPlatform().equals("gtk")) {
platformSpecificSquish = 8;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/PriorityDropDownAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/PriorityDropDownAction.java
index 65cdc2d71..fc8fa589a 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/PriorityDropDownAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/PriorityDropDownAction.java
@@ -12,7 +12,7 @@ import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.ActionContributionItem;
import org.eclipse.jface.action.IMenuCreator;
import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
-import org.eclipse.mylyn.internal.tasks.ui.TaskListPreferenceConstants;
+import org.eclipse.mylyn.internal.tasks.ui.TasksUiPreferenceConstants;
import org.eclipse.mylyn.tasks.core.Task;
import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
import org.eclipse.swt.widgets.Control;
@@ -81,7 +81,7 @@ class PriorityDropDownAction extends Action implements IMenuCreator {
@Override
public void run() {
TasksUiPlugin.getDefault().getPreferenceStore().setValue(
- TaskListPreferenceConstants.SELECTED_PRIORITY, Task.PriorityLevel.P1.toString());
+ TasksUiPreferenceConstants.FILTER_PRIORITY, Task.PriorityLevel.P1.toString());
PriorityDropDownAction.this.taskListView.displayPrioritiesAbove(TaskListView.PRIORITY_LEVELS[0]);
}
};
@@ -95,7 +95,7 @@ class PriorityDropDownAction extends Action implements IMenuCreator {
@Override
public void run() {
TasksUiPlugin.getDefault().getPreferenceStore().setValue(
- TaskListPreferenceConstants.SELECTED_PRIORITY, Task.PriorityLevel.P2.toString());
+ TasksUiPreferenceConstants.FILTER_PRIORITY, Task.PriorityLevel.P2.toString());
PriorityDropDownAction.this.taskListView.displayPrioritiesAbove(TaskListView.PRIORITY_LEVELS[1]);
}
};
@@ -109,7 +109,7 @@ class PriorityDropDownAction extends Action implements IMenuCreator {
@Override
public void run() {
TasksUiPlugin.getDefault().getPreferenceStore().setValue(
- TaskListPreferenceConstants.SELECTED_PRIORITY, Task.PriorityLevel.P3.toString());
+ TasksUiPreferenceConstants.FILTER_PRIORITY, Task.PriorityLevel.P3.toString());
PriorityDropDownAction.this.taskListView.displayPrioritiesAbove(TaskListView.PRIORITY_LEVELS[2]);
}
};
@@ -123,7 +123,7 @@ class PriorityDropDownAction extends Action implements IMenuCreator {
@Override
public void run() {
TasksUiPlugin.getDefault().getPreferenceStore().setValue(
- TaskListPreferenceConstants.SELECTED_PRIORITY, Task.PriorityLevel.P4.toString());
+ TasksUiPreferenceConstants.FILTER_PRIORITY, Task.PriorityLevel.P4.toString());
PriorityDropDownAction.this.taskListView.displayPrioritiesAbove(TaskListView.PRIORITY_LEVELS[3]);
}
};
@@ -137,7 +137,7 @@ class PriorityDropDownAction extends Action implements IMenuCreator {
@Override
public void run() {
TasksUiPlugin.getDefault().getPreferenceStore().setValue(
- TaskListPreferenceConstants.SELECTED_PRIORITY, Task.PriorityLevel.P5.toString());
+ TasksUiPreferenceConstants.FILTER_PRIORITY, Task.PriorityLevel.P5.toString());
PriorityDropDownAction.this.taskListView.displayPrioritiesAbove(TaskListView.PRIORITY_LEVELS[4]);
}
};
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListContentProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListContentProvider.java
index 189e6b709..c280abd1c 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListContentProvider.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListContentProvider.java
@@ -20,7 +20,7 @@ import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.mylyn.internal.tasks.ui.AbstractTaskListFilter;
-import org.eclipse.mylyn.internal.tasks.ui.TaskListPreferenceConstants;
+import org.eclipse.mylyn.internal.tasks.ui.TasksUiPreferenceConstants;
import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
@@ -96,7 +96,7 @@ public class TaskListContentProvider implements IStructuredContentProvider, ITre
private boolean taskHasUnfilteredChildren(ITask parent) {
boolean filterSubtasks = TasksUiPlugin.getDefault().getPreferenceStore().getBoolean(
- TaskListPreferenceConstants.FILTER_SUBTASKS);
+ TasksUiPreferenceConstants.FILTER_SUBTASKS);
if (filterSubtasks)
return false;
Set<ITask> children = parent.getChildren();
@@ -194,7 +194,7 @@ public class TaskListContentProvider implements IStructuredContentProvider, ITre
private boolean shouldAlwaysShow(Object parent, ITask task) {
for (AbstractTaskListFilter filter : this.view.getFilters()) {
if (filter.shouldAlwaysShow(parent, task, !TasksUiPlugin.getDefault().getPreferenceStore().getBoolean(
- TaskListPreferenceConstants.FILTER_SUBTASKS))) {
+ TasksUiPreferenceConstants.FILTER_SUBTASKS))) {
return true;
}
}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java
index 3965e3824..1c49a3e19 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java
@@ -56,7 +56,7 @@ import org.eclipse.mylyn.internal.tasks.ui.TaskArchiveFilter;
import org.eclipse.mylyn.internal.tasks.ui.TaskCompletionFilter;
import org.eclipse.mylyn.internal.tasks.ui.TaskListColorsAndFonts;
import org.eclipse.mylyn.internal.tasks.ui.TaskListPatternFilter;
-import org.eclipse.mylyn.internal.tasks.ui.TaskListPreferenceConstants;
+import org.eclipse.mylyn.internal.tasks.ui.TasksUiPreferenceConstants;
import org.eclipse.mylyn.internal.tasks.ui.TaskPriorityFilter;
import org.eclipse.mylyn.internal.tasks.ui.TaskWorkingSetFilter;
import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
@@ -161,7 +161,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
private static final String PRESENTATION_SCHEDULED = "Scheduled";
- public static final String ID = "org.eclipse.mylyn.tasks.ui.views.TaskListView";
+ public static final String ID = "org.eclipse.mylyn.tasks.ui.views.tasks";
public static final String LABEL_VIEW = "Task List";
@@ -736,11 +736,11 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
addFilter(filterWorkingSet);
addFilter(filterPriority);
- if (TasksUiPlugin.getDefault().getPreferenceStore().contains(TaskListPreferenceConstants.FILTER_COMPLETE_MODE)) {
+ if (TasksUiPlugin.getDefault().getPreferenceStore().contains(TasksUiPreferenceConstants.FILTER_COMPLETE_MODE)) {
addFilter(filterComplete);
}
- if (TasksUiPlugin.getDefault().getPreferenceStore().contains(TaskListPreferenceConstants.FILTER_ARCHIVE_MODE)) {
+ if (TasksUiPlugin.getDefault().getPreferenceStore().contains(TasksUiPreferenceConstants.FILTER_ARCHIVE_MODE)) {
addFilter(filterArchive);
}
@@ -1370,7 +1370,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
StructuredSelection selection = (StructuredSelection) getViewer().getSelection();
Object object = selection.getFirstElement();
if (TasksUiPlugin.getDefault().getPreferenceStore().getBoolean(
- TaskListPreferenceConstants.ACTIVATE_ON_OPEN)) {
+ TasksUiPreferenceConstants.ACTIVATE_ON_OPEN)) {
ITask selectedTask = TaskListView.getFromActivePerspective().getSelectedTask();
if (selectedTask != null) {
// TODO: move history stuff
@@ -1659,9 +1659,9 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
}
public static String getCurrentPriorityLevel() {
- if (TasksUiPlugin.getDefault().getPreferenceStore().contains(TaskListPreferenceConstants.SELECTED_PRIORITY)) {
+ if (TasksUiPlugin.getDefault().getPreferenceStore().contains(TasksUiPreferenceConstants.FILTER_PRIORITY)) {
return TasksUiPlugin.getDefault().getPreferenceStore().getString(
- TaskListPreferenceConstants.SELECTED_PRIORITY);
+ TasksUiPreferenceConstants.FILTER_PRIORITY);
} else {
return Task.PriorityLevel.P5.toString();
}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskRepositoriesView.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskRepositoriesView.java
index 4204e8976..f339c5401 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskRepositoriesView.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskRepositoriesView.java
@@ -44,7 +44,7 @@ import org.eclipse.ui.part.ViewPart;
*/
public class TaskRepositoriesView extends ViewPart {
- public static final String ID = "org.eclipse.mylyn.tasklist.repositories";
+ public static final String ID = "org.eclipse.mylyn.tasks.ui.views.repositories";
private TableViewer viewer;
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 ff845efd9..a00d0ac0c 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
@@ -20,7 +20,6 @@ import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.mylyn.core.MylarStatusHandler;
import org.eclipse.mylyn.internal.tasks.core.WebTask;
-import org.eclipse.mylyn.internal.tasks.ui.TaskListPreferenceConstants;
import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
import org.eclipse.mylyn.internal.tasks.ui.wizards.CommonAddExistingTaskWizard;
import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
@@ -32,6 +31,7 @@ import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
import org.eclipse.mylyn.tasks.core.TaskRepository;
import org.eclipse.mylyn.tasks.core.TaskRepositoryManager;
import org.eclipse.mylyn.tasks.core.Task.PriorityLevel;
+import org.eclipse.mylyn.tasks.ui.editors.TaskEditor;
import org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IWorkbenchPage;
@@ -75,7 +75,7 @@ public abstract class AbstractRepositoryConnectorUi {
* Context pages.
*/
public String getTaskEditorId(AbstractRepositoryTask repositoryTask) {
- return TaskListPreferenceConstants.TASK_EDITOR_ID;
+ return TaskEditor.ID_EDITOR;
}
public abstract boolean hasSearchPage();
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/tasks/ui/OpenRepositoryTaskJob.java
index 8579e71f6..f492c47a9 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/tasks/ui/OpenRepositoryTaskJob.java
@@ -19,13 +19,13 @@ import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.mylyn.core.MylarStatusHandler;
import org.eclipse.mylyn.internal.tasks.core.RepositoryTaskHandleUtil;
-import org.eclipse.mylyn.internal.tasks.ui.TaskListPreferenceConstants;
import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
import org.eclipse.mylyn.tasks.core.ITaskDataHandler;
import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
import org.eclipse.mylyn.tasks.core.TaskRepository;
import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorInput;
import org.eclipse.mylyn.tasks.ui.editors.RepositoryTaskEditorInput;
+import org.eclipse.mylyn.tasks.ui.editors.TaskEditor;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PlatformUI;
@@ -115,7 +115,7 @@ public class OpenRepositoryTaskJob extends Job {
} else {
String handle = RepositoryTaskHandleUtil.getHandle(repository.getUrl(), taskData.getId());
AbstractTaskEditorInput editorInput = new RepositoryTaskEditorInput(repository, handle, taskUrl, taskId);
- TasksUiUtil.openEditor(editorInput, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
+ TasksUiUtil.openEditor(editorInput, TaskEditor.ID_EDITOR, page);
}
}
});
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 452b3511e..757ff071f 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
@@ -39,7 +39,7 @@ import org.eclipse.mylyn.internal.context.core.InteractionContextManager;
import org.eclipse.mylyn.internal.tasks.core.RepositoryTaskHandleUtil;
import org.eclipse.mylyn.internal.tasks.core.TaskDataManager;
import org.eclipse.mylyn.internal.tasks.core.WebTask;
-import org.eclipse.mylyn.internal.tasks.ui.TaskListPreferenceConstants;
+import org.eclipse.mylyn.internal.tasks.ui.TasksUiPreferenceConstants;
import org.eclipse.mylyn.internal.tasks.ui.WorkspaceAwareContextStore;
import org.eclipse.mylyn.internal.tasks.ui.util.TaskListSaveManager;
import org.eclipse.mylyn.internal.tasks.ui.util.TaskListWriter;
@@ -498,7 +498,7 @@ public class TaskListManager implements IPropertyChangeListener {
// TasksUiPlugin.getDefault().getPreferenceStore().getInt(
// TaskListPreferenceConstants.PLANNING_STARTHOUR);
scheduledEndHour = TasksUiPlugin.getDefault().getPreferenceStore().getInt(
- TaskListPreferenceConstants.PLANNING_ENDHOUR);
+ TasksUiPreferenceConstants.PLANNING_ENDHOUR);
activityWeekDays.clear();
for (int x = startDay; x < (startDay + 7); x++) {
@@ -1055,14 +1055,14 @@ public class TaskListManager implements IPropertyChangeListener {
}
public void propertyChange(PropertyChangeEvent event) {
- if (event.getProperty().equals(TaskListPreferenceConstants.PLANNING_STARTHOUR)
- || event.getProperty().equals(TaskListPreferenceConstants.PLANNING_ENDHOUR)) {
+ if (event.getProperty().equals(TasksUiPreferenceConstants.PLANNING_STARTHOUR)
+ || event.getProperty().equals(TasksUiPreferenceConstants.PLANNING_ENDHOUR)) {
// event.getProperty().equals(TaskListPreferenceConstants.PLANNING_STARTDAY)
// scheduledStartHour =
// TasksUiPlugin.getDefault().getPreferenceStore().getInt(
// TaskListPreferenceConstants.PLANNING_STARTHOUR);
scheduledEndHour = TasksUiPlugin.getDefault().getPreferenceStore().getInt(
- TaskListPreferenceConstants.PLANNING_ENDHOUR);
+ TasksUiPreferenceConstants.PLANNING_ENDHOUR);
}
}
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 10657c410..2eb61c752 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
@@ -53,7 +53,7 @@ import org.eclipse.mylyn.internal.tasks.ui.TaskListNotificationIncoming;
import org.eclipse.mylyn.internal.tasks.ui.TaskListNotificationManager;
import org.eclipse.mylyn.internal.tasks.ui.TaskListNotificationQueryIncoming;
import org.eclipse.mylyn.internal.tasks.ui.TaskListNotificationReminder;
-import org.eclipse.mylyn.internal.tasks.ui.TaskListPreferenceConstants;
+import org.eclipse.mylyn.internal.tasks.ui.TasksUiPreferenceConstants;
import org.eclipse.mylyn.internal.tasks.ui.TaskListSynchronizationScheduler;
import org.eclipse.mylyn.internal.tasks.ui.WorkspaceAwareContextStore;
import org.eclipse.mylyn.internal.tasks.ui.util.TaskListSaveManager;
@@ -316,9 +316,9 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup {
private final IPropertyChangeListener PREFERENCE_LISTENER = new IPropertyChangeListener() {
public void propertyChange(PropertyChangeEvent event) {
- if (event.getProperty().equals(TaskListPreferenceConstants.MULTIPLE_ACTIVE_TASKS)) {
+ if (event.getProperty().equals(TasksUiPreferenceConstants.MULTIPLE_ACTIVE_TASKS)) {
TaskListView.getFromActivePerspective().togglePreviousAction(
- !getPreferenceStore().getBoolean(TaskListPreferenceConstants.MULTIPLE_ACTIVE_TASKS));
+ !getPreferenceStore().getBoolean(TasksUiPreferenceConstants.MULTIPLE_ACTIVE_TASKS));
getTaskListManager().getTaskActivationHistory().clear();
}
@@ -602,39 +602,39 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup {
@Override
protected void initializeDefaultPreferences(IPreferenceStore store) {
store.setDefault(ContextPreferenceContstants.PREF_DATA_DIR, getDefaultDataDirectory());
- store.setDefault(TaskListPreferenceConstants.FILTER_SUBTASKS, true);
- store.setDefault(TaskListPreferenceConstants.NOTIFICATIONS_ENABLED, true);
- store.setDefault(TaskListPreferenceConstants.SELECTED_PRIORITY, Task.PriorityLevel.P5.toString());
- store.setDefault(TaskListPreferenceConstants.REPORT_OPEN_EDITOR, true);
- store.setDefault(TaskListPreferenceConstants.REPORT_OPEN_INTERNAL, false);
- store.setDefault(TaskListPreferenceConstants.REPORT_DISABLE_INTERNAL, false);
- store.setDefault(TaskListPreferenceConstants.ACTIVATE_ON_OPEN, false);
- store.setDefault(TaskListPreferenceConstants.REPORT_OPEN_EXTERNAL, false);
+ store.setDefault(TasksUiPreferenceConstants.FILTER_SUBTASKS, true);
+ store.setDefault(TasksUiPreferenceConstants.NOTIFICATIONS_ENABLED, true);
+ store.setDefault(TasksUiPreferenceConstants.FILTER_PRIORITY, Task.PriorityLevel.P5.toString());
+ store.setDefault(TasksUiPreferenceConstants.REPORT_OPEN_EDITOR, true);
+ store.setDefault(TasksUiPreferenceConstants.REPORT_OPEN_INTERNAL, false);
+ store.setDefault(TasksUiPreferenceConstants.REPORT_DISABLE_INTERNAL, false);
+ store.setDefault(TasksUiPreferenceConstants.ACTIVATE_ON_OPEN, false);
+ store.setDefault(TasksUiPreferenceConstants.REPORT_OPEN_EXTERNAL, false);
// store.setDefault(TaskListPreferenceConstants.REPOSITORY_SYNCH_ON_STARTUP,
// false);
- store.setDefault(TaskListPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_ENABLED, true);
- store.setDefault(TaskListPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_MILISECONDS, "" + (20 * 60 * 1000));
+ store.setDefault(TasksUiPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_ENABLED, true);
+ store.setDefault(TasksUiPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_MILISECONDS, "" + (20 * 60 * 1000));
// store.setDefault(TaskListPreferenceConstants.BACKUP_AUTOMATICALLY,
// true);
// store.setDefault(TaskListPreferenceConstants.BACKUP_FOLDER,
// ContextCorePlugin.getDefault().getDataDirectory()
// + DEFAULT_PATH_SEPARATOR + DEFAULT_BACKUP_FOLDER_NAME);
- store.setDefault(TaskListPreferenceConstants.BACKUP_SCHEDULE, 1);
- store.setDefault(TaskListPreferenceConstants.BACKUP_MAXFILES, 20);
- store.setDefault(TaskListPreferenceConstants.BACKUP_LAST, 0f);
+ store.setDefault(TasksUiPreferenceConstants.BACKUP_SCHEDULE, 1);
+ store.setDefault(TasksUiPreferenceConstants.BACKUP_MAXFILES, 20);
+ store.setDefault(TasksUiPreferenceConstants.BACKUP_LAST, 0f);
- store.setDefault(TaskListPreferenceConstants.FILTER_ARCHIVE_MODE, true);
- store.setDefault(TaskListPreferenceConstants.MULTIPLE_ACTIVE_TASKS, false);
- store.setValue(TaskListPreferenceConstants.MULTIPLE_ACTIVE_TASKS, false);
+ store.setDefault(TasksUiPreferenceConstants.FILTER_ARCHIVE_MODE, true);
+ store.setDefault(TasksUiPreferenceConstants.MULTIPLE_ACTIVE_TASKS, false);
+ store.setValue(TasksUiPreferenceConstants.MULTIPLE_ACTIVE_TASKS, false);
// store.setDefault(TaskListPreferenceConstants.PLANNING_STARTDAY, 2);
// store.setDefault(TaskListPreferenceConstants.PLANNING_ENDDAY, 6);
- store.setDefault(TaskListPreferenceConstants.PLANNING_STARTHOUR, 9);
- store.setDefault(TaskListPreferenceConstants.PLANNING_ENDHOUR, 18);
+ store.setDefault(TasksUiPreferenceConstants.PLANNING_STARTHOUR, 9);
+ store.setDefault(TasksUiPreferenceConstants.PLANNING_ENDHOUR, 18);
- store.setDefault(TaskListPreferenceConstants.SAVE_TASKLIST_MODE, TaskListSaveMode.THREE_HOURS.toString());
+ store.setDefault(TasksUiPreferenceConstants.SAVE_TASKLIST_MODE, TaskListSaveMode.THREE_HOURS.toString());
}
public static TaskListManager getTaskListManager() {
@@ -680,7 +680,7 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup {
// TODO: remove
public boolean isMultipleActiveTasksMode() {
- return getPreferenceStore().getBoolean(TaskListPreferenceConstants.MULTIPLE_ACTIVE_TASKS);
+ return getPreferenceStore().getBoolean(TasksUiPreferenceConstants.MULTIPLE_ACTIVE_TASKS);
}
public String[] getSaveOptions() {
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 da32d5ff8..c5ce72102 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
@@ -38,7 +38,8 @@ import org.eclipse.jface.viewers.StructuredViewer;
import org.eclipse.jface.window.Window;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.mylyn.core.MylarStatusHandler;
-import org.eclipse.mylyn.internal.tasks.ui.TaskListPreferenceConstants;
+import org.eclipse.mylyn.internal.tasks.ui.TasksUiPreferenceConstants;
+import org.eclipse.mylyn.internal.tasks.ui.editors.CategoryEditor;
import org.eclipse.mylyn.internal.tasks.ui.editors.CategoryEditorInput;
import org.eclipse.mylyn.internal.tasks.ui.views.TaskRepositoriesView;
import org.eclipse.mylyn.internal.tasks.ui.wizards.EditRepositoryWizard;
@@ -250,7 +251,7 @@ public class TasksUiUtil {
}
private static String getTaskEditorId(final ITask task) {
- String taskEditorId = TaskListPreferenceConstants.TASK_EDITOR_ID;
+ String taskEditorId = TaskEditor.ID_EDITOR;
if (task instanceof AbstractRepositoryTask) {
AbstractRepositoryTask repositoryTask = (AbstractRepositoryTask) task;
AbstractRepositoryConnectorUi repositoryUi = TasksUiPlugin.getRepositoryUi(repositoryTask
@@ -283,7 +284,7 @@ public class TasksUiUtil {
public static void openEditor(final ITask task, boolean asyncExec, final boolean newTask) {
final boolean openWithBrowser = TasksUiPlugin.getDefault().getPreferenceStore().getBoolean(
- TaskListPreferenceConstants.REPORT_OPEN_INTERNAL);
+ TasksUiPreferenceConstants.REPORT_OPEN_INTERNAL);
final String taskEditorId = getTaskEditorId(task);
@@ -393,7 +394,7 @@ public class TasksUiUtil {
IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
if (window != null) {
IWorkbenchPage page = window.getActivePage();
- openEditor(input, TaskListPreferenceConstants.CATEGORY_EDITOR_ID, page);
+ openEditor(input, CategoryEditor.ID_EDITOR, page);
}
}
});
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractNewRepositoryTaskEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractNewRepositoryTaskEditor.java
index 0e9189d7d..d0be529d6 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractNewRepositoryTaskEditor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractNewRepositoryTaskEditor.java
@@ -27,7 +27,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.mylyn.internal.tasks.ui.TaskListColorsAndFonts;
-import org.eclipse.mylyn.internal.tasks.ui.TaskListPreferenceConstants;
+import org.eclipse.mylyn.internal.tasks.ui.TasksUiPreferenceConstants;
import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView;
import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
@@ -217,7 +217,7 @@ public abstract class AbstractNewRepositoryTaskEditor extends AbstractRepository
scheduledForDate.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TEXT_BORDER);
Calendar newTaskSchedule = Calendar.getInstance();
int scheduledEndHour = TasksUiPlugin.getDefault().getPreferenceStore().getInt(
- TaskListPreferenceConstants.PLANNING_ENDHOUR);
+ TasksUiPreferenceConstants.PLANNING_ENDHOUR);
// If past scheduledEndHour set for following day
if (newTaskSchedule.get(Calendar.HOUR_OF_DAY) >= scheduledEndHour) {
TasksUiPlugin.getTaskListManager().setSecheduledIn(newTaskSchedule, 1);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java
index 6545085c3..7fc2cee56 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java
@@ -22,7 +22,7 @@ import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.mylyn.core.MylarStatusHandler;
-import org.eclipse.mylyn.internal.tasks.ui.TaskListPreferenceConstants;
+import org.eclipse.mylyn.internal.tasks.ui.TasksUiPreferenceConstants;
import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
import org.eclipse.mylyn.internal.tasks.ui.editors.TaskEditorActionContributor;
import org.eclipse.mylyn.internal.tasks.ui.editors.TaskPlanningEditor;
@@ -56,6 +56,8 @@ import org.eclipse.ui.progress.IWorkbenchSiteProgressService;
*/
public class TaskEditor extends SharedHeaderFormEditor implements IBusyEditor {
+ public static final String ID_EDITOR = "org.eclipse.mylyn.tasks.ui.editors.task";
+
private static final String ISSUE_WEB_PAGE_LABEL = "Browser";
protected ITask task;
@@ -117,7 +119,7 @@ public class TaskEditor extends SharedHeaderFormEditor implements IBusyEditor {
private int createBrowserPage(final String url) {
if (!TasksUiPlugin.getDefault().getPreferenceStore().getBoolean(
- TaskListPreferenceConstants.REPORT_DISABLE_INTERNAL)) {
+ TasksUiPreferenceConstants.REPORT_DISABLE_INTERNAL)) {
try {
webBrowser = new Browser(getContainer(), SWT.NONE);
int index = addPage(webBrowser);
@@ -132,7 +134,7 @@ public class TaskEditor extends SharedHeaderFormEditor implements IBusyEditor {
});
boolean openWithBrowser = TasksUiPlugin.getDefault().getPreferenceStore().getBoolean(
- TaskListPreferenceConstants.REPORT_OPEN_INTERNAL);
+ TasksUiPreferenceConstants.REPORT_OPEN_INTERNAL);
if (openWithBrowser) {
setActivePage(index);
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 d06f97511..3d13de861 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
@@ -17,7 +17,6 @@ import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.mylyn.core.MylarStatusHandler;
-import org.eclipse.mylyn.internal.tasks.ui.TaskListPreferenceConstants;
import org.eclipse.mylyn.tasks.core.AbstractAttributeFactory;
import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
import org.eclipse.mylyn.tasks.core.IMylarStatusConstants;
@@ -29,6 +28,7 @@ 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.NewTaskEditorInput;
+import org.eclipse.mylyn.tasks.ui.editors.TaskEditor;
import org.eclipse.ui.INewWizard;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPage;
@@ -102,7 +102,7 @@ public class NewTaskWizard extends Wizard implements INewWizard {
NewTaskEditorInput editorInput = new NewTaskEditorInput(taskRepository, taskData);
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- TasksUiUtil.openEditor(editorInput, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
+ TasksUiUtil.openEditor(editorInput, TaskEditor.ID_EDITOR, page);
return true;
}
}
diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/NewTracTaskWizard.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/NewTracTaskWizard.java
index 80fe340a1..0cf84b6b0 100644
--- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/NewTracTaskWizard.java
+++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/NewTracTaskWizard.java
@@ -14,10 +14,10 @@ package org.eclipse.mylyn.internal.trac.ui.wizard;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
-import org.eclipse.mylyn.internal.tasks.ui.TaskListPreferenceConstants;
import org.eclipse.mylyn.tasks.core.TaskRepository;
import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
import org.eclipse.mylyn.tasks.ui.editors.NewTaskEditorInput;
+import org.eclipse.mylyn.tasks.ui.editors.TaskEditor;
import org.eclipse.ui.INewWizard;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPage;
@@ -62,7 +62,7 @@ public class NewTracTaskWizard extends Wizard implements INewWizard {
public boolean performFinish() {
NewTaskEditorInput editorInput = new NewTaskEditorInput(taskRepository, newTaskPage.getRepositoryTaskData());
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- TasksUiUtil.openEditor(editorInput, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
+ TasksUiUtil.openEditor(editorInput, TaskEditor.ID_EDITOR, page);
return true;
}

Back to the top