Perform clean code of bundles/org.eclipse.e4.ui.progress

Author: eclipse-platform-bot

bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/ProgrammaticProgressView.java

@@ -84,8 +84,9 @@ public void createPartControl(Composite parent, MApplication application,
 		viewer.setInput(progressManager);
 
 		selectionListener = event -> {
-			if (selectionService != null)
+			if (selectionService != null) {
 				selectionService.setSelection(event.getSelection());
+			}
 		};
 		viewer.addSelectionChangedListener(selectionListener);
 

bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/ProgressView.java

@@ -61,8 +61,9 @@ public void createPartControl(Composite parent, ProgressManager progressManager,
 		viewer.setInput(progressManager);
 
 		selectionListener = event -> {
-			if (selectionService != null)
+			if (selectionService != null) {
 				selectionService.setSelection(event.getSelection());
+			}
 		};
 		viewer.addSelectionChangedListener(selectionListener);
 	}

bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/UIJob.java

@@ -239,8 +239,7 @@ public static IStatus newError(String message, Throwable t) {
 
 		// If this was a CoreException, keep the original plugin ID and error
 		// code
-		if (t instanceof CoreException) {
-			CoreException ce = (CoreException) t;
+		if (t instanceof CoreException ce) {
 			pluginId = ce.getStatus().getPlugin();
 			errorCode = ce.getStatus().getCode();
 		}

bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/AnimationItem.java

@@ -25,7 +25,7 @@
  */
 public abstract class AnimationItem {
 
-	private AnimationManager animationManager;
+	private final AnimationManager animationManager;
 
 	interface IAnimationContainer {
 		/**

bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/BlockedJobsDialog.java

@@ -56,17 +56,17 @@ public class BlockedJobsDialog extends IconAndMessageDialog {
 	 */
 	private Button cancelSelected;
 
-	private IProgressMonitor blockingMonitor;
+	private final IProgressMonitor blockingMonitor;
 
-	private JobTreeElement blockedElement = new BlockedUIElement();
+	private final JobTreeElement blockedElement = new BlockedUIElement();
 
-	private IProgressService progressService;
+	private final IProgressService progressService;
 
-	private FinishedJobs finishedJobs;
+	private final FinishedJobs finishedJobs;
 
-	private ProgressManager progressManager;
+	private final ProgressManager progressManager;
 
-	private ProgressViewUpdater progressViewUpdater;
+	private final ProgressViewUpdater progressViewUpdater;
 
 	/**
 	 * The BlockedUIElement is the JobTreeElement that represents the blocked
@@ -150,11 +150,12 @@ public static BlockedJobsDialog createBlockedDialog(Shell parentShell,
 		singleton = new BlockedJobsDialog(parentShell, blockedMonitor, reason,
 				progressService, finishedJobs, viewUpdater, progressManager);
 
-		if (taskName == null || taskName.length() == 0)
+		if (taskName == null || taskName.length() == 0) {
 			singleton
 					.setBlockedTaskName(ProgressMessages.BlockedJobsDialog_UserInterfaceTreeElement);
-		else
+		} else {
 			singleton.setBlockedTaskName(taskName);
+		}
 
 		/**
 		 * If there is no parent shell we have not been asked for a parent so we

bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/DetailedProgressViewer.java

@@ -52,13 +52,13 @@ public class DetailedProgressViewer extends AbstractProgressViewer {
 
 	Composite control;
 
-	private ScrolledComposite scrolled;
+	private final ScrolledComposite scrolled;
 
-	private Composite noEntryArea;
+	private final Composite noEntryArea;
 
-	private IProgressService progressService;
+	private final IProgressService progressService;
 
-	private FinishedJobs finishedJobs;
+	private final FinishedJobs finishedJobs;
 
 	/**
 	 * Map to find existing controls for job items. Only elements with a control are
@@ -373,8 +373,9 @@ public void remove(Object[] elements) {
 				if (item == null) {
 					// Is the parent showing?
 					Object parent = treeElement.getParent();
-					if (parent != null)
+					if (parent != null) {
 						item = doFindItem(parent);
+					}
 				}
 				if (item != null) {
 					jobItemControls.remove(element);

bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/FinishedJobs.java

@@ -61,7 +61,7 @@ static interface KeptJobsListener {
 
 	private final Set<JobTreeElement> keptjobinfos = new LinkedHashSet<>();
 
-	private HashMap<Object, Long> finishedTime = new HashMap<>();
+	private final HashMap<Object, Long> finishedTime = new HashMap<>();
 
 	private static final JobTreeElement[] EMPTY_INFOS = new JobTreeElement[0];
 

bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/GroupInfo.java

@@ -29,9 +29,9 @@
 
 class GroupInfo extends JobTreeElement implements IProgressMonitor {
 
-	private List<JobInfo> infos = new ArrayList<>();
+	private final List<JobInfo> infos = new ArrayList<>();
 
-	private Object lock = new Object();
+	private final Object lock = new Object();
 
 	private String taskName = ProgressMessages.SubTaskInfo_UndefinedTaskName;
 
@@ -41,9 +41,9 @@ class GroupInfo extends JobTreeElement implements IProgressMonitor {
 
 	double currentWork;
 
-	private ProgressManager progressManager;
+	private final ProgressManager progressManager;
 
-	private FinishedJobs finishedJobs;
+	private final FinishedJobs finishedJobs;
 
 	public GroupInfo(ProgressManager progressManager, FinishedJobs finishedJobs) {
 		this.progressManager = progressManager;
@@ -126,10 +126,11 @@ private void updateInProgressManager() {
 			}
 		}
 
-		if (finishedJobs.isKept(this))
+		if (finishedJobs.isKept(this)) {
 			progressManager.refreshGroup(this);
-		else
+		} else {
 			progressManager.removeGroup(this);
+		}
 	}
 
 	@Override
@@ -156,10 +157,11 @@ public void setTaskName(String name) {
 		synchronized (this) {
 			isActive = true;
 		}
-		if (name == null)
+		if (name == null) {
 			taskName = ProgressMessages.SubTaskInfo_UndefinedTaskName;
-		else
+		} else {
 			taskName = name;
+		}
 
 	}
 

bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ImageTools.java

@@ -32,7 +32,7 @@ public class ImageTools {
 
 	protected static ImageTools instance;
 
-	private ImageRegistry imageRegistry = JFaceResources.getImageRegistry();
+	private final ImageRegistry imageRegistry = JFaceResources.getImageRegistry();
 
 	public static ImageTools getInstance() {
 		if (instance == null) {

bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/JobInfo.java

@@ -41,9 +41,9 @@ public class JobInfo extends JobTreeElement {
 
 	private TaskInfo taskInfo;
 
-	private ProgressManager progressManager;
+	private final ProgressManager progressManager;
 
-	private FinishedJobs finishedJobs;
+	private final FinishedJobs finishedJobs;
 
 	// Default to no progress
 	private int ticks = -1;
@@ -158,11 +158,9 @@ private int compareJobs(JobInfo jobInfo) {
 
 	@Override
 	public int compareTo(Object other) {
-		if (!(other instanceof JobInfo)) {
+		if (!(other instanceof JobInfo element)) {
 			return super.compareTo(other);
 		}
-		JobInfo element = (JobInfo) other;
-
 		boolean thisCanceled = isCanceled();
 		boolean anotherCanceled = element.isCanceled();
 		if (thisCanceled && !anotherCanceled) {