diff options
| author | pguilet | 2017-01-20 13:06:24 +0000 |
|---|---|---|
| committer | Maxime Porhel | 2017-01-20 14:19:22 +0000 |
| commit | 0a51ea57a7560d663a40f1440585be73ca054041 (patch) | |
| tree | 2e9d590fd2f0bad9b5489a888a0743a3b8932fc8 | |
| parent | 05e6b99ce8dce7a2e3d3ec7518667539dee497fc (diff) | |
| download | org.eclipse.sirius-0a51ea57a7560d663a40f1440585be73ca054041.tar.gz org.eclipse.sirius-0a51ea57a7560d663a40f1440585be73ca054041.tar.xz org.eclipse.sirius-0a51ea57a7560d663a40f1440585be73ca054041.zip | |
[510760] Fix diagram zoom not working
Bug: 510760
Cherry-picked-from: 510693
Change-Id: I7c658f901a63985758a75d8e03f5c22e92724d59
Signed-off-by: pguilet <pierre.guilet@obeo.fr>
| -rw-r--r-- | plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/graphical/edit/part/DDiagramRootEditPart.java | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/graphical/edit/part/DDiagramRootEditPart.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/graphical/edit/part/DDiagramRootEditPart.java index cc8a88e856..6831b5b87a 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/graphical/edit/part/DDiagramRootEditPart.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/graphical/edit/part/DDiagramRootEditPart.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2016 THALES GLOBAL SERVICES. + * Copyright (c) 2007, 2017 THALES GLOBAL SERVICES. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -26,7 +26,6 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart; import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemsAwareFreeFormLayer; import org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants; import org.eclipse.gmf.runtime.diagram.ui.render.editparts.RenderedDiagramRootEditPart; -import org.eclipse.gmf.runtime.gef.ui.internal.editparts.AnimatableZoomManager; import org.eclipse.gmf.runtime.notation.MeasurementUnit; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.sirius.diagram.ui.tools.internal.figure.DConnectionLayerEx; @@ -114,8 +113,8 @@ public class DDiagramRootEditPart extends RenderedDiagramRootEditPart { @Override public void zoomIn(Point center) { - if (getZoomManager() instanceof AnimatableZoomManager) { - ((AnimatableZoomManager) getZoomManager()).zoomTo(getZoomManager().getNextZoomLevel(), center); + if (getZoomManager() instanceof SiriusAnimatableZoomManager) { + ((SiriusAnimatableZoomManager) getZoomManager()).zoomTo(getZoomManager().getNextZoomLevel(), center); } } @@ -126,15 +125,15 @@ public class DDiagramRootEditPart extends RenderedDiagramRootEditPart { @Override public void zoomOut(Point center) { - if (getZoomManager() instanceof AnimatableZoomManager) { - ((AnimatableZoomManager) getZoomManager()).zoomTo(getZoomManager().getPreviousZoomLevel(), center); + if (getZoomManager() instanceof SiriusAnimatableZoomManager) { + ((SiriusAnimatableZoomManager) getZoomManager()).zoomTo(getZoomManager().getPreviousZoomLevel(), center); } } @Override public void zoomTo(double zoom, Point center) { - if (getZoomManager() instanceof AnimatableZoomManager) { - ((AnimatableZoomManager) getZoomManager()).zoomTo(zoom, center); + if (getZoomManager() instanceof SiriusAnimatableZoomManager) { + ((SiriusAnimatableZoomManager) getZoomManager()).zoomTo(zoom, center); } } |
