Skip to content

Commit 138ea99

Browse files
Neethika-sumesh12SougandhS
authored andcommitted
Use instanceof pattern matching
use java 16 instaceof pattern matching by automatic code clean-up in JDT Debug.ui packages.
1 parent a72b138 commit 138ea99

15 files changed

Lines changed: 24 additions & 48 deletions

org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaJRETab.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,8 +326,7 @@ private IStatus checkCompliance() {
326326
vm = JavaRuntime.getVMInstall(vmPath);
327327
}
328328
String environmentId = JavaRuntime.getExecutionEnvironmentId(vmPath);
329-
if(vm instanceof AbstractVMInstall) {
330-
AbstractVMInstall install = (AbstractVMInstall) vm;
329+
if(vm instanceof AbstractVMInstall install) {
331330
String vmver = install.getJavaVersion();
332331
if(vmver != null) {
333332
int val = JavaCore.compareJavaVersions(compliance, vmver);

org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaLaunchShortcut.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,8 +289,7 @@ public IResource getLaunchableResource(IEditorPart editorpart) {
289289

290290
@Override
291291
public IResource getLaunchableResource(ISelection selection) {
292-
if (selection instanceof IStructuredSelection) {
293-
IStructuredSelection ss = (IStructuredSelection) selection;
292+
if (selection instanceof IStructuredSelection ss) {
294293
if (ss.size() == 1) {
295294
Object element = ss.getFirstElement();
296295
if (element instanceof IAdaptable) {

org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIElementImageDescriptor.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,9 @@ protected Point getSize() {
7373
*/
7474
@Override
7575
public boolean equals(Object object) {
76-
if (!(object instanceof JDIElementImageDescriptor)) {
76+
if (!(object instanceof JDIElementImageDescriptor other)) {
7777
return false;
7878
}
79-
JDIElementImageDescriptor other = (JDIElementImageDescriptor) object;
8079
return (fBaseImage.equals(other.fBaseImage) && fFlags == other.fFlags);
8180
}
8281

org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIImageDescriptor.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,10 @@ protected Point getSize() {
9999
*/
100100
@Override
101101
public boolean equals(Object object) {
102-
if (!(object instanceof JDIImageDescriptor)){
102+
if (!(object instanceof JDIImageDescriptor other)){
103103
return false;
104104
}
105105

106-
JDIImageDescriptor other= (JDIImageDescriptor)object;
107106
return (getBaseImage().equals(other.getBaseImage()) && getFlags() == other.getFlags());
108107
}
109108

org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIModelPresentation.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -401,26 +401,23 @@ protected String getThreadText(IJavaThread thread, boolean qualified) throws Cor
401401
if (exName != null) {
402402
args = new String[] { thread.getName(), exName };
403403
}
404-
} else if (breakpoint instanceof IJavaWatchpoint) {
405-
IJavaWatchpoint wp = (IJavaWatchpoint)breakpoint;
404+
} else if (breakpoint instanceof IJavaWatchpoint wp) {
406405
String fieldName = wp.getFieldName();
407406
args = new String[] {thread.getName(), fieldName, typeName};
408407
if (wp.isAccessSuspend(thread.getDebugTarget())) {
409408
key.append("_fieldaccess"); //$NON-NLS-1$
410409
} else {
411410
key.append("_fieldmodification"); //$NON-NLS-1$
412411
}
413-
} else if (breakpoint instanceof IJavaMethodBreakpoint) {
414-
IJavaMethodBreakpoint me= (IJavaMethodBreakpoint)breakpoint;
412+
} else if (breakpoint instanceof IJavaMethodBreakpoint me) {
415413
String methodName= me.getMethodName();
416414
args = new String[] {thread.getName(), methodName, typeName};
417415
if (me.isEntrySuspend(thread.getDebugTarget())) {
418416
key.append("_methodentry"); //$NON-NLS-1$
419417
} else {
420418
key.append("_methodexit"); //$NON-NLS-1$
421419
}
422-
} else if (breakpoint instanceof IJavaLineBreakpoint) {
423-
IJavaLineBreakpoint jlbp = (IJavaLineBreakpoint)breakpoint;
420+
} else if (breakpoint instanceof IJavaLineBreakpoint jlbp) {
424421
int lineNumber= jlbp.getLineNumber();
425422
if (lineNumber > -1) {
426423
args = new String[] {thread.getName(), String.valueOf(lineNumber), typeName};
@@ -1021,9 +1018,8 @@ protected Image getExpressionImage(Object expression) {
10211018
*/
10221019
private int computeJDIAdornmentFlags(Object element) {
10231020
try {
1024-
if (element instanceof IJavaThread) {
1021+
if (element instanceof IJavaThread javaThread) {
10251022
int flag= 0;
1026-
IJavaThread javaThread = ((IJavaThread)element);
10271023
if (ThreadMonitorManager.getDefault().isInDeadlock(javaThread)) {
10281024
flag= JDIImageDescriptor.IN_DEADLOCK;
10291025
}

org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/LambdaUtils.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,9 @@ public static IVariable findLocalVariableFromLambdaScope(IJavaStackFrame frame,
9898
}
9999

100100
private static List<String> getArgumentTypeNames(IJavaElement parent) throws CoreException {
101-
if (!(parent instanceof IMethod)) {
101+
if (!(parent instanceof IMethod method)) {
102102
return null;
103103
}
104-
IMethod method = (IMethod) parent;
105104
IType type = method.getDeclaringType();
106105
if (type == null) {
107106
return null;

org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/MemberActionFilter.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ public class MemberActionFilter implements IActionFilter {
3939
@Override
4040
public boolean testAttribute(Object target, String name, String value) {
4141
if (name.equals("MemberActionFilter")) { //$NON-NLS-1$
42-
if (target instanceof IMember) {
43-
IMember member = (IMember) target;
42+
if (target instanceof IMember member) {
4443
if (value.equals("isRemote")) { //$NON-NLS-1$
4544
IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
4645
if(window != null) {
@@ -95,8 +94,7 @@ public boolean testAttribute(Object target, String name, String value) {
9594
IAdaptable adapt = DebugUITools.getDebugContext();
9695
if(adapt != null) {
9796
IDebugTarget adapter = adapt.getAdapter(IDebugTarget.class);
98-
if(adapter instanceof IJavaDebugTarget) {
99-
IJavaDebugTarget dtarget = (IJavaDebugTarget) adapter;
97+
if(adapter instanceof IJavaDebugTarget dtarget) {
10098
return dtarget.supportsInstanceRetrieval();
10199
}
102100
}

org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaExceptionHyperLink.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,7 @@ public void linkActivated() {
6767
IBreakpoint[] breakpoints = DebugPlugin.getDefault().getBreakpointManager().getBreakpoints(JDIDebugModel.getPluginIdentifier());
6868
for (int i = 0; i < breakpoints.length; i++) {
6969
IBreakpoint breakpoint = breakpoints[i];
70-
if (breakpoint instanceof IJavaExceptionBreakpoint) {
71-
IJavaExceptionBreakpoint exceptionBreakpoint = (IJavaExceptionBreakpoint) breakpoint;
70+
if (breakpoint instanceof IJavaExceptionBreakpoint exceptionBreakpoint) {
7271
if (fExceptionName.equals(exceptionBreakpoint.getTypeName())) {
7372
// reset enabled setting to true but save original value to reset if user cancels dialog
7473
exceptionBreakpoint.getMarker().setAttribute(JavaBreakpointPage.ATTR_ENABLED_SETTING_ON_CANCEL, Boolean.toString(exceptionBreakpoint.isEnabled()));

org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsPreferencePage.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,7 @@ private void validateComplianceAndJRE(IVMInstall vmInstall) {
199199
else {
200200
String latest = JavaCore.getAllJavaSourceVersionsSupportedByCompiler().last();
201201
String vmver = null;
202-
if (vmInstall instanceof AbstractVMInstall) {
203-
AbstractVMInstall vm = (AbstractVMInstall) vmInstall;
202+
if (vmInstall instanceof AbstractVMInstall vm) {
204203
vmver = vm.getJavaVersion();
205204
}
206205
if (vmver == null) {
@@ -255,8 +254,7 @@ private String getCurrentCompilerCompliance() {
255254
* @since 3.3
256255
*/
257256
private boolean supportsCurrentCompliance(IVMInstall vm, String compliance) {
258-
if(vm instanceof AbstractVMInstall) {
259-
AbstractVMInstall install = (AbstractVMInstall) vm;
257+
if(vm instanceof AbstractVMInstall install) {
260258
String vmver = install.getJavaVersion();
261259
if(vmver == null) {
262260
vmver = getVersionFromRealVM(vm);

org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/LibraryContentProvider.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,7 @@ public Object[] getElements(Object inputElement) {
117117
*/
118118
@Override
119119
public Object[] getChildren(Object parentElement) {
120-
if (parentElement instanceof LibraryStandin) {
121-
LibraryStandin standin= (LibraryStandin) parentElement;
120+
if (parentElement instanceof LibraryStandin standin) {
122121
Object[] children= fChildren.get(standin);
123122
if (children == null) {
124123
children = new Object[] { new SubElement(standin, SubElement.SOURCE_PATH), new SubElement(standin, SubElement.JAVADOC_URL),

0 commit comments

Comments
 (0)