462801: remove marker view decoration

Change-Id: I1589801c215ac8ba896a476e583958e140c4305d
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=462801

3 files changed, 2 insertions, 134 deletions

diff --git a/org.eclipse.mylyn.debug.ui/src/org/eclipse/mylyn/internal/debug/ui/FocusBreakpointsViewAction.java b/org.eclipse.mylyn.debug.ui/src/org/eclipse/mylyn/internal/debug/ui/FocusBreakpointsViewAction.java
index 38a154f17..fe922be85 100644
--- a/org.eclipse.mylyn.debug.ui/src/org/eclipse/mylyn/internal/debug/ui/FocusBreakpointsViewAction.java
+++ b/org.eclipse.mylyn.debug.ui/src/org/eclipse/mylyn/internal/debug/ui/FocusBreakpointsViewAction.java
@@ -36,7 +36,6 @@ public class FocusBreakpointsViewAction extends AbstractFocusMarkerViewAction {
 			IDebugView view = (IDebugView) viewPart;
 			Viewer viewer = view.getViewer();
 			if (viewer instanceof StructuredViewer) {
-				updateMarkerViewLabelProvider((StructuredViewer) viewer);
 				viewers.add((StructuredViewer) viewer);
 			}
 		}
diff --git a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/ide/ui/AbstractFocusMarkerViewAction.java b/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/ide/ui/AbstractFocusMarkerViewAction.java
index db4e98fc6..8246e99a5 100644
--- a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/ide/ui/AbstractFocusMarkerViewAction.java
+++ b/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/ide/ui/AbstractFocusMarkerViewAction.java
@@ -17,19 +17,15 @@ import java.util.List;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IBaseLabelProvider;
 import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.mylyn.commons.core.StatusHandler;
 import org.eclipse.mylyn.context.ui.AbstractFocusViewAction;
 import org.eclipse.mylyn.context.ui.InterestFilter;
 import org.eclipse.mylyn.internal.ide.ui.IdeUiBridgePlugin;
 import org.eclipse.mylyn.internal.ide.ui.MarkerInterestFilter;
-import org.eclipse.mylyn.internal.ide.ui.MarkerViewLabelProvider;
 import org.eclipse.ui.IViewPart;
 import org.eclipse.ui.internal.views.markers.ExtendedMarkersView;
 import org.eclipse.ui.internal.views.markers.MarkersTreeViewer;
-import org.eclipse.ui.views.markers.internal.TableViewLabelProvider;
 
 /**
  * @author Mik Kersten
@@ -49,18 +45,10 @@ public abstract class AbstractFocusMarkerViewAction extends AbstractFocusViewAct
 	}
 
 	/**
-	 * HACK: should use platform decorating label provider
-	 * 
-	 * @param viewer
+	 * @deprecated This functionality is no longer supported
 	 */
+	@Deprecated
 	protected void updateMarkerViewLabelProvider(StructuredViewer viewer) {
-		if (viewer != null) {
-			IBaseLabelProvider currentProvider = viewer.getLabelProvider();
-			if (currentProvider instanceof TableViewLabelProvider
-					&& !(currentProvider instanceof MarkerViewLabelProvider)) {
-				viewer.setLabelProvider(new MarkerViewLabelProvider((TableViewLabelProvider) currentProvider));
-			}
-		}
 	}
 
 	/**
@@ -78,9 +66,6 @@ public abstract class AbstractFocusMarkerViewAction extends AbstractFocusViewAct
 					Field field = clazz.getDeclaredField("viewer"); //$NON-NLS-1$
 					field.setAccessible(true);
 					cachedViewer = (MarkersTreeViewer) field.get(viewPart);
-					if (cachedViewer != null && !cachedViewer.getControl().isDisposed()) {
-						updateMarkerViewLabelProvider(cachedViewer);
-					}
 				}
 			} catch (Exception e) {
 				StatusHandler.log(new Status(IStatus.ERROR, IdeUiBridgePlugin.ID_PLUGIN,
@@ -92,19 +77,4 @@ public abstract class AbstractFocusMarkerViewAction extends AbstractFocusViewAct
 		}
 		return viewers;
 	}
-
-	@Override
-	public void update() {
-		super.update();
-		cachedViewer = null;
-		for (StructuredViewer viewer : getViewers()) {
-			if (viewer instanceof TableViewer) {
-				TableViewer tableViewer = (TableViewer) viewer;
-				if (!(tableViewer.getLabelProvider() instanceof MarkerViewLabelProvider)) {
-					tableViewer.setLabelProvider(new MarkerViewLabelProvider(
-							(TableViewLabelProvider) tableViewer.getLabelProvider()));
-				}
-			}
-		}
-	}
 }
diff --git a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/MarkerViewLabelProvider.java b/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/MarkerViewLabelProvider.java
deleted file mode 100644
index a33579611..000000000
--- a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/MarkerViewLabelProvider.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.ide.ui;
-
-import org.eclipse.jface.viewers.IColorProvider;
-import org.eclipse.jface.viewers.IFontProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.mylyn.commons.ui.compatibility.CommonFonts;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.ui.ContextUi;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.views.markers.internal.ConcreteMarker;
-import org.eclipse.ui.views.markers.internal.TableViewLabelProvider;
-
-/**
- * @author Mik Kersten
- */
-public class MarkerViewLabelProvider implements ITableLabelProvider, IColorProvider, IFontProvider {
-
-	private final TableViewLabelProvider provider;
-
-	public MarkerViewLabelProvider(TableViewLabelProvider provider) {
-		this.provider = provider;
-	}
-
-	public Font getFont(Object element) {
-		if (element instanceof ConcreteMarker) {
-			String handle = ContextCore.getStructureBridge(((ConcreteMarker) element).getResource().getFileExtension())
-					.getHandleForOffsetInObject((element), 0);
-			IInteractionElement node = ContextCore.getContextManager().getElement(handle);
-			if (node != null) {
-				if (node.getInterest().isLandmark() && !node.getInterest().isPropagated()) {
-					return CommonFonts.BOLD;
-				}
-			}
-		}
-		return null;
-	}
-
-	public Image getColumnImage(Object element, int columnIndex) {
-		return provider.getColumnImage(element, columnIndex);
-	}
-
-	public String getColumnText(Object element, int columnIndex) {
-		return provider.getColumnText(element, columnIndex);
-	}
-
-	public Color getForeground(Object element) {
-		if (element instanceof ConcreteMarker) {
-			String handle = ContextCore.getStructureBridge(((ConcreteMarker) element).getResource().getFileExtension())
-					.getHandleForOffsetInObject((element), 0);
-			return ContextUi.getForeground(ContextCore.getContextManager().getElement(handle));
-		} else {
-			return null;
-		}
-	}
-
-	public Color getBackground(Object element) {
-		return null;
-//		if (element instanceof ConcreteMarker) {
-//			String handle = ContextCore.getStructureBridge(
-//					((ConcreteMarker) element).getResource().getFileExtension()).getHandleForOffsetInObject((element),
-//					0);
-//			return UiUtil.getBackgroundForElement(ContextCorePlugin.getContextManager().getElement(handle));
-//		} else {
-//			return null;
-//		}
-	}
-
-	/**
-	 * TODO: handle listeners?
-	 */
-	public void addListener(ILabelProviderListener listener) {
-		// provider.addListener(listener);
-	}
-
-	public void dispose() {
-		provider.dispose();
-	}
-
-	public boolean isLabelProperty(Object element, String property) {
-		return provider.isLabelProperty(element, property);
-	}
-
-	public void removeListener(ILabelProviderListener listener) {
-		// removeListener(listener);
-	}
-}