From a6076ab462bdbb778b5a052d4f9b98b64871c7e0 Mon Sep 17 00:00:00 2001 From: Eclipse Platform Bot Date: Fri, 3 Oct 2025 03:05:49 +0000 Subject: [PATCH 1/3] Perform clean code of bundles/org.eclipse.e4.ui.workbench.addons.swt --- .../addons/cleanupaddon/CleanupAddon.java | 3 +- .../addons/dndaddon/DetachedDropAgent.java | 2 +- .../workbench/addons/dndaddon/DnDAddon.java | 3 +- .../ui/workbench/addons/dndaddon/DnDInfo.java | 6 +- .../workbench/addons/dndaddon/DnDManager.java | 10 ++-- .../workbench/addons/dndaddon/DropAgent.java | 6 +- .../addons/dndaddon/IBFDragAgent.java | 3 +- .../addons/dndaddon/PartDragAgent.java | 4 +- .../addons/dndaddon/SplitDropAgent2.java | 6 +- .../addons/dndaddon/SplitFeedbackOverlay.java | 12 ++-- .../addons/dndaddon/StackDropAgent.java | 6 +- .../workbench/addons/minmax/MinMaxAddon.java | 30 ++++------ .../addons/minmax/MinMaxAddonUtil.java | 3 +- .../addons/minmax/TrimPaneLayout.java | 4 +- .../ui/workbench/addons/minmax/TrimStack.java | 57 +++++++------------ .../addons/splitteraddon/SplitHost.java | 3 +- .../addons/splitteraddon/SplitterAddon.java | 4 +- 17 files changed, 60 insertions(+), 102 deletions(-) diff --git a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/cleanupaddon/CleanupAddon.java b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/cleanupaddon/CleanupAddon.java index f38f3ad26da..c2fab02e065 100644 --- a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/cleanupaddon/CleanupAddon.java +++ b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/cleanupaddon/CleanupAddon.java @@ -224,8 +224,7 @@ private void subscribeVisibilityChanged( if (parent.getRenderer() != null) { Object myParent = ((AbstractPartRenderer) parent.getRenderer()) .getUIContainer(changedObj); - if (myParent instanceof Composite) { - Composite parentComp = (Composite) myParent; + if (myParent instanceof Composite parentComp) { ctrl.setParent(parentComp); Control prevControl = null; diff --git a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/DetachedDropAgent.java b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/DetachedDropAgent.java index e7c9aa51333..dbfb562e193 100644 --- a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/DetachedDropAgent.java +++ b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/DetachedDropAgent.java @@ -29,7 +29,7 @@ public class DetachedDropAgent extends DropAgent { DnDManager manager; - private EModelService modelService; + private final EModelService modelService; private Rectangle curRect; public DetachedDropAgent(DnDManager manager) { diff --git a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/DnDAddon.java b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/DnDAddon.java index ed8a96827eb..c783d5d0e9b 100644 --- a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/DnDAddon.java +++ b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/DnDAddon.java @@ -50,8 +50,7 @@ void subscribeTopicWidget(@UIEventTopic(UIEvents.UIElement.TOPIC_WIDGET) Event e } Object widget = event.getProperty(EventTags.NEW_VALUE); - if (widget instanceof Shell && !((Shell) widget).isDisposed()) { - Shell shell = (Shell) widget; + if (widget instanceof Shell shell && !shell.isDisposed()) { DnDManager theManager = (DnDManager) shell.getData("DnDManager"); //$NON-NLS-1$ if (theManager == null) { theManager = new DnDManager((MWindow) changedElement); diff --git a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/DnDInfo.java b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/DnDInfo.java index 80836bd1e48..87a159d86ca 100644 --- a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/DnDInfo.java +++ b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/DnDInfo.java @@ -127,8 +127,7 @@ private void setItemInfo() { Control ctrl = (Control) curElement.getWidget(); // KLUDGE!! Should delegate to curElement's renderer - if (ctrl instanceof CTabFolder) { - CTabFolder ctf = (CTabFolder) ctrl; + if (ctrl instanceof CTabFolder ctf) { Point localPos = display.map(null, ctf, cursorPos); curItem = ctf.getItem(localPos); if (curItem != null) { @@ -137,8 +136,7 @@ private void setItemInfo() { itemRect = display.map(ctf, ctf.getShell(), ((CTabItem) curItem).getBounds()); } } - } else if (ctrl instanceof ToolBar) { - ToolBar tb = (ToolBar) ctrl; + } else if (ctrl instanceof ToolBar tb) { Point localPos = display.map(null, tb, cursorPos); ToolItem curItem = tb.getItem(localPos); if (curItem != null) { diff --git a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/DnDManager.java b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/DnDManager.java index f5b8c46f118..c4bbb25edb4 100644 --- a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/DnDManager.java +++ b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/DnDManager.java @@ -51,7 +51,7 @@ class DnDManager { public static final int HOSTED = 1; public static final int GHOSTED = 2; public static final int SIMPLE = 3; - private int feedbackStyle = SIMPLE; + private final int feedbackStyle = SIMPLE; Collection dragAgents = new ArrayList<>(); Collection dropAgents = new ArrayList<>(); @@ -59,7 +59,7 @@ class DnDManager { DnDInfo info; DragAgent dragAgent; - private MWindow dragWindow; + private final MWindow dragWindow; private Shell dragHost; private Control dragCtrl; @@ -68,7 +68,7 @@ class DnDManager { boolean dragging; private Shell overlayFrame; - private List frames = new ArrayList<>(); + private final List frames = new ArrayList<>(); DragDetectListener dragDetector = e -> { if (dragging || e.widget.isDisposed()) { @@ -93,8 +93,8 @@ public void addFrame(Rectangle newRect) { updateOverlay(); } - private List images = new ArrayList<>(); - private List imageRects = new ArrayList<>(); + private final List images = new ArrayList<>(); + private final List imageRects = new ArrayList<>(); protected boolean isModified; diff --git a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/DropAgent.java b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/DropAgent.java index cf7b3ee2b2d..82d3a9c9c55 100644 --- a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/DropAgent.java +++ b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/DropAgent.java @@ -42,13 +42,11 @@ public void reactivatePart(MUIElement dragElement) { MPart partToActivate = null; if (dragElement instanceof MPart) { partToActivate = (MPart) dragElement; - } else if (dragElement instanceof MPlaceholder) { - MPlaceholder ph = (MPlaceholder) dragElement; + } else if (dragElement instanceof MPlaceholder ph) { if (ph.getRef() instanceof MPart) { partToActivate = (MPart) ph.getRef(); } - } else if (dragElement instanceof MPartStack) { - MPartStack stack = (MPartStack) dragElement; + } else if (dragElement instanceof MPartStack stack) { if (stack.getSelectedElement() instanceof MPart) { partToActivate = (MPart) stack.getSelectedElement(); } else if (stack.getSelectedElement() instanceof MPlaceholder) { diff --git a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/IBFDragAgent.java b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/IBFDragAgent.java index 8219917ff85..b38228db20f 100644 --- a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/IBFDragAgent.java +++ b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/IBFDragAgent.java @@ -65,8 +65,7 @@ public MUIElement getElementToDrag(DnDInfo info) { public void dragStart(DnDInfo info) { super.dragStart(info); - if (dragElement instanceof MToolControl) { - MToolControl tc = (MToolControl) dragElement; + if (dragElement instanceof MToolControl tc) { if (tc.getObject() instanceof TrimStack) { TrimStack ts = (TrimStack) tc.getObject(); ts.showStack(false); diff --git a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/PartDragAgent.java b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/PartDragAgent.java index 42e9b0843ea..cb1571fbc9b 100644 --- a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/PartDragAgent.java +++ b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/PartDragAgent.java @@ -32,12 +32,10 @@ public PartDragAgent(DnDManager manager) { @Override public MUIElement getElementToDrag(DnDInfo info) { - if (!(info.curElement instanceof MPartStack)) { + if (!(info.curElement instanceof MPartStack stack)) { return null; } - MPartStack stack = (MPartStack) info.curElement; - // Drag a part that is in a stack if (info.itemElement instanceof MStackElement) { // Prevent dragging 'No Move' parts diff --git a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/SplitDropAgent2.java b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/SplitDropAgent2.java index 92f256dc6b1..b6318f763b0 100644 --- a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/SplitDropAgent2.java +++ b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/SplitDropAgent2.java @@ -308,19 +308,17 @@ public boolean drop(MUIElement dragElement, DnDInfo info) { } // Adjust the relToElement based on the location of the dragElement - if (relToElement instanceof MArea) { + if (relToElement instanceof MArea area) { // make it difficult to drag outside parts into the shared area boolean fromSharedArea = dragElementLocation == EModelService.IN_SHARED_AREA; // if from shared area and no modifier, is ok // if not from shared area and modifier is on, then ok boolean shouldBePlacedInSharedArea = fromSharedArea == !isModified(); if (shouldBePlacedInSharedArea) { - MArea area = (MArea) relToElement; relToElement = area.getChildren().get(0); } - } else if (relToElement instanceof MPerspective) { + } else if (relToElement instanceof MPerspective persp) { if (dragElementLocation == EModelService.IN_ACTIVE_PERSPECTIVE) { - MPerspective persp = (MPerspective) relToElement; relToElement = persp.getChildren().get(0); } } diff --git a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/SplitFeedbackOverlay.java b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/SplitFeedbackOverlay.java index 35e5394baef..d56c0223335 100644 --- a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/SplitFeedbackOverlay.java +++ b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/SplitFeedbackOverlay.java @@ -30,13 +30,13 @@ public class SplitFeedbackOverlay { private Shell feedbackShell; private int curSide = 0; - private float ratio; + private final float ratio; - private List rects = new ArrayList<>(); - private Rectangle outerRect; + private final List rects = new ArrayList<>(); + private final Rectangle outerRect; Boolean isModified = null; - private IStylingEngine stylingEngine; + private final IStylingEngine stylingEngine; public SplitFeedbackOverlay(Shell dragShell, Rectangle rect, int side, float pct, boolean enclosed, boolean modified) { @@ -119,9 +119,7 @@ private void defineRegion() { // shadows will end up being drawn on top of the shadows for the parent // shell rather than in the middle of the workbench window. Composite parent = feedbackShell.getParent(); - if (parent instanceof Shell) { - Shell parentShell = (Shell) parent; - + if (parent instanceof Shell parentShell) { Rectangle bounds = parentShell.getBounds(); rgn.add(bounds.width - 1, bounds.height - 1, 1, 1); } diff --git a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/StackDropAgent.java b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/StackDropAgent.java index f219adf6b4f..f519151bbbd 100644 --- a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/StackDropAgent.java +++ b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/StackDropAgent.java @@ -54,12 +54,10 @@ public boolean canDrop(MUIElement dragElement, DnDInfo info) { } // We have to be over a stack ourselves - if (!(info.curElement instanceof MPartStack)) { + if (!(info.curElement instanceof MPartStack stack)) { return false; } - MPartStack stack = (MPartStack) info.curElement; - if (stack.getTags().contains(IPresentationEngine.STANDALONE)) { return false; } @@ -416,7 +414,7 @@ public boolean drop(MUIElement dragElement, DnDInfo info) { if (dndManager.getFeedbackStyle() != DnDManager.HOSTED) { int dropIndex = getDropIndex(info); if (dropIndex != -1) { - MUIElement toActivate = dragElement instanceof MPartStack ? ((MPartStack) dragElement) + MUIElement toActivate = dragElement instanceof MPartStack m ? m .getSelectedElement() : dragElement; dock(dragElement, dropIndex); reactivatePart(toActivate); diff --git a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/minmax/MinMaxAddon.java b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/minmax/MinMaxAddon.java index a360926ea04..73985dea358 100644 --- a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/minmax/MinMaxAddon.java +++ b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/minmax/MinMaxAddon.java @@ -100,7 +100,7 @@ public class MinMaxAddon { @Inject MApplication app; - private CTabFolder2Adapter CTFButtonListener = new CTabFolder2Adapter() { + private final CTabFolder2Adapter CTFButtonListener = new CTabFolder2Adapter() { private MUIElement getElementToChange(CTabFolderEvent event) { CTabFolder ctf = (CTabFolder) event.widget; MUIElement element = (MUIElement) ctf.getData(AbstractPartRenderer.OWNING_ME); @@ -136,7 +136,7 @@ public void restore(CTabFolderEvent event) { } }; - private MouseListener CTFDblClickListener = new MouseAdapter() { + private final MouseListener CTFDblClickListener = new MouseAdapter() { @Override public void mouseDown(MouseEvent e) { // HACK! If this is an empty stack treat it as though it was the editor area @@ -238,8 +238,7 @@ private void subscribeTopicWidget(@UIEventTopic(UIEvents.UIElement.TOPIC_WIDGET) } MUIElement stateElement = changedElement; - if (changedElement instanceof MPartStack) { - MPartStack stack = (MPartStack) changedElement; + if (changedElement instanceof MPartStack stack) { MArea area = MinMaxAddonUtil.getAreaFor(stack); if (area != null && !(area.getWidget() instanceof CTabFolder)) { stateElement = area.getCurSharedRef(); @@ -320,17 +319,15 @@ private void subscribeTopicSelectedElement( } final MUIElement changedElement = (MUIElement) event.getProperty(EventTags.ELEMENT); - if (!(changedElement instanceof MPerspectiveStack)) { + if (!(changedElement instanceof MPerspectiveStack ps)) { return; } - MPerspectiveStack ps = (MPerspectiveStack) changedElement; MWindow window = modelService.getTopLevelWindowFor(ps); Object widget = window.getWidget(); - if (!(widget instanceof Shell)) { + if (!(widget instanceof final Shell winShell)) { return; } - final Shell winShell = (Shell) widget; List tcList = modelService.findElements(window, null, MToolControl.class); final MPerspective curPersp = ps.getSelectedElement(); @@ -391,12 +388,10 @@ private void subscribeTopicTagsChanged( Object changedObj = event.getProperty(EventTags.ELEMENT); - if (!(changedObj instanceof MUIElement)) { + if (!(changedObj instanceof final MUIElement changedElement)) { return; } - final MUIElement changedElement = (MUIElement) changedObj; - if (UIEvents.isADD(event)) { if (UIEvents.contains(event, UIEvents.EventTags.NEW_VALUE, MINIMIZED)) { minimize(changedElement); @@ -432,12 +427,10 @@ private void subscribeTopicElementId( Object changedObject = event.getProperty(EventTags.ELEMENT); // Only care about MPerspective id changes - if (!(changedObject instanceof MPerspective)) { + if (!(changedObject instanceof MPerspective perspective)) { return; } - MPerspective perspective = (MPerspective) changedObject; - String newID = (String) event.getProperty(UIEvents.EventTags.NEW_VALUE); String oldID = (String) event.getProperty(UIEvents.EventTags.OLD_VALUE); @@ -622,8 +615,7 @@ private CTabFolder getCTFFor(MUIElement element) { } } else if (element.getWidget() instanceof CTabFolder) { return (CTabFolder) element.getWidget(); - } else if (element instanceof MPlaceholder) { - MPlaceholder ph = (MPlaceholder) element; + } else if (element instanceof MPlaceholder ph) { if (ph.getRef() instanceof MArea) { return getCTFFor(ph.getRef()); } @@ -632,10 +624,9 @@ private CTabFolder getCTFFor(MUIElement element) { } boolean isEmptyPerspectiveStack(MUIElement element) { - if (!(element instanceof MPerspectiveStack)) { + if (!(element instanceof MPerspectiveStack ps)) { return false; } - MPerspectiveStack ps = (MPerspectiveStack) element; return ps.getChildren().isEmpty(); } @@ -989,11 +980,10 @@ private List getElementsToRestore(MUIElement element) { private void createTrim(MUIElement element) { MWindow win = MinMaxAddonUtil.getWindowFor(element); - if (!(win instanceof MTrimmedWindow)) { + if (!(win instanceof MTrimmedWindow window)) { return; } - MTrimmedWindow window = (MTrimmedWindow) win; Shell winShell = (Shell) window.getWidget(); // Is there already a TrimControl there ? diff --git a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/minmax/MinMaxAddonUtil.java b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/minmax/MinMaxAddonUtil.java index d667dc54bec..48d94634f88 100644 --- a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/minmax/MinMaxAddonUtil.java +++ b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/minmax/MinMaxAddonUtil.java @@ -55,10 +55,9 @@ public static boolean isMinMaxChildrenAreaWithMultipleVisibleChildren(MUIElement if (!element.getTags().contains(MIN_MAXIMIZEABLE_CHILDREN_AREA_TAG)) { return false; } - if (!(element instanceof MArea)) { + if (!(element instanceof MArea area)) { return false; } - MArea area = (MArea) element; if (area.getChildren().isEmpty()) { return false; } diff --git a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/minmax/TrimPaneLayout.java b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/minmax/TrimPaneLayout.java index e73dcff3009..8d30e62f2d6 100644 --- a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/minmax/TrimPaneLayout.java +++ b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/minmax/TrimPaneLayout.java @@ -28,7 +28,7 @@ public class TrimPaneLayout extends Layout { private static int BORDER_WIDTH = 4; private static final Rectangle EMPTY_RECT = new Rectangle(0, 0, 0, 0); - private int fixedCorner; + private final int fixedCorner; public Rectangle hSizingRect = EMPTY_RECT; public Rectangle vSizingRect = EMPTY_RECT; @@ -43,7 +43,7 @@ public class TrimPaneLayout extends Layout { int trackState = SWT.NONE; protected Point curPos; - private MToolControl toolControl; + private final MToolControl toolControl; public TrimPaneLayout(MToolControl toolControl, int barSide) { this.toolControl = toolControl; diff --git a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/minmax/TrimStack.java b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/minmax/TrimStack.java index 39f31cd59ef..c325e519e74 100644 --- a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/minmax/TrimStack.java +++ b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/minmax/TrimStack.java @@ -121,7 +121,7 @@ public class TrimStack { /** * A map of created images from a part's icon URI path. */ - private Map imageMap = new HashMap<>(); + private final Map imageMap = new HashMap<>(); ControlListener caResizeListener = new ControlAdapter() { @Override @@ -149,7 +149,7 @@ public void controlResized(ControlEvent e) { protected IEventBroker eventBroker; // Listens to ESC and closes the active fast view - private Listener escapeListener = event -> { + private final Listener escapeListener = event -> { if (event.character == SWT.ESC) { showStack(false); partService.requestActivation(); @@ -162,11 +162,10 @@ private void subscribeTopicTagsChanged( @UIEventTopic(UIEvents.ApplicationElement.TOPIC_TAGS) org.osgi.service.event.Event event) { Object changedObj = event.getProperty(EventTags.ELEMENT); - if (!(changedObj instanceof MToolControl)) { + if (!(changedObj instanceof final MToolControl changedElement)) { return; } - final MToolControl changedElement = (MToolControl) changedObj; if (changedElement.getObject() != this) { return; } @@ -290,7 +289,7 @@ private ToolItem getChangedToolItem(MUIElement changedElement) { * by handleTransientDataEvents() and described in the article at * http://wiki.eclipse.org/Eclipse4/RCP/Event_Model */ - private EventHandler closeHandler = event -> { + private final EventHandler closeHandler = event -> { if (!isShowing) { return; } @@ -321,7 +320,7 @@ private ToolItem getChangedToolItem(MUIElement changedElement) { }; // Close any open stacks before shutting down - private EventHandler shutdownHandler = event -> showStack(false); + private final EventHandler shutdownHandler = event -> showStack(false); private void fixToolItemSelection() { if (trimStackTB == null || trimStackTB.isDisposed()) { @@ -358,11 +357,10 @@ private void fixToolItemSelection() { } private boolean isEditorStack() { - if (!(minimizedElement instanceof MPlaceholder)) { + if (!(minimizedElement instanceof MPlaceholder ph)) { return false; } - MPlaceholder ph = (MPlaceholder) minimizedElement; return ph.getRef() instanceof MArea; } @@ -391,7 +389,7 @@ private MPart getLeafPart(MUIElement element) { * by handleTransientDataEvents() and described in the article at * http://wiki.eclipse.org/Eclipse4/RCP/Event_Model */ - private EventHandler openHandler = event -> { + private final EventHandler openHandler = event -> { if (isShowing) { return; } @@ -432,7 +430,7 @@ private MPart getLeafPart(MUIElement element) { * by handleTransientDataEvents() and described in the article at * http://wiki.eclipse.org/Eclipse4/RCP/Event_Model */ - private EventHandler toBeRenderedHandler = event -> { + private final EventHandler toBeRenderedHandler = event -> { if (minimizedElement == null || trimStackTB == null) { return; } @@ -457,7 +455,7 @@ private MPart getLeafPart(MUIElement element) { * by handleTransientDataEvents() and described in the article at * http://wiki.eclipse.org/Eclipse4/RCP/Event_Model */ - private EventHandler childrenHandler = event -> { + private final EventHandler childrenHandler = event -> { if (minimizedElement == null || trimStackTB == null) { return; } @@ -475,7 +473,7 @@ private MPart getLeafPart(MUIElement element) { * by handleTransientDataEvents() and described in the article at * http://wiki.eclipse.org/Eclipse4/RCP/Event_Model */ - private EventHandler widgetHandler = event -> { + private final EventHandler widgetHandler = event -> { Object changedObj = event.getProperty(UIEvents.EventTags.ELEMENT); if (changedObj != minimizedElement) { return; @@ -493,7 +491,7 @@ private MPart getLeafPart(MUIElement element) { */ // Listener attached to every ToolItem in a TrimStack. Responsible for activating the // appropriate part. - private SelectionListener toolItemSelectionListener = new SelectionListener() { + private final SelectionListener toolItemSelectionListener = new SelectionListener() { @Override public void widgetSelected(SelectionEvent e) { ToolItem toolItem = (ToolItem) e.widget; @@ -580,8 +578,7 @@ void createWidget(Composite parent, MToolControl me) { MUIElement meParent = me.getParent(); int orientation = SWT.HORIZONTAL; - if (meParent instanceof MTrimBar) { - MTrimBar bar = (MTrimBar) meParent; + if (meParent instanceof MTrimBar bar) { if (bar.getSide() == SideValue.RIGHT || bar.getSide() == SideValue.LEFT) { orientation = SWT.VERTICAL; } @@ -847,8 +844,7 @@ private void updateTrimStackItems() { ti.setToolTipText(Messages.TrimStack_SharedAreaTooltip); ti.setImage(getLayoutImage()); ti.addSelectionListener(toolItemSelectionListener); - } else if (minimizedElement instanceof MPlaceholder) { - MPlaceholder ph = (MPlaceholder) minimizedElement; + } else if (minimizedElement instanceof MPlaceholder ph) { if (ph.getRef() instanceof MPart) { MPart part = (MPart) ph.getRef(); ToolItem ti = new ToolItem(trimStackTB, SWT.CHECK); @@ -857,10 +853,8 @@ private void updateTrimStackItems() { ti.setToolTipText(getLabelText(part)); ti.addSelectionListener(toolItemSelectionListener); } - } else if (minimizedElement instanceof MGenericStack) { + } else if (minimizedElement instanceof MGenericStack theStack) { // Handle *both* PartStacks and PerspectiveStacks here... - MGenericStack theStack = (MGenericStack) minimizedElement; - // check to see if this stack has any valid elements boolean hasRenderedElements = false; for (MUIElement stackElement : theStack.getChildren()) { @@ -906,8 +900,7 @@ void restoreStack() { minimizedElement.getTags().remove(IPresentationEngine.MINIMIZED); // Activate the part that is being brought up... - if (minimizedElement instanceof MPartStack) { - MPartStack theStack = (MPartStack) minimizedElement; + if (minimizedElement instanceof MPartStack theStack) { MStackElement curSel = theStack.getSelectedElement(); Control ctrl = (Control) minimizedElement.getWidget(); @@ -937,7 +930,7 @@ public void showStack(boolean show) { if (ctrl == null) { return; } - CTabFolder ctf = ctrl instanceof CTabFolder? (CTabFolder) ctrl: null; + CTabFolder ctf = ctrl instanceof CTabFolder c? c: null; Composite clientAreaComposite = getCAComposite(); if (clientAreaComposite == null || clientAreaComposite.isDisposed()) { @@ -985,8 +978,7 @@ public void showStack(boolean show) { toolControl.getTags().add(MINIMIZED_AND_SHOWING); // Activate the part that is being brought up... - if (minimizedElement instanceof MPartStack) { - MPartStack theStack = (MPartStack) minimizedElement; + if (minimizedElement instanceof MPartStack theStack) { MStackElement curSel = theStack.getSelectedElement(); // Hack for elems that are lazy initialized @@ -997,8 +989,7 @@ public void showStack(boolean show) { if (curSel instanceof MPart) { partService.activate((MPart) curSel); - } else if (curSel instanceof MPlaceholder) { - MPlaceholder ph = (MPlaceholder) curSel; + } else if (curSel instanceof MPlaceholder ph) { if (ph.getRef() instanceof MPart) { partService.activate((MPart) ph.getRef()); } @@ -1012,15 +1003,13 @@ public void showStack(boolean show) { while (partToActivate == null && selectedElement != null) { if (selectedElement instanceof MPart) { partToActivate = (MPart) selectedElement; - } else if (selectedElement instanceof MPlaceholder) { - MPlaceholder ph = (MPlaceholder) selectedElement; + } else if (selectedElement instanceof MPlaceholder ph) { if (ph.getRef() instanceof MPart) { partToActivate = (MPart) ph.getRef(); } else { selectedElement = null; } - } else if (selectedElement instanceof MElementContainer) { - MElementContainer container = (MElementContainer) selectedElement; + } else if (selectedElement instanceof MElementContainer container) { selectedElement = container.getSelectedElement(); } } @@ -1039,8 +1028,7 @@ public void showStack(boolean show) { if (partToActivate != null) { partService.activate(partToActivate); } - } else if (minimizedElement instanceof MPlaceholder) { - MPlaceholder ph = (MPlaceholder) minimizedElement; + } else if (minimizedElement instanceof MPlaceholder ph) { if (ph.getRef() instanceof MPart) { MPart part = (MPart) ph.getRef(); partService.activate(part); @@ -1166,10 +1154,9 @@ private Composite getHostPane() { private int getFixedSides() { MUIElement tcParent = toolControl.getParent(); - if (!(tcParent instanceof MTrimBar)) { + if (!(tcParent instanceof MTrimBar bar)) { return 0; } - MTrimBar bar = (MTrimBar) tcParent; Composite trimComp = (Composite) bar.getWidget(); Rectangle trimBounds = trimComp.getBounds(); Point trimCenter = new Point(trimBounds.width / 2, trimBounds.height / 2); // adjusted to diff --git a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/splitteraddon/SplitHost.java b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/splitteraddon/SplitHost.java index c8e50188dc8..6aeff415819 100644 --- a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/splitteraddon/SplitHost.java +++ b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/splitteraddon/SplitHost.java @@ -58,8 +58,7 @@ MPart findInnerActive(MCompositePart outer) { MPart innerActive = null; MUIElement curParent = outer; while (innerActive == null && curParent != null) { - if (curParent instanceof MElementContainer) { - MElementContainer container = (MElementContainer) curParent; + if (curParent instanceof MElementContainer container) { if (container.getSelectedElement() instanceof MPart) { innerActive = (MPart) container.getSelectedElement(); } else if (container.getSelectedElement() instanceof MElementContainer) { diff --git a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/splitteraddon/SplitterAddon.java b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/splitteraddon/SplitterAddon.java index 0ed588b0ccd..d091e00e1a5 100644 --- a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/splitteraddon/SplitterAddon.java +++ b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/splitteraddon/SplitterAddon.java @@ -61,12 +61,10 @@ private void subscribeTopicTagsChanged( Object changedObj = event.getProperty(EventTags.ELEMENT); - if (!(changedObj instanceof MPart)) { + if (!(changedObj instanceof MPart part)) { return; } - MPart part = (MPart) changedObj; - if (UIEvents.isADD(event)) { if (UIEvents.contains(event, UIEvents.EventTags.NEW_VALUE, IPresentationEngine.SPLIT_HORIZONTAL)) { From 7aa09f543f036cb722ba6bdd2ac954857c29dba9 Mon Sep 17 00:00:00 2001 From: Eclipse Platform Bot Date: Fri, 3 Oct 2025 03:11:35 +0000 Subject: [PATCH 2/3] Version bump(s) for 4.38 stream --- .../org.eclipse.e4.ui.workbench.addons.swt/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.eclipse.e4.ui.workbench.addons.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.workbench.addons.swt/META-INF/MANIFEST.MF index 7cda4cc33f8..72b95a276a9 100644 --- a/bundles/org.eclipse.e4.ui.workbench.addons.swt/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.e4.ui.workbench.addons.swt/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.e4.ui.workbench.addons.swt;singleton:=true -Bundle-Version: 1.5.800.qualifier +Bundle-Version: 1.5.900.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin From 14d4800313aeed41f844f2e8fc5850e816a42db6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Fri, 3 Oct 2025 11:00:34 +0300 Subject: [PATCH 3/3] Set DnDManager style in constructor Prevents dead code warning. --- .../eclipse/e4/ui/workbench/addons/dndaddon/DnDManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/DnDManager.java b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/DnDManager.java index c4bbb25edb4..2f98ab8385d 100644 --- a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/DnDManager.java +++ b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/DnDManager.java @@ -51,7 +51,7 @@ class DnDManager { public static final int HOSTED = 1; public static final int GHOSTED = 2; public static final int SIMPLE = 3; - private final int feedbackStyle = SIMPLE; + private int feedbackStyle; Collection dragAgents = new ArrayList<>(); Collection dropAgents = new ArrayList<>(); @@ -105,6 +105,7 @@ public void addImage(Rectangle imageRect, Image image) { } public DnDManager(MWindow topLevelWindow) { + feedbackStyle = SIMPLE; dragWindow = topLevelWindow; info = new DnDInfo(topLevelWindow);