Author: lresende
Date: Fri May 8 06:13:06 2009
New Revision: 772852
URL: http://svn.apache.org/viewvc?rev=772852&view=rev
Log:
TUSCANY-2959 - Store-android patch from Sanni Lookman
Modified:
tuscany/branches/sca-java-1.x/samples/store-android/AndroidManifest.xml
tuscany/branches/sca-java-1.x/samples/store-android/res/layout/main.xml
tuscany/branches/sca-java-1.x/samples/store-android/src/services/CatalogProxy.java
tuscany/branches/sca-java-1.x/samples/store-android/src/services/ShoppingCartProxy.java
tuscany/branches/sca-java-1.x/samples/store-android/src/store/android/R.java
tuscany/branches/sca-java-1.x/samples/store-android/src/store/android/catalog.java
Modified:
tuscany/branches/sca-java-1.x/samples/store-android/AndroidManifest.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/store-android/AndroidManifest.xml?rev=772852&r1=772851&r2=772852&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/store-android/AndroidManifest.xml
(original)
+++ tuscany/branches/sca-java-1.x/samples/store-android/AndroidManifest.xml Fri
May 8 06:13:06 2009
@@ -4,7 +4,7 @@
android:versionCode="1"
android:versionName="1.0.0">
<application android:icon="@drawable/icon"
android:label="@string/app_name">
- <activity android:name=".catalog"
+ <activity android:name=".store"
android:label="@string/app_name">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Modified:
tuscany/branches/sca-java-1.x/samples/store-android/res/layout/main.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/store-android/res/layout/main.xml?rev=772852&r1=772851&r2=772852&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/store-android/res/layout/main.xml
(original)
+++ tuscany/branches/sca-java-1.x/samples/store-android/res/layout/main.xml Fri
May 8 06:13:06 2009
@@ -1,12 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android";
- android:orientation="vertical"
+<TabHost xmlns:android="http://schemas.android.com/apk/res/android";
+ android:id="@android:id/tabhost"
android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- >
-<TextView
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:text="@string/hello"
- />
-</LinearLayout>
+ android:layout_height="fill_parent">
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent">
+ <TabWidget
+ android:id="@android:id/tabs"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content" />
+ <FrameLayout
+ android:id="@android:id/tabcontent"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent">
+
+
+ <ListView android:id="@+id/ListView01"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ />
+
+ <LinearLayout
+ android:id="@+id/tab02"
+ android:orientation="vertical"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent">
+
+ <ListView android:id="@+id/ListView02"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ />
+
+ <TextView
+ android:id="@+id/txtTotal"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ />
+
+ </LinearLayout>
+ </FrameLayout>
+ </LinearLayout>
+
+</TabHost>
+
Modified:
tuscany/branches/sca-java-1.x/samples/store-android/src/services/CatalogProxy.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/store-android/src/services/CatalogProxy.java?rev=772852&r1=772851&r2=772852&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/samples/store-android/src/services/CatalogProxy.java
(original)
+++
tuscany/branches/sca-java-1.x/samples/store-android/src/services/CatalogProxy.java
Fri May 8 06:13:06 2009
@@ -10,7 +10,7 @@
import services.json.rpc.JSONRpc;
public class CatalogProxy implements Catalog {
- private static final String jsonRPCServiceURI =
"http://192.168.1.104:8080/Catalog";;
+ private static final String jsonRPCServiceURI =
"http://192.168.1.102:8080/Catalog";;
private static final String jsonRPCRequest = "{\"id\": 3, \"method\":
\"Service.get\", \"params\": []}";
private List<Item> catalog = new ArrayList<Item>();
Modified:
tuscany/branches/sca-java-1.x/samples/store-android/src/services/ShoppingCartProxy.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/store-android/src/services/ShoppingCartProxy.java?rev=772852&r1=772851&r2=772852&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/samples/store-android/src/services/ShoppingCartProxy.java
(original)
+++
tuscany/branches/sca-java-1.x/samples/store-android/src/services/ShoppingCartProxy.java
Fri May 8 06:13:06 2009
@@ -3,10 +3,12 @@
import org.json.JSONException;
import org.json.JSONObject;
+import android.util.Log;
+
import services.json.rpc.JSONRpc;
public class ShoppingCartProxy {
- private static final String jsonRPCTotalServiceURI =
"http://192.168.1.104:8080/ShoppingCart/Total";;
+ private static final String jsonRPCTotalServiceURI =
"http://192.168.1.102:8080/ShoppingCart/Total";;
private static final String jsonRPCTotalRequest = "{\"id\": 4, \"method\":
\"Service.getTotal\", \"params\": []}";
public Item[] getItems() {
@@ -28,15 +30,18 @@
public String getTotal() {
String total = "";
JSONObject json = null;
+ Log.e("TUSC", "getting total");
try {
json = JSONRpc.invoke(jsonRPCTotalServiceURI,
jsonRPCTotalRequest);
+ Log.e("TUSC", "Request OK");
if(json != null) {
- total = json.getString("result");
+ total = json.getString("result");
+ Log.e("TUSC", "Total: "+total);
}
} catch (JSONException e) {
- e.printStackTrace();
+ Log.e("TUSC",e.getMessage());
}
return total;
Modified:
tuscany/branches/sca-java-1.x/samples/store-android/src/store/android/R.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/store-android/src/store/android/R.java?rev=772852&r1=772851&r2=772852&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/samples/store-android/src/store/android/R.java
(original)
+++
tuscany/branches/sca-java-1.x/samples/store-android/src/store/android/R.java
Fri May 8 06:13:06 2009
@@ -13,6 +13,12 @@
public static final class drawable {
public static final int icon=0x7f020000;
}
+ public static final class id {
+ public static final int ListView01=0x7f050000;
+ public static final int ListView02=0x7f050002;
+ public static final int tab02=0x7f050001;
+ public static final int txtTotal=0x7f050003;
+ }
public static final class layout {
public static final int main=0x7f030000;
}
Modified:
tuscany/branches/sca-java-1.x/samples/store-android/src/store/android/catalog.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/store-android/src/store/android/catalog.java?rev=772852&r1=772851&r2=772852&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/samples/store-android/src/store/android/catalog.java
(original)
+++
tuscany/branches/sca-java-1.x/samples/store-android/src/store/android/catalog.java
Fri May 8 06:13:06 2009
@@ -1,82 +0,0 @@
-package store.android;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import services.Catalog;
-import services.CatalogProxy;
-import services.Item;
-import services.ShoppingCartProxy;
-import android.app.ListActivity;
-import android.os.Bundle;
-import android.util.SparseBooleanArray;
-import android.view.View;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.ListView;
-
-public class catalog extends ListActivity {
- private Catalog catalogProxy = new CatalogProxy();
- private ShoppingCartProxy shoppingCartProxy = new ShoppingCartProxy();
-
- private String[] getCatalogItems() {
- List<String> catalog = new ArrayList<String>();
-
- for(Item item : catalogProxy.get()) {
- catalog.add(item.getName() + " - " + item.getPrice());
- }
-
- String[] catalogArray = new String[catalog.size()];
- catalog.toArray(catalogArray);
-
- return catalogArray;
- }
-
- /** Called when the activity is first created. */
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
-
- setListAdapter(new ArrayAdapter<String>(this,
- android.R.layout.simple_list_item_multiple_choice,
this.getCatalogItems()));
-
- Button addToCart = (Button) findViewById(1);
- /*
- addToCart.setOnClickListener(new View.OnClickListener() {
- public void onCLick(View v) {
- this.
- }
- });
- */
-
-
- final ListView listView = getListView();
-
- listView.setItemsCanFocus(false);
- listView.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);
- }
-
- @Override
- protected void onListItemClick(ListView l, View v, int position, long
id) {
- super.onListItemClick(l, v, position, id);
-
- String item = this.getCatalogItems()[position];
- System.out.println("Item clicked : " + item);
-
- System.out.println("Selected items:");
- SparseBooleanArray checkedItems = l.getCheckedItemPositions();
- for(int i = 0; i < checkedItems.size(); i++) {
- if(checkedItems.valueAt(i) == true) {
- System.out.println(">>>" +
this.getCatalogItems()[checkedItems.keyAt(i)]);
- }
- }
- System.out.println("Total: " + shoppingCartProxy.getTotal());
-
- //l.getCheckedItemPosition();
- //Intent webIntent = new Intent("android.intent.action.VIEW",
Uri.parse("http://192.168.1.104:8080/ShoppingCart/Cart";));
- //startActivity(webIntent);
- }
-
-
-}
\ No newline at end of file
