Perform clean code of bundles/org.eclipse.ui.editors

Author: eclipse-platform-bot

bundles/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/DefaultEncodingSupport.java

@@ -81,20 +81,22 @@ public void initialize(StatusTextEditor textEditor) {
 			if (ResourcesPlugin.PREF_ENCODING.equals(event.getKey())) {
 				// null means: use default
 				Runnable runnable= () -> setEncoding(null, false);
-				if (Display.getCurrent() != null)
+				if (Display.getCurrent() != null) {
 					runnable.run();
-				else {
+				} else {
 					// Post runnable into UI thread
 					Shell shell;
-					if (fTextEditor != null)
+					if (fTextEditor != null) {
 						shell= fTextEditor.getSite().getShell();
-					else
+					} else {
 						shell= getActiveWorkbenchShell();
+					}
 					Display display;
-					if (shell != null)
+					if (shell != null) {
 						display= shell.getDisplay();
-					else
+					} else {
 						display= Display.getDefault();
+					}
 					display.asyncExec(runnable);
 				}
 			}
@@ -139,10 +141,11 @@ protected void setEncoding(String encoding, boolean overwrite) {
 					Runnable encodingSetter=
 							() -> fTextEditor.doRevertToSaved();
 					Display display= fTextEditor.getSite().getShell().getDisplay();
-					if (display != null && !display.isDisposed())
+					if (display != null && !display.isDisposed()) {
 						BusyIndicator.showWhile(display, encodingSetter);
-					else
+					} else {
 						encodingSetter.run();
+					}
 				}
 			}
 		}
