aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java/sip
diff options
context:
space:
mode:
authorLyubomir Marinov <lyubomir.marinov@jitsi.org>2009-03-02 23:15:30 +0000
committerLyubomir Marinov <lyubomir.marinov@jitsi.org>2009-03-02 23:15:30 +0000
commitc1f7dcda55dc575e93e38859b827434537bc734a (patch)
tree14e89a4aef0b37173929e03152b03deb9bbbb773 /src/net/java/sip
parent01b4f2019e77eace52e1d434aa8d45bf68207220 (diff)
downloadjitsi-c1f7dcda55dc575e93e38859b827434537bc734a.zip
jitsi-c1f7dcda55dc575e93e38859b827434537bc734a.tar.gz
jitsi-c1f7dcda55dc575e93e38859b827434537bc734a.tar.bz2
Removes redundant null checks.
Diffstat (limited to 'src/net/java/sip')
-rw-r--r--src/net/java/sip/communicator/impl/protocol/icq/OperationSetMultiUserChatIcqImpl.java4
-rw-r--r--src/net/java/sip/communicator/impl/protocol/jabber/OperationSetMultiUserChatJabberImpl.java6
-rw-r--r--src/net/java/sip/communicator/impl/protocol/msn/OperationSetMultiUserChatMsnImpl.java4
-rw-r--r--src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetMultiUserChatYahooImpl.java4
4 files changed, 5 insertions, 13 deletions
diff --git a/src/net/java/sip/communicator/impl/protocol/icq/OperationSetMultiUserChatIcqImpl.java b/src/net/java/sip/communicator/impl/protocol/icq/OperationSetMultiUserChatIcqImpl.java
index ba77f3e..4ad717e 100644
--- a/src/net/java/sip/communicator/impl/protocol/icq/OperationSetMultiUserChatIcqImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/icq/OperationSetMultiUserChatIcqImpl.java
@@ -618,9 +618,7 @@ public class OperationSetMultiUserChatIcqImpl
if (member != null)
{
member.setContact(contact);
-
- if (contact != null)
- member.setAvatar(contact.getImage());
+ member.setAvatar(contact.getImage());
}
}
}
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetMultiUserChatJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetMultiUserChatJabberImpl.java
index 95c10ba..5cc8b81 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetMultiUserChatJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetMultiUserChatJabberImpl.java
@@ -870,10 +870,8 @@ public class OperationSetMultiUserChatJabberImpl
if (member != null)
{
member.setContact(contact);
-
- if (contact != null)
- member.setAvatar(contact.getImage());
+ member.setAvatar(contact.getImage());
}
}
}
-} \ No newline at end of file
+}
diff --git a/src/net/java/sip/communicator/impl/protocol/msn/OperationSetMultiUserChatMsnImpl.java b/src/net/java/sip/communicator/impl/protocol/msn/OperationSetMultiUserChatMsnImpl.java
index 33579be..bfd5110 100644
--- a/src/net/java/sip/communicator/impl/protocol/msn/OperationSetMultiUserChatMsnImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/msn/OperationSetMultiUserChatMsnImpl.java
@@ -893,9 +893,7 @@ public class OperationSetMultiUserChatMsnImpl
if (member != null)
{
member.setContact(contact);
-
- if (contact != null)
- member.setAvatar(contact.getImage());
+ member.setAvatar(contact.getImage());
}
}
}
diff --git a/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetMultiUserChatYahooImpl.java b/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetMultiUserChatYahooImpl.java
index 3439560..b5bdd25 100644
--- a/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetMultiUserChatYahooImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetMultiUserChatYahooImpl.java
@@ -830,9 +830,7 @@ public class OperationSetMultiUserChatYahooImpl
if (member != null)
{
member.setContact(contact);
-
- if (contact != null)
- member.setAvatar(contact.getImage());
+ member.setAvatar(contact.getImage());
}
}
}