Skip to content

Commit 14d9a66

Browse files
committed
Remove references to deprecated ZoomListener
The GEF ZoomListener has been deprecated for removal in 2022 and removed in the 3.23 release, with the Draw2D ZoomListener being the drop-in replacement. Contributes to #13
1 parent 6948c81 commit 14d9a66

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

bundles/org.eclipse.gmf.runtime.diagram.ui/META-INF/MANIFEST.MF

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %Plugin.name
44
Bundle-SymbolicName: org.eclipse.gmf.runtime.diagram.ui; singleton:=true
5-
Bundle-Version: 1.10.3.qualifier
5+
Bundle-Version: 1.11.0.qualifier
66
Bundle-Activator: org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin
77
Bundle-Vendor: %Plugin.providerName
88
Bundle-Localization: plugin
@@ -288,8 +288,8 @@ Export-Package: org.eclipse.gmf.runtime.diagram.ui,
288288
Require-Bundle: org.eclipse.ui.views;bundle-version="[3.3.0,4.0.0)",
289289
org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
290290
org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
291-
org.eclipse.draw2d;bundle-version="[3.5.0,4.0.0)",
292-
org.eclipse.gef;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
291+
org.eclipse.draw2d;bundle-version="[3.13.0,4.0.0)",
292+
org.eclipse.gef;bundle-version="[3.13.0,4.0.0)";visibility:=reexport,
293293
org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
294294
org.eclipse.gmf.runtime.emf.core;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
295295
org.eclipse.gmf.runtime.emf.commands.core;bundle-version="[1.2.0,2.0.0)",

