Some code formatting
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@894793 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/html.jsp b/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/html.jsp
index 919b4bd..b92856e 100644
--- a/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/html.jsp
+++ b/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/html.jsp
@@ -21,8 +21,8 @@
%><%@taglib prefix="sling" uri="http://sling.apache.org/taglibs/sling/1.0" %><%
%><sling:defineObjects/><%
-final ValueMap attributes = ResourceUtil.getValueMap(resource);
-final String albumName = attributes.get("jcr:title", ResourceUtil.getName(resource));
+ final ValueMap attributes = ResourceUtil.getValueMap(resource);
+ final String albumName = attributes.get("jcr:title", ResourceUtil.getName(resource));
%><html>
<head>
<title>Album <%= albumName %></title>
diff --git a/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Photo/html.jsp b/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Photo/html.jsp
index 0afef81..415e25a 100644
--- a/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Photo/html.jsp
+++ b/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Photo/html.jsp
@@ -20,18 +20,18 @@
org.apache.sling.api.resource.ValueMap"%><%
%><%@taglib prefix="sling" uri="http://sling.apache.org/taglibs/sling/1.0" %><%
%><sling:defineObjects/><%
-final ValueMap attributes = ResourceUtil.getValueMap(resource);
-final String photoName = attributes.get("jcr:title", ResourceUtil.getName(resource));
+ final ValueMap attributes = ResourceUtil.getValueMap(resource);
+ final String photoName = attributes.get("jcr:title", ResourceUtil.getName(resource));
%><html>
<head>
<title><%= photoName %></title>
</head>
<body>
-<h1><%= photoName %></h1>
-<img src="<%=photoName %>"/>
-<p>Description: <%=attributes.get("jcr:description", "")%></p>
-<p>Location: <%=attributes.get("slingshot:location", "")%></p>
-<p>Tags: 
+ <h1><%= photoName %></h1>
+ <img src="<%=ResourceUtil.getName(resource) %>"/>
+ <p>Description: <%=attributes.get("jcr:description", "")%></p>
+ <p>Location: <%=attributes.get("slingshot:location", "")%></p>
+ <p>Tags: 
<%
String[] values = attributes.get("slingshot:tags", String[].class);
if (values != null ) {
@@ -42,6 +42,6 @@
}
%>
-</p>
-</body>
+ </p>
+ </body>
</html>
\ No newline at end of file
diff --git a/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Photo/main.html.jsp b/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Photo/main.html.jsp
index 41e68f6..7c53c38 100644
--- a/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Photo/main.html.jsp
+++ b/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Photo/main.html.jsp
@@ -38,14 +38,13 @@
<p><a href="<%= request.getContextPath() %><%=relPath%>.slingshot.html"><%= photoName %></a></p>
<p>Tags:
<%
-String[] values = attr.get("slingshot:tags", String[].class);
-if (values != null ) {
- for(int k=0;k<values.length;k++) {
- if(k>0) out.write(", ");
- out.write(values[k]);
+ String[] values = attr.get("slingshot:tags", String[].class);
+ if (values != null ) {
+ for(int k=0;k<values.length;k++) {
+ if (k>0) out.write(", ");
+ out.write(values[k]);
+ }
}
-
-}
%>
-</p>
+ </p>
</div>