From 52f51520a467d95e0c050b3e3c5aa11ce43b6f98 Mon Sep 17 00:00:00 2001 From: Eclipse Platform Bot Date: Thu, 4 Jun 2026 04:28:05 +0000 Subject: [PATCH] Perform clean code of resources/bundles/org.eclipse.core.tools.resources --- .../META-INF/MANIFEST.MF | 24 ++++++++++++++++--- .../tools/resources/CountResourcesAction.java | 6 ++--- .../core/tools/resources/ElementTreeView.java | 3 +-- .../resources/LocalHistoryBrowserView.java | 7 +++--- .../tools/resources/ResourceChangeView.java | 3 +-- .../resources/ResourceContentProvider.java | 4 +--- .../markers/MarkerExtensionModel.java | 15 ++++++++---- .../tools/resources/markers/MarkerView.java | 6 ++--- .../markers/ReadOnlyMarkerPropertySource.java | 9 ++++--- 9 files changed, 47 insertions(+), 30 deletions(-) diff --git a/resources/bundles/org.eclipse.core.tools.resources/META-INF/MANIFEST.MF b/resources/bundles/org.eclipse.core.tools.resources/META-INF/MANIFEST.MF index 98a3bd3d8ed..63507205dc7 100644 --- a/resources/bundles/org.eclipse.core.tools.resources/META-INF/MANIFEST.MF +++ b/resources/bundles/org.eclipse.core.tools.resources/META-INF/MANIFEST.MF @@ -4,13 +4,31 @@ Bundle-Name: Core Resources Tools Bundle-SymbolicName: org.eclipse.core.tools.resources;singleton:=true Bundle-Version: 1.8.200.qualifier Bundle-Vendor: Eclipse.org -Export-Package: org.eclipse.core.tools.resources, - org.eclipse.core.tools.resources.markers +Export-Package: org.eclipse.core.tools.resources; + uses:="org.eclipse.core.internal.events, + org.eclipse.core.internal.resources, + org.eclipse.core.resources, + org.eclipse.core.tools, + org.eclipse.jface.action, + org.eclipse.jface.text, + org.eclipse.jface.viewers, + org.eclipse.swt.widgets, + org.eclipse.ui, + org.eclipse.ui.part", + org.eclipse.core.tools.resources.markers; + uses:="org.eclipse.core.resources, + org.eclipse.core.runtime, + org.eclipse.jface.action, + org.eclipse.jface.resource, + org.eclipse.jface.viewers, + org.eclipse.swt.widgets, + org.eclipse.ui, + org.eclipse.ui.part, + org.eclipse.ui.views.properties" Require-Bundle: org.eclipse.core.resources, org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)", org.eclipse.jface.text, org.eclipse.ui, - org.eclipse.ui.workbench.texteditor, org.eclipse.ui.editors, org.eclipse.ui.ide, org.eclipse.ui.views, diff --git a/resources/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/CountResourcesAction.java b/resources/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/CountResourcesAction.java index 5686714f8cf..2f4b185214c 100644 --- a/resources/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/CountResourcesAction.java +++ b/resources/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/CountResourcesAction.java @@ -67,8 +67,7 @@ private List getSelectedResources() { ISelectionService selectionService = window.getSelectionService(); ISelection selection = selectionService.getSelection(); - if (selection instanceof IStructuredSelection) { - IStructuredSelection structuredSelection = (IStructuredSelection) selection; + if (selection instanceof IStructuredSelection structuredSelection) { for (Object element : structuredSelection) { IResource resource = convertToResource(element); if (resource != null) { @@ -125,8 +124,7 @@ private IResource convertToResource(Object object) { return (IResource) object; } - if (object instanceof IAdaptable) { - IAdaptable adaptable = (IAdaptable) object; + if (object instanceof IAdaptable adaptable) { return adaptable.getAdapter(IResource.class); } diff --git a/resources/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/ElementTreeView.java b/resources/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/ElementTreeView.java index e4065a5828f..d4a0c788181 100644 --- a/resources/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/ElementTreeView.java +++ b/resources/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/ElementTreeView.java @@ -335,8 +335,7 @@ int sizeof(Object object) { if (object instanceof Map) { return basicSizeof((Map) object); } - if (object instanceof QualifiedName) { - QualifiedName name = (QualifiedName) object; + if (object instanceof QualifiedName name) { return 20 + sizeof(name.getQualifier()) + sizeof(name.getLocalName()); } // unknown -- use deep size diff --git a/resources/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/LocalHistoryBrowserView.java b/resources/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/LocalHistoryBrowserView.java index 64d9da0ad4a..da0aa7acb58 100644 --- a/resources/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/LocalHistoryBrowserView.java +++ b/resources/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/LocalHistoryBrowserView.java @@ -189,12 +189,12 @@ public Object[] getElements(Object parent) { @Override public Object getParent(Object child) { - return child instanceof Node ? ((Node) child).getParent() : null; + return child instanceof Node n ? n.getParent() : null; } @Override public Object[] getChildren(Object parent) { - return parent instanceof Node ? ((Node) parent).getChildren() : new Object[0]; + return parent instanceof Node n ? n.getChildren() : new Object[0]; } @Override @@ -306,9 +306,8 @@ public void run() { public void run() { ISelection selection = viewer.getSelection(); Object obj = ((IStructuredSelection) selection).getFirstElement(); - if (obj instanceof IFileState) { + if (obj instanceof IFileState state) { // Show the file contents - IFileState state = (IFileState) obj; IWorkbench workbench = PlatformUI.getWorkbench(); IEditorRegistry editorRegistry = workbench.getEditorRegistry(); IEditorDescriptor descriptor = editorRegistry.getDefaultEditor(state.getName()); diff --git a/resources/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/ResourceChangeView.java b/resources/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/ResourceChangeView.java index 9ab416b44c0..f699d574b99 100644 --- a/resources/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/ResourceChangeView.java +++ b/resources/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/ResourceChangeView.java @@ -210,10 +210,9 @@ private void initialize() { } private void initialize(Object input) { - if (!(input instanceof IResourceChangeEvent)) { + if (!(input instanceof IResourceChangeEvent evt)) { return; } - IResourceChangeEvent evt = (IResourceChangeEvent) input; ResourceEventNode root = new ResourceEventNode(evt); invisibleRoot = new DeltaNode(); invisibleRoot.addChild(root); diff --git a/resources/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/ResourceContentProvider.java b/resources/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/ResourceContentProvider.java index 9bee192d8bd..f3cca2cd699 100644 --- a/resources/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/ResourceContentProvider.java +++ b/resources/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/ResourceContentProvider.java @@ -70,14 +70,12 @@ public class ResourceContentProvider extends AbstractTreeContentProvider { */ protected void extractInfo(IResource selectedResource) { - if (!(selectedResource instanceof Resource)) { + if (!(selectedResource instanceof Resource resource)) { String message = NLS.bind(Messages.resource_error_unknown_resource_impl, selectedResource.getClass().getName()); getRootNode().addChild(new TreeContentProviderNode(message)); return; } - Resource resource = (Resource) selectedResource; - ResourceInfo info = resource.getResourceInfo(true, false); // Resource#getResourceInfo may return null when the resource // does not exist anymore. In this case, we just ignore it. diff --git a/resources/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/markers/MarkerExtensionModel.java b/resources/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/markers/MarkerExtensionModel.java index c4d05fad7c0..2832f6a2def 100644 --- a/resources/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/markers/MarkerExtensionModel.java +++ b/resources/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/markers/MarkerExtensionModel.java @@ -104,12 +104,14 @@ synchronized void readMarkerDeclarations() { IConfigurationElement elt = configElements[j]; if (elt.getName().equalsIgnoreCase("super")) { String sup = elt.getAttribute("type"); - if (sup != null) + if (sup != null) { supersList.add(sup); + } } else if (elt.getName().equalsIgnoreCase("attribute")) { String attr = elt.getAttribute("name"); - if (attr != null) + if (attr != null) { attributes.add(attr); + } } else if (elt.getName().equalsIgnoreCase("persistent")) { String value = elt.getAttribute("value"); persistent = "yes".equalsIgnoreCase(value) ? true : false; @@ -119,8 +121,9 @@ synchronized void readMarkerDeclarations() { markerMap.put(identifier, info); } } - if (DEBUG) + if (DEBUG) { dumpMarkerTypes(); + } } // a cruddy debugging tool. Dumps the model out in pseudo xml @@ -146,8 +149,9 @@ private void dumpMarkerType(String type, int indent) { if (hasAttrs) { System.out.println(); printlnIndented(indent + 1, " attrs='" + mtype.declaredAttributes + "'" + (hasSupers ? ">" : "/>")); - if (!hasSupers) + if (!hasSupers) { return; + } } else { System.out.println(">"); } @@ -163,8 +167,9 @@ private void dumpMarkerType(String type, int indent) { } private void printIndented(int indent, Object value) { - for (int i = 0; i < indent; i++) + for (int i = 0; i < indent; i++) { System.out.print(" "); + } System.out.print(value); } diff --git a/resources/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/markers/MarkerView.java b/resources/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/markers/MarkerView.java index f20d0782853..0db112dfbb5 100644 --- a/resources/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/markers/MarkerView.java +++ b/resources/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/markers/MarkerView.java @@ -398,8 +398,7 @@ class ViewLabelProvider extends LabelProvider { @Override public String getText(Object obj) { try { - if (obj instanceof IMarker) { - IMarker marker = (IMarker) obj; + if (obj instanceof IMarker marker) { String message = (String) marker.getAttribute(IMarker.MESSAGE); String type = marker.getType(); return message == null ? type : message + " : " + type; @@ -482,8 +481,7 @@ public void createPartControl(Composite parent) { IStructuredSelection newSelection = emptySelection; if (!sel.isEmpty() && sel.size() == 1) { Object first = sel.getFirstElement(); - if (first instanceof IMarker) { - IMarker marker = (IMarker) first; + if (first instanceof IMarker marker) { propertySource.setSourceMarker(marker); newSelection = new StructuredSelection(propertySource); } diff --git a/resources/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/markers/ReadOnlyMarkerPropertySource.java b/resources/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/markers/ReadOnlyMarkerPropertySource.java index 81530abf72f..fadf858f45c 100644 --- a/resources/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/markers/ReadOnlyMarkerPropertySource.java +++ b/resources/bundles/org.eclipse.core.tools.resources/src/org/eclipse/core/tools/resources/markers/ReadOnlyMarkerPropertySource.java @@ -67,8 +67,9 @@ private void findPropertyDescriptors(ArrayList descriptorLis } private void findDeclaredPropertyDescriptorsFor(MarkerExtensionModel.MarkerInfo anInfo, List descriptorList, Set actualAttributeSet) { - if (anInfo == null) + if (anInfo == null) { return; + } try { if (anInfo.id.equals(marker.getType())) { persistentDescriptor.setCategory(anInfo.id); @@ -96,8 +97,9 @@ private void findDeclaredPropertyDescriptorsFor(MarkerExtensionModel.MarkerInfo @Override public Object getPropertyValue(Object id) { String name = (String) id; - if ("persistent".equals(name)) + if ("persistent".equals(name)) { return info.persistent ? Boolean.TRUE : Boolean.FALSE; + } try { return marker.getAttribute(name); } catch (CoreException e) { @@ -109,8 +111,9 @@ public Object getPropertyValue(Object id) { @Override public boolean isPropertySet(Object id) { String name = (String) id; - if ("persistent".equals(name)) + if ("persistent".equals(name)) { return info != null; + } try { return marker.getAttribute(name) != null; } catch (CoreException e) {