engine.Order, engine.OrderList, game.Command -> game.Order, game.OrderList

2 files changed, 0 insertions, 95 deletions

diff --git a/core/src/ch/asynk/rustanddust/engine/Order.java b/core/src/ch/asynk/rustanddust/engine/Order.java
deleted file mode 100644
index 960b126..0000000
--- a/core/src/ch/asynk/rustanddust/engine/Order.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package ch.asynk.rustanddust.engine;
-
-import java.lang.Comparable;
-
-import com.badlogic.gdx.utils.Disposable;
-import com.badlogic.gdx.utils.Pool;
-import com.badlogic.gdx.utils.Json;
-
-public abstract class Order implements Disposable, Pool.Poolable, Json.Serializable, Comparable<Pawn>
-{
-    public interface OrderType
-    {
-    }
-
-    public abstract boolean isA(OrderType type);
-}
diff --git a/core/src/ch/asynk/rustanddust/engine/OrderList.java b/core/src/ch/asynk/rustanddust/engine/OrderList.java
deleted file mode 100644
index 9e4fe6c..0000000
--- a/core/src/ch/asynk/rustanddust/engine/OrderList.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package ch.asynk.rustanddust.engine;
-
-import java.util.Iterator;
-
-import com.badlogic.gdx.utils.Json;
-import com.badlogic.gdx.utils.JsonValue;
-import com.badlogic.gdx.utils.JsonWriter.OutputType;
-
-import ch.asynk.rustanddust.engine.util.IterableArray;
-
-public class OrderList extends IterableArray<Order> implements Json.Serializable
-{
-    public OrderList(int capacity)
-    {
-        super(capacity);
-    }
-
-    public Order get(Pawn pawn, Order.OrderType type)
-    {
-        for (Order o : this) {
-            if ((o.compareTo(pawn) == 0) && (o.isA(type)))
-                return o;
-        }
-        return null;
-    }
-
-    public void dispose(Pawn pawn)
-    {
-        Iterator<Order> it = iterator();
-        while (it.hasNext()) {
-            Order order = it.next();
-            if (order.compareTo(pawn) == 0) {
-                it.remove();
-                order.dispose();
-            }
-        }
-    }
-
-    public void dispose(Pawn pawn, Order.OrderType type)
-    {
-        Iterator<Order> it = iterator();
-        while (it.hasNext()) {
-            Order order = it.next();
-            if ((order.compareTo(pawn) == 0) && (order.isA(type))) {
-                it.remove();
-                order.dispose();
-            }
-        }
-    }
-
-    public void dispose()
-    {
-        for (Order o : this)
-            o.dispose();
-        clear();
-    }
-
-    public String toJson()
-    {
-        Json json = new Json();
-        json.setOutputType(OutputType.json);
-        return json.toJson(this);
-    }
-
-    @Override
-    public void write(Json json)
-    {
-        json.writeArrayStart("commands");
-        for (Order o : this)
-            json.writeValue(o);
-        json.writeArrayEnd();
-    }
-
-    @Override
-    public void read(Json json, JsonValue jsonMap)
-    {
-        // TODO read(Json json, JsonValue jsonMap)
-    }
-}