Skip to content

Cleanup various deprecation warnings in the GEF component #788

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 8, 2025
Merged

Cleanup various deprecation warnings in the GEF component #788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions org.eclipse.gef/src/org/eclipse/gef/internal/InternalGEFPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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);
}
Comment on lines -76 to -79
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

InternalGEFPlugin extends AbstractUIPlugin, which internally already calls the deprecated savePluginPreferences().


/**
* 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
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/PaletteCustomizerDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down
4 changes: 2 additions & 2 deletions org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/PaletteSettingsDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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()) {
Expand Down
6 changes: 3 additions & 3 deletions org.eclipse.gef/src/org/eclipse/gef/ui/parts/DomainEventDispatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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;
Expand All @@ -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;

Expand Down Expand Up @@ -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);
Expand Down
Loading