Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormkersten2008-04-29 17:57:26 -0400
committermkersten2008-04-29 17:57:26 -0400
commit2dab441c1bf2c46de9153c1bccd5afb7bd31b12e (patch)
tree68c1c6b35530d98cd0f4e30200e87c6c10ec1bd7
parent25bd6e4030e1d394a26f4fb066a26aa66dd79c7f (diff)
downloadorg.eclipse.mylyn.tasks-2dab441c1bf2c46de9153c1bccd5afb7bd31b12e.tar.gz
org.eclipse.mylyn.tasks-2dab441c1bf2c46de9153c1bccd5afb7bd31b12e.tar.xz
org.eclipse.mylyn.tasks-2dab441c1bf2c46de9153c1bccd5afb7bd31b12e.zip
NEW - bug 214379: [api] Generalize screen capture UI and other common facilities for cross-project use
https://bugs.eclipse.org/bugs/show_bug.cgi?id=214379
-rw-r--r--org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.mylyn.bugzilla.tests/META-INF/MANIFEST.MF5
-rw-r--r--org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListNotificationManagerTest.java2
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/META-INF/MANIFEST.MF5
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditor.java42
-rw-r--r--org.eclipse.mylyn.help.ui/META-INF/MANIFEST.MF5
-rw-r--r--org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/dialogs/UiLegendDialog.java74
-rw-r--r--org.eclipse.mylyn.tasks.bugs/META-INF/MANIFEST.MF3
-rw-r--r--org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/wizards/ReportBugWizard.java2
-rw-r--r--org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF1
-rw-r--r--org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.mylyn.trac.tests/META-INF/MANIFEST.MF1
-rw-r--r--org.eclipse.mylyn.trac.ui/META-INF/MANIFEST.MF5
-rw-r--r--org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorFactory.java4
14 files changed, 82 insertions, 71 deletions
diff --git a/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF
index 21376838b..dc6f0516a 100644
--- a/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.mylyn.web.core;bundle-version="[3.0.0,4.0.0)",
org.eclipse.mylyn.monitor.core;bundle-version="[3.0.0,4.0.0)",
org.eclipse.core.net
-Eclipse-AutoStart: true
+Bundle-ActivationPolicy: lazy
Bundle-Vendor: Eclipse.org
Bundle-ClassPath: .
Export-Package: org.eclipse.mylyn.internal.bugzilla.core;x-friends:="org.eclipse.mylyn.bugzilla.ide,org.eclipse.mylyn.bugzilla.ui",
diff --git a/org.eclipse.mylyn.bugzilla.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.bugzilla.tests/META-INF/MANIFEST.MF
index 35a5e0d4d..66c84772c 100644
--- a/org.eclipse.mylyn.bugzilla.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.bugzilla.tests/META-INF/MANIFEST.MF
@@ -23,8 +23,9 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.mylyn,
org.eclipse.search,
org.eclipse.mylyn.web.core,
- org.eclipse.mylyn.bugzilla.ide;bundle-version="2.3.0"
-Eclipse-AutoStart: true
+ org.eclipse.mylyn.bugzilla.ide;bundle-version="2.3.0",
+ org.eclipse.mylyn.workbench.ui;bundle-version="[3.0.0,4.0.0)"
+Bundle-ActivationPolicy: lazy
Bundle-Vendor: Eclipse.org
Bundle-ClassPath: bugzilla-test.jar
Export-Package: org.eclipse.mylyn.bugzilla.tests;x-internal:=true,
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListNotificationManagerTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListNotificationManagerTest.java
index 2b1b44433..018b1a7ab 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListNotificationManagerTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListNotificationManagerTest.java
@@ -17,8 +17,8 @@ import org.eclipse.mylyn.internal.bugzilla.core.BugzillaTask;
import org.eclipse.mylyn.internal.tasks.core.LocalTask;
import org.eclipse.mylyn.internal.tasks.ui.TaskListNotificationManager;
import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
-import org.eclipse.mylyn.internal.tasks.ui.notifications.AbstractNotification;
import org.eclipse.mylyn.internal.tasks.ui.notifications.TaskListNotification;
+import org.eclipse.mylyn.provisional.workbench.ui.notifications.AbstractNotification;
import org.eclipse.mylyn.tasks.core.AbstractTask;
import org.eclipse.mylyn.tasks.core.TaskRepository;
import org.eclipse.mylyn.tasks.core.AbstractTask.RepositoryTaskSyncState;
diff --git a/org.eclipse.mylyn.bugzilla.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.bugzilla.ui/META-INF/MANIFEST.MF
index 1ab3bdcb2..5d57b90e7 100644
--- a/org.eclipse.mylyn.bugzilla.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.bugzilla.ui/META-INF/MANIFEST.MF
@@ -18,8 +18,9 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.mylyn.bugzilla.core;bundle-version="[3.0.0,4.0.0)",
org.eclipse.mylyn.monitor.core;bundle-version="[3.0.0,4.0.0)",
org.eclipse.mylyn.tasks.ui;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.tasks.core;bundle-version="[3.0.0,4.0.0)"
-Eclipse-AutoStart: true
+ org.eclipse.mylyn.tasks.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.mylyn.workbench.ui;bundle-version="[3.0.0,4.0.0)"
+Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.mylyn.internal.bugzilla.ui;x-internal:=true,
org.eclipse.mylyn.internal.bugzilla.ui.editor;x-internal:=true,
org.eclipse.mylyn.internal.bugzilla.ui.search;x-internal:=true,
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditor.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditor.java
index ba50099f7..69a2f76a0 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditor.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditor.java
@@ -34,13 +34,14 @@ import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants;
import org.eclipse.mylyn.internal.bugzilla.core.RepositoryConfiguration;
import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants.BUGZILLA_OPERATION;
import org.eclipse.mylyn.internal.bugzilla.ui.BugzillaUiPlugin;
-import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
+import org.eclipse.mylyn.internal.tasks.ui.TasksUiPreferenceConstants;
import org.eclipse.mylyn.monitor.core.StatusHandler;
+import org.eclipse.mylyn.provisional.workbench.ui.CommonImages;
+import org.eclipse.mylyn.provisional.workbench.ui.DatePicker;
import org.eclipse.mylyn.tasks.core.AbstractTask;
import org.eclipse.mylyn.tasks.core.RepositoryOperation;
import org.eclipse.mylyn.tasks.core.RepositoryTaskAttribute;
-import org.eclipse.mylyn.tasks.ui.DatePicker;
import org.eclipse.mylyn.tasks.ui.TasksUi;
import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
import org.eclipse.mylyn.tasks.ui.editors.AbstractRepositoryTaskEditor;
@@ -86,7 +87,7 @@ public class BugzillaTaskEditor extends AbstractRepositoryTaskEditor {
private static final String LABEL_TIME_TRACKING = "Bugzilla Time Tracking";
private static final String LABEL_CUSTOM_FIELD = "Custom Fields";
-
+
protected Text keywordsText;
protected Text estimateText;
@@ -120,7 +121,7 @@ public class BugzillaTaskEditor extends AbstractRepositoryTaskEditor {
// config.setRightImage(PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_ELEMENT));
// compareInput = new BugzillaCompareInput(config);
}
-
+
@Override
protected boolean supportsCommentSort() {
return false;
@@ -132,7 +133,7 @@ public class BugzillaTaskEditor extends AbstractRepositoryTaskEditor {
try {
RepositoryConfiguration configuration = BugzillaCorePlugin.getRepositoryConfiguration(this.repository,
false, new NullProgressMonitor());
-
+
if (configuration != null) {
List<BugzillaCustomField> customFields = configuration.getCustomFields();
if (!customFields.isEmpty()) {
@@ -201,11 +202,11 @@ public class BugzillaTaskEditor extends AbstractRepositoryTaskEditor {
if (attribute != null && !attribute.isReadOnly()) {
Label label = createLabel(composite, attribute);
GridDataFactory.fillDefaults().align(SWT.RIGHT, SWT.CENTER).applyTo(label);
-
+
Composite textFieldComposite = getManagedForm().getToolkit().createComposite(composite);
GridDataFactory.swtDefaults().align(SWT.FILL, SWT.CENTER).applyTo(textFieldComposite);
GridLayoutFactory.swtDefaults().margins(1, 3).spacing(0, 3).applyTo(textFieldComposite);
-
+
GridData textData = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
textData.horizontalSpan = 1;
textData.widthHint = 135;
@@ -351,8 +352,8 @@ public class BugzillaTaskEditor extends AbstractRepositoryTaskEditor {
for (String bugNumber : values.split(",")) {
final String bugId = bugNumber.trim();
final String bugUrl = repository.getRepositoryUrl() + IBugzillaConstants.URL_GET_SHOW_BUG + bugId;
- final AbstractTask task = TasksUi.getTaskListManager().getTaskList().getTask(repository.getRepositoryUrl(),
- bugId);
+ final AbstractTask task = TasksUi.getTaskListManager().getTaskList().getTask(
+ repository.getRepositoryUrl(), bugId);
createTaskListHyperlink(hyperlinksComposite, bugId, bugUrl, task);
}
}
@@ -414,7 +415,8 @@ public class BugzillaTaskEditor extends AbstractRepositoryTaskEditor {
operation = BUGZILLA_OPERATION.valueOf(repositoryOperation.getKnobName());
} catch (RuntimeException e) {
// FIXME: ?
- StatusHandler.log(new Status(IStatus.INFO, BugzillaUiPlugin.PLUGIN_ID, "Unrecognized operation: " + repositoryOperation.getKnobName(), e));
+ StatusHandler.log(new Status(IStatus.INFO, BugzillaUiPlugin.PLUGIN_ID, "Unrecognized operation: "
+ + repositoryOperation.getKnobName(), e));
operation = null;
}
@@ -536,7 +538,7 @@ public class BugzillaTaskEditor extends AbstractRepositoryTaskEditor {
dateWithClear.setLayout(layout);
deadlinePicker = new DatePicker(dateWithClear, /* SWT.NONE */SWT.BORDER,
- taskData.getAttributeValue(BugzillaReportElement.DEADLINE.getKeyString()), false);
+ taskData.getAttributeValue(BugzillaReportElement.DEADLINE.getKeyString()), false, 0);
deadlinePicker.setFont(TEXT_FONT);
deadlinePicker.setDatePattern("yyyy-MM-dd");
if (hasChanged(attribute)) {
@@ -568,7 +570,7 @@ public class BugzillaTaskEditor extends AbstractRepositoryTaskEditor {
});
ImageHyperlink clearDeadlineDate = toolkit.createImageHyperlink(dateWithClear, SWT.NONE);
- clearDeadlineDate.setImage(TasksUiImages.getImage(TasksUiImages.REMOVE));
+ clearDeadlineDate.setImage(CommonImages.getImage(CommonImages.REMOVE));
clearDeadlineDate.setToolTipText("Clear");
clearDeadlineDate.addHyperlinkListener(new HyperlinkAdapter() {
@@ -623,7 +625,8 @@ public class BugzillaTaskEditor extends AbstractRepositoryTaskEditor {
List<String> validKeywords = new ArrayList<String>();
try {
- validKeywords = BugzillaCorePlugin.getRepositoryConfiguration(repository, false, new NullProgressMonitor()).getKeywords();
+ validKeywords = BugzillaCorePlugin.getRepositoryConfiguration(repository, false,
+ new NullProgressMonitor()).getKeywords();
} catch (Exception ex) {
// ignore
}
@@ -672,7 +675,8 @@ public class BugzillaTaskEditor extends AbstractRepositoryTaskEditor {
@Override
public void linkActivated(HyperlinkEvent e) {
if (BugzillaTaskEditor.this.getEditor() instanceof TaskEditor) {
- TasksUiUtil.openUrl(repository.getRepositoryUrl() + IBugzillaConstants.URL_SHOW_VOTES + taskData.getTaskId());
+ TasksUiUtil.openUrl(repository.getRepositoryUrl() + IBugzillaConstants.URL_SHOW_VOTES
+ + taskData.getTaskId());
}
}
});
@@ -682,7 +686,8 @@ public class BugzillaTaskEditor extends AbstractRepositoryTaskEditor {
@Override
public void linkActivated(HyperlinkEvent e) {
if (BugzillaTaskEditor.this.getEditor() instanceof TaskEditor) {
- TasksUiUtil.openUrl(repository.getRepositoryUrl() + IBugzillaConstants.URL_VOTE + taskData.getTaskId());
+ TasksUiUtil.openUrl(repository.getRepositoryUrl() + IBugzillaConstants.URL_VOTE
+ + taskData.getTaskId());
}
}
});
@@ -711,7 +716,8 @@ public class BugzillaTaskEditor extends AbstractRepositoryTaskEditor {
if (assignedAttribute != null) {
String bugzillaVersion;
try {
- bugzillaVersion = BugzillaCorePlugin.getRepositoryConfiguration(repository, false, new NullProgressMonitor()).getInstallVersion();
+ bugzillaVersion = BugzillaCorePlugin.getRepositoryConfiguration(repository, false,
+ new NullProgressMonitor()).getInstallVersion();
} catch (CoreException e1) {
// ignore
bugzillaVersion = "2.18";
@@ -800,9 +806,9 @@ public class BugzillaTaskEditor extends AbstractRepositoryTaskEditor {
if (haveRealName) {
textField.setText(textField.getText() + " <"
+ taskData.getAttributeValue(BugzillaReportElement.QA_CONTACT.getKeyString()) + ">");
- }
+ }
}
-
+
super.addSelfToCC(composite);
}
diff --git a/org.eclipse.mylyn.help.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.help.ui/META-INF/MANIFEST.MF
index a01275fe5..40479d000 100644
--- a/org.eclipse.mylyn.help.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.help.ui/META-INF/MANIFEST.MF
@@ -3,13 +3,14 @@ Bundle-ManifestVersion: 2
Bundle-Name: Mylyn Help
Bundle-SymbolicName: org.eclipse.mylyn.help.ui;singleton:=true
Bundle-Version: 3.0.0.qualifier
-Eclipse-AutoStart: true
+Bundle-ActivationPolicy: lazy
Bundle-Vendor: Eclipse.org
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui,
org.eclipse.ui.forms,
org.eclipse.mylyn.tasks.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.tasks.ui;bundle-version="[3.0.0,4.0.0)"
+ org.eclipse.mylyn.tasks.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.mylyn.workbench.ui;bundle-version="[3.0.0,4.0.0)"
Export-Package: org.eclipse.mylyn.internal.help.ui.actions;x-internal:=true,
org.eclipse.mylyn.internal.help.ui.dialogs;x-internal:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/dialogs/UiLegendDialog.java b/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/dialogs/UiLegendDialog.java
index cd02b65c6..ceea6c771 100644
--- a/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/dialogs/UiLegendDialog.java
+++ b/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/dialogs/UiLegendDialog.java
@@ -14,11 +14,12 @@ import java.util.List;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.dialogs.PopupDialog;
import org.eclipse.jface.preference.PreferenceDialog;
-import org.eclipse.mylyn.internal.tasks.ui.TaskListColorsAndFonts;
import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
import org.eclipse.mylyn.internal.tasks.ui.views.TaskElementLabelProvider;
import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView;
+import org.eclipse.mylyn.provisional.workbench.ui.CommonImages;
+import org.eclipse.mylyn.provisional.workbench.ui.CommonColorsAndFonts;
import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
import org.eclipse.mylyn.tasks.core.AbstractTask.PriorityLevel;
@@ -146,23 +147,23 @@ public class UiLegendDialog extends PopupDialog {
Label imageLabel;
imageLabel = toolkit.createLabel(tasksClient, "");
- imageLabel.setImage(TasksUiImages.getImage(TasksUiImages.TASK));
+ imageLabel.setImage(CommonImages.getImage(TasksUiImages.TASK));
toolkit.createLabel(tasksClient, "Task");
imageLabel = toolkit.createLabel(tasksClient, "");
- imageLabel.setImage(TasksUiImages.getImage(TasksUiImages.CATEGORY));
+ imageLabel.setImage(CommonImages.getImage(TasksUiImages.CATEGORY));
toolkit.createLabel(tasksClient, "Category");
imageLabel = toolkit.createLabel(tasksClient, "");
- imageLabel.setImage(TasksUiImages.getImage(TasksUiImages.QUERY));
+ imageLabel.setImage(CommonImages.getImage(TasksUiImages.QUERY));
toolkit.createLabel(tasksClient, "Query");
imageLabel = toolkit.createLabel(tasksClient, "");
- imageLabel.setImage(TasksUiImages.getImage(TasksUiImages.CALENDAR));
+ imageLabel.setImage(CommonImages.getImage(CommonImages.CALENDAR));
toolkit.createLabel(tasksClient, "Date range");
imageLabel = toolkit.createLabel(tasksClient, "");
- imageLabel.setImage(TasksUiImages.getImage(TasksUiImages.BLANK));
+ imageLabel.setImage(CommonImages.getImage(CommonImages.BLANK));
Hyperlink openView = toolkit.createHyperlink(tasksClient, "Open Task List...", SWT.WRAP);
openView.addHyperlinkListener(new IHyperlinkListener() {
@@ -201,23 +202,23 @@ public class UiLegendDialog extends PopupDialog {
Label imageLabel;
imageLabel = toolkit.createLabel(prioritiesClient, "");
- imageLabel.setImage(TasksUiImages.getImage(TasksUiImages.PRIORITY_1));
+ imageLabel.setImage(CommonImages.getImage(CommonImages.PRIORITY_1));
toolkit.createLabel(prioritiesClient, PriorityLevel.P1.getDescription());
imageLabel = toolkit.createLabel(prioritiesClient, "");
- imageLabel.setImage(TasksUiImages.getImage(TasksUiImages.PRIORITY_2));
+ imageLabel.setImage(CommonImages.getImage(CommonImages.PRIORITY_2));
toolkit.createLabel(prioritiesClient, PriorityLevel.P2.getDescription());
imageLabel = toolkit.createLabel(prioritiesClient, "");
- imageLabel.setImage(TasksUiImages.getImage(TasksUiImages.PRIORITY_3));
+ imageLabel.setImage(CommonImages.getImage(CommonImages.PRIORITY_3));
toolkit.createLabel(prioritiesClient, PriorityLevel.P3.getDescription() + " (default)");
imageLabel = toolkit.createLabel(prioritiesClient, "");
- imageLabel.setImage(TasksUiImages.getImage(TasksUiImages.PRIORITY_4));
+ imageLabel.setImage(CommonImages.getImage(CommonImages.PRIORITY_4));
toolkit.createLabel(prioritiesClient, PriorityLevel.P4.getDescription());
imageLabel = toolkit.createLabel(prioritiesClient, "");
- imageLabel.setImage(TasksUiImages.getImage(TasksUiImages.PRIORITY_5));
+ imageLabel.setImage(CommonImages.getImage(CommonImages.PRIORITY_5));
toolkit.createLabel(prioritiesClient, PriorityLevel.P5.getDescription());
}
@@ -240,16 +241,16 @@ public class UiLegendDialog extends PopupDialog {
activitySection.setClient(activityClient);
Label imageLabel = toolkit.createLabel(activityClient, "");
- imageLabel.setImage(TasksUiImages.getImage(TasksUiImages.TASK));
+ imageLabel.setImage(CommonImages.getImage(TasksUiImages.TASK));
Label labelToday = toolkit.createLabel(activityClient, "Scheduled for today");
labelToday.setForeground(themeManager.getCurrentTheme().getColorRegistry().get(
- TaskListColorsAndFonts.THEME_COLOR_TASK_TODAY_SCHEDULED));
+ CommonColorsAndFonts.THEME_COLOR_TASK_TODAY_SCHEDULED));
imageLabel = toolkit.createLabel(activityClient, "");
- imageLabel.setImage(TasksUiImages.getImage(TasksUiImages.TASK));
+ imageLabel.setImage(CommonImages.getImage(TasksUiImages.TASK));
Label labelOverdue = toolkit.createLabel(activityClient, "Past scheduled date");
labelOverdue.setForeground(themeManager.getCurrentTheme().getColorRegistry().get(
- TaskListColorsAndFonts.THEME_COLOR_TASK_PAST_SCHEDULED));
+ CommonColorsAndFonts.THEME_COLOR_TASK_PAST_SCHEDULED));
// imageLabel = toolkit.createLabel(activityClient, "");
// imageLabel.setImage(TasksUiImages.getImage(TasksUiImages.TASK));
@@ -259,32 +260,32 @@ public class UiLegendDialog extends PopupDialog {
// TaskListColorsAndFonts.THEME_COLOR_TASK_THISWEEK_SCHEDULED));
imageLabel = toolkit.createLabel(activityClient, "");
- imageLabel.setImage(TasksUiImages.getImage(TasksUiImages.TASK));
+ imageLabel.setImage(CommonImages.getImage(TasksUiImages.TASK));
Label labelCompleted = toolkit.createLabel(activityClient, "Completed");
- labelCompleted.setFont(TaskListColorsAndFonts.STRIKETHROUGH);
+ labelCompleted.setFont(CommonColorsAndFonts.STRIKETHROUGH);
// labelCompleted.setForeground(TaskListColorsAndFonts.COLOR_TASK_COMPLETED);
labelCompleted.setForeground(themeManager.getCurrentTheme().getColorRegistry().get(
- TaskListColorsAndFonts.THEME_COLOR_COMPLETED));
+ CommonColorsAndFonts.THEME_COLOR_COMPLETED));
imageLabel = toolkit.createLabel(activityClient, "");
- imageLabel.setImage(TasksUiImages.getImage(TasksUiImages.TASK));
+ imageLabel.setImage(CommonImages.getImage(TasksUiImages.TASK));
Label labelCompletedToday = toolkit.createLabel(activityClient, "Completed today");
- labelCompletedToday.setFont(TaskListColorsAndFonts.STRIKETHROUGH);
+ labelCompletedToday.setFont(CommonColorsAndFonts.STRIKETHROUGH);
labelCompletedToday.setForeground(themeManager.getCurrentTheme().getColorRegistry().get(
- TaskListColorsAndFonts.THEME_COLOR_TASK_TODAY_COMPLETED));
+ CommonColorsAndFonts.THEME_COLOR_TASK_TODAY_COMPLETED));
imageLabel = toolkit.createLabel(activityClient, "");
- imageLabel.setImage(TasksUiImages.getImage(TasksUiImages.OVERLAY_HAS_DUE));
+ imageLabel.setImage(CommonImages.getImage(CommonImages.OVERLAY_DATE_DUE));
toolkit.createLabel(activityClient, "Has due date");
imageLabel = toolkit.createLabel(activityClient, "");
- imageLabel.setImage(TasksUiImages.getImage(TasksUiImages.OVERLAY_OVER_DUE));
+ imageLabel.setImage(CommonImages.getImage(CommonImages.OVERLAY_DATE_OVERDUE));
Label textLabel = toolkit.createLabel(activityClient, "Past Due date");
textLabel.setForeground(themeManager.getCurrentTheme().getColorRegistry().get(
- TaskListColorsAndFonts.THEME_COLOR_TASK_PAST_DUE));
+ CommonColorsAndFonts.THEME_COLOR_TASK_PAST_DUE));
imageLabel = toolkit.createLabel(activityClient, "");
- imageLabel.setImage(TasksUiImages.getImage(TasksUiImages.BLANK));
+ imageLabel.setImage(CommonImages.getImage(CommonImages.BLANK));
Hyperlink adjust = toolkit.createHyperlink(activityClient, "Adjust Colors and Fonts...", SWT.WRAP);
adjust.addHyperlinkListener(new IHyperlinkListener() {
public void linkActivated(HyperlinkEvent e) {
@@ -325,19 +326,19 @@ public class UiLegendDialog extends PopupDialog {
Label imageLabel;
imageLabel = toolkit.createLabel(contextClient, "");
- imageLabel.setImage(TasksUiImages.getImage(TasksUiImages.CONTEXT_FOCUS));
+ imageLabel.setImage(CommonImages.getImage(TasksUiImages.CONTEXT_FOCUS));
toolkit.createLabel(contextClient, "Focus view on active task");
imageLabel = toolkit.createLabel(contextClient, "");
- imageLabel.setImage(TasksUiImages.getImage(TasksUiImages.TASK_INACTIVE));
+ imageLabel.setImage(CommonImages.getImage(TasksUiImages.CONTEXT_INACTIVE_EMPTY));
toolkit.createLabel(contextClient, "Inactive task with no context");
imageLabel = toolkit.createLabel(contextClient, "");
- imageLabel.setImage(TasksUiImages.getImage(TasksUiImages.TASK_INACTIVE_CONTEXT));
+ imageLabel.setImage(CommonImages.getImage(TasksUiImages.CONTEXT_INACTIVE));
toolkit.createLabel(contextClient, "Inactive task with context");
imageLabel = toolkit.createLabel(contextClient, "");
- imageLabel.setImage(TasksUiImages.getImage(TasksUiImages.TASK_ACTIVE));
+ imageLabel.setImage(CommonImages.getImage(TasksUiImages.CONTEXT_ACTIVE));
toolkit.createLabel(contextClient, "Active task");
}
@@ -361,23 +362,23 @@ public class UiLegendDialog extends PopupDialog {
Label imageLabel;
imageLabel = toolkit.createLabel(synchroClient, "");
- imageLabel.setImage(TasksUiImages.getImage(TasksUiImages.OVERLAY_INCOMMING_NEW));
+ imageLabel.setImage(CommonImages.getImage(CommonImages.OVERLAY_SYNC_INCOMMING_NEW));
toolkit.createLabel(synchroClient, "New task, open to view");
imageLabel = toolkit.createLabel(synchroClient, "");
- imageLabel.setImage(TasksUiImages.getImage(TasksUiImages.OVERLAY_INCOMMING));
+ imageLabel.setImage(CommonImages.getImage(CommonImages.OVERLAY_SYNC_INCOMMING));
toolkit.createLabel(synchroClient, "Incoming changes, open to view");
imageLabel = toolkit.createLabel(synchroClient, "");
- imageLabel.setImage(TasksUiImages.getImage(TasksUiImages.OVERLAY_OUTGOING));
+ imageLabel.setImage(CommonImages.getImage(CommonImages.OVERLAY_SYNC_OUTGOING));
toolkit.createLabel(synchroClient, "Outgoing changes");
imageLabel = toolkit.createLabel(synchroClient, "");
- imageLabel.setImage(TasksUiImages.getImage(TasksUiImages.OVERLAY_WARNING));
+ imageLabel.setImage(CommonImages.getImage(CommonImages.OVERLAY_SYNC_WARNING));
toolkit.createLabel(synchroClient, "Synchronization failed, mouse over for details");
imageLabel = toolkit.createLabel(synchroClient, "");
- imageLabel.setImage(TasksUiImages.getImage(TasksUiImages.OVERLAY_CONFLICT));
+ imageLabel.setImage(CommonImages.getImage(CommonImages.OVERLAY_SYNC_CONFLICT));
toolkit.createLabel(synchroClient, "Conflicting changes, need to synchronize");
}
@@ -394,8 +395,7 @@ public class UiLegendDialog extends PopupDialog {
composite.setLayout(layout);
composite.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
- Collection<AbstractRepositoryConnector> connectors = TasksUi.getRepositoryManager()
- .getRepositoryConnectors();
+ Collection<AbstractRepositoryConnector> connectors = TasksUi.getRepositoryManager().getRepositoryConnectors();
for (AbstractRepositoryConnector connector : connectors) {
AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getConnectorUi(connector.getConnectorKind());
if (connectorUi != null) {
@@ -474,7 +474,7 @@ public class UiLegendDialog extends PopupDialog {
private class CloseDialogAction extends Action {
private CloseDialogAction() {
- setImageDescriptor(TasksUiImages.NOTIFICATION_CLOSE);
+ setImageDescriptor(CommonImages.NOTIFICATION_CLOSE);
setText("Close Dialog");
}
diff --git a/org.eclipse.mylyn.tasks.bugs/META-INF/MANIFEST.MF b/org.eclipse.mylyn.tasks.bugs/META-INF/MANIFEST.MF
index fe6798e65..475ff96f6 100644
--- a/org.eclipse.mylyn.tasks.bugs/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.tasks.bugs/META-INF/MANIFEST.MF
@@ -8,7 +8,8 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui.views.log,
org.eclipse.mylyn.monitor.core;bundle-version="[3.0.0,4.0.0)",
org.eclipse.mylyn.tasks.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.tasks.ui;bundle-version="[3.0.0,4.0.0)"
+ org.eclipse.mylyn.tasks.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.mylyn.workbench.ui;bundle-version="[3.0.0,4.0.0)"
Bundle-Vendor: Eclipse.org
Bundle-ClassPath: .
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/wizards/ReportBugWizard.java b/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/wizards/ReportBugWizard.java
index 4f8c156f7..8add29477 100644
--- a/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/wizards/ReportBugWizard.java
+++ b/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/wizards/ReportBugWizard.java
@@ -12,8 +12,8 @@ import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IBundleGroup;
import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.mylyn.internal.tasks.bugs.TasksBugsPlugin;
import org.eclipse.mylyn.internal.tasks.bugs.PluginRepositoryMappingManager;
+import org.eclipse.mylyn.internal.tasks.bugs.TasksBugsPlugin;
import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
/**
diff --git a/org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF
index e2f887c55..95fe85d78 100644
--- a/org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF
@@ -32,6 +32,7 @@ Bundle-ClassPath: mylyn-tasklist-tests.jar
Export-Package: org.eclipse.mylyn.tasks.tests;x-internal:=true,
org.eclipse.mylyn.tasks.tests.bugs;x-internal:=true,
org.eclipse.mylyn.tasks.tests.connector;x-internal:=true,
+ org.eclipse.mylyn.tasks.tests.data;x-internal:=true,
org.eclipse.mylyn.tasks.tests.performance;x-internal:=true,
org.eclipse.mylyn.tasks.tests.web;x-internal:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF
index 27f69c8a0..29c2b4878 100644
--- a/org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.mylyn.monitor.core;bundle-version="[3.0.0,4.0.0)",
org.eclipse.mylyn.web.core;bundle-version="[3.0.0,4.0.0)",
org.apache.xmlrpc;bundle-version="[3.0.0,4.0.0)"
-Eclipse-LazyStart: true
+Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.mylyn.internal.trac.core;x-friends:="org.eclipse.mylyn.trac.ui",
org.eclipse.mylyn.internal.trac.core.model;x-friends:="org.eclipse.mylyn.trac.ui",
org.eclipse.mylyn.internal.trac.core.util;x-friends:="org.eclipse.mylyn.trac.ui"
diff --git a/org.eclipse.mylyn.trac.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.trac.tests/META-INF/MANIFEST.MF
index 718036974..c6ef4b834 100644
--- a/org.eclipse.mylyn.trac.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.trac.tests/META-INF/MANIFEST.MF
@@ -20,6 +20,5 @@ Require-Bundle: org.apache.xmlrpc;bundle-version="3.0.0",
Export-Package: org.eclipse.mylyn.internal.trac.ui;x-internal:=true,
org.eclipse.mylyn.trac.tests;x-internal:=true,
org.eclipse.mylyn.trac.tests.support;x-internal:=true
-Eclipse-LazyStart: false
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: Eclipse.org
diff --git a/org.eclipse.mylyn.trac.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.trac.ui/META-INF/MANIFEST.MF
index cc86dcb34..7b146dfd2 100644
--- a/org.eclipse.mylyn.trac.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.trac.ui/META-INF/MANIFEST.MF
@@ -14,8 +14,9 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.mylyn.tasks.core;bundle-version="[3.0.0,4.0.0)",
org.eclipse.mylyn.tasks.ui;bundle-version="[3.0.0,4.0.0)",
org.eclipse.mylyn.trac.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.web.core;bundle-version="[3.0.0,4.0.0)"
-Eclipse-LazyStart: true
+ org.eclipse.mylyn.web.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.mylyn.workbench.ui;bundle-version="[3.0.0,4.0.0)"
+Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.mylyn.internal.trac.ui;x-internal:=true,
org.eclipse.mylyn.internal.trac.ui.editor;x-internal:=true,
org.eclipse.mylyn.internal.trac.ui.wizard;x-internal:=true
diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorFactory.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorFactory.java
index 780e58577..bfb130014 100644
--- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorFactory.java
+++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorFactory.java
@@ -9,10 +9,10 @@
package org.eclipse.mylyn.internal.trac.ui.editor;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
import org.eclipse.mylyn.internal.trac.core.TracCorePlugin;
import org.eclipse.mylyn.internal.trac.core.TracRepositoryConnector;
import org.eclipse.mylyn.internal.trac.core.TracTask;
+import org.eclipse.mylyn.provisional.workbench.ui.CommonImages;
import org.eclipse.mylyn.tasks.core.AbstractTask;
import org.eclipse.mylyn.tasks.core.TaskRepository;
import org.eclipse.mylyn.tasks.ui.TasksUi;
@@ -83,7 +83,7 @@ public class TracTaskEditorFactory extends AbstractTaskEditorFactory {
return new TaskEditorInput(repository, task) {
@Override
public ImageDescriptor getImageDescriptor() {
- return TasksUiImages.BROWSER_SMALL;
+ return CommonImages.BROWSER_SMALL;
}
};
}

Back to the top