You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jd...@apache.org on 2009/12/13 18:54:19 UTC
svn commit: r890083 - in
/wicket/trunk/wicket/src/main/java/org/apache/wicket:
javascript/DefaultJavascriptCompressor.java
util/string/JavascriptStripper.java
Author: jdonnerstag
Date: Sun Dec 13 17:54:19 2009
New Revision: 890083
URL: http://svn.apache.org/viewvc?rev=890083&view=rev
Log:
make JavascriptStripper a bit more flexible (see 1.5 wishlist)
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/javascript/DefaultJavascriptCompressor.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/JavascriptStripper.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/javascript/DefaultJavascriptCompressor.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/javascript/DefaultJavascriptCompressor.java?rev=890083&r1=890082&r2=890083&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/javascript/DefaultJavascriptCompressor.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/javascript/DefaultJavascriptCompressor.java Sun Dec 13 17:54:19 2009
@@ -30,6 +30,6 @@
*/
public String compress(String original)
{
- return JavascriptStripper.stripCommentsAndWhitespace(original);
+ return new JavascriptStripper().stripCommentsAndWhitespace(original);
}
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/JavascriptStripper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/JavascriptStripper.java?rev=890083&r1=890082&r2=890083&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/JavascriptStripper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/JavascriptStripper.java Sun Dec 13 17:54:19 2009
@@ -48,7 +48,7 @@
/** Inside a regular expression */
private final static int REG_EXP = 7;
- private static int getPrevCount(String s, int fromIndex, char c)
+ private int getPrevCount(String s, int fromIndex, char c)
{
int count = 0;
--fromIndex;
@@ -73,7 +73,7 @@
* Source string
* @return String with removed comments and whitespace
*/
- public static String stripCommentsAndWhitespace(String original)
+ public String stripCommentsAndWhitespace(String original)
{
// let's be optimistic
AppendingStringBuffer result = new AppendingStringBuffer(original.length() / 2);