# HG changeset patch # User Thomas Wuerthinger # Date 1328414751 -3600 # Node ID 88f091c2232d8dd888db45355560ecc33ca578f4 # Parent c43083cc96e998d0fc35581bf926349eab52a7e6 Remove zoom animation. diff -r c43083cc96e9 -r 88f091c2232d src/share/tools/IdealGraphVisualizer/ControlFlowEditor/src/at/ssw/visualizer/cfg/action/HierarchicalCompoundLayoutAction.java --- a/src/share/tools/IdealGraphVisualizer/ControlFlowEditor/src/at/ssw/visualizer/cfg/action/HierarchicalCompoundLayoutAction.java Sun Feb 05 04:34:57 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/ControlFlowEditor/src/at/ssw/visualizer/cfg/action/HierarchicalCompoundLayoutAction.java Sun Feb 05 05:05:51 2012 +0100 @@ -1,3 +1,26 @@ +/* + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ package at.ssw.visualizer.cfg.action; import at.ssw.visualizer.cfg.CfgEditorContext; diff -r c43083cc96e9 -r 88f091c2232d src/share/tools/IdealGraphVisualizer/ControlFlowEditor/src/at/ssw/visualizer/cfg/action/HierarchicalNodeLayoutAction.java --- a/src/share/tools/IdealGraphVisualizer/ControlFlowEditor/src/at/ssw/visualizer/cfg/action/HierarchicalNodeLayoutAction.java Sun Feb 05 04:34:57 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/ControlFlowEditor/src/at/ssw/visualizer/cfg/action/HierarchicalNodeLayoutAction.java Sun Feb 05 05:05:51 2012 +0100 @@ -1,3 +1,26 @@ +/* + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ package at.ssw.visualizer.cfg.action; import at.ssw.visualizer.cfg.CfgEditorContext; diff -r c43083cc96e9 -r 88f091c2232d src/share/tools/IdealGraphVisualizer/ControlFlowEditor/src/at/ssw/visualizer/cfg/action/ZoominAction.java --- a/src/share/tools/IdealGraphVisualizer/ControlFlowEditor/src/at/ssw/visualizer/cfg/action/ZoominAction.java Sun Feb 05 04:34:57 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/ControlFlowEditor/src/at/ssw/visualizer/cfg/action/ZoominAction.java Sun Feb 05 05:05:51 2012 +0100 @@ -11,7 +11,7 @@ CfgScene tc = getEditor(); if (tc != null) { CfgScene scene = tc; - scene.animateZoom(1.1); + scene.setZoomFactor(1.1); } } diff -r c43083cc96e9 -r 88f091c2232d src/share/tools/IdealGraphVisualizer/ControlFlowEditor/src/at/ssw/visualizer/cfg/action/ZoomoutAction.java --- a/src/share/tools/IdealGraphVisualizer/ControlFlowEditor/src/at/ssw/visualizer/cfg/action/ZoomoutAction.java Sun Feb 05 04:34:57 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/ControlFlowEditor/src/at/ssw/visualizer/cfg/action/ZoomoutAction.java Sun Feb 05 05:05:51 2012 +0100 @@ -10,7 +10,7 @@ CfgScene tc = getEditor(); if (tc != null) { CfgScene scene = tc; - scene.animateZoom(0.9); + scene.setZoomFactor(0.9); } } diff -r c43083cc96e9 -r 88f091c2232d src/share/tools/IdealGraphVisualizer/ControlFlowEditor/src/at/ssw/visualizer/cfg/graph/CfgScene.java --- a/src/share/tools/IdealGraphVisualizer/ControlFlowEditor/src/at/ssw/visualizer/cfg/graph/CfgScene.java Sun Feb 05 04:34:57 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/ControlFlowEditor/src/at/ssw/visualizer/cfg/graph/CfgScene.java Sun Feb 05 05:05:51 2012 +0100 @@ -324,7 +324,7 @@ } getPreferences().putInt(PREFERENCE_LAYOUT, newLayout); - sceneLayout.invokeLayout(); + sceneLayout.invokeLayoutImmediately(); } @Override @@ -569,10 +569,8 @@ } } - //animated scene Zoom to the max bounds of current viewport public void zoomScene() { JScrollPane pane = scrollPane; - Rectangle prefBounds = this.getPreferredBounds(); Dimension viewDim = pane.getViewportBorderBounds().getSize(); @@ -582,13 +580,7 @@ double zoomX = (double) viewDim.width / realwidth; double zoomY = (double) viewDim.height / realheight; double zoomFactor = Math.min(zoomX, zoomY); - - this.animateZoom(zoomFactor * 0.9); - } - - //animated animateZoom function for scene animateZoom factor - public void animateZoom(double zoomfactor) { - this.getSceneAnimator().animateZoomFactor(this.getZoomFactor() * zoomfactor); + this.setZoomFactor(zoomFactor * 0.9); } public void addCfgEventListener(CfgEventListener l) {