You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2014/06/24 16:03:40 UTC
[3/3] git commit: WICKET-5340 CssAttributeModifier and
StyleAttributeModifier
WICKET-5340 CssAttributeModifier and StyleAttributeModifier
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/fc952226
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/fc952226
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/fc952226
Branch: refs/heads/master
Commit: fc95222672cc06b5b2cf6f6efaa171666ba44fd5
Parents: e2f8fae
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Jun 24 17:03:21 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Jun 24 17:03:21 2014 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/wicket/ClassAttributeModifier.java | 5 +++--
.../src/main/java/org/apache/wicket/StyleAttributeModifier.java | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/fc952226/wicket-core/src/main/java/org/apache/wicket/ClassAttributeModifier.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ClassAttributeModifier.java b/wicket-core/src/main/java/org/apache/wicket/ClassAttributeModifier.java
index b67ff5b..3f6e1ef 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ClassAttributeModifier.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ClassAttributeModifier.java
@@ -41,7 +41,7 @@ public abstract class ClassAttributeModifier extends AttributeAppender
}
@Override
- protected final String newValue(String currentValue, String appendValue)
+ protected String newValue(String currentValue, String appendValue)
{
String[] classes;
if (Strings.isEmpty(currentValue))
@@ -57,12 +57,13 @@ public abstract class ClassAttributeModifier extends AttributeAppender
Set<String> newClasses = update(oldClasses);
+ String separator = getSeparator();
StringBuilder result = new StringBuilder();
for (String cls : newClasses)
{
if (result.length() > 0)
{
- result.append(getSeparator());
+ result.append(separator);
}
result.append(cls);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/fc952226/wicket-core/src/main/java/org/apache/wicket/StyleAttributeModifier.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/StyleAttributeModifier.java b/wicket-core/src/main/java/org/apache/wicket/StyleAttributeModifier.java
index 64cf077..70fa8d6 100644
--- a/wicket-core/src/main/java/org/apache/wicket/StyleAttributeModifier.java
+++ b/wicket-core/src/main/java/org/apache/wicket/StyleAttributeModifier.java
@@ -41,7 +41,7 @@ public abstract class StyleAttributeModifier extends AttributeAppender
}
@Override
- protected final String newValue(String currentValue, String appendValue)
+ protected String newValue(String currentValue, String appendValue)
{
String[] styles;
if (Strings.isEmpty(currentValue))
@@ -61,6 +61,7 @@ public abstract class StyleAttributeModifier extends AttributeAppender
Map<String, String> newStyles = update(oldStyles);
+ String separator = getSeparator();
StringBuilder result = new StringBuilder();
for (Map.Entry<String, String> entry : newStyles.entrySet())
{
@@ -68,7 +69,7 @@ public abstract class StyleAttributeModifier extends AttributeAppender
.append(entry.getKey())
.append(':')
.append(entry.getValue())
- .append(getSeparator());
+ .append(separator);
}
return result.length() > 0 ? result.toString() : VALUELESS_ATTRIBUTE_REMOVE;
}