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

Author: eclipse-platform-bot

bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/BindingTable.java

@@ -119,8 +119,7 @@ public int compare(Binding o1, Binding o2) {
 		private final int countStrokes(final Trigger[] triggers) {
 			int strokeCount = triggers.length;
 			for (final Trigger trigger : triggers) {
-				if (trigger instanceof KeyStroke) {
-					final KeyStroke keyStroke = (KeyStroke) trigger;
+				if (trigger instanceof final KeyStroke keyStroke) {
 					final int modifierKeys = keyStroke.getModifierKeys();
 					final IKeyLookup lookup = KeyLookupFactory.getDefault();
 					if ((modifierKeys & lookup.getAlt()) != 0) {
@@ -146,18 +145,18 @@ private final int countStrokes(final Trigger[] triggers) {
 
 	public static final BindingComparator BEST_SEQUENCE = new BindingComparator();
 
-	private Context tableId;
-	private ArrayList<Binding> bindings = new ArrayList<>();
-	private Map<TriggerSequence, Binding> bindingsByTrigger = new HashMap<>();
-	private Map<ParameterizedCommand, ArrayList<Binding>> bindingsByCommand = new HashMap<>();
-	private Map<TriggerSequence, ArrayList<Binding>> bindingsByPrefix = new HashMap<>();
-	private Map<TriggerSequence, ArrayList<Binding>> conflicts = new HashMap<>();
-	private Map<TriggerSequence, ArrayList<Binding>> orderedBindingsByTrigger = new HashMap<>();
+	private final Context tableId;
+	private final ArrayList<Binding> bindings = new ArrayList<>();
+	private final Map<TriggerSequence, Binding> bindingsByTrigger = new HashMap<>();
+	private final Map<ParameterizedCommand, ArrayList<Binding>> bindingsByCommand = new HashMap<>();
+	private final Map<TriggerSequence, ArrayList<Binding>> bindingsByPrefix = new HashMap<>();
+	private final Map<TriggerSequence, ArrayList<Binding>> conflicts = new HashMap<>();
+	private final Map<TriggerSequence, ArrayList<Binding>> orderedBindingsByTrigger = new HashMap<>();
 	private final Map<Binding, Boolean> activeBindings = new HashMap<>();
 
 	private IContributionFactory contributionFactory;
 
-	private MApplication application;
+	private final MApplication application;
 
 	public BindingTable(Context context, MApplication application) {
 		tableId = context;

bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/ContextSet.java

@@ -27,7 +27,7 @@ public class ContextSet {
 	public static ContextSet EMPTY = new ContextSet(Collections.<Context> emptyList());
 
 	public static class CComp implements Comparator<Context> {
-		private ContextManager manager;
+		private final ContextManager manager;
 
 		public CComp(ContextManager manager) {
 			this.manager = manager;
@@ -72,7 +72,7 @@ public static Comparator<Context> getComparator() {
 		return CONTEXT_COMP;
 	}
 
-	private List<Context> contexts;
+	private final List<Context> contexts;
 
 	public ContextSet(Collection<Context> c) {
 		contexts = new ArrayList<>(c);

bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/KeyAssistDialog.java

@@ -70,7 +70,7 @@ public class KeyAssistDialog extends PopupDialog {
 	/**
 	 * The ordered list of command identifiers corresponding to the table.
 	 */
-	private List<Binding> bindings = new ArrayList<>();
+	private final List<Binding> bindings = new ArrayList<>();
 
 	/**
 	 * The table containing of the possible completions. This value is <code>null</code> until the
@@ -87,7 +87,7 @@ public class KeyAssistDialog extends PopupDialog {
 	/**
 	 * The key binding listener for the associated workbench.
 	 */
-	private KeyBindingDispatcher workbenchKeyboard;
+	private final KeyBindingDispatcher workbenchKeyboard;
 
 	/**
 	 * A sorted map of conflicts or partial matches to be used when the dialog pops up.
@@ -96,7 +96,7 @@ public class KeyAssistDialog extends PopupDialog {
 	 */
 	private Collection<Binding> matches;
 
-	private IEclipseContext context;
+	private final IEclipseContext context;
 
 	/**
 	 * Constructs a new instance of <code>KeyAssistDialog</code>. When the dialog is first

bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/keys/KeyBindingDispatcher.java

@@ -331,8 +331,7 @@ public final boolean executeCommand(final ParameterizedCommand parameterizedComm
 					logger.trace((Throwable) commandException,
 							"Command exception for: " + parameterizedCommand + " in " //$NON-NLS-1$ //$NON-NLS-2$
 									+ describe(context));
-					if (handlerService instanceof HandlerServiceImpl) {
-						HandlerServiceImpl serviceImpl = (HandlerServiceImpl) handlerService;
+					if (handlerService instanceof HandlerServiceImpl serviceImpl) {
 						IEclipseContext serviceContext = serviceImpl.getContext();
 						if (serviceContext != null) {
 							StringBuilder sb = new StringBuilder("\n\tExecution context: "); //$NON-NLS-1$

bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/keys/OutOfOrderVerifyListener.java

@@ -38,7 +38,7 @@ final class OutOfOrderVerifyListener implements VerifyKeyListener {
 	/**
 	 * The listener that will be chained in if the verify event has not been eaten yet.
 	 */
-	private OutOfOrderListener chainedListener;
+	private final OutOfOrderListener chainedListener;
 
 	/**
 	 * Constructs a new instance of <code>OutOfOrderVerifyListener</code> with the listener that