[gatein-commits] gatein SVN: r5209 - in portal/branches/branch-GTNPORTAL-1643/webui: portal/src/main/java/org/exoplatform/portal/webui/workspace and 1 other directory.

[do-not-reply at jboss.org]

Author: phuong_vu
Date: 2010-11-22 17:58:49 -0500 (Mon, 22 Nov 2010)
New Revision: 5209

Modified:
   portal/branches/branch-GTNPORTAL-1643/webui/framework/src/main/java/org/exoplatform/webui/core/UIComponentDecorator.java
   portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMaskWorkspace.java
Log:
GTNPORTAL-1682 Should change setUIComponent method of UIComponentDecorator class

Modified: portal/branches/branch-GTNPORTAL-1643/webui/framework/src/main/java/org/exoplatform/webui/core/UIComponentDecorator.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1643/webui/framework/src/main/java/org/exoplatform/webui/core/UIComponentDecorator.java	2010-11-22 21:17:29 UTC (rev 5208)
+++ portal/branches/branch-GTNPORTAL-1643/webui/framework/src/main/java/org/exoplatform/webui/core/UIComponentDecorator.java	2010-11-22 22:58:49 UTC (rev 5209)
@@ -48,14 +48,15 @@
       return uicomponent_;
    }
 
-   public void setUIComponent(UIComponent uicomponent)
+   public UIComponent setUIComponent(UIComponent uicomponent)
    {
+      UIComponent oldOne = uicomponent_;
+//      if (uicomponent_ != null)
+//         uicomponent_.setParent(null);
+      uicomponent_ = uicomponent;
       if (uicomponent_ != null)
-         uicomponent_.setRendered(false);
-      uicomponent_ = uicomponent;
-      if (uicomponent_ == null)
-         return;
-      uicomponent_.setParent(this);
+         uicomponent_.setParent(this);
+      return oldOne;
    }
 
    @SuppressWarnings("unchecked")

Modified: portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMaskWorkspace.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMaskWorkspace.java	2010-11-22 21:17:29 UTC (rev 5208)
+++ portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMaskWorkspace.java	2010-11-22 22:58:49 UTC (rev 5209)
@@ -93,10 +93,11 @@
       return createUIComponent(clazz, null, null);
    }
 
-   public void setUIComponent(UIComponent uicomponent)
+   public UIComponent setUIComponent(UIComponent uicomponent)
    {
-      super.setUIComponent(uicomponent);
+      UIComponent oldOne = super.setUIComponent(uicomponent);
       setShow(uicomponent != null);
+      return oldOne;
    }
 
    static public class CloseActionListener extends EventListener<UIComponent>