Perform clean code of bundles/org.eclipse.ui.workbench.texteditor

Author: eclipse-platform-bot

bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/contentassist/ContentAssistHandler.java

@@ -54,15 +54,15 @@ public class ContentAssistHandler {
 	/**
 	 * The target control.
 	 */
-	private Control fControl;
+	private final Control fControl;
 	/**
 	 * The content assist subject adapter.
 	 */
-	private AbstractControlContentAssistSubjectAdapter fContentAssistSubjectAdapter;
+	private final AbstractControlContentAssistSubjectAdapter fContentAssistSubjectAdapter;
 	/**
 	 * The content assistant.
 	 */
-	private SubjectControlContentAssistant fContentAssistant;
+	private final SubjectControlContentAssistant fContentAssistant;
 	/**
 	 * The currently installed FocusListener, or <code>null</code> iff none installed.
 	 * This is also used as flag to tell whether content assist is enabled
@@ -132,13 +132,15 @@ public boolean isEnabled() {
 	 * @param enable enable content assist iff true
 	 */
 	public void setEnabled(boolean enable) {
-		if (enable == isEnabled())
+		if (enable == isEnabled()) {
 			return;
+		}
 
-		if (enable)
+		if (enable) {
 			enable();
-		else
+		} else {
 			disable();
+		}
 	}
 
 	/**
@@ -149,8 +151,9 @@ private void enable() {
 			fContentAssistant.install(fContentAssistSubjectAdapter);
 			installCueLabelProvider();
 			installFocusListener();
-			if (fControl.isFocusControl())
+			if (fControl.isFocusControl()) {
 				activateHandler();
+			}
 		}
 	}
 
@@ -163,8 +166,9 @@ private void disable() {
 			fContentAssistSubjectAdapter.setContentAssistCueProvider(null);
 			fControl.removeFocusListener(fFocusListener);
 			fFocusListener= null;
-			if (fHandlerActivation != null)
+			if (fHandlerActivation != null) {
 				deactivateHandler();
+			}
 		}
 	}
 
@@ -177,8 +181,9 @@ private void installCueLabelProvider() {
 			public String getText(Object element) {
 				IBindingService bindingService= PlatformUI.getWorkbench().getAdapter(IBindingService.class);
 				TriggerSequence[] activeBindings= bindingService.getActiveBindingsFor(ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS);
-				if (activeBindings.length == 0)
+				if (activeBindings.length == 0) {
 					return ContentAssistMessages.ContentAssistHandler_contentAssistAvailable;
+				}
 				return NLSUtility.format(ContentAssistMessages.ContentAssistHandler_contentAssistAvailableWithKeyBinding, activeBindings[0].format());
 			}
 		};
@@ -192,13 +197,15 @@ private void installFocusListener() {
 		fFocusListener= new FocusListener() {
 			@Override
 			public void focusGained(final FocusEvent e) {
-				if (fHandlerActivation == null)
+				if (fHandlerActivation == null) {
 					activateHandler();
+				}
 			}
 			@Override
 			public void focusLost(FocusEvent e) {
-				if (fHandlerActivation != null)
+				if (fHandlerActivation != null) {
 					deactivateHandler();
+				}
 			}
 		};
 		fControl.addFocusListener(fFocusListener);
@@ -209,14 +216,16 @@ public void focusLost(FocusEvent e) {
 	 */
 	private void activateHandler() {
 		IHandlerService handlerService= PlatformUI.getWorkbench().getAdapter(IHandlerService.class);
-		if (handlerService == null)
+		if (handlerService == null) {
 			return;
+		}
 
 		IHandler handler= new AbstractHandler() {
 			@Override
 			public Object execute(ExecutionEvent event) throws ExecutionException {
-				if (ContentAssistHandler.this.isEnabled()) // don't call AbstractHandler#isEnabled()!
+				if (ContentAssistHandler.this.isEnabled()) { // don't call AbstractHandler#isEnabled()!
 					fContentAssistant.showPossibleCompletions();
+				}
 				return null;
 			}
 		};
@@ -228,8 +237,9 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
 	 */
 	private void deactivateHandler() {
 		IHandlerService handlerService= PlatformUI.getWorkbench().getAdapter(IHandlerService.class);
-		if (handlerService != null)
+		if (handlerService != null) {
 			handlerService.deactivateHandler(fHandlerActivation);
+		}
 		fHandlerActivation= null;
 	}
 }

bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/FindReplaceLogic.java

@@ -53,7 +53,7 @@ public class FindReplaceLogic implements IFindReplaceLogic {
 
 	private boolean isTargetSupportingRegEx;
 	private boolean isTargetEditable;
-	private Set<SearchOptions> searchOptions = new HashSet<>();
+	private final Set<SearchOptions> searchOptions = new HashSet<>();
 
 	private String findString = ""; //$NON-NLS-1$
 	private String replaceString = ""; //$NON-NLS-1$
@@ -465,11 +465,12 @@ public int findAndSelect(int offset) {
 	 * @return the selection after replacing, i.e. the inserted text
 	 */
 	private Point replaceSelection() {
-		if (target instanceof IFindReplaceTargetExtension3)
+		if (target instanceof IFindReplaceTargetExtension3) {
 			((IFindReplaceTargetExtension3) target).replaceSelection(replaceString,
 					isAvailableAndActive(SearchOptions.REGEX));
-		else
+		} else {
 			target.replaceSelection(replaceString);
+		}
 
 		return target.getSelection();
 	}
@@ -575,8 +576,9 @@ public void updateTarget(IFindReplaceTarget newTarget, boolean canEditTarget) {
 		this.isTargetEditable = canEditTarget;
 
 		if (this.target != newTarget) {
-			if (this.target instanceof IFindReplaceTargetExtension)
+			if (this.target instanceof IFindReplaceTargetExtension) {
 				((IFindReplaceTargetExtension) this.target).endSession();
+			}
 
 			this.target = newTarget;
 			isTargetSupportingRegEx = newTarget instanceof IFindReplaceTargetExtension3;

bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/HistoryStore.java

@@ -26,9 +26,9 @@
  * the nodes using the DialogSettings mechanism.
  */
 public class HistoryStore {
-	private IDialogSettings settingsManager;
-	private int historySize;
-	private String sectionName;
+	private final IDialogSettings settingsManager;
+	private final int historySize;
+	private final String sectionName;
 
 	/**
 	 * @param settingsManager manager for DialogSettings

bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/FindReplaceOverlay.java

@@ -83,7 +83,7 @@
 import org.eclipse.ui.texteditor.StatusTextEditor;
 
 public class FindReplaceOverlay {
-	private final class KeyboardShortcuts {
+	private static final class KeyboardShortcuts {
 		private static final List<KeyStroke> SEARCH_FORWARD = List.of( //
 				KeyStroke.getInstance(SWT.CR), KeyStroke.getInstance(SWT.KEYPAD_CR));
 		private static final List<KeyStroke> SEARCH_BACKWARD = List.of( //
@@ -154,7 +154,7 @@ private final class KeyboardShortcuts {
 	private ControlDecoration searchBarDecoration;
 	private ContentAssistCommandAdapter contentAssistSearchField, contentAssistReplaceField;
 
-	private FocusListener targetActionActivationHandling = new FocusListener() {
+	private final FocusListener targetActionActivationHandling = new FocusListener() {
 		private DeactivateGlobalActionHandlers globalActionHandlerDeaction;
 
 		@Override
@@ -348,7 +348,7 @@ private void performSelectAll() {
 		searchBar.storeHistory();
 	}
 
-	private ControlListener targetMovementListener = ControlListener
+	private final ControlListener targetMovementListener = ControlListener
 			.controlResizedAdapter(__ -> asyncExecIfOpen(FindReplaceOverlay.this::updatePlacementAndVisibility));
 
 	private void asyncExecIfOpen(Runnable operation) {
@@ -361,12 +361,12 @@ private void asyncExecIfOpen(Runnable operation) {
 		}
 	}
 
-	private FocusListener targetFocusListener = FocusListener.focusGainedAdapter(__ ->  {
+	private final FocusListener targetFocusListener = FocusListener.focusGainedAdapter(__ ->  {
 			removeSearchScope();
 			searchBar.storeHistory();
 	});
 
-	private KeyListener closeOnTargetEscapeListener = KeyListener.keyPressedAdapter(c -> {
+	private final KeyListener closeOnTargetEscapeListener = KeyListener.keyPressedAdapter(c -> {
 		if (c.keyCode == SWT.ESC) {
 			this.close();
 		}
@@ -382,8 +382,9 @@ private IDialogSettings getDialogSettings() {
 		IDialogSettings settings = PlatformUI
 				.getDialogSettingsProvider(FrameworkUtil.getBundle(FindReplaceAction.class)).getDialogSettings();
 		IDialogSettings dialogSettings = settings.getSection(FindReplaceAction.class.getClass().getName());
-		if (dialogSettings == null)
+		if (dialogSettings == null) {
 			dialogSettings = settings.addNewSection(FindReplaceAction.class.getClass().getName());
+		}
 		return dialogSettings;
 	}
 
@@ -515,7 +516,7 @@ public void create() {
 	 * A composite with a fixed background color, not adapting to theming.
 	 */
 	private class FixedColorComposite extends Composite {
-		private Color fixColor;
+		private final Color fixColor;
 
 		public FixedColorComposite(Composite parent, int style, Color backgroundColor) {
 			super(parent, style);

bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/status/FindAllStatus.java

@@ -14,7 +14,7 @@
 package org.eclipse.ui.internal.findandreplace.status;
 
 public class FindAllStatus implements IFindReplaceStatus {
-	private int selectCount;
+	private final int selectCount;
 
 	public FindAllStatus(int selectCount) {
 		this.selectCount = selectCount;

bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/status/FindStatus.java

@@ -20,7 +20,7 @@ public enum StatusCode {
 		WRAPPED, READONLY,
 	}
 
-	private StatusCode messageCode;
+	private final StatusCode messageCode;
 
 	public FindStatus(StatusCode errorCode) {
 		this.messageCode = errorCode;

bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/status/InvalidRegExStatus.java

@@ -21,7 +21,7 @@
  */
 public class InvalidRegExStatus implements IFindReplaceStatus {
 
-	private PatternSyntaxException regExException;
+	private final PatternSyntaxException regExException;
 
 	public InvalidRegExStatus(PatternSyntaxException regExException) {
 		this.regExException = regExException;

bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/status/ReplaceAllStatus.java

@@ -14,7 +14,7 @@
 package org.eclipse.ui.internal.findandreplace.status;
 
 public class ReplaceAllStatus implements IFindReplaceStatus {
-	private int replaceCount;
+	private final int replaceCount;
 
 	public ReplaceAllStatus(int replaceCount) {
 		this.replaceCount = replaceCount;

bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/CompoundEditExitStrategy.java

@@ -109,8 +109,9 @@ public void preExecute(String commandId, ExecutionEvent event) {
 		public void verifyKey(VerifyEvent event) {
 			// any key press that is not a modifier combo ends the compound change
 			final int maskWithoutShift= SWT.MODIFIER_MASK & ~SWT.SHIFT;
-			if ((event.keyCode & SWT.MODIFIER_MASK) == 0 && (event.stateMask & maskWithoutShift) == 0)
+			if ((event.keyCode & SWT.MODIFIER_MASK) == 0 && (event.stateMask & maskWithoutShift) == 0) {
 				fireEndCompoundEdit();
+			}
 		}
 
 	}
@@ -130,8 +131,9 @@ public void verifyKey(VerifyEvent event) {
 	 * @param commandId the command id of the repeatable command
 	 */
 	public CompoundEditExitStrategy(String commandId) {
-		if (commandId == null)
+		if (commandId == null) {
 			throw new NullPointerException("commandId"); //$NON-NLS-1$
+		}
 		fCommandIds= new String[] {commandId};
 	}
 
@@ -143,8 +145,9 @@ public CompoundEditExitStrategy(String commandId) {
 	 */
 	public CompoundEditExitStrategy(String[] commandIds) {
 		for (int i= 0; i < commandIds.length; i++) {
-			if (commandIds[i] == null)
+			if (commandIds[i] == null) {
 				throw new NullPointerException("commandIds[" + i + "]"); //$NON-NLS-1$ //$NON-NLS-2$
+			}
 		}
 		fCommandIds= new String[commandIds.length];
 		System.arraycopy(commandIds, 0, fCommandIds, 0, commandIds.length);
@@ -158,8 +161,9 @@ public CompoundEditExitStrategy(String[] commandIds) {
 	 */
 	public void arm(ITextViewer viewer) {
 		disarm();
-		if (viewer == null)
+		if (viewer == null) {
 			throw new NullPointerException("editor"); //$NON-NLS-1$
+		}
 		fViewer= viewer;
 		addListeners(fViewer);
 	}
@@ -189,14 +193,16 @@ private void addListeners(ITextViewer viewer) {
 		}
 
 		ICommandService commandService= PlatformUI.getWorkbench().getAdapter(ICommandService.class);
-		if (commandService != null)
+		if (commandService != null) {
 			commandService.addExecutionListener(fEventListener);
+		}
 	}
 
 	private void removeListeners() {
 		ICommandService commandService= PlatformUI.getWorkbench().getAdapter(ICommandService.class);
-		if (commandService != null)
+		if (commandService != null) {
 			commandService.removeExecutionListener(fEventListener);
+		}
 
 		if (fWidgetEventSource != null) {
 			fWidgetEventSource.removeFocusListener(fEventListener);

bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/FocusedInformationPresenter.java

@@ -47,9 +47,9 @@ public class FocusedInformationPresenter extends InformationPresenter {
 	 */
 	public final static class InformationProvider implements IInformationProvider, IInformationProviderExtension, IInformationProviderExtension2 {
 
-		private IRegion fHoverRegion;
-		private Object fHoverInfo;
-		private IInformationControlCreator fControlCreator;
+		private final IRegion fHoverRegion;
+		private final Object fHoverInfo;
+		private final IInformationControlCreator fControlCreator;
 
 		public InformationProvider(IRegion hoverRegion, Object hoverInfo, IInformationControlCreator controlCreator) {
 			fHoverRegion= hoverRegion;
@@ -125,8 +125,9 @@ public boolean openFocusedAnnotationHover(IAnnotationHover annotationHover, int
 			Object hoverInfo;
 			if (annotationHover instanceof IAnnotationHoverExtension extension) {
 				ILineRange hoverLineRange= extension.getHoverLineRange(fSourceViewer, line);
-				if (hoverLineRange == null)
+				if (hoverLineRange == null) {
 					return false;
+				}
 				final int maxVisibleLines= Integer.MAX_VALUE; // allow any number of lines being displayed, as we support scrolling
 				hoverInfo= extension.getHoverInfo(fSourceViewer, hoverLineRange, maxVisibleLines);
 			} else {
@@ -139,10 +140,11 @@ public boolean openFocusedAnnotationHover(IAnnotationHover annotationHover, int
 			String contentType= TextUtilities.getContentType(document, fSourceViewerConfiguration.getConfiguredDocumentPartitioning(fSourceViewer), offset, true);
 
 			IInformationControlCreator controlCreator= null;
-			if (annotationHover instanceof IInformationProviderExtension2) // this is undocumented, but left here for backwards compatibility
+			if (annotationHover instanceof IInformationProviderExtension2) { // this is undocumented, but left here for backwards compatibility
 				controlCreator= ((IInformationProviderExtension2) annotationHover).getInformationPresenterControlCreator();
-			else if (annotationHover instanceof IAnnotationHoverExtension)
+			} else if (annotationHover instanceof IAnnotationHoverExtension) {
 				controlCreator= ((IAnnotationHoverExtension) annotationHover).getHoverControlCreator();
+			}
 
 			IInformationProvider informationProvider= new InformationProvider(new Region(offset, 0), hoverInfo, controlCreator);