From 39bf8185b95149ab535699966ca4f3e38a0d37ea Mon Sep 17 00:00:00 2001 From: Leif Åstrand Date: Tue, 16 Aug 2011 12:03:58 +0000 Subject: #7422 Updated fix for coping with additional spaces in the input svn changeset:20416/svn branch:6.7 --- src/com/vaadin/ui/AbstractComponent.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/com/vaadin/ui/AbstractComponent.java b/src/com/vaadin/ui/AbstractComponent.java index ad95b6ed58..836ea498fd 100644 --- a/src/com/vaadin/ui/AbstractComponent.java +++ b/src/com/vaadin/ui/AbstractComponent.java @@ -7,7 +7,6 @@ package com.vaadin.ui; import java.io.Serializable; import java.lang.reflect.Method; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashSet; @@ -225,8 +224,12 @@ public abstract class AbstractComponent implements Component, MethodEventSource styles = new ArrayList(); } styles.clear(); - String[] styleParts = style.split(" "); - styles.addAll(Arrays.asList(styleParts)); + String[] styleParts = style.split(" +"); + for (String part : styleParts) { + if (part.length() > 0) { + styles.add(part); + } + } requestRepaint(); } @@ -245,8 +248,12 @@ public abstract class AbstractComponent implements Component, MethodEventSource public void removeStyleName(String style) { if (styles != null) { - String[] styleParts = style.split(" "); - styles.removeAll(Arrays.asList(styleParts)); + String[] styleParts = style.split(" +"); + for (String part : styleParts) { + if (part.length() > 0) { + styles.remove(part); + } + } requestRepaint(); } } -- cgit v1.2.3