From e119aa82c0a4a4d066fcd462a99dc93f9ee15296 Mon Sep 17 00:00:00 2001 From: Jérémy Zurcher Date: Mon, 11 Jan 2016 12:18:52 +0100 Subject: add engine.util.Collection and use it --- .../ch/asynk/rustanddust/engine/util/Collection.java | 18 ++++++++++++++++++ .../asynk/rustanddust/engine/util/IterableArray.java | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 core/src/ch/asynk/rustanddust/engine/util/Collection.java (limited to 'core/src/ch/asynk/rustanddust/engine/util') diff --git a/core/src/ch/asynk/rustanddust/engine/util/Collection.java b/core/src/ch/asynk/rustanddust/engine/util/Collection.java new file mode 100644 index 00000000..c768d45d --- /dev/null +++ b/core/src/ch/asynk/rustanddust/engine/util/Collection.java @@ -0,0 +1,18 @@ +package ch.asynk.rustanddust.engine.util; + +import java.util.Iterator; + +public interface Collection extends Iterator, Iterable +{ + public void clear(); + + public int size(); + + public boolean isEmpty(); + + public E get(int idx); + + public boolean add(E e); + + // public boolean contains(E e); +} diff --git a/core/src/ch/asynk/rustanddust/engine/util/IterableArray.java b/core/src/ch/asynk/rustanddust/engine/util/IterableArray.java index f310a605..baa58d93 100644 --- a/core/src/ch/asynk/rustanddust/engine/util/IterableArray.java +++ b/core/src/ch/asynk/rustanddust/engine/util/IterableArray.java @@ -3,7 +3,7 @@ package ch.asynk.rustanddust.engine.util; import java.util.ArrayList; import java.util.Iterator; -public class IterableArray extends ArrayList implements Iterator, Iterable +public class IterableArray extends ArrayList implements Collection { private int i; private int s; -- cgit v1.2.3