[gatein-commits] gatein SVN: r4159 - 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
do-not-reply at jboss.org
Sun Sep 12 18:55:25 EDT 2010
Author: julien_viet
Date: 2010-09-12 18:55:24 -0400 (Sun, 12 Sep 2010)
New Revision: 4159
Added:
portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/SegmentRoute.java
Removed:
portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/SimpleRoute.java
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:
rename SimpleRoute -> SegmentRoute
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-09-12 22:54:07 UTC (rev 4158)
+++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java 2010-09-12 22:55:24 UTC (rev 4159)
@@ -46,10 +46,10 @@
boolean terminal;
/** . */
- private final Map<String, List<SimpleRoute>> simpleRoutes;
+ private final Map<String, List<SegmentRoute>> segments;
/** Actually here we allow to store several times the same pattern and routing could be optimized instead. */
- private final List<PatternRoute> patternRoutes;
+ private final List<PatternRoute> patterns;
/** . */
private final Map<QualifiedName, String> routeParameters;
@@ -58,8 +58,8 @@
{
this.parent = null;
this.terminal = false;
- this.simpleRoutes = new LinkedHashMap<String, List<SimpleRoute>>();
- this.patternRoutes = new ArrayList<PatternRoute>();
+ this.segments = new LinkedHashMap<String, List<SegmentRoute>>();
+ this.patterns = new ArrayList<PatternRoute>();
this.routeParameters = new HashMap<QualifiedName, String>();
}
@@ -76,7 +76,7 @@
}
else
{
- if (r instanceof PatternRoute || r instanceof SimpleRoute)
+ if (r instanceof PatternRoute || r instanceof SegmentRoute)
{
StringBuilder sb = new StringBuilder();
r.render(blah, sb);
@@ -97,9 +97,9 @@
}
//
- if (this instanceof SimpleRoute)
+ if (this instanceof SegmentRoute)
{
- SimpleRoute sr = (SimpleRoute)this;
+ SegmentRoute sr = (SegmentRoute)this;
sb.append('/').append(sr.name);
}
else if (this instanceof PatternRoute)
@@ -164,9 +164,9 @@
}
//
- for (List<SimpleRoute> routes : simpleRoutes.values())
+ for (List<SegmentRoute> routes : segments.values())
{
- for (SimpleRoute route : routes)
+ for (SegmentRoute route : routes)
{
Route a = route.find(abc);
if (a != null)
@@ -175,7 +175,7 @@
}
}
}
- for (PatternRoute route : patternRoutes)
+ for (PatternRoute route : patterns)
{
Route a = route.find(abc);
if (a != null)
@@ -226,7 +226,7 @@
String segment = path.substring(1, pos);
// Try to find a route for the segment
- List<SimpleRoute> routes = simpleRoutes.get(segment);
+ List<SegmentRoute> routes = segments.get(segment);
if (routes != null)
{
// Determine next path
@@ -241,7 +241,7 @@
}
//
- for (SimpleRoute route : routes)
+ for (SegmentRoute route : routes)
{
// Delegate the process to the next route
Map<QualifiedName, String> response = route.route(nextPath, parameters);
@@ -259,7 +259,7 @@
// Try to find a pattern matching route otherwise
if (ret == null)
{
- for (PatternRoute route : patternRoutes)
+ for (PatternRoute route : patterns)
{
Matcher matcher = route.pattern.matcher(path.substring(1));
@@ -339,14 +339,14 @@
}
//
- if (route instanceof SimpleRoute)
+ if (route instanceof SegmentRoute)
{
- SimpleRoute segment = (SimpleRoute)route;
- List<SimpleRoute> routes = simpleRoutes.get(segment.name);
+ SegmentRoute segment = (SegmentRoute)route;
+ List<SegmentRoute> routes = segments.get(segment.name);
if (routes == null)
{
- routes = new ArrayList<SimpleRoute>();
- simpleRoutes.put(segment.name, routes);
+ routes = new ArrayList<SegmentRoute>();
+ segments.put(segment.name, routes);
}
routes.add(segment);
((Route)segment).parent = this;
@@ -356,7 +356,7 @@
{
PatternRoute pattern = (PatternRoute)route;
- patternRoutes.add(pattern);
+ patterns.add(pattern);
route.parent = this;
return (R)pattern;
}
@@ -368,29 +368,29 @@
Set<String> getSegmentNames()
{
- return simpleRoutes.keySet();
+ return segments.keySet();
}
int getSegmentSize(String segmentName)
{
- List<SimpleRoute> routes = simpleRoutes.get(segmentName);
+ List<SegmentRoute> routes = segments.get(segmentName);
return routes != null ? routes.size() : 0;
}
- SimpleRoute getSegment(String segmentName, int index)
+ SegmentRoute getSegment(String segmentName, int index)
{
- List<SimpleRoute> routes = simpleRoutes.get(segmentName);
+ List<SegmentRoute> routes = segments.get(segmentName);
return routes != null ? routes.get(index) : null;
}
int getPatternSize()
{
- return patternRoutes.size();
+ return patterns.size();
}
PatternRoute getPattern(int index)
{
- return patternRoutes.get(index);
+ return patterns.get(index);
}
/**
@@ -443,7 +443,7 @@
else
{
String segment = path.substring(0, pos);
- SimpleRoute route = new SimpleRoute(segment);
+ SegmentRoute route = new SegmentRoute(segment);
add(route);
next = route;
}
Copied: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/SegmentRoute.java (from rev 4158, portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/SimpleRoute.java)
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/SegmentRoute.java (rev 0)
+++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/SegmentRoute.java 2010-09-12 22:55:24 UTC (rev 4159)
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2010 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.exoplatform.web.controller.router;
+
+/**
+ * @author <a href="mailto:julien.viet at exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+class SegmentRoute extends Route
+{
+
+ /** . */
+ final String name;
+
+ SegmentRoute(String name)
+ {
+ this.name = name;
+ }
+}
Deleted: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/SimpleRoute.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/SimpleRoute.java 2010-09-12 22:54:07 UTC (rev 4158)
+++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/SimpleRoute.java 2010-09-12 22:55:24 UTC (rev 4159)
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2010 eXo Platform SAS.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.exoplatform.web.controller.router;
-
-/**
- * @author <a href="mailto:julien.viet at exoplatform.com">Julien Viet</a>
- * @version $Revision$
- */
-class SimpleRoute extends Route
-{
-
- /** . */
- final String name;
-
- SimpleRoute(String name)
- {
- this.name = name;
- }
-}
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-09-12 22:54:07 UTC (rev 4158)
+++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestBuildRoute.java 2010-09-12 22:55:24 UTC (rev 4159)
@@ -55,7 +55,7 @@
routerMD.addRoute(new RouteDescriptor(path));
Router router = new Router(routerMD);
Route expectedRoute = new Route();
- expectedRoute.add(new SimpleRoute("a"));
+ expectedRoute.add(new SegmentRoute("a"));
assertEquals(expectedRoute, router.root);
}
}
@@ -153,9 +153,9 @@
assertEquals(expectedRoute.getSegmentSize(segmentName), route.getSegmentSize(segmentName));
for (int segmentIndex = 0;segmentIndex < expectedRoute.getSegmentSize(segmentName);segmentIndex++)
{
- SimpleRoute expectedSimpleRoute = expectedRoute.getSegment(segmentName, segmentIndex);
- SimpleRoute simpleRoute = route.getSegment(segmentName, segmentIndex);
- assertEquals(expectedSimpleRoute, simpleRoute);
+ SegmentRoute expectedSegmentRoute = expectedRoute.getSegment(segmentName, segmentIndex);
+ SegmentRoute segmentRoute = route.getSegment(segmentName, segmentIndex);
+ assertEquals(expectedSegmentRoute, segmentRoute);
}
}
assertEquals(expectedRoute.getPatternSize(), route.getPatternSize());
@@ -168,9 +168,9 @@
assertEquals(((PatternRoute)expectedRoute).pattern.toString(), ((PatternRoute)route).pattern.toString());
assertEquals(((PatternRoute)expectedRoute).parameterNames, ((PatternRoute)route).parameterNames);
}
- else if (route instanceof SimpleRoute)
+ else if (route instanceof SegmentRoute)
{
- assertEquals(((SimpleRoute)expectedRoute).name, ((SimpleRoute)route).name);
+ assertEquals(((SegmentRoute)expectedRoute).name, ((SegmentRoute)route).name);
}
}
}
More information about the gatein-commits
mailing list