From 9564a205dc63d05dd12344a870f18182c560b2c3 Mon Sep 17 00:00:00 2001
From: Claudio Maggioni <maggicl@usi.ch>
Date: Tue, 22 Nov 2022 11:32:57 +0100
Subject: [PATCH] Minor cleanups

---
 src/main/java/com/github/dtschust/zork/Zork.java   |  1 +
 .../java/com/github/dtschust/zork/ZorkCommand.java |  2 +-
 .../com/github/dtschust/zork/ZorkCondition.java    |  2 +-
 .../java/com/github/dtschust/zork/ZorkGame.java    | 14 +++++++-------
 .../com/github/dtschust/zork/parser/DOMUtils.java  |  5 +++--
 .../github/dtschust/zork/parser/dom/Elements.java  |  1 -
 .../dtschust/zork/repl/actions/MoveAction.java     |  1 -
 .../github/dtschust/zork/types/ZorkDirection.java  |  8 --------
 8 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/github/dtschust/zork/Zork.java b/src/main/java/com/github/dtschust/zork/Zork.java
index 7ec2ade..0a8a4c3 100644
--- a/src/main/java/com/github/dtschust/zork/Zork.java
+++ b/src/main/java/com/github/dtschust/zork/Zork.java
@@ -19,6 +19,7 @@ import static com.github.dtschust.zork.Zork.Type.*;
 public class Zork {
     ZorkGame game;
     Scanner source = new Scanner(System.in);
+
     public Zork(String filename) {
 
         game = new ZorkReader(filename).build();
diff --git a/src/main/java/com/github/dtschust/zork/ZorkCommand.java b/src/main/java/com/github/dtschust/zork/ZorkCommand.java
index a32c851..14e4cc2 100644
--- a/src/main/java/com/github/dtschust/zork/ZorkCommand.java
+++ b/src/main/java/com/github/dtschust/zork/ZorkCommand.java
@@ -2,7 +2,7 @@ package com.github.dtschust.zork;
 
 /* Special Command condition */
 public class ZorkCommand {
-    public final String commandName;
+    private final String commandName;
 
     public ZorkCommand(String command) {
         this.commandName = command;
diff --git a/src/main/java/com/github/dtschust/zork/ZorkCondition.java b/src/main/java/com/github/dtschust/zork/ZorkCondition.java
index 3b22297..45175ef 100644
--- a/src/main/java/com/github/dtschust/zork/ZorkCondition.java
+++ b/src/main/java/com/github/dtschust/zork/ZorkCondition.java
@@ -2,7 +2,7 @@ package com.github.dtschust.zork;
 
 /* Generic condition*/
 public abstract class ZorkCondition {
-    public final String object;
+    protected final String object;
 
     protected ZorkCondition(String object) {
         this.object = object;
diff --git a/src/main/java/com/github/dtschust/zork/ZorkGame.java b/src/main/java/com/github/dtschust/zork/ZorkGame.java
index 5200de9..b0acdf9 100644
--- a/src/main/java/com/github/dtschust/zork/ZorkGame.java
+++ b/src/main/java/com/github/dtschust/zork/ZorkGame.java
@@ -10,13 +10,13 @@ import java.util.Set;
 public class ZorkGame {
 
     public final Set<String> inventory = new HashSet<>();
-    protected boolean running = false;
-    protected String currentRoom;
-    protected ZorkMap<ZorkRoom> rooms = new ZorkMap<>();
-    protected ZorkMap<ZorkItem> items = new ZorkMap<>();
-    protected ZorkMap<ZorkContainer> containers = new ZorkMap<>();
-    protected ZorkMap<ZorkCreature> creatures = new ZorkMap<>();
-    protected HashMap<String, Type> objectLookup = new HashMap<>();
+    private final ZorkMap<ZorkRoom> rooms = new ZorkMap<>();
+    private final ZorkMap<ZorkItem> items = new ZorkMap<>();
+    private final ZorkMap<ZorkContainer> containers = new ZorkMap<>();
+    private final ZorkMap<ZorkCreature> creatures = new ZorkMap<>();
+    private final HashMap<String, Type> objectLookup = new HashMap<>();
+    private boolean running = false;
+    private String currentRoom;
 
     public ZorkRoom getCurrentRoom() {
         return rooms.get(currentRoom);
diff --git a/src/main/java/com/github/dtschust/zork/parser/DOMUtils.java b/src/main/java/com/github/dtschust/zork/parser/DOMUtils.java
index efff276..867e71a 100644
--- a/src/main/java/com/github/dtschust/zork/parser/DOMUtils.java
+++ b/src/main/java/com/github/dtschust/zork/parser/DOMUtils.java
@@ -1,12 +1,13 @@
 package com.github.dtschust.zork.parser;
 
-import com.github.dtschust.zork.parser.dom.Elements;
 import org.w3c.dom.CharacterData;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
 
 public final class DOMUtils {
     private DOMUtils() {
diff --git a/src/main/java/com/github/dtschust/zork/parser/dom/Elements.java b/src/main/java/com/github/dtschust/zork/parser/dom/Elements.java
index aafef69..a233edb 100644
--- a/src/main/java/com/github/dtschust/zork/parser/dom/Elements.java
+++ b/src/main/java/com/github/dtschust/zork/parser/dom/Elements.java
@@ -6,7 +6,6 @@ import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
 import java.util.AbstractList;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.RandomAccess;
 import java.util.stream.Collectors;
diff --git a/src/main/java/com/github/dtschust/zork/repl/actions/MoveAction.java b/src/main/java/com/github/dtschust/zork/repl/actions/MoveAction.java
index 367d89c..98130c6 100644
--- a/src/main/java/com/github/dtschust/zork/repl/actions/MoveAction.java
+++ b/src/main/java/com/github/dtschust/zork/repl/actions/MoveAction.java
@@ -3,7 +3,6 @@ package com.github.dtschust.zork.repl.actions;
 import com.github.dtschust.zork.ZorkGame;
 import com.github.dtschust.zork.repl.Action;
 import com.github.dtschust.zork.types.ZorkDirection;
-import com.github.dtschust.zork.types.ZorkRoom;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/src/main/java/com/github/dtschust/zork/types/ZorkDirection.java b/src/main/java/com/github/dtschust/zork/types/ZorkDirection.java
index fa17c9e..5549faa 100644
--- a/src/main/java/com/github/dtschust/zork/types/ZorkDirection.java
+++ b/src/main/java/com/github/dtschust/zork/types/ZorkDirection.java
@@ -9,14 +9,6 @@ public enum ZorkDirection {
     SOUTH("south", "s"),
     WEST("west", "w");
 
-    public String getLongName() {
-        return longName;
-    }
-
-    public String getShortName() {
-        return shortName;
-    }
-
     private final String longName;
     private final String shortName;