changeset 6940:b524bb50da08

Reverted accidentally commited changed to NumberAxis (from 4b558607b25b)
author Martin Sladecek <martin.sladecek@oracle.com>
date Wed, 30 Apr 2014 08:24:15 +0200
parents 3c4fb09288b6
children 29ad05f09214
files modules/controls/src/main/java/javafx/scene/chart/NumberAxis.java
diffstat 1 files changed, 4 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/modules/controls/src/main/java/javafx/scene/chart/NumberAxis.java	Wed Apr 30 08:21:14 2014 +0200
+++ b/modules/controls/src/main/java/javafx/scene/chart/NumberAxis.java	Wed Apr 30 08:24:15 2014 +0200
@@ -218,16 +218,14 @@
             animator.stop(currentAnimationID);
             currentAnimationID = animator.animate(
                 new KeyFrame(Duration.ZERO,
-                        new KeyValue(currentLowerBound, oldLowerBound)
-//                        new KeyValue(scalePropertyImpl(), getScale())
+                        new KeyValue(currentLowerBound, oldLowerBound),
+                        new KeyValue(scalePropertyImpl(), getScale())
                 ),
                 new KeyFrame(Duration.millis(700),
-                        new KeyValue(currentLowerBound, lowerBound)
-//                        new KeyValue(scalePropertyImpl(), scale)
+                        new KeyValue(currentLowerBound, lowerBound),
+                        new KeyValue(scalePropertyImpl(), scale)
                 )
             );
-            setScale(scale);
-//            currentLowerBound.set(lowerBound);
         } else {
             currentLowerBound.set(lowerBound);
             setScale(scale);