From do-not-reply at jboss.org Tue Nov 30 16:12:08 2010
Content-Type: multipart/mixed; boundary="===============6590880752496632513=="
MIME-Version: 1.0
From: do-not-reply at jboss.org
To: gatein-commits at lists.jboss.org
Subject: [gatein-commits] gatein SVN: r5390 -
 portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/url.
Date: Tue, 30 Nov 2010 16:12:08 -0500
Message-ID: <201011302112.oAULC8jF027810@svn01.web.mwc.hst.phx2.redhat.com>

--===============6590880752496632513==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien_viet
Date: 2010-11-30 16:12:07 -0500 (Tue, 30 Nov 2010)
New Revision: 5390

Modified:
   portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform=
/portal/url/PortalURLProvider.java
   portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform=
/portal/url/PortalURLProviderFilter.java
Log:
rennable this code I commented before


Modified: portal/branches/navcontroller/webui/portal/src/main/java/org/exop=
latform/portal/url/PortalURLProvider.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatfor=
m/portal/url/PortalURLProvider.java	2010-11-30 20:49:57 UTC (rev 5389)
+++ portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatfor=
m/portal/url/PortalURLProvider.java	2010-11-30 21:12:07 UTC (rev 5390)
@@ -24,6 +24,8 @@
 import org.exoplatform.web.url.ResourceLocator;
 import org.exoplatform.web.url.ResourceType;
 =

+import java.util.Locale;
+
 /**
  * @author <a href=3D"trongtt(a)gmail.com">Trong Tran</a>
  * @version $Revision$
@@ -35,11 +37,14 @@
    private ControllerContext controllerContext;
 =

    private LocatorProvider locatorProvider;
+
+   private Locale requestLocale;
    =

-   public PortalURLProvider(ControllerContext controllerCtx, LocatorProvid=
er locatorService)
+   public PortalURLProvider(ControllerContext controllerCtx, LocatorProvid=
er locatorService, Locale requestLocale)
    {
       this.controllerContext =3D controllerCtx;
       this.locatorProvider =3D locatorService;
+      this.requestLocale =3D requestLocale;
    }
    =

    public static void setCurrentPortalURLProvider(PortalURLProvider provid=
er)
@@ -57,9 +62,8 @@
       PortalURLProvider portalURLProvider =3D currentProvider.get();
       if (portalURLProvider !=3D null)
       {
-//         L newLocator =3D locatorProvider.newLocator(resourceType);
-//         return new PortalURL<R, L>(controllerContext, newLocator, false=
, siteType, siteName, access);
-         throw new UnsupportedOperationException("is it used ?");
+         L newLocator =3D locatorProvider.newLocator(resourceType);
+         return new PortalURL<R, L>(controllerContext, newLocator, false, =
requestLocale, siteType, siteName, access);
       }
       return null;
    }

Modified: portal/branches/navcontroller/webui/portal/src/main/java/org/exop=
latform/portal/url/PortalURLProviderFilter.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatfor=
m/portal/url/PortalURLProviderFilter.java	2010-11-30 20:49:57 UTC (rev 5389)
+++ portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatfor=
m/portal/url/PortalURLProviderFilter.java	2010-11-30 21:12:07 UTC (rev 5390)
@@ -56,7 +56,7 @@
       try
       {
          ControllerContext controllerCtx =3D new ControllerContext(webAppC=
ontroller, httpRequest, httpResponse, null);
-         PortalURLProvider urlProvider =3D new PortalURLProvider(controlle=
rCtx, locatorProvider);
+         PortalURLProvider urlProvider =3D new PortalURLProvider(controlle=
rCtx, locatorProvider, null);
          PortalURLProvider.setCurrentPortalURLProvider(urlProvider);
          chain.doFilter(httpRequest, httpResponse);
       }


--===============6590880752496632513==--