From: Joonas Lehtinen <joonas.lehtinen@itmill.com>
Date: Sun, 21 Oct 2007 15:37:26 +0000 (+0000)
Subject: Fixes #1011
X-Git-Tag: 6.7.0.beta1~5798
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2f406e5d9bd11f0d3a07a1cad39de2a6bdd7bb5d;p=vaadin-framework.git

Fixes #1011

Traced problem back to IntroWelcome.java:138. This class changes the state as a side-effect of paint, that is strictly forbidden and breaks painting.

Removing side-effect from paint in above mentioned method corrects the problem.

svn changeset:2572/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/tests/featurebrowser/IntroWelcome.java b/src/com/itmill/toolkit/tests/featurebrowser/IntroWelcome.java
index fb77b16231..79b9705e7f 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/IntroWelcome.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/IntroWelcome.java
@@ -80,10 +80,11 @@ public class IntroWelcome extends Feature implements URIHandler,
 			+ " on the left and remember to experiment with the <b>Properties panel</b>"
 			+ " located at the top right corner area.";
 
+	// TODO Add browser agent string
 	private String description = WELCOME_TEXT_LOWER
 			+ "<br /><br />IT Mill Toolkit version: "
 			+ ApplicationServlet.VERSION;
-
+	
 	public IntroWelcome() {
 		super();
 	}
@@ -135,27 +136,6 @@ public class IntroWelcome extends Feature implements URIHandler,
 		return description;
 	}
 
-	// Hack for #512: set description right (WebBrowser now exists)
-	public void paint(PaintTarget target) throws PaintException {
-		if (webBrowser == null) {
-			webBrowser = (WebBrowser) getWindow().getTerminal();
-			if (webBrowser != null) {
-				super.getDescription().setValue(
-						description + "<br />Browser: "
-								+ webBrowser.getBrowserApplication());
-				try {
-					FeatureUtil.debug(getApplication().getUser().toString(),
-							"timestamp=[" + FeatureUtil.getTimestamp()
-									+ "] userAgent=["
-									+ webBrowser.getBrowserApplication() + "]");
-				} catch (Exception e) {
-					// ignored, should never happen
-				}
-			}
-		}
-		super.paint(target);
-	}
-
 	protected String getImage() {
 		return "icon_intro.png";
 	}