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 6c59980c4407ceff3884fd4e26bd144e5a43cc48..55b3bcf18949df527541fb95a8a64b515b09d6f8 100644 (file)
--- 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