Limits the use of Constants.FONT because it overrides the system font (when it's available) and is thus related to issue #423 (GUI default font shows squares instead of Chinese characters). It's now used only in the SC L&F (which is itself not used on Windows, Mac OS X and GNU/Linux+GNOME) and to badge the protocol images with numbers.

21 files changed, 107 insertions, 140 deletions

diff --git a/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationRequestedDialog.java b/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationRequestedDialog.java
index 6fe313c..7ac9d33 100644
--- a/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationRequestedDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationRequestedDialog.java
@@ -90,15 +90,17 @@ public class AuthorizationRequestedDialog
         this.setTitle(title);
         
         titleLabel.setHorizontalAlignment(JLabel.CENTER);
-        titleLabel.setFont(Constants.FONT.deriveFont(Font.BOLD, 18f));
         titleLabel.setText(title);
+
+        Font font = titleLabel.getFont();
+        titleLabel.setFont(font.deriveFont(Font.BOLD, font.getSize2D() + 6));
         
         infoTextArea.setText(
             GuiActivator.getResources().getI18NString(
                 "service.gui.AUTHORIZATION_REQUESTED_INFO", 
                 new String[]{contact.getDisplayName()}));
         
-        this.infoTextArea.setFont(Constants.FONT.deriveFont(Font.BOLD, 12f));
+        this.infoTextArea.setFont(infoTextArea.getFont().deriveFont(Font.BOLD));
         this.infoTextArea.setLineWrap(true);
         this.infoTextArea.setWrapStyleWord(true);
         this.infoTextArea.setOpaque(false);
diff --git a/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationResponseDialog.java b/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationResponseDialog.java
index b65dbab..e38ccff 100644
--- a/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationResponseDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationResponseDialog.java
@@ -65,8 +65,10 @@ public class AuthorizationResponseDialog extends SIPCommDialog
         this.setTitle(title);
         
         titleLabel.setHorizontalAlignment(JLabel.CENTER);
-        titleLabel.setFont(Constants.FONT.deriveFont(Font.BOLD, 18f));
         titleLabel.setText(title);
+
+        Font font = titleLabel.getFont();
+        titleLabel.setFont(font.deriveFont(Font.BOLD, font.getSize2D() + 6));
         
         this.mainPanel.setPreferredSize(new Dimension(400, 250));
         
@@ -106,7 +108,7 @@ public class AuthorizationResponseDialog extends SIPCommDialog
             this.mainPanel.setPreferredSize(new Dimension(400, 180));
         }
                 
-        this.infoTextArea.setFont(Constants.FONT.deriveFont(Font.BOLD, 12f));
+        this.infoTextArea.setFont(infoTextArea.getFont().deriveFont(Font.BOLD));
         this.infoTextArea.setLineWrap(true);
         this.infoTextArea.setWrapStyleWord(true);
         this.infoTextArea.setEditable(false);
diff --git a/src/net/java/sip/communicator/impl/gui/main/authorization/RequestAuthorizationDialog.java b/src/net/java/sip/communicator/impl/gui/main/authorization/RequestAuthorizationDialog.java
index 5c3adda..7df63fe 100644
--- a/src/net/java/sip/communicator/impl/gui/main/authorization/RequestAuthorizationDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/authorization/RequestAuthorizationDialog.java
@@ -89,8 +89,10 @@ public class RequestAuthorizationDialog
         this.setTitle(title);
         
         titleLabel.setHorizontalAlignment(JLabel.CENTER);
-        titleLabel.setFont(Constants.FONT.deriveFont(Font.BOLD, 18f));
         titleLabel.setText(title);
+
+        Font font = titleLabel.getFont();
+        titleLabel.setFont(font.deriveFont(Font.BOLD, font.getSize2D() + 6));
         
         this.mainPanel.setPreferredSize(new Dimension(400, 230));
         
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatTransportSelectorBox.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatTransportSelectorBox.java
index af17fb3..95d38b0 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatTransportSelectorBox.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatTransportSelectorBox.java
@@ -8,12 +8,10 @@ package net.java.sip.communicator.impl.gui.main.chat;
 
 import java.awt.*;
 import java.awt.event.*;
-import java.awt.image.*;
 import java.util.*;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.lookandfeel.*;
 import net.java.sip.communicator.impl.gui.utils.*;
@@ -57,13 +55,9 @@ public class ChatTransportSelectorBox
         // a valid menu item
         this.menu.setEnabled(false);
 
