diff options
| author | Artur Signell <artur@vaadin.com> | 2012-01-26 16:30:54 +0200 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-01-26 16:30:54 +0200 |
| commit | 4c9905b221bc9324669713711a5fd3759e15f899 (patch) | |
| tree | 9d66a19c6d55cacb58d4653ea8872a24cfa0645c | |
| parent | cc3d673ad83b048a838a8db3198066cad7bd7ab1 (diff) | |
| download | vaadin-framework-4c9905b221bc9324669713711a5fd3759e15f899.tar.gz vaadin-framework-4c9905b221bc9324669713711a5fd3759e15f899.zip | |
Fixed ClassCastException when MenuBar has a set width
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java | 4 | ||||
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/VMenuBarPaintable.java | 7 |
2 files changed, 2 insertions, 9 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java b/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java index 372ddf25d2..c39155d032 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java @@ -1420,8 +1420,4 @@ public class VMenuBar extends SimpleFocusablePanel implements return null; } - public Widget getWidgetForPaintable() { - return this; - } - } diff --git a/src/com/vaadin/terminal/gwt/client/ui/VMenuBarPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/VMenuBarPaintable.java index 38b3cac358..f36db99583 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VMenuBarPaintable.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VMenuBarPaintable.java @@ -9,7 +9,6 @@ import com.google.gwt.user.client.ui.Widget; import com.vaadin.terminal.gwt.client.ApplicationConnection;
import com.vaadin.terminal.gwt.client.UIDL;
import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.VPaintableMap;
import com.vaadin.terminal.gwt.client.ui.VMenuBar.CustomMenuItem;
public class VMenuBarPaintable extends VAbstractPaintableWidget {
@@ -66,12 +65,10 @@ public class VMenuBarPaintable extends VAbstractPaintableWidget { getWidgetForPaintable().moreItem = GWT.create(CustomMenuItem.class);
getWidgetForPaintable().moreItem.setHTML(itemHTML.toString());
- getWidgetForPaintable().moreItem
- .setCommand(getWidgetForPaintable().emptyCommand);
+ getWidgetForPaintable().moreItem.setCommand(VMenuBar.emptyCommand);
getWidgetForPaintable().collapsedRootItems = new VMenuBar(true,
- (VMenuBar) VPaintableMap.get(client).getPaintable(
- getWidgetForPaintable().uidlId));
+ getWidgetForPaintable());
getWidgetForPaintable().moreItem
.setSubMenu(getWidgetForPaintable().collapsedRootItems);
getWidgetForPaintable().moreItem.addStyleName(VMenuBar.CLASSNAME
|