# HG changeset patch
# User Da Risk <darisk972@gmail.com>
# Date 1238710432 -7200
# Node ID c91278dda16610e45f15b1e9b34771cef91c3dc7
# Parent  d1a5bb00aaebe0b230cbc200e600f3793bf70816
La facade et la connexion permette de recuperer une instance de ChatManager

diff -r d1a5bb00aaeb -r c91278dda166 Beem-ecipse-formatter.xml
--- a/Beem-ecipse-formatter.xml	Thu Apr 02 19:03:08 2009 +0200
+++ b/Beem-ecipse-formatter.xml	Fri Apr 03 00:13:52 2009 +0200
@@ -19,7 +19,7 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
@@ -37,7 +37,7 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="1"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
@@ -69,8 +69,8 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
@@ -139,7 +139,7 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
@@ -157,7 +157,7 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
 <setting id="org.eclipse.jdt.core.compiler.compliance" value="1.5"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="1"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
@@ -186,7 +186,7 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120"/>
 <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
@@ -230,7 +230,7 @@
 <setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.5"/>
 <setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
diff -r d1a5bb00aaeb -r c91278dda166 src/com/beem/project/beem/jingle/Caller.java
--- a/src/com/beem/project/beem/jingle/Caller.java	Thu Apr 02 19:03:08 2009 +0200
+++ b/src/com/beem/project/beem/jingle/Caller.java	Fri Apr 03 00:13:52 2009 +0200
@@ -1,22 +1,16 @@
 package com.beem.project.beem.jingle;
 
 import java.net.UnknownHostException;
-
 import java.util.ArrayList;
 import java.util.List;
-
 import org.jivesoftware.smack.ConnectionConfiguration;
 import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
-
 import org.jivesoftware.smackx.jingle.JingleManager;
 import org.jivesoftware.smackx.jingle.JingleSession;
-
 import org.jivesoftware.smackx.jingle.listeners.JingleSessionListener;
-
 import org.jivesoftware.smackx.jingle.media.JingleMediaManager;
 import org.jivesoftware.smackx.jingle.media.PayloadType;
-
 import org.jivesoftware.smackx.jingle.nat.BasicTransportManager;
 import org.jivesoftware.smackx.jingle.nat.TransportCandidate;
 
diff -r d1a5bb00aaeb -r c91278dda166 src/com/beem/project/beem/service/XMPPConnectionAdapter.java
--- a/src/com/beem/project/beem/service/XMPPConnectionAdapter.java	Thu Apr 02 19:03:08 2009 +0200
+++ b/src/com/beem/project/beem/service/XMPPConnectionAdapter.java	Fri Apr 03 00:13:52 2009 +0200
@@ -15,6 +15,7 @@
 import android.util.Log;
 import com.beem.project.beem.BeemException;
 import com.beem.project.beem.service.aidl.IBeemConnectionListener;
+import com.beem.project.beem.service.aidl.IChatManager;
 import com.beem.project.beem.service.aidl.IRoster;
 import com.beem.project.beem.service.aidl.IXmppConnection;
 
@@ -26,6 +27,7 @@
 
     private static final String TAG = "XMPPConnectionAdapter";
     private XMPPConnection mAdaptee;
+    private IChatManager mChatManager;
     private BeemException mLastException;
     private String mLogin;
     private String mPassword;
@@ -76,6 +78,7 @@
 	    mAdaptee.connect();
 	    mAdaptee.addConnectionListener(mConListener);
 	    mAdaptee.login(mLogin, mPassword, "BEEM");
+	    mChatManager = new BeemChatManager(mAdaptee.getChatManager());
 	    // TODO find why this cause a null pointer exception
 	    // this.initFeatures(); // pour declarer les features xmpp qu'on supporte
 	    mLastException = null;
@@ -147,6 +150,14 @@
 	if (listen != null)
 	    mRemoteConnListeners.unregister(listen);
     }
+    
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public IChatManager getChatManager() throws RemoteException {
+	return mChatManager;
+    }
 
     /**
      * Trigger Connection event.
diff -r d1a5bb00aaeb -r c91278dda166 src/com/beem/project/beem/service/XMPPFacade.java
--- a/src/com/beem/project/beem/service/XMPPFacade.java	Thu Apr 02 19:03:08 2009 +0200
+++ b/src/com/beem/project/beem/service/XMPPFacade.java	Fri Apr 03 00:13:52 2009 +0200
@@ -1,6 +1,7 @@
 package com.beem.project.beem.service;
 import android.os.RemoteException;
 
+import com.beem.project.beem.service.aidl.IChatManager;
 import com.beem.project.beem.service.aidl.IRoster;
 import com.beem.project.beem.service.aidl.IXmppConnection;
 import com.beem.project.beem.service.aidl.IXMPPFacade;
@@ -65,4 +66,12 @@
 	return mConnexion.getRoster();
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public IChatManager getChatManager() throws RemoteException {
+	return mConnexion.getChatManager();
+    }
+
 }
diff -r d1a5bb00aaeb -r c91278dda166 src/com/beem/project/beem/service/aidl/IXMPPFacade.aidl
--- a/src/com/beem/project/beem/service/aidl/IXMPPFacade.aidl	Thu Apr 02 19:03:08 2009 +0200
+++ b/src/com/beem/project/beem/service/aidl/IXMPPFacade.aidl	Fri Apr 03 00:13:52 2009 +0200
@@ -2,6 +2,7 @@
 
 import  com.beem.project.beem.service.aidl.IXmppConnection;
 import  com.beem.project.beem.service.aidl.IRoster;
+import  com.beem.project.beem.service.aidl.IChatManager;
 
 interface IXMPPFacade {
 
@@ -15,4 +16,6 @@
     
     void disconnect();
 
+    IChatManager getChatManager();
+    
 }
diff -r d1a5bb00aaeb -r c91278dda166 src/com/beem/project/beem/service/aidl/IXmppConnection.aidl
--- a/src/com/beem/project/beem/service/aidl/IXmppConnection.aidl	Thu Apr 02 19:03:08 2009 +0200
+++ b/src/com/beem/project/beem/service/aidl/IXmppConnection.aidl	Fri Apr 03 00:13:52 2009 +0200
@@ -2,6 +2,7 @@
 
 import  com.beem.project.beem.service.aidl.IRoster;
 import  com.beem.project.beem.service.aidl.IBeemConnectionListener;
+import  com.beem.project.beem.service.aidl.IChatManager;
 
 interface IXmppConnection {
     
@@ -16,5 +17,5 @@
     void addConnectionListener(in IBeemConnectionListener listen);
     void removeConnectionListener(in IBeemConnectionListener listen);
     
- //   IChatManager getChatManager();
+    IChatManager getChatManager();
 }
\ No newline at end of file