From 56ffcf820f0e665b954c068d6bef6c50cc2ea27a Mon Sep 17 00:00:00 2001
From: Vincent Lucas <chenzo@jitsi.org>
Date: Wed, 2 Jul 2008 13:24:01 +0000
Subject: [PATCH] Correcting error messages when creating a rss account
 (original patch from Atul Aggarwal).

---
 .../rssaccregwizz/RssAccRegWizzActivator.java | 15 ++++++++++++--
 .../RssAccountRegistrationWizard.java         | 20 +++++++++----------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccRegWizzActivator.java b/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccRegWizzActivator.java
index ffc678603..671e0f8d0 100644
--- a/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccRegWizzActivator.java
+++ b/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccRegWizzActivator.java
@@ -34,6 +34,8 @@ public class RssAccRegWizzActivator
      * A currently valid reference to the configuration service.
      */
     private static ConfigurationService configService;
+    
+    private static UIService uiService;
 
     /**
      * Starts this bundle.
@@ -48,8 +50,7 @@ public void start(BundleContext bc)
         ServiceReference uiServiceRef = bundleContext
             .getServiceReference(UIService.class.getName());
 
-        UIService uiService
-            = (UIService) bundleContext.getService(uiServiceRef);
+        uiService = (UIService) bundleContext.getService(uiServiceRef);
 
         WizardContainer wizardContainer
             = uiService.getAccountRegWizardContainer();
@@ -107,6 +108,16 @@ public static ProtocolProviderFactory getRssProtocolProviderFactory()
 
         return (ProtocolProviderFactory) bundleContext.getService(serRefs[0]);
     }
+    
+     /**
+     * Returns the <tt>UIService</tt>.
+     * 
+     * @return the <tt>UIService</tt>
+     */
+    public static UIService getUIService()
+    {
+        return uiService;
+    }
 
     /**
      * Returns the bundleContext that we received when we were started.
diff --git a/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java
index 95461cbed..8201ef250 100644
--- a/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java
@@ -183,19 +183,19 @@ public ProtocolProviderService installAccount(
                 RssAccRegWizzActivator.bundleContext
                 .getService(serRef);
         }
-        catch (IllegalArgumentException exc)
+        catch (IllegalArgumentException e)
         {
-            new ErrorDialog(null,
-                            Resources.getString("error"),
-                            exc.getMessage(),
-                            exc).showDialog();
+            RssAccRegWizzActivator.getUIService().getPopupDialog()
+                .showMessagePopupDialog(e.getMessage(),
+                        Resources.getString("error"),
+                        PopupDialog.ERROR_MESSAGE);
         }
-        catch (IllegalStateException exc)
+        catch (IllegalStateException e)
         {
-            new ErrorDialog(null,
-                            Resources.getString("error"),
-                            exc.getMessage(),
-                            exc).showDialog();
+            RssAccRegWizzActivator.getUIService().getPopupDialog()
+                .showMessagePopupDialog(e.getMessage(),
+                        Resources.getString("error"),
+                        PopupDialog.ERROR_MESSAGE);
         }
 
         return protocolProvider;