You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by jw...@apache.org on 2010/12/09 18:28:23 UTC

svn commit: r1044045 - in /myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal: skin/SkinStyleSheetParserUtils.java style/xml/parse/StyleSheetDocument.java

Author: jwaldman
Date: Thu Dec  9 17:28:23 2010
New Revision: 1044045

URL: http://svn.apache.org/viewvc?rev=1044045&view=rev
Log:
TRINIDAD-1972 SkinStyleSheetParserUtils.trimQuotes trims mis-matched quotes
fix bug I introduced because I was trimming whitespace and before I wasn't, so I was breaking someone that relied on no whitespace trimming.

Modified:
    myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleSheetParserUtils.java
    myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocument.java

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleSheetParserUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleSheetParserUtils.java?rev=1044045&r1=1044044&r2=1044045&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleSheetParserUtils.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleSheetParserUtils.java Thu Dec  9 17:28:23 2010
@@ -143,7 +143,6 @@ class SkinStyleSheetParserUtils
     if ( in == null )
       return in;
 
-    in = in.trim();
     boolean startsWithDoubleQuote = in.startsWith( "\"" );
     boolean startsWithSingleQuote = in.startsWith( "\'" );
     boolean endsWithDoubleQuote = in.endsWith( "\"" );

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocument.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocument.java?rev=1044045&r1=1044044&r2=1044045&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocument.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocument.java Thu Dec  9 17:28:23 2010
@@ -1274,7 +1274,6 @@ public class StyleSheetDocument
     if ( in == null )
       return in;
 
-    in = in.trim();
     boolean startsWithDoubleQuote = in.startsWith( "\"" );
     boolean startsWithSingleQuote = in.startsWith( "\'" );
     boolean endsWithDoubleQuote = in.endsWith( "\"" );