diff options
author | Artur Signell <artur@vaadin.com> | 2013-04-22 14:02:46 +0300 |
---|---|---|
committer | Vaadin Code Review <review@vaadin.com> | 2013-04-23 07:46:12 +0000 |
commit | 09cb9d88956b5c892d8dba9b1a3f3dd9cdfd078a (patch) | |
tree | 5e7916f6f8a435ff744ef492038711a7b1733bd6 /server/src/com/vaadin/ui | |
parent | 069e4d2d870fc174df10680275fe7614274edba7 (diff) | |
download | vaadin-framework-09cb9d88956b5c892d8dba9b1a3f3dd9cdfd078a.tar.gz vaadin-framework-09cb9d88956b5c892d8dba9b1a3f3dd9cdfd078a.zip |
Renamed UI.getTooltip to getTooltipConfiguration (#11663)
Change-Id: Idd33f68171b40b4097454418b78f75aee8f76eab
Diffstat (limited to 'server/src/com/vaadin/ui')
-rw-r--r-- | server/src/com/vaadin/ui/TooltipConfiguration.java (renamed from server/src/com/vaadin/ui/Tooltip.java) | 12 | ||||
-rw-r--r-- | server/src/com/vaadin/ui/UI.java | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/server/src/com/vaadin/ui/Tooltip.java b/server/src/com/vaadin/ui/TooltipConfiguration.java index 093bb33b51..f9120aa18d 100644 --- a/server/src/com/vaadin/ui/Tooltip.java +++ b/server/src/com/vaadin/ui/TooltipConfiguration.java @@ -17,7 +17,7 @@ package com.vaadin.ui; import java.io.Serializable; -import com.vaadin.shared.ui.ui.UIState.TooltipConfiguration; +import com.vaadin.shared.ui.ui.UIState.TooltipConfigurationState; /** * Provides method for configuring the tooltip. @@ -25,7 +25,7 @@ import com.vaadin.shared.ui.ui.UIState.TooltipConfiguration; * @author Vaadin Ltd * @since 7.1 */ -public interface Tooltip extends Serializable { +public interface TooltipConfiguration extends Serializable { /** * Returns the time (in ms) the tooltip should be displayed after an event * that will cause it to be closed (e.g. mouse click outside the component, @@ -122,10 +122,10 @@ public interface Tooltip extends Serializable { public void setMaxWidth(int maxWidth); } -class TooltipImpl implements Tooltip { +class TooltipConfigurationImpl implements TooltipConfiguration { private UI ui; - public TooltipImpl(UI ui) { + public TooltipConfigurationImpl(UI ui) { this.ui = ui; } @@ -229,11 +229,11 @@ class TooltipImpl implements Tooltip { getState().maxWidth = maxWidth; } - private TooltipConfiguration getState() { + private TooltipConfigurationState getState() { return ui.getState().tooltipConfiguration; } - private TooltipConfiguration getState(boolean markAsDirty) { + private TooltipConfigurationState getState(boolean markAsDirty) { return ui.getState(markAsDirty).tooltipConfiguration; } diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/com/vaadin/ui/UI.java index 5bef772c95..b6574fe1b2 100644 --- a/server/src/com/vaadin/ui/UI.java +++ b/server/src/com/vaadin/ui/UI.java @@ -167,7 +167,7 @@ public abstract class UI extends AbstractSingleComponentContainer implements private boolean closing = false; - private Tooltip tooltip = new TooltipImpl(this); + private TooltipConfiguration tooltipConfiguration = new TooltipConfigurationImpl(this); /** * Creates a new empty UI without a caption. The content of the UI must be @@ -1123,8 +1123,8 @@ public abstract class UI extends AbstractSingleComponentContainer implements * * @return The instance used for tooltip configuration */ - public Tooltip getTooltip() { - return tooltip; + public TooltipConfiguration getTooltipConfiguration() { + return tooltipConfiguration; } /** |