Perform clean code of runtime/bundles/org.eclipse.core.tools

Author: eclipse-platform-bot

runtime/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/AbstractTreeContentProvider.java

@@ -66,10 +66,10 @@ protected AbstractTreeContentProvider() {
 	 */
 	@Override
 	public Object[] getChildren(Object parentElement) {
-		if (!(parentElement instanceof TreeContentProviderNode))
+		if (!(parentElement instanceof TreeContentProviderNode treeNode)) {
 			return null;
+		}
 
-		TreeContentProviderNode treeNode = (TreeContentProviderNode) parentElement;
 		return treeNode.getChildren();
 	}
 
@@ -84,10 +84,10 @@ public Object[] getChildren(Object parentElement) {
 	 */
 	@Override
 	public Object getParent(Object element) {
-		if (!(element instanceof TreeContentProviderNode))
+		if (!(element instanceof TreeContentProviderNode treeNode)) {
 			return null;
+		}
 
-		TreeContentProviderNode treeNode = (TreeContentProviderNode) element;
 		return treeNode.getParent();
 	}
 
@@ -114,8 +114,9 @@ public boolean hasChildren(Object element) {
 	 */
 	@Override
 	public Object[] getElements(Object inputElement) {
-		if (rootNode == null)
+		if (rootNode == null) {
 			return new Object[0];
+		}
 
 		return omitRoot ? rootNode.getChildren() : new Object[] {rootNode};
 	}
@@ -175,8 +176,9 @@ public void inputChanged(Viewer viewer, Object oldInput, final Object input) {
 			return;
 		}
 
-		if (!acceptInput(input))
+		if (!acceptInput(input)) {
 			return;
+		}
 
 		rootNode = createNode("root"); //$NON-NLS-1$
 		rebuild(viewer, input);

runtime/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ByteUtil.java

@@ -35,11 +35,12 @@ public static String byteArrayToString(byte[] byteArray, int max) {
 			result.append(',');
 		}
 		// adds an ellipsis if there is too much bytes to show
-		if (max > 0 && max < byteArray.length)
+		if (max > 0 && max < byteArray.length) {
 			result.append("..."); //$NON-NLS-1$
 		// or remove the trailing comma
-		else
+		} else {
 			result.deleteCharAt(result.length() - 1);
+		}
 		result.append(']');
 		return result.toString();
 	}

runtime/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ClearTextAction.java

@@ -28,7 +28,7 @@ public class ClearTextAction extends GlobalAction {
 	/**
 	 * The document on which this action performs its duty.
 	 */
-	private IDocument document;
+	private final IDocument document;
 
 	/**
 	 * Constructs a ClearTextAction action with the provided document.

runtime/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/CollapseAllAction.java

@@ -23,7 +23,7 @@
 public class CollapseAllAction extends Action {
 
 	private static final String label = "Collapse All"; //$NON-NLS-1$
-	private TreeViewer viewer;
+	private final TreeViewer viewer;
 
 	public CollapseAllAction(TreeViewer viewer) {
 		super(label);

runtime/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/DeepSize.java

@@ -57,8 +57,9 @@ public boolean equals(Object o) {
 			if (o == null) {
 				return false;
 			}
-			if (o.getClass() != ObjectWrapper.class)
+			if (o.getClass() != ObjectWrapper.class) {
 				return false;
+			}
 			return object == ((ObjectWrapper) o).object;
 		}
 
@@ -168,21 +169,25 @@ private boolean shouldIgnoreType(Class<?> clazz) {
 			ignoreTypeNames = getDefaultIgnoreTypeNames();
 		}
 		while (clazz != null) {
-			if (ignoreTypeNames.contains(clazz.getName()))
+			if (ignoreTypeNames.contains(clazz.getName())) {
 				return true;
+			}
 			clazz = clazz.getSuperclass();
 		}
 		return false;
 	}
 
 	private int sizeOf(Object o) {
-		if (o == null)
+		if (o == null) {
 			return 0;
-		if (ignore(o))
+		}
+		if (ignore(o)) {
 			return POINTER_SIZE;
+		}
 		Class<?> clazz = o.getClass();
-		if (shouldIgnoreType(clazz))
+		if (shouldIgnoreType(clazz)) {
 			return POINTER_SIZE;
+		}
 		return clazz.isArray() ? sizeOfArray(clazz, o) : sizeOfObject(clazz, o);
 	}
 
@@ -258,8 +263,9 @@ private int sizeOfObject(Class<?> type, Object o) {
 	}
 
 	private int sizeOfPrimitiveField(Class<?> type) {
-		if (type == long.class || type == double.class)
+		if (type == long.class || type == double.class) {
 			return 8;
+		}
 		return 4;
 	}
 

runtime/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ErrorUtil.java

@@ -31,8 +31,9 @@ public class ErrorUtil {
 	 * @param userMessage an optional  higher-level explanation for the exception
 	 */
 	public static void logException(Exception exception, String userMessage) {
-		if (userMessage == null)
+		if (userMessage == null) {
 			userMessage = exception.getMessage();
+		}
 		IStatus status = new Status(IStatus.ERROR, ErrorUtil.class, -1, userMessage, exception);
 		ILog.of(ErrorUtil.class).log(status);
 	}
@@ -44,8 +45,9 @@ public static void logException(Exception exception, String userMessage) {
 	 */
 	public static void showErrorMessage(String message, String title) {
 		Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
-		if (title == null)
+		if (title == null) {
 			title = "Error in Spy plug-in"; //$NON-NLS-1$
+		}
 		MessageDialog.openError(shell, title, message);
 	}
 }

runtime/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TableSelectionProviderDecorator.java

@@ -58,12 +58,11 @@ public ISelection getSelection() {
 		ISelection selection = selectionProvider.getSelection();
 
 		// in these cases the original selection will be returned
-		if (selection == null || selection.isEmpty() || !(selection instanceof IStructuredSelection))
+		if (selection == null || selection.isEmpty() || !(selection instanceof IStructuredSelection structuredSelection)) {
 			return selection;
+		}
 
 		// constructs a list with the selected elements
-		IStructuredSelection structuredSelection = (IStructuredSelection) selection;
-
 		StringBuilder copyText = new StringBuilder();
 		copyText.append(headerPluginStats());
 		copyText.append('\n');

runtime/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TableWithTotalView.java

@@ -78,8 +78,9 @@ public void widgetSelected(SelectionEvent event) {
 					// Three state sort for column 0.  !flat/!reverse -> flat/!reverse -> flat/reverse
 					if (column == 0) {
 						if (flat) {
-							if (oldSorter.isReversed())
+							if (oldSorter.isReversed()) {
 								flat = false;
+							}
 							oldSorter.setReversed(!oldSorter.isReversed());
 						} else {
 							flat = true;
@@ -90,8 +91,9 @@ public void widgetSelected(SelectionEvent event) {
 						oldSorter.setReversed(!oldSorter.isReversed());
 					}
 				}
-				if (viewer.getContentProvider() instanceof IFlattable)
+				if (viewer.getContentProvider() instanceof IFlattable) {
 					((IFlattable) viewer.getContentProvider()).setFlat(flat);
+				}
 				viewer.refresh();
 				viewer.setSelection(selection);
 			}
@@ -199,15 +201,17 @@ public void run() {
 				IStructuredSelection selection = viewer.getStructuredSelection();
 				String result = ""; //$NON-NLS-1$
 				String[] columnHeaders = getColumnHeaders();
-				for (String columnHeader : columnHeaders)
+				for (String columnHeader : columnHeaders) {
 					result += columnHeader + ","; //$NON-NLS-1$
+				}
 				result += "\n\n"; //$NON-NLS-1$
 
 				ITableLabelProvider labelProvider = (ITableLabelProvider) viewer.getLabelProvider();
 				for (Iterator<?> iterator = selection.iterator(); iterator.hasNext();) {
 					Object selectedItem = iterator.next();
-					for (int i = 0; i < columnHeaders.length; i++)
+					for (int i = 0; i < columnHeaders.length; i++) {
 						result += labelProvider.getColumnText(selectedItem, i) + ","; //$NON-NLS-1$
+					}
 					result += "\n"; //$NON-NLS-1$
 				}
 				clipboard.setContents(new Object[] {result}, new Transfer[] {TextTransfer.getInstance()});
@@ -268,7 +272,8 @@ public void setSelection(ISelection selection) {
 
 	@Override
 	public void setFocus() {
-		if (tableTree != null)
+		if (tableTree != null) {
 			tableTree.setFocus();
+		}
 	}
 }

runtime/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TreeContentProviderNode.java

@@ -108,10 +108,12 @@ public boolean hasChildren() {
 
 	@Override
 	public String toString() {
-		if (name == null)
+		if (name == null) {
 			return value.toString();
-		if (value == null)
+		}
+		if (value == null) {
 			return name;
+		}
 		return name + " = " + value; //$NON-NLS-1$
 	}
 
@@ -149,8 +151,9 @@ public boolean isRoot() {
 	 * <code>TreeContentProviderNode</code>.
 	 */
 	public void sort() {
-		if (children == null)
+		if (children == null) {
 			return;
+		}
 		children.sort(null);
 	}
 
@@ -173,10 +176,12 @@ public int compareTo(TreeContentProviderNode other) {
 	 * @see ITreeNodeVisitor#visit
 	 */
 	public void accept(ITreeNodeVisitor visitor) {
-		if (!visitor.visit(this))
+		if (!visitor.visit(this)) {
 			return;
-		if (children == null)
+		}
+		if (children == null) {
 			return;
+		}
 		for (TreeContentProviderNode child : children) {
 			child.accept(visitor);
 		}
@@ -197,10 +202,12 @@ public TreeContentProviderNode getRoot() {
 	 * @return a tree node, or <code>null</code>
 	 */
 	public TreeContentProviderNode findNode(Object obj) {
-		if (obj.equals(this.value))
+		if (obj.equals(this.value)) {
 			return this;
-		if (children == null || children.isEmpty())
+		}
+		if (children == null || children.isEmpty()) {
 			return null;
+		}
 		for (TreeContentProviderNode child : children) {
 			TreeContentProviderNode found = child.findNode(obj);
 			if (found != null) {
@@ -212,7 +219,7 @@ public TreeContentProviderNode findNode(Object obj) {
 
 	@Override
 	public <T> T getAdapter(Class<T> adapter) {
-		return value instanceof IAdaptable ? ((IAdaptable) value).getAdapter(adapter) : null;
+		return value instanceof IAdaptable i ? i.getAdapter(adapter) : null;
 	}
 
 }

runtime/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TreeSelectionProviderDecorator.java

@@ -63,20 +63,21 @@ public ISelection getSelection() {
 		ISelection selection = selectionProvider.getSelection();
 
 		// in these cases the original selection will be returned
-		if (selection == null || selection.isEmpty() || !(selection instanceof IStructuredSelection))
+		if (selection == null || selection.isEmpty() || !(selection instanceof IStructuredSelection structuredSelection)) {
 			return selection;
+		}
 
 		// constructs a list with the selected elements
-		IStructuredSelection structuredSelection = (IStructuredSelection) selection;
 		List<Object> list = structuredSelection.toList();
 		final List<Object> selectedElements = new ArrayList<>(list);
 
 		// tries to find a TreeContentProviderNode between the selected elements
 		TreeContentProviderNode anyNode = findNodeElement(selectedElements);
 
 		// if there is no TreeContentProviderNodes, there is nothing to do
-		if (anyNode == null)
+		if (anyNode == null) {
 			return selection;
+		}
 
 		// otherwise, we will move the elements to a new list in the same order
 		// we find them in the tree.
@@ -87,8 +88,9 @@ public ISelection getSelection() {
 		anyNode.getRoot().accept(node -> {
 			int elementIndex = selectedElements.indexOf(node);
 
-			if (selectedElements.contains(node))
+			if (selectedElements.contains(node)) {
 				orderedElements.add(selectedElements.remove(elementIndex));
+			}
 
 			return true;
 		});
@@ -108,8 +110,9 @@ public ISelection getSelection() {
 	private TreeContentProviderNode findNodeElement(List<Object> elements) {
 		for (Iterator<?> iter = elements.iterator(); iter.hasNext();) {
 			Object element = iter.next();
-			if (element instanceof TreeContentProviderNode)
+			if (element instanceof TreeContentProviderNode) {
 				return (TreeContentProviderNode) element;
+			}
 		}
 
 		return null;