From 9d2ecae975b90ef46fb93fa04fc692108bd2ed60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= <kjetil.orbekk@gmail.com>
Date: Tue, 24 Apr 2012 16:40:59 +0200
Subject: Remove Broadcaster.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

– Broadcaster is not needed anymore with asynchronous RPC.
---
 .../java/com/orbekk/same/android/MainActivity.java |  3 --
 .../benchmark/ExampleHttpServerActivity.java       | 34 ----------------------
 2 files changed, 37 deletions(-)
 delete mode 100644 same-android/src/main/java/com/orbekk/same/android/benchmark/ExampleHttpServerActivity.java

(limited to 'same-android')

diff --git a/same-android/src/main/java/com/orbekk/same/android/MainActivity.java b/same-android/src/main/java/com/orbekk/same/android/MainActivity.java
index 17b0ff0..baff8a0 100644
--- a/same-android/src/main/java/com/orbekk/same/android/MainActivity.java
+++ b/same-android/src/main/java/com/orbekk/same/android/MainActivity.java
@@ -16,7 +16,6 @@ import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
 
-import com.orbekk.same.android.benchmark.ExampleHttpServerActivity;
 import com.orbekk.same.android.benchmark.ExampleProtobufServerActivity;
 import com.orbekk.same.android.benchmark.RepeatedSetVariableActivity;
 
@@ -33,8 +32,6 @@ public class MainActivity extends Activity {
         activities.put("Benchmark", RepeatedSetVariableActivity.class);
         activities.put("ExampleProtobufServer (temp)", 
                 ExampleProtobufServerActivity.class);
-        activities.put("ExampleHttpServer (temp)", 
-                ExampleHttpServerActivity.class);
     }
     
     public final static List<String> activityList =
diff --git a/same-android/src/main/java/com/orbekk/same/android/benchmark/ExampleHttpServerActivity.java b/same-android/src/main/java/com/orbekk/same/android/benchmark/ExampleHttpServerActivity.java
deleted file mode 100644
index 700030c..0000000
--- a/same-android/src/main/java/com/orbekk/same/android/benchmark/ExampleHttpServerActivity.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.orbekk.same.android.benchmark;
-
-import android.app.Activity;
-
-import com.orbekk.same.benchmark.ExampleServer;
-import com.orbekk.same.benchmark.HttpClientBenchmark;
-import com.orbekk.same.benchmark.HttpExampleServer;
-
-public class ExampleHttpServerActivity extends Activity {
-    public final HttpExampleServer server = new HttpExampleServer();
-    
-    @Override public void onResume() {
-        super.onResume();
-        try {
-            server.runServer(12000);
-            HttpClientBenchmark.benchmark(
-                    "http://localhost:12000/HttpExampleService.json",
-                    100, 2000);
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw new RuntimeException(e);
-        }
-    }
-    
-    @Override public void onStop() {
-        super.onStop();
-        try {
-            server.stopServer();
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw new RuntimeException(e);
-        }
-    }
-}
-- 
cgit v1.2.3