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

[do-not-reply at jboss.org]

Author: julien_viet
Date: 2010-11-09 16:09:11 -0500 (Tue, 09 Nov 2010)
New Revision: 4990

Modified:
   portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java
   portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestBuildRoute.java
Log:
minor improvement


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-09 16:28:48 UTC (rev 4989)
+++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java	2010-11-09 21:09:11 UTC (rev 4990)
@@ -360,13 +360,13 @@
          {
             for (PatternRoute route : patterns)
             {
-               Matcher matcher = route.pattern.matcher(path.substring(1));
+               Matcher matcher = route.pattern.matcher(path);
 
                // We match
                if (matcher.find())
                {
                   // Build next controller context
-                  int nextPos = matcher.end() + 1;
+                  int nextPos = matcher.end();
                   String nextPath;
                   if (path.length() == nextPos)
                   {
@@ -592,7 +592,7 @@
          {
             List<QualifiedName> parameterNames = new ArrayList<QualifiedName>();
             PatternBuilder builder = new PatternBuilder();
-            builder.expr("^");
+            builder.expr("^").expr('/');
             List<String> chunks = new ArrayList<String>();
             List<PatternParam> parameterPatterns = new ArrayList<PatternParam>();
             int previous = 0;

Modified: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestBuildRoute.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestBuildRoute.java	2010-11-09 16:28:48 UTC (rev 4989)
+++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestBuildRoute.java	2010-11-09 21:09:11 UTC (rev 4990)
@@ -71,7 +71,7 @@
          assertEquals(0, router.root.getSegmentNames().size());
          assertEquals(1, router.root.getPatternSize());
          PatternRoute patternRoute = router.root.getPattern(0);
-         assertEquals("^([^/]+)", patternRoute.pattern.toString());
+         assertEquals("^/([^/]+)", patternRoute.pattern.toString());
          assertEquals(1, patternRoute.params.size());
          assertEquals(QualifiedName.create("a"), patternRoute.params.get(0).name);
          assertEquals("^[^/]+$", patternRoute.params.get(0).pattern.toString());
@@ -95,7 +95,7 @@
          assertEquals(0, router.root.getSegmentNames().size());
          assertEquals(1, router.root.getPatternSize());
          PatternRoute patternRoute = router.root.getPattern(0);
-         assertEquals("^([^/]+)", patternRoute.pattern.toString());
+         assertEquals("^/([^/]+)", patternRoute.pattern.toString());
          assertEquals(1, patternRoute.params.size());
          assertEquals(QualifiedName.create("q", "a"), patternRoute.params.get(0).name);
          assertEquals("^[^/]+$", patternRoute.params.get(0).pattern.toString());
@@ -119,7 +119,7 @@
          assertEquals(0, router.root.getSegmentNames().size());
          assertEquals(1, router.root.getPatternSize());
          PatternRoute patternRoute = router.root.getPattern(0);
-         assertEquals("^(.*)", patternRoute.pattern.toString());
+         assertEquals("^/(.*)", patternRoute.pattern.toString());
          assertEquals(1, patternRoute.params.size());
          assertEquals(QualifiedName.create("a"), patternRoute.params.get(0).name);
          assertEquals("^.*$", patternRoute.params.get(0).pattern.toString());