Bug 577731 - Merge remote-tracking branch 'origin/master' into BETA_JAVA18
Change-Id: I0e0b1fbda8c91597774da1ba7a54dbecb9d0004f
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/LauncherMessages.properties b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/LauncherMessages.properties
index 3422552..c0b051d 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/LauncherMessages.properties
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/LauncherMessages.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2021 IBM Corporation and others.
+# Copyright (c) 2000, 2022 IBM Corporation and others.
#
# This program and the accompanying materials
# are made available under the terms of the Eclipse Public License 2.0
@@ -116,7 +116,7 @@
JavaClasspathTab_AttributeLabel_DefaultClasspath=Default classpath
JavaClasspathTab_AttributeLabel_Classpath=Classpath
-JavaDependenciesTab_0=De&pendencies
+JavaDependenciesTab_0=Dependenc&ies
JavaDependenciesTab_Dependencies_3=Dependencies
JavaDependenciesTab_add_modules_label=Add mod&ules:
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 91d3864..7691d94 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
@@ -1053,6 +1053,8 @@
}
}
+ } else if (body instanceof LambdaExpression) {
+ body.accept(this);
}
}
return false;
@@ -1064,7 +1066,7 @@
String key = methodBinding.getKey();
return key.substring(key.indexOf('.') + 1, key.indexOf('('));
}
-
+
/*
* (non-Javadoc)
*
