cleanup

3 files changed, 50 insertions, 60 deletions

diff --git a/navit/android/src/org/navitproject/navit/NavitBackupTask.java b/navit/android/src/org/navitproject/navit/NavitBackupTask.java
index 5780da382..442769054 100644
--- a/navit/android/src/org/navitproject/navit/NavitBackupTask.java
+++ b/navit/android/src/org/navitproject/navit/NavitBackupTask.java
@@ -15,7 +15,6 @@ import java.io.ObjectOutputStream;
 public class NavitBackupTask extends AsyncTask<Void, Void, String> {
 
     private Navit mActivity;
-
     private ProgressDialog mDialog;
 
     NavitBackupTask(Navit context) {
@@ -98,8 +97,7 @@ public class NavitBackupTask extends AsyncTask<Void, Void, String> {
                 if (preferencesOOs != null) {
                     preferencesOOs.close();
                 }
-            }
-            catch (IOException e) {
+            } catch (IOException e) {
                 e.printStackTrace();
                 return mActivity.getString(R.string.backup_failed);
             }
diff --git a/navit/android/src/org/navitproject/navit/NavitRestoreTask.java b/navit/android/src/org/navitproject/navit/NavitRestoreTask.java
index dbdb00cc5..6711b2354 100644
--- a/navit/android/src/org/navitproject/navit/NavitRestoreTask.java
+++ b/navit/android/src/org/navitproject/navit/NavitRestoreTask.java
@@ -85,17 +85,13 @@ public class NavitRestoreTask extends AsyncTask<Void, Void, String> {
 
                 if (value instanceof Boolean) {
                     prefEditor.putBoolean(key, (Boolean) value);
-                }
-                else if (value instanceof Float) {
+                } else if (value instanceof Float) {
                     prefEditor.putFloat(key, (Float) value);
-                }
-                else if (value instanceof Integer) {
+                } else if (value instanceof Integer) {
                     prefEditor.putInt(key, (Integer) value);
-                }
-                else if (value instanceof Long) {
+                } else if (value instanceof Long) {
                     prefEditor.putLong(key, (Long) value);
-                }
-                else if (value instanceof String) {
+                } else if (value instanceof String) {
                     prefEditor.putString(key, (String) value);
                 }
             }
diff --git a/navit/android/src/org/navitproject/navit/NavitSpeech2.java b/navit/android/src/org/navitproject/navit/NavitSpeech2.java
index 573696698..f6fe2a327 100644
--- a/navit/android/src/org/navitproject/navit/NavitSpeech2.java
+++ b/navit/android/src/org/navitproject/navit/NavitSpeech2.java
@@ -1,16 +1,20 @@
 /**
- * Navit, a modular navigation system. Copyright (C) 2005-2008 Navit Team
+ * Navit, a modular navigation system.
+ * Copyright (C) 2005-2008 Navit Team
  *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License version 2 as published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License along with this program; if
- * not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301, USA.
  */
 
 package org.navitproject.navit;
@@ -25,61 +29,53 @@ import android.util.Log;
 
 @SuppressWarnings("unused")
 public class NavitSpeech2 implements TextToSpeech.OnInitListener, NavitActivityResult {
-
-    private final Navit navit;
-    private final int MY_DATA_CHECK_CODE = 1;
-    private final String TAG = this.getClass().getName();
     private TextToSpeech mTts;
-
-
-    NavitSpeech2(Navit navit) {
-        this.navit = navit;
-        navit.setActivityResult(1, this);
-        Log.d(TAG, "Create");
-        Intent checkIntent = new Intent();
-        checkIntent.setAction(TextToSpeech.Engine.ACTION_CHECK_TTS_DATA);
-        if (navit.getPackageManager()
-                .resolveActivity(checkIntent, PackageManager.MATCH_DEFAULT_ONLY) != null) {
-            Log.d(TAG, "ACTION_CHECK_TTS_DATA available");
-            navit.startActivityForResult(checkIntent, MY_DATA_CHECK_CODE);
-        } else {
-            Log.e(TAG, "ACTION_CHECK_TTS_DATA not available, assume tts is working");
-            mTts = new TextToSpeech(navit, this);
-        }
-    }
+    private final Navit mNavit;
+    private final int MY_DATA_CHECK_CODE = 1;
+    private static final String TAG = NavitSpeech2.class.getName();
 
     public void onInit(int status) {
-        Log.d(TAG, "Status " + status);
+        Log.d(TAG,"Status "+status);
     }
 
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        Log.d(TAG, "onActivityResult " + requestCode + " " + resultCode);
+        Log.d(TAG,"onActivityResult "+requestCode+" "+resultCode);
         if (requestCode == MY_DATA_CHECK_CODE) {
             if (resultCode == TextToSpeech.Engine.CHECK_VOICE_DATA_PASS) {
                 // success, create the TTS instance
-                mTts = new TextToSpeech(navit, this);
+                mTts = new TextToSpeech(mNavit, this);
             } else {
                 // missing data, ask to install it
-                AlertDialog.Builder builder = new AlertDialog.Builder(navit);
-                builder
-                .setTitle(navit.getTstring(R.string.TTS_title_data_missing))
-                .setMessage(navit.getTstring(R.string.TTS_qery_install_data))
-                .setPositiveButton(navit.getTstring(R.string.yes),
-                new DialogInterface.OnClickListener() {
-                    public void onClick(DialogInterface dialog, int which) {
-                        Intent installIntent = new Intent();
-                        installIntent.setAction(
-                            TextToSpeech.Engine.ACTION_INSTALL_TTS_DATA);
-                        navit.startActivity(installIntent);
-                    }
-                })
-                .setNegativeButton(navit.getTstring(R.string.no), null)
-                .show();
+                AlertDialog.Builder builder = new AlertDialog.Builder(mNavit);
+                    builder.setTitle(R.string.TTS_title_data_missing).setMessage(R.string.TTS_qery_install_data)
+                            .setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
+                                public void onClick(DialogInterface dialog, int which) {
+                                    Intent installIntent = new Intent();
+                                    installIntent.setAction(TextToSpeech.Engine.ACTION_INSTALL_TTS_DATA);
+                                    mNavit.startActivity(installIntent);
+                                }
+                            })
+                    .setNegativeButton(R.string.no, null).show();
             }
         }
     }
 
-    public void say(String what) {
+    NavitSpeech2(Navit navit) {
+        this.mNavit =navit;
+        navit.setActivityResult(1, this);
+        Log.d(TAG,"Create");
+        Intent checkIntent = new Intent();
+        checkIntent.setAction(TextToSpeech.Engine.ACTION_CHECK_TTS_DATA);
+        if (navit.getPackageManager().resolveActivity(checkIntent, PackageManager.MATCH_DEFAULT_ONLY) != null) {
+            Log.d(TAG,"ACTION_CHECK_TTS_DATA available");
+            navit.startActivityForResult(checkIntent, MY_DATA_CHECK_CODE);
+        } else {
+            Log.e(TAG,"ACTION_CHECK_TTS_DATA not available, assume tts is working");
+            mTts = new TextToSpeech(navit, this);
+        }
+    }
+
+    void say(String what) {
         if (mTts != null) {
             mTts.speak(what, TextToSpeech.QUEUE_FLUSH, null);
         }