Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrsuen2008-06-05 21:27:06 +0000
committerrsuen2008-06-05 21:27:06 +0000
commit02456c7a2a72bd37155438ace9e8ba28d6c2e003 (patch)
tree334dd84a4dcabc291f5c189d3e7d428cfd574e58 /incubation/bundles
parentbd449c08cfebf5d63a67589c1a7871307ab201b2 (diff)
downloadorg.eclipse.ecf-02456c7a2a72bd37155438ace9e8ba28d6c2e003.tar.gz
org.eclipse.ecf-02456c7a2a72bd37155438ace9e8ba28d6c2e003.tar.xz
org.eclipse.ecf-02456c7a2a72bd37155438ace9e8ba28d6c2e003.zip
Commit work towards Mylyn 3.0 API compatibility.
Diffstat (limited to 'incubation/bundles')
-rwxr-xr-xincubation/bundles/org.eclipse.ecf.mylyn.ui/.settings/org.eclipse.jdt.core.prefs19
-rwxr-xr-xincubation/bundles/org.eclipse.ecf.mylyn.ui/META-INF/MANIFEST.MF3
-rwxr-xr-xincubation/bundles/org.eclipse.ecf.mylyn.ui/src/org/eclipse/ecf/internal/mylyn/ui/ActivateReceivedContextHandler.java6
-rwxr-xr-xincubation/bundles/org.eclipse.ecf.mylyn.ui/src/org/eclipse/ecf/internal/mylyn/ui/Activator.java6
-rwxr-xr-xincubation/bundles/org.eclipse.ecf.mylyn.ui/src/org/eclipse/ecf/internal/mylyn/ui/CompoundContextActivationContributionItem.java22
-rwxr-xr-xincubation/bundles/org.eclipse.ecf.mylyn.ui/src/org/eclipse/ecf/internal/mylyn/ui/IncomingSharedTaskNotificationPopup.java12
-rwxr-xr-xincubation/bundles/org.eclipse.ecf.mylyn.ui/src/org/eclipse/ecf/internal/mylyn/ui/SelectTaskDialog.java10
-rwxr-xr-xincubation/bundles/org.eclipse.ecf.mylyn.ui/src/org/eclipse/ecf/internal/mylyn/ui/SendContextContributionItem.java11
8 files changed, 53 insertions, 36 deletions
diff --git a/incubation/bundles/org.eclipse.ecf.mylyn.ui/.settings/org.eclipse.jdt.core.prefs b/incubation/bundles/org.eclipse.ecf.mylyn.ui/.settings/org.eclipse.jdt.core.prefs
index 78523cd05..63cfbd7d3 100755
--- a/incubation/bundles/org.eclipse.ecf.mylyn.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/incubation/bundles/org.eclipse.ecf.mylyn.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Thu Aug 16 11:00:59 EDT 2007
+#Thu Jun 05 17:17:26 EDT 2008
eclipse.preferences.version=1
org.eclipse.jdt.core.builder.cleanOutputFolder=clean
org.eclipse.jdt.core.builder.duplicateResourceTask=warning
@@ -22,13 +22,15 @@ org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
org.eclipse.jdt.core.compiler.problem.deprecation=warning
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=error
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
@@ -49,8 +51,14 @@ org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
@@ -64,13 +72,18 @@ org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.3
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
diff --git a/incubation/bundles/org.eclipse.ecf.mylyn.ui/META-INF/MANIFEST.MF b/incubation/bundles/org.eclipse.ecf.mylyn.ui/META-INF/MANIFEST.MF
index 13324a2f7..11867452a 100755
--- a/incubation/bundles/org.eclipse.ecf.mylyn.ui/META-INF/MANIFEST.MF
+++ b/incubation/bundles/org.eclipse.ecf.mylyn.ui/META-INF/MANIFEST.MF
@@ -15,6 +15,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.mylyn.tasks.ui,
org.eclipse.ecf.presence.ui,
org.eclipse.mylyn.context.core,
- org.eclipse.ui.forms
+ org.eclipse.ui.forms,
+ org.eclipse.mylyn.commons.ui
Bundle-RequiredExecutionEnvironment: J2SE-1.4
Eclipse-LazyStart: true
diff --git a/incubation/bundles/org.eclipse.ecf.mylyn.ui/src/org/eclipse/ecf/internal/mylyn/ui/ActivateReceivedContextHandler.java b/incubation/bundles/org.eclipse.ecf.mylyn.ui/src/org/eclipse/ecf/internal/mylyn/ui/ActivateReceivedContextHandler.java
index 2b632132c..e1adbf079 100755
--- a/incubation/bundles/org.eclipse.ecf.mylyn.ui/src/org/eclipse/ecf/internal/mylyn/ui/ActivateReceivedContextHandler.java
+++ b/incubation/bundles/org.eclipse.ecf.mylyn.ui/src/org/eclipse/ecf/internal/mylyn/ui/ActivateReceivedContextHandler.java
@@ -14,7 +14,7 @@ import org.eclipse.core.commands.*;
import org.eclipse.ecf.internal.mylyn.ui.CompoundContextActivationContributionItem.ActivateTaskAction;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.window.Window;
-import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.ITask;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.dialogs.ElementListSelectionDialog;
import org.eclipse.ui.handlers.HandlerUtil;
@@ -32,14 +32,14 @@ public class ActivateReceivedContextHandler extends AbstractHandler {
static void open(Shell shell) {
ElementListSelectionDialog elsd = new ElementListSelectionDialog(shell, new LabelProvider() {
public String getText(Object element) {
- String summary = ((AbstractTask) element).getSummary();
+ String summary = ((ITask) element).getSummary();
return summary;
}
});
elsd.setElements(CompoundContextActivationContributionItem.tasks.toArray());
if (Window.OK == elsd.open()) {
ActivateTaskAction action = new CompoundContextActivationContributionItem.ActivateTaskAction();
- action.setTask((AbstractTask) elsd.getFirstResult());
+ action.setTask((ITask) elsd.getFirstResult());
action.run();
}
}
diff --git a/incubation/bundles/org.eclipse.ecf.mylyn.ui/src/org/eclipse/ecf/internal/mylyn/ui/Activator.java b/incubation/bundles/org.eclipse.ecf.mylyn.ui/src/org/eclipse/ecf/internal/mylyn/ui/Activator.java
index b179a33c2..596fdcc09 100755
--- a/incubation/bundles/org.eclipse.ecf.mylyn.ui/src/org/eclipse/ecf/internal/mylyn/ui/Activator.java
+++ b/incubation/bundles/org.eclipse.ecf.mylyn.ui/src/org/eclipse/ecf/internal/mylyn/ui/Activator.java
@@ -21,10 +21,10 @@ import org.eclipse.ecf.datashare.events.IChannelEvent;
import org.eclipse.ecf.datashare.events.IChannelMessageEvent;
import org.eclipse.ecf.presence.service.IPresenceService;
import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.mylyn.context.core.ContextCorePlugin;
+import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
import org.eclipse.mylyn.internal.context.core.InteractionContext;
-import org.eclipse.mylyn.tasks.core.AbstractTask;
-import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
+import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
+import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
diff --git a/incubation/bundles/org.eclipse.ecf.mylyn.ui/src/org/eclipse/ecf/internal/mylyn/ui/CompoundContextActivationContributionItem.java b/incubation/bundles/org.eclipse.ecf.mylyn.ui/src/org/eclipse/ecf/internal/mylyn/ui/CompoundContextActivationContributionItem.java
index 9a3bb9f15..b92b508ab 100755
--- a/incubation/bundles/org.eclipse.ecf.mylyn.ui/src/org/eclipse/ecf/internal/mylyn/ui/CompoundContextActivationContributionItem.java
+++ b/incubation/bundles/org.eclipse.ecf.mylyn.ui/src/org/eclipse/ecf/internal/mylyn/ui/CompoundContextActivationContributionItem.java
@@ -15,12 +15,14 @@ import org.eclipse.core.runtime.*;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.action.*;
import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.mylyn.context.core.ContextCorePlugin;
+import org.eclipse.mylyn.context.core.IInteractionContext;
+import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
import org.eclipse.mylyn.internal.context.core.InteractionContext;
-import org.eclipse.mylyn.internal.tasks.ui.ITasksUiConstants;
-import org.eclipse.mylyn.tasks.core.AbstractTask;
-import org.eclipse.mylyn.tasks.core.TaskList;
-import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
+import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
+import org.eclipse.mylyn.internal.tasks.core.TaskList;
+import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
+import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.ui.ITasksUiConstants;
import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.actions.CompoundContributionItem;
@@ -76,15 +78,15 @@ public class CompoundContextActivationContributionItem extends CompoundContribut
return array;
}
- static void enqueue(AbstractTask task, InteractionContext context) {
+ static void enqueue(ITask task, IInteractionContext context) {
tasks.add(task);
contexts.put(task, context);
}
static class ActivateTaskAction extends Action {
- private AbstractTask task;
+ private ITask task;
- void setTask(AbstractTask task) {
+ void setTask(ITask task) {
this.task = task;
setText(task.getSummary());
}
@@ -92,7 +94,7 @@ public class CompoundContextActivationContributionItem extends CompoundContribut
public void run() {
final InteractionContext context = (InteractionContext) contexts.get(task);
- final TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList();
+ final TaskList taskList = TasksUiPlugin.getTaskList();
if (taskList.getTask(task.getHandleIdentifier()) != null) {
boolean confirmed = MessageDialog.openConfirm(shell, ITasksUiConstants.TITLE_DIALOG, "The task '" + task.getSummary() + "' already exists. Do you want to override its context with the source?");
if (confirmed) {
@@ -125,7 +127,7 @@ public class CompoundContextActivationContributionItem extends CompoundContribut
private void scheduleTaskActivationJob() {
UIJob job = new UIJob(shell.getDisplay(), "Activate imported task") {
public IStatus runInUIThread(IProgressMonitor monitor) {
- TasksUiPlugin.getTaskListManager().activateTask(task);
+ TasksUiPlugin.getTaskListManager().activateTask((AbstractTask) task);
return Status.OK_STATUS;
}
};
diff --git a/incubation/bundles/org.eclipse.ecf.mylyn.ui/src/org/eclipse/ecf/internal/mylyn/ui/IncomingSharedTaskNotificationPopup.java b/incubation/bundles/org.eclipse.ecf.mylyn.ui/src/org/eclipse/ecf/internal/mylyn/ui/IncomingSharedTaskNotificationPopup.java
index ae8e52f1c..2fc1193bb 100755
--- a/incubation/bundles/org.eclipse.ecf.mylyn.ui/src/org/eclipse/ecf/internal/mylyn/ui/IncomingSharedTaskNotificationPopup.java
+++ b/incubation/bundles/org.eclipse.ecf.mylyn.ui/src/org/eclipse/ecf/internal/mylyn/ui/IncomingSharedTaskNotificationPopup.java
@@ -15,11 +15,11 @@ package org.eclipse.ecf.internal.mylyn.ui;
import org.eclipse.ecf.internal.mylyn.ui.CompoundContextActivationContributionItem.ActivateTaskAction;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.viewers.DecoratingLabelProvider;
+import org.eclipse.mylyn.internal.provisional.commons.ui.AbstractNotificationPopup;
import org.eclipse.mylyn.internal.tasks.ui.TaskListHyperlink;
-import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
-import org.eclipse.mylyn.internal.tasks.ui.notifications.AbstractNotificationPopup;
-import org.eclipse.mylyn.internal.tasks.ui.views.TaskElementLabelProvider;
-import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.ui.TaskElementLabelProvider;
+import org.eclipse.mylyn.tasks.ui.TasksUiImages;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.*;
@@ -31,7 +31,7 @@ class IncomingSharedTaskNotificationPopup extends AbstractNotificationPopup {
private static final DecoratingLabelProvider labelProvider = new DecoratingLabelProvider(new TaskElementLabelProvider(true), PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator());
- private AbstractTask task;
+ private ITask task;
IncomingSharedTaskNotificationPopup(Widget widget) {
super(widget.getDisplay());
@@ -41,7 +41,7 @@ class IncomingSharedTaskNotificationPopup extends AbstractNotificationPopup {
return "Incoming Task Context";
}
- void setTask(AbstractTask task) {
+ void setTask(ITask task) {
this.task = task;
}
diff --git a/incubation/bundles/org.eclipse.ecf.mylyn.ui/src/org/eclipse/ecf/internal/mylyn/ui/SelectTaskDialog.java b/incubation/bundles/org.eclipse.ecf.mylyn.ui/src/org/eclipse/ecf/internal/mylyn/ui/SelectTaskDialog.java
index f0ff2629f..ee7019557 100755
--- a/incubation/bundles/org.eclipse.ecf.mylyn.ui/src/org/eclipse/ecf/internal/mylyn/ui/SelectTaskDialog.java
+++ b/incubation/bundles/org.eclipse.ecf.mylyn.ui/src/org/eclipse/ecf/internal/mylyn/ui/SelectTaskDialog.java
@@ -13,7 +13,7 @@ package org.eclipse.ecf.internal.mylyn.ui;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.viewers.*;
-import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.ITask;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.layout.GridData;
@@ -24,7 +24,7 @@ class SelectTaskDialog extends Dialog {
private ListViewer viewer;
- private AbstractTask task;
+ private ITask task;
private Object input;
@@ -52,7 +52,7 @@ class SelectTaskDialog extends Dialog {
viewer.setContentProvider(new ArrayContentProvider());
viewer.setLabelProvider(new LabelProvider() {
public String getText(Object element) {
- String summary = ((AbstractTask) element).getSummary();
+ String summary = ((ITask) element).getSummary();
if (summary.length() > 30) {
return summary.substring(0, 30) + "..."; //$NON-NLS-1$
} else {
@@ -81,7 +81,7 @@ class SelectTaskDialog extends Dialog {
}
protected void okPressed() {
- task = (AbstractTask) ((IStructuredSelection) viewer.getSelection()).getFirstElement();
+ task = (ITask) ((IStructuredSelection) viewer.getSelection()).getFirstElement();
super.okPressed();
}
@@ -89,7 +89,7 @@ class SelectTaskDialog extends Dialog {
this.input = input;
}
- AbstractTask getTask() {
+ ITask getTask() {
return task;
}
diff --git a/incubation/bundles/org.eclipse.ecf.mylyn.ui/src/org/eclipse/ecf/internal/mylyn/ui/SendContextContributionItem.java b/incubation/bundles/org.eclipse.ecf.mylyn.ui/src/org/eclipse/ecf/internal/mylyn/ui/SendContextContributionItem.java
index 4923de781..539859d99 100755
--- a/incubation/bundles/org.eclipse.ecf.mylyn.ui/src/org/eclipse/ecf/internal/mylyn/ui/SendContextContributionItem.java
+++ b/incubation/bundles/org.eclipse.ecf.mylyn.ui/src/org/eclipse/ecf/internal/mylyn/ui/SendContextContributionItem.java
@@ -25,8 +25,9 @@ import org.eclipse.ecf.presence.ui.menu.AbstractRosterMenuContributionItem;
import org.eclipse.ecf.presence.ui.menu.AbstractRosterMenuHandler;
import org.eclipse.jface.action.IContributionItem;
import org.eclipse.jface.viewers.*;
-import org.eclipse.mylyn.tasks.core.AbstractTask;
-import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
+import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
+import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
+import org.eclipse.mylyn.tasks.core.ITask;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.IWorkbenchSite;
import org.eclipse.ui.handlers.HandlerUtil;
@@ -76,13 +77,13 @@ public class SendContextContributionItem extends AbstractRosterMenuContributionI
return null;
}
Object element = ((IStructuredSelection) selection).getFirstElement();
- if (element instanceof AbstractTask) {
- final AbstractTask task = (AbstractTask) element;
+ if (element instanceof ITask) {
+ final ITask task = (ITask) element;
Job job = new Job("Send Task") {
protected IStatus run(IProgressMonitor monitor) {
monitor.beginTask("Sending task...", 5);
ByteArrayOutputStream stream = new ByteArrayOutputStream();
- TasksUiPlugin.getTaskListManager().getTaskListWriter().writeTask(task, stream);
+ TasksUiPlugin.getTaskListManager().getTaskListWriter().writeTask((AbstractTask) task, stream);
monitor.worked(2);
try {
channel.sendMessage(getRosterEntry().getUser().getID(), stream.toByteArray());

Back to the top