You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2008/10/22 16:21:48 UTC

svn commit: r707086 - in /tiles/framework/trunk/tiles-core/src: main/java/org/apache/tiles/renderer/impl/BasicRendererFactory.java test/java/org/apache/tiles/renderer/impl/BasicRendererFactoryTest.java

Author: apetrelli
Date: Wed Oct 22 07:21:47 2008
New Revision: 707086

URL: http://svn.apache.org/viewvc?rev=707086&view=rev
Log:
TILES-322
Now the pairs are split correctly.

Modified:
    tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/renderer/impl/BasicRendererFactory.java
    tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/renderer/impl/BasicRendererFactoryTest.java

Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/renderer/impl/BasicRendererFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/renderer/impl/BasicRendererFactory.java?rev=707086&r1=707085&r2=707086&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/renderer/impl/BasicRendererFactory.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/renderer/impl/BasicRendererFactory.java Wed Oct 22 07:21:47 2008
@@ -151,7 +151,7 @@
         Map<String, String> completeParams = new HashMap<String, String>(
                 DEFAULT_TYPE_2_RENDERER);
         if (typeRenderersParam != null) {
-            String[] pairs = typeRenderersParam.split("\\s*;\\s");
+            String[] pairs = typeRenderersParam.split("\\s*;\\s*");
             for (int i = 0; i < pairs.length; i++) {
                 String[] pair = pairs[i].split("\\s*,\\s*");
                 if (pair == null || pair.length != 2) {

Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/renderer/impl/BasicRendererFactoryTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/renderer/impl/BasicRendererFactoryTest.java?rev=707086&r1=707085&r2=707086&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/renderer/impl/BasicRendererFactoryTest.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/renderer/impl/BasicRendererFactoryTest.java Wed Oct 22 07:21:47 2008
@@ -66,7 +66,8 @@
     public void testInitAndGetRenderer() {
         Map<String, String> params = new HashMap<String, String>();
         params.put(BasicRendererFactory.TYPE_RENDERERS_INIT_PARAM, "test,"
-                + StringAttributeRenderer.class.getName());
+				+ StringAttributeRenderer.class.getName() + ";test2,"
+				+ StringAttributeRenderer.class.getName());
         rendererFactory.init(params);
         AttributeRenderer renderer = rendererFactory.getRenderer("string");
         assertNotNull("The renderer is null", renderer);
@@ -74,6 +75,9 @@
         renderer = rendererFactory.getRenderer("test");
         assertNotNull("The renderer is null", renderer);
         assertTrue("The class of the renderer is wrong", renderer instanceof StringAttributeRenderer);
+        renderer = rendererFactory.getRenderer("test2");
+        assertNotNull("The renderer is null", renderer);
+        assertTrue("The class of the renderer is wrong", renderer instanceof StringAttributeRenderer);
         renderer = rendererFactory.getRenderer(StringAttributeRenderer.class
                 .getName());
         assertNotNull("The renderer is null", renderer);