-        Iterator chatTransports = chatSession.getChatTransports();
+        Iterator<ChatTransport> chatTransports = chatSession.getChatTransports();
         while (chatTransports.hasNext())
-        {
-            ChatTransport chatTransport = (ChatTransport) chatTransports.next();
-
-            this.addChatTransport(chatTransport);
-        }
+            this.addChatTransport(chatTransports.next());
 
         if (this.menu.getItemCount() > 0 &&
             selectedChatTransport.allowsInstantMessage())
@@ -156,31 +150,11 @@ public class ChatTransportSelectorBox
      */
     public Image createTransportStatusImage(ChatTransport chatTransport)
     {
-        Image statusImage = ImageLoader.getBytesInImage(
-                chatTransport.getStatus().getStatusIcon());
-
-        int index = GuiActivator.getUIService().getMainFrame()
-            .getProviderIndex(chatTransport.getProtocolProvider());
-
-        Image img;
-        if(index > 0) {
-            BufferedImage buffImage
-                = new BufferedImage(22, 16, BufferedImage.TYPE_INT_ARGB);
-            Graphics2D g = (Graphics2D)buffImage.getGraphics();
-
-            AntialiasingManager.activateAntialiasing(g);
-            g.setColor(Color.DARK_GRAY);
-            g.setFont(Constants.FONT.deriveFont(Font.BOLD, 9));
-            g.drawImage(statusImage, 0, 0, null);
-            g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER));
-            g.drawString(Integer.toString(index+1), 14, 8);
-
-            img = buffImage;
-        }
-        else {
-            img = statusImage;
-        }
-        return img;
+        return
+            ImageLoader.badgeImageWithProtocolIndex(
+                ImageLoader.getBytesInImage(
+                    chatTransport.getStatus().getStatusIcon()),
+                chatTransport.getProtocolProvider());
     }
 
     /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatInviteDialog.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatInviteDialog.java
index 4e376a9..b9bf6c7 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatInviteDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatInviteDialog.java
@@ -85,7 +85,7 @@ public class ChatInviteDialog
         infoTextArea.setText(GuiActivator.getResources()
             .getI18NString("service.gui.INVITE_CONTACT_MSG"));
 
-        infoTextArea.setFont(Constants.FONT.deriveFont(Font.BOLD));
+        infoTextArea.setFont(infoTextArea.getFont().deriveFont(Font.BOLD));
         infoTextArea.setLineWrap(true);
         infoTextArea.setOpaque(false);
         infoTextArea.setWrapStyleWord(true);
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/InvitationReceivedDialog.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/InvitationReceivedDialog.java
index cd8de87..15cf011 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/InvitationReceivedDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/InvitationReceivedDialog.java
@@ -121,8 +121,8 @@ public class InvitationReceivedDialog
 
             this.dataPanel.add(invitationReasonTextArea, BorderLayout.CENTER);
         }
-        
-        this.infoTextArea.setFont(Constants.FONT.deriveFont(Font.BOLD));
+
+        this.infoTextArea.setFont(infoTextArea.getFont().deriveFont(Font.BOLD));
         this.infoTextArea.setLineWrap(true);
         this.infoTextArea.setOpaque(false);
         this.infoTextArea.setWrapStyleWord(true);
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/ChatRoomNamePanel.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/ChatRoomNamePanel.java
index 1540e94..0e41fb2 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/ChatRoomNamePanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/ChatRoomNamePanel.java
@@ -82,7 +82,10 @@ public class ChatRoomNamePanel
         this.dataPanel.add(textField, BorderLayout.CENTER);
 
         this.infoTitleLabel.setHorizontalAlignment(JLabel.CENTER);
