diff options
Diffstat (limited to 'same-android/src/main/java/com')
-rw-r--r-- | same-android/src/main/java/com/orbekk/same/android/GraphicsActivity.java | 6 | ||||
-rw-r--r-- | same-android/src/main/java/com/orbekk/same/android/benchmark/RepeatedSetVariableActivity.java | 2 |
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); |