From: zoff99 <zoff99@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Date: Mon, 28 Feb 2011 20:18:03 +0000 (+0000)
Subject: Fix:Android:search small bugfix
X-Git-Tag: navit-0.5.0.5194svn~935
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fcebb0a8a8fb720123246b8525c6ffe8ece6639a;p=profile%2Fivi%2Fnavit.git

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
--- 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
 {
 	public static final class Navit_Address_Result_Struct
 	{
-		String result_type; // TWN,STR,SHN
+		String	result_type;	// TWN,STR,SHN
 		float		lat;
 		float		lon;
 		String	addr;
@@ -95,9 +95,9 @@ public class Navit extends Activity implements Handler.Callback
 	public static int											download_map_id								= 0;
 	ProgressThread												progressThread_pri							= null;
 	ProgressThread												progressThread_sec							= null;
-	public static int          search_results_towns=0;
-	public static int          search_results_streets=0;
-	public static int          search_results_streets_hn=0;
+	public static int											search_results_towns							= 0;
+	public static int											search_results_streets						= 0;
+	public static int											search_results_streets_hn					= 0;
 	SearchResultsThread										searchresultsThread							= null;
 	SearchResultsThreadSpinnerThread						spinner_thread									= null;
 	public static Boolean									NavitAddressSearchSpinnerActive			= false;
@@ -1108,9 +1108,9 @@ public class Navit extends Activity implements Handler.Callback
 
 							// clear results
 							Navit.NavitAddressResultList_foundItems.clear();
-							Navit.search_results_towns=0;
-							Navit.search_results_streets=0;
-							Navit.search_results_streets_hn=0;
+							Navit.search_results_towns = 0;
+							Navit.search_results_streets = 0;
+							Navit.search_results_streets_hn = 0;
 
 							if (addr.equals(""))
 							{
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
--- 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
 
 		Navit.Navit_Address_Result_Struct tmp = new Navit.Navit_Address_Result_Struct();
 
-		//Log.e("Navit", "###########11111111");
+		Log.e("Navit", "########### full result count: "
+				+ Navit.NavitAddressResultList_foundItems.size());
+
 		// show "town names" as results only when we dont have any street names in resultlist
-		if ((Navit.search_results_streets > 0)||(Navit.search_results_streets_hn > 0))
+		if ((Navit.search_results_streets > 0) || (Navit.search_results_streets_hn > 0))
 		{
-			//Log.e("Navit", "###########22222222");
 			// clear out towns from result list
 			for (Iterator<Navit.Navit_Address_Result_Struct> k = Navit.NavitAddressResultList_foundItems
 					.iterator(); k.hasNext();)
 			{
-				//Log.e("Navit", "###########333333333");
 				tmp = k.next();
 				if (tmp.result_type.equals("TWN"))
 				{
-					//Log.e("Navit", "###########444444444");
 					k.remove();
 				}
 			}
 		}
 
-		Log.e("Navit", "########### "+Navit.NavitAddressResultList_foundItems.size());
+		Log.e("Navit", "########### final result count: "
+				+ Navit.NavitAddressResultList_foundItems.size());
 
 		this.result_list = new String[Navit.NavitAddressResultList_foundItems.size()];
 		int j = 0;
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
--- 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)