diff options
13 files changed, 23 insertions, 51 deletions
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaFlagPart.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaFlagPart.java index d69f92d72..1455e8d6e 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaFlagPart.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaFlagPart.java @@ -17,9 +17,9 @@ import java.util.Comparator; import java.util.List; import java.util.Map; +import org.eclipse.jface.action.LegacyActionTools; import org.eclipse.jface.action.ToolBarManager; import org.eclipse.jface.layout.GridDataFactory; -import org.eclipse.mylyn.commons.ui.CommonUiUtil; import org.eclipse.mylyn.internal.bugzilla.core.BugzillaAttribute; import org.eclipse.mylyn.internal.tasks.ui.editors.EditorUtil; import org.eclipse.mylyn.internal.tasks.ui.notifications.TaskDiffUtil; @@ -262,7 +262,7 @@ public class BugzillaFlagPart extends AbstractTaskEditorPart { return; } - final Label label = toolkit.createLabel(composite, CommonUiUtil.toLabel(text)); + final Label label = toolkit.createLabel(composite, LegacyActionTools.escapeMnemonics(text)); label.setForeground(toolkit.getColors().getColor(IFormColors.TITLE)); label.setBackground(null); label.setVisible(!section.isExpanded()); diff --git a/org.eclipse.mylyn.tasks.index.ui/src/org/eclipse/mylyn/internal/tasks/index/ui/IndexSearchHandler.java b/org.eclipse.mylyn.tasks.index.ui/src/org/eclipse/mylyn/internal/tasks/index/ui/IndexSearchHandler.java index 59f8da32c..a58562c3a 100644 --- a/org.eclipse.mylyn.tasks.index.ui/src/org/eclipse/mylyn/internal/tasks/index/ui/IndexSearchHandler.java +++ b/org.eclipse.mylyn.tasks.index.ui/src/org/eclipse/mylyn/internal/tasks/index/ui/IndexSearchHandler.java @@ -10,8 +10,6 @@ *******************************************************************************/ package org.eclipse.mylyn.internal.tasks.index.ui; -import java.lang.reflect.Method; - import org.eclipse.jface.fieldassist.ContentProposalAdapter; import org.eclipse.jface.fieldassist.IContentProposalProvider; import org.eclipse.jface.fieldassist.TextContentAdapter; @@ -107,15 +105,7 @@ public class IndexSearchHandler extends AbstractSearchHandler { textControl.removeListener(SWT.Traverse, listener); textControl.addListener(SWT.Traverse, new Listener() { public void handleEvent(Event event) { - // TODO e3.6 replace with call to adapter.isProposalPopupOpen() - boolean popupOpen = false; - try { - Method method = ContentProposalAdapter.class.getDeclaredMethod("isProposalPopupOpen"); //$NON-NLS-1$ - popupOpen = (Boolean) method.invoke(adapter); - } catch (Exception e) { - // ignore, Eclipse 3.5 does not support this API - } - if (!popupOpen) { + if (!adapter.isProposalPopupOpen()) { listener.handleEvent(event); } } diff --git a/org.eclipse.mylyn.tasks.search/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultContentProvider.java b/org.eclipse.mylyn.tasks.search/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultContentProvider.java index 23f103619..ce19887b4 100644 --- a/org.eclipse.mylyn.tasks.search/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultContentProvider.java +++ b/org.eclipse.mylyn.tasks.search/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultContentProvider.java @@ -15,10 +15,8 @@ import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; /** - * @author Rob Elves (moved into task.ui) - * @see org.eclipse.jface.viewers.IContentProvider + * @author Rob Elves */ -// TODO e3.5 merge into SearchResultTreeContentProvider public abstract class SearchResultContentProvider implements ITreeContentProvider { /** An empty array of objects */ diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/context/RetrieveLatestContextDialog.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/context/RetrieveLatestContextDialog.java index e8a9ffa1c..6e3dc98c2 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/context/RetrieveLatestContextDialog.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/context/RetrieveLatestContextDialog.java @@ -24,7 +24,6 @@ import org.eclipse.jface.wizard.ProgressMonitorPart; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.mylyn.commons.workbench.WorkbenchUtil; import org.eclipse.mylyn.internal.tasks.ui.util.AttachmentUtil; -import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiInternal; import org.eclipse.mylyn.tasks.core.ITask; import org.eclipse.mylyn.tasks.core.ITaskAttachment; import org.eclipse.mylyn.tasks.core.TaskRepository; @@ -77,7 +76,7 @@ public class RetrieveLatestContextDialog extends MessageDialog { RetrieveLatestContextDialog dialog = new RetrieveLatestContextDialog(shell, Messages.RetrieveLatestContextDialog_Dialog_Title, null, message, kind, new String[] { IDialogConstants.OK_LABEL, IDialogConstants.CANCEL_LABEL }, 0, task, attachment); - style &= TasksUiInternal.SWT_SHEET; + style &= SWT.SHEET; dialog.setShellStyle(dialog.getShellStyle() | style); return dialog.open() == 0; } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AbstractTaskEditorSection.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AbstractTaskEditorSection.java index 7bbacbe65..e6fca0078 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AbstractTaskEditorSection.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AbstractTaskEditorSection.java @@ -18,10 +18,10 @@ import org.eclipse.core.runtime.ISafeRunnable; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.SafeRunner; import org.eclipse.core.runtime.Status; +import org.eclipse.jface.action.LegacyActionTools; import org.eclipse.jface.action.ToolBarManager; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.mylyn.commons.core.StatusHandler; -import org.eclipse.mylyn.commons.ui.CommonUiUtil; import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin; import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPart; import org.eclipse.swt.SWT; @@ -82,7 +82,7 @@ public abstract class AbstractTaskEditorSection extends AbstractTaskEditorPart { return; } - final Label label = toolkit.createLabel(composite, CommonUiUtil.toLabel(text)); + final Label label = toolkit.createLabel(composite, LegacyActionTools.escapeMnemonics(text)); label.setForeground(toolkit.getColors().getColor(IFormColors.TITLE)); label.setBackground(null); label.setVisible(!section.isExpanded()); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorAttachmentPart.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorAttachmentPart.java index 725ed362b..bbc8b2a4a 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorAttachmentPart.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorAttachmentPart.java @@ -24,6 +24,7 @@ import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.IMenuListener; import org.eclipse.jface.action.IMenuManager; +import org.eclipse.jface.action.LegacyActionTools; import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.action.ToolBarManager; import org.eclipse.jface.layout.GridDataFactory; @@ -38,7 +39,6 @@ import org.eclipse.jface.viewers.ViewerFilter; import org.eclipse.jface.window.ToolTip; import org.eclipse.mylyn.commons.core.CoreUtil; import org.eclipse.mylyn.commons.ui.CommonImages; -import org.eclipse.mylyn.commons.ui.CommonUiUtil; import org.eclipse.mylyn.commons.ui.TableSorter; import org.eclipse.mylyn.commons.ui.TableViewerSupport; import org.eclipse.mylyn.commons.workbench.forms.CommonFormUtil; @@ -377,10 +377,10 @@ public class TaskEditorAttachmentPart extends AbstractTaskEditorPart { private void updateSectionTitle() { if (tableFilter.isFilterDeprecatedEnabled()) { section.setText(NLS.bind(Messages.TaskEditorAttachmentPart_Attachment_Section_Title_X_of_Y, new Object[] { - CommonUiUtil.toLabel(getPartName()), nonDeprecatedCount, attachmentAttributes.size() })); + LegacyActionTools.escapeMnemonics(getPartName()), nonDeprecatedCount, attachmentAttributes.size() })); } else { section.setText(NLS.bind(Messages.TaskEditorAttachmentPart_Attachment_Section_Title_X, - CommonUiUtil.toLabel(getPartName()), attachmentAttributes.size())); + LegacyActionTools.escapeMnemonics(getPartName()), attachmentAttributes.size())); } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskListNotificationPopup.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskListNotificationPopup.java index 6f627570f..71961901b 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskListNotificationPopup.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskListNotificationPopup.java @@ -14,9 +14,9 @@ package org.eclipse.mylyn.internal.tasks.ui.notifications; import java.util.ArrayList; import java.util.List; +import org.eclipse.jface.action.LegacyActionTools; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.mylyn.commons.notifications.ui.AbstractUiNotification; -import org.eclipse.mylyn.commons.ui.CommonUiUtil; import org.eclipse.mylyn.commons.workbench.AbstractWorkbenchNotificationPopup; import org.eclipse.mylyn.internal.tasks.core.AbstractTask; import org.eclipse.mylyn.internal.tasks.ui.TaskScalingHyperlink; @@ -105,7 +105,7 @@ public class TaskListNotificationPopup extends AbstractWorkbenchNotificationPopu | SWT.NO_FOCUS); GridDataFactory.fillDefaults().grab(true, false).align(SWT.FILL, SWT.TOP).applyTo(itemLink); - itemLink.setText(CommonUiUtil.toLabel(notification.getLabel())); + itemLink.setText(LegacyActionTools.escapeMnemonics(notification.getLabel())); itemLink.setImage(notification.getNotificationImage()); itemLink.setBackground(parent.getBackground()); itemLink.addHyperlinkListener(new HyperlinkAdapter() { @@ -133,7 +133,7 @@ public class TaskListNotificationPopup extends AbstractWorkbenchNotificationPopu } if (descriptionText != null && !descriptionText.trim().equals("")) { //$NON-NLS-1$ Label descriptionLabel = new Label(notificationComposite, SWT.NO_FOCUS); - descriptionLabel.setText(CommonUiUtil.toLabel(descriptionText)); + descriptionLabel.setText(LegacyActionTools.escapeMnemonics(descriptionText)); descriptionLabel.setBackground(parent.getBackground()); GridDataFactory.fillDefaults() .span(2, SWT.DEFAULT) diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/PlatformUtil.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/PlatformUtil.java index d735e2775..3ba473430 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/PlatformUtil.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/PlatformUtil.java @@ -97,7 +97,6 @@ public class PlatformUtil { return "carbon".equals(SWT.getPlatform()) || "cocoa".equals(SWT.getPlatform()); //$NON-NLS-1$ //$NON-NLS-2$ } - // TODO e3.5: remove, platform has been fixed, see bug 272046 public static boolean isPaintItemClippingRequired() { return "gtk".equals(SWT.getPlatform()); //$NON-NLS-1$ } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiInternal.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiInternal.java index fe5ac0977..e2f3ed054 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiInternal.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiInternal.java @@ -154,7 +154,10 @@ public class TasksUiInternal { private static final TaskDropHandler taskDropHandler = new TaskDropHandler(); - // TODO e3.5 replace by SWT.SHEET + /** + * @deprecated use SWT.SHEET instead + */ + @Deprecated public static final int SWT_SHEET = 1 << 28; public static final String ID_MENU_ACTIVE_TASK = "org.eclipse.mylyn.tasks.ui.menus.activeTask"; //$NON-NLS-1$ 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 c1e1ccd18..6d5384ba8 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 @@ -58,8 +58,6 @@ public class CustomTaskListDecorationDrawer implements Listener { private final Rectangle lastClippingArea; - private final boolean tweakClipping; - private boolean useStrikethroughForCompleted; private boolean synchronizationOverlaid; @@ -84,7 +82,6 @@ public class CustomTaskListDecorationDrawer implements Listener { public CustomTaskListDecorationDrawer(int activationImageOffset, boolean focusedMode) { this.activationImageOffset = activationImageOffset; this.lastClippingArea = new Rectangle(0, 0, 0, 0); - this.tweakClipping = PlatformUiUtil.isPaintItemClippingRequired(); this.platformSpecificSquish = PlatformUiUtil.getTreeItemSquish(); this.synchronizationOverlaid = TasksUiPlugin.getDefault() .getPreferenceStore() @@ -152,30 +149,16 @@ public class CustomTaskListDecorationDrawer implements Listener { // int offsetY = tree.getViewer().getExpandedElements().length * tree.getViewer().getTree().getItemHeight(); // event.gc.drawText("Open search dialog...", 20, offsetY - 10); // } - if (tweakClipping) { - lastClippingArea.x = event.x; - lastClippingArea.y = event.y; - lastClippingArea.width = event.width; - lastClippingArea.height = event.height; - } break; } case SWT.PaintItem: { Rectangle clipping = null; - if (tweakClipping) { - // GTK requires setting the clipping from the erase event so that images can be drawn to the left of the content area - clipping = event.gc.getClipping(); - event.gc.setClipping(lastClippingArea); - } if (activationImage != null) { drawActivationImage(activationImageOffset, event, activationImage); } if (data instanceof ITaskContainer) { drawSyncronizationImage((ITaskContainer) data, event); } - if (tweakClipping) { - event.gc.setClipping(clipping); - } break; } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListToolTip.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListToolTip.java index 40d7bf0c2..2a023f2dc 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListToolTip.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListToolTip.java @@ -21,10 +21,10 @@ import java.util.List; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IStatus; +import org.eclipse.jface.action.LegacyActionTools; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.mylyn.commons.core.DateUtil; import org.eclipse.mylyn.commons.ui.CommonImages; -import org.eclipse.mylyn.commons.ui.CommonUiUtil; import org.eclipse.mylyn.commons.ui.GradientToolTip; import org.eclipse.mylyn.commons.ui.PlatformUiUtil; import org.eclipse.mylyn.commons.ui.compatibility.CommonFonts; @@ -659,7 +659,7 @@ public class TaskListToolTip extends GradientToolTip { textLabel.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND)); textLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_CENTER)); text = removeTrailingNewline(text); - textLabel.setText(CommonUiUtil.toLabel(text)); + textLabel.setText(LegacyActionTools.escapeMnemonics(text)); int width = Math.min(textLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT).x, MAX_WIDTH); GridDataFactory.fillDefaults().align(SWT.FILL, SWT.BEGINNING).hint(width, SWT.DEFAULT).applyTo(textLabel); } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractAttributeEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractAttributeEditor.java index 211763a01..38291ebdd 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractAttributeEditor.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractAttributeEditor.java @@ -12,7 +12,7 @@ package org.eclipse.mylyn.tasks.ui.editors; import org.eclipse.core.runtime.Assert; -import org.eclipse.mylyn.commons.ui.CommonUiUtil; +import org.eclipse.jface.action.LegacyActionTools; import org.eclipse.mylyn.tasks.core.data.TaskAttribute; import org.eclipse.mylyn.tasks.core.data.TaskAttributeMapper; import org.eclipse.mylyn.tasks.core.data.TaskDataModel; @@ -153,7 +153,7 @@ public abstract class AbstractAttributeEditor { */ public String getLabel() { String label = getAttributeMapper().getLabel(getTaskAttribute()); - return CommonUiUtil.toLabel(label); + return (label != null) ? LegacyActionTools.escapeMnemonics(label) : ""; //$NON-NLS-1$ } /** diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPart.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPart.java index 937ee5666..b1c45ba8e 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPart.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPart.java @@ -12,11 +12,11 @@ package org.eclipse.mylyn.tasks.ui.editors; import org.eclipse.jface.action.Action; +import org.eclipse.jface.action.LegacyActionTools; import org.eclipse.jface.action.ToolBarManager; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.viewers.ISelection; import org.eclipse.mylyn.commons.ui.CommonImages; -import org.eclipse.mylyn.commons.ui.CommonUiUtil; import org.eclipse.mylyn.commons.workbench.forms.CommonFormUtil; import org.eclipse.mylyn.internal.tasks.ui.editors.Messages; import org.eclipse.mylyn.internal.tasks.ui.editors.RichTextAttributeEditor; @@ -80,7 +80,7 @@ public abstract class AbstractTaskEditorPart extends AbstractFormPart { protected Section createSection(Composite parent, FormToolkit toolkit, int style) { Section section = toolkit.createSection(parent, style); - section.setText(CommonUiUtil.toLabel(getPartName())); + section.setText(LegacyActionTools.escapeMnemonics(getPartName())); return section; } |