merged with alpha2

2 files changed, 29 insertions, 1 deletions

diff --git a/src/net/java/sip/communicator/service/gui/AccountRegistrationWizard.java b/src/net/java/sip/communicator/service/gui/AccountRegistrationWizard.java
index 2191566..4f9dbc3 100644
--- a/src/net/java/sip/communicator/service/gui/AccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/service/gui/AccountRegistrationWizard.java
@@ -6,6 +6,7 @@
  */
 package net.java.sip.communicator.service.gui;
 
+import java.awt.*;
 import java.util.*;
 
 import net.java.sip.communicator.service.protocol.*;
@@ -91,6 +92,14 @@ public interface AccountRegistrationWizard {
     /**
      * Defines the operations that will be executed when the user clicks on
      * the wizard "Finish" button.
+     * 
      */
     public ProtocolProviderService finish();
+    
+    /**
+     * Returns the preferred dimensions of this wizard.
+     * 
+     * @return the preferred dimensions of this wizard.
+     */
+    public Dimension getSize();
 }
diff --git a/src/net/java/sip/communicator/service/gui/UIService.java b/src/net/java/sip/communicator/service/gui/UIService.java
index 4575917..edd629a 100644
--- a/src/net/java/sip/communicator/service/gui/UIService.java
+++ b/src/net/java/sip/communicator/service/gui/UIService.java
@@ -482,7 +482,26 @@ public interface UIService
                 String constraint, ContactAwareComponent component)
         throws ClassCastException, IllegalArgumentException;
     
-    
+    /**
+     * Removes the given UI component from the container given by
+     * <tt>containerID</tt>. 
+     * This method is meant to be used by plugins or bundles that have added
+     * their components to the user interface and for some reason want to remove
+     * them. The <tt>containerID</tt> is used by the implementation to determine
+     * the place where the component was added. The <tt>containerID</tt> SHOULD
+     * be one of the CONTAINER_XXX constants. It is up to the service
+     * implementation to verify that the <tt>component</tt> is really contained
+     * in the specified container. If this is not the case nothing will happen.
+     * <br>
+     * @param containerID one of the CONTAINER_XXX ContainerID-s 
+     * @param component the component to remove
+     * @throws IllegalArgumentException if the specified <tt>containerID</tt>
+     * is not recognized by the implementation (note that implementations
+     * MUST properly handle all CONTAINER_XXX containerID-s.
+     */
+    public void removeComponent(ContainerID containerID, Object component)
+        throws IllegalArgumentException;
+
     /**
      * Returns an iterator over a set containing containerID-s pointing to
      * containers supported by the current UI implementation. Each containerID