From 1d0dde26d090bc4abdb1ecd87f0f399d89941ccf Mon Sep 17 00:00:00 2001
From: Peter Osterlund <peterosterlund2@gmail.com>
Date: Wed, 4 Jan 2012 21:10:26 +0000
Subject: [PATCH] DroidFish: Moved error message to strings.xml.

---
 DroidFish/res/values/strings.xml                       |  1 +
 .../org/petero/droidfish/engine/ExternalEngine.java    | 10 ++++++++--
 .../org/petero/droidfish/engine/InternalStockFish.java |  5 +----
 .../src/org/petero/droidfish/engine/UCIEngineBase.java |  2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/DroidFish/res/values/strings.xml b/DroidFish/res/values/strings.xml
index 7d28fae..f3fc3c8 100644
--- a/DroidFish/res/values/strings.xml
+++ b/DroidFish/res/values/strings.xml
@@ -407,6 +407,7 @@ you are not actively using the program.\
     <string name="engine_error">Engine error</string>
     <string name="stockfish_engine">Stockfish</string>
     <string name="cuckoochess_engine">CuckooChess</string>
+    <string name="failed_to_start_engine">Failed to start engine</string>
 
     <string name="err_too_few_spaces">Too few spaces</string>
     <string name="err_invalid_piece">Invalid piece</string>
diff --git a/DroidFish/src/org/petero/droidfish/engine/ExternalEngine.java b/DroidFish/src/org/petero/droidfish/engine/ExternalEngine.java
index b7d79d0..b2cfa08 100644
--- a/DroidFish/src/org/petero/droidfish/engine/ExternalEngine.java
+++ b/DroidFish/src/org/petero/droidfish/engine/ExternalEngine.java
@@ -29,8 +29,13 @@ import java.nio.channels.FileChannel;
 import java.util.LinkedList;
 import java.util.List;
 
+import org.petero.droidfish.R;
+import android.content.Context;
+
 /** Engine running as a process started from an external resource. */
 public class ExternalEngine extends UCIEngineBase {
+    protected final Context context;
+
     private File engineFileName;
     protected static final String intSfPath = "/data/data/org.petero.droidfish/internal_sf";
     private static final String exePath = "/data/data/org.petero.droidfish/engine.exe";
@@ -42,7 +47,8 @@ public class ExternalEngine extends UCIEngineBase {
     private List<String> inLines;
     private boolean startedOk;
 
-    public ExternalEngine(String engine, Report report) {
+    public ExternalEngine(Context context, String engine, Report report) {
+        this.context = context;
         this.report = report;
         engineFileName = new File(engine);
         engineProc = null;
@@ -68,7 +74,7 @@ public class ExternalEngine extends UCIEngineBase {
                     try {
                         engineProc.waitFor();
                         if (!startedOk)
-                            report.reportError("Failed to start engine");
+                            report.reportError(context.getString(R.string.failed_to_start_engine));
                     } catch (InterruptedException e) {
                     }
                 }
diff --git a/DroidFish/src/org/petero/droidfish/engine/InternalStockFish.java b/DroidFish/src/org/petero/droidfish/engine/InternalStockFish.java
index f4c2115..23ec867 100644
--- a/DroidFish/src/org/petero/droidfish/engine/InternalStockFish.java
+++ b/DroidFish/src/org/petero/droidfish/engine/InternalStockFish.java
@@ -29,12 +29,9 @@ import android.os.Build;
 
 /** Stockfish engine running as process, started from assets resource. */
 public class InternalStockFish extends ExternalEngine {
-    private Context context;
 
     public InternalStockFish(Context context, Report report) {
-        super("", report);
-        this.context = context;
-
+        super(context, "", report);
     }
 
     /** @inheritDoc */
diff --git a/DroidFish/src/org/petero/droidfish/engine/UCIEngineBase.java b/DroidFish/src/org/petero/droidfish/engine/UCIEngineBase.java
index 15f946f..62d5164 100644
--- a/DroidFish/src/org/petero/droidfish/engine/UCIEngineBase.java
+++ b/DroidFish/src/org/petero/droidfish/engine/UCIEngineBase.java
@@ -34,7 +34,7 @@ public abstract class UCIEngineBase implements UCIEngine {
         else if ("stockfish".equals(engine))
             return new InternalStockFish(context, report);
         else
-            return new ExternalEngine(engine, report);
+            return new ExternalEngine(context, engine, report);
     }
 
     protected UCIEngineBase() {