Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormkersten2005-12-12 18:19:05 +0000
committermkersten2005-12-12 18:19:05 +0000
commit8f0efbbcb0138a52fdd2c6f3f7d380788f1ffd64 (patch)
treeddfc840a0e568ec0e9c58c2e9e5250237da1ff1b
parenta09f4b06440392e881a5b9d5fdb1cf2a54cc6dfb (diff)
downloadorg.eclipse.mylyn.tasks-8f0efbbcb0138a52fdd2c6f3f7d380788f1ffd64.tar.gz
org.eclipse.mylyn.tasks-8f0efbbcb0138a52fdd2c6f3f7d380788f1ffd64.tar.xz
org.eclipse.mylyn.tasks-8f0efbbcb0138a52fdd2c6f3f7d380788f1ffd64.zip
Progress on: Bug 120374: task activity time reportes is too high
https://bugs.eclipse.org/bugs/show_bug.cgi?id=120374
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/TaskActivityTimingTest.java50
-rw-r--r--org.eclipse.mylyn.tasks.ui/plugin.xml4
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/MylarTaskListPlugin.java6
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/BackgroundSaveTimer.java2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskActivityTimer.java72
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskList.java15
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskListManager.java37
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/CompletedTaskCollector.java (renamed from org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/internal/CompletedTaskCollector.java)2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/ITasksCollector.java (renamed from org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/internal/ITasksCollector.java)2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/InProgressTaskCollector.java (renamed from org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/internal/InProgressTaskCollector.java)2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/ReminderRequiredCollector.java (renamed from org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/internal/ReminderRequiredCollector.java)2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/TaskReportGenerator.java (renamed from org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/internal/TaskReportGenerator.java)2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/ui/ReminderCellEditor.java (renamed from org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/ui/ReminderCellEditor.java)2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/ui/TaskActivityContentProvider.java (renamed from org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/ui/TaskActivityContentProvider.java)2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/ui/TaskActivityLabelProvider.java (renamed from org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/ui/TaskActivityLabelProvider.java)2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/ui/TaskActivitySorter.java (renamed from org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/ui/TaskActivitySorter.java)2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/ui/TaskPlanContentProvider.java (renamed from org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/ui/TaskPlanContentProvider.java)2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/ui/TaskPlanLabelProvider.java (renamed from org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/ui/TaskPlanLabelProvider.java)2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/ui/TaskPlanSorter.java (renamed from org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/ui/TaskPlanSorter.java)2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/ui/TaskPlannerEditorInput.java (renamed from org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/ui/TaskPlannerEditorInput.java)10
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/ui/TaskPlannerEditorPart.java (renamed from org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/ui/TaskPlannerEditorPart.java)2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/ui/TaskPlannerWizard.java (renamed from org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/ui/TaskPlannerWizard.java)2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/ui/TaskPlannerWizardPage.java (renamed from org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/ui/TaskPlannerWizardPage.java)2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/views/TaskListView.java4
24 files changed, 155 insertions, 75 deletions
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/TaskActivityTimingTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/TaskActivityTimingTest.java
index d635ce75e..843fe4746 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/TaskActivityTimingTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/TaskActivityTimingTest.java
@@ -6,6 +6,7 @@ import org.eclipse.mylar.core.InteractionEvent;
import org.eclipse.mylar.core.MylarPlugin;
import org.eclipse.mylar.tasklist.MylarTaskListPlugin;
import org.eclipse.mylar.tasklist.internal.Task;
+import org.eclipse.mylar.tasklist.internal.TaskActivityTimer;
import org.eclipse.mylar.tasklist.internal.TaskListManager;
/**
@@ -13,7 +14,7 @@ import org.eclipse.mylar.tasklist.internal.TaskListManager;
*/
public class TaskActivityTimingTest extends TestCase {
- private static final int TIMEOUT = 20;
+ private static final int TIMEOUT = 30;
private static final int SLEEP = TIMEOUT * 10;
@@ -34,6 +35,53 @@ public class TaskActivityTimingTest extends TestCase {
MylarTaskListPlugin.getTaskListManager().deactivateTask(task1);
MylarPlugin.getContextManager().setInactivityTimeout(originalActivityTimeout);
}
+
+ public void testDeactivation() throws InterruptedException {
+ assertEquals(0, task1.getElapsedTime());
+ MylarTaskListPlugin.getTaskListManager().deactivateTask(task1);
+ assertEquals(0, task1.getElapsedTime());
+
+ MylarTaskListPlugin.getTaskListManager().activateTask(task1);
+ Thread.sleep(SLEEP);
+ MylarTaskListPlugin.getTaskListManager().deactivateTask(task1);
+ assertTrue("elapsed: " + task1.getElapsedTime(), task1.getElapsedTime() > SLEEP);
+ }
+
+ public void testTimerMap() throws InterruptedException {
+ Task task0 = new Task("t0", "t0", true);
+ manager.activateTask(task0);
+ assertEquals(1, manager.getTimerMap().values().size());
+ TaskActivityTimer timer0 = manager.getTimerMap().get(task0);
+ assertTrue(timer0.isStarted());
+
+ long elapsed = task1.getElapsedTime();
+ assertEquals(0, elapsed);
+ MylarTaskListPlugin.getTaskListManager().activateTask(task1);
+ TaskActivityTimer timer1 = manager.getTimerMap().get(task1);
+ assertEquals(1, manager.getTimerMap().values().size()); // previous task was deactivated
+ assertTrue(timer1.isStarted());
+ Thread.sleep(SLEEP);
+
+ elapsed = task1.getElapsedTime();
+ assertTrue("should be bigger than timeout", elapsed > TIMEOUT);
+
+ manager.deactivateTask(task1);
+ assertFalse(timer1.isStarted());
+ assertEquals(0, manager.getTimerMap().values().size());
+
+ Thread.sleep(SLEEP);
+ long elapsedAfterDeactivation = task1.getElapsedTime();
+ assertTrue("should have accumulated some time: ", elapsedAfterDeactivation > elapsed);
+
+ Thread.sleep(SLEEP);
+ Thread.sleep(SLEEP);
+ long elapsedAfterInactivity = task1.getElapsedTime();
+ assertEquals("no accumulation if task inactive", elapsedAfterDeactivation, elapsedAfterInactivity);
+
+ manager.deactivateTask(task0);
+ assertFalse(timer0.isStarted());
+ assertEquals(0, manager.getTimerMap().values().size());
+ }
public void testElapsedTimeCapture() throws InterruptedException {
long elapsed = task1.getElapsedTime();
diff --git a/org.eclipse.mylyn.tasks.ui/plugin.xml b/org.eclipse.mylyn.tasks.ui/plugin.xml
index 72b51550a..85fb0d0d8 100644
--- a/org.eclipse.mylyn.tasks.ui/plugin.xml
+++ b/org.eclipse.mylyn.tasks.ui/plugin.xml
@@ -39,7 +39,7 @@
<extension point="org.eclipse.ui.newWizards">
<wizard
category="org.eclipse.mylar.wizards"
- class="org.eclipse.mylar.tasklist.planner.ui.TaskPlannerWizard"
+ class="org.eclipse.mylar.tasklist.internal.planner.ui.TaskPlannerWizard"
icon="icons/eview16/task-list.gif"
id="org.eclipse.mylar.tasklist.report.ui.planningGameWizard"
name="Mylar Task Planner (experimental)">
@@ -96,7 +96,7 @@
id="org.eclipse.mylar.tasklist.ui.catEditor"/>
<editor
icon="icons/eview16/task-list.gif"
- class="org.eclipse.mylar.tasklist.planner.ui.TaskPlannerEditorPart"
+ class="org.eclipse.mylar.tasklist.internal.planner.ui.TaskPlannerEditorPart"
name="Mylar Task Planner"
id="org.eclipse.mylar.tasklist.ui.planner.editor"/>
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/MylarTaskListPlugin.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/MylarTaskListPlugin.java
index aeb99df8d..98372cd60 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/MylarTaskListPlugin.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/MylarTaskListPlugin.java
@@ -26,8 +26,8 @@ import org.eclipse.mylar.tasklist.internal.TaskListExtensionReader;
import org.eclipse.mylar.tasklist.internal.TaskListManager;
import org.eclipse.mylar.tasklist.internal.TaskListSaveManager;
import org.eclipse.mylar.tasklist.internal.TaskListWriter;
-import org.eclipse.mylar.tasklist.planner.internal.ReminderRequiredCollector;
-import org.eclipse.mylar.tasklist.planner.internal.TaskReportGenerator;
+import org.eclipse.mylar.tasklist.internal.planner.ReminderRequiredCollector;
+import org.eclipse.mylar.tasklist.internal.planner.TaskReportGenerator;
import org.eclipse.mylar.tasklist.ui.IContextEditorFactory;
import org.eclipse.mylar.tasklist.ui.IDynamicSubMenuContributor;
import org.eclipse.mylar.tasklist.ui.ITaskHighlighter;
@@ -558,7 +558,7 @@ public class MylarTaskListPlugin extends AbstractUIPlugin implements IStartup {
// taskListListeners.add(taskListListner);
// }
- public boolean isMultipleMode() {
+ public boolean isMultipleActiveTasksMode() {
return getPrefs().getBoolean(MULTIPLE_ACTIVE_TASKS);
}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/BackgroundSaveTimer.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/BackgroundSaveTimer.java
index 90caf8069..2a17f0a34 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/BackgroundSaveTimer.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/BackgroundSaveTimer.java
@@ -37,7 +37,7 @@ public class BackgroundSaveTimer implements ITimerThreadListener {
public void stop() {
- timer.killTimer();
+ timer.kill();
}
public void setSaveIntervalMillis(int saveIntervalMillis) {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskActivityTimer.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskActivityTimer.java
index 2a376c4ae..d5d9d48f0 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskActivityTimer.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskActivityTimer.java
@@ -32,49 +32,64 @@ public class TaskActivityTimer implements ITimerThreadListener, IInteractionEven
private ITask task;
- private long lastTimeout;
+ private long lastActivity;
+ private boolean started;
+
public TaskActivityTimer(ITask task, int timeout) {
this.task = task;
timer = new TimerThread(timeout);
- }
-
- public void fireTimedOut() {
- long elapsed = Calendar.getInstance().getTimeInMillis() - lastTimeout;
- task.setElapsedTime(task.getElapsedTime() + elapsed);
- lastTimeout = Calendar.getInstance().getTimeInMillis();
- }
-
- public void interactionObserved(InteractionEvent event) {
- timer.resetTimer();
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell().addShellListener(this);
+ MylarPlugin.getDefault().addInteractionListener(this);
+ timer.addListener(this);
}
public void startTimer() {
- lastTimeout = Calendar.getInstance().getTimeInMillis();
- timer.addListener(this);
- MylarPlugin.getDefault().addInteractionListener(this);
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell().addShellListener(this);
+ lastActivity = Calendar.getInstance().getTimeInMillis();
timer.start();
+ started = true;
}
public void stopTimer() {
- fireTimedOut();
- timer.killTimer();
+ addElapsedToActivityTime();
+ timer.kill();
+ timer.removeListener(this);
MylarPlugin.getDefault().removeInteractionListener(this);
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell().removeShellListener(this);
+ started = false;
}
-
+
+ public void fireTimedOut() {
+ suspendTiming();
+ }
+
public void shellDeactivated(ShellEvent e) {
- fireTimedOut();
- timer.setSuspended(true);
+ suspendTiming();
+ }
+
+ public void interactionObserved(InteractionEvent event) {
+// lastActivity = Calendar.getInstance().getTimeInMillis();
+ timer.resetTimer();
}
public void shellActivated(ShellEvent e) {
- timer.setSuspended(false);
- lastTimeout = Calendar.getInstance().getTimeInMillis();
+ timer.resetTimer();
+ lastActivity = Calendar.getInstance().getTimeInMillis();
}
+ private void suspendTiming() {
+ addElapsedToActivityTime();
+ timer.setSuspended(true);
+ }
+
+ private void addElapsedToActivityTime() {
+ long elapsed = Calendar.getInstance().getTimeInMillis() - lastActivity;
+ task.setElapsedTime(task.getElapsedTime() + elapsed);
+ lastActivity = Calendar.getInstance().getTimeInMillis();
+ }
+
public void shellClosed(ShellEvent e) {
- // ignore
+ timer.kill();
}
public void shellDeiconified(ShellEvent e) {
@@ -92,4 +107,15 @@ public class TaskActivityTimer implements ITimerThreadListener, IInteractionEven
public void stopObserving() {
}
+
+ /**
+ * Public for testing
+ */
+ public boolean isStarted() {
+ return started;
+ }
+
+ public String toString() {
+ return "timer for task: " + task.toString();
+ }
}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskList.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskList.java
index 2bfe13f02..fe2730d39 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskList.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskList.java
@@ -68,14 +68,13 @@ public class TaskList implements Serializable {
queries.add(query);
}
- public void setActive(ITask task, boolean active) {
+ void setActive(ITask task, boolean active) {
task.setActive(active);
if (active && !activeTasks.contains(task)) {
activeTasks.add(task);
} else if (!active) {
activeTasks.remove(task);
}
-
}
void deleteTask(ITask task) {
@@ -232,10 +231,10 @@ public class TaskList implements Serializable {
rootTasks.clear();
}
- public void clearActiveTasks() {
- for (ITask task : activeTasks) {
- task.setActive(false);
- }
- activeTasks.clear();
- }
+// public void clearActiveTasks() {
+// for (ITask task : activeTasks) {
+// task.setActive(false);
+// }
+// activeTasks.clear();
+// }
}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskListManager.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskListManager.java
index 0804a420b..bd41e7530 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskListManager.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskListManager.java
@@ -140,8 +140,8 @@ public class TaskListManager {
}
public void deleteTask(ITask task) {
- TaskActivityTimer activityTimer = timerMap.remove(task);
- if (activityTimer != null) activityTimer.stopTimer();
+ TaskActivityTimer taskTimer = timerMap.remove(task);
+ if (taskTimer != null) taskTimer.stopTimer();
taskList.setActive(task, false);
taskList.deleteTask(task);
for (ITaskActivityListener listener : listeners) listener.tasklistModified();
@@ -165,29 +165,28 @@ public class TaskListManager {
listeners.remove(listener);
}
+ /**
+ * Deactivates previously active tasks if not in multiple active mode.
+ * @param task
+ */
public void activateTask(ITask task) {
- if (!MylarTaskListPlugin.getDefault().isMultipleMode()) {
- if (taskList.getActiveTasks().size() > 0
- && taskList.getActiveTasks().get(0).getHandleIdentifier().compareTo(task.getHandleIdentifier()) != 0) {
- for (ITask t : taskList.getActiveTasks()) {
- for (ITaskActivityListener listener : listeners)
- listener.taskDeactivated(t);
- }
- taskList.clearActiveTasks();
+ if (!MylarTaskListPlugin.getDefault().isMultipleActiveTasksMode()) {
+ for (ITask activeTask : new ArrayList<ITask>(taskList.getActiveTasks())) {
+ deactivateTask(activeTask);
}
}
taskList.setActive(task, true);
- int timout = MylarPlugin.getContextManager().getInactivityTimeout();
- TaskActivityTimer activityTimer = new TaskActivityTimer(task, timout);
+ int timeout = MylarPlugin.getContextManager().getInactivityTimeout();
+ TaskActivityTimer activityTimer = new TaskActivityTimer(task, timeout);
activityTimer.startTimer();
timerMap.put(task, activityTimer);
for (ITaskActivityListener listener : listeners) listener.taskActivated(task);
}
public void deactivateTask(ITask task) {
- TaskActivityTimer activeListener = timerMap.remove(task);
- if (activeListener != null) activeListener.stopTimer();
- taskList.setActive(task, false);
+ TaskActivityTimer taskTimer = timerMap.remove(task);
+ if (taskTimer != null) taskTimer.stopTimer();
+ taskList.setActive(task, false);
for (ITaskActivityListener listener : listeners) listener.taskDeactivated(task);
}
@@ -219,4 +218,12 @@ public class TaskListManager {
public File getTaskListFile() {
return taskListFile;
}
+
+ /**
+ * Public for testing
+ */
+ public Map<ITask, TaskActivityTimer> getTimerMap() {
+ return timerMap;
+ }
+
}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/internal/CompletedTaskCollector.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/CompletedTaskCollector.java
index 4c48c34ee..43b59eeec 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/internal/CompletedTaskCollector.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/CompletedTaskCollector.java
@@ -9,7 +9,7 @@
* University Of British Columbia - initial API and implementation
*******************************************************************************/
-package org.eclipse.mylar.tasklist.planner.internal;
+package org.eclipse.mylar.tasklist.internal.planner;
import java.util.ArrayList;
import java.util.Date;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/internal/ITasksCollector.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/ITasksCollector.java
index 0db3513aa..f4c0c0390 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/internal/ITasksCollector.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/ITasksCollector.java
@@ -9,7 +9,7 @@
* University Of British Columbia - initial API and implementation
*******************************************************************************/
-package org.eclipse.mylar.tasklist.planner.internal;
+package org.eclipse.mylar.tasklist.internal.planner;
import java.util.List;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/internal/InProgressTaskCollector.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/InProgressTaskCollector.java
index c9e854a44..433b98206 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/internal/InProgressTaskCollector.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/InProgressTaskCollector.java
@@ -1,4 +1,4 @@
-package org.eclipse.mylar.tasklist.planner.internal;
+package org.eclipse.mylar.tasklist.internal.planner;
import java.util.ArrayList;
import java.util.Date;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/internal/ReminderRequiredCollector.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/ReminderRequiredCollector.java
index ce8697522..f5d178187 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/internal/ReminderRequiredCollector.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/ReminderRequiredCollector.java
@@ -9,7 +9,7 @@
* University Of British Columbia - initial API and implementation
*******************************************************************************/
-package org.eclipse.mylar.tasklist.planner.internal;
+package org.eclipse.mylar.tasklist.internal.planner;
import java.util.ArrayList;
import java.util.Date;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/internal/TaskReportGenerator.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/TaskReportGenerator.java
index d80511b15..b06a4768f 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/internal/TaskReportGenerator.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/TaskReportGenerator.java
@@ -9,7 +9,7 @@
* University Of British Columbia - initial API and implementation
*******************************************************************************/
-package org.eclipse.mylar.tasklist.planner.internal;
+package org.eclipse.mylar.tasklist.internal.planner;
import java.util.ArrayList;
import java.util.List;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/ui/ReminderCellEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/ui/ReminderCellEditor.java
index 53e5924ca..68e390772 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/ui/ReminderCellEditor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/ui/ReminderCellEditor.java
@@ -8,7 +8,7 @@
* Contributors:
* University Of British Columbia - initial API and implementation
*******************************************************************************/
-package org.eclipse.mylar.tasklist.planner.ui;
+package org.eclipse.mylar.tasklist.internal.planner.ui;
import java.util.Date;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/ui/TaskActivityContentProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/ui/TaskActivityContentProvider.java
index 477d18960..388806327 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/ui/TaskActivityContentProvider.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/ui/TaskActivityContentProvider.java
@@ -9,7 +9,7 @@
* University Of British Columbia - initial API and implementation
*******************************************************************************/
-package org.eclipse.mylar.tasklist.planner.ui;
+package org.eclipse.mylar.tasklist.internal.planner.ui;
import java.util.List;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/ui/TaskActivityLabelProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/ui/TaskActivityLabelProvider.java
index 543b92a2b..bf6f7ad12 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/ui/TaskActivityLabelProvider.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/ui/TaskActivityLabelProvider.java
@@ -9,7 +9,7 @@
* University Of British Columbia - initial API and implementation
*******************************************************************************/
-package org.eclipse.mylar.tasklist.planner.ui;
+package org.eclipse.mylar.tasklist.internal.planner.ui;
import java.text.DateFormat;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/ui/TaskActivitySorter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/ui/TaskActivitySorter.java
index 545eeb04e..9b4df91ba 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/ui/TaskActivitySorter.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/ui/TaskActivitySorter.java
@@ -9,7 +9,7 @@
* University Of British Columbia - initial API and implementation
*******************************************************************************/
-package org.eclipse.mylar.tasklist.planner.ui;
+package org.eclipse.mylar.tasklist.internal.planner.ui;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerSorter;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/ui/TaskPlanContentProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/ui/TaskPlanContentProvider.java
index 374ab3590..7fd277475 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/ui/TaskPlanContentProvider.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/ui/TaskPlanContentProvider.java
@@ -9,7 +9,7 @@
* University Of British Columbia - initial API and implementation
*******************************************************************************/
-package org.eclipse.mylar.tasklist.planner.ui;
+package org.eclipse.mylar.tasklist.internal.planner.ui;
import java.util.ArrayList;
import java.util.List;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/ui/TaskPlanLabelProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/ui/TaskPlanLabelProvider.java
index 92993a507..81d31f356 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/ui/TaskPlanLabelProvider.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/ui/TaskPlanLabelProvider.java
@@ -9,7 +9,7 @@
* University Of British Columbia - initial API and implementation
*******************************************************************************/
-package org.eclipse.mylar.tasklist.planner.ui;
+package org.eclipse.mylar.tasklist.internal.planner.ui;
import java.text.DateFormat;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/ui/TaskPlanSorter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/ui/TaskPlanSorter.java
index fcd9a0b98..d9bdbecb4 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/ui/TaskPlanSorter.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/ui/TaskPlanSorter.java
@@ -9,7 +9,7 @@
* University Of British Columbia - initial API and implementation
*******************************************************************************/
-package org.eclipse.mylar.tasklist.planner.ui;
+package org.eclipse.mylar.tasklist.internal.planner.ui;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.mylar.tasklist.ITask;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/ui/TaskPlannerEditorInput.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/ui/TaskPlannerEditorInput.java
index d5cf92480..46c2e68f2 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/ui/TaskPlannerEditorInput.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/ui/TaskPlannerEditorInput.java
@@ -9,7 +9,7 @@
* University Of British Columbia - initial API and implementation
*******************************************************************************/
-package org.eclipse.mylar.tasklist.planner.ui;
+package org.eclipse.mylar.tasklist.internal.planner.ui;
import java.util.Calendar;
import java.util.Date;
@@ -18,10 +18,10 @@ import java.util.List;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.mylar.tasklist.ITask;
import org.eclipse.mylar.tasklist.internal.TaskList;
-import org.eclipse.mylar.tasklist.planner.internal.CompletedTaskCollector;
-import org.eclipse.mylar.tasklist.planner.internal.ITasksCollector;
-import org.eclipse.mylar.tasklist.planner.internal.InProgressTaskCollector;
-import org.eclipse.mylar.tasklist.planner.internal.TaskReportGenerator;
+import org.eclipse.mylar.tasklist.internal.planner.CompletedTaskCollector;
+import org.eclipse.mylar.tasklist.internal.planner.ITasksCollector;
+import org.eclipse.mylar.tasklist.internal.planner.InProgressTaskCollector;
+import org.eclipse.mylar.tasklist.internal.planner.TaskReportGenerator;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IPersistableElement;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/ui/TaskPlannerEditorPart.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/ui/TaskPlannerEditorPart.java
index 428d07ad9..e40380581 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/ui/TaskPlannerEditorPart.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/ui/TaskPlannerEditorPart.java
@@ -9,7 +9,7 @@
* University Of British Columbia - initial API and implementation
*******************************************************************************/
-package org.eclipse.mylar.tasklist.planner.ui;
+package org.eclipse.mylar.tasklist.internal.planner.ui;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/ui/TaskPlannerWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/ui/TaskPlannerWizard.java
index b42bcee12..ae822f23d 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/ui/TaskPlannerWizard.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/ui/TaskPlannerWizard.java
@@ -9,7 +9,7 @@
* University Of British Columbia - initial API and implementation
*******************************************************************************/
-package org.eclipse.mylar.tasklist.planner.ui;
+package org.eclipse.mylar.tasklist.internal.planner.ui;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.Wizard;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/ui/TaskPlannerWizardPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/ui/TaskPlannerWizardPage.java
index 56bf07f65..b6ad9df63 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/planner/ui/TaskPlannerWizardPage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/planner/ui/TaskPlannerWizardPage.java
@@ -9,7 +9,7 @@
* University Of British Columbia - initial API and implementation
*******************************************************************************/
-package org.eclipse.mylar.tasklist.planner.ui;
+package org.eclipse.mylar.tasklist.internal.planner.ui;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/views/TaskListView.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/views/TaskListView.java
index f3c55b49a..5a6ff55be 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/views/TaskListView.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/views/TaskListView.java
@@ -617,7 +617,7 @@ public class TaskListView extends ViewPart {
}
public void addTaskToHistory(ITask task) {
- if (!MylarTaskListPlugin.getDefault().isMultipleMode()) {
+ if (!MylarTaskListPlugin.getDefault().isMultipleActiveTasksMode()) {
taskHistory.addTask(task);
nextTaskAction.setEnabled(taskHistory.hasNext());
previousTaskAction.setEnabled(taskHistory.hasPrevious());
@@ -749,7 +749,7 @@ public class TaskListView extends ViewPart {
// MylarTaskListPlugin.getTaskListManager().getTaskList().addFilter(inCompleteFilter);
if (MylarTaskListPlugin.getDefault().isFilterCompleteMode())
addFilter(COMPLETE_FILTER);
- if (MylarTaskListPlugin.getDefault().isMultipleMode()) {
+ if (MylarTaskListPlugin.getDefault().isMultipleActiveTasksMode()) {
togglePreviousAction(false);
toggleNextAction(false);
}

Back to the top