[portal-commits] JBoss Portal SVN: r9015 - in branches/UIServer: core-uiserver/src/main/org/jboss/portal/core/presentation/server and 7 other directories.

portal-commits at lists.jboss.org portal-commits at lists.jboss.org
Sun Nov 18 18:03:54 EST 2007


Author: julien at jboss.com
Date: 2007-11-18 18:03:54 -0500 (Sun, 18 Nov 2007)
New Revision: 9015

Modified:
   branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation/model/ModelLoaderImpl.java
   branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation/server/MainProcessor.java
   branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation/server/content/PresentationContentRendererContext.java
   branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation/server/content/portlet/PresentationRenderContext.java
   branches/UIServer/core-uiserver/src/resources/presentation-sar/META-INF/jboss-service.xml
   branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/controller/UIController.java
   branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/PresentationContextImpl.java
   branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/model/UIContextImpl.java
   branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/model/UIObjectImpl.java
   branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/protocol/CreateUIObjectAction.java
   branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/protocol/GetActivation.java
   branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/protocol/LinkActivation.java
   branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/protocol/MoveUIObjectAction.java
   branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/protocol/PostActivation.java
Log:
started portlet container integration

Modified: branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation/model/ModelLoaderImpl.java
===================================================================
--- branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation/model/ModelLoaderImpl.java	2007-11-18 20:03:56 UTC (rev 9014)
+++ branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation/model/ModelLoaderImpl.java	2007-11-18 23:03:54 UTC (rev 9015)
@@ -88,27 +88,27 @@
    {
       ObjectState objectState = null;
       
-      //Get the PortalObject corresponding to this objectId from the PortalObjectContainer
+      // Get the PortalObject corresponding to this objectId from the PortalObjectContainer
       PortalObject portalObject = this.portalObjectContainer.getObject(PortalObjectId.parse(objectId, 
       PortalObjectPath.CANONICAL_FORMAT)); 
                   
       if(portalObject == null)
       {
-         //Object by this id was not found in the Portal
+         // Object by this id was not found in the Portal
          return null;
       }
             
-      //Type
+      // Type
       Class<? extends UIObject> type = this.getType(portalObject);
       
-      //Name
+      // Name
       String name = portalObject.getName();
       
-      //Properties
+      // Properties
       Map<String, String> properties = portalObject.getDeclaredProperties();
       
-      //Parent Id
-      String parentId = "";
+      // Parent Id
+      String parentId = null;
       if(portalObject.getParent() != null)
       {
          parentId = portalObject.getParent().getId().toString();         

Modified: branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation/server/MainProcessor.java
===================================================================
--- branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation/server/MainProcessor.java	2007-11-18 20:03:56 UTC (rev 9014)
+++ branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation/server/MainProcessor.java	2007-11-18 23:03:54 UTC (rev 9015)
@@ -31,9 +31,20 @@
 import org.jboss.portal.presentation.protocol.ViewUIObjectAction;
 import org.jboss.portal.presentation.protocol.ShowUIObjectResponse;
 import org.jboss.portal.presentation.protocol.ServerAction;
+import org.jboss.portal.presentation.protocol.GetActivation;
+import org.jboss.portal.presentation.protocol.LinkActivation;
 import org.jboss.portal.presentation.server.Processor;
 import org.jboss.portal.presentation.server.ProcessorRequest;
 import org.jboss.portal.presentation.server.ProcessorResponse;
+import org.jboss.portal.presentation.model.UIWindow;
+import org.jboss.portal.core.model.portal.PortalObject;
+import org.jboss.portal.core.model.portal.PortalObjectContainer;
+import org.jboss.portal.core.model.portal.PortalObjectId;
+import org.jboss.portal.core.model.portal.PortalObjectPath;
+import org.jboss.portal.core.model.portal.Window;
+import org.jboss.portal.portlet.impl.PortletRequestDecoder;
+import org.jboss.portal.WindowState;
+import org.jboss.portal.Mode;
 
 /**
  * @author <a href="mailto:sshah at redhat.com">Sohil Shah</a>
@@ -41,11 +52,23 @@
  */
 public class MainProcessor implements Processor
 {
-   /**
-    * 
-    */
+
+   /** . */
    private static Logger log = Logger.getLogger(MainProcessor.class);
-   
+
+   /** . */
+   private PortalObjectContainer portalObjectContainer;
+
+   public PortalObjectContainer getPortalObjectContainer()
+   {
+      return portalObjectContainer;
+   }
+
+   public void setPortalObjectContainer(PortalObjectContainer portalObjectContainer)
+   {
+      this.portalObjectContainer = portalObjectContainer;
+   }
+
    /**
     * 
     */
@@ -112,7 +135,51 @@
             ViewUIObjectAction viewAction = (ViewUIObjectAction)serverAction;
             ShowUIObjectResponse actionResponse = new ShowUIObjectResponse(viewAction.getTargetId());
             response = new ProcessorResponse(actionResponse);
-         }                  
+         }
+         else if (serverAction instanceof LinkActivation)
+         {
+            GetActivation getActivation = (GetActivation)serverAction;
+            String id = getActivation.getTargetId();
+            PortalObjectId poid = PortalObjectId.parse(id, PortalObjectPath.CANONICAL_FORMAT);
+            Window target = (Window)portalObjectContainer.getObject(poid);
+            PortletRequestDecoder decoder = new PortletRequestDecoder();
+            decoder.decode(getActivation.getQueryParameters(), null);
+
+            // We assume that for now
+            UIWindow window = (UIWindow)presentationContext.getUIContext().getObject(id);
+
+            //
+            switch(decoder.getType())
+            {
+               case PortletRequestDecoder.ACTION_TYPE:
+                  System.out.println("Todo call portlet action");
+                  break;
+               case PortletRequestDecoder.NAV_TYPE:
+               case PortletRequestDecoder.RENDER_TYPE:
+
+                  //
+                  WindowState windowState = decoder.getWindowState();
+                  if (windowState != null)
+                  {
+                     window.setWindowState(windowState);
+                  }
+
+                  //
+                  Mode mode = decoder.getMode();
+                  if (mode != null)
+                  {
+                     window.setMode(mode);
+                  }
+
+                  // Update parameters
+
+                  break;
+            }
+
+            //
+            ShowUIObjectResponse actionResponse = new ShowUIObjectResponse(target.getPage().getId().toString(PortalObjectPath.CANONICAL_FORMAT));
+            response = new ProcessorResponse(actionResponse);
+         }
          return response;
       }
       catch(Exception e)

