aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2012-01-31 10:08:07 +0200
committerArtur Signell <artur@vaadin.com>2012-01-31 10:08:07 +0200
commit53d77343a28e248d3c4f7f5045d4e24ebc5f802c (patch)
treeb113157cf0a53c3901ad8601d3e8b05299b84942
parentb6f2df440915ec31c9c6e1b84c26124f49d6c2af (diff)
downloadvaadin-framework-53d77343a28e248d3c4f7f5045d4e24ebc5f802c.tar.gz
vaadin-framework-53d77343a28e248d3c4f7f5045d4e24ebc5f802c.zip
Fixed paintable vs widget class comparison problem
-rw-r--r--src/com/vaadin/terminal/gwt/client/WidgetSet.java14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/WidgetSet.java b/src/com/vaadin/terminal/gwt/client/WidgetSet.java
index b78091950b..5a40fa1730 100644
--- a/src/com/vaadin/terminal/gwt/client/WidgetSet.java
+++ b/src/com/vaadin/terminal/gwt/client/WidgetSet.java
@@ -6,7 +6,7 @@ package com.vaadin.terminal.gwt.client;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.ui.Widget;
-import com.vaadin.terminal.gwt.client.ui.VFilterSelect;
+import com.vaadin.terminal.gwt.client.ui.VFilterSelectPaintable;
import com.vaadin.terminal.gwt.client.ui.VListSelect;
import com.vaadin.terminal.gwt.client.ui.VSplitPanelHorizontal;
import com.vaadin.terminal.gwt.client.ui.VSplitPanelVertical;
@@ -25,7 +25,8 @@ public class WidgetSet {
/**
* Create an uninitialized component that best matches given UIDL. The
- * component must be a {@link Widget} that implements {@link VPaintableWidget}.
+ * component must be a {@link Widget} that implements
+ * {@link VPaintableWidget}.
*
* @param uidl
* UIDL to be painted with returned component.
@@ -35,7 +36,8 @@ public class WidgetSet {
* @return New uninitialized and unregistered component that can paint given
* UIDL.
*/
- public VPaintableWidget createWidget(UIDL uidl, ApplicationConfiguration conf) {
+ public VPaintableWidget createWidget(UIDL uidl,
+ ApplicationConfiguration conf) {
/*
* Yes, this (including the generated code in WidgetMap) may look very
* odd code, but due the nature of GWT, we cannot do this any cleaner.
@@ -46,8 +48,8 @@ public class WidgetSet {
* TODO should try to get rid of these exceptions here
*/
- final Class<? extends VPaintableWidget> classType = resolveWidgetType(uidl,
- conf);
+ final Class<? extends VPaintableWidget> classType = resolveWidgetType(
+ uidl, conf);
if (classType == null || classType == VUnknownComponent.class) {
String serverSideName = conf
.getUnknownServerClassNameByEncodedTagName(uidl.getTag());
@@ -76,7 +78,7 @@ public class WidgetSet {
if (widgetClass == VView.class && uidl.hasAttribute("sub")) {
return VWindow.class;
- } else if (widgetClass == VFilterSelect.class) {
+ } else if (widgetClass == VFilterSelectPaintable.class) {
if (uidl.hasAttribute("type")) {
final String type = uidl.getStringAttribute("type").intern();
if ("legacy-multi" == type) {