From 5aaf308a0c0d67836d3225fb7f4ed0ab0d842209 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= Date: Sat, 25 Feb 2012 23:04:04 +0100 Subject: =?UTF-8?q?Rename=20SameInterfaceBridge=20=E2=86=92=20ClientInterf?= =?UTF-8?q?aceBridge.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/orbekk/same/VariableTestActivity.java | 6 +- .../orbekk/same/android/ClientInterfaceBridge.java | 99 ++++++++++++++++++++++ .../orbekk/same/android/SameInterfaceBridge.java | 99 ---------------------- 3 files changed, 102 insertions(+), 102 deletions(-) create mode 100644 same-android/src/main/java/com/orbekk/same/android/ClientInterfaceBridge.java delete mode 100644 same-android/src/main/java/com/orbekk/same/android/SameInterfaceBridge.java diff --git a/same-android/src/main/java/com/orbekk/same/VariableTestActivity.java b/same-android/src/main/java/com/orbekk/same/VariableTestActivity.java index 1420f2e..f98e204 100644 --- a/same-android/src/main/java/com/orbekk/same/VariableTestActivity.java +++ b/same-android/src/main/java/com/orbekk/same/VariableTestActivity.java @@ -6,11 +6,11 @@ import org.slf4j.LoggerFactory; import android.app.Activity; import android.os.Bundle; -import com.orbekk.same.android.SameInterfaceBridge; +import com.orbekk.same.android.ClientInterfaceBridge; public class VariableTestActivity extends Activity { private Logger logger = LoggerFactory.getLogger(getClass()); - private SameInterfaceBridge client; + private ClientInterfaceBridge client; @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -18,7 +18,7 @@ public class VariableTestActivity extends Activity { @Override public void onResume() { super.onResume(); - client = new SameInterfaceBridge(this); + client = new ClientInterfaceBridge(this); client.connect(); } 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 new file mode 100644 index 0000000..22396f3 --- /dev/null +++ b/same-android/src/main/java/com/orbekk/same/android/ClientInterfaceBridge.java @@ -0,0 +1,99 @@ +package com.orbekk.same.android; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import android.content.ComponentName; +import android.content.Context; +import android.content.Intent; +import android.content.ServiceConnection; +import android.os.Handler; +import android.os.IBinder; +import android.os.Message; +import android.os.Messenger; +import android.os.RemoteException; +import android.widget.Toast; + +import com.orbekk.same.ClientInterface; +import com.orbekk.same.SameService; +import com.orbekk.same.State; +import com.orbekk.same.StateChangedListener; +import com.orbekk.same.UpdateConflict; + +public class ClientInterfaceBridge implements ClientInterface { + class ResponseHandler extends Handler { + @Override public void handleMessage(Message message) { + switch (message.what) { + case SameService.UPDATED_STATE_MESSAGE: + State.Component component = (State.Component)message.obj; + Toast.makeText(context, "Updated: " + component, + Toast.LENGTH_SHORT).show(); + default: + logger.warn("Received unknown message from service: {}", + message); + } + } + } + + private Logger logger = LoggerFactory.getLogger(getClass()); + private Messenger serviceMessenger = null; + private Messenger responseMessenger = new Messenger(new ResponseHandler()); + private Context context; + + private ServiceConnection serviceConnection = new ServiceConnection() { + @Override + public void onServiceConnected(ComponentName name, IBinder service) { + serviceMessenger = new Messenger(service); + Message message = Message.obtain(null, + SameService.ADD_STATE_RECEIVER); + message.replyTo = responseMessenger; + try { + serviceMessenger.send(message); + } catch (RemoteException e) { + e.printStackTrace(); + } + } + + @Override + public void onServiceDisconnected(ComponentName name) { + serviceMessenger = null; + } + }; + + public ClientInterfaceBridge(Context context) { + this.context = context; + } + + public void connect() { + Intent intent = new Intent(context, SameService.class); + context.bindService(intent, serviceConnection, Context.BIND_AUTO_CREATE); + } + + public void disconnect() { + if (serviceMessenger != null) { + context.unbindService(serviceConnection); + } + } + + @Override + public State getState() { + return null; + } + + @Override + public void set(String name, String data, long revision) throws UpdateConflict { + logger.info("set({}, {}, {}", + new Object[]{name, data, revision}); + } + + @Override + public void addStateListener(StateChangedListener listener) { + logger.info("addStateListener()"); + } + + @Override + public void removeStateListener(StateChangedListener listener) { + logger.info("removeStateListener()"); + } + +} diff --git a/same-android/src/main/java/com/orbekk/same/android/SameInterfaceBridge.java b/same-android/src/main/java/com/orbekk/same/android/SameInterfaceBridge.java deleted file mode 100644 index 4d44a03..0000000 --- a/same-android/src/main/java/com/orbekk/same/android/SameInterfaceBridge.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.orbekk.same.android; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import android.content.ComponentName; -import android.content.Context; -import android.content.Intent; -import android.content.ServiceConnection; -import android.os.Handler; -import android.os.IBinder; -import android.os.Message; -import android.os.Messenger; -import android.os.RemoteException; -import android.widget.Toast; - -import com.orbekk.same.ClientInterface; -import com.orbekk.same.SameService; -import com.orbekk.same.State; -import com.orbekk.same.StateChangedListener; -import com.orbekk.same.UpdateConflict; - -public class SameInterfaceBridge implements ClientInterface { - class ResponseHandler extends Handler { - @Override public void handleMessage(Message message) { - switch (message.what) { - case SameService.UPDATED_STATE_MESSAGE: - State.Component component = (State.Component)message.obj; - Toast.makeText(context, "Updated: " + component, - Toast.LENGTH_SHORT).show(); - default: - logger.warn("Received unknown message from service: {}", - message); - } - } - } - - private Logger logger = LoggerFactory.getLogger(getClass()); - private Messenger serviceMessenger = null; - private Messenger responseMessenger = new Messenger(new ResponseHandler()); - private Context context; - - private ServiceConnection serviceConnection = new ServiceConnection() { - @Override - public void onServiceConnected(ComponentName name, IBinder service) { - serviceMessenger = new Messenger(service); - Message message = Message.obtain(null, - SameService.ADD_STATE_RECEIVER); - message.replyTo = responseMessenger; - try { - serviceMessenger.send(message); - } catch (RemoteException e) { - e.printStackTrace(); - } - } - - @Override - public void onServiceDisconnected(ComponentName name) { - serviceMessenger = null; - } - }; - - public SameInterfaceBridge(Context context) { - this.context = context; - } - - public void connect() { - Intent intent = new Intent(context, SameService.class); - context.bindService(intent, serviceConnection, Context.BIND_AUTO_CREATE); - } - - public void disconnect() { - if (serviceMessenger != null) { - context.unbindService(serviceConnection); - } - } - - @Override - public State getState() { - return null; - } - - @Override - public void set(String name, String data, long revision) throws UpdateConflict { - logger.info("set({}, {}, {}", - new Object[]{name, data, revision}); - } - - @Override - public void addStateListener(StateChangedListener listener) { - logger.info("addStateListener()"); - } - - @Override - public void removeStateListener(StateChangedListener listener) { - logger.info("removeStateListener()"); - } - -} -- cgit v1.2.3