tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lrese...@apache.org
Subject svn commit: r780957 - in /tuscany/sandbox/travelsample/scatours-android-ui: ./ gen/com/scatours/android/ gen/scatours/ gen/scatours/android/ res/layout/ src/com/scatours/android/ src/com/scatours/services/jsonrpc/ src/scatours/ src/scatours/android/ sr...
Date Tue, 02 Jun 2009 06:57:00 GMT
Author: lresende
Date: Tue Jun  2 06:56:59 2009
New Revision: 780957

URL: http://svn.apache.org/viewvc?rev=780957&view=rev
Log:
Refactoring to follow the same package naming used in other modules + renaming main activity
to become search activity and introducing search results view

Added:
    tuscany/sandbox/travelsample/scatours-android-ui/gen/scatours/
    tuscany/sandbox/travelsample/scatours-android-ui/gen/scatours/android/
    tuscany/sandbox/travelsample/scatours-android-ui/gen/scatours/android/R.java   (contents,
props changed)
      - copied, changed from r780956, tuscany/sandbox/travelsample/scatours-android-ui/gen/com/scatours/android/R.java
    tuscany/sandbox/travelsample/scatours-android-ui/res/layout/search.xml   (contents, props
changed)
      - copied, changed from r780956, tuscany/sandbox/travelsample/scatours-android-ui/res/layout/main.xml
    tuscany/sandbox/travelsample/scatours-android-ui/res/layout/search_results.xml   (with
props)
    tuscany/sandbox/travelsample/scatours-android-ui/src/scatours/android/
    tuscany/sandbox/travelsample/scatours-android-ui/src/scatours/android/TripSearch.java
  (contents, props changed)
      - copied, changed from r780956, tuscany/sandbox/travelsample/scatours-android-ui/src/com/scatours/android/TripSearch.java
    tuscany/sandbox/travelsample/scatours-android-ui/src/scatours/jsonrpc/
    tuscany/sandbox/travelsample/scatours-android-ui/src/scatours/jsonrpc/JSONRpc.java   (contents,
props changed)
      - copied, changed from r780956, tuscany/sandbox/travelsample/scatours-android-ui/src/com/scatours/services/jsonrpc/JSONRpc.java
Removed:
    tuscany/sandbox/travelsample/scatours-android-ui/gen/com/scatours/android/R.java
    tuscany/sandbox/travelsample/scatours-android-ui/res/layout/main.xml
    tuscany/sandbox/travelsample/scatours-android-ui/src/com/scatours/android/TripSearch.java
    tuscany/sandbox/travelsample/scatours-android-ui/src/com/scatours/services/jsonrpc/JSONRpc.java
Modified:
    tuscany/sandbox/travelsample/scatours-android-ui/AndroidManifest.xml
    tuscany/sandbox/travelsample/scatours-android-ui/default.properties
    tuscany/sandbox/travelsample/scatours-android-ui/src/scatours/SCAToursSearchProxy.java

Modified: tuscany/sandbox/travelsample/scatours-android-ui/AndroidManifest.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/scatours-android-ui/AndroidManifest.xml?rev=780957&r1=780956&r2=780957&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/scatours-android-ui/AndroidManifest.xml (original)
+++ tuscany/sandbox/travelsample/scatours-android-ui/AndroidManifest.xml Tue Jun  2 06:56:59
2009
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.scatours.android"
+      package="scatours.android"
       android:versionCode="1"
       android:versionName="1.0">
     <application android:icon="@drawable/icon" android:label="@string/app_name">

Modified: tuscany/sandbox/travelsample/scatours-android-ui/default.properties
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/scatours-android-ui/default.properties?rev=780957&r1=780956&r2=780957&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/scatours-android-ui/default.properties (original)
+++ tuscany/sandbox/travelsample/scatours-android-ui/default.properties Tue Jun  2 06:56:59
2009
@@ -7,5 +7,16 @@
 # "build.properties", and override values to adapt the script to your
 # project structure.
 
+# apk configurations. This property allows creation of APK files with limited
+# resources. For example, if your application contains many locales and
+# you wish to release multiple smaller apks instead of a large one, you can
+# define configuration to create apks with limited language sets.
+# Format is a comma separated list of configuration names. For each
+# configuration, a property will declare the resource configurations to
+# include. Example:
+#     apk-configurations=european,northamerica
+#     apk-config-european=en,fr,it,de,es
+#     apk-config-northamerica=en,es
+apk-configurations=
 # Project target.
 target=android-3

Copied: tuscany/sandbox/travelsample/scatours-android-ui/gen/scatours/android/R.java (from
r780956, tuscany/sandbox/travelsample/scatours-android-ui/gen/com/scatours/android/R.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/scatours-android-ui/gen/scatours/android/R.java?p2=tuscany/sandbox/travelsample/scatours-android-ui/gen/scatours/android/R.java&p1=tuscany/sandbox/travelsample/scatours-android-ui/gen/com/scatours/android/R.java&r1=780956&r2=780957&rev=780957&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/scatours-android-ui/gen/com/scatours/android/R.java (original)
+++ tuscany/sandbox/travelsample/scatours-android-ui/gen/scatours/android/R.java Tue Jun 
2 06:56:59 2009
@@ -5,7 +5,7 @@
  * should not be modified by hand.
  */
 
-package com.scatours.android;
+package scatours.android;
 
 public final class R {
     public static final class attr {
@@ -22,7 +22,8 @@
         public static final int edit_toLocation=0x7f050001;
     }
     public static final class layout {
-        public static final int main=0x7f030000;
+        public static final int search=0x7f030000;
+        public static final int search_results=0x7f030001;
     }
     public static final class string {
         public static final int alert_cancel=0x7f040003;

Propchange: tuscany/sandbox/travelsample/scatours-android-ui/gen/scatours/android/R.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/travelsample/scatours-android-ui/gen/scatours/android/R.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: tuscany/sandbox/travelsample/scatours-android-ui/res/layout/search.xml (from r780956,
tuscany/sandbox/travelsample/scatours-android-ui/res/layout/main.xml)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/scatours-android-ui/res/layout/search.xml?p2=tuscany/sandbox/travelsample/scatours-android-ui/res/layout/search.xml&p1=tuscany/sandbox/travelsample/scatours-android-ui/res/layout/main.xml&r1=780956&r2=780957&rev=780957&view=diff
==============================================================================
    (empty)

Propchange: tuscany/sandbox/travelsample/scatours-android-ui/res/layout/search.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/travelsample/scatours-android-ui/res/layout/search.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/sandbox/travelsample/scatours-android-ui/res/layout/search_results.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/scatours-android-ui/res/layout/search_results.xml?rev=780957&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/scatours-android-ui/res/layout/search_results.xml (added)
+++ tuscany/sandbox/travelsample/scatours-android-ui/res/layout/search_results.xml Tue Jun
 2 06:56:59 2009
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="wrap_content"
+  android:layout_height="wrap_content">
+</LinearLayout>

Propchange: tuscany/sandbox/travelsample/scatours-android-ui/res/layout/search_results.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/travelsample/scatours-android-ui/res/layout/search_results.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: tuscany/sandbox/travelsample/scatours-android-ui/src/scatours/SCAToursSearchProxy.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/scatours-android-ui/src/scatours/SCAToursSearchProxy.java?rev=780957&r1=780956&r2=780957&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/scatours-android-ui/src/scatours/SCAToursSearchProxy.java
(original)
+++ tuscany/sandbox/travelsample/scatours-android-ui/src/scatours/SCAToursSearchProxy.java
Tue Jun  2 06:56:59 2009
@@ -28,11 +28,7 @@
 
 import scatours.common.TripItem;
 import scatours.common.TripLeg;
-
-import android.util.Log;
-
-import com.scatours.android.R;
-import com.scatours.services.jsonrpc.JSONRpc;
+import scatours.jsonrpc.JSONRpc;
 
 public class SCAToursSearchProxy implements SCAToursSearch {
     // see http://developer.android.com/guide/developing/tools/emulator.html
@@ -81,22 +77,4 @@
         tripCatalog.toArray(catalogArray);
         return catalogArray;
     }
-    
-    public static void main(String[] args) {
-        SCAToursSearch searchProxy = new SCAToursSearchProxy();
-        TripLeg tripLeg = new TripLeg();
-        
-        tripLeg.setFromLocation("LGW");
-        tripLeg.setToLocation("FLR");
-        tripLeg.setFromDate("06/12/09");
-        tripLeg.setToDate("13/12/09");
-        tripLeg.setNoOfPeople("2");
-        
-        TripItem[] tripsAvailable = searchProxy.search(tripLeg);
-        
-        int foundTrips = tripsAvailable.length;
-        System.out.println(foundTrips);
-
-    }
-
 }

Copied: tuscany/sandbox/travelsample/scatours-android-ui/src/scatours/android/TripSearch.java
(from r780956, tuscany/sandbox/travelsample/scatours-android-ui/src/com/scatours/android/TripSearch.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/scatours-android-ui/src/scatours/android/TripSearch.java?p2=tuscany/sandbox/travelsample/scatours-android-ui/src/scatours/android/TripSearch.java&p1=tuscany/sandbox/travelsample/scatours-android-ui/src/com/scatours/android/TripSearch.java&r1=780956&r2=780957&rev=780957&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/scatours-android-ui/src/com/scatours/android/TripSearch.java
(original)
+++ tuscany/sandbox/travelsample/scatours-android-ui/src/scatours/android/TripSearch.java
Tue Jun  2 06:56:59 2009
@@ -1,12 +1,10 @@
-package com.scatours.android;
+package scatours.android;
 
 import scatours.SCAToursSearch;
 import scatours.SCAToursSearchProxy;
 import scatours.common.TripItem;
 import scatours.common.TripLeg;
 import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
@@ -41,7 +39,7 @@
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.main);
+        setContentView(R.layout.search);
         
         
         ArrayAdapter adapter = new ArrayAdapter(this,android.R.layout.simple_dropdown_item_1line,
AIRPORT_CODES);

Propchange: tuscany/sandbox/travelsample/scatours-android-ui/src/scatours/android/TripSearch.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/travelsample/scatours-android-ui/src/scatours/android/TripSearch.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: tuscany/sandbox/travelsample/scatours-android-ui/src/scatours/jsonrpc/JSONRpc.java
(from r780956, tuscany/sandbox/travelsample/scatours-android-ui/src/com/scatours/services/jsonrpc/JSONRpc.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/scatours-android-ui/src/scatours/jsonrpc/JSONRpc.java?p2=tuscany/sandbox/travelsample/scatours-android-ui/src/scatours/jsonrpc/JSONRpc.java&p1=tuscany/sandbox/travelsample/scatours-android-ui/src/com/scatours/services/jsonrpc/JSONRpc.java&r1=780956&r2=780957&rev=780957&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/scatours-android-ui/src/com/scatours/services/jsonrpc/JSONRpc.java
(original)
+++ tuscany/sandbox/travelsample/scatours-android-ui/src/scatours/jsonrpc/JSONRpc.java Tue
Jun  2 06:56:59 2009
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package com.scatours.services.jsonrpc;
+package scatours.jsonrpc;
 
 import java.io.IOException;
 

Propchange: tuscany/sandbox/travelsample/scatours-android-ui/src/scatours/jsonrpc/JSONRpc.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/travelsample/scatours-android-ui/src/scatours/jsonrpc/JSONRpc.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date



Mime
View raw message