Initial cleanup, introduced Action interface.

cardshifter-core/src/main/java/com/cardshifter/core/Action.java

@@ -0,0 +1,12 @@
+
+package com.cardshifter.core;
+
+/**
+ *
+ * @author Frank van Heeswijk
+ */
+public interface Action {
+	boolean isAllowed();
+
+	void perform();
+}

cardshifter-core/src/main/java/com/cardshifter/core/CardAction.java

@@ -1,35 +1,34 @@
-package com.cardshifter.core;
-
-import java.util.Objects;
-
-import org.luaj.vm2.LuaValue;
-import org.luaj.vm2.lib.jse.CoerceJavaToLua;
-
-public class CardAction extends UsableAction {
-
-	private final Card card;
-
-	public CardAction(final Card card, final String name, final LuaValue allowedFunction, final LuaValue actionFunction) {
-		super(name, allowedFunction, actionFunction);
-		this.card = Objects.requireNonNull(card, "card");
-	}
-
-	public Card getCard() {
-		return card;
-	}
-
-	@Override
-	public String toString() {
-		return "{Action " + getName() + " on card " + card + "}";
-	}
-
-	@Override
-	protected LuaValue methodArg() {
-		return CoerceJavaToLua.coerce(card);
-	}
-
-	@Override
-	protected Game getGame() {
-		return card.getGame();
-	}
-}
+package com.cardshifter.core;
+
+import java.util.Objects;
+
+import org.luaj.vm2.LuaValue;
+import org.luaj.vm2.lib.jse.CoerceJavaToLua;
+
+public class CardAction extends UsableAction {
+	private final Card card;
+
+	public CardAction(final Card card, final String name, final LuaValue allowedFunction, final LuaValue actionFunction) {
+		super(name, allowedFunction, actionFunction);
+		this.card = Objects.requireNonNull(card, "card");
+	}
+
+	public Card getCard() {
+		return card;
+	}
+
+	@Override
+	protected LuaValue methodArg() {
+		return CoerceJavaToLua.coerce(card);
+	}
+
+	@Override
+	protected Game getGame() {
+		return card.getGame();
+	}
+
+	@Override
+	public String toString() {
+		return "{Action " + getName() + " on card " + card + "}";
+	}
+}

cardshifter-core/src/main/java/com/cardshifter/core/CommandLineOptions.java

@@ -1,23 +1,21 @@
-package com.cardshifter.core;
-
-import java.util.Random;
-
-import com.beust.jcommander.Parameter;
-
-public class CommandLineOptions {
-
-	@Parameter(names = { "--file", "-f" }, description = "Script file to run")
-	private String script;
-
-	@Parameter(names = { "--seed", "-s" }, description = "Set random seed")
-	private Integer seed;
-
-	public Random getRandom() {
-		return seed == null ? new Random() : new Random(seed);
-	}
-
-	public String getScript() {
-		return script;
-	}
-
-}
+package com.cardshifter.core;
+
+import java.util.Random;
+
+import com.beust.jcommander.Parameter;
+
+public class CommandLineOptions {
+	@Parameter(names = { "--file", "-f" }, description = "Script file to run")
+	private String script;
+
+	@Parameter(names = { "--seed", "-s" }, description = "Set random seed")
+	private Integer seed;
+
+	public Random getRandom() {
+		return (seed == null) ? new Random() : new Random(seed);
+	}
+
+	public String getScript() {
+		return script;
+	}
+}