From ff2ce94effa7798470344e1d3c21b21fa024ec85 Mon Sep 17 00:00:00 2001 From: Joonas Lehtinen Date: Sat, 3 Feb 2007 18:06:32 +0000 Subject: [PATCH] Corrected bug: Now deep theme inferitance does not loose resources svn changeset:435/svn branch:toolkit --- .../toolkit/terminal/web/CollectionThemeSource.java | 8 +++----- 1 file 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 -- 2.39.5