[jboss-cvs] jboss-portal/portlet/src/main/org/jboss/portal/portlet/test ...

[Chris Laprun]

  User: claprun 
  Date: 06/08/12 14:51:01

  Modified:    portlet/src/main/org/jboss/portal/portlet/test 
                        PortletController.java
  Log:
  JBPORTAL-979:
  - Added enforceAbsoluteURL and isURLAbsolute on URLTools.
  - Use URLTool.enforceAbsoluteURL where needed.
  
  Revision  Changes    Path
  1.78      +13 -12    jboss-portal/portlet/src/main/org/jboss/portal/portlet/test/PortletController.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PortletController.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/test/PortletController.java,v
  retrieving revision 1.77
  retrieving revision 1.78
  diff -u -b -r1.77 -r1.78
  --- PortletController.java	31 Jul 2006 19:29:55 -0000	1.77
  +++ PortletController.java	12 Aug 2006 18:51:01 -0000	1.78
  @@ -25,16 +25,17 @@
   import org.jboss.portal.WindowState;
   import org.jboss.portal.common.system.AbstractJBossService;
   import org.jboss.portal.common.util.Tools;
  +import org.jboss.portal.common.util.URLTools;
   import org.jboss.portal.portlet.ActionURL;
  +import org.jboss.portal.portlet.Parameters;
   import org.jboss.portal.portlet.ParametersStateString;
   import org.jboss.portal.portlet.Portlet;
   import org.jboss.portal.portlet.PortletInvoker;
  +import org.jboss.portal.portlet.PortletInvokerException;
  +import org.jboss.portal.portlet.PortletRequestDecoder;
   import org.jboss.portal.portlet.PortletURL;
   import org.jboss.portal.portlet.RenderURL;
   import org.jboss.portal.portlet.StateString;
  -import org.jboss.portal.portlet.PortletInvokerException;
  -import org.jboss.portal.portlet.PortletRequestDecoder;
  -import org.jboss.portal.portlet.Parameters;
   import org.jboss.portal.portlet.impl.spi.AbstractInvocationContext;
   import org.jboss.portal.portlet.impl.spi.AbstractRequestContext;
   import org.jboss.portal.portlet.impl.spi.AbstractSecurityContext;
  @@ -59,10 +60,10 @@
   import org.jboss.portal.portlet.state.AccessMode;
   import org.jboss.portal.server.AbstractServerURL;
   import org.jboss.portal.server.RequestController;
  +import org.jboss.portal.server.ServerException;
   import org.jboss.portal.server.ServerInvocation;
   import org.jboss.portal.server.ServerRequest;
   import org.jboss.portal.server.ServerResponse;
  -import org.jboss.portal.server.ServerException;
   import org.jboss.portal.server.request.RequestParameter;
   import org.jboss.portal.server.request.URLContext;
   import org.jboss.portal.server.request.URLFormat;
  @@ -83,7 +84,7 @@
   
   /**
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.77 $
  + * @version $Revision: 1.78 $
    */
   public class PortletController extends AbstractJBossService implements RequestController
   {
  @@ -166,10 +167,12 @@
                              {
                                 return _portletNavState;
                              }
  +
                              public Mode getMode()
                              {
                                 return _mode;
                              }
  +
                              public WindowState getWindowState()
                              {
                                 return _windowState;
  @@ -372,9 +375,7 @@
         writer.close();
      }
   
  -   /**
  -    * An instance context implementation that stores
  -    */
  +   /** An instance context implementation that stores */
      protected class InstanceContextImpl implements InstanceContext
      {
   
  @@ -524,14 +525,17 @@
            {
               return null;
            }
  +
            public Map getInformations()
            {
               return ((UserInterceptor.User)invocationContext.serverRequest.getUser()).getInformations();
            }
  +
            public Locale getLocale()
            {
               return invocationContext.serverRequest.getLocale();
            }
  +
            public List getLocales()
            {
               return Tools.toList(invocationContext.serverRequest.getLocales());
  @@ -606,10 +610,7 @@
   
         public String encodeURL(String url)
         {
  -         if (!url.startsWith("http://") && !url.startsWith("/"))
  -         {
  -            throw new IllegalArgumentException("invalid URL " + url);
  -         }
  +         URLTools.enforceAbsoluteURL(url);
            return serverResponse.getContext().getClientResponse().encodeURL(url);
         }