[gatein-commits] gatein SVN: r5361 - in portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller: router and 1 other directory.

[do-not-reply at jboss.org]

Author: julien_viet
Date: 2010-11-29 17:43:42 -0500 (Mon, 29 Nov 2010)
New Revision: 5361

Modified:
   portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/DescriptorBuilder.java
   portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/RouterDescriptor.java
   portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java
Log:
minor


Modified: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/DescriptorBuilder.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/DescriptorBuilder.java	2010-11-29 22:39:20 UTC (rev 5360)
+++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/DescriptorBuilder.java	2010-11-29 22:43:42 UTC (rev 5361)
@@ -34,6 +34,18 @@
 public class DescriptorBuilder
 {
 
+   /** . */
+   private static final QName routeQN = new QName("http://www.gatein.org/xml/ns/gatein_router_1_0", "route");
+
+   /** . */
+   private static final QName paramQN = new QName("http://www.gatein.org/xml/ns/gatein_router_1_0", "route-param");
+
+   /** . */
+   private static final QName requestParamQN = new QName("http://www.gatein.org/xml/ns/gatein_router_1_0", "request-param");
+
+   /** . */
+   private static final QName pathParamQN = new QName("http://www.gatein.org/xml/ns/gatein_router_1_0", "path-param");
+
    public static PathParamDescriptor pathParam(String qualifiedName)
    {
       return new PathParamDescriptor(qualifiedName);
@@ -49,18 +61,6 @@
       return new RouteParamDescriptor(qualifiedName);
    }
 
-   /** . */
-   private static final QName routeQN = new QName("http://www.gatein.org/xml/ns/gatein_router_1_0", "route");
-
-   /** . */
-   private static final QName paramQN = new QName("http://www.gatein.org/xml/ns/gatein_router_1_0", "route-param");
-
-   /** . */
-   private static final QName requestParamQN = new QName("http://www.gatein.org/xml/ns/gatein_router_1_0", "request-param");
-
-   /** . */
-   private static final QName pathParamQN = new QName("http://www.gatein.org/xml/ns/gatein_router_1_0", "path-param");
-
    public static RouteDescriptor route(String path)
    {
       return new RouteDescriptor(path);

Modified: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/RouterDescriptor.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/RouterDescriptor.java	2010-11-29 22:39:20 UTC (rev 5360)
+++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/RouterDescriptor.java	2010-11-29 22:43:42 UTC (rev 5361)
@@ -41,15 +41,15 @@
       this.routes = new ArrayList<RouteDescriptor>();
    }
 
-   public RouterDescriptor add(RouteDescriptor controller)
+   public RouterDescriptor add(RouteDescriptor route)
    {
-      if (controller == null)
+      if (route == null)
       {
          throw new NullPointerException();
       }
 
       //
-      routes.add(controller);
+      routes.add(route);
 
       //
       return this;

Modified: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java	2010-11-29 22:39:20 UTC (rev 5360)
+++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java	2010-11-29 22:43:42 UTC (rev 5361)
@@ -671,9 +671,7 @@
                   analyser.process(disjunction);
 
                   //
-                  String tmp = analyser.getPattern();
-                  System.out.println("" + regex + " -> " + tmp);
-                  regex = tmp;
+                  regex = analyser.getPattern();
                }
                catch (SyntaxException e)
                {
@@ -701,7 +699,6 @@
             // Julien : should the pattern end with a $ ?????? I don't see that for now
             // we need to figure out clearly
             Pattern pattern = builder.build();
-            System.out.println("pattern = " + pattern);
             PatternRoute route = new PatternRoute(pattern, parameterPatterns, chunks);
 
             // Wire