Author: nlebas
Date: Fri Dec 16 00:31:49 2011
New Revision: 1215008
URL: http://svn.apache.org/viewvc?rev=1215008&view=rev
Log:
merging TypeDetectingRenderer into Renderer
Removed:
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/render/TypeDetectingRenderer.java
Modified:
tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java
tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/renderer/DefinitionRenderer.java
tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/factory/BasicTilesContainerFactoryTest.java
tiles/framework/trunk/tiles-parent/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java
tiles/framework/trunk/tiles-parent/tiles-extras/src/main/java/org/apache/tiles/extras/renderer/OptionsRenderer.java
tiles/framework/trunk/tiles-parent/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactoryTest.java
tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/renderer/ReverseStringRenderer.java
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/render/ChainedDelegateRenderer.java
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/render/DispatchRenderer.java
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/render/PublisherRenderer.java
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/render/Renderer.java
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/render/StringRenderer.java
tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/render/ChainedDelegateRendererTest.java
tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/render/FreemarkerRenderer.java
tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/render/VelocityRenderer.java
tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/render/VelocityRendererTest.java
Modified:
tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java?rev=1215008&r1=1215007&r2=1215008&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java
(original)
+++
tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java
Fri Dec 16 00:31:49 2011
@@ -54,7 +54,6 @@ import org.apache.tiles.request.render.D
import org.apache.tiles.request.render.Renderer;
import org.apache.tiles.request.render.RendererFactory;
import org.apache.tiles.request.render.StringRenderer;
-import org.apache.tiles.request.render.TypeDetectingRenderer;
/**
* Factory that builds a standard Tiles container using only Java code.
@@ -298,12 +297,9 @@ public class BasicTilesContainerFactory
TilesContainer container,
AttributeEvaluatorFactory attributeEvaluatorFactory) {
ChainedDelegateRenderer retValue = new ChainedDelegateRenderer();
- retValue.addAttributeRenderer((TypeDetectingRenderer) rendererFactory
- .getRenderer(DEFINITION_RENDERER_NAME));
- retValue.addAttributeRenderer((TypeDetectingRenderer) rendererFactory
- .getRenderer(TEMPLATE_RENDERER_NAME));
- retValue.addAttributeRenderer((TypeDetectingRenderer) rendererFactory
- .getRenderer(STRING_RENDERER_NAME));
+
retValue.addAttributeRenderer(rendererFactory.getRenderer(DEFINITION_RENDERER_NAME));
+
retValue.addAttributeRenderer(rendererFactory.getRenderer(TEMPLATE_RENDERER_NAME));
+
retValue.addAttributeRenderer(rendererFactory.getRenderer(STRING_RENDERER_NAME));
return retValue;
}
Modified:
tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/renderer/DefinitionRenderer.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/renderer/DefinitionRenderer.java?rev=1215008&r1=1215007&r2=1215008&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/renderer/DefinitionRenderer.java
(original)
+++
tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/renderer/DefinitionRenderer.java
Fri Dec 16 00:31:49 2011
@@ -25,7 +25,7 @@ import java.io.IOException;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.request.Request;
import org.apache.tiles.request.render.CannotRenderException;
-import org.apache.tiles.request.render.TypeDetectingRenderer;
+import org.apache.tiles.request.render.Renderer;
/**
* Renders an attribute that contains a reference to a definition.
@@ -33,7 +33,7 @@ import org.apache.tiles.request.render.T
* @version $Rev$ $Date$
* @since 3.0.0
*/
-public class DefinitionRenderer implements TypeDetectingRenderer {
+public class DefinitionRenderer implements Renderer {
/**
* The Tiles container.
Modified:
tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/factory/BasicTilesContainerFactoryTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/factory/BasicTilesContainerFactoryTest.java?rev=1215008&r1=1215007&r2=1215008&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/factory/BasicTilesContainerFactoryTest.java
(original)
+++
tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/factory/BasicTilesContainerFactoryTest.java
Fri Dec 16 00:31:49 2011
@@ -48,7 +48,6 @@ import org.apache.tiles.request.render.D
import org.apache.tiles.request.render.Renderer;
import org.apache.tiles.request.render.RendererFactory;
import org.apache.tiles.request.render.StringRenderer;
-import org.apache.tiles.request.render.TypeDetectingRenderer;
import org.easymock.EasyMock;
/**
@@ -197,9 +196,9 @@ public class BasicTilesContainerFactoryT
TilesContainer container = createMock(TilesContainer.class);
AttributeEvaluatorFactory attributeEvaluatorFactory =
createMock(AttributeEvaluatorFactory.class);
BasicRendererFactory rendererFactory =
createMock(BasicRendererFactory.class);
- Renderer stringRenderer = createMock(TypeDetectingRenderer.class);
- Renderer templateRenderer = createMock(TypeDetectingRenderer.class);
- Renderer definitionRenderer = createMock(TypeDetectingRenderer.class);
+ Renderer stringRenderer = createMock(Renderer.class);
+ Renderer templateRenderer = createMock(Renderer.class);
+ Renderer definitionRenderer = createMock(Renderer.class);
expect(rendererFactory.getRenderer("string")).andReturn(stringRenderer);
expect(rendererFactory.getRenderer("template")).andReturn(templateRenderer);
Modified:
tiles/framework/trunk/tiles-parent/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java?rev=1215008&r1=1215007&r2=1215008&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-parent/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java
(original)
+++
tiles/framework/trunk/tiles-parent/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java
Fri Dec 16 00:31:49 2011
@@ -81,7 +81,6 @@ import org.apache.tiles.request.freemark
import org.apache.tiles.request.render.BasicRendererFactory;
import org.apache.tiles.request.render.ChainedDelegateRenderer;
import org.apache.tiles.request.render.Renderer;
-import org.apache.tiles.request.render.TypeDetectingRenderer;
import org.apache.tiles.request.velocity.render.VelocityRenderer;
import org.apache.tiles.request.velocity.render.VelocityRendererBuilder;
import org.apache.tiles.util.URLUtil;
@@ -165,16 +164,11 @@ public class CompleteAutoloadTilesContai
TilesContainer container,
AttributeEvaluatorFactory attributeEvaluatorFactory) {
ChainedDelegateRenderer retValue = new ChainedDelegateRenderer();
- retValue.addAttributeRenderer((TypeDetectingRenderer) rendererFactory
- .getRenderer(DEFINITION_RENDERER_NAME));
- retValue.addAttributeRenderer((TypeDetectingRenderer) rendererFactory
- .getRenderer(VELOCITY_RENDERER_NAME));
- retValue.addAttributeRenderer((TypeDetectingRenderer) rendererFactory
- .getRenderer(FREEMARKER_RENDERER_NAME));
- retValue.addAttributeRenderer((TypeDetectingRenderer) rendererFactory
- .getRenderer(TEMPLATE_RENDERER_NAME));
- retValue.addAttributeRenderer((TypeDetectingRenderer) rendererFactory
- .getRenderer(STRING_RENDERER_NAME));
+
retValue.addAttributeRenderer(rendererFactory.getRenderer(DEFINITION_RENDERER_NAME));
+
retValue.addAttributeRenderer(rendererFactory.getRenderer(VELOCITY_RENDERER_NAME));
+
retValue.addAttributeRenderer(rendererFactory.getRenderer(FREEMARKER_RENDERER_NAME));
+
retValue.addAttributeRenderer(rendererFactory.getRenderer(TEMPLATE_RENDERER_NAME));
+
retValue.addAttributeRenderer(rendererFactory.getRenderer(STRING_RENDERER_NAME));
return retValue;
}
Modified:
tiles/framework/trunk/tiles-parent/tiles-extras/src/main/java/org/apache/tiles/extras/renderer/OptionsRenderer.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-extras/src/main/java/org/apache/tiles/extras/renderer/OptionsRenderer.java?rev=1215008&r1=1215007&r2=1215008&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-parent/tiles-extras/src/main/java/org/apache/tiles/extras/renderer/OptionsRenderer.java
(original)
+++
tiles/framework/trunk/tiles-parent/tiles-extras/src/main/java/org/apache/tiles/extras/renderer/OptionsRenderer.java
Fri Dec 16 00:31:49 2011
@@ -13,7 +13,7 @@ import org.apache.tiles.ListAttribute;
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
-import org.apache.tiles.request.render.TypeDetectingRenderer;
+import org.apache.tiles.request.render.Renderer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory;
* Currently only supports one occurrance of such an "option" pattern in the
attribute's value.
*
*/
-public final class OptionsRenderer implements TypeDetectingRenderer {
+public final class OptionsRenderer implements Renderer {
private static final Pattern OPTIONS_PATTERN
= Pattern.compile(Pattern.quote("{options[") + "(.+)" +
Pattern.quote("]}"));
@@ -53,9 +53,9 @@ public final class OptionsRenderer imple
private static final Logger LOG =
LoggerFactory.getLogger(OptionsRenderer.class);
private final ApplicationContext applicationContext;
- private final TypeDetectingRenderer renderer;
+ private final Renderer renderer;
- public OptionsRenderer(final ApplicationContext applicationContext, final
TypeDetectingRenderer renderer){
+ public OptionsRenderer(final ApplicationContext applicationContext, final
Renderer renderer){
this.applicationContext = applicationContext;
this.renderer = renderer;
}
Modified:
tiles/framework/trunk/tiles-parent/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactoryTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactoryTest.java?rev=1215008&r1=1215007&r2=1215008&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-parent/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactoryTest.java
(original)
+++
tiles/framework/trunk/tiles-parent/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactoryTest.java
Fri Dec 16 00:31:49 2011
@@ -56,7 +56,6 @@ import org.apache.tiles.request.render.C
import org.apache.tiles.request.render.DispatchRenderer;
import org.apache.tiles.request.render.Renderer;
import org.apache.tiles.request.render.StringRenderer;
-import org.apache.tiles.request.render.TypeDetectingRenderer;
import org.apache.tiles.request.servlet.ServletApplicationContext;
import org.apache.tiles.request.velocity.render.VelocityRenderer;
import org.apache.velocity.tools.view.VelocityView;
@@ -174,11 +173,11 @@ public class CompleteAutoloadTilesContai
TilesContainer container = createMock(TilesContainer.class);
AttributeEvaluatorFactory attributeEvaluatorFactory =
createMock(AttributeEvaluatorFactory.class);
BasicRendererFactory rendererFactory =
createMock(BasicRendererFactory.class);
- Renderer stringRenderer = createMock(TypeDetectingRenderer.class);
- Renderer templateRenderer = createMock(TypeDetectingRenderer.class);
- Renderer definitionRenderer = createMock(TypeDetectingRenderer.class);
- Renderer velocityRenderer = createMock(TypeDetectingRenderer.class);
- Renderer freemarkerRenderer = createMock(TypeDetectingRenderer.class);
+ Renderer stringRenderer = createMock(Renderer.class);
+ Renderer templateRenderer = createMock(Renderer.class);
+ Renderer definitionRenderer = createMock(Renderer.class);
+ Renderer velocityRenderer = createMock(Renderer.class);
+ Renderer freemarkerRenderer = createMock(Renderer.class);
expect(rendererFactory.getRenderer("string")).andReturn(stringRenderer);
expect(rendererFactory.getRenderer("template")).andReturn(templateRenderer);
Modified:
tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/renderer/ReverseStringRenderer.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/renderer/ReverseStringRenderer.java?rev=1215008&r1=1215007&r2=1215008&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/renderer/ReverseStringRenderer.java
(original)
+++
tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/renderer/ReverseStringRenderer.java
Fri Dec 16 00:31:49 2011
@@ -42,4 +42,9 @@ public class ReverseStringRenderer imple
}
request.getWriter().write(String.valueOf(newArray));
}
+
+ @Override
+ public boolean isRenderable(String path, Request request) {
+ return true;
+ }
}
Modified:
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/render/ChainedDelegateRenderer.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/render/ChainedDelegateRenderer.java?rev=1215008&r1=1215007&r2=1215008&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/render/ChainedDelegateRenderer.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/render/ChainedDelegateRenderer.java
Fri Dec 16 00:31:49 2011
@@ -38,7 +38,7 @@ public class ChainedDelegateRenderer imp
/**
* The list of chained renderers.
*/
- private List<TypeDetectingRenderer> renderers;
+ private List<Renderer> renderers;
/**
* Constructor.
@@ -46,7 +46,7 @@ public class ChainedDelegateRenderer imp
* @since 2.2.1
*/
public ChainedDelegateRenderer() {
- renderers = new ArrayList<TypeDetectingRenderer>();
+ renderers = new ArrayList<Renderer>();
}
/**
@@ -55,7 +55,7 @@ public class ChainedDelegateRenderer imp
*
* @param renderer The renderer to add.
*/
- public void addAttributeRenderer(TypeDetectingRenderer renderer) {
+ public void addAttributeRenderer(Renderer renderer) {
renderers.add(renderer);
}
@@ -66,7 +66,7 @@ public class ChainedDelegateRenderer imp
throw new NullPointerException("The attribute value is null");
}
- for (TypeDetectingRenderer renderer : renderers) {
+ for (Renderer renderer : renderers) {
if (renderer.isRenderable(value, request)) {
renderer.render(value, request);
return;
@@ -75,4 +75,14 @@ public class ChainedDelegateRenderer imp
throw new CannotRenderException("Cannot renderer value '" + value +
"'");
}
+
+ /** {@inheritDoc} */
+ public boolean isRenderable(String value, Request request) {
+ for (Renderer renderer : renderers) {
+ if (renderer.isRenderable(value, request)) {
+ return true;
+ }
+ }
+ return false;
+ }
}
Modified:
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/render/DispatchRenderer.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/render/DispatchRenderer.java?rev=1215008&r1=1215007&r2=1215008&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/render/DispatchRenderer.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/render/DispatchRenderer.java
Fri Dec 16 00:31:49 2011
@@ -31,7 +31,7 @@ import org.apache.tiles.request.Dispatch
* @version $Rev$ $Date$
* @since 3.0.0
*/
-public class DispatchRenderer implements TypeDetectingRenderer {
+public class DispatchRenderer implements Renderer {
/** {@inheritDoc} */
@Override
Modified:
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/render/PublisherRenderer.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/render/PublisherRenderer.java?rev=1215008&r1=1215007&r2=1215008&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/render/PublisherRenderer.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/render/PublisherRenderer.java
Fri Dec 16 00:31:49 2011
@@ -33,7 +33,7 @@ import org.apache.tiles.request.Request;
* @version $Rev: 1035784 $ $Date: 2010-11-16 20:24:12 +0000 (Tue, 16 Nov
2010) $
* @since 3.0.0
*/
-public class PublisherRenderer implements TypeDetectingRenderer {
+public class PublisherRenderer implements Renderer {
public interface RendererListener{
/** Called before the delegate's render method is called. */
@@ -44,11 +44,11 @@ public class PublisherRenderer implement
void handleIOException(IOException ex, Request request) throws
IOException;
}
- private final TypeDetectingRenderer renderer;
+ private final Renderer renderer;
private final List<RendererListener> listeners = new
ArrayList<RendererListener>();
private final List<RendererListener> listenersReversed = new
ArrayList<RendererListener>();
- public PublisherRenderer(TypeDetectingRenderer renderer){
+ public PublisherRenderer(Renderer renderer){
this.renderer = renderer;
}
Modified:
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/render/Renderer.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/render/Renderer.java?rev=1215008&r1=1215007&r2=1215008&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/render/Renderer.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/render/Renderer.java
Fri Dec 16 00:31:49 2011
@@ -40,4 +40,14 @@ public interface Renderer {
* @throws IOException If something goes wrong during rendition.
*/
void render(String path, Request request) throws IOException;
+
+ /**
+ * Checks if this renderer can render a path. Note that this does not mean
+ * it is the <strong>best</strong> renderer available, but checks only its
capability.
+ *
+ * @param path The path to be rendered.
+ * @param request The request context.
+ * @return <code>true</code> if this renderer can render the attribute.
+ */
+ boolean isRenderable(String path, Request request);
}
Modified:
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/render/StringRenderer.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/render/StringRenderer.java?rev=1215008&r1=1215007&r2=1215008&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/render/StringRenderer.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/render/StringRenderer.java
Fri Dec 16 00:31:49 2011
@@ -29,7 +29,7 @@ import org.apache.tiles.request.Request;
*
* @version $Rev$ $Date$
*/
-public class StringRenderer implements TypeDetectingRenderer {
+public class StringRenderer implements Renderer {
/** {@inheritDoc} */
@Override
Modified:
tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/render/ChainedDelegateRendererTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/render/ChainedDelegateRendererTest.java?rev=1215008&r1=1215007&r2=1215008&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/render/ChainedDelegateRendererTest.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/render/ChainedDelegateRendererTest.java
Fri Dec 16 00:31:49 2011
@@ -45,26 +45,26 @@ public class ChainedDelegateRendererTest
/**
* A mock string attribute renderer.
*/
- private TypeDetectingRenderer stringRenderer;
+ private Renderer stringRenderer;
/**
* A mock template attribute renderer.
*/
- private TypeDetectingRenderer templateRenderer;
+ private Renderer templateRenderer;
/**
* A mock definition attribute renderer.
*/
- private TypeDetectingRenderer definitionRenderer;
+ private Renderer definitionRenderer;
/**
* Sets up the test.
*/
@Before
public void setUp() {
- stringRenderer = createMock(TypeDetectingRenderer.class);
- templateRenderer = createMock(TypeDetectingRenderer.class);
- definitionRenderer = createMock(TypeDetectingRenderer.class);
+ stringRenderer = createMock(Renderer.class);
+ templateRenderer = createMock(Renderer.class);
+ definitionRenderer = createMock(Renderer.class);
renderer = new ChainedDelegateRenderer();
renderer.addAttributeRenderer(definitionRenderer);
renderer.addAttributeRenderer(templateRenderer);
Modified:
tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/render/FreemarkerRenderer.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/render/FreemarkerRenderer.java?rev=1215008&r1=1215007&r2=1215008&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/render/FreemarkerRenderer.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/render/FreemarkerRenderer.java
Fri Dec 16 00:31:49 2011
@@ -30,7 +30,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.tiles.request.Request;
import org.apache.tiles.request.freemarker.FreemarkerRequestException;
import org.apache.tiles.request.render.CannotRenderException;
-import org.apache.tiles.request.render.TypeDetectingRenderer;
+import org.apache.tiles.request.render.Renderer;
import org.apache.tiles.request.servlet.ExternalWriterHttpServletResponse;
import org.apache.tiles.request.servlet.ServletRequest;
@@ -44,7 +44,7 @@ import org.apache.tiles.request.servlet.
* @version $Rev$ $Date$
* @since 2.2.0
*/
-public class FreemarkerRenderer implements TypeDetectingRenderer {
+public class FreemarkerRenderer implements Renderer {
/**
* The servlet that is used to forward the request to.
Modified:
tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/render/VelocityRenderer.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/render/VelocityRenderer.java?rev=1215008&r1=1215007&r2=1215008&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/render/VelocityRenderer.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/render/VelocityRenderer.java
Fri Dec 16 00:31:49 2011
@@ -25,7 +25,7 @@ import java.io.IOException;
import org.apache.tiles.request.Request;
import org.apache.tiles.request.render.CannotRenderException;
-import org.apache.tiles.request.render.TypeDetectingRenderer;
+import org.apache.tiles.request.render.Renderer;
import org.apache.tiles.request.servlet.ServletRequest;
import org.apache.tiles.request.servlet.ServletUtil;
import org.apache.velocity.Template;
@@ -42,7 +42,7 @@ import org.apache.velocity.tools.view.Ve
* @version $Rev$ $Date$
* @since 2.2.0
*/
-public class VelocityRenderer implements TypeDetectingRenderer {
+public class VelocityRenderer implements Renderer {
/**
* The VelocityView object to use.
Modified:
tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/render/VelocityRendererTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/render/VelocityRendererTest.java?rev=1215008&r1=1215007&r2=1215008&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/render/VelocityRendererTest.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/render/VelocityRendererTest.java
Fri Dec 16 00:31:49 2011
@@ -31,7 +31,7 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.tiles.request.render.CannotRenderException;
-import org.apache.tiles.request.render.TypeDetectingRenderer;
+import org.apache.tiles.request.render.Renderer;
import org.apache.tiles.request.servlet.ServletRequest;
import org.apache.velocity.Template;
import org.apache.velocity.tools.view.VelocityView;
@@ -67,7 +67,7 @@ public class VelocityRendererTest {
view.merge(template, context, writer);
replay(view, request, httpRequest, response, context, template,
writer);
- TypeDetectingRenderer renderer = new VelocityRenderer(view);
+ Renderer renderer = new VelocityRenderer(view);
renderer.render("/test.vm", request);
verify(view, request, httpRequest, response, context, template,
writer);
}
@@ -82,7 +82,7 @@ public class VelocityRendererTest {
ServletRequest request = createMock(ServletRequest.class);
replay(view, request);
- TypeDetectingRenderer renderer = new VelocityRenderer(view);
+ Renderer renderer = new VelocityRenderer(view);
try {
renderer.render(null, request);
} finally {
@@ -99,7 +99,7 @@ public class VelocityRendererTest {
public void testIsRenderable() {
VelocityView view = createMock(VelocityView.class);
replay(view);
- TypeDetectingRenderer renderer = new VelocityRenderer(view);
+ Renderer renderer = new VelocityRenderer(view);
assertTrue(renderer.isRenderable("/my/template.vm", null));
assertFalse(renderer.isRenderable("my/template.vm", null));
assertFalse(renderer.isRenderable("/my/template.jsp", null));
