Skip to content

Cleanup: Use instanceof pattern matching #946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SougandhS merged 1 commit into from
Apr 21, 2026
Merged

Cleanup: Use instanceof pattern matching #946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaJRETab.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,8 +326,7 @@ private IStatus checkCompliance() {
vm = JavaRuntime.getVMInstall(vmPath);
}
String environmentId = JavaRuntime.getExecutionEnvironmentId(vmPath);
if(vm instanceof AbstractVMInstall) {
AbstractVMInstall install = (AbstractVMInstall) vm;
if(vm instanceof AbstractVMInstall install) {
String vmver = install.getJavaVersion();
if(vmver != null) {
int val = JavaCore.compareJavaVersions(compliance, vmver);
Expand Down
3 changes: 1 addition & 2 deletions ...pse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaLaunchShortcut.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,8 +289,7 @@ public IResource getLaunchableResource(IEditorPart editorpart) {

@Override
public IResource getLaunchableResource(ISelection selection) {
if (selection instanceof IStructuredSelection) {
IStructuredSelection ss = (IStructuredSelection) selection;
if (selection instanceof IStructuredSelection ss) {
if (ss.size() == 1) {
Object element = ss.getFirstElement();
if (element instanceof IAdaptable) {
Expand Down
3 changes: 1 addition & 2 deletions org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIElementImageDescriptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,9 @@ protected Point getSize() {
*/
@Override
public boolean equals(Object object) {
if (!(object instanceof JDIElementImageDescriptor)) {
if (!(object instanceof JDIElementImageDescriptor other)) {
return false;
}
JDIElementImageDescriptor other = (JDIElementImageDescriptor) object;
return (fBaseImage.equals(other.fBaseImage) && fFlags == other.fFlags);
}

Expand Down
3 changes: 1 addition & 2 deletions org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIImageDescriptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,10 @@ protected Point getSize() {
*/
@Override
public boolean equals(Object object) {
if (!(object instanceof JDIImageDescriptor)){
if (!(object instanceof JDIImageDescriptor other)){
return false;
}

JDIImageDescriptor other= (JDIImageDescriptor)object;
return (getBaseImage().equals(other.getBaseImage()) && getFlags() == other.getFlags());
}

Expand Down
12 changes: 4 additions & 8 deletions org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIModelPresentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,26 +401,23 @@ protected String getThreadText(IJavaThread thread, boolean qualified) throws Cor
if (exName != null) {
args = new String[] { thread.getName(), exName };
}
} else if (breakpoint instanceof IJavaWatchpoint) {
IJavaWatchpoint wp = (IJavaWatchpoint)breakpoint;
} else if (breakpoint instanceof IJavaWatchpoint wp) {
String fieldName = wp.getFieldName();
args = new String[] {thread.getName(), fieldName, typeName};
if (wp.isAccessSuspend(thread.getDebugTarget())) {
key.append("_fieldaccess"); //$NON-NLS-1$
} else {
key.append("_fieldmodification"); //$NON-NLS-1$
}
} else if (breakpoint instanceof IJavaMethodBreakpoint) {
IJavaMethodBreakpoint me= (IJavaMethodBreakpoint)breakpoint;
} else if (breakpoint instanceof IJavaMethodBreakpoint me) {
String methodName= me.getMethodName();
args = new String[] {thread.getName(), methodName, typeName};
if (me.isEntrySuspend(thread.getDebugTarget())) {
key.append("_methodentry"); //$NON-NLS-1$
} else {
key.append("_methodexit"); //$NON-NLS-1$
}
} else if (breakpoint instanceof IJavaLineBreakpoint) {
IJavaLineBreakpoint jlbp = (IJavaLineBreakpoint)breakpoint;
} else if (breakpoint instanceof IJavaLineBreakpoint jlbp) {
int lineNumber= jlbp.getLineNumber();
if (lineNumber > -1) {
args = new String[] {thread.getName(), String.valueOf(lineNumber), typeName};
Expand Down Expand Up @@ -1021,9 +1018,8 @@ protected Image getExpressionImage(Object expression) {
*/
private int computeJDIAdornmentFlags(Object element) {
try {
if (element instanceof IJavaThread) {
if (element instanceof IJavaThread javaThread) {
int flag= 0;
IJavaThread javaThread = ((IJavaThread)element);
if (ThreadMonitorManager.getDefault().isInDeadlock(javaThread)) {
flag= JDIImageDescriptor.IN_DEADLOCK;
}
Expand Down
3 changes: 1 addition & 2 deletions org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/LambdaUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,9 @@ public static IVariable findLocalVariableFromLambdaScope(IJavaStackFrame frame,
}

private static List<String> getArgumentTypeNames(IJavaElement parent) throws CoreException {
if (!(parent instanceof IMethod)) {
if (!(parent instanceof IMethod method)) {
return null;
}
IMethod method = (IMethod) parent;
IType type = method.getDeclaringType();
if (type == null) {
return null;
Expand Down
6 changes: 2 additions & 4 deletions org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/MemberActionFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ public class MemberActionFilter implements IActionFilter {
@Override
public boolean testAttribute(Object target, String name, String value) {
if (name.equals("MemberActionFilter")) { //$NON-NLS-1$
if (target instanceof IMember) {
IMember member = (IMember) target;
if (target instanceof IMember member) {
if (value.equals("isRemote")) { //$NON-NLS-1$
IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
if(window != null) {
Expand Down Expand Up @@ -95,8 +94,7 @@ public boolean testAttribute(Object target, String name, String value) {
IAdaptable adapt = DebugUITools.getDebugContext();
if(adapt != null) {
IDebugTarget adapter = adapt.getAdapter(IDebugTarget.class);
if(adapter instanceof IJavaDebugTarget) {
IJavaDebugTarget dtarget = (IJavaDebugTarget) adapter;
if(adapter instanceof IJavaDebugTarget dtarget) {
return dtarget.supportsInstanceRetrieval();
}
}
Expand Down
3 changes: 1 addition & 2 deletions ...pse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaExceptionHyperLink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,7 @@ public void linkActivated() {
IBreakpoint[] breakpoints = DebugPlugin.getDefault().getBreakpointManager().getBreakpoints(JDIDebugModel.getPluginIdentifier());
for (int i = 0; i < breakpoints.length; i++) {
IBreakpoint breakpoint = breakpoints[i];
if (breakpoint instanceof IJavaExceptionBreakpoint) {
IJavaExceptionBreakpoint exceptionBreakpoint = (IJavaExceptionBreakpoint) breakpoint;
if (breakpoint instanceof IJavaExceptionBreakpoint exceptionBreakpoint) {
if (fExceptionName.equals(exceptionBreakpoint.getTypeName())) {
// reset enabled setting to true but save original value to reset if user cancels dialog
exceptionBreakpoint.getMarker().setAttribute(JavaBreakpointPage.ATTR_ENABLED_SETTING_ON_CANCEL, Boolean.toString(exceptionBreakpoint.isEnabled()));
Expand Down
6 changes: 2 additions & 4 deletions org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsPreferencePage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,7 @@ private void validateComplianceAndJRE(IVMInstall vmInstall) {
else {
String latest = JavaCore.getAllJavaSourceVersionsSupportedByCompiler().last();
String vmver = null;
if (vmInstall instanceof AbstractVMInstall) {
AbstractVMInstall vm = (AbstractVMInstall) vmInstall;
if (vmInstall instanceof AbstractVMInstall vm) {
vmver = vm.getJavaVersion();
}
if (vmver == null) {
Expand Down Expand Up @@ -255,8 +254,7 @@ private String getCurrentCompilerCompliance() {
* @since 3.3
*/
private boolean supportsCurrentCompliance(IVMInstall vm, String compliance) {
if(vm instanceof AbstractVMInstall) {
AbstractVMInstall install = (AbstractVMInstall) vm;
if(vm instanceof AbstractVMInstall install) {
String vmver = install.getJavaVersion();
if(vmver == null) {
vmver = getVersionFromRealVM(vm);
Expand Down
3 changes: 1 addition & 2 deletions ...clipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/LibraryContentProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,7 @@ public Object[] getElements(Object inputElement) {
*/
@Override
public Object[] getChildren(Object parentElement) {
if (parentElement instanceof LibraryStandin) {
LibraryStandin standin= (LibraryStandin) parentElement;
if (parentElement instanceof LibraryStandin standin) {
Object[] children= fChildren.get(standin);
if (children == null) {
children = new Object[] { new SubElement(standin, SubElement.SOURCE_PATH), new SubElement(standin, SubElement.JAVADOC_URL),
Expand Down
6 changes: 2 additions & 4 deletions org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/LibraryLabelProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ public class LibraryLabelProvider extends LabelProvider {
public Image getImage(Object element) {
String key = null;
IStatus status = Status.OK_STATUS;
if (element instanceof LibraryStandin) {
LibraryStandin library= (LibraryStandin) element;
if (element instanceof LibraryStandin library) {
IPath sourcePath= library.getSystemLibrarySourcePath();
if (sourcePath != null && !Path.EMPTY.equals(sourcePath)) {
key = ISharedImages.IMG_OBJS_EXTERNAL_ARCHIVE_WITH_SOURCE;
Expand Down Expand Up @@ -88,8 +87,7 @@ public Image getImage(Object element) {
public String getText(Object element) {
if (element instanceof LibraryStandin) {
return ((LibraryStandin)element).getSystemLibraryPath().toOSString();
} else if (element instanceof SubElement) {
SubElement subElement= (SubElement) element;
} else if (element instanceof SubElement subElement) {
StringBuilder text= new StringBuilder();
switch (subElement.getType()) {
case SubElement.SOURCE_PATH:
Expand Down
3 changes: 1 addition & 2 deletions org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/LibraryStandin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,7 @@ void setPackageRootPath(IPath path) {
*/
@Override
public boolean equals(Object obj) {
if (obj instanceof LibraryStandin) {
LibraryStandin lib = (LibraryStandin)obj;
if (obj instanceof LibraryStandin lib) {
return getSystemLibraryPath().equals(lib.getSystemLibraryPath())
&& equals(getSystemLibrarySourcePath(), lib.getSystemLibrarySourcePath())
&& equals(getPackageRootPath(), lib.getPackageRootPath())
Expand Down
12 changes: 4 additions & 8 deletions ...g.ui/ui/org/eclipse/jdt/internal/debug/ui/search/LaunchConfigurationQueryParticipant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,9 @@ public void search(ISearchRequestor requestor, QuerySpecification query, IProgre
SubMonitor subMon = SubMonitor.convert(monitor, 8);
try {
Pattern pattern = null;
if (query instanceof ElementQuerySpecification) {
ElementQuerySpecification elementQuery = (ElementQuerySpecification) query;
if (query instanceof ElementQuerySpecification elementQuery) {
IJavaElement element = elementQuery.getElement();
if(element instanceof IMember) {
IMember member = (IMember) element;
if(element instanceof IMember member) {
IType type = null;
if(member.getElementType() == IJavaElement.TYPE) {
type = (IType) member;
Expand All @@ -121,8 +119,7 @@ else if(member.getElementType() == IJavaElement.METHOD) {
return;
}
}
if (query instanceof PatternQuerySpecification) {
PatternQuerySpecification patternQuery = (PatternQuerySpecification) query;
if (query instanceof PatternQuerySpecification patternQuery) {
int flags = patternQuery.isCaseSensitive() ? 0
: Pattern.CASE_INSENSITIVE;
String quotedPattern = quotePattern(patternQuery.getPattern());
Expand Down Expand Up @@ -197,8 +194,7 @@ private boolean isValid(QuerySpecification query) {
IJavaElement element = ((ElementQuerySpecification) query).getElement();
return element.getElementType() == IJavaElement.TYPE || element.getElementType() == IJavaElement.METHOD;
}
if (query instanceof PatternQuerySpecification) {
PatternQuerySpecification patternQuery = (PatternQuerySpecification) query;
if (query instanceof PatternQuerySpecification patternQuery) {
switch (patternQuery.getSearchFor()) {
case IJavaSearchConstants.UNKNOWN:
case IJavaSearchConstants.TYPE:
Expand Down
3 changes: 1 addition & 2 deletions ...ui/org/eclipse/jdt/internal/debug/ui/variables/JavaVariableColumnPresentationFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ public String getColumnPresentationId(IPresentationContext context, Object eleme
private boolean isApplicable(IPresentationContext context, Object element) {
IJavaStackFrame frame = null;
if (IDebugUIConstants.ID_VARIABLE_VIEW.equals(context.getId())) {
if (element instanceof IAdaptable) {
IAdaptable adaptable = (IAdaptable)element;
if (element instanceof IAdaptable adaptable) {
frame = adaptable.getAdapter(IJavaStackFrame.class);
}
}
Expand Down
3 changes: 1 addition & 2 deletions ...lipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/JavaVariableEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ public ICellModifier getCellModifier(IPresentationContext context, Object elemen
*/
@Override
public CellEditor getCellEditor(IPresentationContext context, String columnId, Object element, Composite parent) {
if (element instanceof IJavaVariable) {
IJavaVariable var = (IJavaVariable) element;
if (element instanceof IJavaVariable var) {
if (JavaVariableCellModifier.isBoolean(var)) {
return new ComboBoxCellEditor(parent, new String[]{Boolean.toString(true), Boolean.toString(false)}, SWT.READ_ONLY);
}
Expand Down
Loading