diff options
4 files changed, 10 insertions, 11 deletions
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/RepositorySearchResultView.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/RepositorySearchResultView.java index b11a28a7a..b1db707e6 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/RepositorySearchResultView.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/RepositorySearchResultView.java @@ -14,7 +14,6 @@ import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.util.IPropertyChangeListener; -import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.jface.viewers.ILabelDecorator; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.StructuredViewer; @@ -28,7 +27,6 @@ import org.eclipse.mylar.tasks.core.AbstractQueryHit; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; import org.eclipse.search.internal.ui.SearchMessages; import org.eclipse.search.internal.ui.SearchPlugin; -import org.eclipse.search.internal.ui.SearchPreferencePage; import org.eclipse.search.ui.IContextMenuConstants; import org.eclipse.search.ui.text.AbstractTextSearchViewPage; import org.eclipse.search.ui.text.Match; @@ -236,12 +234,12 @@ public class RepositorySearchResultView extends AbstractTextSearchViewPage imple getSettings().put(KEY_SORTING, bugCurrentSortOrder); } - /* - * (non-Javadoc) - * - * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) - */ + @SuppressWarnings("unchecked") public Object getAdapter(Class adapter) { + return getAdapterDelegate(adapter); + } + + private Object getAdapterDelegate(Class<?> adapter) { if (IShowInTargetList.class.equals(adapter)) { return SHOW_IN_TARGET_LIST; } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultTableContentProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultTableContentProvider.java index ae7291569..48fc2a749 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultTableContentProvider.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultTableContentProvider.java @@ -14,7 +14,6 @@ package org.eclipse.mylar.internal.tasks.ui.search; import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.search.internal.ui.SearchPreferencePage; /** * This implementation of <code>SearchResultContentProvider</code> is used for the diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskActivityViewSorter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskActivityViewSorter.java index 5e7cd00eb..b9d7bb266 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskActivityViewSorter.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskActivityViewSorter.java @@ -87,6 +87,7 @@ public class TaskActivityViewSorter extends ViewerSorter { System.arraycopy(DEFAULT_DIRECTIONS, 0, directions, 0, directions.length); } + @SuppressWarnings("unchecked") private int compare(DateRangeActivityDelegate task1, DateRangeActivityDelegate task2) { if (sortColumn >= directions.length) return 0; @@ -101,7 +102,7 @@ public class TaskActivityViewSorter extends ViewerSorter { case DESCRIPTION: { String description1 = task1.getDescription(); String description2 = task2.getDescription(); - int result = collator.compare(description1, description2); + int result = getComparator().compare(description1, description2); return result * directions[sortColumn]; } case ELAPSED: { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/InputAttachmentSourcePage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/InputAttachmentSourcePage.java index ef606b344..574cb5276 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/InputAttachmentSourcePage.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/InputAttachmentSourcePage.java @@ -61,7 +61,7 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.model.WorkbenchContentProvider; import org.eclipse.ui.model.WorkbenchLabelProvider; -import org.eclipse.ui.views.navigator.ResourceSorter; +import org.eclipse.ui.views.navigator.*; /** * A wizard to input the source of the attachment. This is a modified version of @@ -351,6 +351,7 @@ public class InputAttachmentSourcePage extends WizardPage { setEnableWorkspaceAttachment(false); } + @SuppressWarnings("deprecation") private void addWorkspaceControls(Composite composite) { Composite newComp = new Composite(composite, SWT.NONE); @@ -530,7 +531,7 @@ public class InputAttachmentSourcePage extends WizardPage { */ public static IResource[] getResources(ISelection selection) { ArrayList<IResource> tmp = new ArrayList<IResource>(); - Class type = IResource.class; + Class<?> type = IResource.class; if (selection instanceof IStructuredSelection) { Object[] s = ((IStructuredSelection) selection).toArray(); |