Fix to issue 616 (editor npe in autoclose on unsupported scripts)

rjmatthews62 · rjmatthews62 · commit 0351661d8c9a · 2012-03-26T15:55:14.000+11:00
This time for sure...
diff --git a/android/Common/src/com/googlecode/android_scripting/language/Language.java b/android/Common/src/com/googlecode/android_scripting/language/Language.java
@@ -27,10 +27,10 @@
  * 
  * @author igor.v.karp@gmail.com (Igor Karp)
  */
-public abstract class Language {
+public class Language {
 
-  private final static Map<Character, String> AUTO_CLOSE_MAP =
-      buildAutoCloseMap('[', "[]", '{', "{}", '(', "()", '\'', "''", '"', "\"\"");
+  private final static Map<Character, String> AUTO_CLOSE_MAP = buildAutoCloseMap('[', "[]", '{',
+      "{}", '(', "()", '\'', "''", '"', "\"\"");
 
   /** Returns the initial template for newly created script. */
   public String getContentTemplate() {
@@ -67,8 +67,8 @@ public String autoClose(char token) {
 
   /** Returns the RPC call text with given parameter values. */
   public final String getRpcText(String content, MethodDescriptor rpc, String[] values) {
-    return getMethodCallText(getRpcReceiverName(content), rpc.getName(), rpc
-        .getParameterValues(values));
+    return getMethodCallText(getRpcReceiverName(content), rpc.getName(),
+        rpc.getParameterValues(values));
   }
 
   /** Returns the RPC receiver found in the given script. */
diff --git a/android/ScriptingLayerForAndroid/AndroidManifest.xml b/android/ScriptingLayerForAndroid/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest
   xmlns:android="http://schemas.android.com/apk/res/android"
   package="com.googlecode.android_scripting"
-  android:installLocation="auto" android:versionCode="406" android:versionName="5x06">
+  android:installLocation="auto" android:versionCode="407" android:versionName="5x07">
     <uses-permission android:name="android.permission.RECEIVE_SMS"></uses-permission>
     <uses-permission android:name="net.dinglisch.android.tasker.PERMISSION_RUN_TASKS"></uses-permission>
   <application
diff --git a/android/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ScriptManager.java b/android/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ScriptManager.java
@@ -117,7 +117,8 @@ public void onCreate(Bundle savedInstanceState) {
         new AlertDialog.Builder(this)
             .setTitle("Error")
             .setMessage(
-                "Failed to create scripts directory. Please check the permissions of your external storage media.")
+                "Failed to create scripts directory.\n" + mBaseDir + "\n"
+                    + "Please check the permissions of your external storage media.")
             .setIcon(android.R.drawable.ic_dialog_alert).setPositiveButton("Ok", null).show();
       }
     } else {
