Merge pull request #1118 from ISISComputingGroup/Fix_checkstyle_warnings

fixed some checkstyle warnings

Author: Tom-Willemsen

base/uk.ac.stfc.isis.ibex.ui.scripting/src/uk/ac/stfc/isis/ibex/ui/scripting/Consoles.java

@@ -96,7 +96,7 @@ public class Consoles extends AbstractUIPlugin {
 	/**
 	 * Clear console menu item ID.
 	 */
-	private final String CLEAR_CONSOLE_ID = "uk.ac.stfc.isis.ibex.ui.scripting.clearConsole";
+	private static final String CLEAR_CONSOLE_ID = "uk.ac.stfc.isis.ibex.ui.scripting.clearConsole";
 
 	/**
 	 * Limit on the total number of lines (input and output) per console.
@@ -155,17 +155,17 @@ public void run() {
 				ConsoleView view = getConsoleView();	
 				if (view != null) {
 					IToolBarManager tbm = view.getViewSite().getActionBars().getToolBarManager();
-					IContributionItem [] items= tbm.getItems();
+					IContributionItem[] items = tbm.getItems();
 					// Add our "Open Console" action
 					GenieOpenConsoleAction openConsoleAction = new GenieOpenConsoleAction();
 					tbm.insertBefore(CLEAR_CONSOLE_ID, openConsoleAction);
 
 					// Console view icons that are not required. We are removing OpenConsoleAction so that we can add our Action
 					// and make it behave the way we want. In this case we remove Pin Console and Open Console icons.
-					List<ActionContributionItem> itemsToRemove = Arrays.stream(items).filter(item->(item instanceof ActionContributionItem))
- 					.map(item->(ActionContributionItem)item)
-					.filter(item-> item.getAction().toString().contains("PinConsole")||
-							item.getAction() instanceof OpenConsoleAction)
+					List<ActionContributionItem> itemsToRemove = Arrays.stream(items).filter(item -> (item instanceof ActionContributionItem))
+ 					.map(item -> (ActionContributionItem) item)
+					.filter(item -> item.getAction().toString().contains("PinConsole")
+							|| item.getAction() instanceof OpenConsoleAction)
 					.collect(Collectors.toList());
 
 					itemsToRemove.forEach(action -> tbm.remove(action));
@@ -184,7 +184,7 @@ private ConsoleView getConsoleView() {
 		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
 		IWorkbenchPage page = window.getActivePage();
 		IViewPart part = page.findView(IConsoleConstants.ID_CONSOLE_VIEW);
-		return (ConsoleView)part;
+		return (ConsoleView) part;
 	}
 
 	/**

base/uk.ac.stfc.isis.ibex.ui.scripting/src/uk/ac/stfc/isis/ibex/ui/scripting/GenieOpenConsoleAction.java

@@ -26,11 +26,17 @@ public class GenieOpenConsoleAction extends OpenConsoleAction {
 	private ConsoleFactoryExtension[] fFactoryExtensions;
 	private Menu fMenu;
 	private ImageDescriptor pyDevImageDescriptor;
+	/**
+	 * Maximum number of actions we can have in open console drop down menu for keyboard shortcuts.
+	 */
+	private static final int MAX_NUMBER_OF_ITEMS_FOR_KEYBOARD_SHORTCUTS = 9;
 
-	public GenieOpenConsoleAction( ) {
+	/**
+	 * Initialise factory extensions.
+	 */
+	public GenieOpenConsoleAction() {
 		super();
 		fFactoryExtensions = getFactories();
-		
 	}
 
 	private ConsoleFactoryExtension[] getFactories() {	
@@ -51,7 +57,7 @@ public Menu getMenu(Control parent) {
 			fMenu.dispose();
 		}
 
-		fMenu= new Menu(parent);
+		fMenu = new Menu(parent);
 		int accel = 1;
 		for (ConsoleFactoryExtension extension : fFactoryExtensions) {
 			if (!WorkbenchActivityHelper.filterItem(extension) && extension.isEnabled()) {
@@ -73,8 +79,8 @@ public Menu getMenu(Control parent) {
 	}
 
 	private void addActionToMenu(Menu parent, Action action, int accelerator) {
-		if (accelerator < 10) {
-			StringBuilder label= new StringBuilder();
+		if (accelerator <= MAX_NUMBER_OF_ITEMS_FOR_KEYBOARD_SHORTCUTS) {
+			StringBuilder label = new StringBuilder();
 			//add the numerical accelerator
 			label.append('&');
 			label.append(accelerator);
@@ -83,7 +89,7 @@ private void addActionToMenu(Menu parent, Action action, int accelerator) {
 			action.setText(label.toString());
 		}
 
-		ActionContributionItem item= new ActionContributionItem(action);
+		ActionContributionItem item = new ActionContributionItem(action);
 		item.fill(parent, -1);
 	}
 
@@ -92,7 +98,7 @@ private class ConsoleFactoryAction extends Action {
 		private ConsoleFactoryExtension fConfig;
 		private IConsoleFactory fFactory;
 
-		public ConsoleFactoryAction(String label, ImageDescriptor image, ConsoleFactoryExtension extension) {
+		ConsoleFactoryAction(String label, ImageDescriptor image, ConsoleFactoryExtension extension) {
 			setText(label);
 			if (image != null) {
 				setImageDescriptor(image);