11 files changed, 31 insertions, 23 deletions
diff --git a/same-android/AndroidManifest.xml b/same-android/AndroidManifest.xml
index 40ceaf7..59af81a 100644
--- a/same-android/AndroidManifest.xml
+++ b/same-android/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.orbekk.same"
+    package="com.orbekk.same.android"
     android:versionCode="1"
     android:versionName="1.0-SNAPSHOT" >
 
@@ -23,8 +23,7 @@
         <activity android:name=".StateViewerActivity"/>
         <activity android:name=".GraphicsActivity"/>
         <activity android:name="com.orbekk.same.android.benchmark.RepeatedSetVariableActivity"/>
-        
-        <service android:name=".SameService" android:process="com.orbekk.same.SameService"/>
+        <service  android:name=".SameService" android:process="com.orbekk.same.android.SameService"/>
     </application>
 
-</manifest>
-\ No newline at end of file
+</manifest>
diff --git a/same-android/src/main/java/com/orbekk/same/android/ClientInterfaceBridge.java b/same-android/src/main/java/com/orbekk/same/android/ClientInterfaceBridge.java
index 72dfdb7..081b7ed 100644
--- a/same-android/src/main/java/com/orbekk/same/android/ClientInterfaceBridge.java
+++ b/same-android/src/main/java/com/orbekk/same/android/ClientInterfaceBridge.java
@@ -18,7 +18,6 @@ import android.os.Messenger;
 import android.os.RemoteException;
 
 import com.orbekk.same.ClientInterface;
-import com.orbekk.same.SameService;
 import com.orbekk.same.State;
 import com.orbekk.same.State.Component;
 import com.orbekk.same.StateChangedListener;
diff --git a/same-android/src/main/java/com/orbekk/same/GameController.java b/same-android/src/main/java/com/orbekk/same/android/GameController.java
index b8ea7ad..2678208 100644
--- a/same-android/src/main/java/com/orbekk/same/GameController.java
+++ b/same-android/src/main/java/com/orbekk/same/android/GameController.java
@@ -1,4 +1,4 @@
-package com.orbekk.same;
+package com.orbekk.same.android;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/same-android/src/main/java/com/orbekk/same/GameView.java b/same-android/src/main/java/com/orbekk/same/android/GameView.java
index d21d05d..c3485bb 100644
--- a/same-android/src/main/java/com/orbekk/same/GameView.java
+++ b/same-android/src/main/java/com/orbekk/same/android/GameView.java
@@ -1,10 +1,14 @@
-package com.orbekk.same;
+package com.orbekk.same.android;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.orbekk.same.Variable;
+import com.orbekk.same.VariableUpdaterTask;
+import com.orbekk.same.Variable.OnChangeListener;
+
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Paint;
diff --git a/same-android/src/main/java/com/orbekk/same/GraphicsActivity.java b/same-android/src/main/java/com/orbekk/same/android/GraphicsActivity.java
index 25a9739..dab26a7 100644
--- a/same-android/src/main/java/com/orbekk/same/GraphicsActivity.java
+++ b/same-android/src/main/java/com/orbekk/same/android/GraphicsActivity.java
@@ -1,8 +1,8 @@
-package com.orbekk.same;
+package com.orbekk.same.android;
 
 import org.codehaus.jackson.type.TypeReference;
 
-import com.orbekk.same.android.ClientInterfaceBridge;
+import com.orbekk.same.Variable;
 
 import android.app.Activity;
 import android.os.Bundle;
diff --git a/same-android/src/main/java/com/orbekk/same/MainActivity.java b/same-android/src/main/java/com/orbekk/same/android/MainActivity.java
index e9f7498..87ec967 100644
--- a/same-android/src/main/java/com/orbekk/same/MainActivity.java
+++ b/same-android/src/main/java/com/orbekk/same/android/MainActivity.java
@@ -1,4 +1,4 @@
-package com.orbekk.same;
+package com.orbekk.same.android;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -11,15 +11,12 @@ import org.slf4j.LoggerFactory;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.view.View;
-import android.widget.Adapter;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
 
