From: Artur Signell <artur@vaadin.com>
Date: Thu, 15 Mar 2012 12:51:06 +0000 (+0200)
Subject: Corrected icon check for TabSheet captions
X-Git-Tag: 7.0.0.alpha2~311
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fe17289d789e7be6ae583e6da75597441729fa62;p=vaadin-framework.git

Corrected icon check for TabSheet captions
---

diff --git a/src/com/vaadin/terminal/gwt/client/VCaption.java b/src/com/vaadin/terminal/gwt/client/VCaption.java
index 09f26fe8b3..900c8b0680 100644
--- a/src/com/vaadin/terminal/gwt/client/VCaption.java
+++ b/src/com/vaadin/terminal/gwt/client/VCaption.java
@@ -397,19 +397,22 @@ public class VCaption extends HTML {
             if (state.getCaption() != null) {
                 return true;
             }
+            if (state.getIcon() != null) {
+                return true;
+            }
         } else {
             // TODO fallback for cases where the caption has no owner (Tabsheet,
             // Accordion)
             if (uidl.getStringAttribute(TabsheetBaseConnector.ATTRIBUTE_TAB_CAPTION) != null) {
                 return true;
             }
+            if (uidl.hasAttribute(TabsheetBaseConnector.ATTRIBUTE_TAB_ICON)) {
+                return true;
+            }
         }
         if (uidl.hasAttribute(AbstractComponentConnector.ATTRIBUTE_ERROR)) {
             return true;
         }
-        if (state.getIcon() != null) {
-            return true;
-        }
         if (uidl.hasAttribute(AbstractComponentConnector.ATTRIBUTE_REQUIRED)) {
             return true;
         }