summaryrefslogtreecommitdiffstats
path: root/core/src/ch
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2014-10-17 09:22:33 +0200
committerJérémy Zurcher <jeremy@asynk.ch>2014-10-17 09:22:33 +0200
commitf8d7d57a1fdd661b4e771e80d045c12ea57f9725 (patch)
tree8072ba35cbc1691002e6968639f57df0d0ca9435 /core/src/ch
parent21b260d4fc0bef844db02ca08e70b8802f088049 (diff)
downloadRustAndDust-f8d7d57a1fdd661b4e771e80d045c12ea57f9725.zip
RustAndDust-f8d7d57a1fdd661b4e771e80d045c12ea57f9725.tar.gz
Army: add String and toString()
Diffstat (limited to 'core/src/ch')
-rw-r--r--core/src/ch/asynk/tankontank/game/Army.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/core/src/ch/asynk/tankontank/game/Army.java b/core/src/ch/asynk/tankontank/game/Army.java
index 66c6b4f..852dbe9 100644
--- a/core/src/ch/asynk/tankontank/game/Army.java
+++ b/core/src/ch/asynk/tankontank/game/Army.java
@@ -2,10 +2,17 @@ package ch.asynk.tankontank.game;
public enum Army
{
- GE, US;
+ GE("German"), US("US");
+ private String s;
+ Army(String s) { this.s = s; }
public boolean isEnemy(Army other)
{
return (this != other);
}
+
+ public String toString()
+ {
+ return s;
+ }
}