Merge pull request iluwatar#14 from mafagafogigante/master

iluwatar · iluwatar · commit 86abc4177e2b · 2014-11-09T12:57:24.000+02:00
Small refactorings
diff --git a/interpreter/src/main/java/com/iluwatar/App.java b/interpreter/src/main/java/com/iluwatar/App.java
@@ -50,11 +50,7 @@ public static void main(String[] args) {
 	}
 
 	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,
diff --git 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 "";
+	}
 }
diff --git 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 String loadData() {
 		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) {

Original file line number	Diff line number	Diff line change
`@@ -50,11 +50,7 @@ public static void main(String[] args) {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`public static boolean isOperator(String s) {`
`53`		`- if (s.equals("+") \|\| s.equals("-") \|\| s.equals("*")) {`
`54`		`- return true;`
`55`		`- } else {`
`56`		`- return false;`
`57`		`- }`
	`53`	`+ return s.equals("+") \|\| s.equals("-") \|\| s.equals("*");`
`58`	`54`	`}`
`59`	`55`
`60`	`56`	`public static Expression getOperatorInstance(String s, Expression left,`