Perform clean code of bundles/org.eclipse.ltk.ui.refactoring

Author: eclipse-platform-bot

bundles/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/AbstractChangeNode.java

@@ -130,8 +130,9 @@ boolean hasOneGroupCategory(List<GroupCategory> categories) {
 
 	@Override
 	boolean hasDerived() {
-		if (hasDerivedResourceChange(fChange))
+		if (hasDerivedResourceChange(fChange)) {
 			return true;
+		}
 		for (PreviewNode child : getChildren()) {
 			if (child.hasDerived()) {
 				return true;
@@ -145,8 +146,9 @@ int getDefaultChangeActive() {
 		if (fChildren != null) {
 			for (PreviewNode child : fChildren) {
 				result= ACTIVATION_TABLE[child.getActive()][result];
-				if (result == PARTLY_ACTIVE)
+				if (result == PARTLY_ACTIVE) {
 					break;
+				}
 			}
 		}
 		return result;
@@ -157,8 +159,9 @@ int getCompositeChangeActive() {
 			int result= fChildren[0].getActive();
 			for (int i= 1; i < fChildren.length; i++) {
 				result= ACTIVATION_TABLE[fChildren[i].getActive()][result];
-				if (result == PARTLY_ACTIVE)
+				if (result == PARTLY_ACTIVE) {
 					break;
+				}
 			}
 			return result;
 		} else {
@@ -177,8 +180,7 @@ static boolean hasDerivedResourceChange(Change change) {
 		Object modifiedElement= change.getModifiedElement();
 		if (modifiedElement instanceof IResource) {
 			return ((IResource) modifiedElement).isDerived(IResource.CHECK_ANCESTORS);
-		} else if (modifiedElement instanceof IAdaptable) {
-			IAdaptable adaptable= (IAdaptable) modifiedElement;
+		} else if (modifiedElement instanceof IAdaptable adaptable) {
 			IResource resource= adaptable.getAdapter(IResource.class);
 			if (resource != null) {
 				return resource.isDerived(IResource.CHECK_ANCESTORS);

bundles/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/AbstractDescriptor.java

@@ -46,14 +46,16 @@ public boolean matches(Object element, String variableName) throws CoreException
 		Expression exp= getExpression();
 		EvaluationContext evaluationContext= new EvaluationContext(null, element);
 		evaluationContext.addVariable(variableName, element);
-		if (exp.evaluate(evaluationContext) == EvaluationResult.FALSE)
+		if (exp.evaluate(evaluationContext) == EvaluationResult.FALSE) {
 			return false;
+		}
 		return true;
 	}
 
 	public Expression getExpression() throws CoreException {
-		if (fExpression == null)
+		if (fExpression == null) {
 			fExpression= createExpression(fConfigurationElement);
+		}
 		return fExpression;
 	}
 
@@ -63,8 +65,9 @@ public void clear() {
 
 	protected Expression createExpression(IConfigurationElement element) throws CoreException {
 		IConfigurationElement[] children= element.getChildren(ExpressionTagNames.ENABLEMENT);
-		if (children.length == 0)
+		if (children.length == 0) {
 			return Expression.FALSE;
+		}
 		// TODO we should add some sort of syntax check and throw an core exception in this case
 		Assert.isTrue(children.length == 1);
 		return ExpressionConverter.getDefault().perform(children[0]);

bundles/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ChangeElementLabelProvider.java

@@ -26,7 +26,7 @@
 
 class ChangeElementLabelProvider extends LabelProvider implements IFontProvider {
 
-	private Map<ImageDescriptor, Image> fDescriptorImageMap= new HashMap<>();
+	private final Map<ImageDescriptor, Image> fDescriptorImageMap= new HashMap<>();
 
 	public ChangeElementLabelProvider() {
 	}

bundles/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ChangeElementTreeViewer.java

@@ -40,8 +40,9 @@ public void setGroupCategory(List<GroupCategory> groupCategories) {
 		}
 		@Override
 		public boolean select(Viewer viewer, Object parentElement, Object element) {
-			if (fGroupCategories == null)
+			if (fGroupCategories == null) {
 				return true;
+			}
 			return ((PreviewNode)element).hasOneGroupCategory(fGroupCategories);
 		}
 	}
@@ -161,8 +162,7 @@ protected void revealPrevious() {
 
 	private void setSubtreeGrayed(Object element, boolean grayed) {
 		Widget widget= findItem(element);
-		if (widget instanceof TreeItem) {
-			TreeItem item= (TreeItem)widget;
+		if (widget instanceof TreeItem item) {
 			if (item.getGrayed() != grayed) {
 				item.setGrayed(grayed);
 				grayChildren(getChildren(item), grayed);
@@ -172,8 +172,7 @@ private void setSubtreeGrayed(Object element, boolean grayed) {
 
 	private void grayChildren(Item[] items, boolean grayed) {
 		for (Item element : items) {
-			if (element instanceof TreeItem) {
-				TreeItem item= (TreeItem)element;
+			if (element instanceof TreeItem item) {
 				if (item.getGrayed() != grayed) {
 					item.setGrayed(grayed);
 					grayChildren(getChildren(item), grayed);
@@ -185,22 +184,25 @@ private void grayChildren(Item[] items, boolean grayed) {
 	private void revealElement(boolean next) {
 		PreviewNode current= (PreviewNode)getInput();
 		IStructuredSelection selection= (IStructuredSelection)getSelection();
-		if (!selection.isEmpty())
+		if (!selection.isEmpty()) {
 			current= (PreviewNode)selection.iterator().next();
+		}
 
 		PreviewNode candidate= getLeaf(current, next);
 		if (candidate == null) {
 			candidate= getElement(current, next);
 			if (candidate != null) {
 				PreviewNode leaf= getLeaf(candidate, next);
-				if (leaf != null)
+				if (leaf != null) {
 					candidate= leaf;
+				}
 			}
 		}
-		if (candidate != null)
+		if (candidate != null) {
 			setSelection(new StructuredSelection(candidate), true);
-		else
+		} else {
 			getControl().getDisplay().beep();
+		}
 	}
 
 	private PreviewNode getLeaf(PreviewNode element, boolean first) {
@@ -216,30 +218,34 @@ private PreviewNode getLeaf(PreviewNode element, boolean first) {
 	private PreviewNode getElement(PreviewNode element, boolean next) {
 		while(true) {
 			PreviewNode parent= element.getParent();
-			if (parent == null)
+			if (parent == null) {
 				return null;
+			}
 			PreviewNode candidate= getSibling(
 				getSortedChildrenAsPreviewNodes(parent),
 				element, next);
-			if (candidate != null)
+			if (candidate != null) {
 				return candidate;
+			}
 			element= parent;
 		}
 	}
 
 	private PreviewNode getSibling(PreviewNode[] children, PreviewNode element, boolean next) {
 		for (int i= 0; i < children.length; i++) {
 			if (children[i] == element) {
-				if (next)
-	 				if (i < children.length - 1)
-	 					return children[i + 1];
-	 				else
-	 					return null;
-	 			else
-					if (i > 0)
-	 					return children[i - 1];
-	 				else
-	 					return null;
+				if (next) {
+					if (i < children.length - 1) {
+						return children[i + 1];
+					} else {
+						return null;
+					}
+				} else
+					if (i > 0) {
+						return children[i - 1];
+					} else {
+						return null;
+					}
 			}
 		}
 		return null;

bundles/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ChangeExceptionHandler.java

@@ -41,8 +41,8 @@
 
 public class ChangeExceptionHandler {
 
-	private Shell fParent;
-	private String fName;
+	private final Shell fParent;
+	private final String fName;
 
 	private static class RefactorErrorDialog extends ErrorDialog {
 		public RefactorErrorDialog(Shell parentShell, String dialogTitle, String dialogMessage, IStatus status, int displayMask) {

bundles/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/DescriptorManager.java

@@ -25,8 +25,8 @@
 
 public abstract class DescriptorManager {
 
-	private String fExtensionPoint;
-	private String fVariableName;
+	private final String fExtensionPoint;
+	private final String fVariableName;
 	private AbstractDescriptor[] fExtensions;
 
 	public DescriptorManager(String extensionPoint, String variableName) {
@@ -37,8 +37,9 @@ public DescriptorManager(String extensionPoint, String variableName) {
 	}
 
 	public AbstractDescriptor getDescriptor(Object element) throws CoreException {
-		if (fExtensions == null)
+		if (fExtensions == null) {
 			init();
+		}
 
 		List<AbstractDescriptor> candidates= new ArrayList<>(1);
 		for (AbstractDescriptor descriptor : fExtensions) {
@@ -47,8 +48,9 @@ public AbstractDescriptor getDescriptor(Object element) throws CoreException {
 			}
 			descriptor.clear();
 		}
-		if (candidates.isEmpty())
+		if (candidates.isEmpty()) {
 			return null;
+		}
 		// No support for conflicts yet.
 		return candidates.get(0);
 	}

bundles/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ErrorWizardPage.java

@@ -109,8 +109,9 @@ public void setVisible(boolean visible) {
 			// the page was not complete if we show a fatal error. In this
 			// case we can finish anyway. To enable the OK and Preview button
 			// on the user input page we have to mark the page as complete again.
-			if (!isPageComplete() && fStatus.hasFatalError())
+			if (!isPageComplete() && fStatus.hasFatalError()) {
 				setPageComplete(true);
+			}
 		}
 		super.setVisible(visible);
 	}
@@ -131,8 +132,9 @@ public IWizardPage getNextPage() {
 			change= wizard.internalCreateChange(InternalAPI.INSTANCE, new CreateChangeOperation(getRefactoring()), false);
 			wizard.internalSetChange(InternalAPI.INSTANCE, change);
 		}
-		if (change == null)
+		if (change == null) {
 			return this;
+		}
 
 		return super.getNextPage();
 	}
@@ -149,10 +151,12 @@ protected boolean performFinish() {
 			operation= new UIPerformChangeOperation(getShell().getDisplay(), ccop, getContainer());
 		}
 		FinishResult result= wizard.internalPerformFinish(InternalAPI.INSTANCE, operation);
-		if (result.isException())
+		if (result.isException()) {
 			return true;
-		if (result.isInterrupted())
+		}
+		if (result.isInterrupted()) {
 			return false;
+		}
 		RefactoringStatus fValidationStatus= operation.getValidationStatus();
 		if (fValidationStatus != null && fValidationStatus.hasFatalError()) {
 			MessageDialog.openError(wizard.getShell(), wizard.getWindowTitle(),

bundles/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ExceptionHandler.java

@@ -108,10 +108,11 @@ private void displayMessageDialog(String exceptionMessage, Shell shell, String t
 			msg.write(message);
 			msg.write("\n\n"); //$NON-NLS-1$
 		}
-		if (exceptionMessage == null || exceptionMessage.length() == 0)
+		if (exceptionMessage == null || exceptionMessage.length() == 0) {
 			msg.write(RefactoringUIMessages.ExceptionHandler_seeErrorLogMessage);
-		else
+		} else {
 			msg.write(exceptionMessage);
+		}
 		MessageDialog.openError(shell, title, msg.toString());
 	}
 }

bundles/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/FileStatusContextViewer.java

@@ -54,9 +54,9 @@ public void setInput(RefactoringStatusContext context) {
 		updateTitle(file);
 		IDocument document= getDocument(file);
 		IRegion region= fc.getTextRegion();
-		if (region != null && document.getLength() >= region.getOffset() + region.getLength())
+		if (region != null && document.getLength() >= region.getOffset() + region.getLength()) {
 			setInput(document, region);
-		else {
+		} else {
 			setInput(document, new Region(0, 0));
 		}
 	}

bundles/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/FinishResult.java

@@ -19,7 +19,7 @@
  * @since 3.0
  */
 public class FinishResult {
-	private int fValue;
+	private final int fValue;
 
 	private FinishResult(int value) {
 		fValue= value;