summaryrefslogtreecommitdiff
path: root/same-android/src/main/java/com/orbekk
diff options
context:
space:
mode:
authorKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-03-27 11:12:08 +0200
committerKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-03-27 11:12:08 +0200
commitccc1c8c56acb4347403cdd43a394e492964c83cc (patch)
treedaf3260855df77ccf9380f7d26dd095e2935a262 /same-android/src/main/java/com/orbekk
parent841db9546efdf08a3b6a91a92936ad90b277f39c (diff)
Bugfixes on same-android.
Diffstat (limited to 'same-android/src/main/java/com/orbekk')
-rw-r--r--same-android/src/main/java/com/orbekk/same/android/GraphicsActivity.java6
-rw-r--r--same-android/src/main/java/com/orbekk/same/android/benchmark/RepeatedSetVariableActivity.java2
2 files changed, 5 insertions, 3 deletions
diff --git a/same-android/src/main/java/com/orbekk/same/android/GraphicsActivity.java b/same-android/src/main/java/com/orbekk/same/android/GraphicsActivity.java
index c26b062..8a81c34 100644
--- a/same-android/src/main/java/com/orbekk/same/android/GraphicsActivity.java
+++ b/same-android/src/main/java/com/orbekk/same/android/GraphicsActivity.java
@@ -1,10 +1,12 @@
package com.orbekk.same.android;
+import org.codehaus.jackson.type.TypeReference;
+
import android.app.Activity;
import android.os.Bundle;
-import com.orbekk.same.Types;
import com.orbekk.same.Variable;
+import com.orbekk.same.android.GameView.Player;
public class GraphicsActivity extends Activity {
private GameView gameView;
@@ -20,7 +22,7 @@ public class GraphicsActivity extends Activity {
client = new ClientInterfaceBridge(this);
client.connect();
Variable<GameView.Player> player = client.createVariableFactory()
- .create("Player", Types.fromType(GameView.Player.class));
+ .create("Player", new TypeReference<Player>() {});
gameView = new GameView(this, player);
gameView.setUp();
setContentView(gameView);
diff --git a/same-android/src/main/java/com/orbekk/same/android/benchmark/RepeatedSetVariableActivity.java b/same-android/src/main/java/com/orbekk/same/android/benchmark/RepeatedSetVariableActivity.java
index 7940939..378653c 100644
--- a/same-android/src/main/java/com/orbekk/same/android/benchmark/RepeatedSetVariableActivity.java
+++ b/same-android/src/main/java/com/orbekk/same/android/benchmark/RepeatedSetVariableActivity.java
@@ -71,7 +71,7 @@ public class RepeatedSetVariableActivity extends Activity {
public void initializeVariable() {
variable = client.createVariableFactory()
- .create("BenchmarkVariable", Types.fromType(Integer.class));
+ .create("BenchmarkVariable", Types.INTEGER);
variable.addOnChangeListener(changeListener);
timer.start();
variable.set(0);