-        this.infoTitleLabel.setFont(Constants.FONT.deriveFont(Font.BOLD, 18));
+
+        Font font = infoTitleLabel.getFont();
+        infoTitleLabel.setFont(
+            font.deriveFont(Font.BOLD, font.getSize2D() + 6));
 
         this.labelsPanel.add(infoTitleLabel);
         this.labelsPanel.add(infoLabel);
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/SelectAccountPanel.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/SelectAccountPanel.java
index acbadb0..38e8e2d 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/SelectAccountPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/SelectAccountPanel.java
@@ -17,7 +17,6 @@ import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.swing.*;
 
 /**
@@ -90,7 +89,9 @@ public class SelectAccountPanel extends TransparentPanel
 
         this.infoLabel.setEditable(false);
 
-        this.infoTitleLabel.setFont(Constants.FONT.deriveFont(Font.BOLD, 18));
+        Font font = infoTitleLabel.getFont();
+        infoTitleLabel.setFont(
+            font.deriveFont(Font.BOLD, font.getSize2D() + 6));
 
         this.labelsPanel.add(infoTitleLabel);
         this.labelsPanel.add(infoLabel);
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/ChatRoomAuthenticationWindow.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/ChatRoomAuthenticationWindow.java
index 4580221..23b940d 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/ChatRoomAuthenticationWindow.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/ChatRoomAuthenticationWindow.java
@@ -113,15 +113,15 @@ public class ChatRoomAuthenticationWindow
         this.infoTextArea.setOpaque(false);
         this.infoTextArea.setLineWrap(true);
         this.infoTextArea.setWrapStyleWord(true);
-        this.infoTextArea.setFont(Constants.FONT.deriveFont(Font.BOLD, 12f));
+        this.infoTextArea.setFont(infoTextArea.getFont().deriveFont(Font.BOLD));
         this.infoTextArea.setEditable(false);
         this.infoTextArea.setText(
             GuiActivator.getResources().getI18NString(
                 "service.gui.CHAT_ROOM_REQUIRES_PASSWORD",
                 new String[]{chatRoom.getChatRoomName()}));
 
-        this.idLabel.setFont(Constants.FONT.deriveFont(Font.BOLD));
-        this.passwdLabel.setFont(Constants.FONT.deriveFont(Font.BOLD));
+        this.idLabel.setFont(idLabel.getFont().deriveFont(Font.BOLD));
+        this.passwdLabel.setFont(passwdLabel.getFont().deriveFont(Font.BOLD));
 
         this.labelsPanel.add(idLabel);
         this.labelsPanel.add(passwdLabel);
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/ChatRoomNamePanel.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/ChatRoomNamePanel.java
index eb02a9a..8b89d89 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/ChatRoomNamePanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/ChatRoomNamePanel.java
@@ -13,7 +13,6 @@ import javax.swing.event.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
-import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.util.swing.*;
 
 /**
@@ -58,7 +57,10 @@ public class ChatRoomNamePanel
         this.dataPanel.add(textField, BorderLayout.CENTER);
 
         this.infoTitleLabel.setHorizontalAlignment(JLabel.CENTER);
-        this.infoTitleLabel.setFont(Constants.FONT.deriveFont(Font.BOLD, 18));
+
+        Font font = infoTitleLabel.getFont();
+        infoTitleLabel.setFont(
+            font.deriveFont(Font.BOLD, font.getSize2D() + 6));
 
         this.labelsPanel.add(infoTitleLabel);
         this.labelsPanel.add(infoLabel);
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/SelectAccountPanel.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/SelectAccountPanel.java
index aaeeba8..71dc598 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/SelectAccountPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/SelectAccountPanel.java
@@ -96,7 +96,9 @@ public class SelectAccountPanel extends TransparentPanel
 
         this.infoLabel.setEditable(false);
 
-        this.infoTitleLabel.setFont(Constants.FONT.deriveFont(Font.BOLD, 18));
+        Font font = infoTitleLabel.getFont();
+        infoTitleLabel.setFont(
+            font.deriveFont(Font.BOLD, font.getSize2D() + 6));
 
         this.labelsPanel.add(infoTitleLabel);
         this.labelsPanel.add(infoLabel);
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java
index 6129a63..12a94bc 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java
@@ -8,7 +8,6 @@ package net.java.sip.communicator.impl.gui.main.contactlist;
 
 import java.awt.*;
 import java.awt.event.*;
-import java.awt.image.*;
 import java.util.*;
 
 import javax.swing.*;
@@ -27,7 +26,6 @@ import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.gui.Container;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
-import net.java.sip.communicator.util.swing.*;
 
 import org.osgi.framework.*;
 
@@ -968,35 +966,11 @@ public class ContactRightButtonMenu
      */
     public Image createContactStatusImage(Contact protoContact)
     {
-        Image statusImage = ImageLoader.getBytesInImage(
-                protoContact.getPresenceStatus().getStatusIcon());
-
-        int index = mainFrame.getProviderIndex(
-            protoContact.getProtocolProvider());
-
-        Image img = null;
-        if(index > 0)
-        {
-            BufferedImage buffImage = new BufferedImage(
-                    22, 16, BufferedImage.TYPE_INT_ARGB);
-
-            Graphics2D g = (Graphics2D)buffImage.getGraphics();
-            AlphaComposite ac =
-                AlphaComposite.getInstance(AlphaComposite.SRC_OVER);
-
-            AntialiasingManager.activateAntialiasing(g);
-            g.setColor(Color.DARK_GRAY);
-            g.setFont(Constants.FONT.deriveFont(Font.BOLD, 9));
-            g.drawImage(statusImage, 0, 0, null);
-            g.setComposite(ac);
-            g.drawString(Integer.toString(index+1), 14, 8);
-
-            img = buffImage;
-        }
-        else {
-            img = statusImage;
-        }
-        return img;
+        return
+            ImageLoader.badgeImageWithProtocolIndex(
+                ImageLoader.getBytesInImage(
+                    protoContact.getPresenceStatus().getStatusIcon()),
+                protoContact.getProtocolProvider());
     }
     
     /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/MoveSubcontactMessageDialog.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/MoveSubcontactMessageDialog.java