+import com.orbekk.same.android.R;
 import com.orbekk.same.android.benchmark.RepeatedSetVariableActivity;
 
 public class MainActivity extends Activity {
diff --git a/same-android/src/main/java/com/orbekk/same/SameControllerActivity.java b/same-android/src/main/java/com/orbekk/same/android/SameControllerActivity.java
index 2fb0d25..7700e2f 100644
--- a/same-android/src/main/java/com/orbekk/same/SameControllerActivity.java
+++ b/same-android/src/main/java/com/orbekk/same/android/SameControllerActivity.java
@@ -1,4 +1,4 @@
-package com.orbekk.same;
+package com.orbekk.same.android;
 
 import java.util.List;
 import java.util.ArrayList;
@@ -6,7 +6,7 @@ import java.util.ArrayList;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.orbekk.same.R;
+import com.orbekk.same.android.R;
 import com.orbekk.same.android.net.Broadcaster;
 
 import android.app.Activity;
diff --git a/same-android/src/main/java/com/orbekk/same/SameService.java b/same-android/src/main/java/com/orbekk/same/android/SameService.java
index f99eb68..f5116ba 100644
--- a/same-android/src/main/java/com/orbekk/same/SameService.java
+++ b/same-android/src/main/java/com/orbekk/same/android/SameService.java
@@ -1,4 +1,4 @@
-package com.orbekk.same;
+package com.orbekk.same.android;
 
 import java.util.ArrayList;
 import java.util.Properties;
@@ -16,8 +16,11 @@ import android.os.Messenger;
 import android.os.RemoteException;
 import android.widget.Toast;
 
+import com.orbekk.same.NetworkNotificationListener;
+import com.orbekk.same.SameController;
+import com.orbekk.same.State;
+import com.orbekk.same.StateChangedListener;
 import com.orbekk.same.State.Component;
-import com.orbekk.same.android.ComponentBundle;
 import com.orbekk.same.android.net.AndroidBroadcasterFactory;
 import com.orbekk.same.android.net.Broadcaster;
 import com.orbekk.same.config.Configuration;
diff --git a/same-android/src/main/java/com/orbekk/same/StateViewerActivity.java b/same-android/src/main/java/com/orbekk/same/android/StateViewerActivity.java
index a6aa3ee..679e3b6 100644
--- a/same-android/src/main/java/com/orbekk/same/StateViewerActivity.java
+++ b/same-android/src/main/java/com/orbekk/same/android/StateViewerActivity.java
@@ -1,4 +1,4 @@
-package com.orbekk.same;
+package com.orbekk.same.android;
 
 import java.util.ArrayList;
 
@@ -11,8 +11,10 @@ import android.widget.ArrayAdapter;
 import android.widget.ListView;
 import android.widget.Toast;
 
+import com.orbekk.same.android.R;
+import com.orbekk.same.State;
+import com.orbekk.same.StateChangedListener;
 import com.orbekk.same.State.Component;
-import com.orbekk.same.android.ClientInterfaceBridge;
 
 public class StateViewerActivity extends Activity {
     private Logger logger = LoggerFactory.getLogger(getClass());
diff --git a/same-android/src/main/java/com/orbekk/same/VariableTestActivity.java b/same-android/src/main/java/com/orbekk/same/android/VariableTestActivity.java
index 46adb88..7560a41 100644
--- a/same-android/src/main/java/com/orbekk/same/VariableTestActivity.java
+++ b/same-android/src/main/java/com/orbekk/same/android/VariableTestActivity.java
@@ -1,4 +1,4 @@
-package com.orbekk.same;
+package com.orbekk.same.android;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -11,7 +11,11 @@ import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.orbekk.same.android.ClientInterfaceBridge;
+import com.orbekk.same.android.R;
+import com.orbekk.same.Variable;
+import com.orbekk.same.android.R.id;
+import com.orbekk.same.android.R.layout;
+import com.orbekk.same.Variable.OnChangeListener;
 import com.orbekk.util.DelayedOperation;
 
 public class VariableTestActivity extends Activity {
diff --git a/same/src/main/java/com/orbekk/same/Client.java b/same/src/main/java/com/orbekk/same/Client.java
index c6c3c1d..4237fee 100644
--- a/same/src/main/java/com/orbekk/same/Client.java
+++ b/same/src/main/java/com/orbekk/same/Client.java
@@ -141,7 +141,7 @@ public class Client implements DiscoveryListener {
         }          
     }
 
-    ClientInterface getInterface() {
+    public ClientInterface getInterface() {
         return clientInterface;
     }