Perform clean code of bundles/org.eclipse.jface

Author: eclipse-platform-bot

bundles/org.eclipse.jface/src/org/eclipse/jface/action/ActionContributionItem.java

@@ -104,7 +104,7 @@ public static void setUseColorIconsInToolbars(boolean useColorIcons) {
 	/**
 	 * The action.
 	 */
-	private IAction action;
+	private final IAction action;
 
 	/**
 	 * The listener for changes to the text of the action contributed by an
@@ -836,16 +836,14 @@ private void updateMenuItemText(MenuItem mi) {
 		 * be placed on the menu. We will only do this for "Ctrl+Shift+[0-9A-FU]".
 		 */
 		final String commandId = updatedAction.getActionDefinitionId();
-		if ((Util.isGtk()) && (callback instanceof IBindingManagerCallback) && (commandId != null)) {
-			final IBindingManagerCallback bindingManagerCallback = (IBindingManagerCallback) callback;
+		if ((Util.isGtk()) && (callback instanceof final IBindingManagerCallback bindingManagerCallback) && (commandId != null)) {
 			final IKeyLookup lookup = KeyLookupFactory.getDefault();
 			final TriggerSequence[] triggerSequences = bindingManagerCallback.getActiveBindingsFor(commandId);
 			for (final TriggerSequence triggerSequence : triggerSequences) {
 				final Trigger[] triggers = triggerSequence.getTriggers();
 				if (triggers.length == 1) {
 					final Trigger trigger = triggers[0];
-					if (trigger instanceof KeyStroke) {
-						final KeyStroke currentKeyStroke = (KeyStroke) trigger;
+					if (trigger instanceof final KeyStroke currentKeyStroke) {
 						final int currentNaturalKey = currentKeyStroke.getNaturalKey();
 						if ((currentKeyStroke.getModifierKeys() == (lookup.getCtrl() | lookup.getShift()))
 								&& ((currentNaturalKey >= '0' && currentNaturalKey <= '9')

bundles/org.eclipse.jface/src/org/eclipse/jface/action/ContributionManager.java

@@ -47,7 +47,7 @@ public abstract class ContributionManager implements IContributionManager {
 	/**
 	 * The list of contribution items.
 	 */
-	private List<IContributionItem> contributions = new ArrayList<>();
+	private final List<IContributionItem> contributions = new ArrayList<>();
 
 	/**
 	 * Indicates whether the widgets are in sync with the contributions.

bundles/org.eclipse.jface/src/org/eclipse/jface/action/ControlContribution.java

@@ -121,8 +121,7 @@ public final void fill(ToolBar parent, int index) {
 	public void setVisible(boolean visible) {
 		super.setVisible(visible);
 		IContributionManager parent = getParent();
-		if (parent instanceof SubToolBarManager) {
-			SubToolBarManager subManager = (SubToolBarManager) parent;
+		if (parent instanceof SubToolBarManager subManager) {
 			IContributionItem item = subManager.getParent().find(getId());
 			if (item instanceof SubContributionItem) {
 				item.setVisible(visible);

bundles/org.eclipse.jface/src/org/eclipse/jface/action/CoolBarManager.java

@@ -49,7 +49,7 @@ public class CoolBarManager extends ContributionManager implements ICoolBarManag
 	/**
 	 * The original creation order of the contribution items.
 	 */
-	private ArrayList<IContributionItem> cbItemsCreationOrder = new ArrayList<>();
+	private final ArrayList<IContributionItem> cbItemsCreationOrder = new ArrayList<>();
 
 	/**
 	 * MenuManager for cool bar pop-up menu, or null if none.

bundles/org.eclipse.jface/src/org/eclipse/jface/action/ExternalActionManager.java

@@ -287,8 +287,7 @@ public final Integer getAccelerator(final String commandId) {
 				final Trigger[] triggers = triggerSequence.getTriggers();
 				if (triggers.length == 1) {
 					final Trigger trigger = triggers[0];
-					if (trigger instanceof KeyStroke) {
-						final KeyStroke keyStroke = (KeyStroke) trigger;
+					if (trigger instanceof final KeyStroke keyStroke) {
 						final int accelerator = SWTKeySupport
 								.convertKeyStrokeToAccelerator(keyStroke);
 						return Integer.valueOf(accelerator);
@@ -398,8 +397,7 @@ public final void removePropertyChangeListener(final String commandId,
 					bindingManager.removeBindingManagerListener(this);
 					bindingManagerListenerAttached = false;
 				}
-			} else if (existing instanceof ListenerList) {
-				ListenerList existingList = (ListenerList) existing;
+			} else if (existing instanceof ListenerList existingList) {
 				existingList.remove(listener);
 				if (existingList.size() == 1) {
 					registeredListeners.put(commandId, existingList.getListeners()[0]);

bundles/org.eclipse.jface/src/org/eclipse/jface/action/MenuManager.java

@@ -57,12 +57,12 @@ public class MenuManager extends ContributionManager implements IMenuManager {
 	/**
 	 * The menu id.
 	 */
-	private String id;
+	private final String id;
 
 	/**
 	 * List of registered menu listeners (element type: <code>IMenuListener</code>).
 	 */
-	private ListenerList<IMenuListener> listeners = new ListenerList<>();
+	private final ListenerList<IMenuListener> listeners = new ListenerList<>();
 
 	/**
 	 * The menu control; <code>null</code> before creation and after disposal.
@@ -318,8 +318,7 @@ public IContributionItem findUsingPath(String path) {
 		}
 
 		IContributionItem item = super.find(id);
-		if (item instanceof IMenuManager) {
-			IMenuManager manager = (IMenuManager) item;
+		if (item instanceof IMenuManager manager) {
 			return manager.findUsingPath(rest);
 		}
 		return null;
@@ -839,8 +838,7 @@ protected void update(boolean force, boolean recursive) {
 		if (recursive) {
 			IContributionItem[] items = getItems();
 			for (IContributionItem ci : items) {
-				if (ci instanceof IMenuManager) {
-					IMenuManager mm = (IMenuManager) ci;
+				if (ci instanceof IMenuManager mm) {
 					if (isChildVisible(mm)) {
 						mm.updateAll(force);
 					}

bundles/org.eclipse.jface/src/org/eclipse/jface/action/StatusLine.java

@@ -122,7 +122,7 @@
 	protected static ImageDescriptor fgStopImage = ImageDescriptor
 			.createFromFile(StatusLine.class, "images/stop.svg");//$NON-NLS-1$
 
-	private MenuItem copyMenuItem;
+	private final MenuItem copyMenuItem;
 	static {
 		JFaceResources.getImageRegistry().put(
 				"org.eclipse.jface.parts.StatusLine.stopImage", fgStopImage);//$NON-NLS-1$
@@ -645,10 +645,11 @@ void startTask(final long timestamp, final boolean animated) {
 	public void subTask(String name) {
 
 		String newName;
-		if (name == null)
+		if (name == null) {
 			newName = Util.ZERO_LENGTH_STRING;
-		else
+		} else {
 			newName = name;
+		}
 
 		String text;
 		if (fTaskName == null || fTaskName.isEmpty()) {

bundles/org.eclipse.jface/src/org/eclipse/jface/action/StatusLineContributionItem.java

@@ -45,7 +45,7 @@ public class StatusLineContributionItem extends ContributionItem {
 	 */
 	public static final int CALC_TRUE_WIDTH = -1;
 
-	private int charWidth;
+	private final int charWidth;
 
 	private CLabel label;
 

bundles/org.eclipse.jface/src/org/eclipse/jface/action/SubContributionItem.java

@@ -37,7 +37,7 @@ public class SubContributionItem implements IContributionItem {
 	/**
 	 * The inner item for this contribution.
 	 */
-	private IContributionItem innerItem;
+	private final IContributionItem innerItem;
 
 	/**
 	 * Creates a new <code>SubContributionItem</code>.

bundles/org.eclipse.jface/src/org/eclipse/jface/action/SubContributionManager.java

@@ -27,13 +27,13 @@ public abstract class SubContributionManager implements IContributionManager {
 	/**
 	 * The parent contribution manager.
 	 */
-	private IContributionManager parentMgr;
+	private final IContributionManager parentMgr;
 
 	/**
 	 * Maps each item in the manager to a wrapper.  The wrapper is used to
 	 * control the visibility of each item.
 	 */
-	private Map<IContributionItem, SubContributionItem> mapItemToWrapper = new HashMap<>();
+	private final Map<IContributionItem, SubContributionItem> mapItemToWrapper = new HashMap<>();
 
 	/**
 	 * The visibility of the manager,