bundles/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/DiagramRootEditPart.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/******************************************************************************
2-
* Copyright (c) 2002, 2009 IBM Corporation and others.
2+
* Copyright (c) 2002, 2025 IBM Corporation and others.
33
* This program and the accompanying materials are made
44
* available under the terms of the Eclipse Public License 2.0
55
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -24,12 +24,12 @@
2424
import org.eclipse.draw2d.geometry.Point;
2525
import org.eclipse.draw2d.geometry.Rectangle;
2626
import org.eclipse.draw2d.geometry.Translatable;
27+
import org.eclipse.draw2d.zoom.ZoomListener;
2728
import org.eclipse.gef.Request;
2829
import org.eclipse.gef.SnapToGeometry;
2930
import org.eclipse.gef.SnapToGrid;
3031
import org.eclipse.gef.editparts.GridLayer;
3132
import org.eclipse.gef.editparts.ScalableFreeformRootEditPart;
32-
import org.eclipse.gef.editparts.ZoomListener;
3333
import org.eclipse.gef.editparts.ZoomManager;
3434
import org.eclipse.gef.rulers.RulerProvider;
3535
import org.eclipse.gmf.runtime.common.core.util.Log;
@@ -193,7 +193,7 @@ protected ScaledGraphics createScaledGraphics(MapModeGraphics gmm) {
193193

194194
/*
195195
* (non-Javadoc)
196-
* @see org.eclipse.gef.editparts.ZoomListener#zoomChanged(double)
196+
* @see ZoomListener#zoomChanged(double)
197197
*/
198198
public void zoomChanged(double zoom) {
199199
ScaledGraphics.resetFontCache();

bundles/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/actions/ZoomContributionItem.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/******************************************************************************
2-
* Copyright (c) 2002, 2009 IBM Corporation and others.
2+
* Copyright (c) 2002, 2025 IBM Corporation and others.
33
* This program and the accompanying materials are made
44
* available under the terms of the Eclipse Public License 2.0
55
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -20,9 +20,9 @@
2020
import org.eclipse.draw2d.Viewport;
2121
import org.eclipse.draw2d.geometry.Point;
2222
import org.eclipse.draw2d.geometry.Rectangle;
23+
import org.eclipse.draw2d.zoom.ZoomListener;
2324
import org.eclipse.gef.GraphicalEditPart;
2425
import org.eclipse.gef.Request;
25-
import org.eclipse.gef.editparts.ZoomListener;
2626
import org.eclipse.gef.editparts.ZoomManager;
2727
import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
2828
import org.eclipse.gmf.runtime.diagram.ui.internal.l10n.DiagramUIPluginImages;
@@ -173,7 +173,7 @@ public void dispose() {
173173
}
174174

175175
/**
176-
* @see org.eclipse.gef.editparts.ZoomListener#zoomChanged(double)
176+
* @see ZoomListener#zoomChanged(double)
177177
*/
178178
public void zoomChanged(double zoom) {
179179
update();

bundles/org.eclipse.gmf.runtime.gef.ui/META-INF/MANIFEST.MF

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %Plugin.name
44
Bundle-SymbolicName: org.eclipse.gmf.runtime.gef.ui
5-
Bundle-Version: 1.8.1.qualifier
5+
Bundle-Version: 1.9.0.qualifier
66
Bundle-Activator: org.eclipse.gmf.runtime.gef.ui.internal.GefPlugin
77
Bundle-Vendor: %Plugin.providerName
88
Bundle-Localization: plugin
@@ -20,8 +20,8 @@ Export-Package: org.eclipse.gmf.runtime.gef.ui.figures,
2020
org.eclipse.gmf.runtime.gef.ui.internal.tools;x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,org.eclipse.gmf.tests.runtime.gef.ui,org.eclipse.gmf.runtime.diagram.ui,org.eclipse.gmf.runtime.diagram.ui.render,org.eclipse.gmf.runtime.diagram.ui.providers",
2121
org.eclipse.gmf.runtime.gef.ui.palette.customize
2222
Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
23-
org.eclipse.draw2d;bundle-version="[3.6.0,4.0.0)";visibility:=reexport,
24-
org.eclipse.gef;bundle-version="[3.5.0,4.0.0)",
23+
org.eclipse.draw2d;bundle-version="[3.13.0,4.0.0)";visibility:=reexport,
24+
org.eclipse.gef;bundle-version="[3.13.0,4.0.0)",
2525
org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
2626
org.eclipse.gmf.runtime.common.core;bundle-version="[1.2.0,2.0.0)",
2727
org.eclipse.gmf.runtime.common.ui;bundle-version="[1.2.0,2.0.0)",

bundles/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/editparts/AnimatableZoomManager.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/******************************************************************************
2-
* Copyright (c) 2004 IBM Corporation and others.
2+
* Copyright (c) 2004, 2025 IBM Corporation and others.
33
* This program and the accompanying materials are made
44
* available under the terms of the Eclipse Public License 2.0
55
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -21,7 +21,7 @@
2121
import org.eclipse.draw2d.geometry.Dimension;
2222
import org.eclipse.draw2d.geometry.Point;
2323
import org.eclipse.draw2d.geometry.Rectangle;
24-
import org.eclipse.gef.editparts.ZoomListener;
24+
import org.eclipse.draw2d.zoom.ZoomListener;
2525
import org.eclipse.gef.editparts.ZoomManager;
2626
import org.eclipse.gmf.runtime.draw2d.ui.geometry.LineSeg;
2727
import org.eclipse.gmf.runtime.draw2d.ui.internal.figures.AnimationModel;

bundles/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/editparts/AnimatedZoomListener.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2005 IBM Corporation and others.
2+
* Copyright (c) 2005, 2025 IBM Corporation and others.
33
* This program and the accompanying materials are made
44
* available under the terms of the Eclipse Public License 2.0
55
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -12,7 +12,7 @@
1212

1313
package org.eclipse.gmf.runtime.gef.ui.internal.editparts;
1414

15-
import org.eclipse.gef.editparts.ZoomListener;
15+
import org.eclipse.draw2d.zoom.ZoomListener;
1616

1717
/**
1818
* Listens to animated zoom changes.

0 commit comments

Comments
 (0)