From 031bbe9f096762ec4c6852bf63eff957e3ef5ac0 Mon Sep 17 00:00:00 2001 From: mafagafogigante Date: Sat, 8 Nov 2014 20:09:10 -0200 Subject: [PATCH 1/4] Simplifies an if statement --- interpreter/src/main/java/com/iluwatar/App.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/interpreter/src/main/java/com/iluwatar/App.java b/interpreter/src/main/java/com/iluwatar/App.java index 0471f34a8..94bbc4466 100644 --- a/interpreter/src/main/java/com/iluwatar/App.java +++ b/interpreter/src/main/java/com/iluwatar/App.java @@ -50,11 +50,7 @@ public class App { } public static boolean isOperator(String s) { - if (s.equals("+") || s.equals("-") || s.equals("*")) { - return true; - } else { - return false; - } + return s.equals("+") || s.equals("-") || s.equals("*"); } public static Expression getOperatorInstance(String s, Expression left, From a4637fcf99dabad0f13650f01d4a383eb3427f13 Mon Sep 17 00:00:00 2001 From: mafagafogigante Date: Sat, 8 Nov 2014 20:35:23 -0200 Subject: [PATCH 2/4] Uses a StringBuilder to improve performance. Also stops initializing a variable (removes an unused initialization). --- .../src/main/java/com/iluwatar/FileLoader.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/model-view-presenter/src/main/java/com/iluwatar/FileLoader.java b/model-view-presenter/src/main/java/com/iluwatar/FileLoader.java index ec4d095da..c36dca612 100644 --- a/model-view-presenter/src/main/java/com/iluwatar/FileLoader.java +++ b/model-view-presenter/src/main/java/com/iluwatar/FileLoader.java @@ -29,17 +29,17 @@ public class FileLoader { try { BufferedReader br = new BufferedReader(new FileReader(new File( this.fileName))); - String text = ""; - String line = ""; + StringBuilder sb = new StringBuilder(); + String line; while ((line = br.readLine()) != null) { - text += line + "\n"; + sb.append(line).append('\n'); } this.loaded = true; br.close(); - return text; + return sb.toString(); } catch (Exception e) { From bc060309e3164e1dbe6775235ba14d5a2bd87d99 Mon Sep 17 00:00:00 2001 From: mafagafogigante Date: Sat, 8 Nov 2014 20:38:20 -0200 Subject: [PATCH 3/4] Improves a toString method. Makes it more readable and deletes an useless semicolon. --- .../src/main/java/com/iluwatar/Action.java | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/mediator/src/main/java/com/iluwatar/Action.java b/mediator/src/main/java/com/iluwatar/Action.java index 25f568e12..0b978ac3f 100644 --- a/mediator/src/main/java/com/iluwatar/Action.java +++ b/mediator/src/main/java/com/iluwatar/Action.java @@ -6,23 +6,16 @@ public enum Action { public String toString() { - String s = ""; switch (this) { case ENEMY: - s = "spotted enemies"; - break; + return "spotted enemies"; case GOLD: - s = "found gold"; - break; + return "found gold"; case HUNT: - s = "hunted a rabbit"; - break; + return "hunted a rabbit"; case TALE: - s = "tells a tale"; - break; - default: - break; + return "tells a tale"; } - return s; - }; + return ""; + } } From 5e28382021a579d27717962ed8d7a45acbbff40e Mon Sep 17 00:00:00 2001 From: mafagafogigante Date: Sat, 8 Nov 2014 20:49:40 -0200 Subject: [PATCH 4/4] Fixed spaces instead of tabs. --- mediator/src/main/java/com/iluwatar/Action.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mediator/src/main/java/com/iluwatar/Action.java b/mediator/src/main/java/com/iluwatar/Action.java index 0b978ac3f..cbe6f60c9 100644 --- a/mediator/src/main/java/com/iluwatar/Action.java +++ b/mediator/src/main/java/com/iluwatar/Action.java @@ -10,11 +10,11 @@ public enum Action { case ENEMY: return "spotted enemies"; case GOLD: - return "found gold"; + return "found gold"; case HUNT: - return "hunted a rabbit"; + return "hunted a rabbit"; case TALE: - return "tells a tale"; + return "tells a tale"; } return ""; }