Fix:Android:search small bugfix

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@4260 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 465b5de..ea652bb 100644 (file)
--- a/navit/navit/android/src/org/navitproject/navit/Navit.java
+++ b/navit/navit/android/src/org/navitproject/navit/Navit.java
@@ -61,7 +61,7 @@ public class Navit extends Activity implements Handler.Callback
 {\r
        public static final class Navit_Address_Result_Struct\r
        {\r
-               String result_type; // TWN,STR,SHN\r
+               String  result_type;    // TWN,STR,SHN\r
                float           lat;\r
                float           lon;\r
                String  addr;\r
@@ -95,9 +95,9 @@ public class Navit extends Activity implements Handler.Callback
        public static int                                                                                       download_map_id                                                         = 0;\r
        ProgressThread                                                                                          progressThread_pri                                                      = null;\r
        ProgressThread                                                                                          progressThread_sec                                                      = null;\r
-       public static int          search_results_towns=0;\r
-       public static int          search_results_streets=0;\r
-       public static int          search_results_streets_hn=0;\r
+       public static int                                                                                       search_results_towns                                                    = 0;\r
+       public static int                                                                                       search_results_streets                                          = 0;\r
+       public static int                                                                                       search_results_streets_hn                                       = 0;\r
        SearchResultsThread                                                                             searchresultsThread                                                     = null;\r
        SearchResultsThreadSpinnerThread                                                spinner_thread                                                                  = null;\r
        public static Boolean                                                                   NavitAddressSearchSpinnerActive                 = false;\r
@@ -1108,9 +1108,9 @@ public class Navit extends Activity implements Handler.Callback
 \r
                                                        // clear results\r
                                                        Navit.NavitAddressResultList_foundItems.clear();\r
-                                                       Navit.search_results_towns=0;\r
-                                                       Navit.search_results_streets=0;\r
-                                                       Navit.search_results_streets_hn=0;\r
+                                                       Navit.search_results_towns = 0;\r
+                                                       Navit.search_results_streets = 0;\r
+                                                       Navit.search_results_streets_hn = 0;\r
 \r
                                                        if (addr.equals(""))\r
                                                        {\r

diff --git a/navit/navit/android/src/org/navitproject/navit/NavitAddressResultListActivity.java b/navit/navit/android/src/org/navitproject/navit/NavitAddressResultListActivity.java
index d2f6bc4..da24b35 100644 (file)
--- a/navit/navit/android/src/org/navitproject/navit/NavitAddressResultListActivity.java
+++ b/navit/navit/android/src/org/navitproject/navit/NavitAddressResultListActivity.java
@@ -45,26 +45,26 @@ public class NavitAddressResultListActivity extends ListActivity
 \r
                Navit.Navit_Address_Result_Struct tmp = new Navit.Navit_Address_Result_Struct();\r
 \r
-               //Log.e("Navit", "###########11111111");\r
+               Log.e("Navit", "########### full result count: "\r
+                               + Navit.NavitAddressResultList_foundItems.size());\r
+\r
                // show "town names" as results only when we dont have any street names in resultlist\r
-               if ((Navit.search_results_streets > 0)||(Navit.search_results_streets_hn > 0))\r
+               if ((Navit.search_results_streets > 0) || (Navit.search_results_streets_hn > 0))\r
                {\r
-                       //Log.e("Navit", "###########22222222");\r
                        // clear out towns from result list\r
                        for (Iterator<Navit.Navit_Address_Result_Struct> k = Navit.NavitAddressResultList_foundItems\r
                                        .iterator(); k.hasNext();)\r
                        {\r
-                               //Log.e("Navit", "###########333333333");\r
                                tmp = k.next();\r
                                if (tmp.result_type.equals("TWN"))\r
                                {\r
-                                       //Log.e("Navit", "###########444444444");\r
                                        k.remove();\r
                                }\r
                        }\r
                }\r
 \r
-               Log.e("Navit", "########### "+Navit.NavitAddressResultList_foundItems.size());\r
+               Log.e("Navit", "########### final result count: "\r
+                               + Navit.NavitAddressResultList_foundItems.size());\r
 \r
                this.result_list = new String[Navit.NavitAddressResultList_foundItems.size()];\r
                int j = 0;\r

diff --git a/navit/navit/android/src/org/navitproject/navit/NavitGraphics.java b/navit/navit/android/src/org/navitproject/navit/NavitGraphics.java
index 0449ecd..4e53811 100644 (file)
--- a/navit/navit/android/src/org/navitproject/navit/NavitGraphics.java
+++ b/navit/navit/android/src/org/navitproject/navit/NavitGraphics.java
@@ -1240,7 +1240,8 @@ public class NavitGraphics
                tmp_addr.lat = Float.parseFloat(tmp_s[1]);
                tmp_addr.lon = Float.parseFloat(tmp_s[2]);
                // the rest ist address
-               tmp_addr.addr = s.substring(3 + tmp_s[0].length() + tmp_s[1].length() + tmp_s[2].length(), s.length());
+               tmp_addr.addr = s.substring(3 + tmp_s[0].length() + tmp_s[1].length() + tmp_s[2].length(), s
+                               .length());
                Navit.NavitAddressResultList_foundItems.add(tmp_addr);
 
                if (tmp_addr.result_type.equals("TWN"))
@@ -1263,7 +1264,8 @@ public class NavitGraphics
                b.putInt("cur", Navit.NavitAddressResultList_foundItems.size()
                                % (Navit.ADDRESS_RESULTS_DIALOG_MAX + 1));
                b.putString("title", "loading search results");
-               b.putString("text", "towns:"+Navit.search_results_towns+" streets:"+(int)(Navit.search_results_streets+Navit.search_results_streets_hn));
+               b.putString("text", "towns:" + Navit.search_results_towns + " streets:"
+                               + (int) (Navit.search_results_streets + Navit.search_results_streets_hn));
                Navit.msg_to_msg_handler(b, 10);
        }
        public void SearchResultList(int i, int partial_match, String text)