Fix search button text in ui

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@779217 13f79535-47bb-0310-9956-ffa450edef68

9 files changed, 4 insertions, 17 deletions

diff --git a/sandbox/travelsample/scatours-android-ui/bin/classes.dex b/sandbox/travelsample/scatours-android-ui/bin/classes.dex
index bd99887b37..a4c9d29bfb 100644
--- a/sandbox/travelsample/scatours-android-ui/bin/classes.dex
+++ b/sandbox/travelsample/scatours-android-ui/bin/classes.dex
diff --git a/sandbox/travelsample/scatours-android-ui/bin/com/scatours/android/R$string.class b/sandbox/travelsample/scatours-android-ui/bin/com/scatours/android/R$string.class
index f8e6c81660..1cf6366b96 100644
--- a/sandbox/travelsample/scatours-android-ui/bin/com/scatours/android/R$string.class
+++ b/sandbox/travelsample/scatours-android-ui/bin/com/scatours/android/R$string.class
diff --git a/sandbox/travelsample/scatours-android-ui/bin/com/scatours/android/TripSearch.class b/sandbox/travelsample/scatours-android-ui/bin/com/scatours/android/TripSearch.class
index 952ede323a..098859c0d8 100644
--- a/sandbox/travelsample/scatours-android-ui/bin/com/scatours/android/TripSearch.class
+++ b/sandbox/travelsample/scatours-android-ui/bin/com/scatours/android/TripSearch.class
diff --git a/sandbox/travelsample/scatours-android-ui/bin/resources.ap_ b/sandbox/travelsample/scatours-android-ui/bin/resources.ap_
index 1a4ca621ec..909daf32b7 100644
--- a/sandbox/travelsample/scatours-android-ui/bin/resources.ap_
+++ b/sandbox/travelsample/scatours-android-ui/bin/resources.ap_
diff --git a/sandbox/travelsample/scatours-android-ui/bin/scatours-android-ui.apk b/sandbox/travelsample/scatours-android-ui/bin/scatours-android-ui.apk
index 0a3cb72ee9..8bc5e8ddbe 100644
--- a/sandbox/travelsample/scatours-android-ui/bin/scatours-android-ui.apk
+++ b/sandbox/travelsample/scatours-android-ui/bin/scatours-android-ui.apk
diff --git a/sandbox/travelsample/scatours-android-ui/gen/com/scatours/android/R.java b/sandbox/travelsample/scatours-android-ui/gen/com/scatours/android/R.java
index d2976a42db..1e56491c1a 100644
--- a/sandbox/travelsample/scatours-android-ui/gen/com/scatours/android/R.java
+++ b/sandbox/travelsample/scatours-android-ui/gen/com/scatours/android/R.java
@@ -28,5 +28,6 @@ public final class R {
     }
     public static final class string {
         public static final int app_name=0x7f040000;
+        public static final int title_search=0x7f040001;
     }
 }
diff --git a/sandbox/travelsample/scatours-android-ui/res/layout/main.xml b/sandbox/travelsample/scatours-android-ui/res/layout/main.xml
index 180326ab2d..cb7ae6acb6 100644
--- a/sandbox/travelsample/scatours-android-ui/res/layout/main.xml
+++ b/sandbox/travelsample/scatours-android-ui/res/layout/main.xml
@@ -57,7 +57,8 @@
         
       <Button android:id="@+id/btnSearch" 
         android:layout_width="100px" 
-        android:layout_height="40px"/>  
+        android:layout_height="40px"
+        android:text="@string/title_search"/>  
         
 </LinearLayout>
 
diff --git a/sandbox/travelsample/scatours-android-ui/res/values/strings.xml b/sandbox/travelsample/scatours-android-ui/res/values/strings.xml
index d0fa135e50..0f0ebc5cac 100644
--- a/sandbox/travelsample/scatours-android-ui/res/values/strings.xml
+++ b/sandbox/travelsample/scatours-android-ui/res/values/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">SCA Tours - Search Trip</string>
+    <string name="title_search">Search</string>
 </resources>
diff --git a/sandbox/travelsample/scatours-android-ui/src/com/scatours/android/TripSearch.java b/sandbox/travelsample/scatours-android-ui/src/com/scatours/android/TripSearch.java
index 38492aa36d..5e7dcd33e7 100644
--- a/sandbox/travelsample/scatours-android-ui/src/com/scatours/android/TripSearch.java
+++ b/sandbox/travelsample/scatours-android-ui/src/com/scatours/android/TripSearch.java
@@ -1,7 +1,5 @@
 package com.scatours.android;
 
-import java.util.Calendar;
-
 import android.app.Activity;
 import android.os.Bundle;
 import android.widget.ArrayAdapter;
@@ -24,20 +22,6 @@ public class TripSearch extends Activity {
         AutoCompleteTextView textViewTo = (AutoCompleteTextView) findViewById(R.id.edit_toLocation);
         //ArrayAdapter adapterTo = new ArrayAdapter(this,android.R.layout.simple_dropdown_item_1line, AIRPORT_CODES);
         textViewTo.setAdapter(adapter);
-        
-        //String currentDate = getCurrentDate();
-        //AutoCompleteTextView textStartDate = (AutoCompleteTextView) findViewById(R.id.date_start);
-        //textStartDate.setText(currentDate.toCharArray(), 0, currentDate.length());
-        
-    }
-    
-    private String getCurrentDate() {
-        final Calendar c = Calendar.getInstance();
-        int mYear = c.get(Calendar.YEAR);
-        int mMonth = c.get(Calendar.MONTH);
-        int mDay = c.get(Calendar.DAY_OF_MONTH);
-        
-        return Integer.toString(mMonth) + "/" + Integer.toString(mDay) + "/" + Integer.toString(mYear); 
     }
 
     static final String[] AIRPORT_CODES = new String[] {