From ce99297b3e4e46070d4f0eb4f5d05ee9c090dd53 Mon Sep 17 00:00:00 2001 From: Jérémy Zurcher Date: Wed, 10 Feb 2016 11:21:13 +0100 Subject: Collection,IterableArray: add indexOf(E) --- core/src/ch/asynk/rustanddust/engine/util/Collection.java | 2 ++ core/src/ch/asynk/rustanddust/engine/util/IterableArray.java | 10 ++++++++++ 2 files changed, 12 insertions(+) (limited to 'core/src/ch/asynk/rustanddust') diff --git a/core/src/ch/asynk/rustanddust/engine/util/Collection.java b/core/src/ch/asynk/rustanddust/engine/util/Collection.java index a7b5a022..67ea169e 100644 --- a/core/src/ch/asynk/rustanddust/engine/util/Collection.java +++ b/core/src/ch/asynk/rustanddust/engine/util/Collection.java @@ -16,6 +16,8 @@ public interface Collection extends Iterator, Iterable public E get(int idx); + public int indexOf(E e); + public boolean add(E e); public E remove(int idx); diff --git a/core/src/ch/asynk/rustanddust/engine/util/IterableArray.java b/core/src/ch/asynk/rustanddust/engine/util/IterableArray.java index 1b965fc0..f1473ddb 100644 --- a/core/src/ch/asynk/rustanddust/engine/util/IterableArray.java +++ b/core/src/ch/asynk/rustanddust/engine/util/IterableArray.java @@ -71,6 +71,16 @@ public class IterableArray implements Collection return data[i]; } + @Override + public int indexOf(E e) + { + for (int i = 0; i < data.length; i++) { + if (data[i] != null && data[i].equals(e)) + return i; + } + return -1; + } + @Override public boolean add(E e) { -- cgit v1.2.3