sipwise
/
jitsi
mirror of https://github.com/sipwise/jitsi.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixes warnings

Browse Source
cusax-fix
Lyubomir Marinov 17 years ago
parent 2f8b4304f2
commit f21f8cc962
27 changed files with 156 additions and 181 deletions
Show Stats Download Patch File Download Diff File

11
src/net/java/sip/communicator/impl/gui/main/call/CallManager.java
Unescape View File

@ -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
{

90
src/net/java/sip/communicator/impl/gui/main/chat/MetaContactChatTransport.java
Unescape View File

@ -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)
{

23
src/net/java/sip/communicator/impl/gui/main/chat/conference/AdHocConferenceChatTransport.java
Unescape View File

@ -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 <tt>ConferenceChatTransport</tt> 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);

24
src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatTransport.java
Unescape View File

@ -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 <tt>ConferenceChatTransport</tt> 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);
}

19
src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListModel.java
Unescape View File

@ -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
* <tt>MetaContactListService</tt> itself. The <tt>ContactListModel</tt>
* 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 <tt>ListModel</tt> for <tt>MetaContactListService</tt> in order to
* display it in <tt>ContactList</tt> 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 <tt>ContactListModel</tt> instance which is to
* implement <tt>ListModel</tt> for a specific
* <tt>MetaContactListService</tt> in order to display it in
* <tt>ContactList</tt> as a list instead of a tree.
*
* @param contactList The MetaContactListService which contains the contact
* list.
* @param contactList the <tt>MetaContactListService</tt> which contains the
* contact list to be represented as a list by the new instance
*/
public ContactListModel(MetaContactListService contactList)
{

16
src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java
Unescape View File

@ -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;

4
src/net/java/sip/communicator/impl/gui/utils/InviteDialog.java
Unescape View File

@ -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);
}

4
src/net/java/sip/communicator/impl/media/CallSessionImpl.java
Unescape View File

@ -599,7 +599,9 @@ private boolean stopSendStreaming(RTPManager rtpManager)
/**
* Stops and closes all streams currently handled by <tt>rtpManager</tt>.
*
* @param rtpManager the rtpManager whose streams we'll be stopping.
* @param rtpManager the <tt>RTPManager</tt> to stop the streams of
* @param dispose <tt>true</tt> to dispose of <tt>rtpManager</tt> after
* stopping its streams; otherwise, <tt>false</tt>
* @return <tt>true</tt> if there was an actual change in the streaming i.e.
* the streaming wasn't already stopped before this request;
* <tt>false</tt>, otherwise

2
src/net/java/sip/communicator/impl/media/codec/audio/g729/Coder.java
Unescape View File

@ -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);

18
src/net/java/sip/communicator/impl/protocol/facebook/OperationSetPersistentPresenceFacebookImpl.java
Unescape View File

@ -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);
}

18
src/net/java/sip/communicator/impl/protocol/gibberish/OperationSetPersistentPresenceGibberishImpl.java
Unescape View File

@ -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);
}
/**

7
src/net/java/sip/communicator/impl/protocol/icq/FileTransferImpl.java
Unescape View File

@ -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;

36
src/net/java/sip/communicator/impl/protocol/icq/OperationSetAdHocMultiUserChatIcqImpl.java
Unescape View File

@ -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<AdHocChatRoomInvitationListener> listeners = null;
Iterable<AdHocChatRoomInvitationListener> listeners;
synchronized (invitationListeners)
{
listeners =
new ArrayList<AdHocChatRoomInvitationListener>(
invitationListeners).iterator();
listeners
= new ArrayList<AdHocChatRoomInvitationListener>(
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<LocalUserAdHocChatRoomPresenceListener> listeners = null;
Iterable<LocalUserAdHocChatRoomPresenceListener> listeners = null;
synchronized (presenceListeners)
{
listeners =
new ArrayList<LocalUserAdHocChatRoomPresenceListener>(
presenceListeners).iterator();
listeners
= new ArrayList<LocalUserAdHocChatRoomPresenceListener>(
presenceListeners);
}
while (listeners.hasNext())
{
LocalUserAdHocChatRoomPresenceListener listener =
(LocalUserAdHocChatRoomPresenceListener) listeners.next();
for (LocalUserAdHocChatRoomPresenceListener listener : listeners)
listener.localUserAdHocPresenceChanged(evt);
}
}
/**

2
src/net/java/sip/communicator/impl/protocol/icq/OperationSetPersistentPresenceIcqImpl.java
Unescape View File

@ -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);

5
src/net/java/sip/communicator/impl/protocol/mock/MockOperationSetFileTransfer.java
Unescape View File

@ -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.

7
src/net/java/sip/communicator/impl/protocol/msn/FileTransferImpl.java
Unescape View File

@ -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;

9
src/net/java/sip/communicator/impl/protocol/msn/OperationSetAdHocMultiUserChatMsnImpl.java
Unescape View File

@ -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)
{

1
src/net/java/sip/communicator/impl/protocol/sip/CallPeerSipImpl.java
Unescape View File

@ -12,7 +12,6 @@
import javax.sip.*;
import javax.sip.address.*;
import javax.sip.address.URI;
import javax.sip.header.*;
import javax.sip.message.*;

4
src/net/java/sip/communicator/impl/protocol/sip/CallSipImpl.java
Unescape View File

@ -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.*;

2
src/net/java/sip/communicator/impl/protocol/sip/EventPackageNotifier.java
Unescape View File

@ -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

1
src/net/java/sip/communicator/impl/protocol/sip/OperationSetVideoTelephonySipImpl.java
Unescape View File

@ -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.*;

6
src/net/java/sip/communicator/impl/protocol/sip/SipMessageFactory.java
Unescape View File

@ -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.*;
/**

2
src/net/java/sip/communicator/impl/protocol/zeroconf/ProtocolProviderServiceZeroconfImpl.java
Unescape View File

@ -105,7 +105,7 @@ protected void initialize(String userID,
{
synchronized(initializationLock)
{
this.accountID = (ZeroconfAccountID) accountID;
this.accountID = accountID;
//initialize the presence operationset

14
src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDetailsPanel.java
Unescape View File

@ -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();
}

8
src/net/java/sip/communicator/plugin/whiteboard/WhiteboardMenuItem.java
Unescape View File

@ -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)
{

2
src/net/java/sip/communicator/util/swing/plaf/SIPCommTabbedPaneUI.java
Unescape View File

@ -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');

2
test/net/java/sip/communicator/slick/protocol/icq/IcqTesterAgent.java
Unescape View File

@ -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(){});
}

Write Preview
Loading…
Cancel
Save