From 92c090f18da3ab23ce5b3356764fcb64f1b8a3ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Tue, 16 Oct 2018 15:03:52 +0200 Subject: animation : get() -> obtain() (avoid clash with Collection.get()) --- core/src/ch/asynk/gdx/boardgame/animations/AnimationSequence.java | 2 +- core/src/ch/asynk/gdx/boardgame/animations/BounceAnimation.java | 2 +- core/src/ch/asynk/gdx/boardgame/animations/DelayAnimation.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/ch/asynk/gdx/boardgame/animations/AnimationSequence.java b/core/src/ch/asynk/gdx/boardgame/animations/AnimationSequence.java index 8aa6b06..0569a40 100644 --- a/core/src/ch/asynk/gdx/boardgame/animations/AnimationSequence.java +++ b/core/src/ch/asynk/gdx/boardgame/animations/AnimationSequence.java @@ -15,7 +15,7 @@ public class AnimationSequence implements Animation, Pool.Poolable } }; - public static AnimationSequence get(int capacity) + public static AnimationSequence obtain(int capacity) { AnimationSequence seq = animationSequencePool.obtain(); if (seq.animations == null) { diff --git a/core/src/ch/asynk/gdx/boardgame/animations/BounceAnimation.java b/core/src/ch/asynk/gdx/boardgame/animations/BounceAnimation.java index 432d0d7..17f0a53 100644 --- a/core/src/ch/asynk/gdx/boardgame/animations/BounceAnimation.java +++ b/core/src/ch/asynk/gdx/boardgame/animations/BounceAnimation.java @@ -17,7 +17,7 @@ public class BounceAnimation extends TimedAnimation implements Pool.Poolable } }; - public static BounceAnimation get(Piece piece, float duration, float bounceFactor, int rotations) + public static BounceAnimation obtain(Piece piece, float duration, float bounceFactor, int rotations) { BounceAnimation a = bounceAnimationPool.obtain(); diff --git a/core/src/ch/asynk/gdx/boardgame/animations/DelayAnimation.java b/core/src/ch/asynk/gdx/boardgame/animations/DelayAnimation.java index 0d20cae..695a21a 100644 --- a/core/src/ch/asynk/gdx/boardgame/animations/DelayAnimation.java +++ b/core/src/ch/asynk/gdx/boardgame/animations/DelayAnimation.java @@ -15,7 +15,7 @@ public class DelayAnimation extends TimedAnimation implements Pool.Poolable } }; - public static DelayAnimation get(Drawable drawable, float duration) + public static DelayAnimation obtain(Drawable drawable, float duration) { DelayAnimation a = delayAnimationPool.obtain(); -- cgit v1.1-2-g2b99