diff options
| author | Joonas Lehtinen <joonas.lehtinen@itmill.com> | 2007-02-03 18:06:32 +0000 |
|---|---|---|
| committer | Joonas Lehtinen <joonas.lehtinen@itmill.com> | 2007-02-03 18:06:32 +0000 |
| commit | ff2ce94effa7798470344e1d3c21b21fa024ec85 (patch) | |
| tree | 860c4118081b2f2d3219e844a5e16b007b30715f /src/com/itmill/toolkit/terminal/web/CollectionThemeSource.java | |
| parent | 25de179e5a4f673903d9a1d9549f2ff7b1ab8901 (diff) | |
| download | vaadin-framework-ff2ce94effa7798470344e1d3c21b21fa024ec85.tar.gz vaadin-framework-ff2ce94effa7798470344e1d3c21b21fa024ec85.zip | |
Corrected bug: Now deep theme inferitance does not loose resources
svn changeset:435/svn branch:toolkit
Diffstat (limited to 'src/com/itmill/toolkit/terminal/web/CollectionThemeSource.java')
| -rw-r--r-- | src/com/itmill/toolkit/terminal/web/CollectionThemeSource.java | 8 |
1 files changed, 3 insertions, 5 deletions
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 |