From: Joonas Lehtinen <joonas.lehtinen@itmill.com>
Date: Wed, 31 Jan 2007 11:15:54 +0000 (+0000)
Subject: Fixed a bug when setting the style of the object before adding it
X-Git-Tag: 6.7.0.beta1~6722
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fe5b627b76a56f2437c68e668e61e7c0c2a91012;p=vaadin-framework.git

Fixed a bug when setting the style of the object before adding it

svn changeset:377/svn branch:toolkit
---

diff --git a/src/com/itmill/toolkit/demo/features/PropertyPanel.java b/src/com/itmill/toolkit/demo/features/PropertyPanel.java
index 1212271b29..ade6effe54 100644
--- a/src/com/itmill/toolkit/demo/features/PropertyPanel.java
+++ b/src/com/itmill/toolkit/demo/features/PropertyPanel.java
@@ -234,12 +234,21 @@ public class PropertyPanel
 				"Sample System Error" });
 
 		// Style
+		String currentStyle = ((Component)objectToConfigure).getStyle();
+		if (currentStyle == null)
 		set
 			.replaceWithSelect(
 				"style",
 				new Object[] { null },
 				new Object[] { "Default" })
 			.setNewItemsAllowed(true);
+		else
+			set
+			.replaceWithSelect(
+				"style",
+				new Object[] { null, currentStyle },
+				new Object[] { "Default", currentStyle })
+			.setNewItemsAllowed(true);
 
 		// Set up descriptions
 		set.getField("caption").setDescription(