Revert "Bug 485741 - [Breakpoints] Can't remove method breakpoint in second"
This reverts commit ab2e1cfb7766ab0154afe58699f9a8b893149160.
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ToggleBreakpointAdapter.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ToggleBreakpointAdapter.java
index 572c616..85c0e25 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ToggleBreakpointAdapter.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ToggleBreakpointAdapter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2016 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation 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
@@ -732,14 +732,7 @@
else if(element instanceof IClassFile) {
element = ((IClassFile) element).getElementAt(selection.getOffset());
}
- if (element != null && element.getElementType() == IJavaElement.METHOD) {
- IMethod method = (IMethod) element;
- if (method.getDeclaringType().isAnonymous()) {
- return false;
- }
- return true;
- }
-
+ return element != null && element.getElementType() == IJavaElement.METHOD;
}
catch (JavaModelException e) {return false;}
}
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/ValidBreakpointLocationLocator.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/ValidBreakpointLocationLocator.java
index 7707704..739a9b4 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/ValidBreakpointLocationLocator.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/ValidBreakpointLocationLocator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2016 IBM Corporation and others.
+ * Copyright (c) 2003, 2014 IBM Corporation 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
@@ -994,11 +994,6 @@
@Override
public boolean visit(MethodDeclaration node) {
if (visit(node, false)) {
- if (node.getParent() instanceof AnonymousClassDeclaration){
- fLocationType = LOCATION_NOT_FOUND;
- fLocationFound = true;
- return false;
- }
if (fBestMatch) {
// check if we are on the line which contains the method name
int nameOffset = node.getName().getStartPosition();
