modules/graphics/src/main/java/com/sun/scenario/animation/shared/InterpolationInterval.java

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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.  Oracle designates this

@@ -23,10 +23,11 @@
  * questions.
  */
 
 package com.sun.scenario.animation.shared;
 
+import com.sun.javafx.animation.KeyValueHelper;
 import javafx.animation.Interpolator;
 import javafx.animation.KeyValue;
 import javafx.beans.value.WritableBooleanValue;
 import javafx.beans.value.WritableDoubleValue;
 import javafx.beans.value.WritableFloatValue;

@@ -51,11 +52,11 @@
 
     public abstract void recalculateStartValue();
 
     public static InterpolationInterval create(KeyValue rightKeyValue,
             long ticks, KeyValue leftKeyValue, long duration) {
-        switch (rightKeyValue.getType()) {
+        switch (KeyValueHelper.getType(rightKeyValue)) {
             case BOOLEAN:
                 return new BooleanInterpolationInterval(rightKeyValue, ticks,
                         leftKeyValue.getEndValue());
             case DOUBLE:
                 return ((leftKeyValue.getInterpolator() instanceof NumberTangentInterpolator) || (rightKeyValue

@@ -88,11 +89,11 @@
         throw new RuntimeException("Should not reach here");
     }
 
     public static InterpolationInterval create(KeyValue rightKeyValue,
             long ticks) {
-        switch (rightKeyValue.getType()) {
+        switch (KeyValueHelper.getType(rightKeyValue)) {
             case BOOLEAN:
                 return new BooleanInterpolationInterval(rightKeyValue, ticks);
             case DOUBLE:
                 return (rightKeyValue.getInterpolator() instanceof NumberTangentInterpolator) ? new TangentDoubleInterpolationInterval(
                         rightKeyValue, ticks)