# HG changeset patch # User Da Risk # Date 1300741311 -3600 # Node ID 98060a89b5ec666a17767a2c003e1cd0d1f8ef6f # Parent bfb4326524f8594531e5546cafbf67c62ae6450c Checkstyle to fix #338 diff -r bfb4326524f8 -r 98060a89b5ec src/com/beem/project/beem/BeemService.java --- a/src/com/beem/project/beem/BeemService.java Mon Mar 21 21:55:23 2011 +0100 +++ b/src/com/beem/project/beem/BeemService.java Mon Mar 21 22:01:51 2011 +0100 @@ -45,7 +45,6 @@ import org.jivesoftware.smack.ConnectionConfiguration; import org.jivesoftware.smack.Roster; -import org.jivesoftware.smack.SmackConfiguration; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.ConnectionConfiguration.SecurityMode; import org.jivesoftware.smack.Roster.SubscriptionMode; diff -r bfb4326524f8 -r 98060a89b5ec src/com/beem/project/beem/service/UserInfo.java --- a/src/com/beem/project/beem/service/UserInfo.java Mon Mar 21 21:55:23 2011 +0100 +++ b/src/com/beem/project/beem/service/UserInfo.java Mon Mar 21 22:01:51 2011 +0100 @@ -1,4 +1,46 @@ +/* + BEEM is a videoconference application on the Android Platform. + Copyright (C) 2009 by Frederic-Charles Barthelery, + Jean-Manuel Da Silva, + Nikita Kozlov, + Philippe Lago, + Jean Baptiste Vergely, + Vincent Veronis. + + This file is part of BEEM. + + BEEM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + BEEM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with BEEM. If not, see . + + Please send bug reports with examples or suggestions to + contact@beem-project.com or http://dev.beem-project.com/ + + Epitech, hereby disclaims all copyright interest in the program "Beem" + written by Frederic-Charles Barthelery, + Jean-Manuel Da Silva, + Nikita Kozlov, + Philippe Lago, + Jean Baptiste Vergely, + Vincent Veronis. + + Nicolas Sadirac, November 26, 2009 + President of Epitech. + + Flavien Astraud, November 26, 2009 + Head of the EIP Laboratory. + +*/ package com.beem.project.beem.service; import android.os.Parcel; @@ -57,14 +99,29 @@ return 0; } + /** + * Get the avatar id of the user. + * + * @return the avatar id + */ public String getAvatarId() { return mAvatarId; } + /** + * Set the avater id of the user. + * + * @param avatarId + */ public void setAvatarId(String avatarId) { mAvatarId = avatarId; } + /** + * Get the jid of the user. + * + * @return the jid + */ public String getJid() { return mBareJid; }