Fix:port/android:More whitespace removal. No change to code.

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@4969 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/navit/android/src/org/navitproject/navit/Navit.java b/navit/navit/android/src/org/navitproject/navit/Navit.java
index 34534b2..cac593e 100644 (file)
--- a/navit/navit/android/src/org/navitproject/navit/Navit.java
+++ b/navit/navit/android/src/org/navitproject/navit/Navit.java
@@ -66,9 +66,9 @@ public class Navit extends Activity
        public static final class NavitAddress\r
        {\r
                String  result_type;    // TWN,STR,SHN\r
-               String  item_id;                // H<ddddd>L<ddddd> -> item.id_hi item.id_lo\r
-               float           lat;\r
-               float           lon;\r
+               String  item_id;        // H<ddddd>L<ddddd> -> item.id_hi item.id_lo\r
+               float   lat;\r
+               float   lon;\r
                String  addr;\r
        }\r
 \r
@@ -95,8 +95,7 @@ public class Navit extends Activity
        public static final int          NavitAddressSearch_id          = 70;\r
        public static final int          NavitAddressResultList_id      = 71;\r
 \r
-       public static List<NavitAddress>        NavitAddressResultList_foundItems       \r
-                = new ArrayList<NavitAddress>();\r
+       public static List<NavitAddress> NavitAddressResultList_foundItems = new ArrayList<NavitAddress>();\r
 \r
        public static final int          MAP_NUM_SECONDARY              = 12;\r
        static final String              MAP_FILENAME_PATH              = "/sdcard/navit/";\r
@@ -120,7 +119,9 @@ public class Navit extends Activity
                Log.e("Navit", "result " + result);\r
                int id = res.getIdentifier(resname, "raw", "org.navitproject.navit");\r
                Log.e("Navit", "Res ID " + id);\r
-               if (id == 0) return false;\r
+               if (id == 0) \r
+                       return false;\r
+\r
                while ((slash = result.indexOf("/", slash + 1)) != -1)\r
                {\r
                        if (slash != 0)\r
@@ -130,13 +131,17 @@ public class Navit extends Activity
                                if (!resultfile.exists())\r
                                {\r
                                        Log.e("Navit", "Creating dir");\r
-                                       if (!resultfile.mkdir()) return false;\r
+                                       if (!resultfile.mkdir())\r
+                                               return false;\r
                                        needs_update = true;\r
                                }\r
                        }\r
                }\r
+\r
                resultfile = new File(result);\r
-               if (!resultfile.exists()) needs_update = true;\r
+               if (!resultfile.exists()) \r
+                       needs_update = true;\r
+\r
                if (!needs_update)\r
                {\r
                        try\r
@@ -217,9 +222,7 @@ public class Navit extends Activity
                        message.setFadingEdgeLength(20);\r
                        message.setVerticalFadingEdgeEnabled(true);\r
                        // message.setVerticalScrollBarEnabled(true);\r
-                       RelativeLayout.LayoutParams rlp =\r
-                               new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.FILL_PARENT,\r
-                                       RelativeLayout.LayoutParams.FILL_PARENT);\r
+                       RelativeLayout.LayoutParams rlp = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.FILL_PARENT, RelativeLayout.LayoutParams.FILL_PARENT);\r
        \r
                        message.setLayoutParams(rlp);\r
                        final SpannableString s = new SpannableString(NavitTextTranslations.INFO_BOX_TEXT); // TRANS\r
@@ -373,8 +376,7 @@ public class Navit extends Activity
                ActivityResults = new NavitActivityResult[16];\r
                setVolumeControlStream(AudioManager.STREAM_MUSIC);\r
                PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);\r
-               wl = pm.newWakeLock(PowerManager.FULL_WAKE_LOCK | PowerManager.ON_AFTER_RELEASE,\r
-                               "NavitDoNotDimScreen");\r
+               wl = pm.newWakeLock(PowerManager.FULL_WAKE_LOCK | PowerManager.ON_AFTER_RELEASE,"NavitDoNotDimScreen");\r
 \r
                if (!extractRes(langc, NAVIT_DATA_DIR + "/locale/" + langc + "/LC_MESSAGES/navit.mo"))\r
                {\r
@@ -486,8 +488,7 @@ public class Navit extends Activity
                                                lon = Float.valueOf(geo[1]);\r
                                                b.putFloat("lat", lat);\r
                                                b.putFloat("lon", lon);\r
-                                               Message msg = Message.obtain(N_NavitGraphics.callback_handler\r
-                                                               , NavitGraphics.msg_type.CLB_SET_DESTINATION.ordinal());\r
+                                               Message msg = Message.obtain(N_NavitGraphics.callback_handler, NavitGraphics.msg_type.CLB_SET_DESTINATION.ordinal());\r
 \r
                                                msg.setData(b);\r
                                                msg.sendToTarget();\r
@@ -532,7 +533,7 @@ public class Navit extends Activity
        }\r
 \r
        // define callback id here\r
-       public static NavitGraphics     N_NavitGraphics = null;\r
+       public static NavitGraphics N_NavitGraphics = null;\r
 \r
        // callback id gets set here when called from NavitGraphics\r
        public static void setKeypressCallback(int kp_cb_id, NavitGraphics ng)\r
@@ -564,8 +565,7 @@ public class Navit extends Activity
                if (NavitDialogs.Navit_last_address_search_string.equals(""))\r
                {\r
                        // empty search string entered\r
-                       Toast.makeText(getApplicationContext(), Navit.get_text("No address found"),\r
-                                       Toast.LENGTH_LONG).show(); //TRANS\r
+                       Toast.makeText(getApplicationContext(), Navit.get_text("No address found"), Toast.LENGTH_LONG).show(); //TRANS\r
                }\r
                else\r
                {\r
@@ -639,8 +639,7 @@ public class Navit extends Activity
        }\r
 \r
        void setDestination(float latitude, float longitude, String address) {\r
-               Toast.makeText( getApplicationContext(),\r
-                       Navit.get_text("setting destination to") + "\n" + address, Toast.LENGTH_LONG).show(); //TRANS\r
+               Toast.makeText( getApplicationContext(),Navit.get_text("setting destination to") + "\n" + address, Toast.LENGTH_LONG).show(); //TRANS\r
 \r
                Message msg = Message.obtain(N_NavitGraphics.callback_handler, NavitGraphics.msg_type.CLB_SET_DESTINATION.ordinal());\r
                Bundle b = new Bundle();\r
@@ -691,8 +690,7 @@ public class Navit extends Activity
        \r
                                        if (addr.equals("")) {\r
                                                // empty search string entered\r
-                                               Toast.makeText(getApplicationContext(),\r
-                                                               Navit.get_text("No search string entered"), Toast.LENGTH_LONG).show(); //TRANS\r
+                                               Toast.makeText(getApplicationContext(),Navit.get_text("No search string entered"), Toast.LENGTH_LONG).show(); //TRANS\r
                                        } else {\r
                                                // show dialog, and start search for the results\r
                                                // make it indirect, to give our activity a chance to startup\r