[sip-comm-cvs] CVS update: /sip-communicator/src/net/java/sip/communicator/plugin/jabberaccregwizz/, /sip-communicator/src/net/java/sip/communicator/plugin/aimacc...

yanas at dev.java.net yanas at dev.java.net
Thu Apr 26 23:18:33 CEST 2007


User: yanas   
Date: 2007-04-26 21:18:33+0000
Modified:
   sip-communicator/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccRegWizzActivator.java
   sip-communicator/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccRegWizzActivator.java
   sip-communicator/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccRegWizzActivator.java
   sip-communicator/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccRegWizzActivator.java
   sip-communicator/src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccRegWizzActivator.java
   sip-communicator/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccRegWizzActivator.java

Log:
 remove account wizards from the gui when the corresponding bundle is stopped

File Changes:

Directory: /sip-communicator/src/net/java/sip/communicator/plugin/jabberaccregwizz/
===================================================================================

File [changed]: JabberAccRegWizzActivator.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccRegWizzActivator.java?r1=1.4&r2=1.5
Delta lines:  +7 -4
-------------------
--- JabberAccRegWizzActivator.java	2007-02-22 12:38:56+0000	1.4
+++ JabberAccRegWizzActivator.java	2007-04-26 21:18:30+0000	1.5
@@ -28,6 +28,10 @@
 
     private static ConfigurationService configService;
 
+    private static AccountRegistrationWizardContainer wizardContainer;
+    
+    private static JabberAccountRegistrationWizard jabberWizard;
+    
     /**
      * Starts this bundle.
      * @param bc BundleContext
@@ -45,11 +49,9 @@
         UIService uiService
             = (UIService) bundleContext.getService(uiServiceRef);
 
-        AccountRegistrationWizardContainer wizardContainer
-            = uiService.getAccountRegWizardContainer();
+        wizardContainer = uiService.getAccountRegWizardContainer();
 
-        JabberAccountRegistrationWizard jabberWizard
-            = new JabberAccountRegistrationWizard(wizardContainer);
+        jabberWizard = new JabberAccountRegistrationWizard(wizardContainer);
 
         wizardContainer.addAccountRegistrationWizard(jabberWizard);
     }
@@ -57,6 +59,7 @@
     public void stop(BundleContext bundleContext)
         throws Exception
     {
+        wizardContainer.removeAccountRegistrationWizard(jabberWizard);
     }
 
     /**

Directory: /sip-communicator/src/net/java/sip/communicator/plugin/aimaccregwizz/
================================================================================

File [changed]: AimAccRegWizzActivator.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccRegWizzActivator.java?r1=1.1&r2=1.2
Delta lines:  +10 -5
--------------------
--- AimAccRegWizzActivator.java	2007-04-10 15:29:00+0000	1.1
+++ AimAccRegWizzActivator.java	2007-04-26 21:18:30+0000	1.2
@@ -27,6 +27,10 @@
     
     private static BrowserLauncherService browserLauncherService;
     
+    private static UIService uiService;
+    
+    private static AimAccountRegistrationWizard aimWizard;
+    
     /**
      * Starts this bundle.
      */
@@ -37,19 +41,20 @@
         ServiceReference uiServiceRef = bundleContext
             .getServiceReference(UIService.class.getName());
 
-        UIService uiService
-            = (UIService) bundleContext.getService(uiServiceRef);
+        uiService = (UIService) bundleContext.getService(uiServiceRef);
 
         AccountRegistrationWizardContainer wizardContainer
             = uiService.getAccountRegWizardContainer();
 
-        AimAccountRegistrationWizard aimWizard
-            = new AimAccountRegistrationWizard(wizardContainer);
+        aimWizard = new AimAccountRegistrationWizard(wizardContainer);
 
         wizardContainer.addAccountRegistrationWizard(aimWizard);
     }
 
-    public void stop(BundleContext bundleContext) throws Exception {
+    public void stop(BundleContext bundleContext) throws Exception
+    {
+        uiService.getAccountRegWizardContainer()
+            .removeAccountRegistrationWizard(aimWizard);
     }
 
     /**

Directory: /sip-communicator/src/net/java/sip/communicator/plugin/icqaccregwizz/
================================================================================

File [changed]: IcqAccRegWizzActivator.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccRegWizzActivator.java?r1=1.8&r2=1.9
Delta lines:  +9 -5
-------------------
--- IcqAccRegWizzActivator.java	2007-02-13 17:00:06+0000	1.8
+++ IcqAccRegWizzActivator.java	2007-04-26 21:18:30+0000	1.9
@@ -27,6 +27,10 @@
     
     private static BrowserLauncherService browserLauncherService;
     
+    private static AccountRegistrationWizardContainer wizardContainer;
+    
+    private static IcqAccountRegistrationWizard icqWizard;
+    
     /**
      * Starts this bundle.
      */
@@ -40,16 +44,16 @@
         UIService uiService
             = (UIService) bundleContext.getService(uiServiceRef);
 
-        AccountRegistrationWizardContainer wizardContainer
-            = uiService.getAccountRegWizardContainer();
+        wizardContainer = uiService.getAccountRegWizardContainer();
 
-        IcqAccountRegistrationWizard icqWizard
-            = new IcqAccountRegistrationWizard(wizardContainer);
+        icqWizard = new IcqAccountRegistrationWizard(wizardContainer);
 
         wizardContainer.addAccountRegistrationWizard(icqWizard);
     }
 
