From 625d2b460a04131b221b4c95749ee1ab44442c48 Mon Sep 17 00:00:00 2001 From: Patrick Ziegler Date: Mon, 8 Sep 2025 19:30:00 +0200 Subject: [PATCH] Cleanup various deprecation warnings in the GEF component Contributes to https://github.com/eclipse-gef/gef-classic/pull/778 --- .../org/eclipse/gef/internal/InternalGEFPlugin.java | 11 +---------- .../ui/palette/customize/PaletteCustomizerDialog.java | 2 +- .../ui/palette/customize/PaletteSettingsDialog.java | 4 ++-- .../eclipse/gef/ui/parts/DomainEventDispatcher.java | 6 +++--- 4 files changed, 7 insertions(+), 16 deletions(-) diff --git a/org.eclipse.gef/src/org/eclipse/gef/internal/InternalGEFPlugin.java b/org.eclipse.gef/src/org/eclipse/gef/internal/InternalGEFPlugin.java index 9deb758e4..27473b31f 100644 --- a/org.eclipse.gef/src/org/eclipse/gef/internal/InternalGEFPlugin.java +++ b/org.eclipse.gef/src/org/eclipse/gef/internal/InternalGEFPlugin.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2024 IBM Corporation and others. + * Copyright (c) 2006, 2025 IBM Corporation and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -69,15 +69,6 @@ public static AbstractUIPlugin getDefault() { return singleton; } - /** - * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext) - */ - @Override - public void stop(BundleContext context) throws Exception { - savePluginPreferences(); - super.stop(context); - } - /** * Convenience method for getting the current zoom level of the active device.If * on MacOS or Linux (x11 window system) or if the device zoom couldn't diff --git a/org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/PaletteCustomizerDialog.java b/org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/PaletteCustomizerDialog.java index 91aece0e3..59680de27 100644 --- a/org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/PaletteCustomizerDialog.java +++ b/org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/PaletteCustomizerDialog.java @@ -296,7 +296,7 @@ public void widgetSelected(SelectionEvent event) { widgets.put(Integer.valueOf(id), button); if (descriptor != null) { - button.setImage(new Image(parent.getDisplay(), descriptor.getImageData())); + button.setImage(descriptor.createImage(parent.getDisplay())); button.addDisposeListener(e -> { Image img = ((Button) e.getSource()).getImage(); if (img != null && !img.isDisposed()) { diff --git a/org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/PaletteSettingsDialog.java b/org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/PaletteSettingsDialog.java index 9b7e44050..430bc1e60 100644 --- a/org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/PaletteSettingsDialog.java +++ b/org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/PaletteSettingsDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2024 IBM Corporation and others. + * Copyright (c) 2000, 2025 IBM Corporation and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -253,7 +253,7 @@ public void widgetSelected(SelectionEvent event) { widgets.put(Integer.valueOf(id), button); if (descriptor != null) { - button.setImage(new Image(parent.getDisplay(), descriptor.getImageData())); + button.setImage(descriptor.createImage(parent.getDisplay())); button.addDisposeListener(e -> { Image img = ((Button) e.getSource()).getImage(); if (img != null && !img.isDisposed()) { diff --git a/org.eclipse.gef/src/org/eclipse/gef/ui/parts/DomainEventDispatcher.java b/org.eclipse.gef/src/org/eclipse/gef/ui/parts/DomainEventDispatcher.java index c6ba93702..4da7e7f71 100644 --- a/org.eclipse.gef/src/org/eclipse/gef/ui/parts/DomainEventDispatcher.java +++ b/org.eclipse.gef/src/org/eclipse/gef/ui/parts/DomainEventDispatcher.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2010 IBM Corporation and others. + * Copyright (c) 2000, 2025 IBM Corporation and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -15,6 +15,7 @@ import java.util.HashMap; import java.util.Map; +import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.ACC; import org.eclipse.swt.accessibility.AccessibleControlEvent; import org.eclipse.swt.accessibility.AccessibleControlListener; @@ -28,7 +29,6 @@ import org.eclipse.draw2d.EventDispatcher; import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.InputEvent; import org.eclipse.draw2d.SWTEventDispatcher; import org.eclipse.draw2d.geometry.Point; @@ -409,7 +409,7 @@ public void dispatchMouseMoved(org.eclipse.swt.events.MouseEvent me) { } } if (okToDispatch()) { - if ((me.stateMask & InputEvent.ANY_BUTTON) != 0) { + if ((me.stateMask & SWT.BUTTON_MASK) != 0) { domain.mouseDrag(me, viewer); } else { domain.mouseMove(me, viewer);