From 7e82b05a56ca8dc3433e4a91b5b13c63edfc59fc Mon Sep 17 00:00:00 2001 From: yugecin Date: Sun, 4 Dec 2016 23:54:53 +0100 Subject: [PATCH] use inner interface instead of default impl so we can go back to java 7 :) (close #87) --- pom.xml | 4 ++-- src/awlex/ospu/polymover/factory/PolyMoverFactory.java | 7 +------ src/yugecin/opsudance/Dancer.java | 2 +- src/yugecin/opsudance/movers/factories/MoverFactory.java | 4 ++-- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 3d31b81f..ba810c48 100644 --- a/pom.xml +++ b/pom.xml @@ -36,8 +36,8 @@ maven-compiler-plugin 3.2 - 1.8 - 1.8 + 1.7 + 1.7 UTF-8 diff --git a/src/awlex/ospu/polymover/factory/PolyMoverFactory.java b/src/awlex/ospu/polymover/factory/PolyMoverFactory.java index 5548ca43..1d612943 100644 --- a/src/awlex/ospu/polymover/factory/PolyMoverFactory.java +++ b/src/awlex/ospu/polymover/factory/PolyMoverFactory.java @@ -13,7 +13,7 @@ import java.util.List; /** * Created by Awlex on 18.11.2016. */ -public abstract class PolyMoverFactory implements MoverFactory { +public abstract class PolyMoverFactory implements MoverFactory, MoverFactory.MultiPoint { private LinkedList movers; private int latestIndex; @@ -47,11 +47,6 @@ public abstract class PolyMoverFactory implements MoverFactory { throw new UnsupportedOperationException("Polymovers should use the create variant with all the gameobjects + startindex"); } - @Override - public boolean isMultiPoint() { - return true; - } - public final void create(GameObject[] objects, int startIndex) { if (latestIndex <= startIndex) { movers.clear(); diff --git a/src/yugecin/opsudance/Dancer.java b/src/yugecin/opsudance/Dancer.java index 25be5acf..ac23becb 100644 --- a/src/yugecin/opsudance/Dancer.java +++ b/src/yugecin/opsudance/Dancer.java @@ -160,7 +160,7 @@ public class Dancer { } this.moverFactoryIndex = moverFactoryIndex; moverFactory = moverFactories[moverFactoryIndex]; - multipoint = moverFactory.isMultiPoint(); + multipoint = moverFactory instanceof MoverFactory.MultiPoint; // to prevent crashes when changing mover in storyboard, create mover now createNewMover(); } diff --git a/src/yugecin/opsudance/movers/factories/MoverFactory.java b/src/yugecin/opsudance/movers/factories/MoverFactory.java index ba190795..ad0d7489 100644 --- a/src/yugecin/opsudance/movers/factories/MoverFactory.java +++ b/src/yugecin/opsudance/movers/factories/MoverFactory.java @@ -24,8 +24,8 @@ public interface MoverFactory { Mover create(GameObject start, GameObject end, int dir); - default boolean isMultiPoint() { - return false; + interface MultiPoint { + } }