From 164ff083c2f43e30909034c8d73da88d3b990858 Mon Sep 17 00:00:00 2001 From: Jumar Macato Date: Sun, 15 Apr 2018 17:56:10 +0800 Subject: [PATCH] Fix tests and rename classes with typeparams according to conventions. --- .../Keyframes/{KeyFramePair.cs => KeyFramePair`1.cs} | 0 .../{KeyFramesStateMachine.cs => KeyFramesStateMachine`1.cs} | 1 - .../Keyframes/{KeyFrames.cs => KeyFrames`1.cs} | 0 src/Avalonia.Animation/Timing.cs | 2 +- .../Transitions/{Transition.cs => Transition`1.cs} | 0 5 files changed, 1 insertion(+), 2 deletions(-) rename src/Avalonia.Animation/Keyframes/{KeyFramePair.cs => KeyFramePair`1.cs} (100%) rename src/Avalonia.Animation/Keyframes/{KeyFramesStateMachine.cs => KeyFramesStateMachine`1.cs} (99%) rename src/Avalonia.Animation/Keyframes/{KeyFrames.cs => KeyFrames`1.cs} (100%) rename src/Avalonia.Animation/Transitions/{Transition.cs => Transition`1.cs} (100%) diff --git a/src/Avalonia.Animation/Keyframes/KeyFramePair.cs b/src/Avalonia.Animation/Keyframes/KeyFramePair`1.cs similarity index 100% rename from src/Avalonia.Animation/Keyframes/KeyFramePair.cs rename to src/Avalonia.Animation/Keyframes/KeyFramePair`1.cs diff --git a/src/Avalonia.Animation/Keyframes/KeyFramesStateMachine.cs b/src/Avalonia.Animation/Keyframes/KeyFramesStateMachine`1.cs similarity index 99% rename from src/Avalonia.Animation/Keyframes/KeyFramesStateMachine.cs rename to src/Avalonia.Animation/Keyframes/KeyFramesStateMachine`1.cs index 9081908f75..f582a8a622 100644 --- a/src/Avalonia.Animation/Keyframes/KeyFramesStateMachine.cs +++ b/src/Avalonia.Animation/Keyframes/KeyFramesStateMachine`1.cs @@ -30,7 +30,6 @@ namespace Avalonia.Animation.Keyframes private Animation _targetAnimation; private Animatable _targetControl; internal bool _unsubscribe = false; - double _outputTime = 0d; private IObserver _targetObserver; private enum KeyFramesStates diff --git a/src/Avalonia.Animation/Keyframes/KeyFrames.cs b/src/Avalonia.Animation/Keyframes/KeyFrames`1.cs similarity index 100% rename from src/Avalonia.Animation/Keyframes/KeyFrames.cs rename to src/Avalonia.Animation/Keyframes/KeyFrames`1.cs diff --git a/src/Avalonia.Animation/Timing.cs b/src/Avalonia.Animation/Timing.cs index 071e48f82c..10d65cca7f 100644 --- a/src/Avalonia.Animation/Timing.cs +++ b/src/Avalonia.Animation/Timing.cs @@ -15,7 +15,7 @@ namespace Avalonia.Animation /// public static class Timing { - static ulong _animationsFrameCount, _transitionsFrameCount; + static ulong _transitionsFrameCount; static PlayState _globalState = PlayState.Run; /// diff --git a/src/Avalonia.Animation/Transitions/Transition.cs b/src/Avalonia.Animation/Transitions/Transition`1.cs similarity index 100% rename from src/Avalonia.Animation/Transitions/Transition.cs rename to src/Avalonia.Animation/Transitions/Transition`1.cs