-    public void stop(BundleContext bundleContext) throws Exception {
+    public void stop(BundleContext bundleContext) throws Exception
+    {
+        wizardContainer.removeAccountRegistrationWizard(icqWizard);
     }
 
     /**

Directory: /sip-communicator/src/net/java/sip/communicator/plugin/gibberishaccregwizz/
======================================================================================

File [changed]: GibberishAccRegWizzActivator.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccRegWizzActivator.java?r1=1.1&r2=1.2
Delta lines:  +11 -8
--------------------
--- GibberishAccRegWizzActivator.java	2007-02-22 12:34:34+0000	1.1
+++ GibberishAccRegWizzActivator.java	2007-04-26 21:18:31+0000	1.2
@@ -7,6 +7,7 @@
 package net.java.sip.communicator.plugin.gibberishaccregwizz;
 
 import org.osgi.framework.*;
+
 import net.java.sip.communicator.service.configuration.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
@@ -33,6 +34,10 @@
      */
     private static ConfigurationService configService;
 
+    private static AccountRegistrationWizardContainer wizardContainer;
+    
+    private static GibberishAccountRegistrationWizard gibberishWizard;
+
     /**
      * Starts this bundle.
      * @param bc the currently valid <tt>BundleContext</tt>.
@@ -46,13 +51,11 @@
         ServiceReference uiServiceRef = bundleContext
             .getServiceReference(UIService.class.getName());
 
-        UIService uiService
-            = (UIService) bundleContext.getService(uiServiceRef);
+        UIService uiService = (UIService) bundleContext.getService(uiServiceRef);
 
-        AccountRegistrationWizardContainer wizardContainer
-            = uiService.getAccountRegWizardContainer();
+        wizardContainer = uiService.getAccountRegWizardContainer();
 
-        GibberishAccountRegistrationWizard gibberishWizard
+        gibberishWizard
             = new GibberishAccountRegistrationWizard(wizardContainer);
 
         wizardContainer.addAccountRegistrationWizard(gibberishWizard);
@@ -66,9 +69,9 @@
      *
      * @param context The execution context of the bundle being stopped.
      */
-    public void stop(BundleContext context)
+    public void stop(BundleContext bundleContext) throws Exception
     {
-
+        wizardContainer.removeAccountRegistrationWizard(gibberishWizard);
     }
 
     /**

Directory: /sip-communicator/src/net/java/sip/communicator/plugin/yahooaccregwizz/
==================================================================================

File [changed]: YahooAccRegWizzActivator.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccRegWizzActivator.java?r1=1.1&r2=1.2
Delta lines:  +11 -6
--------------------
--- YahooAccRegWizzActivator.java	2007-01-12 17:56:54+0000	1.1
+++ YahooAccRegWizzActivator.java	2007-04-26 21:18:31+0000	1.2
@@ -6,12 +6,13 @@
  */
 package net.java.sip.communicator.plugin.yahooaccregwizz;
 
-import org.osgi.framework.*;
 import net.java.sip.communicator.service.configuration.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 
+import org.osgi.framework.*;
+
 /**
  * Registers the <tt>YahooAccountRegistrationWizard</tt> in the UI Service.
  *
@@ -26,6 +27,10 @@
 
     private static ConfigurationService configService;
 
+    private static AccountRegistrationWizardContainer wizardContainer;
+    
+    private static YahooAccountRegistrationWizard yahooWizard;
+    
     /**
      * Starts this bundle.
      * @param bc BundleContext
@@ -41,16 +46,16 @@
         UIService uiService
             = (UIService) bundleContext.getService(uiServiceRef);
 
-        AccountRegistrationWizardContainer wizardContainer
-            = uiService.getAccountRegWizardContainer();
+        wizardContainer = uiService.getAccountRegWizardContainer();
 
-        YahooAccountRegistrationWizard yahooWizard
-            = new YahooAccountRegistrationWizard(wizardContainer);
+        yahooWizard = new YahooAccountRegistrationWizard(wizardContainer);
 
         wizardContainer.addAccountRegistrationWizard(yahooWizard);
     }
 
-    public void stop(BundleContext bundleContext) throws Exception {
+    public void stop(BundleContext bundleContext) throws Exception
+    {
+        wizardContainer.removeAccountRegistrationWizard(yahooWizard);
     }
 
     /**

Directory: /sip-communicator/src/net/java/sip/communicator/plugin/sipaccregwizz/
================================================================================

File [changed]: SIPAccRegWizzActivator.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccRegWizzActivator.java?r1=1.2&r2=1.3
Delta lines:  +9 -5
-------------------
--- SIPAccRegWizzActivator.java	2006-10-31 13:55:49+0000	1.2
+++ SIPAccRegWizzActivator.java	2007-04-26 21:18:31+0000	1.3
@@ -26,6 +26,10 @@
 
     private static ConfigurationService configService;
 
+    private static AccountRegistrationWizardContainer wizardContainer;
+    
+    private static SIPAccountRegistrationWizard sipWizard;
+    
     /**
      * Starts this bundle.
      * @param bc BundleContext
@@ -41,16 +45,16 @@
         UIService uiService
             = (UIService) bundleContext.getService(uiServiceRef);
 
-        AccountRegistrationWizardContainer wizardContainer
-            = uiService.getAccountRegWizardContainer();
+        wizardContainer = uiService.getAccountRegWizardContainer();
 
-        SIPAccountRegistrationWizard sipWizard
-            = new SIPAccountRegistrationWizard(wizardContainer);
+        sipWizard = new SIPAccountRegistrationWizard(wizardContainer);
 
         wizardContainer.addAccountRegistrationWizard(sipWizard);
     }
 
-    public void stop(BundleContext bundleContext) throws Exception {
+    public void stop(BundleContext bundleContext) throws Exception
+    {
+        wizardContainer.removeAccountRegistrationWizard(sipWizard);
     }
 
     /**




---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe at sip-communicator.dev.java.net
For additional commands, e-mail: cvs-help at sip-communicator.dev.java.net





More information about the commits mailing list