From 63f857a92206bd3fcefd75cc6034d6a205134709 Mon Sep 17 00:00:00 2001
From: Yana Stamcheva <yana@jitsi.org>
Date: Mon, 22 Feb 2010 14:21:06 +0000
Subject: [PATCH] Patch provided by Matthieu Casanova on
 dev@sip-communicator.dev.java.net with subject: "[PATCH] Fix for suspicious
 String comparison" on 19/02/2010.

---
 build.xml                                     |  4 +-
 .../gui/main/chat/history/HistoryWindow.java  |  4 +-
 .../AimAccountRegistrationWizard.java         | 10 ++--
 .../IcqAccountRegistrationWizard.java         | 10 ++--
 .../gui/InvitationReceivedDialog.java         | 54 ++++++++++---------
 5 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/build.xml b/build.xml
index 33f0efd98..213d64be6 100644
--- a/build.xml
+++ b/build.xml
@@ -719,8 +719,8 @@
             <sysproperty key="java.net.preferIPv6Addresses"
                 value="${java.net.preferIPv6Addresses}"/>
 
-            <!--sysproperty key="net.java.sip.communicator.SC_HOME_DIR_LOCATION"
-                    value="${user.home}/schome"/-->
+            <sysproperty key="net.java.sip.communicator.SC_HOME_DIR_LOCATION"
+                    value="${user.home}/schome"/>
 
             <!-- Setting properties necessary for dependencies on native libs.-->
             <sysproperty key="java.library.path"
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/history/HistoryWindow.java b/src/net/java/sip/communicator/impl/gui/main/chat/history/HistoryWindow.java
index a4b7df7e3..881a42ecf 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/history/HistoryWindow.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/history/HistoryWindow.java
@@ -210,7 +210,7 @@ private void initDates()
      */
     public void showHistoryByPeriod(Date startDate, Date endDate)
     {
-        if((searchKeyword == null || searchKeyword == "")
+        if((searchKeyword == null || searchKeyword.length() == 0)
                 && dateHistoryTable.containsKey(startDate))
         {
             HTMLDocument document = dateHistoryTable.get(startDate);
@@ -588,7 +588,7 @@ public void run()
                 {
                     HTMLDocument doc = createHistory(msgList);
 
-                    if(searchKeyword == null || searchKeyword == "")
+                    if(searchKeyword == null || searchKeyword.length() == 0)
                     {
                         dateHistoryTable.put(startDate, doc);
                     }
diff --git a/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java
index 1ffa9c17b..a82f66e65 100644
--- a/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java
@@ -191,27 +191,27 @@ public ProtocolProviderService installAccount(
         }
 
         if (registration.getProxy() != null
-            && registration.getProxy() != "")
+            && registration.getProxy().length() != 0)
             accountProperties.put(ProtocolProviderFactory.PROXY_ADDRESS,
                 registration.getProxy());
 
         if (registration.getProxyPort() != null
-            && registration.getProxyPort() != "")
+            && registration.getProxyPort().length() != 0)
             accountProperties.put(ProtocolProviderFactory.PROXY_PORT,
                 registration.getProxyPort());
 
         if (registration.getProxyType() != null
-            && registration.getProxyType() != "")
+            && registration.getProxyType().length() != 0)
             accountProperties.put(ProtocolProviderFactory.PROXY_TYPE,
                 registration.getProxyType());
 
         if (registration.getProxyUsername() != null
-            && registration.getProxyUsername() != "")
+            && registration.getProxyUsername().length() != 0)
             accountProperties.put(ProtocolProviderFactory.PROXY_USERNAME,
                 registration.getProxyUsername());
 
         if (registration.getProxyPassword() != null
-            && registration.getProxyPassword() != "")
+            && registration.getProxyPassword().length() != 0)
             accountProperties.put(ProtocolProviderFactory.PROXY_PASSWORD,
                 registration.getProxyPassword());
 
diff --git a/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java
index df89a5b13..8acb16b9a 100644
--- a/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java
@@ -186,27 +186,27 @@ public ProtocolProviderService installAccount(
         }
 
         if (registration.getProxy() != null
-            && registration.getProxy() != "")
+            && registration.getProxy().length() != 0)
             accountProperties.put(ProtocolProviderFactory.PROXY_ADDRESS,
                 registration.getProxy());
 
         if (registration.getProxyPort() != null
-            && registration.getProxyPort() != "")
+            && registration.getProxyPort().length() != 0)
             accountProperties.put(ProtocolProviderFactory.PROXY_PORT,
                 registration.getProxyPort());
 
         if (registration.getProxyType() != null
-            && registration.getProxyType() != "")
+            && registration.getProxyType().length() != 0)
             accountProperties.put(ProtocolProviderFactory.PROXY_TYPE,
                 registration.getProxyType());
 
         if (registration.getProxyUsername() != null
-            && registration.getProxyUsername() != "")
+            && registration.getProxyUsername().length() != 0)
             accountProperties.put(ProtocolProviderFactory.PROXY_USERNAME,
                 registration.getProxyUsername());
 
         if (registration.getProxyPassword() != null
-            && registration.getProxyPassword() != "")
+            && registration.getProxyPassword().length() != 0)
             accountProperties.put(ProtocolProviderFactory.PROXY_PASSWORD,
                 registration.getProxyPassword());
 
