Clean Code for bundles/org.eclipse.e4.ui.workbench.renderers.swt

bundles/org.eclipse.e4.ui.workbench.renderers.swt/META-INF/MANIFEST.MF

@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.e4.ui.workbench.renderers.swt;singleton:=true
-Bundle-Version: 0.16.900.qualifier
+Bundle-Version: 0.16.1000.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/internal/workbench/renderers/swt/AbstractTableInformationControl.java

@@ -64,11 +64,9 @@ protected class NamePatternFilter extends ViewerFilter {
 		public boolean select(Viewer viewer, Object parentElement,
 				Object element) {
 			SearchPattern matcher = getMatcher();
-			if (matcher == null || !(viewer instanceof TableViewer)) {
+			if (matcher == null || !(viewer instanceof TableViewer tableViewer)) {
 				return true;
 			}
-			TableViewer tableViewer = (TableViewer) viewer;
-
 			String matchName = ((ILabelProvider) tableViewer.getLabelProvider())
 					.getText(element);
 
@@ -251,12 +249,14 @@ public void mouseMove(MouseEvent e) {
 				e.doit = true;
 				{
 					int n1 = table.getItemCount();
-					if (n1 == 0)
+					if (n1 == 0) {
 						return;
+					}
 
 					int i1 = table.getSelectionIndex() + 1;
-					if (i1 >= n1)
+					if (i1 >= n1) {
 						i1 = 0;
+					}
 					table.setSelection(i1);
 				}
 				break;
@@ -266,12 +266,14 @@ public void mouseMove(MouseEvent e) {
 				e.doit = true;
 				{
 					int n2 = table.getItemCount();
-					if (n2 == 0)
+					if (n2 == 0) {
 						return;
+					}
 
 					int i2 = table.getSelectionIndex() - 1;
-					if (i2 < 0)
+					if (i2 < 0) {
 						i2 = n2 - 1;
+					}
 					table.setSelection(i2);
 				}
 				break;

bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/internal/workbench/renderers/swt/BasicPartList.java

@@ -45,7 +45,7 @@ public class BasicPartList extends AbstractTableInformationControl {
 
 	private class BasicStackListLabelProvider extends ColumnLabelProvider {
 
-		private Font boldFont;
+		private final Font boldFont;
 
 		public BasicStackListLabelProvider() {
 			Font font = Display.getDefault().getSystemFont();
@@ -58,8 +58,7 @@ public BasicStackListLabelProvider() {
 
 		@Override
 		public Font getFont(Object element) {
-			if (element instanceof MPart) {
-				MPart part = (MPart) element;
+			if (element instanceof MPart part) {
 				CTabItem item = renderer.findItemForPart(part);
 				if (item != null && !item.isShowing()) {
 					return boldFont;
@@ -118,8 +117,7 @@ public BasicPartList(Shell parent, int shellStyle, int treeStyler,
 			getTableViewer().setComparator(new ViewerComparator() {
 				@Override
 				public int category(Object element) {
-					if (element instanceof MPart) {
-						MPart part = (MPart) element;
+					if (element instanceof MPart part) {
 						CTabItem item = BasicPartList.this.renderer.findItemForPart(part);
 						if (item != null && !item.isShowing()) {
 							return -1;
@@ -186,8 +184,7 @@ protected boolean deleteSelectedElement(Object selectedElement) {
 		if (selectedElement == null) {
 			selectedElement = getSelectedElement();
 		}
-		if (selectedElement instanceof MPart) {
-			MPart part = (MPart) selectedElement;
+		if (selectedElement instanceof MPart part) {
 			if (partService.savePart(part, true)) {
 				partService.hidePart(part);
 			}

bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/AbstractContributionItem.java

@@ -181,10 +181,9 @@ private Image getDisabledImage(String iconURI, LocalResourceManager resourceMana
 	}
 
 	protected void updateIcons() {
-		if (!(widget instanceof Item)) {
+		if (!(widget instanceof Item item)) {
 			return;
 		}
-		Item item = (Item) widget;
 		String iconURI = modelItem.getIconURI() != null ? modelItem.getIconURI() : ""; //$NON-NLS-1$
 		String disabledURI = getDisabledIconURI(modelItem);
 		Object disabledData = item.getData(DISABLED_URI);
@@ -213,7 +212,7 @@ protected void updateIcons() {
 
 	private String getDisabledIconURI(MItem toolItem) {
 		Object obj = toolItem.getTransientData().get(IPresentationEngine.DISABLED_ICON_IMAGE_KEY);
-		return obj instanceof String ? (String) obj : ""; //$NON-NLS-1$
+		return obj instanceof String s ? s : ""; //$NON-NLS-1$
 	}
 
 	protected void disposeOldImages() {
@@ -246,8 +245,7 @@ public void setParent(IContributionManager parent) {
 			IMenuManager menuMgr = (IMenuManager) getParent();
 			menuMgr.removeMenuListener(menuListener);
 		}
-		if (parent instanceof IMenuManager) {
-			IMenuManager menuMgr = (IMenuManager) parent;
+		if (parent instanceof IMenuManager menuMgr) {
 			menuMgr.addMenuListener(menuListener);
 		}
 		super.setParent(parent);
@@ -262,12 +260,13 @@ public void fill(Menu menu, int index) {
 			return;
 		}
 		int style = SWT.PUSH;
-		if (modelItem.getType() == ItemType.PUSH)
+		if (modelItem.getType() == ItemType.PUSH) {
 			style = SWT.PUSH;
-		else if (modelItem.getType() == ItemType.CHECK)
+		} else if (modelItem.getType() == ItemType.CHECK) {
 			style = SWT.CHECK;
-		else if (modelItem.getType() == ItemType.RADIO)
+		} else if (modelItem.getType() == ItemType.RADIO) {
 			style = SWT.RADIO;
+		}
 		MenuItem item = null;
 		if (index >= 0) {
 			item = new MenuItem(menu, style, index);
@@ -311,12 +310,13 @@ public void fill(ToolBar parent, int index) {
 			isDropdown = menu != null;
 		}
 		int style = SWT.PUSH;
-		if (isDropdown)
+		if (isDropdown) {
 			style = SWT.DROP_DOWN;
-		else if (modelItem.getType() == ItemType.CHECK)
+		} else if (modelItem.getType() == ItemType.CHECK) {
 			style = SWT.CHECK;
-		else if (modelItem.getType() == ItemType.RADIO)
+		} else if (modelItem.getType() == ItemType.RADIO) {
 			style = SWT.RADIO;
+		}
 		ToolItem item = null;
 		if (index >= 0) {
 			item = new ToolItem(parent, style, index);
@@ -396,8 +396,7 @@ protected Menu getMenu(final MMenu mmenu, ToolItem toolItem) {
 				obj = ((IContextFunction) obj).compute(lclContext, null);
 				RenderedElementUtil.setContributionManager(mmenu, obj);
 			}
-			if (obj instanceof IMenuCreator) {
-				final IMenuCreator creator = (IMenuCreator) obj;
+			if (obj instanceof final IMenuCreator creator) {
 				final Menu menu = creator.getMenu(toolItem.getParent().getShell());
 				if (menu != null) {
 					toolItem.addDisposeListener(e -> {
@@ -504,11 +503,13 @@ protected Listener getItemListener() {
 	}
 
 	protected void handleHelpRequest() {
-		if (helpService == null)
+		if (helpService == null) {
 			return;
+		}
 		String helpContextId = getModel().getPersistedState().get(EHelpService.HELP_CONTEXT_ID);
-		if (helpContextId != null)
+		if (helpContextId != null) {
 			helpService.displayHelp(helpContextId);
+		}
 	}
 
 	protected abstract void handleWidgetDispose(Event event);
@@ -560,12 +561,14 @@ protected ToolItemUpdater getUpdater() {
 
 
 	protected void updateItemEnablement() {
-		if (!(modelItem.getWidget() instanceof ToolItem))
+		if (!(modelItem.getWidget() instanceof ToolItem)) {
 			return;
+		}
 
 		ToolItem widget = (ToolItem) modelItem.getWidget();
-		if (widget == null || widget.isDisposed())
+		if (widget == null || widget.isDisposed()) {
 			return;
+		}
 
 		SafeRunner.run(getUpdateRunner());
 	}

bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/AreaRenderer.java

@@ -47,23 +47,26 @@ public class AreaRenderer extends SWTPartRenderer {
 	@Inject
 	private IEventBroker eventBroker;
 
-	private EventHandler itemUpdater = event -> {
+	private final EventHandler itemUpdater = event -> {
 		// Ensure that this event is for a MArea
-		if (!(event.getProperty(UIEvents.EventTags.ELEMENT) instanceof MArea))
+		if (!(event.getProperty(UIEvents.EventTags.ELEMENT) instanceof MArea)) {
 			return;
+		}
 
 		MArea areaModel = (MArea) event
 				.getProperty(UIEvents.EventTags.ELEMENT);
 
-		if (!(areaModel.getWidget() instanceof CTabFolder))
+		if (!(areaModel.getWidget() instanceof CTabFolder)) {
 			return;
+		}
 
 		CTabFolder ctf = (CTabFolder) areaModel.getWidget();
 		CTabItem areaItem = ctf.getItem(0);
 
 		// No widget == nothing to update
-		if (areaItem == null)
+		if (areaItem == null) {
 			return;
+		}
 
 		String attName = (String) event
 				.getProperty(UIEvents.EventTags.ATTNAME);
@@ -78,24 +81,27 @@ public class AreaRenderer extends SWTPartRenderer {
 		}
 	};
 
-	private EventHandler widgetListener = new EventHandler() {
+	private final EventHandler widgetListener = new EventHandler() {
 		@Override
 		public void handleEvent(Event event) {
 			final MUIElement changedElement = (MUIElement) event
 					.getProperty(EventTags.ELEMENT);
-			if (!(changedElement instanceof MPartStack))
+			if (!(changedElement instanceof MPartStack)) {
 				return;
+			}
 
 			MArea areaModel = findArea(changedElement);
-			if (areaModel != null)
+			if (areaModel != null) {
 				synchCTFState(areaModel);
+			}
 		}
 
 		private MArea findArea(MUIElement element) {
 			MUIElement parent = element.getParent();
 			while (parent != null) {
-				if (parent instanceof MArea)
+				if (parent instanceof MArea) {
 					return (MArea) parent;
+				}
 				parent = parent.getParent();
 			}
 			return null;
@@ -116,10 +122,9 @@ void contextDisposed() {
 
 	@Override
 	public Object createWidget(final MUIElement element, Object parent) {
-		if (!(element instanceof MArea) || !(parent instanceof Composite))
+		if (!(element instanceof MArea) || !(parent instanceof Composite parentComp)) {
 			return null;
-
-		Composite parentComp = (Composite) parent;
+		}
 
 		Composite areaComp = new Composite(parentComp, SWT.NONE);
 		areaComp.setLayout(new FillLayout());
@@ -129,12 +134,13 @@ public Object createWidget(final MUIElement element, Object parent) {
 
 	private void ensureCTF(MArea areaModel, List<MPartStack> stacks) {
 		Object widget = areaModel.getWidget();
-		if (widget instanceof CTabFolder)
+		if (widget instanceof CTabFolder) {
 			return;
-		if (!(widget instanceof Composite))
+		}
+		if (!(widget instanceof Composite curComp)) {
 			return;
+		}
 		// if not assigned to CTabFolder but any other Composite create CTabFolder
-		Composite curComp = (Composite) widget;
 		Composite parentComp = curComp.getParent();
 		CTabFolder ctf = new CTabFolder(parentComp, SWT.BORDER | SWT.SINGLE);
 		// don't paint the split editor area tab highlighted, it looks ugly
@@ -169,12 +175,15 @@ private void ensureCTF(MArea areaModel, List<MPartStack> stacks) {
 		}
 
 		CTabItem cti = new CTabItem(ctf, SWT.NONE);
-		if (areaModel.getLabel() != null)
+		if (areaModel.getLabel() != null) {
 			cti.setText(areaModel.getLocalizedLabel());
-		if (areaModel.getTooltip() != null)
+		}
+		if (areaModel.getTooltip() != null) {
 			cti.setToolTipText(areaModel.getLocalizedTooltip());
-		if (areaModel.getIconURI() != null)
+		}
+		if (areaModel.getIconURI() != null) {
 			cti.setImage(getImage(areaModel));
+		}
 
 		curComp.setParent(ctf);
 		cti.setControl(curComp);
@@ -219,15 +228,17 @@ private void synchCTFState(MArea areaModel) {
 		List<MPartStack> stacks = findDirectStacks(areaModel);
 		int count = 0;
 		for (MPartStack stack : stacks) {
-			if (stack.isToBeRendered())
+			if (stack.isToBeRendered()) {
 				count++;
+			}
 		}
 
 		// If there's more than one stack visible we use a CTF
-		if (count > 1)
+		if (count > 1) {
 			ensureCTF(areaModel, stacks);
-		else
+		} else {
 			ensureComposite(areaModel, stacks);
+		}
 	}
 
 	private List<MPartStack> findDirectStacks(MPartSashContainer root) {
@@ -246,10 +257,10 @@ private List<MPartStack> findDirectStacks(MPartSashContainer root) {
 	public Object getUIContainer(MUIElement element) {
 		MUIElement parentElement = element.getParent();
 
-		if (!(parentElement instanceof MArea))
+		if (!(parentElement instanceof MArea areaModel)) {
 			return null;
+		}
 
-		MArea areaModel = (MArea) parentElement;
 		synchCTFState(areaModel);
 
 		if (areaModel.getWidget() instanceof CTabFolder) {

bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/CSSEngineHelper.java

@@ -54,8 +54,9 @@ private void initialize() {
 	 * @return the margin in pixels
 	 */
 	public int getMarginBottom(int defaultValue) {
-		if (style == null)
+		if (style == null) {
 			return defaultValue;
+		}
 		return getPxValue(
 				style.getPropertyCSSValue("margin-bottom"), defaultValue); //$NON-NLS-1$
 	}
@@ -67,8 +68,9 @@ public int getMarginBottom(int defaultValue) {
 	 * @return the margin in pixels
 	 */
 	public int getMarginTop(int defaultValue) {
-		if (style == null)
+		if (style == null) {
 			return defaultValue;
+		}
 		return getPxValue(style.getPropertyCSSValue("margin-top"), defaultValue); //$NON-NLS-1$
 	}
 
@@ -79,8 +81,9 @@ public int getMarginTop(int defaultValue) {
 	 * @return the margin in pixels
 	 */
 	public int getMarginLeft(int defaultValue) {
-		if (style == null)
+		if (style == null) {
 			return defaultValue;
+		}
 		return getPxValue(
 				style.getPropertyCSSValue("margin-left"), defaultValue); //$NON-NLS-1$
 	}
@@ -92,8 +95,9 @@ public int getMarginLeft(int defaultValue) {
 	 * @return the margin in pixels
 	 */
 	public int getMarginRight(int defaultValue) {
-		if (style == null)
+		if (style == null) {
 			return defaultValue;
+		}
 		return getPxValue(
 				style.getPropertyCSSValue("margin-right"), defaultValue); //$NON-NLS-1$
 	}