--- a/src/com/beem/project/beem/ui/Chat.java	Fri Dec 18 21:53:02 2009 +0100
+++ b/src/com/beem/project/beem/ui/Chat.java	Sun Dec 20 00:06:09 2009 +0100
@@ -270,7 +270,7 @@
 		Intent contactListIntent = new Intent(this, ContactList.class);
 		contactListIntent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT | Intent.FLAG_ACTIVITY_SINGLE_TOP);
 		startActivity(contactListIntent);
-		return true;
+		break;
 	    case R.id.chat_menu_change_chat:
 		try {
 		    final List<Contact> openedChats = mChatManager.getOpenedChatList();
@@ -281,7 +281,7 @@
 		} catch (RemoteException e) {
 		    Log.e(TAG, e.getMessage());
 		}
-		return true;
+		break;
 	    case R.id.chat_menu_close_chat:
 		try {
 		    mChatManager.destroyChat(mChat);
@@ -289,10 +289,11 @@
 		    Log.e(TAG, e.getMessage());
 		}
 		this.finish();
-		return true;
+		break;
 	    default:
 		return false;
 	}
+	return true;
     }
 
     /**
@@ -393,31 +394,31 @@
 	 * {@inheritDoc}.
 	 */
 	@Override
-	    public void onServiceConnected(ComponentName name, IBinder service) {
-		mXmppFacade = IXmppFacade.Stub.asInterface(service);
-		try {
-		    mChatManager = mXmppFacade.getChatManager();
-		    mRoster = mXmppFacade.getRoster();
-		    mRoster.addRosterListener(mBeemRosterListener);
-		    mContact = new Contact(getIntent().getData());
-		    changeCurrentChat(mContact);
-		} catch (RemoteException e) {
-		    Log.e(TAG, e.getMessage());
-		}
+	public void onServiceConnected(ComponentName name, IBinder service) {
+	    mXmppFacade = IXmppFacade.Stub.asInterface(service);
+	    try {
+		mChatManager = mXmppFacade.getChatManager();
+		mRoster = mXmppFacade.getRoster();
+		mRoster.addRosterListener(mBeemRosterListener);
+		mContact = new Contact(getIntent().getData());
+		changeCurrentChat(mContact);
+	    } catch (RemoteException e) {
+		Log.e(TAG, e.getMessage());
 	    }
+	}
 
 	/**
 	 * {@inheritDoc}.
 	 */
 	@Override
-	    public void onServiceDisconnected(ComponentName name) {
-		mXmppFacade = null;
-		try {
-		    mRoster.removeRosterListener(mBeemRosterListener);
-		} catch (RemoteException e) {
-		    Log.e(TAG, e.getMessage());
-		}
+	public void onServiceDisconnected(ComponentName name) {
+	    mXmppFacade = null;
+	    try {
+		mRoster.removeRosterListener(mBeemRosterListener);
+	    } catch (RemoteException e) {
+		Log.e(TAG, e.getMessage());
 	    }
+	}
     }
 
     /**
@@ -426,6 +427,12 @@
     private class BeemRosterListener extends IBeemRosterListener.Stub {
 
 	/**
+	 * Constructor.
+	 */
+	public BeemRosterListener() {
+	}
+
+	/**
 	 * {@inheritDoc}.
 	 */
 	@Override
@@ -478,6 +485,12 @@
     private class OnMessageListener extends IMessageListener.Stub {
 
 	/**
+	 * Constructor.
+	 */
+	public OnMessageListener() {
+	}
+
+	/**
 	 * {@inheritDoc}.
 	 */
 	@Override
@@ -562,7 +575,6 @@
 
 	/**
 	 * Constructor.
-	 * @param context The MessagesListAdapter context.
 	 */
 	public MessagesListAdapter() {
 	}
@@ -611,7 +623,7 @@
 		sv.setMessage(mListMessages.get(position).getMessage());
 	    }
 
-	    //TODO Put this un the xml layout
+	    //TODO Put this in the xml layout
 	    sv.setPadding(2, 2, 2, 4);
 
 	    sv.mName.setTextSize(16);
@@ -700,6 +712,7 @@
 
     /**
      * We will use a MessageView to display each message.
+     * TODO : put this in an xml file
      */
     private class MessageView extends LinearLayout {
 	private final TextView mName;
@@ -718,11 +731,15 @@
 
 	    mName = new TextView(context);
 	    mName.setText(name);
-	    addView(mName, new LinearLayout.LayoutParams(android.view.ViewGroup.LayoutParams.FILL_PARENT, android.view.ViewGroup.LayoutParams.WRAP_CONTENT));
+	    addView(mName,
+		    new LinearLayout.LayoutParams(android.view.ViewGroup.LayoutParams.FILL_PARENT,
+			android.view.ViewGroup.LayoutParams.WRAP_CONTENT));
 
 	    mMessage = new TextView(context);
 	    mMessage.setText(message);
-	    addView(mMessage, new LinearLayout.LayoutParams(android.view.ViewGroup.LayoutParams.FILL_PARENT, android.view.ViewGroup.LayoutParams.WRAP_CONTENT));
+	    addView(mMessage,
+		    new LinearLayout.LayoutParams(android.view.ViewGroup.LayoutParams.FILL_PARENT,
+			android.view.ViewGroup.LayoutParams.WRAP_CONTENT));
 	}
 
 	/**
@@ -788,6 +805,7 @@
 	}
     }
 
+    @Override
     protected void finalize() {
 	Log.e("CHATFIN", "FINALIZE");
     }