Restores changes addressing issue #492 (Grey background dialogs) lost in the recent resource-naming modifications.

5 files changed, 37 insertions, 33 deletions

diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/MessageDialog.java b/src/net/java/sip/communicator/impl/gui/customcontrols/MessageDialog.java
index b01924f..bee09cc 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/MessageDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/MessageDialog.java
@@ -35,7 +35,7 @@ public class MessageDialog
     private JButton okButton = new JButton(
         GuiActivator.getResources().getI18NString("service.gui.OK"));
 
-    private JCheckBox doNotAskAgain = new JCheckBox(
+    private JCheckBox doNotAskAgain = new SIPCommCheckBox(
         GuiActivator.getResources()
             .getI18NString("service.gui.DO_NOT_ASK_AGAIN"));
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java
index 1c7241a..589db84 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java
@@ -54,7 +54,7 @@ public class ChatPanel
 
     private final JSplitPane messagePane = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
 
-    private final JCheckBox sendSmsCheckBox = new JCheckBox(
+    private final JCheckBox sendSmsCheckBox = new SIPCommCheckBox(
         GuiActivator.getResources().getI18NString("service.gui.SEND_AS_SMS"));
 
     private JSplitPane topSplitPane;
diff --git a/src/net/java/sip/communicator/plugin/callhistoryform/ExtendedCallHistorySearchDialog.java b/src/net/java/sip/communicator/plugin/callhistoryform/ExtendedCallHistorySearchDialog.java
index 44290da..a9bc8aa 100644
--- a/src/net/java/sip/communicator/plugin/callhistoryform/ExtendedCallHistorySearchDialog.java
+++ b/src/net/java/sip/communicator/plugin/callhistoryform/ExtendedCallHistorySearchDialog.java
@@ -4,7 +4,6 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-
 package net.java.sip.communicator.plugin.callhistoryform;
 
 import java.awt.*;
@@ -15,6 +14,7 @@ import javax.swing.*;
 
 import net.java.sip.communicator.service.callhistory.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 import com.toedter.calendar.*;
 
@@ -26,20 +26,21 @@ import com.toedter.calendar.*;
  * @author Maxime Bourdon & Thomas Meyer
  */
 public class ExtendedCallHistorySearchDialog
-    extends JDialog
+    extends SIPCommDialog
     implements  ActionListener,
                 ItemListener
 {
     /* PANEL */
-    private JPanel mainSearchPanel = new JPanel(new BorderLayout());
+    private JPanel mainSearchPanel = new TransparentPanel(new BorderLayout());
 
-    private JPanel mainPanel = new JPanel(new BorderLayout(3, 1));
+    private JPanel mainPanel = new TransparentPanel(new BorderLayout(3, 1));
 
-    private JPanel searchPanel = new JPanel(new GridBagLayout());
+    private JPanel searchPanel = new TransparentPanel(new GridBagLayout());
 
-    private JPanel callTypePanel = new JPanel(new GridBagLayout());
+    private JPanel callTypePanel = new TransparentPanel(new GridBagLayout());
 
-    private JPanel callListResultPanel = new JPanel(new BorderLayout());
+    private JPanel callListResultPanel =
+        new TransparentPanel(new BorderLayout());
 
     /* BUTTON */
     private JButton searchButton = new JButton(
@@ -69,11 +70,11 @@ public class ExtendedCallHistorySearchDialog
                 .getI18NString("plugin.callhistoryform.CALLTYPE") + ": ");
 
     /* CHECKBOX */
-    private JCheckBox inCheckBox = new JCheckBox(
+    private JCheckBox inCheckBox = new SIPCommCheckBox(
         ExtendedCallHistorySearchActivator.getResources()
             .getI18NString("plugin.callhistoryform.INCOMING"), true);
 
-    private JCheckBox outCheckBox = new JCheckBox(
+    private JCheckBox outCheckBox = new SIPCommCheckBox(
         ExtendedCallHistorySearchActivator.getResources()
             .getI18NString("plugin.callhistoryform.OUTGOING"), true);
 
@@ -453,13 +454,13 @@ public class ExtendedCallHistorySearchDialog
             /* PARTICIPANTS Checking */
             if (addMe)
             {
-                Iterator participants = callRecord.getParticipantRecords()
-                    .iterator();
+                Iterator<CallParticipantRecord> participants =
+                    callRecord.getParticipantRecords().iterator();
 
                 while (participants.hasNext() && addMe)
                 {
-                    CallParticipantRecord participantRecord
-                        = (CallParticipantRecord) participants.next();
+                    CallParticipantRecord participantRecord =
+                        participants.next();
 
                     String participantName = participantRecord
                         .getParticipantAddress();
@@ -487,4 +488,8 @@ public class ExtendedCallHistorySearchDialog
             callList.addItem(ExtendedCallHistorySearchActivator.getResources()
                     .getI18NString("service.gui.OLDER_CALLS") + "...");
     }
+
+    protected void close(boolean isEscaped)
+    {
+    }
 }
diff --git a/src/net/java/sip/communicator/plugin/callhistoryform/callhistoryform.manifest.mf b/src/net/java/sip/communicator/plugin/callhistoryform/callhistoryform.manifest.mf
index 62ffc58..69ed48b 100644
--- a/src/net/java/sip/communicator/plugin/callhistoryform/callhistoryform.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/callhistoryform/callhistoryform.manifest.mf
@@ -4,14 +4,15 @@ Bundle-Description: An Extended Call History Search
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
 Import-Package: org.osgi.framework,
- net.java.sip.communicator.util,
- net.java.sip.communicator.service.resources, 
+ net.java.sip.communicator.service.callhistory,
+ net.java.sip.communicator.service.configuration,
  net.java.sip.communicator.service.contactlist,
  net.java.sip.communicator.service.contactlist.event,
  net.java.sip.communicator.service.gui,
  net.java.sip.communicator.service.gui.event,
- net.java.sip.communicator.service.callhistory,
- net.java.sip.communicator.service.configuration,
+ net.java.sip.communicator.service.resources,
+ net.java.sip.communicator.util,
+ net.java.sip.communicator.util.swing,
  javax.swing,
  javax.swing.event,
  javax.swing.table,
@@ -24,5 +25,3 @@ Import-Package: org.osgi.framework,
  javax.swing.filechooser,
  javax.swing.tree,
  javax.swing.border
-
-
diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/FirstWizardPage.java
index 679d1da..61cd3bb 100644
--- a/src/net/java/sip/communicator/plugin/sipaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/FirstWizardPage.java
@@ -77,8 +77,9 @@ public class FirstWizardPage
     private JLabel serverLabel
         = new JLabel(Resources.getString("plugin.sipaccregwizz.REGISTRAR"));
 
-    private JCheckBox enableDefaultEncryption = 
-        new JCheckBox(Resources.getString("plugin.sipaccregwizz.ENABLE_DEFAULT_ENCRYPTION"), false); 
+    private JCheckBox enableDefaultEncryption =
+        new SIPCommCheckBox(Resources
+            .getString("plugin.sipaccregwizz.ENABLE_DEFAULT_ENCRYPTION"), false); 
 
     private JLabel proxyLabel
         = new JLabel(Resources.getString("plugin.sipaccregwizz.PROXY"));
@@ -115,12 +116,13 @@ public class FirstWizardPage
 
     private JPanel valuesPresOpPanel = new TransparentPanel(new GridLayout(0, 1, 10, 10));
 
-    private JCheckBox enablePresOpButton = new JCheckBox(
-        Resources.getString("plugin.sipaccregwizz.ENABLE_PRESENCE"),
-        true);
+    private JCheckBox enablePresOpButton =
+        new SIPCommCheckBox(Resources
+            .getString("plugin.sipaccregwizz.ENABLE_PRESENCE"), true);
 
-    private JCheckBox forceP2PPresOpButton = new JCheckBox(
-        Resources.getString("plugin.sipaccregwizz.FORCE_P2P_PRESENCE"), true);
+    private JCheckBox forceP2PPresOpButton =
+        new SIPCommCheckBox(Resources
+            .getString("plugin.sipaccregwizz.FORCE_P2P_PRESENCE"), true);
 
     private JLabel pollPeriodLabel = new JLabel(
         Resources.getString("plugin.sipaccregwizz.OFFLINE_CONTACT_POLLING_PERIOD"));
@@ -687,13 +689,11 @@ public class FirstWizardPage
     {
         ProtocolProviderFactory factory =
             SIPAccRegWizzActivator.getSIPProtocolProviderFactory();
+        java.util.List<AccountID> registeredAccounts =
+            factory.getRegisteredAccounts();
 
-        ArrayList registeredAccounts = factory.getRegisteredAccounts();
-
-        for (int i = 0; i < registeredAccounts.size(); i++)
+        for (AccountID accountID : registeredAccounts)
         {
-            AccountID accountID = (AccountID) registeredAccounts.get(i);
-
             if (accountName.equalsIgnoreCase(accountID.getUserID())
                     && serverName.equalsIgnoreCase(accountID.getService()))
                 return true;