--- a/src/com/beem/project/beem/BeemService.java	Fri Feb 19 00:31:43 2010 +0100
+++ b/src/com/beem/project/beem/BeemService.java	Fri Feb 19 00:44:59 2010 +0100
@@ -40,7 +40,7 @@
     Flavien Astraud, November 26, 2009
     Head of the EIP Laboratory.
 
- */
+*/
 package com.beem.project.beem;
 
 import org.jivesoftware.smack.ConnectionConfiguration;
@@ -194,7 +194,7 @@
 	    if ("".equals(mHost))
 		mHost = StringUtils.parseServer(tmpJid);
 	    String tmpPort = mSettings.getString("settings_key_xmpp_port", "5222");
-	    mPort = ("".equals(tmpPort)) ? DEFAULT_XMPP_PORT : Integer.parseInt(tmpPort) ;
+	    mPort = ("".equals(tmpPort)) ? DEFAULT_XMPP_PORT : Integer.parseInt(tmpPort);
 	}
 	if ("gmail.com".equals(mService) || "googlemail.com".equals(mService))  {
 	    mLogin = tmpJid;
@@ -382,7 +382,20 @@
 	 */
     }
 
+    /**
+     * Listen on preference changes
+     */
     private class BeemServicePreferenceListener implements SharedPreferences.OnSharedPreferenceChangeListener {
+	
+	/**
+	 * ctor
+	 */
+	public BeemServicePreferenceListener() {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
 	@Override
 	public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
 	    if (key.equals("settings_away_chk")) {
@@ -394,18 +407,27 @@
 		    mOnOffReceiverIsRegistered = false;
 		    unregisterReceiver(mOnOffReceiver);
 		}
-	    }	    
-	}	
+	    }
+	}
     }
-
+    
+    /**
+     * Listen on some Intent broadcast, ScreenOn and ScreenOff
+     */
     private class BeemServiceBroadcastReceiver extends BroadcastReceiver {
 
 	private String mOldStatus;
 	private int mOldMode;
 
+	/**
+	 * ctor
+	 */
 	public BeemServiceBroadcastReceiver() {
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
 	@Override
 	public void onReceive(final Context context, final Intent intent) {
 	    String intentAction = intent.getAction();

--- a/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Fri Feb 19 00:31:43 2010 +0100
+++ b/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Fri Feb 19 00:44:59 2010 +0100
@@ -105,8 +105,6 @@
     private final SubscribePacketListener mSubscribePacketListener = new SubscribePacketListener();
 
     private final ConnexionListenerAdapter mConListener = new ConnexionListenerAdapter();
-    
-   
 
     /**
      * Constructor.
@@ -181,7 +179,7 @@
 			mService.getResources().getIdentifier(
 			    e.getXMPPError().getCondition().replace("-", "_"), "string", "com.beem.project.beem"));
 		    mErrorMsg = str;
-		} catch(NullPointerException e2) {
+		} catch (NullPointerException e2) {
 		    if (!"".equals(e.getMessage()))
 			mErrorMsg = e.getMessage();
 		    else
@@ -294,7 +292,7 @@
 	mAdaptee.sendPacket(pres);
 	updateNotification(m);
     }
-    
+
     /**
      * {@inheritDoc}
      */
@@ -302,11 +300,19 @@
     public void changeStatus(int status, String msg) {
 	changeStatusAndPriority(status, msg, mPreviousPriority);
     }
-    
+
+    /**
+     * get the previous status
+     * @return previous status
+     */
     public String getPreviousStatus() {
 	return mPreviousStatus;
     }
-    
+
+    /**
+     * get the previous mode
+     * @return previous mode
+     */
     public int getPreviousMode() {
 	return mPreviousMode;
     }