Modified: branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation/server/content/PresentationContentRendererContext.java
===================================================================
--- branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation/server/content/PresentationContentRendererContext.java	2007-11-18 20:03:56 UTC (rev 9014)
+++ branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation/server/content/PresentationContentRendererContext.java	2007-11-18 23:03:54 UTC (rev 9015)
@@ -98,7 +98,7 @@
 
    public RenderInvocation createRenderInvocation(WindowNavigationalState navigationalState)
    {
-      RenderInvocation invocation = new RenderInvocation(new PresentationRenderContext(navigationalState));
+      RenderInvocation invocation = new RenderInvocation(new PresentationRenderContext(presentationContext, uiwindow, navigationalState));
       invocation.setRequestContext(new PresentationRequestContext(presentationContext));
       invocation.setWindowContext(new WindowContextImpl(window));
       invocation.setPortalContext(new PresentationPortalContext());

Modified: branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation/server/content/portlet/PresentationRenderContext.java
===================================================================
--- branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation/server/content/portlet/PresentationRenderContext.java	2007-11-18 20:03:56 UTC (rev 9014)
+++ branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation/server/content/portlet/PresentationRenderContext.java	2007-11-18 23:03:54 UTC (rev 9015)
@@ -25,16 +25,21 @@
 import org.jboss.portal.portlet.spi.RenderContext;
 import org.jboss.portal.portlet.StateString;
 import org.jboss.portal.portlet.PortletURL;
+import org.jboss.portal.portlet.impl.PortletRequestEncoder;
 import org.jboss.portal.portlet.invocation.PortletInvocation;
 import org.jboss.portal.Mode;
 import org.jboss.portal.WindowState;
 import org.jboss.portal.core.model.portal.navstate.WindowNavigationalState;
 import org.jboss.portal.presentation.model.UIWindow;
+import org.jboss.portal.presentation.client.PresentationContext;
+import org.jboss.portal.presentation.protocol.GetActivation;
 import org.jboss.portal.common.util.MarkupInfo;
 import org.jboss.portal.common.util.MediaType;
 import org.jboss.portal.common.invocation.AbstractInvocationContext;
 import org.jboss.portal.common.invocation.resolver.MapAttributeResolver;
 
+import java.util.HashMap;
+
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
@@ -43,13 +48,22 @@
 {
 
    /** . */
-   private final WindowNavigationalState navigationalState;
+   private static final MarkupInfo markupInfo = new MarkupInfo(MediaType.HTML, "UTF-8");
 
    /** . */
-   private final MarkupInfo markupInfo = new MarkupInfo(MediaType.HTML, "UTF-8");
+   private final PresentationContext presentationContext;
 
-   public PresentationRenderContext(WindowNavigationalState navigationalState)
+   /** . */
+   private final UIWindow uiwindow;
+
+   /** . */
+   private final WindowNavigationalState navigationalState;
+
+
+   public PresentationRenderContext(PresentationContext presentationContext, UIWindow uiwindow, WindowNavigationalState navigationalState)
    {
+      this.presentationContext = presentationContext;
+      this.uiwindow = uiwindow;
       this.navigationalState = navigationalState;
 
       //
@@ -87,6 +101,9 @@
 
    public String renderURL(PortletURL portletURL, Boolean wantSecure, Boolean wantAuthenticated, boolean relative)
    {
-      return "todo";
+      PortletRequestEncoder encoder = new PortletRequestEncoder();
+      encoder.encode(portletURL);
+      GetActivation get = new GetActivation(uiwindow.getId(), encoder.getQueryParameters());
+      return presentationContext.render(get);
    }
 }

Modified: branches/UIServer/core-uiserver/src/resources/presentation-sar/META-INF/jboss-service.xml
===================================================================
--- branches/UIServer/core-uiserver/src/resources/presentation-sar/META-INF/jboss-service.xml	2007-11-18 20:03:56 UTC (rev 9014)
+++ branches/UIServer/core-uiserver/src/resources/presentation-sar/META-INF/jboss-service.xml	2007-11-18 23:03:54 UTC (rev 9015)
@@ -69,7 +69,6 @@
       xmbean-dd=""
       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
       <xmbean/>
-      <depends>portal:container=PortalObject</depends>
       <depends>portal:service=PageService</depends>
       <depends>portal:commandFactory=DefaultPortal</depends>
       <depends>portal:urlFactory=Delegating</depends>
@@ -80,6 +79,7 @@
       <depends>portal:service=ContentProviderRegistry</depends>
       <depends>portal:service=ResponseHandler,type=Selector</depends>
       <depends>portal:service=ControlPolicy,type=Page</depends>
+      <depends optional-attribute-name="PortalObjectContainer" proxy-type="attribute">portal:container=PortalObject</depends>
    </mbean>
    <mbean
       code="org.jboss.portal.core.presentation.model.ModelLoaderImpl"

Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/controller/UIController.java
===================================================================
--- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/controller/UIController.java	2007-11-18 20:03:56 UTC (rev 9014)
+++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/controller/UIController.java	2007-11-18 23:03:54 UTC (rev 9015)
@@ -24,6 +24,7 @@
 
 import java.io.PrintWriter;
 import java.util.List;
+import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -37,6 +38,8 @@
 import org.jboss.portal.presentation.protocol.ServerAction;
 import org.jboss.portal.presentation.protocol.ServerResponse;
 import org.jboss.portal.presentation.protocol.ViewUIObjectAction;
+import org.jboss.portal.presentation.protocol.GetActivation;
+import org.jboss.portal.presentation.protocol.PostActivation;
 import org.jboss.portal.presentation.model.UIContext;
 import org.jboss.portal.presentation.model.UIObject;
 import org.jboss.portal.presentation.model.UIPage;
@@ -48,7 +51,6 @@
 import org.jboss.portal.server.ServerInvocation;
 import org.jboss.portal.server.ServerInvocationContext;
 
-
 /**
  * The UIServer is responsible for generating the output that is sent back to the client based on the Portal state of a particular Portal Request
  * 
@@ -207,15 +209,57 @@
     */
    private ServerAction getServerAction(PresentationContext presentationContext, ServerInvocation invocation)
    {
-      ServerAction serverAction = null;
-      
       ServerInvocationContext invocationContext = invocation.getServerContext();
-      HttpServletRequest request = invocationContext.getClientRequest();
+      String requestPath = invocation.getServerContext().getPortalRequestPath();
+
+      //
+      if (requestPath.startsWith("/invoke/"))
+      {
+         UIObject target = presentationContext.getUIContext();
+
+         //
+         int from = "/invoke/".length();
+         while (true)
+         {
+            int pos = requestPath.indexOf('/', from);
+            if (pos == -1)
+            {
+               String name = requestPath.substring(from);
+               target = target.getChild(name);
+               break;
+            }
+            else
+            {
+               String name = requestPath.substring(from, pos);
+               target = target.getChild(name);
+            }
+            if (target == null)
+            {
+               break;
+            }
+            from = pos + 1;
+         }
+
+         //
+         if (target != null)
+         {
+            Map queryParameters = invocationContext.getQueryParameterMap();
+            Map bodyParameters = invocationContext.getBodyParameterMap();
+            if (bodyParameters != null)
+            {
+               return new PostActivation(target.getId(), queryParameters, bodyParameters);
+            }
+            else
+            {
+               return new GetActivation(target.getId(), queryParameters);
+            }
+         }
+      }
             
       //Just use ViewUIObject command for now until URL interpretation/mapping
       //to ServiceAction is implemented
-      serverAction = new ViewUIObjectAction("/default/default");
-            
+      return new ViewUIObjectAction("/default/default");
+
       /*if(targetPortalObject instanceof UIPage)
       {         
          serverAction = new ViewUIObjectAction(targetPortalObject.getId());
@@ -244,8 +288,6 @@
             serverAction = post;
          }
       }*/
-      
-      return serverAction;
    }
    
    /**

Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/PresentationContextImpl.java
===================================================================
--- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/PresentationContextImpl.java	2007-11-18 20:03:56 UTC (rev 9014)
+++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/PresentationContextImpl.java	2007-11-18 23:03:54 UTC (rev 9015)
@@ -26,10 +26,17 @@
 
 import org.jboss.portal.presentation.client.PresentationContext;
 import org.jboss.portal.presentation.protocol.ServerAction;
+import org.jboss.portal.presentation.protocol.LinkActivation;
+import org.jboss.portal.presentation.protocol.UIObjectAction;
 import org.jboss.portal.presentation.model.UIContext;
+import org.jboss.portal.presentation.model.UIObject;
 import org.jboss.portal.presentation.server.PresentationServer;
 import org.jboss.portal.presentation.impl.model.UIContextImpl;
 import org.jboss.portal.server.ServerInvocation;
+import org.jboss.portal.server.ServerURL;
+import org.jboss.portal.server.AbstractServerURL;
+import org.jboss.portal.server.request.URLContext;
+import org.jboss.portal.server.request.URLFormat;
 import org.jboss.portal.web.ServletContextDispatcher;
 
 /**
@@ -38,11 +45,11 @@
  */
 public class PresentationContextImpl implements PresentationContext
 {
-   /**
-    * 
-    */
+
+   /** . */
    private ServerInvocation invocation = null;
    
+   /** . */
    private PresentationServer presentationServer = null;
    
    /**
@@ -93,6 +100,48 @@
     */
    public String render(ServerAction action) throws IllegalArgumentException
    {
-      return "TODO";
+      if (action instanceof UIObjectAction)
+      {
+         UIObjectAction objectAction = (UIObjectAction)action;
+
+         String targetId = objectAction.getTargetId();
+
+         UIObject target = getUIContext().getObject(targetId);
+
+         //
+         if (objectAction instanceof LinkActivation)
+         {
+            StringBuffer portalRequestPath = new StringBuffer("/invoke");
+            createPath(target, portalRequestPath);
+            ServerURL url = new AbstractServerURL();
+            url.setPortalRequestPath(portalRequestPath.toString());
+            LinkActivation linkActivation = (LinkActivation)objectAction;
+            url.getParameterMap().putAll(linkActivation.getQueryParameters());
+            return invocation.getServerContext().renderURL(url, URLContext.newInstance(false, false), URLFormat.newInstance(false, true));
+         }
+         else
+         {
+            throw new IllegalArgumentException();
+         }
+      }
+      else
+      {
+         throw new IllegalArgumentException();
+      }
    }
+
+   private static void createPath(UIObject object, StringBuffer buffer)
+   {
+      UIObject parent = object.getParent();
+
+      //
+      if (parent != null)
+      {
+         createPath(parent, buffer);
+
+         //
+         buffer.append('/').append(object.getName());
+      }
+   }
+
 }

Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/model/UIContextImpl.java
===================================================================
--- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/model/UIContextImpl.java	2007-11-18 20:03:56 UTC (rev 9014)
+++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/model/UIContextImpl.java	2007-11-18 23:03:54 UTC (rev 9015)
@@ -65,6 +65,9 @@
 
       //
       this.modelLoader = modelLoader;
+
+      // Put our self in the object cache
+      objects.put(getId(), this);
    }
 
    /**

Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/model/UIObjectImpl.java
===================================================================
--- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/model/UIObjectImpl.java	2007-11-18 20:03:56 UTC (rev 9014)
+++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/model/UIObjectImpl.java	2007-11-18 23:03:54 UTC (rev 9015)
@@ -132,8 +132,8 @@
     * 
     */
    public UIObject getParent()
-   {      
-      return context.getObject(parentId);
+   {
+      return parentId != null ? context.getObject(parentId) : null;
    }
    
    /**

Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/protocol/CreateUIObjectAction.java
===================================================================
--- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/protocol/CreateUIObjectAction.java	2007-11-18 20:03:56 UTC (rev 9014)
+++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/protocol/CreateUIObjectAction.java	2007-11-18 23:03:54 UTC (rev 9015)
@@ -22,6 +22,8 @@
  ******************************************************************************/
 package org.jboss.portal.presentation.protocol;
 
+import org.jboss.portal.presentation.model.UIObject;
+
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $

Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/protocol/GetActivation.java
===================================================================
--- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/protocol/GetActivation.java	2007-11-18 20:03:56 UTC (rev 9014)
+++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/protocol/GetActivation.java	2007-11-18 23:03:54 UTC (rev 9015)
@@ -22,11 +22,16 @@
  ******************************************************************************/
 package org.jboss.portal.presentation.protocol;
 
+import java.util.Map;
+
 /**
  * @author <a href="mailto:sshah at redhat.com">Sohil Shah</a>
  *
  */
 public class GetActivation extends LinkActivation
 {
-
+   public GetActivation(String targetId, Map queryParameters)
+   {
+      super(targetId, queryParameters);
+   }
 }

Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/protocol/LinkActivation.java
===================================================================
--- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/protocol/LinkActivation.java	2007-11-18 20:03:56 UTC (rev 9014)
+++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/protocol/LinkActivation.java	2007-11-18 23:03:54 UTC (rev 9015)
@@ -24,50 +24,25 @@
 
 import java.util.Map;
 
-import org.jboss.portal.presentation.model.UIObject;
-
 /**
  * @author <a href="mailto:sshah at redhat.com">Sohil Shah</a>
  *
  */
-public abstract class LinkActivation extends ServerAction
+public abstract class LinkActivation extends UIObjectAction
 {   
-   /**
-    * 
-    */
-   protected String contentType = null;
-   
-   /**
-    * 
-    */
-   protected String url = null;
-   
-   /**
-    * 
-    */
-   protected Map queryParameters = null;  
 
-   /**
-    * Target object where action needs to be performed
-    */
-   protected UIObject target = null;
+   /** julien: Not used for now . */
+   // protected String url = null;
 
-   /**
-    * 
-    * @return
-    */
-   public String getContentType()
-   {
-      return contentType;
-   }
+   /** . */
+   protected Map queryParameters = null;
 
-   /**
-    * 
-    * @param contentType
-    */
-   public void setContentType(String contentType)
+   protected LinkActivation(String targetId, Map queryParameters)
    {
-      this.contentType = contentType;
+      super(targetId);
+
+      //
+      this.queryParameters = queryParameters;
    }
 
    /**
@@ -78,49 +53,4 @@
    {
       return queryParameters;
    }
-
-   /**
-    * 
-    * @param queryParameters
-    */
-   public void setQueryParameters(Map queryParameters)
-   {
-      this.queryParameters = queryParameters;
-   }
-
-   /**
-    * 
-    * @return
-    */
-   public String getURL()
-   {
-      return url;
-   }
-
-   /**
-    * 
-    * @param URL
-    */
-   public void setURL(String URL)
-   {
-      this.url = URL;
-   }
-
-   /**
-    * 
-    * @return
-    */
-   public UIObject getTarget()
-   {
-      return target;
-   }
-
-   /**
-    * 
-    * @param target
-    */
-   public void setTarget(UIObject target)
-   {
-      this.target = target;
-   }
 }

Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/protocol/MoveUIObjectAction.java
===================================================================
--- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/protocol/MoveUIObjectAction.java	2007-11-18 20:03:56 UTC (rev 9014)
+++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/protocol/MoveUIObjectAction.java	2007-11-18 23:03:54 UTC (rev 9015)
@@ -22,6 +22,8 @@
  ******************************************************************************/
 package org.jboss.portal.presentation.protocol;
 
+import org.jboss.portal.presentation.model.UIObject;
+
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $

Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/protocol/PostActivation.java
===================================================================
--- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/protocol/PostActivation.java	2007-11-18 20:03:56 UTC (rev 9014)
+++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/protocol/PostActivation.java	2007-11-18 23:03:54 UTC (rev 9015)
@@ -22,6 +22,8 @@
  ******************************************************************************/
 package org.jboss.portal.presentation.protocol;
 
+import org.jboss.portal.presentation.model.UIObject;
+
 import java.util.Map;
 
 /**
@@ -30,8 +32,18 @@
  */
 public class PostActivation extends LinkActivation
 {
-   private Map bodyParameters = null;
 
+   /** . */
+   private final Map bodyParameters;
+
+   public PostActivation(String targetId, Map queryParameters, Map bodyParameters)
+   {
+      super(targetId, queryParameters);
+
+      //
+      this.bodyParameters = bodyParameters;
+   }
+
    /**
     * 
     * @return
@@ -40,13 +52,4 @@
    {
       return bodyParameters;
    }
-
-   /**
-    * 
-    * @param bodyParameters
-    */
-   public void setBodyParameters(Map bodyParameters)
-   {
-      this.bodyParameters = bodyParameters;
-   }
 }




More information about the portal-commits mailing list