NEW - bug 297878: [e3.6] NoSuchMethodError in breakpoints view
https://bugs.eclipse.org/bugs/show_bug.cgi?id=297878
diff --git a/org.eclipse.mylyn.java.ui/plugin.xml b/org.eclipse.mylyn.java.ui/plugin.xml
index 27b6f23..a2b3297 100644
--- a/org.eclipse.mylyn.java.ui/plugin.xml
+++ b/org.eclipse.mylyn.java.ui/plugin.xml
@@ -307,7 +307,6 @@
targetID="org.eclipse.mylyn.ui.views.active.search">
</viewContribution>
- <!--
<viewContribution
id="org.eclipse.mylyn.java.ui.markers.breakpoints.contribution"
targetID="org.eclipse.debug.ui.BreakpointView">
@@ -324,7 +323,6 @@
tooltip="%FocusBreakpointsViewAction.tooltip">
</action>
</viewContribution>
- -->
<viewContribution
id="org.eclipse.mylyn.ui.debug.view.contribution"
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/FocusBreakpointsViewAction.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/FocusBreakpointsViewAction.java
index 1763e2f..90b1420 100644
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/FocusBreakpointsViewAction.java
+++ b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/FocusBreakpointsViewAction.java
@@ -14,9 +14,12 @@
import java.util.ArrayList;
import java.util.List;
+import org.eclipse.debug.ui.IDebugView;
import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.Viewer;
import org.eclipse.mylyn.ide.ui.AbstractFocusMarkerViewAction;
import org.eclipse.mylyn.internal.java.ui.BreakpointsInterestFilter;
+import org.eclipse.ui.IViewPart;
/**
* @author Mik Kersten
@@ -30,12 +33,15 @@
@Override
public final List<StructuredViewer> getViewers() {
List<StructuredViewer> viewers = new ArrayList<StructuredViewer>();
-// IViewPart viewPart = super.getPartForAction();
-// if (viewPart instanceof BreakpointsView) {
-// BreakpointsView view = (BreakpointsView) viewPart;
-// updateMarkerViewLabelProvider(view.getCheckboxViewer());
-// viewers.add(view.getCheckboxViewer());
-// }
+ IViewPart viewPart = super.getPartForAction();
+ if (viewPart instanceof IDebugView) {
+ IDebugView view = (IDebugView) viewPart;
+ Viewer viewer = view.getViewer();
+ if (viewer instanceof StructuredViewer) {
+ updateMarkerViewLabelProvider((StructuredViewer) viewer);
+ viewers.add((StructuredViewer) viewer);
+ }
+ }
return viewers;
}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/FocusDebugViewAction.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/FocusDebugViewAction.java
index 235b4fc..77ad1ee 100644
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/FocusDebugViewAction.java
+++ b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/FocusDebugViewAction.java
@@ -14,8 +14,9 @@
import java.util.ArrayList;
import java.util.List;
-import org.eclipse.debug.internal.ui.views.launch.LaunchView;
+import org.eclipse.debug.ui.IDebugView;
import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.Viewer;
import org.eclipse.mylyn.context.ui.AbstractFocusViewAction;
import org.eclipse.mylyn.context.ui.InterestFilter;
import org.eclipse.ui.IViewPart;
@@ -32,10 +33,13 @@
@Override
public List<StructuredViewer> getViewers() {
List<StructuredViewer> viewers = new ArrayList<StructuredViewer>();
- IViewPart view = super.getPartForAction();
- if (view instanceof LaunchView) {
- LaunchView launchView = (LaunchView) view;
- viewers.add((StructuredViewer) launchView.getViewer());
+ IViewPart viewPart = super.getPartForAction();
+ if (viewPart instanceof IDebugView) {
+ IDebugView view = (IDebugView) viewPart;
+ Viewer viewer = view.getViewer();
+ if (viewer instanceof StructuredViewer) {
+ viewers.add((StructuredViewer) viewer);
+ }
}
return viewers;
}
