[gatein-commits] gatein SVN: r4873 - portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp.

[do-not-reply at jboss.org]

Author: chris.laprun at jboss.com
Date: 2010-10-29 11:02:06 -0400 (Fri, 29 Oct 2010)
New Revision: 4873

Modified:
   portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/MOPConsumerStructureProvider.java
Log:
- GTNPORTAL-126: Make PageInfo maintain window name -> uuid mapping instead of it being done at the top level to avoid collisions (previous implementation was quite stupid, actually!) :/

Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/MOPConsumerStructureProvider.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/MOPConsumerStructureProvider.java	2010-10-28 15:55:36 UTC (rev 4872)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/MOPConsumerStructureProvider.java	2010-10-29 15:02:06 UTC (rev 4873)
@@ -47,6 +47,7 @@
 import org.gatein.pc.api.StatefulPortletContext;
 import org.gatein.wsrp.api.context.ConsumerStructureProvider;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -63,13 +64,11 @@
    private static final String PAGES_CHILD_NAME = "pages";
    private final POMSessionManager pomManager;
    private Map<String, PageInfo> pageInfos;
-   private Map<String, String> windowIdToUUIDs;
    private boolean pagesHaveBeenInitialized;
 
    public MOPConsumerStructureProvider(ExoContainer container)
    {
       pomManager = (POMSessionManager)container.getComponentInstanceOfType(POMSessionManager.class);
-      windowIdToUUIDs = new HashMap<String, String>();
       pageInfos = new HashMap<String, PageInfo>();
    }
 
@@ -112,8 +111,8 @@
       if (!ignoreCurrent)
       {
          Described described = page.adapt(Described.class);
-         PageInfo pageInfo = new PageInfo(page.getObjectId());
-         pageInfos.put(described.getName(), pageInfo);
+         PageInfo pageInfo = new PageInfo(page.getObjectId(), described.getName());
+         pageInfos.put(pageInfo.getName(), pageInfo);
          UIContainer container = page.getRootComponent();
          processContainer(container, pageInfo);
       }
@@ -146,8 +145,8 @@
          {
             Described described = component.adapt(Described.class);
             String name = described.getName();
-            windowIdToUUIDs.put(name, component.getObjectId());
-            pageInfo.addWindow(name);
+
+            pageInfo.addWindow(name, component.getObjectId());
          }
          else if (ObjectType.CONTAINER.equals(type))
          {
@@ -162,7 +161,8 @@
 
    public void assignPortletToWindow(PortletContext portletContext, String windowId, String pageId, String exportedPortletHandle)
    {
-      String uuid = windowIdToUUIDs.get(windowId);
+      PageInfo pageInfo = pageInfos.get(pageId);
+      String uuid = pageInfo.getWindowUUID(windowId);
       ParameterValidation.throwIllegalArgExceptionIfNull(uuid, "UUID for " + windowId);
 
       // get the window
@@ -195,8 +195,12 @@
 
       // Change the window's name so that it's less confusing to users
       Described described = window.adapt(Described.class);
-      described.setName(exportedPortletHandle + " (remote)"); // should be the same as ApplicationRegistryService.REMOTE_DISPLAY_NAME_SUFFIX
+      String newName = exportedPortletHandle + " (remote)";
+      described.setName(newName); // should be the same as ApplicationRegistryService.REMOTE_DISPLAY_NAME_SUFFIX
 
+      // update window mappings
+      pageInfo.updateWindowName(windowId, newName);
+
       // mark page for cache invalidation otherwise DataCache will use the previous customization id when trying to set
       // the portlet state in UIPortlet.setState and will not find it resulting in an error
       Page page = window.getPage();
@@ -243,13 +247,6 @@
       PageInfo pageInfo = pageInfos.get(name);
       if (pageInfo != null)
       {
-         // remove window information associated to the page
-         List<String> windows = pageInfo.getChildrenWindows();
-         for (String window : windows)
-         {
-            windowIdToUUIDs.remove(window);
-         }
-
          // remove page info
          pageInfos.remove(name);
       }
@@ -257,13 +254,14 @@
 
    private static class PageInfo
    {
-      private String uuid;
-      private List<String> childrenWindows;
+      private final String uuid;
+      private final Map<String, String> childrenWindows = new HashMap<String, String>();
+      private final String name;
 
-      private PageInfo(String uuid)
+      private PageInfo(String uuid, String name)
       {
          this.uuid = uuid;
-         childrenWindows = new LinkedList<String>();
+         this.name = name;
       }
 
       public String getUUID()
@@ -273,12 +271,42 @@
 
       public List<String> getChildrenWindows()
       {
-         return childrenWindows;
+         return new ArrayList<String>(childrenWindows.keySet());
       }
 
-      public void addWindow(String windowName)
+      public void addWindow(String windowName, String uuid)
       {
-         childrenWindows.add(windowName);
+         // add suffix in case we have several windows with the same name in the page
+         if (childrenWindows.containsKey(windowName))
+         {
+            if (windowName.endsWith("|"))
+            {
+               windowName += "|";
+            }
+            else
+            {
+               windowName += windowName + " |";
+            }
+         }
+
+         childrenWindows.put(windowName, uuid);
       }
+
+      public void updateWindowName(String oldWindowName, String newWindowName)
+      {
+         String windowUUID = getWindowUUID(oldWindowName);
+         childrenWindows.remove(oldWindowName);
+         childrenWindows.put(newWindowName, windowUUID);
+      }
+
+      public String getName()
+      {
+         return name;
+      }
+
+      public String getWindowUUID(String windowId)
+      {
+         return childrenWindows.get(windowId);
+      }
    }
 }