Fixed compilation errors

diff --git a/src/com/vaadin/terminal/gwt/client/WidgetSet.java b/src/com/vaadin/terminal/gwt/client/WidgetSet.java
index 617c354fa8568b8b05b4e6641e3cd95e04e28ce6..03dde5fd2fbb86ab3648e12cfbff9d603e9b6009 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/WidgetSet.java
+++ b/src/com/vaadin/terminal/gwt/client/WidgetSet.java
@@ -7,13 +7,10 @@ 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.VFilterSelectPaintable;
+import com.vaadin.terminal.gwt.client.ui.VHorizontalSplitPanelPaintable;
 import com.vaadin.terminal.gwt.client.ui.VListSelectPaintable;
-import com.vaadin.terminal.gwt.client.ui.VSplitPanelHorizontal;
 import com.vaadin.terminal.gwt.client.ui.VUnknownComponentPaintable;
 import com.vaadin.terminal.gwt.client.ui.VVerticalSplitPanelPaintable;
-import com.vaadin.terminal.gwt.client.ui.VView;
-import com.vaadin.terminal.gwt.client.ui.VWindow;
-import com.vaadin.terminal.gwt.client.ui.VWindowPaintable;
 
 public class WidgetSet {
 
@@ -58,8 +55,6 @@ public class WidgetSet {
                     .create(VUnknownComponentPaintable.class);
             c.setServerSideClassName(serverSideName);
             return c;
-        } else if (VWindow.class == classType) {
-            return GWT.create(VWindow.class);
         } else {
             /*
              * let the auto generated code instantiate this type
@@ -78,16 +73,14 @@ public class WidgetSet {
 
         // add our historical quirks
 
-        if (widgetClass == VView.class && uidl.hasAttribute("sub")) {
-            return VWindowPaintable.class;
-        } else if (widgetClass == VFilterSelectPaintable.class) {
+        if (widgetClass == VFilterSelectPaintable.class) {
             if (uidl.hasAttribute("type")) {
                 final String type = uidl.getStringAttribute("type").intern();
                 if ("legacy-multi" == type) {
                     return VListSelectPaintable.class;
                 }
             }
-        } else if (widgetClass == VSplitPanelHorizontal.class
+        } else if (widgetClass == VHorizontalSplitPanelPaintable.class
                 && uidl.hasAttribute("vertical")) {
             return VVerticalSplitPanelPaintable.class;
         }

diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetMapGenerator.java b/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetMapGenerator.java
index 76178baa6e3a461a2de24c4a5be023f27fca854d..2150748b546b72c97cdb8585f8257eec8d3148e7 100644 (file)
--- a/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetMapGenerator.java
+++ b/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetMapGenerator.java
@@ -24,7 +24,6 @@ import com.google.gwt.user.rebind.ClassSourceFileComposerFactory;
 import com.google.gwt.user.rebind.SourceWriter;
 import com.vaadin.terminal.Paintable;
 import com.vaadin.terminal.gwt.client.VPaintableWidget;
-import com.vaadin.terminal.gwt.client.ui.VView;
 import com.vaadin.terminal.gwt.client.ui.VViewPaintable;
 import com.vaadin.ui.ClientWidget;
 import com.vaadin.ui.ClientWidget.LoadStyle;
@@ -259,7 +258,7 @@ public class WidgetMapGenerator extends Generator {
             if (widgetsWithInstantiator.contains(clientClass)) {
                 continue;
             }
-            if (clientClass == VView.class) {
+            if (clientClass == VViewPaintable.class) {
                 // VView's are not instantiated by widgetset
                 continue;
             }