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 2007/05/31 00:23:53 UTC
svn commit: r542958 -
/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinCSSParser.java
Author: jwaldman
Date: Wed May 30 15:23:45 2007
New Revision: 542958
URL: http://svn.apache.org/viewvc?view=rev&rev=542958
Log:
fix bug in my most recent checkin re: improve performance of skin parsing by not using regexp to split on spaces, commas, semi-colons.
I was removing whitespace from css property values when I shouldn't have.
e.g., padding: 0px 5px;
I was removing the space between 0px and 5px.
This checkin fixes this.
Modified:
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinCSSParser.java
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinCSSParser.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinCSSParser.java?view=diff&rev=542958&r1=542957&r2=542958
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinCSSParser.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinCSSParser.java Wed May 30 15:23:45 2007
@@ -147,8 +147,9 @@
// first, parse out any comments
Matcher matcher = _COMMENT_PATTERN.matcher(properties);
properties = matcher.replaceAll("");
- // split into name and value (skip whitespace)
- String[] property = _splitString(properties, ';', true);
+ // split into name and value (don't skip whitespace since properties like padding: 0px 5px
+ // need the spaces)
+ String[] property = _splitString(properties, ';', false);
for (int i=0; i < property.length; i++)
{
@@ -157,7 +158,7 @@
{
String name = property[i].substring(0, indexOfColon);
String value = property[i].substring(indexOfColon+1);
- _documentHandler.property((name), value);
+ _documentHandler.property(name.trim(), value.trim());
}
}
Re: svn commit: r542958 - /myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinCSSParser.java
Posted by Mike Kienenberger <mk...@gmail.com>.
There should be a reference to the JIRA issue in the commit log message.
On 5/30/07, jwaldman@apache.org <jw...@apache.org> wrote:
> Author: jwaldman
> Date: Wed May 30 15:23:45 2007
> New Revision: 542958
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=542958
> Log:
> fix bug in my most recent checkin re: improve performance of skin parsing by not using regexp to split on spaces, commas, semi-colons.
> I was removing whitespace from css property values when I shouldn't have.
> e.g., padding: 0px 5px;
> I was removing the space between 0px and 5px.
> This checkin fixes this.
>
> Modified:
> myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinCSSParser.java
>
> Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinCSSParser.java
> URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinCSSParser.java?view=diff&rev=542958&r1=542957&r2=542958
> ==============================================================================
> --- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinCSSParser.java (original)
> +++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinCSSParser.java Wed May 30 15:23:45 2007
> @@ -147,8 +147,9 @@
> // first, parse out any comments
> Matcher matcher = _COMMENT_PATTERN.matcher(properties);
> properties = matcher.replaceAll("");
> - // split into name and value (skip whitespace)
> - String[] property = _splitString(properties, ';', true);
> + // split into name and value (don't skip whitespace since properties like padding: 0px 5px
> + // need the spaces)
> + String[] property = _splitString(properties, ';', false);
>
> for (int i=0; i < property.length; i++)
> {
> @@ -157,7 +158,7 @@
> {
> String name = property[i].substring(0, indexOfColon);
> String value = property[i].substring(indexOfColon+1);
> - _documentHandler.property((name), value);
> + _documentHandler.property(name.trim(), value.trim());
>
> }
> }
>
>
>