You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2012/08/13 09:34:49 UTC
svn commit: r1372292 - in /sling/trunk/contrib/scripting/jst: pom.xml
src/main/java/org/apache/sling/scripting/jst/HtmlContentRenderer.java
Author: cziegeler
Date: Mon Aug 13 07:34:48 2012
New Revision: 1372292
URL: http://svn.apache.org/viewvc?rev=1372292&view=rev
Log:
SLING-2545 : Scripting jst is using wrong import package directives
Modified:
sling/trunk/contrib/scripting/jst/pom.xml
sling/trunk/contrib/scripting/jst/src/main/java/org/apache/sling/scripting/jst/HtmlContentRenderer.java
Modified: sling/trunk/contrib/scripting/jst/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/jst/pom.xml?rev=1372292&r1=1372291&r2=1372292&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/jst/pom.xml (original)
+++ sling/trunk/contrib/scripting/jst/pom.xml Mon Aug 13 07:34:48 2012
@@ -74,6 +74,8 @@
</Private-Package>
<Import-Package>
+ org.w3c.dom,
+ org.w3c.dom.html,
org.apache.bsf.*;
org.apache.xml.serialize;
sun.misc; resolution:=optional,
Modified: sling/trunk/contrib/scripting/jst/src/main/java/org/apache/sling/scripting/jst/HtmlContentRenderer.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/jst/src/main/java/org/apache/sling/scripting/jst/HtmlContentRenderer.java?rev=1372292&r1=1372291&r2=1372292&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/jst/src/main/java/org/apache/sling/scripting/jst/HtmlContentRenderer.java (original)
+++ sling/trunk/contrib/scripting/jst/src/main/java/org/apache/sling/scripting/jst/HtmlContentRenderer.java Mon Aug 13 07:34:48 2012
@@ -12,19 +12,19 @@ import javax.jcr.Value;
import org.apache.sling.api.resource.Resource;
public class HtmlContentRenderer {
-
+
// TODO make this configurable
- public static final String BREADCRUMB_PREFIX = "/content";
-
+ private static final String BREADCRUMB_PREFIX = "/content/";
+
public void render(PrintWriter pw, Resource r, Node n, String title)
throws RepositoryException {
pw.print("<h1 class='title'>");
pw.print(escape(title));
pw.println("</h1>");
-
+
renderBreadcrumbs(pw, n);
renderChildNodes(pw, n);
-
+
for (PropertyIterator pi = n.getProperties(); pi.hasNext();) {
final Property p = pi.nextProperty();
if(displayProperty(p.getName())) {
@@ -36,8 +36,8 @@ public class HtmlContentRenderer {
protected void renderBreadcrumbs(PrintWriter pw, Node n) throws RepositoryException {
final String path = n.getPath();
pw.println("<div class='breadcrumbs'>");
- if(path.startsWith(BREADCRUMB_PREFIX)) {
- final String [] crumbs = path.substring(BREADCRUMB_PREFIX.length() + 1).split("/");
+ if (path.startsWith(BREADCRUMB_PREFIX) ) {
+ final String [] crumbs = path.substring(BREADCRUMB_PREFIX.length()).split("/");
// omit the last path element when iterating, it's this node's name
for(int i=0; i < crumbs.length - 1; i++) {
final String c = crumbs[i];
@@ -51,7 +51,7 @@ public class HtmlContentRenderer {
}
pw.println("</div>");
}
-
+
protected String getDotDots(int start, int len) {
final StringBuffer sb = new StringBuffer();
for(int i=start; i < len - 1; i++) {
@@ -59,7 +59,7 @@ public class HtmlContentRenderer {
}
return sb.toString();
}
-
+
protected void renderChildNodes(PrintWriter pw, Node parent) throws RepositoryException {
pw.println("<div class='childnodes'>");
final String prefix = parent.getName() + "/";
@@ -75,7 +75,7 @@ public class HtmlContentRenderer {
}
pw.println("</div>");
}
-
+
protected void renderPropertyValue(PrintWriter pw, Property p)
throws RepositoryException {
@@ -114,7 +114,7 @@ public class HtmlContentRenderer {
}
return sb.toString();
}
-
+
protected boolean displayProperty(String name) {
return !name.startsWith("jcr:") && !name.startsWith("sling:");
}