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 2010/08/31 21:22:48 UTC
svn commit: r991301 - in
/tiles/sandbox/trunk/tiles-render/tiles-render-core: ./ src/main/java/org/
src/main/java/org/apache/ src/main/java/org/apache/tiles/
src/main/java/org/apache/tiles/render/
Author: apetrelli
Date: Tue Aug 31 19:22:48 2010
New Revision: 991301
URL: http://svn.apache.org/viewvc?rev=991301&view=rev
Log:
TILESSB-35
First renderer and delegation.
Added:
tiles/sandbox/trunk/tiles-render/tiles-render-core/src/main/java/org/
tiles/sandbox/trunk/tiles-render/tiles-render-core/src/main/java/org/apache/
tiles/sandbox/trunk/tiles-render/tiles-render-core/src/main/java/org/apache/tiles/
tiles/sandbox/trunk/tiles-render/tiles-render-core/src/main/java/org/apache/tiles/render/
tiles/sandbox/trunk/tiles-render/tiles-render-core/src/main/java/org/apache/tiles/render/DispatchRenderer.java
- copied, changed from r982384, tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/TemplateAttributeRenderer.java
tiles/sandbox/trunk/tiles-render/tiles-render-core/src/main/java/org/apache/tiles/render/InvalidTemplateException.java (with props)
tiles/sandbox/trunk/tiles-render/tiles-render-core/src/main/java/org/apache/tiles/render/RenderException.java (with props)
tiles/sandbox/trunk/tiles-render/tiles-render-core/src/main/java/org/apache/tiles/render/Renderer.java (with props)
tiles/sandbox/trunk/tiles-render/tiles-render-core/src/main/java/org/apache/tiles/render/TypeDetectingRenderer.java (with props)
Modified:
tiles/sandbox/trunk/tiles-render/tiles-render-core/pom.xml
Modified: tiles/sandbox/trunk/tiles-render/tiles-render-core/pom.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-render/tiles-render-core/pom.xml?rev=991301&r1=991300&r2=991301&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-render/tiles-render-core/pom.xml (original)
+++ tiles/sandbox/trunk/tiles-render/tiles-render-core/pom.xml Tue Aug 31 19:22:48 2010
@@ -10,4 +10,11 @@
<version>1.0.0-SNAPSHOT</version>
<name>Tiles Render - Core</name>
<description>Core library of Tiles Render.</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-request-api</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
Copied: tiles/sandbox/trunk/tiles-render/tiles-render-core/src/main/java/org/apache/tiles/render/DispatchRenderer.java (from r982384, tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/TemplateAttributeRenderer.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-render/tiles-render-core/src/main/java/org/apache/tiles/render/DispatchRenderer.java?p2=tiles/sandbox/trunk/tiles-render/tiles-render-core/src/main/java/org/apache/tiles/render/DispatchRenderer.java&p1=tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/TemplateAttributeRenderer.java&r1=982384&r2=991301&rev=991301&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/TemplateAttributeRenderer.java (original)
+++ tiles/sandbox/trunk/tiles-render/tiles-render-core/src/main/java/org/apache/tiles/render/DispatchRenderer.java Tue Aug 31 19:22:48 2010
@@ -18,46 +18,36 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.renderer.impl;
+package org.apache.tiles.render;
import java.io.IOException;
-import org.apache.tiles.Attribute;
-import org.apache.tiles.impl.InvalidTemplateException;
import org.apache.tiles.request.Request;
/**
* Renders an attribute that contains a reference to a template.
*
* @version $Rev$ $Date$
- * @since 2.1.0
+ * @since 3.0.0
*/
-public class TemplateAttributeRenderer extends AbstractTypeDetectingAttributeRenderer {
+public class DispatchRenderer implements TypeDetectingRenderer {
/** {@inheritDoc} */
@Override
- public void write(Object value, Attribute attribute,
- Request request)
- throws IOException {
- if (value != null) {
- if (value instanceof String) {
- request.dispatch(value.toString());
- } else {
- throw new InvalidTemplateException(
- "Cannot render a template that is not a string: "
- + value.toString());
- }
- } else {
- throw new InvalidTemplateException("Cannot render a null template");
+ public void render(String path, Request request) throws IOException {
+ if (path == null) {
+ throw new InvalidTemplateException("Cannot dispatch a null path");
}
+
+ request.dispatch(path);
}
/** {@inheritDoc} */
- public boolean isRenderable(Object value, Attribute attribute,
- Request request) {
- if (value instanceof String) {
- return ((String) value).startsWith("/");
+ public boolean isRenderable(String path, Request request) {
+ if (path == null) {
+ throw new InvalidTemplateException("Cannot dispatch a null path");
}
- return false;
+
+ return path.startsWith("/");
}
}
Added: tiles/sandbox/trunk/tiles-render/tiles-render-core/src/main/java/org/apache/tiles/render/InvalidTemplateException.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-render/tiles-render-core/src/main/java/org/apache/tiles/render/InvalidTemplateException.java?rev=991301&view=auto
==============================================================================
--- tiles/sandbox/trunk/tiles-render/tiles-render-core/src/main/java/org/apache/tiles/render/InvalidTemplateException.java (added)
+++ tiles/sandbox/trunk/tiles-render/tiles-render-core/src/main/java/org/apache/tiles/render/InvalidTemplateException.java Tue Aug 31 19:22:48 2010
@@ -0,0 +1,21 @@
+package org.apache.tiles.render;
+
+public class InvalidTemplateException extends RenderException {
+
+ public InvalidTemplateException() {
+ super();
+ }
+
+ public InvalidTemplateException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ public InvalidTemplateException(String message) {
+ super(message);
+ }
+
+ public InvalidTemplateException(Throwable cause) {
+ super(cause);
+ }
+
+}
Propchange: tiles/sandbox/trunk/tiles-render/tiles-render-core/src/main/java/org/apache/tiles/render/InvalidTemplateException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/sandbox/trunk/tiles-render/tiles-render-core/src/main/java/org/apache/tiles/render/InvalidTemplateException.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: tiles/sandbox/trunk/tiles-render/tiles-render-core/src/main/java/org/apache/tiles/render/RenderException.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-render/tiles-render-core/src/main/java/org/apache/tiles/render/RenderException.java?rev=991301&view=auto
==============================================================================
--- tiles/sandbox/trunk/tiles-render/tiles-render-core/src/main/java/org/apache/tiles/render/RenderException.java (added)
+++ tiles/sandbox/trunk/tiles-render/tiles-render-core/src/main/java/org/apache/tiles/render/RenderException.java Tue Aug 31 19:22:48 2010
@@ -0,0 +1,19 @@
+package org.apache.tiles.render;
+
+public class RenderException extends RuntimeException {
+
+ public RenderException() {
+ }
+
+ public RenderException(String message) {
+ super(message);
+ }
+
+ public RenderException(Throwable cause) {
+ super(cause);
+ }
+
+ public RenderException(String message, Throwable cause) {
+ super(message, cause);
+ }
+}
Propchange: tiles/sandbox/trunk/tiles-render/tiles-render-core/src/main/java/org/apache/tiles/render/RenderException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/sandbox/trunk/tiles-render/tiles-render-core/src/main/java/org/apache/tiles/render/RenderException.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: tiles/sandbox/trunk/tiles-render/tiles-render-core/src/main/java/org/apache/tiles/render/Renderer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-render/tiles-render-core/src/main/java/org/apache/tiles/render/Renderer.java?rev=991301&view=auto
==============================================================================
--- tiles/sandbox/trunk/tiles-render/tiles-render-core/src/main/java/org/apache/tiles/render/Renderer.java (added)
+++ tiles/sandbox/trunk/tiles-render/tiles-render-core/src/main/java/org/apache/tiles/render/Renderer.java Tue Aug 31 19:22:48 2010
@@ -0,0 +1,44 @@
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tiles.render;
+
+import java.io.IOException;
+
+import org.apache.tiles.request.Request;
+
+/**
+ * An object that can render a path, depending on the request passed as a
+ * parameter.
+ *
+ * @version $Rev$ $Date$
+ */
+public interface Renderer {
+
+ /**
+ * Renders a path.
+ *
+ * @param path The path to render.
+ * @param request The Tiles request context.
+ * @throws IOException If something goes wrong during rendition.
+ * @throws RendererException If something goes wrong during rendition.
+ */
+ void render(String path, Request request) throws IOException;
+}
Propchange: tiles/sandbox/trunk/tiles-render/tiles-render-core/src/main/java/org/apache/tiles/render/Renderer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/sandbox/trunk/tiles-render/tiles-render-core/src/main/java/org/apache/tiles/render/Renderer.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: tiles/sandbox/trunk/tiles-render/tiles-render-core/src/main/java/org/apache/tiles/render/TypeDetectingRenderer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-render/tiles-render-core/src/main/java/org/apache/tiles/render/TypeDetectingRenderer.java?rev=991301&view=auto
==============================================================================
--- tiles/sandbox/trunk/tiles-render/tiles-render-core/src/main/java/org/apache/tiles/render/TypeDetectingRenderer.java (added)
+++ tiles/sandbox/trunk/tiles-render/tiles-render-core/src/main/java/org/apache/tiles/render/TypeDetectingRenderer.java Tue Aug 31 19:22:48 2010
@@ -0,0 +1,42 @@
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tiles.render;
+
+import org.apache.tiles.request.Request;
+
+/**
+ * It represents a renderer that identifies attributes that can render.
+ *
+ * @version $Rev$ $Date$
+ */
+public interface TypeDetectingRenderer extends Renderer {
+
+ /**
+ * 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);
+}
Propchange: tiles/sandbox/trunk/tiles-render/tiles-render-core/src/main/java/org/apache/tiles/render/TypeDetectingRenderer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/sandbox/trunk/tiles-render/tiles-render-core/src/main/java/org/apache/tiles/render/TypeDetectingRenderer.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL