From dd0e1ab27b1ebde577084f3a538585d47c2d881a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Garc=C3=ADa?= Date: Tue, 19 Sep 2023 17:49:21 +0200 Subject: [PATCH] More cleanup + spotless --- .../java/com/bladecoder/ink/runtime/CallStack.java | 1 - .../java/com/bladecoder/ink/runtime/Container.java | 5 ++--- src/main/java/com/bladecoder/ink/runtime/Json.java | 1 - .../java/com/bladecoder/ink/runtime/RTObject.java | 1 - src/main/java/com/bladecoder/ink/runtime/Story.java | 5 +---- .../java/com/bladecoder/ink/runtime/StoryState.java | 2 +- .../ink/runtime/test/BasicTextSpecTest.java | 7 ++----- .../com/bladecoder/ink/runtime/test/TestUtils.java | 13 ++++++------- 8 files changed, 12 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/bladecoder/ink/runtime/CallStack.java b/src/main/java/com/bladecoder/ink/runtime/CallStack.java index 1a7ff96..41c52dc 100644 --- a/src/main/java/com/bladecoder/ink/runtime/CallStack.java +++ b/src/main/java/com/bladecoder/ink/runtime/CallStack.java @@ -2,7 +2,6 @@ import com.bladecoder.ink.runtime.SimpleJson.InnerWriter; import com.bladecoder.ink.runtime.SimpleJson.Writer; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/com/bladecoder/ink/runtime/Container.java b/src/main/java/com/bladecoder/ink/runtime/Container.java index 4161fae..34f12ba 100644 --- a/src/main/java/com/bladecoder/ink/runtime/Container.java +++ b/src/main/java/com/bladecoder/ink/runtime/Container.java @@ -1,7 +1,6 @@ package com.bladecoder.ink.runtime; import com.bladecoder.ink.runtime.Path.Component; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -202,11 +201,11 @@ private RTObject contentWithPathComponent(Path.Component component) { } } - public SearchResult contentAtPath(Path path) throws Exception { + public SearchResult contentAtPath(Path path) { return contentAtPath(path, 0, -1); } - public SearchResult contentAtPath(Path path, int partialPathStart, int partialPathLength) throws Exception { + public SearchResult contentAtPath(Path path, int partialPathStart, int partialPathLength) { if (partialPathLength == -1) partialPathLength = path.getLength(); SearchResult result = new SearchResult(); diff --git a/src/main/java/com/bladecoder/ink/runtime/Json.java b/src/main/java/com/bladecoder/ink/runtime/Json.java index 313408a..4d6d7b4 100644 --- a/src/main/java/com/bladecoder/ink/runtime/Json.java +++ b/src/main/java/com/bladecoder/ink/runtime/Json.java @@ -1,7 +1,6 @@ package com.bladecoder.ink.runtime; import com.bladecoder.ink.runtime.ControlCommand.CommandType; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/com/bladecoder/ink/runtime/RTObject.java b/src/main/java/com/bladecoder/ink/runtime/RTObject.java index 7a357d6..3e8bbdd 100644 --- a/src/main/java/com/bladecoder/ink/runtime/RTObject.java +++ b/src/main/java/com/bladecoder/ink/runtime/RTObject.java @@ -1,7 +1,6 @@ package com.bladecoder.ink.runtime; import com.bladecoder.ink.runtime.Path.Component; - import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/src/main/java/com/bladecoder/ink/runtime/Story.java b/src/main/java/com/bladecoder/ink/runtime/Story.java index 966336a..27a5f0e 100644 --- a/src/main/java/com/bladecoder/ink/runtime/Story.java +++ b/src/main/java/com/bladecoder/ink/runtime/Story.java @@ -3,7 +3,6 @@ import com.bladecoder.ink.runtime.Error.ErrorType; import com.bladecoder.ink.runtime.SimpleJson.InnerWriter; import com.bladecoder.ink.runtime.SimpleJson.Writer; - import java.io.OutputStream; import java.util.ArrayList; import java.util.Collections; @@ -2667,9 +2666,7 @@ void visitChangedContainersDueToDivert() throws Exception { // Invalid pointer? May happen if attemptingto if (currentChildOfContainer == null) return; - Container currentContainerAncestor = currentChildOfContainer.getParent() instanceof Container - ? (Container) currentChildOfContainer.getParent() - : null; + Container currentContainerAncestor = currentChildOfContainer.getParent(); boolean allChildrenEnteredAtStart = true; while (currentContainerAncestor != null diff --git a/src/main/java/com/bladecoder/ink/runtime/StoryState.java b/src/main/java/com/bladecoder/ink/runtime/StoryState.java index f51f19b..4c1edfc 100644 --- a/src/main/java/com/bladecoder/ink/runtime/StoryState.java +++ b/src/main/java/com/bladecoder/ink/runtime/StoryState.java @@ -3,7 +3,6 @@ import com.bladecoder.ink.runtime.CallStack.Element; import com.bladecoder.ink.runtime.SimpleJson.InnerWriter; import com.bladecoder.ink.runtime.SimpleJson.Writer; - import java.io.OutputStream; import java.util.ArrayList; import java.util.HashMap; @@ -580,6 +579,7 @@ RTObject peekEvaluationStack() { RTObject popEvaluationStack() { RTObject obj = evaluationStack.get(evaluationStack.size() - 1); evaluationStack.remove(evaluationStack.size() - 1); + return obj; } diff --git a/src/test/java/com/bladecoder/ink/runtime/test/BasicTextSpecTest.java b/src/test/java/com/bladecoder/ink/runtime/test/BasicTextSpecTest.java index 2444ccf..982015e 100644 --- a/src/test/java/com/bladecoder/ink/runtime/test/BasicTextSpecTest.java +++ b/src/test/java/com/bladecoder/ink/runtime/test/BasicTextSpecTest.java @@ -1,11 +1,10 @@ package com.bladecoder.ink.runtime.test; import com.bladecoder.ink.runtime.Story; -import org.junit.Assert; -import org.junit.Test; - import java.util.ArrayList; import java.util.List; +import org.junit.Assert; +import org.junit.Test; public class BasicTextSpecTest { @@ -34,8 +33,6 @@ public void twolines() throws Exception { String json = TestUtils.getJsonString("inkfiles/basictext/twolines.ink.json"); Story story = new Story(json); - System.out.println(story.buildStringOfHierarchy()); - TestUtils.nextAll(story, text); Assert.assertEquals(2, text.size()); Assert.assertEquals("Line.", text.get(0)); diff --git a/src/test/java/com/bladecoder/ink/runtime/test/TestUtils.java b/src/test/java/com/bladecoder/ink/runtime/test/TestUtils.java index 9d8eb7a..6fdb651 100644 --- a/src/test/java/com/bladecoder/ink/runtime/test/TestUtils.java +++ b/src/test/java/com/bladecoder/ink/runtime/test/TestUtils.java @@ -1,9 +1,10 @@ package com.bladecoder.ink.runtime.test; +import static org.junit.Assert.fail; + import com.bladecoder.ink.runtime.Choice; import com.bladecoder.ink.runtime.Story; import com.bladecoder.ink.runtime.StoryException; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -11,11 +12,9 @@ import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.fail; - public class TestUtils { - public static final String getJsonString(String filename) throws IOException { + public static String getJsonString(String filename) throws IOException { InputStream systemResourceAsStream = ClassLoader.getSystemResourceAsStream(filename); @@ -39,7 +38,7 @@ public static final String getJsonString(String filename) throws IOException { } } - public static final List runStory(String filename, List choiceList, List errors) + public static List runStory(String filename, List choiceList, List errors) throws Exception { // 1) Load story String json = getJsonString(filename); @@ -90,7 +89,7 @@ public static final List runStory(String filename, List choiceL return text; } - public static final String joinText(List text) { + public static String joinText(List text) { StringBuilder sb = new StringBuilder(); for (String s : text) { @@ -101,7 +100,7 @@ public static final String joinText(List text) { } public static boolean isEnded(Story story) { - return !story.canContinue() && story.getCurrentChoices().size() == 0; + return !story.canContinue() && story.getCurrentChoices().isEmpty(); } public static void nextAll(Story story, List text) throws StoryException, Exception {