diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java b/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java
index fb467ba1e..7124b7bef 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java
@@ -412,8 +412,10 @@ public InviteToConferenceCallThread(String[] callees, Call call)
public void run()
{
OperationSetTelephonyConferencing confOpSet
- = (OperationSetTelephonyConferencing) call.getProtocolProvider()
- .getOperationSet(OperationSetTelephonyConferencing.class);
+ = call
+ .getProtocolProvider()
+ .getOperationSet(
+ OperationSetTelephonyConferencing.class);
/*
* XXX If we are here and we just discover that
@@ -465,9 +467,8 @@ public void run()
while (peers.hasNext())
{
CallPeer peer = peers.next();
- OperationSetBasicTelephony telephony =
- (OperationSetBasicTelephony) pps
- .getOperationSet(OperationSetBasicTelephony.class);
+ OperationSetBasicTelephony telephony
+ = pps.getOperationSet(OperationSetBasicTelephony.class);
try
{
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/MetaContactChatTransport.java b/src/net/java/sip/communicator/impl/gui/main/chat/MetaContactChatTransport.java
index 2190528ff..2637e2a74 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/MetaContactChatTransport.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/MetaContactChatTransport.java
@@ -4,7 +4,6 @@
* Distributable under LGPL license.
* See terms of license at gnu.org.
*/
-
package net.java.sip.communicator.impl.gui.main.chat;
import java.io.*;
@@ -45,9 +44,10 @@ public MetaContactChatTransport(ChatSession chatSession,
this.parentChatSession = chatSession;
this.contact = contact;
- presenceOpSet =
- (OperationSetPresence) contact.getProtocolProvider()
- .getOperationSet(OperationSetPresence.class);
+ presenceOpSet
+ = contact
+ .getProtocolProvider()
+ .getOperationSet(OperationSetPresence.class);
if (presenceOpSet != null)
presenceOpSet.addContactPresenceStatusListener(this);
@@ -190,8 +190,9 @@ public void sendInstantMessage( String message,
return;
OperationSetBasicInstantMessaging imOpSet
- = (OperationSetBasicInstantMessaging) contact.getProtocolProvider()
- .getOperationSet(OperationSetBasicInstantMessaging.class);
+ = contact
+ .getProtocolProvider()
+ .getOperationSet(OperationSetBasicInstantMessaging.class);
Message msg;
if (mimeType.equals(OperationSetBasicInstantMessaging.HTML_MIME_TYPE)
@@ -224,8 +225,9 @@ public void sendSmsMessage(String phoneNumber, String messageText)
return;
OperationSetSmsMessaging smsOpSet
- = (OperationSetSmsMessaging) contact.getProtocolProvider()
- .getOperationSet(OperationSetSmsMessaging.class);
+ = contact
+ .getProtocolProvider()
+ .getOperationSet(OperationSetSmsMessaging.class);
Message smsMessage = smsOpSet.createMessage(messageText);
@@ -247,11 +249,13 @@ public int sendTypingNotification(int typingState)
if (!allowsTypingNotifications())
return -1;
+ ProtocolProviderService protocolProvider
+ = contact.getProtocolProvider();
OperationSetTypingNotifications tnOperationSet
- = (OperationSetTypingNotifications) contact.getProtocolProvider()
+ = protocolProvider
.getOperationSet(OperationSetTypingNotifications.class);
- if(contact.getProtocolProvider().isRegistered())
+ if(protocolProvider.isRegistered())
{
try
{
@@ -286,16 +290,18 @@ public FileTransfer sendFile(File file)
return null;
OperationSetFileTransfer ftOpSet
- = (OperationSetFileTransfer) contact.getProtocolProvider()
- .getOperationSet(OperationSetFileTransfer.class);
+ = contact
+ .getProtocolProvider()
+ .getOperationSet(OperationSetFileTransfer.class);
if (FileUtils.isImage(file.getName()))
{
// Create a thumbnailed file if possible.
OperationSetThumbnailedFileFactory tfOpSet
- = (OperationSetThumbnailedFileFactory)
- contact.getProtocolProvider()
- .getOperationSet(OperationSetThumbnailedFileFactory.class);
+ = contact
+ .getProtocolProvider()
+ .getOperationSet(
+ OperationSetThumbnailedFileFactory.class);
if (tfOpSet != null)
{
@@ -320,8 +326,9 @@ public FileTransfer sendFile(File file)
public long getMaximumFileLength()
{
OperationSetFileTransfer ftOpSet
- = (OperationSetFileTransfer) contact.getProtocolProvider()
- .getOperationSet(OperationSetFileTransfer.class);
+ = contact
+ .getProtocolProvider()
+ .getOperationSet(OperationSetFileTransfer.class);
return ftOpSet.getMaximumFileLength();
}
@@ -354,8 +361,9 @@ public void addSmsMessageListener(MessageListener l)
return;
OperationSetSmsMessaging smsOpSet
- = (OperationSetSmsMessaging) contact.getProtocolProvider()
- .getOperationSet(OperationSetSmsMessaging.class);
+ = contact
+ .getProtocolProvider()
+ .getOperationSet(OperationSetSmsMessaging.class);
smsOpSet.addMessageListener(l);
}
@@ -373,8 +381,9 @@ public void addInstantMessageListener(MessageListener l)
return;
OperationSetBasicInstantMessaging imOpSet
- = (OperationSetBasicInstantMessaging) contact.getProtocolProvider()
- .getOperationSet(OperationSetBasicInstantMessaging.class);
+ = contact
+ .getProtocolProvider()
+ .getOperationSet(OperationSetBasicInstantMessaging.class);
imOpSet.addMessageListener(l);
}
@@ -392,8 +401,9 @@ public void removeSmsMessageListener(MessageListener l)
return;
OperationSetSmsMessaging smsOpSet
- = (OperationSetSmsMessaging) contact.getProtocolProvider()
- .getOperationSet(OperationSetSmsMessaging.class);
+ = contact
+ .getProtocolProvider()
+ .getOperationSet(OperationSetSmsMessaging.class);
smsOpSet.removeMessageListener(l);
}
@@ -411,8 +421,9 @@ public void removeInstantMessageListener(MessageListener l)
return;
OperationSetBasicInstantMessaging imOpSet
- = (OperationSetBasicInstantMessaging) contact.getProtocolProvider()
- .getOperationSet(OperationSetBasicInstantMessaging.class);
+ = contact
+ .getProtocolProvider()
+ .getOperationSet(OperationSetBasicInstantMessaging.class);
imOpSet.removeMessageListener(l);
}
@@ -482,21 +493,20 @@ private byte[] getFileThumbnail(File file)
try
{
ImageIcon image = new ImageIcon(file.toURI().toURL());
-
- if (image != null)
- {
- int width = image.getIconWidth();
- int height = image.getIconHeight();
-
- if (width > THUMBNAIL_WIDTH)
- width = THUMBNAIL_WIDTH;
- if (height > THUMBNAIL_HEIGHT)
- height = THUMBNAIL_HEIGHT;
-
- bytes = ImageUtils
- .getScaledInstanceInBytes(image.getImage(),
- width, height);
- }
+ int width = image.getIconWidth();
+ int height = image.getIconHeight();
+
+ if (width > THUMBNAIL_WIDTH)
+ width = THUMBNAIL_WIDTH;
+ if (height > THUMBNAIL_HEIGHT)
+ height = THUMBNAIL_HEIGHT;
+
+ bytes
+ = ImageUtils
+ .getScaledInstanceInBytes(
+ image.getImage(),
+ width,
+ height);
}
catch (MalformedURLException e)
{
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/AdHocConferenceChatTransport.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/AdHocConferenceChatTransport.java
index 950b4aa3d..799649795 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/AdHocConferenceChatTransport.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/AdHocConferenceChatTransport.java
@@ -4,7 +4,6 @@
* Distributable under LGPL license.
* See terms of license at gnu.org.
*/
-
package net.java.sip.communicator.impl.gui.main.chat.conference;
import java.io.*;
@@ -22,9 +21,9 @@
public class AdHocConferenceChatTransport
implements ChatTransport
{
- private ChatSession chatSession;
+ private final ChatSession chatSession;
- private AdHocChatRoom adHocChatRoom;
+ private final AdHocChatRoom adHocChatRoom;
/**
* Creates an instance of ConferenceChatTransport by specifying the
@@ -216,8 +215,9 @@ public void addSmsMessageListener(MessageListener l)
return;
OperationSetSmsMessaging smsOpSet
- = (OperationSetSmsMessaging) adHocChatRoom.getParentProvider()
- .getOperationSet(OperationSetSmsMessaging.class);
+ = adHocChatRoom
+ .getParentProvider()
+ .getOperationSet(OperationSetSmsMessaging.class);
smsOpSet.addMessageListener(l);
}
@@ -235,8 +235,8 @@ public void addInstantMessageListener(MessageListener l)
return;
OperationSetBasicInstantMessaging imOpSet
- = (OperationSetBasicInstantMessaging)
- adHocChatRoom.getParentProvider()
+ = adHocChatRoom
+ .getParentProvider()
.getOperationSet(OperationSetBasicInstantMessaging.class);
imOpSet.addMessageListener(l);
@@ -255,8 +255,9 @@ public void removeSmsMessageListener(MessageListener l)
return;
OperationSetSmsMessaging smsOpSet
- = (OperationSetSmsMessaging) adHocChatRoom.getParentProvider()
- .getOperationSet(OperationSetSmsMessaging.class);
+ = adHocChatRoom
+ .getParentProvider()
+ .getOperationSet(OperationSetSmsMessaging.class);
smsOpSet.removeMessageListener(l);
}
@@ -274,8 +275,8 @@ public void removeInstantMessageListener(MessageListener l)
return;
OperationSetBasicInstantMessaging imOpSet
- = (OperationSetBasicInstantMessaging)
- adHocChatRoom.getParentProvider()
+ = adHocChatRoom
+ .getParentProvider()
.getOperationSet(OperationSetBasicInstantMessaging.class);
imOpSet.removeMessageListener(l);
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatTransport.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatTransport.java
index 85d1e050b..eceec6616 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatTransport.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatTransport.java
@@ -22,9 +22,9 @@
public class ConferenceChatTransport
implements ChatTransport
{
- private ChatSession chatSession;
+ private final ChatSession chatSession;
- private ChatRoom chatRoom;
+ private final ChatRoom chatRoom;
/**
* Creates an instance of ConferenceChatTransport by specifying the
@@ -223,8 +223,9 @@ public void addSmsMessageListener(MessageListener l)
return;
OperationSetSmsMessaging smsOpSet
- = (OperationSetSmsMessaging) chatRoom.getParentProvider()
- .getOperationSet(OperationSetSmsMessaging.class);
+ = chatRoom
+ .getParentProvider()
+ .getOperationSet(OperationSetSmsMessaging.class);
smsOpSet.addMessageListener(l);
}
@@ -242,8 +243,9 @@ public void addInstantMessageListener(MessageListener l)
return;
OperationSetBasicInstantMessaging imOpSet
- = (OperationSetBasicInstantMessaging) chatRoom.getParentProvider()
- .getOperationSet(OperationSetBasicInstantMessaging.class);
+ = chatRoom
+ .getParentProvider()
+ .getOperationSet(OperationSetBasicInstantMessaging.class);
imOpSet.addMessageListener(l);
}
@@ -261,8 +263,9 @@ public void removeSmsMessageListener(MessageListener l)
return;
OperationSetSmsMessaging smsOpSet
- = (OperationSetSmsMessaging) chatRoom.getParentProvider()
- .getOperationSet(OperationSetSmsMessaging.class);
+ = chatRoom
+ .getParentProvider()
+ .getOperationSet(OperationSetSmsMessaging.class);
smsOpSet.removeMessageListener(l);
}
@@ -280,8 +283,9 @@ public void removeInstantMessageListener(MessageListener l)
return;
OperationSetBasicInstantMessaging imOpSet
- = (OperationSetBasicInstantMessaging) chatRoom.getParentProvider()
- .getOperationSet(OperationSetBasicInstantMessaging.class);
+ = chatRoom
+ .getParentProvider()
+ .getOperationSet(OperationSetBasicInstantMessaging.class);
imOpSet.removeMessageListener(l);
}
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListModel.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListModel.java
index 1b15b6498..3bdce567f 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListModel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListModel.java
@@ -15,13 +15,8 @@
import net.java.sip.communicator.service.protocol.*;
/**
- * The list model of the ContactList. This class use as a data model the
- * MetaContactListService itself. The ContactListModel
- * plays only a role of a "list" face of the "tree" MetaContactListService
- * structure. It provides an implementation of the AbstractListModel and adds
- * some methods facilitating the access to the contact list. Some more contact
- * list specific methods are added like: getMetaContactStatus,
- * getMetaContactStatusIcon, changeContactStatus, etc.
+ * Implements ListModel for MetaContactListService in order to
+ * display it in ContactList as a list instead of a tree.
*
* @author Yana Stamcheva
* @author Lubomir Marinov
@@ -39,11 +34,13 @@ public class ContactListModel
private boolean showOffline = true;
/**
- * Creates a List Model, which gets its data from the given
- * MetaContactListService.
+ * Initializes a new ContactListModel instance which is to
+ * implement ListModel for a specific
+ * MetaContactListService in order to display it in
+ * ContactList as a list instead of a tree.
*
- * @param contactList The MetaContactListService which contains the contact
- * list.
+ * @param contactList the MetaContactListService which contains the
+ * contact list to be represented as a list by the new instance
*/
public ContactListModel(MetaContactListService contactList)
{
diff --git a/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java b/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java
index 8bf39315e..6a069dda0 100644
--- a/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java
+++ b/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java
@@ -216,7 +216,7 @@ public void actionPerformed(ActionEvent e)
else
{
OperationSetPresence presence
- = (OperationSetPresence) protocolProvider
+ = protocolProvider
.getOperationSet(OperationSetPresence.class);
if (presence == null)
@@ -258,7 +258,7 @@ else if (itemName.equals(Constants.OFFLINE_STATUS))
.equals(RegistrationState.UNREGISTERING))
{
OperationSetPresence presence
- = (OperationSetPresence) protocolProvider
+ = protocolProvider
.getOperationSet(OperationSetPresence.class);
if (presence == null)
@@ -311,7 +311,7 @@ else if (itemName.equals(Constants.FREE_FOR_CHAT_STATUS))
continue;
OperationSetPresence presence
- = (OperationSetPresence) protocolProvider
+ = protocolProvider
.getOperationSet(OperationSetPresence.class);
if (presence == null)
@@ -350,7 +350,7 @@ else if (itemName.equals(Constants.AWAY_STATUS))
continue;
OperationSetPresence presence
- = (OperationSetPresence) protocolProvider
+ = protocolProvider
.getOperationSet(OperationSetPresence.class);
if (presence == null)
@@ -477,9 +477,7 @@ private void updateGlobalStatus()
continue;
OperationSetPresence presence
- = (OperationSetPresence)
- protocolProvider
- .getOperationSet(OperationSetPresence.class);
+ = protocolProvider.getOperationSet(OperationSetPresence.class);
int presenceStatus
= (presence == null)
? PresenceStatus.AVAILABLE_THRESHOLD
@@ -660,9 +658,7 @@ public PresenceStatus getLastPresenceStatus(
if (lastStatus != null)
{
OperationSetPresence presence
- = (OperationSetPresence)
- protocolProvider
- .getOperationSet(OperationSetPresence.class);
+ = protocolProvider.getOperationSet(OperationSetPresence.class);
if (presence == null)
return null;
diff --git a/src/net/java/sip/communicator/impl/gui/utils/InviteDialog.java b/src/net/java/sip/communicator/impl/gui/utils/InviteDialog.java
index 656552874..fdff799db 100644
--- a/src/net/java/sip/communicator/impl/gui/utils/InviteDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/utils/InviteDialog.java
@@ -113,7 +113,6 @@ public InviteDialog (String title)
GuiActivator.getResources().getI18nMnemonic("service.gui.CANCEL"));
final DefaultContactList contactList = new DefaultContactList();
-
final DefaultContactList selectedContactList = new DefaultContactList();
contactList.setModel(contactListModel);
@@ -125,8 +124,7 @@ public void mouseClicked(MouseEvent e)
{
if (e.getClickCount() > 1)
{
- Object[] metaContacts
- = (Object[]) contactList.getSelectedValues();
+ Object[] metaContacts = contactList.getSelectedValues();
moveContactsFromLeftToRight(metaContacts);
}
diff --git a/src/net/java/sip/communicator/impl/media/CallSessionImpl.java b/src/net/java/sip/communicator/impl/media/CallSessionImpl.java
index 3ed1513f6..7f583dfb9 100644
--- a/src/net/java/sip/communicator/impl/media/CallSessionImpl.java
+++ b/src/net/java/sip/communicator/impl/media/CallSessionImpl.java
@@ -599,7 +599,9 @@ private boolean stopSendStreaming(RTPManager rtpManager)
/**
* Stops and closes all streams currently handled by rtpManager.
*
- * @param rtpManager the rtpManager whose streams we'll be stopping.
+ * @param rtpManager the RTPManager to stop the streams of
+ * @param dispose true to dispose of rtpManager after
+ * stopping its streams; otherwise, false
* @return true if there was an actual change in the streaming i.e.
* the streaming wasn't already stopped before this request;
* false, otherwise
diff --git a/src/net/java/sip/communicator/impl/media/codec/audio/g729/Coder.java b/src/net/java/sip/communicator/impl/media/codec/audio/g729/Coder.java
index a82bf1f57..f365602ed 100644
--- a/src/net/java/sip/communicator/impl/media/codec/audio/g729/Coder.java
+++ b/src/net/java/sip/communicator/impl/media/codec/audio/g729/Coder.java
@@ -189,7 +189,7 @@ void process(short[] sp16, short[] serial)
int new_speech_offset = codLd8k.new_speech_offset;
for (int i = 0; i < L_FRAME; i++)
- new_speech[new_speech_offset + i] = (float) sp16[i];
+ new_speech[new_speech_offset + i] = sp16[i];
preProc.pre_process(new_speech, new_speech_offset, L_FRAME);
diff --git a/src/net/java/sip/communicator/impl/protocol/facebook/OperationSetPersistentPresenceFacebookImpl.java b/src/net/java/sip/communicator/impl/protocol/facebook/OperationSetPersistentPresenceFacebookImpl.java
index 54f48b29c..06a920691 100644
--- a/src/net/java/sip/communicator/impl/protocol/facebook/OperationSetPersistentPresenceFacebookImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/facebook/OperationSetPersistentPresenceFacebookImpl.java
@@ -601,8 +601,9 @@ public void renameServerStoredContactGroup(ContactGroup group,
{
((ContactGroupFacebookImpl) group).setGroupName(newName);
- this.fireServerStoredGroupEvent((ContactGroupFacebookImpl) group,
- ServerStoredGroupEvent.GROUP_RENAMED_EVENT);
+ this.fireServerStoredGroupEvent(
+ group,
+ ServerStoredGroupEvent.GROUP_RENAMED_EVENT);
}
/**
@@ -657,8 +658,9 @@ public void subscribe(ContactGroup parent, String contactIdentifier)
= fbProvider
.getOperationSet(OperationSetPersistentPresence.class);
- changePresenceStatusForContact(contact,
- (FacebookStatusEnum) opSetPresence.getPresenceStatus());
+ changePresenceStatusForContact(
+ contact,
+ opSetPresence.getPresenceStatus());
}
else
{
@@ -787,13 +789,13 @@ public void unsubscribe(Contact contact)
IllegalStateException,
OperationFailedException
{
- ContactGroupFacebookImpl parentGroup =
- (ContactGroupFacebookImpl) ((ContactFacebookImpl) contact)
- .getParentContactGroup();
+ ContactGroupFacebookImpl parentGroup
+ = (ContactGroupFacebookImpl) contact.getParentContactGroup();
parentGroup.removeContact((ContactFacebookImpl) contact);
- fireSubscriptionEvent((ContactFacebookImpl) contact,
+ fireSubscriptionEvent(
+ contact,
parentGroup,
SubscriptionEvent.SUBSCRIPTION_REMOVED);
}
diff --git a/src/net/java/sip/communicator/impl/protocol/gibberish/OperationSetPersistentPresenceGibberishImpl.java b/src/net/java/sip/communicator/impl/protocol/gibberish/OperationSetPersistentPresenceGibberishImpl.java
index 2f9a2bbfd..82dc3f03e 100644
--- a/src/net/java/sip/communicator/impl/protocol/gibberish/OperationSetPersistentPresenceGibberishImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/gibberish/OperationSetPersistentPresenceGibberishImpl.java
@@ -457,7 +457,8 @@ public void renameServerStoredContactGroup(ContactGroup group,
((ContactGroupGibberishImpl)group).setGroupName(newName);
this.fireServerStoredGroupEvent(
- (ContactGroupGibberishImpl)group, ServerStoredGroupEvent.GROUP_RENAMED_EVENT);
+ group,
+ ServerStoredGroupEvent.GROUP_RENAMED_EVENT);
}
/**
@@ -530,12 +531,12 @@ public void subscribe(ContactGroup parent, String contactIdentifier) throws
if(gibProvider != null)
{
OperationSetPersistentPresence opSetPresence
- = (OperationSetPersistentPresence)gibProvider.getOperationSet(
- OperationSetPersistentPresence.class);
+ = gibProvider
+ .getOperationSet(OperationSetPersistentPresence.class);
changePresenceStatusForContact(
- contact
- , (GibberishStatusEnum)opSetPresence.getPresenceStatus());
+ contact,
+ opSetPresence.getPresenceStatus());
}
else
{
@@ -671,9 +672,10 @@ public void unsubscribe(Contact contact) throws IllegalArgumentException,
parentGroup.removeContact((ContactGibberishImpl)contact);
- fireSubscriptionEvent((ContactGibberishImpl)contact,
- ((ContactGibberishImpl)contact).getParentContactGroup()
- , SubscriptionEvent.SUBSCRIPTION_REMOVED);
+ fireSubscriptionEvent(
+ contact,
+ contact.getParentContactGroup(),
+ SubscriptionEvent.SUBSCRIPTION_REMOVED);
}
/**
diff --git a/src/net/java/sip/communicator/impl/protocol/icq/FileTransferImpl.java b/src/net/java/sip/communicator/impl/protocol/icq/FileTransferImpl.java
index 3e8d5d6ae..5f2f3b009 100644
--- a/src/net/java/sip/communicator/impl/protocol/icq/FileTransferImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/icq/FileTransferImpl.java
@@ -10,7 +10,6 @@
import net.java.sip.communicator.service.protocol.*;
import net.java.sip.communicator.service.protocol.event.*;
-import net.java.sip.communicator.util.*;
import net.kano.joustsim.oscar.oscar.service.icbm.ft.*;
import net.kano.joustsim.oscar.oscar.service.icbm.ft.FileTransfer;
import net.kano.joustsim.oscar.oscar.service.icbm.ft.controllers.*;
@@ -24,12 +23,6 @@
public class FileTransferImpl
extends AbstractFileTransfer
{
- /**
- * Logger
- */
- private static final Logger logger =
- Logger.getLogger(FileTransferImpl.class);
-
private String id = null;
private Contact contact = null;
private File file = null;
diff --git a/src/net/java/sip/communicator/impl/protocol/icq/OperationSetAdHocMultiUserChatIcqImpl.java b/src/net/java/sip/communicator/impl/protocol/icq/OperationSetAdHocMultiUserChatIcqImpl.java
index fa746f195..05d7fdb56 100644
--- a/src/net/java/sip/communicator/impl/protocol/icq/OperationSetAdHocMultiUserChatIcqImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/icq/OperationSetAdHocMultiUserChatIcqImpl.java
@@ -278,9 +278,8 @@ private AdHocChatRoom createLocalChatRoomInstance(
public void rejectInvitation(AdHocChatRoomInvitation invitation,
String rejectReason)
{
- ChatInvitation inv =
- (ChatInvitation) invitations.get(invitation
- .getTargetAdHocChatRoom());
+ ChatInvitation inv
+ = invitations.get(invitation.getTargetAdHocChatRoom());
if (inv != null)
{ // send the rejection
@@ -350,26 +349,20 @@ public void fireInvitationEvent(AdHocChatRoom targetChatRoom,
AdHocChatRoomInvitationIcqImpl invitation =
new AdHocChatRoomInvitationIcqImpl(targetChatRoom, inviter, reason,
password);
-
AdHocChatRoomInvitationReceivedEvent evt =
new AdHocChatRoomInvitationReceivedEvent(this, invitation,
new Date(System.currentTimeMillis()));
- Iterator listeners = null;
+ Iterable listeners;
synchronized (invitationListeners)
{
- listeners =
- new ArrayList(
- invitationListeners).iterator();
+ listeners
+ = new ArrayList(
+ invitationListeners);
}
- while (listeners.hasNext())
- {
- AdHocChatRoomInvitationListener listener =
- (AdHocChatRoomInvitationListener) listeners.next();
-
+ for (AdHocChatRoomInvitationListener listener : listeners)
listener.invitationReceived(evt);
- }
}
/**
@@ -389,21 +382,16 @@ public void fireLocalUserPresenceEvent(AdHocChatRoom chatRoom,
new LocalUserAdHocChatRoomPresenceChangeEvent(this, chatRoom,
eventType, reason);
- Iterator listeners = null;
+ Iterable listeners = null;
synchronized (presenceListeners)
{
- listeners =
- new ArrayList(
- presenceListeners).iterator();
+ listeners
+ = new ArrayList(
+ presenceListeners);
}
- while (listeners.hasNext())
- {
- LocalUserAdHocChatRoomPresenceListener listener =
- (LocalUserAdHocChatRoomPresenceListener) listeners.next();
-
+ for (LocalUserAdHocChatRoomPresenceListener listener : listeners)
listener.localUserAdHocPresenceChanged(evt);
- }
}
/**
diff --git a/src/net/java/sip/communicator/impl/protocol/icq/OperationSetPersistentPresenceIcqImpl.java b/src/net/java/sip/communicator/impl/protocol/icq/OperationSetPersistentPresenceIcqImpl.java
index c9f710e1b..472781fc1 100644
--- a/src/net/java/sip/communicator/impl/protocol/icq/OperationSetPersistentPresenceIcqImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/icq/OperationSetPersistentPresenceIcqImpl.java
@@ -639,7 +639,7 @@ else if(getPresenceStatus().equals(AimStatusEnum.AWAY))
}
else
{
- long icqStatus = presenceStatusToStatusLong((IcqStatusEnum)status);
+ long icqStatus = presenceStatusToStatusLong(status);
logger.debug("Will set status: " + status + " long=" + icqStatus);
diff --git a/src/net/java/sip/communicator/impl/protocol/mock/MockOperationSetFileTransfer.java b/src/net/java/sip/communicator/impl/protocol/mock/MockOperationSetFileTransfer.java
index 2e9d8a689..04df91c62 100644
--- a/src/net/java/sip/communicator/impl/protocol/mock/MockOperationSetFileTransfer.java
+++ b/src/net/java/sip/communicator/impl/protocol/mock/MockOperationSetFileTransfer.java
@@ -7,11 +7,10 @@
package net.java.sip.communicator.impl.protocol.mock;
import java.io.*;
-
import java.util.*;
+
import net.java.sip.communicator.service.protocol.*;
import net.java.sip.communicator.service.protocol.event.*;
-import net.java.sip.communicator.util.*;
/**
* A mock implementation of a basic telephony opearation set
@@ -21,8 +20,6 @@
public class MockOperationSetFileTransfer
implements OperationSetFileTransfer
{
- private static final Logger logger =
- Logger.getLogger(MockOperationSetFileTransfer.class);
/**
* A list of listeners registered for file transfer events.
diff --git a/src/net/java/sip/communicator/impl/protocol/msn/FileTransferImpl.java b/src/net/java/sip/communicator/impl/protocol/msn/FileTransferImpl.java
index 46ff7f88f..502d2ca7e 100644
--- a/src/net/java/sip/communicator/impl/protocol/msn/FileTransferImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/msn/FileTransferImpl.java
@@ -9,7 +9,6 @@
import java.io.*;
import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.util.*;
import net.sf.jml.*;
/**
@@ -19,12 +18,6 @@
public class FileTransferImpl
extends AbstractFileTransfer
{
- /**
- * Logger
- */
- private static final Logger logger =
- Logger.getLogger(FileTransferImpl.class);
-
private String id = null;
private Contact contact = null;
private File file = null;
diff --git a/src/net/java/sip/communicator/impl/protocol/msn/OperationSetAdHocMultiUserChatMsnImpl.java b/src/net/java/sip/communicator/impl/protocol/msn/OperationSetAdHocMultiUserChatMsnImpl.java
index e969e0ca5..fdde12b39 100644
--- a/src/net/java/sip/communicator/impl/protocol/msn/OperationSetAdHocMultiUserChatMsnImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/msn/OperationSetAdHocMultiUserChatMsnImpl.java
@@ -268,10 +268,7 @@ private AdHocChatRoomMsnImpl createLocalAdHocChatRoomInstance(
private AdHocChatRoomMsnImpl getLocalAdHocChatRoomInstance(
MsnSwitchboard switchboard)
{
- AdHocChatRoomMsnImpl adHocRoom = (AdHocChatRoomMsnImpl)
- this.adHocChatRoomCache.get(switchboard);
-
- return adHocRoom;
+ return adHocChatRoomCache.get(switchboard);
}
/**
@@ -285,8 +282,8 @@ private AdHocChatRoomMsnImpl getLocalAdHocChatRoomInstance(
private AdHocChatRoomMsnImpl createLocalAdHocChatRoomInstance(
MsnSwitchboard switchboard)
{
- AdHocChatRoomMsnImpl adHocChatRoom = (AdHocChatRoomMsnImpl)
- this.adHocChatRoomCache.get(switchboard);
+ AdHocChatRoomMsnImpl adHocChatRoom
+ = adHocChatRoomCache.get(switchboard);
if (adHocChatRoom == null)
{
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/CallPeerSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/CallPeerSipImpl.java
index ac7d8d3ef..802ad8c59 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/CallPeerSipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/CallPeerSipImpl.java
@@ -12,7 +12,6 @@
import javax.sip.*;
import javax.sip.address.*;
-import javax.sip.address.URI;
import javax.sip.header.*;
import javax.sip.message.*;
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/CallSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/CallSipImpl.java
index a3a18887e..1b0f899d5 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/CallSipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/CallSipImpl.java
@@ -6,17 +6,13 @@
*/
package net.java.sip.communicator.impl.protocol.sip;
-import java.net.*;
-import java.text.*;
import java.util.*;
import javax.sip.*;
import javax.sip.address.*;
-import javax.sip.address.URI;//disambiguates java.net.URI
import javax.sip.header.*;
import javax.sip.message.*;
-import net.java.sip.communicator.service.media.*;
import net.java.sip.communicator.service.protocol.*;
import net.java.sip.communicator.service.protocol.event.*;
import net.java.sip.communicator.util.*;
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/EventPackageNotifier.java b/src/net/java/sip/communicator/impl/protocol/sip/EventPackageNotifier.java
index 0a4d71b52..311a4f374 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/EventPackageNotifier.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/EventPackageNotifier.java
@@ -252,7 +252,7 @@ private ClientTransaction createNotify( Dialog dialog,
ex);
}
- req.setHeader((Header) viaHeaders.get(0));
+ req.setHeader(viaHeaders.get(0));
// add the content
try
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetVideoTelephonySipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetVideoTelephonySipImpl.java
index 557992095..b0e180c6d 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetVideoTelephonySipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetVideoTelephonySipImpl.java
@@ -7,7 +7,6 @@
package net.java.sip.communicator.impl.protocol.sip;
import java.awt.*;
-import java.util.*;
import net.java.sip.communicator.service.media.*;
import net.java.sip.communicator.service.protocol.*;
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/SipMessageFactory.java b/src/net/java/sip/communicator/impl/protocol/sip/SipMessageFactory.java
index a8287ef8f..8b68ef96f 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/SipMessageFactory.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/SipMessageFactory.java
@@ -10,18 +10,18 @@
import gov.nist.javax.sip.header.extensions.*;
import gov.nist.javax.sip.message.*;
-import java.net.URLDecoder; //disamgibuates javax.sip.address.URI
+import java.net.*;
import java.text.*;
import java.util.*;
import javax.sip.*;
import javax.sip.address.*;
+import javax.sip.address.URI;
import javax.sip.header.*;
import javax.sip.message.*;
-import javax.sip.message.Message;//disambiguates with service.protocol.Message
+import javax.sip.message.Message;
import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.service.protocol.event.*;
import net.java.sip.communicator.util.*;
/**
diff --git a/src/net/java/sip/communicator/impl/protocol/zeroconf/ProtocolProviderServiceZeroconfImpl.java b/src/net/java/sip/communicator/impl/protocol/zeroconf/ProtocolProviderServiceZeroconfImpl.java
index 53cb69080..80f9e5449 100644
--- a/src/net/java/sip/communicator/impl/protocol/zeroconf/ProtocolProviderServiceZeroconfImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/zeroconf/ProtocolProviderServiceZeroconfImpl.java
@@ -105,7 +105,7 @@ protected void initialize(String userID,
{
synchronized(initializationLock)
{
- this.accountID = (ZeroconfAccountID) accountID;
+ this.accountID = accountID;
//initialize the presence operationset
diff --git a/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDetailsPanel.java b/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDetailsPanel.java
index 5ffe8a190..91b55d1c2 100644
--- a/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDetailsPanel.java
+++ b/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDetailsPanel.java
@@ -248,7 +248,7 @@ private JPanel createSummaryInfoPanel()
String firstNameDetail = "";
while (contactDetails.hasNext())
{
- genericDetail = (FirstNameDetail) contactDetails.next();
+ genericDetail = contactDetails.next();
firstNameDetail =
firstNameDetail + " " + genericDetail.getDetailValue();
@@ -267,7 +267,7 @@ private JPanel createSummaryInfoPanel()
String middleNameDetail = "";
while (contactDetails.hasNext())
{
- genericDetail = (MiddleNameDetail) contactDetails.next();
+ genericDetail = contactDetails.next();
middleNameDetail =
middleNameDetail + " " + genericDetail.getDetailValue();
}
@@ -285,7 +285,7 @@ private JPanel createSummaryInfoPanel()
String lastNameDetail = "";
while (contactDetails.hasNext())
{
- genericDetail = (LastNameDetail) contactDetails.next();
+ genericDetail = contactDetails.next();
lastNameDetail =
lastNameDetail + " " + genericDetail.getDetailValue();
@@ -304,7 +304,7 @@ private JPanel createSummaryInfoPanel()
String genderDetail = "";
while (contactDetails.hasNext())
{
- genericDetail = (GenderDetail) contactDetails.next();
+ genericDetail = contactDetails.next();
genderDetail = genderDetail + " " + genericDetail.getDetailValue();
}
@@ -322,7 +322,7 @@ private JPanel createSummaryInfoPanel()
String ageDetail = "";
if (contactDetails.hasNext())
{
- genericDetail = (BirthDateDetail) contactDetails.next();
+ genericDetail = contactDetails.next();
Calendar calendarDetail =
(Calendar) genericDetail.getDetailValue();
@@ -358,7 +358,7 @@ private JPanel createSummaryInfoPanel()
String emailDetail = "";
while (contactDetails.hasNext())
{
- genericDetail = (EmailAddressDetail) contactDetails.next();
+ genericDetail = contactDetails.next();
emailDetail = emailDetail + " " + genericDetail.getDetailValue();
}
@@ -375,7 +375,7 @@ private JPanel createSummaryInfoPanel()
String phoneNumberDetail = "";
while (contactDetails.hasNext())
{
- genericDetail = (PhoneNumberDetail) contactDetails.next();
+ genericDetail = contactDetails.next();
phoneNumberDetail =
phoneNumberDetail + " " + genericDetail.getDetailValue();
}
diff --git a/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardMenuItem.java b/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardMenuItem.java
index b45678bb0..a102ffea7 100644
--- a/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardMenuItem.java
+++ b/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardMenuItem.java
@@ -72,8 +72,8 @@ public void setCurrentContact (MetaContact metaContact)
Contact contact = iter.next();
ProtocolProviderService pps = contact.getProtocolProvider();
- OperationSetWhiteboarding opSetWb = (OperationSetWhiteboarding)
- pps.getOperationSet(OperationSetWhiteboarding.class);
+ OperationSetWhiteboarding opSetWb
+ = pps.getOperationSet(OperationSetWhiteboarding.class);
String contactDisplayName = contact.getDisplayName();
@@ -140,8 +140,8 @@ public Object getComponent()
Contact contact = iter.next();
ProtocolProviderService pps = contact.getProtocolProvider();
- OperationSetWhiteboarding opSetWb = (OperationSetWhiteboarding)
- pps.getOperationSet(OperationSetWhiteboarding.class);
+ OperationSetWhiteboarding opSetWb
+ = pps.getOperationSet(OperationSetWhiteboarding.class);
if (opSetWb != null)
{
diff --git a/src/net/java/sip/communicator/util/swing/plaf/SIPCommTabbedPaneUI.java b/src/net/java/sip/communicator/util/swing/plaf/SIPCommTabbedPaneUI.java
index 61130483f..0bd3cf2ad 100644
--- a/src/net/java/sip/communicator/util/swing/plaf/SIPCommTabbedPaneUI.java
+++ b/src/net/java/sip/communicator/util/swing/plaf/SIPCommTabbedPaneUI.java
@@ -1019,7 +1019,7 @@ public void actionPerformed(ActionEvent e)
if (command != null && command.length() > 0)
{
- int mnemonic = (int) e.getActionCommand().charAt(0);
+ int mnemonic = e.getActionCommand().charAt(0);
if (mnemonic >= 'a' && mnemonic <= 'z')
{
mnemonic -= ('a' - 'A');
diff --git a/test/net/java/sip/communicator/slick/protocol/icq/IcqTesterAgent.java b/test/net/java/sip/communicator/slick/protocol/icq/IcqTesterAgent.java
index 51ff78389..b99ede0cf 100644
--- a/test/net/java/sip/communicator/slick/protocol/icq/IcqTesterAgent.java
+++ b/test/net/java/sip/communicator/slick/protocol/icq/IcqTesterAgent.java
@@ -941,7 +941,7 @@ public void groupAdded(BuddyList list,
System.out.println(" buddy is="
+((Buddy)buddies.get(i))
.getScreenname().getFormatted());
- Buddy b = ((Buddy)buddies.get(i));
+ Buddy b = buddies.get(i);
conn.getBuddyInfoTracker().addTracker(b.getScreenname(),
new BuddyInfoTrackerListener(){});
}