vmassol 2003/11/16 15:29:37
Modified: announcement/src/plugin-resources announcement.jsl
announcement/src/main/org/apache/maven/announcement
Formatter.java
Log:
Fixed line break issue. Thanks to Brett!
Revision Changes Path
1.3 +29 -23 maven-plugins/announcement/src/plugin-resources/announcement.jsl
Index: announcement.jsl
===================================================================
RCS file:
/home/cvs/maven-plugins/announcement/src/plugin-resources/announcement.jsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- announcement.jsl 16 Nov 2003 22:50:44 -0000 1.2
+++ announcement.jsl 16 Nov 2003 23:29:37 -0000 1.3
@@ -18,40 +18,46 @@
<j:set var="header" value="The Maven team is pleased to announce the
${pom.name} ${versionVariable} release!"/>
<j:set var="formattedHeader" value="${formatter.format(header,78)}"/>
+
<!-- TODO: Find out why brackets are added -->
- <j:expr value="${formattedHeader}"/>
- <!-- TODO: Need line break here -->
-
- <j:expr value="${pom.url}"/>
+ <j:whitespace trim="false">${formattedHeader}
- <!-- TODO: Need line break here -->
+${pom.url}
- <j:expr value="Changes in this version include (last changes first):"/>
+Changes in this version include (last changes first):
+ </j:whitespace>
<x:forEach var="action" select="action">
<x:set var="text" select="string($action)"/>
- <j:expr value="o "/>
+ <j:set var="counter" value=""/>
<j:forEach var="line" items="${formatter.format(text,75)}">
- <!-- TODO: Need to add 3 spaces on second line and thereafter -->
- <j:expr value="${line}"/>
+ <j:choose>
+ <j:when test="${counter.length() == '0'}">
+ <j:whitespace trim="false">
+o ${line}</j:whitespace>
+ </j:when>
+ <j:otherwise>
+ <j:whitespace trim="false">
+ ${line}</j:whitespace>
+ </j:otherwise>
+ </j:choose>
+ <!-- TODO: Add reference to issue number if there's any -->
+ <j:set var="counter" value="${counter}X"/>
</j:forEach>
</x:forEach>
- <!-- TODO: Need line break here -->
-
- <j:expr value="This plugin has been tested with Maven [TODO]. Using it with"/>
- <j:expr value="another version of Maven is at your own risks! :-)"/>
-
- <!-- TODO: Need line break here -->
-
- <j:expr value="You can download the ${pom.name} here:"/>
- <j:expr
value="${maven.repo.remote}/${pom.groupId}/jars/${pom.artifactId}-${versionVariable}.jar"/>
-
- <!-- TODO: Need line break here -->
-
- <j:expr value="Have fun!"/>
- <j:expr value="-The development team"/>
+ <j:whitespace trim="false">
+
+This plugin has been tested with Maven [TODO]. Using it with
+another version of Maven is at your own risks! :-)
+
+You can download the ${pom.name} here:
+${maven.repo.remote}/${pom.groupId}/jars/${pom.artifactId}-${versionVariable}.jar
+
+Have fun!
+-The development team
+ </j:whitespace>
</j:if>
1.2 +1 -5
maven-plugins/announcement/src/main/org/apache/maven/announcement/Formatter.java
Index: Formatter.java
===================================================================
RCS file:
/home/cvs/maven-plugins/announcement/src/main/org/apache/maven/announcement/Formatter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Formatter.java 16 Nov 2003 22:48:57 -0000 1.1
+++ Formatter.java 16 Nov 2003 23:29:37 -0000 1.2
@@ -81,16 +81,12 @@
}
else
{
- buffer.append('\r');
- buffer.append('\n');
strings.add(buffer.toString());
buffer = new StringBuffer();
buffer.append(token);
buffer.append(' ');
}
}
- buffer.append('\r');
- buffer.append('\n');
strings.add(buffer.toString());
return strings;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
