Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormkersten2005-11-09 15:49:26 -0500
committermkersten2005-11-09 15:49:26 -0500
commitf4c93360a8cd9bb4038fa697c5c7ac7acdbea448 (patch)
tree48d3aa4e1c5b3c999adb82539400448a92d01268 /org.eclipse.mylyn.tasks.ui
parentf357b8d4bfa401e717c8a3ac183e5922ea51f0d6 (diff)
downloadorg.eclipse.mylyn.tasks-f4c93360a8cd9bb4038fa697c5c7ac7acdbea448.tar.gz
org.eclipse.mylyn.tasks-f4c93360a8cd9bb4038fa697c5c7ac7acdbea448.tar.xz
org.eclipse.mylyn.tasks-f4c93360a8cd9bb4038fa697c5c7ac7acdbea448.zip
Fixed Bugzilla Bug 106862: use task description as comments in CVS co...
Diffstat (limited to 'org.eclipse.mylyn.tasks.ui')
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/MylarTasklistPlugin.java9
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/Task.java4
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskCategory.java5
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/views/TaskListView.java2
4 files changed, 12 insertions, 8 deletions
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 3351449e9..1d103467e 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
@@ -35,6 +35,8 @@ import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.events.ShellEvent;
import org.eclipse.swt.events.ShellListener;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IStartup;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.PlatformUI;
@@ -54,7 +56,12 @@ public class MylarTasklistPlugin extends AbstractUIPlugin implements IStartup {
private TaskListExternalizer externalizer;
private List<ITaskHandler> taskHandlers = new ArrayList<ITaskHandler>(); // TODO: use extension points
private List<IContextEditorFactory> contextEditors = new ArrayList<IContextEditorFactory>();
-
+
+ /**
+ * TODO: move to common color map.
+ */
+ public static Color ACTIVE_TASK = new Color(Display.getDefault(), 36, 22, 50);
+
public static final String PLANNING_GAME_WIZARD_ID = "org.eclipse.mylar.tasklist.ui.planner.wizard";
public static final String PLANNING_GAME_EDITOR_ID = "org.eclipse.mylar.tasklist.ui.planner.editor";
public static final String REPORT_OPEN_EDITOR = "org.eclipse.mylar.tasklist.report.open.editor";
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/Task.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/Task.java
index 5fe7ee1b3..fbfd9d420 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/Task.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/Task.java
@@ -26,7 +26,6 @@ import org.eclipse.mylar.tasklist.ui.views.TaskListView;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PartInitException;
@@ -39,7 +38,6 @@ public class Task implements ITask {
public static final long INACTIVITY_TIME_MILLIS = MylarPlugin.getContextManager().getActivityTimeoutSeconds() * 1000;
public static final int MAX_LABEL_LENGTH = 50;
- public static Color ACTIVE = new Color(Display.getDefault(), 30, 30, 60);
private static final long serialVersionUID = 3545518391537382197L;
private boolean active = false;
@@ -423,7 +421,7 @@ public class Task implements ITask {
if (isCompleted()){
return GRAY_LIGHT;
} else if (isActive()) {
- return ACTIVE;
+ return MylarTasklistPlugin.ACTIVE_TASK;
} else {
return null;
}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskCategory.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskCategory.java
index bc8515137..cd40120dc 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskCategory.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskCategory.java
@@ -18,10 +18,9 @@ import java.util.ArrayList;
import java.util.List;
import org.eclipse.mylar.core.MylarPlugin;
-import org.eclipse.mylar.tasklist.ITaskListCategory;
import org.eclipse.mylar.tasklist.ITask;
+import org.eclipse.mylar.tasklist.ITaskListCategory;
import org.eclipse.mylar.tasklist.MylarTasklistPlugin;
-import org.eclipse.mylar.tasklist.Task;
import org.eclipse.mylar.tasklist.TaskListImages;
import org.eclipse.mylar.tasklist.ui.CategoryEditorInput;
import org.eclipse.swt.graphics.Color;
@@ -167,7 +166,7 @@ public class TaskCategory implements ITaskListCategory, Serializable {
public Color getForeground() {
for (ITask child : getChildren()) {
if (child.isActive())
- return Task.ACTIVE;
+ return MylarTasklistPlugin.ACTIVE_TASK;
}
return null;
}
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 5a9da4944..a36d20aff 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
@@ -126,7 +126,7 @@ import org.eclipse.ui.part.ViewPart;
* @author Ken Sueda
*/
public class TaskListView extends ViewPart {
-
+
public static final String ID = "org.eclipse.mylar.tasks.ui.views.TaskListView";
private static final String SEPARATOR_ID_REPORTS = "reports";

Back to the top