Commits the patch of Sebastien Vincent provided on the dev mailing list in an e-mail with the subject "[sip-comm-dev] [Patch] Fix warnings".

cusax-fix
Lyubomir Marinov 16 years ago
parent 0d124e899e
commit dc5ce7cef5

@ -121,7 +121,6 @@ public class MetaContactImpl
/**
* Creates new meta contact with a newly generated meta contact UID.
* @param mclServiceImpl the service that creates the contact.
*/
MetaContactImpl()
{
@ -134,8 +133,8 @@ public class MetaContactImpl
/**
* Creates a new meta contact with the specified UID. This constructor
* MUST ONLY be used when restoring contacts stored in the contactlist.xml.
*
* @param metaUID the meta uid that this meta contact should have.
* @param mclServiceImpl the service that creates the contact.
* @param details the already stored details for the contact.
*/
MetaContactImpl(String metaUID, Map<String, List<String>> details)

@ -128,7 +128,8 @@ public boolean isChatOpenedForContact(MetaContact metaContact)
/**
* Returns TRUE if there is an opened <tt>ChatPanel</tt> for the given
* <tt>AdHocChatRoom</tt>.
* @param chatRoomWrapper the <tt>AdHocChatRoomWrapper</tt>, for which the
*
* @param adHocChatRoomWrapper the <tt>AdHocChatRoomWrapper</tt>, for which the
* ad-hoc chat is about
* @return TRUE if there is an opened <tt>ChatPanel</tt> for the given
* <tt>AdHocChatRoom</tt>

@ -258,7 +258,7 @@ public void setColor(Color c)
* Returns the family name of the selected font
* @return the family name of the selected font
*
* @see setFontFamily
* @see #setFontFamily
*/
public String getFontFamily()
{
@ -269,7 +269,7 @@ public String getFontFamily()
* Returns the size of the selected font
* @return the size of the selected font
*
* @see setFontSize
* @see #setFontSize
*/
public int getFontSize()
{

@ -173,11 +173,6 @@ public int indexOf(AdHocChatRoomWrapper chatRoomWrapper)
* {@link ChatRoomWrapper} tries to find the corresponding server stored
* {@link ChatRoom} in the specified operation set. Joins automatically all
* found chat rooms.
*
* @param protocolProvider the protocol provider for the account to
* synchronize
* @param opSet the ad-hoc multi-user chat operation set, which give us
* access to chat room server
*/
public void synchronizeProvider()
{

@ -48,7 +48,7 @@ public AdHocChatRoomWrapper(AdHocChatRoomProviderWrapper parentProvider,
* Creates a <tt>ChatRoomWrapper</tt> by specifying the corresponding chat
* room.
*
* @param chatRoom the chat room to which this wrapper corresponds.
* @param adHocChatRoom the chat room to which this wrapper corresponds.
*/
public AdHocChatRoomWrapper( AdHocChatRoomProviderWrapper parentProvider,
AdHocChatRoom adHocChatRoom)

@ -136,7 +136,7 @@ public boolean allowsTypingNotifications()
* Sends the given instant message trough this chat transport, by specifying
* the mime type (html or plain text).
*
* @param message The message to send.
* @param messageText The message to send.
* @param mimeType The mime type of the message to send: text/html or
* text/plain.
*/
@ -299,4 +299,4 @@ public long getMaximumFileLength()
// TODO Auto-generated method stub
return 0;
}
}
}

@ -619,7 +619,7 @@ public void rejectInvitation( OperationSetMultiUserChat multiUserChatOpSet,
/**
* Rejects the given invitation with the specified reason.
*
* @param multiUserChatOpSet the operation set to use for rejecting the
* @param multiUserChatAdHocOpSet the operation set to use for rejecting the
* invitation
* @param invitation the invitation to reject
* @param reason the reason for the rejection

@ -75,9 +75,6 @@ public void loadList()
*
* @param pps the <tt>ProtocolProviderService</tt> corresponding to the chat
* server
* @param adHocMultiUserChatOperationSet the
* <tt>OperationSetAdHocMultiUserChat</tt> from which we manage ad-hoc chat
* rooms
*/
public void addChatProvider(ProtocolProviderService pps)
{

@ -570,9 +570,9 @@ else if (typingState == OperationSetTypingNotifications.STATE_UNKNOWN)
/**
* When a request has been received we show it to the user through the
* chat session renderer.
*
* @param event <tt>FileTransferRequestEvent</tt>
* @see FileTransferListener#incomingRequestReceived(
* FileTransferRequestEvent)
* @see FileTransferListener#fileTransferRequestReceived(FileTransferRequestEvent)
*/
public void fileTransferRequestReceived(FileTransferRequestEvent event)
{

@ -21,7 +21,6 @@
* A parent class for all status selector boxes.
*
* @see SimpleStatusMenu
* @see PresenceStatusSelectorBox
* @see GlobalStatusSelectorBox
*
* @author Yana Stamcheva

@ -2470,9 +2470,9 @@ else if (rtpManager.equals(videoRtpManager))
* <p>
* JMF stores this statically, so it only has to be done once. FMJ does it
* dynamically (per instance, so it needs to be done for each instance.
* <p>
*
* @param rtpManager The manager with which to register the formats.
* @see MediaControl#registerCustomCodecs()
* @see EncodingConfiguration#registerCustomCodecs()
*/
static void registerCustomCodecFormats(RTPManager rtpManager)
{

@ -252,8 +252,8 @@ int decod_ld8k(
*-------------------------------------------------------*/
if(bfi != 0) { /* Bad Frame Error Concealment */
parm[parm_offset + 0] = (int) (Util.random_g729() & 0x1fff); /* 13 bits random*/
parm[parm_offset + 1]= (int) (Util.random_g729() & 0x000f); /* 4 bits random */
parm[parm_offset + 0] = (Util.random_g729() & 0x1fff); /* 13 bits random*/
parm[parm_offset + 1]= (Util.random_g729() & 0x000f); /* 4 bits random */
}
DeAcelp.decod_ACELP(parm[parm_offset + 1], parm[parm_offset + 0], code);

@ -78,7 +78,7 @@ static float gain_predict(
/* predicted codebook gain */
gcode0 = pred_code;
gcode0 = (float)Math.pow((double)10.0,(double)(gcode0/20.0)); /* predicted gain */
gcode0 = (float)Math.pow(10.0, gcode0/20.0); /* predicted gain */
return gcode0;
}

@ -278,7 +278,7 @@ class Ld8k
* Error threshold taming
*/
static final float THRESH_ERR = 60000.0f;
static final float INV_L_SUBFR = (float) (1.0f/(float)L_SUBFR); /* =0.025 */
static final float INV_L_SUBFR = (1.0f/(float)L_SUBFR); /* =0.025 */
/*-------------------------------------------------------------------------
* gain quantizer constants
*-------------------------------------------------------------------------

@ -169,7 +169,7 @@ public int unpack(
index+=((((buffer[buffer_pos]) << (pos)) & 0xFF) >>> (8 - bitno));
pos=8;
} else {
index+=(((int)(((buffer[buffer_pos]) << (pos)) & 0xFF)) << (bitno - 8));
index+=(((buffer[buffer_pos] << pos) & 0xFF) << (bitno - 8));
pos=8;
}
bitno -= BitsLeft;

@ -331,8 +331,7 @@ public ZRTPTransformEngine()
/**
* Returns an instance of <tt>ZRTPCTransformer</tt>.
*
* @see net.java.sip.communicator.impl.media.transform.
* TransformEngine#getRTCPTransformer()
* @see TransformEngine#getRTCPTransformer()
*/
public PacketTransformer getRTCPTransformer()
{
@ -342,8 +341,7 @@ public PacketTransformer getRTCPTransformer()
/**
* Returns this RTPTransformer.
*
* @see net.java.sip.communicator.impl.media.transform.
* TransformEngine#getRTPTransformer()
* @see TransformEngine#getRTPTransformer()
*/
public PacketTransformer getRTPTransformer()
{
@ -486,8 +484,7 @@ public void cleanup()
* The data output stream calls this method to transform outgoing
* packets.
*
* @see net.java.sip.communicator.impl.media.transform.PacketTransformer#
* transform(net.java.sip.communicator.impl.media.transform.RawPacket)
* @see PacketTransformer#transform(net.java.sip.communicator.impl.media.transform.RawPacket)
*/
public RawPacket transform(RawPacket pkt)
{
@ -524,9 +521,7 @@ public RawPacket transform(RawPacket pkt)
* The input data stream calls this method to transform
* incoming packets.
*
* @see net.java.sip.communicator.impl.media.transform.PacketTransformer#
* reverseTransform(
* net.java.sip.communicator.impl.media.transform.RawPacket)
* @see PacketTransformer#reverseTransform(net.java.sip.communicator.impl.media.transform.RawPacket)
*/
public RawPacket reverseTransform(RawPacket pkt)
{

@ -266,10 +266,6 @@ public ProtocolProviderService getParentProvider()
* notified every time the room's subject change you should add a
* <tt>ChatRoomPropertyChangelistener</tt> to this room. <p>
*
*
* To change the room's subject use {@link #setSubject(String)}. Note: Not
* possible inside the msn protocol!
*
* @return the room subject or <tt>null</tt> if the user hasn't joined the
* room or the room does not have a subject yet.
*/
@ -368,7 +364,7 @@ public void leave()
{
Map.Entry<String, Contact> memberEntry = membersSet.next();
Contact participant = (Contact) memberEntry.getValue();
Contact participant = memberEntry.getValue();
fireParticipantPresenceEvent(participant,
AdHocChatRoomParticipantPresenceChangeEvent.CONTACT_LEFT,

@ -155,13 +155,10 @@ public void addPresenceListener(
public AdHocChatRoom findRoom(ChatInvitation chatInvitation)
throws OperationFailedException, OperationNotSupportedException
{
AdHocChatRoom chatRoom = (AdHocChatRoom) chatRoomCache.get(chatInvitation
.getRoomName());
AdHocChatRoom chatRoom = chatRoomCache.get(chatInvitation.getRoomName());
if (chatRoom == null)
{
chatRoom = createLocalChatRoomInstance(chatInvitation);
}
return chatRoom;
}
@ -285,7 +282,7 @@ public AdHocChatRoom createAdHocChatRoom(String adHocRoomName,
public AdHocChatRoom findRoom(String roomName)
throws OperationFailedException, OperationNotSupportedException
{
AdHocChatRoom room = (AdHocChatRoom) chatRoomCache.get(roomName);
AdHocChatRoom room = chatRoomCache.get(roomName);
return room;
}
@ -316,7 +313,7 @@ public boolean isMultiChatSupportedByContact(Contact contact)
public void rejectInvitation(AdHocChatRoomInvitation invitation,
String rejectReason)
{
ChatInvitation inv = (ChatInvitation) invitations.get(invitation
ChatInvitation inv = invitations.get(invitation
.getTargetAdHocChatRoom());
if (inv != null)
@ -402,7 +399,7 @@ public void fireInvitationEvent(AdHocChatRoom targetChatRoom, String inviter,
while (listeners.hasNext())
{
AdHocChatRoomInvitationListener listener
= (AdHocChatRoomInvitationListener) listeners.next();
= listeners.next();
listener.invitationReceived(evt);
}
@ -436,7 +433,7 @@ public void fireLocalUserPresenceEvent( AdHocChatRoom chatRoom,
while (listeners.hasNext())
{
LocalUserAdHocChatRoomPresenceListener listener
= (LocalUserAdHocChatRoomPresenceListener) listeners.next();
= listeners.next();
listener.localUserAdHocPresenceChanged(evt);
}

@ -167,7 +167,7 @@ public void join(byte[] password) throws OperationFailedException
/**
* Returns true if the local user is currently in the white-board session
* (after white-boarding one of the {@link #join(String)} methods).
* (after white-boarding one of the {@link #join()} methods).
*
* @return true if currently we're currently in this white-board and false
* otherwise.

@ -687,8 +687,6 @@ private String createParticipantNames()
/**
* Creates an html description (table rows) of the specified thread.
*
* @param thread the thread that we are to describe.
*
* @return an html description of <tt>thread</tt>
*/
public String createHtmlDescription()

@ -239,9 +239,9 @@ public List<Contact> getParticipants()
/**
* Returns the participant of this ad-hoc chat room which corresponds to
* the given _id.
* the given id.
*
* @param _id
* @param id ID of the participant
* @return Contact the corresponding Contact
*/
public Contact getAdHocChatRoomParticipant(String id)
@ -264,9 +264,9 @@ public void addAdHocChatRoomParticipant(String id, Contact participant)
/**
* Removes the participant of this ad-hoc chat room which corresponds to
* the given _id.
* the given id.
*
* @param _id
* @param id ID of the participant
*/
public void removeParticipant(String id)
{
@ -349,7 +349,7 @@ public void leave()
while (participantsIter.hasNext())
{
Contact participant = (Contact) participantsIter.next();
Contact participant = participantsIter.next();
fireParticipantPresenceEvent(participant,
AdHocChatRoomParticipantPresenceChangeEvent.CONTACT_LEFT,
@ -455,8 +455,7 @@ public void fireMessageEvent(EventObject evt)
while (listeners.hasNext())
{
AdHocChatRoomMessageListener listener =
(AdHocChatRoomMessageListener) listeners.next();
AdHocChatRoomMessageListener listener = listeners.next();
if (evt instanceof AdHocChatRoomMessageDeliveredEvent)
{

@ -320,12 +320,12 @@ public AdHocChatRoom findRoom(String adHocRoomName)
public AdHocChatRoom findRoom(MsnSwitchboard switchboard)
throws OperationFailedException,
OperationNotSupportedException
OperationNotSupportedException
{
this.assertConnected();
AdHocChatRoomMsnImpl adHocRoom = (AdHocChatRoomMsnImpl)
this.adHocChatRoomCache.get(String.valueOf(switchboard.hashCode()));
AdHocChatRoomMsnImpl adHocRoom
= adHocChatRoomCache.get(String.valueOf(switchboard.hashCode()));
if (adHocRoom == null)
{

@ -349,8 +349,6 @@ public void setPersistent(boolean isPersistent)
* initialized. This data contains the key identifying the last displayed
* item, so that upon restart, items that have already been displayed in
* older sessions don't get displayed again.
*
* @see #setPersistentData(String)
*/
public String getPersistentData()
{

@ -513,7 +513,6 @@ protected void initialize(String sipAddress,
/**
* Never called.
* @see net.java.sip.communicator.impl.protocol.sip.PersistentService#processIOException(IOExceptionEvent)
*/
public void processIOException(IOExceptionEvent exceptionEvent) {}

@ -365,9 +365,7 @@ public void leave()
while (membersSet.hasNext())
{
Map.Entry<String, Contact> memberEntry
= (Map.Entry<String, Contact>) membersSet.next();
Map.Entry<String, Contact> memberEntry = membersSet.next();
Contact participant = memberEntry.getValue();
fireParticipantPresenceEvent(participant,
@ -434,8 +432,7 @@ public void fireMessageEvent(EventObject evt)
while (listeners.hasNext())
{
AdHocChatRoomMessageListener listener
= (AdHocChatRoomMessageListener) listeners.next();
AdHocChatRoomMessageListener listener = listeners.next();
if (evt instanceof AdHocChatRoomMessageDeliveredEvent)
{
@ -484,8 +481,7 @@ public void fireParticipantPresenceEvent(Contact participant, String eventID,
while (listeners.hasNext())
{
AdHocChatRoomParticipantPresenceListener listener
= (AdHocChatRoomParticipantPresenceListener) listeners.next();
AdHocChatRoomParticipantPresenceListener listener = listeners.next();
listener.participantPresenceChanged(evt);
}
@ -520,7 +516,7 @@ public Contact findParticipantForAddress(String address)
/**
* Removes the specified ad-hoc chat room participant from the participants
* list of this ad-hoc chat room.
* @param contact The member, who should be removed from the ad-hoc chat room
* @param participant The member, who should be removed from the ad-hoc chat room
* participants list.
*/
public void removeChatRoomParticipant(Contact participant)

@ -418,8 +418,6 @@ public void rejectInvitation(AdHocChatRoomInvitation invitation,
* the inviter that sent the invitation
* @param reason
* the reason why the inviter sent the invitation
* @param password
* the password to use when joining the room
*/
public void fireInvitationEvent(AdHocChatRoom targetChatRoom, String inviter,
String reason)
@ -441,8 +439,7 @@ public void fireInvitationEvent(AdHocChatRoom targetChatRoom, String inviter,
while (listeners.hasNext())
{
AdHocChatRoomInvitationListener listener
= (AdHocChatRoomInvitationListener) listeners.next();
AdHocChatRoomInvitationListener listener = listeners.next();
listener.invitationReceived(evt);
}
@ -479,8 +476,7 @@ public void fireInvitationRejectedEvent(AdHocChatRoom sourceChatRoom,
while (listeners.hasNext())
{
AdHocChatRoomInvitationRejectionListener listener
= (AdHocChatRoomInvitationRejectionListener) listeners.next();
AdHocChatRoomInvitationRejectionListener listener = listeners.next();
listener.invitationRejected(evt);
}
@ -518,8 +514,7 @@ public void fireLocalUserPresenceEvent( AdHocChatRoom chatRoom,
while (listeners.hasNext())
{
LocalUserAdHocChatRoomPresenceListener listener
= (LocalUserAdHocChatRoomPresenceListener) listeners.next();
LocalUserAdHocChatRoomPresenceListener listener = listeners.next();
listener.localUserAdHocPresenceChanged(evt);
}

@ -48,8 +48,9 @@ public interface MediaService
* <tt>MediaDevice</tt> for both capture and playback of media exchanged
* via the specified <tt>MediaConnector</tt>.
*
* @param the connector that the stream should use for sending and receiving
* @param connector the connector that the stream should use for sending and receiving
* media.
* @param device
*
* @return the newly created <tt>MediaStream</tt>.
*/

@ -117,7 +117,7 @@ public void consume()
* Gets the origin of the video this <code>VideoEvent</code> notifies about
* which is one of {@link #LOCAL} and {@link #REMOTE}.
*
* @return one of {@link LOCAL} and {@link #REMOTE} which specifies the
* @return one of {@link #LOCAL} and {@link #REMOTE} which specifies the
* origin of the video this <code>VideoEvent</code> notifies about
*/
public int getOrigin()

@ -72,7 +72,7 @@ public AdHocChatRoom createAdHocChatRoom(String adHocRoomName,
* Returns a reference to an AdHocChatRoom named <tt>adHocRoomName</tt> or
* null if no ad-hoc room with the given name exist on the server.
* <p>
* @param adHocRroomName the name of the <tt>AdHocChatRoom</tt> that we're
* @param adHocRoomName the name of the <tt>AdHocChatRoom</tt> that we're
* looking for.
* @return the <tt>AdHocChatRoom</tt> named <tt>adHocRoomName</tt> if it
* exists, null otherwise.

@ -93,7 +93,7 @@ public void removeWhiteboardChangeListener (
/**
* Returns true if the local user is currently in the whiteboard session
* (after whiteboarding one of the {@link #join(String)} methods).
* (after whiteboarding one of the {@link #join()} methods).
*
* @return true if currently we're currently in this whiteboard and false
* otherwise.

@ -65,11 +65,11 @@ public class LocalUserAdHocChatRoomPresenceChangeEvent
* representing that a change in local participant presence in the source
* ad-hoc chat room has occurred.
*
* @param _source the <tt>OperationSetAdHocMultiUserChat</tt>, which
* @param source the <tt>OperationSetAdHocMultiUserChat</tt>, which
* produced this event
* @param _adHocChatRoom the <tt>AdHocChatRoom</tt> that this event is about
* @param _eventType the type of this event.
* @param _reason the reason explaining why this event might have occurred
* @param adHocChatRoom the <tt>AdHocChatRoom</tt> that this event is about
* @param eventType the type of this event.
* @param reason the reason explaining why this event might have occurred
*/
public LocalUserAdHocChatRoomPresenceChangeEvent(
OperationSetAdHocMultiUserChat source,

@ -21,7 +21,7 @@ public interface LocalUserAdHocChatRoomPresenceListener
* Called to notify interested parties that a change in our presence in
* an ad-hoc chat room has occurred. Changes may include us being join,
* left.
* @param _evt the <tt>LocalUserAdHocChatRoomPresenceChangeEvent</tt>
* @param evt the <tt>LocalUserAdHocChatRoomPresenceChangeEvent</tt>
* instance containing the ad-hoc chat room and the type, and reason of the
* change
*/

@ -117,7 +117,7 @@ public void consume()
* Gets the origin of the video this <code>VideoEvent</code> notifies about
* which is one of {@link #LOCAL} and {@link #REMOTE}.
*
* @return one of {@link LOCAL} and {@link #REMOTE} which specifies the
* @return one of {@link #LOCAL} and {@link #REMOTE} which specifies the
* origin of the video this <code>VideoEvent</code> notifies about
*/
public int getOrigin()

@ -851,14 +851,8 @@ public void gotBuddyStatus(BuddyService service, Screenname buddy,
System.out.println("printing extra info blocks ("
+ eInfoBlocks.size() + ")");
for (int i = 0; i < eInfoBlocks.size(); i++)
{
ExtraInfoBlock block
= (ExtraInfoBlock) eInfoBlocks.get(i);
System.out.println("block.toString()="
+ block.toString()); ;
}
for (ExtraInfoBlock block : eInfoBlocks)
System.out.println("block.toString()=" + block);
}
else
logger.trace("no extra info.");

Loading…
Cancel
Save