From baa72fea3a4ec08682fe83058ad76dd85ccb8a13 Mon Sep 17 00:00:00 2001 From: Henri Sara Date: Mon, 18 May 2009 11:35:51 +0000 Subject: [PATCH] #2904 renamed VToolkitOverlay -> VOverlay svn changeset:7855/svn branch:6.0 --- src/com/vaadin/terminal/gwt/client/VDebugConsole.java | 4 ++-- src/com/vaadin/terminal/gwt/client/VErrorMessage.java | 8 ++++---- src/com/vaadin/terminal/gwt/client/VTooltip.java | 4 ++-- src/com/vaadin/terminal/gwt/client/ui/MenuBar.java | 2 +- .../vaadin/terminal/gwt/client/ui/VCalendarPanel.java | 2 +- .../vaadin/terminal/gwt/client/ui/VContextMenu.java | 2 +- .../vaadin/terminal/gwt/client/ui/VFilterSelect.java | 2 +- src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java | 4 ++-- .../vaadin/terminal/gwt/client/ui/VNotification.java | 2 +- .../client/ui/{VToolkitOverlay.java => VOverlay.java} | 10 +++++----- .../vaadin/terminal/gwt/client/ui/VPopupCalendar.java | 4 ++-- src/com/vaadin/terminal/gwt/client/ui/VPopupView.java | 2 +- src/com/vaadin/terminal/gwt/client/ui/VSplitPanel.java | 2 +- src/com/vaadin/terminal/gwt/client/ui/VWindow.java | 4 ++-- 14 files changed, 26 insertions(+), 26 deletions(-) rename src/com/vaadin/terminal/gwt/client/ui/{VToolkitOverlay.java => VOverlay.java} (97%) diff --git a/src/com/vaadin/terminal/gwt/client/VDebugConsole.java b/src/com/vaadin/terminal/gwt/client/VDebugConsole.java index 38ba032995..fe77602daf 100755 --- a/src/com/vaadin/terminal/gwt/client/VDebugConsole.java +++ b/src/com/vaadin/terminal/gwt/client/VDebugConsole.java @@ -28,9 +28,9 @@ import com.google.gwt.user.client.ui.Tree; import com.google.gwt.user.client.ui.TreeItem; import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; -import com.vaadin.terminal.gwt.client.ui.VToolkitOverlay; +import com.vaadin.terminal.gwt.client.ui.VOverlay; -public final class VDebugConsole extends VToolkitOverlay implements Console { +public final class VDebugConsole extends VOverlay implements Console { /** * Builds number. For example 0-custom_tag in 5.0.0-custom_tag. diff --git a/src/com/vaadin/terminal/gwt/client/VErrorMessage.java b/src/com/vaadin/terminal/gwt/client/VErrorMessage.java index f32bd80b09..ba25dd23db 100644 --- a/src/com/vaadin/terminal/gwt/client/VErrorMessage.java +++ b/src/com/vaadin/terminal/gwt/client/VErrorMessage.java @@ -10,7 +10,7 @@ import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Element; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.HTML; -import com.vaadin.terminal.gwt.client.ui.VToolkitOverlay; +import com.vaadin.terminal.gwt.client.ui.VOverlay; public class VErrorMessage extends FlowPanel { public static final String CLASSNAME = "v-errormessage"; @@ -48,9 +48,9 @@ public class VErrorMessage extends FlowPanel { * @param indicatorElement */ public void showAt(Element indicatorElement) { - VToolkitOverlay errorContainer = (VToolkitOverlay) getParent(); + VOverlay errorContainer = (VOverlay) getParent(); if (errorContainer == null) { - errorContainer = new VToolkitOverlay(); + errorContainer = new VOverlay(); errorContainer.setWidget(this); } errorContainer.setPopupPosition(DOM.getAbsoluteLeft(indicatorElement) @@ -65,7 +65,7 @@ public class VErrorMessage extends FlowPanel { } public void hide() { - final VToolkitOverlay errorContainer = (VToolkitOverlay) getParent(); + final VOverlay errorContainer = (VOverlay) getParent(); if (errorContainer != null) { errorContainer.hide(); } diff --git a/src/com/vaadin/terminal/gwt/client/VTooltip.java b/src/com/vaadin/terminal/gwt/client/VTooltip.java index ff64896d27..77059bd21e 100644 --- a/src/com/vaadin/terminal/gwt/client/VTooltip.java +++ b/src/com/vaadin/terminal/gwt/client/VTooltip.java @@ -9,12 +9,12 @@ import com.google.gwt.user.client.Event; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.FlowPanel; -import com.vaadin.terminal.gwt.client.ui.VToolkitOverlay; +import com.vaadin.terminal.gwt.client.ui.VOverlay; /** * TODO open for extension */ -public class VTooltip extends VToolkitOverlay { +public class VTooltip extends VOverlay { private static final String CLASSNAME = "v-tooltip"; private static final int MARGIN = 4; public static final int TOOLTIP_EVENTS = Event.ONKEYDOWN diff --git a/src/com/vaadin/terminal/gwt/client/ui/MenuBar.java b/src/com/vaadin/terminal/gwt/client/ui/MenuBar.java index 88de95cb38..f950014ad7 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/MenuBar.java +++ b/src/com/vaadin/terminal/gwt/client/ui/MenuBar.java @@ -376,7 +376,7 @@ public class MenuBar extends Widget implements PopupListener { // Create a new popup for this item, and position it next to // the item (below if this is a horizontal menu bar, to the // right if it's a vertical bar). - popup = new VToolkitOverlay(true) { + popup = new VOverlay(true) { { setWidget(item.getSubMenu()); item.getSubMenu().onShow(); diff --git a/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java b/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java index 85c4124dd4..8d688c2ed9 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java @@ -487,7 +487,7 @@ public class VCalendarPanel extends FlexTable implements MouseListener { if (datefield instanceof VTextualDate && resolution < VDateField.RESOLUTION_HOUR) { - ((VToolkitOverlay) getParent()).hide(); + ((VOverlay) getParent()).hide(); } else { updateCalendar(); } diff --git a/src/com/vaadin/terminal/gwt/client/ui/VContextMenu.java b/src/com/vaadin/terminal/gwt/client/ui/VContextMenu.java index 30c717418a..b83006bf23 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VContextMenu.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VContextMenu.java @@ -13,7 +13,7 @@ import com.google.gwt.user.client.ui.MenuBar; import com.google.gwt.user.client.ui.MenuItem; import com.google.gwt.user.client.ui.PopupPanel; -public class VContextMenu extends VToolkitOverlay implements SubPartAware { +public class VContextMenu extends VOverlay implements SubPartAware { private ActionOwner actionOwner; diff --git a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java index d333f6537a..7c9e4dadd1 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java @@ -87,7 +87,7 @@ public class VFilterSelect extends Composite implements Paintable, Field, } } - public class SuggestionPopup extends VToolkitOverlay implements + public class SuggestionPopup extends VOverlay implements PositionCallback, PopupListener { private static final String Z_INDEX = "30000"; diff --git a/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java b/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java index ce3f34313c..ef70cae606 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java @@ -41,7 +41,7 @@ public class VMenuBar extends Widget implements Paintable, PopupListener { protected boolean subMenu; protected ArrayList items; protected Element containerElement; - protected VToolkitOverlay popup; + protected VOverlay popup; protected VMenuBar visibleChildMenu; protected VMenuBar parentMenu; protected CustomMenuItem selected; @@ -435,7 +435,7 @@ public class VMenuBar extends Widget implements Paintable, PopupListener { * @param item */ public void showChildMenu(CustomMenuItem item) { - popup = new VToolkitOverlay(true, false, true); + popup = new VOverlay(true, false, true); popup.setWidget(item.getSubMenu()); popup.addPopupListener(this); diff --git a/src/com/vaadin/terminal/gwt/client/ui/VNotification.java b/src/com/vaadin/terminal/gwt/client/ui/VNotification.java index 23e48437a3..a7accae95d 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VNotification.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VNotification.java @@ -17,7 +17,7 @@ import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.Widget; import com.vaadin.terminal.gwt.client.BrowserInfo; -public class VNotification extends VToolkitOverlay { +public class VNotification extends VOverlay { public static final int CENTERED = 1; public static final int CENTERED_TOP = 2; diff --git a/src/com/vaadin/terminal/gwt/client/ui/VToolkitOverlay.java b/src/com/vaadin/terminal/gwt/client/ui/VOverlay.java similarity index 97% rename from src/com/vaadin/terminal/gwt/client/ui/VToolkitOverlay.java rename to src/com/vaadin/terminal/gwt/client/ui/VOverlay.java index 84b3c78405..858132ba36 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VToolkitOverlay.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VOverlay.java @@ -18,7 +18,7 @@ import com.vaadin.terminal.gwt.client.BrowserInfo; * temporary float over other components like context menus etc. This is to deal * stacking order correctly with VWindow objects. */ -public class VToolkitOverlay extends PopupPanel { +public class VOverlay extends PopupPanel { /* * The z-index value from where all overlays live. This can be overridden in @@ -59,22 +59,22 @@ public class VToolkitOverlay extends PopupPanel { */ private static final String SHADOW_HTML = "
"; - public VToolkitOverlay() { + public VOverlay() { super(); adjustZIndex(); } - public VToolkitOverlay(boolean autoHide) { + public VOverlay(boolean autoHide) { super(autoHide); adjustZIndex(); } - public VToolkitOverlay(boolean autoHide, boolean modal) { + public VOverlay(boolean autoHide, boolean modal) { super(autoHide, modal); adjustZIndex(); } - public VToolkitOverlay(boolean autoHide, boolean modal, boolean showShadow) { + public VOverlay(boolean autoHide, boolean modal, boolean showShadow) { super(autoHide, modal); if (showShadow) { shadow = DOM.createDiv(); diff --git a/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java b/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java index 983b1fb71e..c0c032d276 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java @@ -24,7 +24,7 @@ public class VPopupCalendar extends VTextualDate implements Paintable, Field, private final VCalendarPanel calendar; - private final VToolkitOverlay popup; + private final VOverlay popup; private boolean open = false; public VPopupCalendar() { @@ -37,7 +37,7 @@ public class VPopupCalendar extends VTextualDate implements Paintable, Field, add(calendarToggle); calendar = new VCalendarPanel(this); - popup = new VToolkitOverlay(true, true, true); + popup = new VOverlay(true, true, true); popup.setStyleName(VDateField.CLASSNAME + "-popup"); popup.setWidget(calendar); popup.addPopupListener(this); diff --git a/src/com/vaadin/terminal/gwt/client/ui/VPopupView.java b/src/com/vaadin/terminal/gwt/client/ui/VPopupView.java index ce1fa343f3..c6041d71d1 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VPopupView.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VPopupView.java @@ -192,7 +192,7 @@ public class VPopupView extends HTML implements Container { } }-*/; - private class CustomPopup extends VToolkitOverlay { + private class CustomPopup extends VOverlay { private Paintable popupComponentPaintable = null; private Widget popupComponentWidget = null; diff --git a/src/com/vaadin/terminal/gwt/client/ui/VSplitPanel.java b/src/com/vaadin/terminal/gwt/client/ui/VSplitPanel.java index a1f14af242..59015a9606 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VSplitPanel.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VSplitPanel.java @@ -435,7 +435,7 @@ public class VSplitPanel extends ComplexPanel implements Container, DOM.setStyleAttribute(draggingCurtain, "width", "100%"); DOM.setStyleAttribute(draggingCurtain, "height", "100%"); DOM.setStyleAttribute(draggingCurtain, "zIndex", "" - + VToolkitOverlay.Z_INDEX); + + VOverlay.Z_INDEX); DOM.appendChild(RootPanel.getBodyElement(), draggingCurtain); } } diff --git a/src/com/vaadin/terminal/gwt/client/ui/VWindow.java b/src/com/vaadin/terminal/gwt/client/ui/VWindow.java index 87bd272af3..57ce65f378 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VWindow.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VWindow.java @@ -35,7 +35,7 @@ import com.vaadin.terminal.gwt.client.Util; * * @author IT Mill Ltd */ -public class VWindow extends VToolkitOverlay implements Container, +public class VWindow extends VOverlay implements Container, ScrollListener { private static final int MIN_HEIGHT = 100; @@ -595,7 +595,7 @@ public class VWindow extends VToolkitOverlay implements Container, DOM.setStyleAttribute(draggingCurtain, "width", "100%"); DOM.setStyleAttribute(draggingCurtain, "height", "100%"); DOM.setStyleAttribute(draggingCurtain, "zIndex", "" - + VToolkitOverlay.Z_INDEX); + + VOverlay.Z_INDEX); DOM.appendChild(RootPanel.getBodyElement(), draggingCurtain); } else if (!show && draggingCurtain != null) { -- 2.39.5