From: Joonas Lehtinen <joonas.lehtinen@itmill.com>
Date: Sat, 3 Feb 2007 18:06:32 +0000 (+0000)
Subject: Corrected bug: Now deep theme inferitance does not loose resources
X-Git-Tag: 6.7.0.beta1~6707
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ff2ce94effa7798470344e1d3c21b21fa024ec85;p=vaadin-framework.git

Corrected bug: Now deep theme inferitance does not loose resources

svn changeset:435/svn branch:toolkit
---

diff --git a/src/com/itmill/toolkit/terminal/web/CollectionThemeSource.java b/src/com/itmill/toolkit/terminal/web/CollectionThemeSource.java
index 6c59980c44..55b3bcf189 100644
--- a/src/com/itmill/toolkit/terminal/web/CollectionThemeSource.java
+++ b/src/com/itmill/toolkit/terminal/web/CollectionThemeSource.java
@@ -122,13 +122,11 @@ public class CollectionThemeSource implements ThemeSource {
 
 		// Get list of themes to look for the resource
 		List themes = new LinkedList();
-		if (themeName.length() > 0) {
+		while (themeName != null && themeName.length() > 0) {
 			Theme t = this.getThemeByName(themeName);
-			if (t != null) {
+			if (t != null) 
 				themes.add(themeName);
-				if (t.getParent() != null)
-					themes.add(t.getParent());
-			}
+			themeName = t.getParent();
 		}
 
 		// Iterate all themes in list