diff --git a/src/net/java/sip/communicator/plugin/whiteboard/gui/InvitationReceivedDialog.java b/src/net/java/sip/communicator/plugin/whiteboard/gui/InvitationReceivedDialog.java
index 471c19719..ae06100f2 100644
--- a/src/net/java/sip/communicator/plugin/whiteboard/gui/InvitationReceivedDialog.java
+++ b/src/net/java/sip/communicator/plugin/whiteboard/gui/InvitationReceivedDialog.java
@@ -37,24 +37,27 @@ public class InvitationReceivedDialog
 
     private JPanel dataPanel = new TransparentPanel(new BorderLayout(10, 10));
 
-    private JPanel buttonsPanel = new TransparentPanel(new FlowLayout(FlowLayout.RIGHT));
+    private JPanel buttonsPanel
+        = new TransparentPanel(new FlowLayout(FlowLayout.RIGHT));
 
     private JButton acceptButton
         = new JButton(Resources.getString("service.gui.ACCEPT"));
-    
-    private JButton rejectButton = new JButton(Resources.getString("service.gui.REJECT"));
-    
-    private JButton ignoreButton = new JButton(Resources.getString("service.gui.IGNORE"));
-    
+
+    private JButton rejectButton
+        = new JButton(Resources.getString("service.gui.REJECT"));
+
+    private JButton ignoreButton
+        = new JButton(Resources.getString("service.gui.IGNORE"));
+
     private JPanel mainPanel = new TransparentPanel(new BorderLayout(10, 10));
-    
+
     private JPanel northPanel = new TransparentPanel(new BorderLayout(10, 10));
-    
+
     private JLabel iconLabel = new JLabel(Resources.getImage("inviteIcon"));
-    
+
     private String title
         = Resources.getString("service.gui.INVITATION_RECEIVED");
-    
+
     /**
      * The <tt>ChatRoomInvitation</tt> for which this dialog is.
      */
@@ -103,7 +106,8 @@ public InvitationReceivedDialog (WhiteboardSessionManager whiteboardManager,
                                 invitation.getTargetWhiteboard()
                                     .getWhiteboardID()}));
 
-        if(invitation.getReason() != null && invitation.getReason() != "")
+        if(invitation.getReason() != null
+                && invitation.getReason().length() != 0)
         {
             invitationReasonTextArea.setText(invitation.getReason());
             invitationReasonTextArea.setBorder(
@@ -112,45 +116,47 @@ public InvitationReceivedDialog (WhiteboardSessionManager whiteboardManager,
 
             this.dataPanel.add(invitationReasonTextArea, BorderLayout.CENTER);
         }
-        
+
         this.infoTextArea.setFont(
             infoTextArea.getFont().deriveFont(Font.BOLD, 12f));
         this.infoTextArea.setLineWrap(true);
         this.infoTextArea.setOpaque(false);
         this.infoTextArea.setWrapStyleWord(true);
         this.infoTextArea.setEditable(false);
-        
+
         this.northPanel.add(iconLabel, BorderLayout.WEST);
         this.northPanel.add(infoTextArea, BorderLayout.CENTER);
-        
+
         this.reasonPanel.add(reasonLabel, BorderLayout.WEST);
         this.reasonPanel.add(reasonField, BorderLayout.CENTER);
-        
+
         this.dataPanel.add(reasonPanel, BorderLayout.SOUTH);
-        
+
         this.acceptButton.addActionListener(this);
         this.rejectButton.addActionListener(this);
         this.ignoreButton.addActionListener(this);
-        
+
         this.buttonsPanel.add(acceptButton);
         this.buttonsPanel.add(rejectButton);
         this.buttonsPanel.add(ignoreButton);
-        
+
         this.getRootPane().setDefaultButton(acceptButton);
         this.acceptButton.setMnemonic(Resources.getMnemonic("accept"));
-        this.rejectButton.setMnemonic(Resources.getMnemonic("service.gui.REJECT"));
-        this.ignoreButton.setMnemonic(Resources.getMnemonic("service.gui.IGNORE"));
-        
+        this.rejectButton.setMnemonic(
+            Resources.getMnemonic("service.gui.REJECT"));
+        this.ignoreButton.setMnemonic(
+            Resources.getMnemonic("service.gui.IGNORE"));
+
         this.mainPanel.setBorder(
             BorderFactory.createEmptyBorder(15, 15, 15, 15));
-        
+
         this.mainPanel.add(northPanel, BorderLayout.NORTH);
         this.mainPanel.add(dataPanel, BorderLayout.CENTER);
         this.mainPanel.add(buttonsPanel, BorderLayout.SOUTH);
-        
+
         this.getContentPane().add(mainPanel);
     }
-    
+
     /**
      * Handles the <tt>ActionEvent</tt> triggered when one user clicks
      * on one of the buttons.