index c9e26fe..f4200be 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/MoveSubcontactMessageDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/MoveSubcontactMessageDialog.java
@@ -97,7 +97,9 @@ public class MoveSubcontactMessageDialog
         });
 
         this.infoTitleLabel.setHorizontalAlignment(JLabel.CENTER);
-        this.infoTitleLabel.setFont(Constants.FONT.deriveFont(Font.BOLD, 18));
+
+        Font font = infoTitleLabel.getFont();
+        infoTitleLabel.setFont(font.deriveFont(Font.BOLD, font.getSize2D() + 6));
 
         this.labelsPanel.add(infoTitleLabel);
         this.labelsPanel.add(infoArea);
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameContactPanel.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameContactPanel.java
index 0a33f6f..a7d65d7 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameContactPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameContactPanel.java
@@ -69,7 +69,9 @@ public class RenameContactPanel
         this.dataPanel.add(textField, BorderLayout.CENTER);
 
         this.infoTitleLabel.setHorizontalAlignment(JLabel.CENTER);
-        this.infoTitleLabel.setFont(Constants.FONT.deriveFont(Font.BOLD, 18));
+
+        Font font = infoTitleLabel.getFont();
+        infoTitleLabel.setFont(font.deriveFont(Font.BOLD, font.getSize2D() + 6));
 
         this.labelsPanel.add(infoTitleLabel);
         this.labelsPanel.add(infoLabel);
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameGroupPanel.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameGroupPanel.java
index 3c0f60a..f66f71d 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameGroupPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameGroupPanel.java
@@ -69,7 +69,9 @@ public class RenameGroupPanel
         this.dataPanel.add(textField, BorderLayout.CENTER);
 
         this.infoTitleLabel.setHorizontalAlignment(JLabel.CENTER);
-        this.infoTitleLabel.setFont(Constants.FONT.deriveFont(Font.BOLD, 18));
+
+        Font font = infoTitleLabel.getFont();
+        infoTitleLabel.setFont(font.deriveFont(Font.BOLD, font.getSize2D() + 6));
 
         this.labelsPanel.add(infoTitleLabel);
         this.labelsPanel.add(infoLabel);
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactPanel.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactPanel.java
index f13bf44..cf6f159 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactPanel.java
@@ -87,7 +87,9 @@ public class AddContactPanel
         this.dataPanel.add(textField, BorderLayout.CENTER);
 
         this.infoTitleLabel.setHorizontalAlignment(JLabel.CENTER);
-        this.infoTitleLabel.setFont(Constants.FONT.deriveFont(Font.BOLD, 18));
+
+        Font font = infoTitleLabel.getFont();
+        infoTitleLabel.setFont(font.deriveFont(Font.BOLD, font.getSize2D() + 6));
 
         this.labelsPanel.add(infoTitleLabel);
         this.labelsPanel.add(infoLabel);
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectAccountPanel.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectAccountPanel.java
index fcca1db..a3d2d63 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectAccountPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectAccountPanel.java
@@ -19,7 +19,6 @@ import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.main.account.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.impl.gui.utils.Constants;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.swing.*;
@@ -112,7 +111,8 @@ public class SelectAccountPanel
 
         this.infoLabel.setEditable(false);
 
