You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by fm...@apache.org on 2008/03/25 22:35:37 UTC
svn commit: r641015 - in /incubator/sling/trunk/extensions/apt/parser/src:
main/java/org/apache/sling/apt/parser/internal/CustomAptSink.java
test/java/org/apache/sling/apt/parser/internal/SlingAptParserImplTest.java
Author: fmeschbe
Date: Tue Mar 25 14:35:35 2008
New Revision: 641015
URL: http://svn.apache.org/viewvc?rev=641015&view=rev
Log:
Fix more EOL issues on Windows platform
Modified:
incubator/sling/trunk/extensions/apt/parser/src/main/java/org/apache/sling/apt/parser/internal/CustomAptSink.java
incubator/sling/trunk/extensions/apt/parser/src/test/java/org/apache/sling/apt/parser/internal/SlingAptParserImplTest.java
Modified: incubator/sling/trunk/extensions/apt/parser/src/main/java/org/apache/sling/apt/parser/internal/CustomAptSink.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/apt/parser/src/main/java/org/apache/sling/apt/parser/internal/CustomAptSink.java?rev=641015&r1=641014&r2=641015&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/apt/parser/src/main/java/org/apache/sling/apt/parser/internal/CustomAptSink.java (original)
+++ incubator/sling/trunk/extensions/apt/parser/src/main/java/org/apache/sling/apt/parser/internal/CustomAptSink.java Tue Mar 25 14:35:35 2008
@@ -28,26 +28,27 @@
class CustomAptSink extends AptSink {
private final boolean generateHtmlSkeleton;
+
private String title;
-
+
CustomAptSink(Writer w, Map<String, Object> options) {
super(w);
-
- if(options==null) {
+
+ if (options == null) {
generateHtmlSkeleton = true;
} else {
generateHtmlSkeleton = !("false".equals(options.get(SlingAptParser.OPT_HTML_SKELETON)));
}
}
-
+
@Override
- public void title_()
- {
- if ( getBuffer().length() > 0 ) {
+ public void title_() {
+ if (getBuffer().length() > 0) {
title = getBuffer().toString();
resetBuffer();
}
}
+
@Override
public void sectionTitle1() {
write("<h1>");
@@ -57,7 +58,7 @@
public void sectionTitle1_() {
write("</h1>");
}
-
+
@Override
public void sectionTitle2_() {
write("</h2>");
@@ -108,24 +109,23 @@
write("<li>");
}
-
@Override
public void head_() {
- if(generateHtmlSkeleton) {
- if(title!=null) {
- write("\n<title>");
+ if (generateHtmlSkeleton) {
+ if (title != null) {
+ write(EOL + "<title>");
write(title);
write("</title>");
}
- write("\n</head>");
+ write(EOL + "</head>");
}
setHeadFlag(false);
}
@Override
public void head() {
- if(generateHtmlSkeleton) {
- write("<html>\n<head>");
+ if (generateHtmlSkeleton) {
+ write("<html>" + EOL + "<head>");
}
setHeadFlag(true);
}
@@ -149,23 +149,23 @@
public void link_() {
write("</a>");
}
-
+
@Override
public void horizontalRule() {
- write("<hr/>\n");
+ write("<hr/>" + EOL);
}
@Override
public void body_() {
- if(generateHtmlSkeleton) {
- write("</body>\n</html>\n");
+ if (generateHtmlSkeleton) {
+ write("</body>" + EOL + "</html>" + EOL);
}
}
@Override
public void body() {
- if(generateHtmlSkeleton) {
- write("\n<body>");
+ if (generateHtmlSkeleton) {
+ write(EOL + "<body>");
}
}
}
Modified: incubator/sling/trunk/extensions/apt/parser/src/test/java/org/apache/sling/apt/parser/internal/SlingAptParserImplTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/apt/parser/src/test/java/org/apache/sling/apt/parser/internal/SlingAptParserImplTest.java?rev=641015&r1=641014&r2=641015&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/apt/parser/src/test/java/org/apache/sling/apt/parser/internal/SlingAptParserImplTest.java (original)
+++ incubator/sling/trunk/extensions/apt/parser/src/test/java/org/apache/sling/apt/parser/internal/SlingAptParserImplTest.java Tue Mar 25 14:35:35 2008
@@ -141,8 +141,8 @@
public void testTitle() throws Exception {
final String input = " ---- \n test title \n ---- \n\nH1 title now";
final String expected =
- "<html>\n<head>\n<title>test title</title>\n</head>"
- + "\n<body><h1>H1 title now</h1>\n</body>\n</html>"
+ "<html>" + EOL + "<head>" + EOL + "<title>test title</title>" + EOL + "</head>"
+ + EOL + "<body><h1>H1 title now</h1>" + EOL + "</body>" + EOL + "</html>"
;
parse(input, expected, null);
}