formatted annotations more nicely
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/edf7c099 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/edf7c099 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/edf7c099 Branch: refs/heads/master Commit: edf7c099e3ed6ee17008a738ef8801c854139fd1 Parents: 9ca6eb9 Author: cnenning <cnenn...@apache.org> Authored: Mon Feb 1 09:36:23 2016 +0100 Committer: cnenning <cnenn...@apache.org> Committed: Mon Feb 1 09:36:23 2016 +0100 ---------------------------------------------------------------------- .../apache/struts2/showcase/tiles/TilesAnnotationsAction.java | 5 +++-- .../org/apache/struts2/tiles/annotation/TilesDefinition.java | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/edf7c099/apps/showcase/src/main/java/org/apache/struts2/showcase/tiles/TilesAnnotationsAction.java ---------------------------------------------------------------------- diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/tiles/TilesAnnotationsAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/tiles/TilesAnnotationsAction.java index 997db11..b5c62f0 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/tiles/TilesAnnotationsAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/tiles/TilesAnnotationsAction.java @@ -12,8 +12,9 @@ import com.opensymphony.xwork2.ActionSupport; @ParentPackage("tiles") @Result(name = "success", type="tiles") @TilesDefinition(extend = "showcase.annotations", putAttributes = { - @TilesPutAttribute(name = "header", value = "/WEB-INF/tiles/header.jsp"), - @TilesPutAttribute(name = "body", value = "/WEB-INF/tiles/body.ftl"), }) + @TilesPutAttribute(name = "header", value = "/WEB-INF/tiles/header.jsp"), + @TilesPutAttribute(name = "body", value = "/WEB-INF/tiles/body.ftl") +}) public class TilesAnnotationsAction extends ActionSupport { private static final long serialVersionUID = 2900509995064928866L; http://git-wip-us.apache.org/repos/asf/struts/blob/edf7c099/plugins/tiles/src/main/java/org/apache/struts2/tiles/annotation/TilesDefinition.java ---------------------------------------------------------------------- diff --git a/plugins/tiles/src/main/java/org/apache/struts2/tiles/annotation/TilesDefinition.java b/plugins/tiles/src/main/java/org/apache/struts2/tiles/annotation/TilesDefinition.java index 1618b63..3aa144c 100644 --- a/plugins/tiles/src/main/java/org/apache/struts2/tiles/annotation/TilesDefinition.java +++ b/plugins/tiles/src/main/java/org/apache/struts2/tiles/annotation/TilesDefinition.java @@ -42,7 +42,8 @@ import java.lang.annotation.Target; * @Result(name = "success", type="tiles") * @TilesDefinition(extend = "layout", putAttributes = { * @TilesPutAttribute(name = "header", value = "/WEB-INF/tiles/header.jsp"), - * @TilesPutAttribute(name = "body", value = "/WEB-INF/tiles/body.ftl"), }) + * @TilesPutAttribute(name = "body", value = "/WEB-INF/tiles/body.ftl") + * }) * public class FooAction extends ActionSupport { * </pre> * </p>