-        this.infoTitleLabel.setFont(Constants.FONT.deriveFont(Font.BOLD, 18));
+        Font font = infoTitleLabel.getFont();
+        infoTitleLabel.setFont(font.deriveFont(Font.BOLD, font.getSize2D() + 6));
 
         this.labelsPanel.add(infoTitleLabel);
         this.labelsPanel.add(infoLabel);
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectGroupPanel.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectGroupPanel.java
index f681eb3..0952e0a 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectGroupPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectGroupPanel.java
@@ -84,7 +84,9 @@ public class SelectGroupPanel
         this.infoLabel.setEditable(false);
 
         this.infoTitleLabel.setHorizontalAlignment(JLabel.CENTER);
-        this.infoTitleLabel.setFont(Constants.FONT.deriveFont(Font.BOLD, 18));
+
+        Font font = infoTitleLabel.getFont();
+        infoTitleLabel.setFont(font.deriveFont(Font.BOLD, font.getSize2D() + 6));
 
         this.labelsPanel.add(infoTitleLabel);
         this.labelsPanel.add(infoLabel);
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/addgroup/CreateGroupPanel.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/addgroup/CreateGroupPanel.java
index 882f035..2b6c0e8 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/addgroup/CreateGroupPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/addgroup/CreateGroupPanel.java
@@ -68,7 +68,9 @@ public class CreateGroupPanel
         this.dataPanel.add(textField, BorderLayout.CENTER);
         
         this.infoTitleLabel.setHorizontalAlignment(JLabel.CENTER);
-        this.infoTitleLabel.setFont(Constants.FONT.deriveFont(Font.BOLD, 18));
+
+        Font font = infoTitleLabel.getFont();
+        infoTitleLabel.setFont(font.deriveFont(Font.BOLD, font.getSize2D() + 6));
         
         this.labelsPanel.add(infoTitleLabel);
         this.labelsPanel.add(infoLabel);
diff --git a/src/net/java/sip/communicator/impl/gui/main/login/AuthenticationWindow.java b/src/net/java/sip/communicator/impl/gui/main/login/AuthenticationWindow.java
index fc4bf3d..1320381 100644
--- a/src/net/java/sip/communicator/impl/gui/main/login/AuthenticationWindow.java
+++ b/src/net/java/sip/communicator/impl/gui/main/login/AuthenticationWindow.java
@@ -26,18 +26,11 @@ import net.java.sip.communicator.util.swing.*;
  */
 public class AuthenticationWindow
     extends SIPCommFrame
-    implements  ActionListener,
-                ExportedWindow
+    implements ActionListener,
+               ExportedWindow
 {
-
     private JTextArea realmTextArea = new JTextArea();
 
-    private JLabel uinLabel = new JLabel(
-        GuiActivator.getResources().getI18NString("service.gui.IDENTIFIER"));
-
-    private JLabel passwdLabel = new JLabel(
-        GuiActivator.getResources().getI18NString("service.gui.PASSWORD"));
-
     private JComponent uinValue;
 
     private JPasswordField passwdField = new JPasswordField(15);
@@ -68,11 +61,11 @@ public class AuthenticationWindow
 
     private UserCredentials userCredentials;
 
-    private Object lock = new Object();
+    private final Object lock = new Object();
 
     private String realm;
 
-    private boolean isUserNameEditable = false;
+    private final boolean isUserNameEditable;
 
     /**
      * Creates an instance of the <tt>LoginWindow</tt>.
@@ -112,17 +105,11 @@ public class AuthenticationWindow
                 new String[]{protocolProvider.getProtocolName()}));
         }
 
-        if(logoImage != null)
-            backgroundPanel = new LoginWindowBackground(logoImage);
-        else
-            backgroundPanel = new LoginWindowBackground();
-
-        this.backgroundPanel.setPreferredSize(new Dimension(420, 230));
-
-        this.backgroundPanel.setLayout(new FlowLayout(FlowLayout.RIGHT));
-
+        backgroundPanel = new LoginWindowBackground(logoImage);
         this.backgroundPanel.setBorder(
                 BorderFactory.createEmptyBorder(20, 5, 5, 5));
+        this.backgroundPanel.setLayout(new FlowLayout(FlowLayout.RIGHT));
+        this.backgroundPanel.setPreferredSize(new Dimension(420, 230));
 
         this.getContentPane().setLayout(new BorderLayout());
 
@@ -201,14 +188,24 @@ public class AuthenticationWindow
         this.realmTextArea.setOpaque(false);
         this.realmTextArea.setLineWrap(true);
         this.realmTextArea.setWrapStyleWord(true);
-        this.realmTextArea.setFont(Constants.FONT.deriveFont(Font.BOLD, 12f));
+        this.realmTextArea.setFont(
+            realmTextArea.getFont().deriveFont(Font.BOLD));
         this.realmTextArea.setText(
             GuiActivator.getResources().getI18NString(
                 "service.gui.SECURITY_AUTHORITY_REALM",
                 new String[]{realm}));
 
-        this.uinLabel.setFont(Constants.FONT.deriveFont(Font.BOLD));
-        this.passwdLabel.setFont(Constants.FONT.deriveFont(Font.BOLD));
+        JLabel uinLabel
+            = new JLabel(
+                    GuiActivator.getResources().getI18NString(
+                        "service.gui.IDENTIFIER"));
+        uinLabel.setFont(uinLabel.getFont().deriveFont(Font.BOLD));
+
+        JLabel passwdLabel
+            = new JLabel(
+                    GuiActivator.getResources().getI18NString(
+                        "service.gui.PASSWORD"));
+        passwdLabel.setFont(passwdLabel.getFont().deriveFont(Font.BOLD));
 
         this.labelsPanel.add(uinLabel);
         this.labelsPanel.add(passwdLabel);
@@ -248,7 +245,7 @@ public class AuthenticationWindow
 
     /**
      * Sets transparent background to all components in the login window,
-     * because of the nonwhite background.
+     * because of the non-white background.
      * @param transparent <code>true</code> to set a transparent background,
      * <code>false</code> otherwise.
      */
@@ -274,9 +271,8 @@ public class AuthenticationWindow
         if (buttonName.equals("ok")) {
             if(uinValue instanceof JLabel)
                 userCredentials.setUserName(((JLabel)uinValue).getText());
-            else
-                if(uinValue instanceof JTextField)
-                    userCredentials.setUserName(((JTextField)uinValue).getText());
+            else if(uinValue instanceof JTextField)
+                userCredentials.setUserName(((JTextField)uinValue).getText());
 
             userCredentials.setPassword(
                     passwdField.getPassword());
@@ -284,7 +280,7 @@ public class AuthenticationWindow
                     rememberPassCheckBox.isSelected());
         }
         else {
-            // if usercredentials are created outside the exported window
+            // if userCredentials are created outside the exported window
             // by specifying null username we note that the window was canceled
             this.userCredentials.setUserName(null);
             this.userCredentials = null;
@@ -302,7 +298,8 @@ public class AuthenticationWindow
      * the <code>paintComponent</code> method to provide a custom background
      * image for this window.
      */
-    private static class LoginWindowBackground extends TransparentPanel
+    private static class LoginWindowBackground
+        extends TransparentPanel
     {
         private final Image bgImage;
 
@@ -311,28 +308,23 @@ public class AuthenticationWindow
             this.bgImage = bgImage;
         }
 
-        public LoginWindowBackground()
-        {
-            this.bgImage = null;
-        }
-
         protected void paintComponent(Graphics g)
         {
             super.paintComponent(g);
 
-            g = g.create();
-            try
+            if (bgImage != null)
             {
-                AntialiasingManager.activateAntialiasing(g);
+                g = g.create();
+                try
+                {
+                    AntialiasingManager.activateAntialiasing(g);
 
-                Graphics2D g2 = (Graphics2D) g;
-
-                if (bgImage != null)
-                    g2.drawImage(bgImage, 30, 30, null);
-            }
-            finally
-            {
-                g.dispose();
+                    g.drawImage(bgImage, 30, 30, null);
+                }
+                finally
+                {
+                    g.dispose();
+                }
             }
         }
     }
@@ -341,10 +333,12 @@ public class AuthenticationWindow
      * Enables the actions when a key is pressed, for now
      * closes the window when esc is pressed.
      */
-    private void enableKeyActions() {
-
-        AbstractAction act = new AbstractAction() {
-            public void actionPerformed(ActionEvent e) {
+    private void enableKeyActions()
+    {
+        AbstractAction act = new AbstractAction()
+        {
+            public void actionPerformed(ActionEvent e)
+            {
                 AuthenticationWindow.this.setVisible(false);
             }
         };
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 6be0fe2..ba6a4ba 100644
--- a/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetMultiUserChatYahooImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetMultiUserChatYahooImpl.java
@@ -3,11 +3,10 @@ package net.java.sip.communicator.impl.protocol.yahoo;
 import java.io.IOException;
 import java.util.*;
 
-import org.jivesoftware.smackx.muc.*;
-
 import ymsg.network.*;
 import ymsg.network.event.*;
 import ymsg.support.MessageDecoder;
+
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;