--- a/src/com/beem/project/beem/service/XmppFacade.java	Fri May 22 19:17:50 2009 +0200
+++ b/src/com/beem/project/beem/service/XmppFacade.java	Tue May 26 19:56:38 2009 +0200
@@ -17,17 +17,21 @@
 
 /**
  * This class is a facade for the Beem Service.
+ * 
  * @author darisk
  */
 public class XmppFacade extends IXmppFacade.Stub {
 
     private XmppConnectionAdapter mConnexion;
-    private BeemService mBeemService;
+    private BeemService           mBeemService;
 
     /**
      * Constructor for XMPPFacade.
-     * @param connection the connection use by the facade
-     * @param service the service which holds the facade
+     * 
+     * @param connection
+     *            the connection use by the facade
+     * @param service
+     *            the service which holds the facade
      */
     public XmppFacade(final XmppConnectionAdapter connection, final BeemService service) {
 	this.mConnexion = connection;
@@ -38,6 +42,32 @@
      * {@inheritDoc}
      */
     @Override
+    public void changeStatus(int status, String msg) {
+	Presence pres = new Presence(Presence.Type.available);
+	if (msg != null)
+	    pres.setStatus(msg);
+	Presence.Mode mode = com.beem.project.beem.utils.Status.getPresenceModeFromStatus(status);
+	if (mode != null)
+	    pres.setMode(mode);
+	mConnexion.getAdaptee().sendPacket(pres);
+
+	Notification mStatusNotification;
+	String text = (msg == null ? "" : msg);
+	mStatusNotification = new Notification(com.beem.project.beem.R.drawable.notify_signal, text, System
+	        .currentTimeMillis());
+	mStatusNotification.defaults = Notification.DEFAULT_ALL;
+	mStatusNotification.flags = Notification.FLAG_NO_CLEAR;
+
+	// mStatusNotification.contentView = ;
+	mStatusNotification.setLatestEventInfo(mBeemService, "Beem Status", text, PendingIntent.getActivity(
+	        mBeemService, 0, new Intent(mBeemService, ChangeStatus.class), 0));
+	mBeemService.sendNotification(BeemService.NOTIFICATION_STATUS_ID, mStatusNotification);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
     public void connectAsync() throws RemoteException {
 	mConnexion.connectAsync();
     }
@@ -70,14 +100,6 @@
      * {@inheritDoc}
      */
     @Override
-    public IRoster getRoster() throws RemoteException {
-	return mConnexion.getRoster();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
     public IChatManager getChatManager() throws RemoteException {
 	return mConnexion.getChatManager();
     }
@@ -86,25 +108,8 @@
      * {@inheritDoc}
      */
     @Override
-    public void changeStatus(int status, String msg) {
-	Presence pres = new Presence(Presence.Type.available);
-	if (msg != null)
-	    pres.setStatus(msg);
-	Presence.Mode mode = com.beem.project.beem.utils.Status.getPresenceModeFromStatus(status);
-	if (mode != null)
-	    pres.setMode(mode);
-	mConnexion.getAdaptee().sendPacket(pres);
-	
-	Notification mStatusNotification;
-	String text = (msg == null ? "" : msg);
-	mStatusNotification = new Notification(com.beem.project.beem.R.drawable.notify_signal, text, System.currentTimeMillis());
-	mStatusNotification.defaults = Notification.DEFAULT_ALL;
-	mStatusNotification.flags = Notification.FLAG_NO_CLEAR;
-
-	// mStatusNotification.contentView = ;
-	mStatusNotification.setLatestEventInfo(mBeemService, "Beem Status", text, PendingIntent.getActivity(
-	    mBeemService, 0, new Intent(mBeemService,ChangeStatus.class), 0));
-	mBeemService.sendNotification(BeemService.NOTIFICATION_STATUS_ID, mStatusNotification);
+    public IRoster getRoster() throws RemoteException {
+	return mConnexion.getRoster();
     }
 
     @Override