From: Leif Åstrand <leif@vaadin.com>
Date: Tue, 16 Aug 2011 09:08:49 +0000 (+0000)
Subject: #5880 Removed some more Java 1.6 api that somehow slipped along
X-Git-Tag: 6.7.0.beta1~75
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=96732707462f5c3c4bd44f46ae4fb1320362d2ee;p=vaadin-framework.git

#5880 Removed some more Java 1.6 api that somehow slipped along

svn changeset:20405/svn branch:6.7
---

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java b/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java
index 0a69fd3b9d..6188305436 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java
@@ -658,10 +658,10 @@ public class VTabsheet extends VTabsheetBase {
         String oldStyleName = tabStyles.get(index);
         // Find the nth td element
         Element td = (Element) tb.tr.getChild(index);
-        if (styleName != null && !styleName.isEmpty()) {
+        if (styleName != null && styleName.length() != 0) {
             if (!styleName.equals(oldStyleName)) {
                 // If we have a new style name
-                if (oldStyleName != null && !oldStyleName.isEmpty()) {
+                if (oldStyleName != null && oldStyleName.length() != 0) {
                     // Remove old style name if present
                     td.removeClassName(ITEMCELL_CLASSNAME + "-" + oldStyleName);
                 }
diff --git a/src/com/vaadin/ui/TabSheet.java b/src/com/vaadin/ui/TabSheet.java
index 212f13328b..300e507fdd 100644
--- a/src/com/vaadin/ui/TabSheet.java
+++ b/src/com/vaadin/ui/TabSheet.java
@@ -407,7 +407,7 @@ public class TabSheet extends AbstractComponentContainer {
             }
 
             final String styleName = tab.getStyleName();
-            if (styleName != null) {
+            if (styleName != null && styleName.length() != 0) {
                 target.addAttribute(VTabsheet.TAB_STYLE_NAME, styleName);
             }