summaryrefslogtreecommitdiff
path: root/same-android/src/main/java
diff options
context:
space:
mode:
authorKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-04-24 16:40:59 +0200
committerKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-04-24 16:40:59 +0200
commit9d2ecae975b90ef46fb93fa04fc692108bd2ed60 (patch)
tree23a77c16bb235f5c2af458a34fe5e2b89aaa95e2 /same-android/src/main/java
parentb9469eb43b5647605ad7b9662f584c2efbef5153 (diff)
Remove Broadcaster.
– Broadcaster is not needed anymore with asynchronous RPC.
Diffstat (limited to 'same-android/src/main/java')
-rw-r--r--same-android/src/main/java/com/orbekk/same/android/MainActivity.java3
-rw-r--r--same-android/src/main/java/com/orbekk/same/android/benchmark/ExampleHttpServerActivity.java34
2 files changed, 0 insertions, 37 deletions
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);
- }
- }
-}