@@ -180,11 +183,13 @@ public String getDefaultEncoding() {
 	public String getStatusHeader(IStatus status) {
 		Throwable t= status.getException();
 
-		if (t instanceof CharConversionException)
+		if (t instanceof CharConversionException) {
 			return TextEditorMessages.Editor_error_unreadable_encoding_header;
+		}
 
-		if (t instanceof UnsupportedEncodingException)
+		if (t instanceof UnsupportedEncodingException) {
 			return TextEditorMessages.Editor_error_unsupported_encoding_header;
+		}
 
 		return null;
 	}
@@ -198,11 +203,13 @@ public String getStatusHeader(IStatus status) {
 	public String getStatusBanner(IStatus status) {
 		Throwable t= status.getException();
 
-		if (t instanceof CharConversionException)
+		if (t instanceof CharConversionException) {
 			return TextEditorMessages.Editor_error_unreadable_encoding_banner;
+		}
 
-		if (t instanceof UnsupportedEncodingException)
+		if (t instanceof UnsupportedEncodingException) {
 			return TextEditorMessages.Editor_error_unsupported_encoding_banner;
+		}
 
 		return null;
 
@@ -219,18 +226,21 @@ public String getStatusMessage(IStatus status) {
 		if (t instanceof CharConversionException || t instanceof UnsupportedEncodingException) {
 
 			String encoding= getEncoding();
-			if (encoding == null)
+			if (encoding == null) {
 				encoding= getDefaultEncoding();
+			}
 
 			if (t instanceof CharConversionException) {
-				if (encoding != null)
+				if (encoding != null) {
 					return NLSUtility.format(TextEditorMessages.Editor_error_unreadable_encoding_message_arg, encoding);
+				}
 				return TextEditorMessages.Editor_error_unreadable_encoding_message;
 			}
 
 			if (t instanceof UnsupportedEncodingException) {
-				if (encoding != null)
+				if (encoding != null) {
 					return NLSUtility.format(TextEditorMessages.Editor_error_unsupported_encoding_message_arg, encoding);
+				}
 				return TextEditorMessages.Editor_error_unsupported_encoding_message;
 			}
 		}
@@ -247,8 +257,9 @@ public String getStatusMessage(IStatus status) {
 	 * @since 3.1
 	 */
 	public boolean isEncodingError(IStatus status) {
-		if (status == null || status.getSeverity() != IStatus.ERROR)
+		if (status == null || status.getSeverity() != IStatus.ERROR) {
 			return false;
+		}
 
 		Throwable t= status.getException();
 		return t instanceof CharConversionException || t instanceof UnsupportedEncodingException;
@@ -265,11 +276,13 @@ public boolean isEncodingError(IStatus status) {
 	 */
 	public void createStatusEncodingChangeControl(Composite parent, final IStatus status) {
 		final IAction action= fTextEditor.getAction(ITextEditorActionConstants.CHANGE_ENCODING);
-		if (action instanceof TextEditorAction textEditorAction)
+		if (action instanceof TextEditorAction textEditorAction) {
 			textEditorAction.update();
+		}
 
-		if (action == null || !action.isEnabled())
+		if (action == null || !action.isEnabled()) {
 			return;
+		}
 
 		Shell shell= parent.getShell();
 		Display display= shell.getDisplay();
@@ -301,8 +314,9 @@ public void widgetSelected(SelectionEvent e) {
 	 */
 	private static Shell getActiveWorkbenchShell() {
 		 IWorkbenchWindow window= PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-		 if (window != null)
-		 	return window.getShell();
+		 if (window != null) {
+			return window.getShell();
+		 }
 
 		 return null;
 	}

bundles/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/DocumentReader.java

@@ -43,7 +43,7 @@ class DocumentReader extends Reader {
 	private static class DocumentCharSequence implements CharSequence {
 
 		/** Document */
-		private IDocument fDocument;
+		private final IDocument fDocument;
 
 		/**
 		 * Initialize with the sequence of characters in the given
@@ -104,7 +104,7 @@ public void documentChanged(DocumentEvent event) {
 	private volatile CharSequence fCharSequence;
 
 	/** Document length. */
-	private int fLength;
+	private final int fLength;
 
 	/** The current offset. */
 	private int fOffset= 0;
@@ -142,12 +142,14 @@ public void close() throws IOException {
 	 */
 	private void handleDocumentAboutToBeChanged() {
 		IDocument document= fDocument;
-		if (fCharSequence == null || document == null)
+		if (fCharSequence == null || document == null) {
 			return;
+		}
 		String content= document.get();
 		synchronized (this) {
-			if (fCharSequence == null)
+			if (fCharSequence == null) {
 				return;
+			}
 			fCharSequence= content;
 		}
 		releaseDocument();
@@ -157,8 +159,9 @@ private void handleDocumentAboutToBeChanged() {
 	 * Removes the document listener.
 	 */
 	private synchronized void releaseDocument() {
-		if (fDocument != null)
+		if (fDocument != null) {
 			fDocument.removeDocumentListener(fDocumentListener);
+		}
 		fDocument= null;
 		fDocumentListener= null;
 	}
@@ -167,10 +170,12 @@ private synchronized void releaseDocument() {
 	public int read(char[] cbuf, int off, int len) throws IOException {
 		int i= 0;
 		try {
-			for (; i < len && fOffset < fLength; i++)
+			for (; i < len && fOffset < fLength; i++) {
 				cbuf[off + i]=  fCharSequence.charAt(fOffset++);
-			if (i > 0)
+			}
+			if (i > 0) {
 				return i;
+			}
 
 			return -1;
 		} catch (NullPointerException x) {

bundles/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/EditorsUI.java

@@ -235,16 +235,19 @@ public static HyperlinkDetectorRegistry getHyperlinkDetectorRegistry() {
 	 * @since 3.3
 	 */
 	public static final String getTooltipAffordanceString() {
-		if (!getPreferenceStore().getBoolean(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_SHOW_TEXT_HOVER_AFFORDANCE))
+		if (!getPreferenceStore().getBoolean(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_SHOW_TEXT_HOVER_AFFORDANCE)) {
 			return null;
+		}
 
 		IBindingService bindingService= PlatformUI.getWorkbench().getAdapter(IBindingService.class);
-		if (bindingService == null)
+		if (bindingService == null) {
 			return null;
+		}
 
 		String keySequence= bindingService.getBestActiveBindingFormattedFor(ITextEditorActionDefinitionIds.SHOW_INFORMATION);
-		if (keySequence == null)
+		if (keySequence == null) {
 			return ""; //$NON-NLS-1$
+		}
 
 		return NLSUtility.format(TextEditorMessages.Editor_toolTip_affordance, keySequence);
 	}

bundles/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/FileBufferOperationAction.java

@@ -91,12 +91,13 @@ public void selectionChanged(IAction action, ISelection selection) {
 			Iterator<?> e= structuredSelection.iterator();
 			while (e.hasNext()) {
 				Object element= e.next();
-				if (element instanceof IResource)
+				if (element instanceof IResource) {
 					fResources.add(element);
-				else if (element instanceof IAdaptable adaptable) {
+				} else if (element instanceof IAdaptable adaptable) {
 					Object adapter= adaptable.getAdapter(IResource.class);
-					if (adapter instanceof IResource)
+					if (adapter instanceof IResource) {
 						fResources.add(adapter);
+					}
 				}
 			}
 		}
@@ -108,9 +109,9 @@ else if (element instanceof IAdaptable adaptable) {
 				if (workbenchPart instanceof IEditorPart editorPart) {
 					IEditorInput input= editorPart.getEditorInput();
 					Object adapter= input.getAdapter(IResource.class);
-					if (adapter instanceof IResource)
+					if (adapter instanceof IResource) {
 						fResources.add(adapter);
-					else {
+					} else {
 						adapter= input.getAdapter(ILocationProvider.class);
 						if (adapter instanceof ILocationProvider provider) {
 							fLocation= provider.getPath(input);
@@ -125,8 +126,9 @@ else if (element instanceof IAdaptable adaptable) {
 	}
 
 	protected final IWorkbenchWindow getWorkbenchWindow() {
-		if (fWindow == null)
+		if (fWindow == null) {
 			fWindow= PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+		}
 		return fWindow;
 	}
 
@@ -139,10 +141,12 @@ protected final Shell getShell() {
 	public void run(IAction action) {
 		if (fResources != null && !fResources.isEmpty()) {
 			IFile[] files= collectFiles(fResources.toArray(new IResource[fResources.size()]));
-			if (files != null && files.length > 0)
+			if (files != null && files.length > 0) {
 				doRun(files, null, fFileBufferOperation);
-		} else if (isAcceptableLocation(fLocation))
+			}
+		} else if (isAcceptableLocation(fLocation)) {
 			doRun(null, fLocation, fFileBufferOperation);
+		}
 	}
 
 	/**
@@ -155,8 +159,9 @@ public void run(IAction action) {
 	protected IFile[] collectFiles(IResource[] resources) {
 		Set<IResource> files= new HashSet<>();
 		for (IResource resource : resources) {
-			if ((IResource.FILE & resource.getType()) > 0)
+			if ((IResource.FILE & resource.getType()) > 0) {
 				files.add(resource);
+			}
 		}
 		return files.toArray(new IFile[files.size()]);
 	}
@@ -175,8 +180,9 @@ protected IStatus run(IProgressMonitor monitor) {
 					if (files != null) {
 						ticks-= 30;
 						locations= generateLocations(files, subMonitor.split(30));
-					} else
+					} else {
 						locations= new IPath[] { location };
+					}
 
 					if (locations != null && locations.length > 0) {
 						FileBufferOperationRunner runner= new FileBufferOperationRunner(FileBuffers.getTextFileBufferManager(), getShell());
@@ -203,8 +209,9 @@ protected final IPath[] generateLocations(IFile[] files, IProgressMonitor progre
 			Set<IPath> locations= new HashSet<>();
 			for (IFile file : files) {
 				IPath fullPath = file.getFullPath();
-				if (isAcceptableLocation(fullPath))
+				if (isAcceptableLocation(fullPath)) {
 					locations.add(fullPath);
+				}
 				progressMonitor.worked(1);
 			}
 			return locations.toArray(new IPath[locations.size()]);