diff options
| -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 | ||||
| -rw-r--r-- | shared/src/com/vaadin/shared/ui/ui/UIState.java | 4 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/ui/TooltipConfiguration.java | 10 |
4 files changed, 16 insertions, 16 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; } /** diff --git a/shared/src/com/vaadin/shared/ui/ui/UIState.java b/shared/src/com/vaadin/shared/ui/ui/UIState.java index 589744a48c..9e9f179f0b 100644 --- a/shared/src/com/vaadin/shared/ui/ui/UIState.java +++ b/shared/src/com/vaadin/shared/ui/ui/UIState.java @@ -21,7 +21,7 @@ import com.vaadin.shared.communication.PushMode; import com.vaadin.shared.ui.TabIndexState; public class UIState extends TabIndexState { - public TooltipConfiguration tooltipConfiguration = new TooltipConfiguration(); + public TooltipConfigurationState tooltipConfiguration = new TooltipConfigurationState(); public LoadingIndicatorConfiguration loadingIndicatorConfiguration = new LoadingIndicatorConfiguration(); public int pollInterval = -1; @@ -33,7 +33,7 @@ public class UIState extends TabIndexState { public int waitStateDelay = 5000; } - public static class TooltipConfiguration implements Serializable { + public static class TooltipConfigurationState implements Serializable { public int openDelay = 750; public int quickOpenDelay = 100; public int quickOpenTimeout = 1000; diff --git a/uitest/src/com/vaadin/tests/components/ui/TooltipConfiguration.java b/uitest/src/com/vaadin/tests/components/ui/TooltipConfiguration.java index b8998ff32e..2227e89256 100644 --- a/uitest/src/com/vaadin/tests/components/ui/TooltipConfiguration.java +++ b/uitest/src/com/vaadin/tests/components/ui/TooltipConfiguration.java @@ -32,7 +32,7 @@ public class TooltipConfiguration extends AbstractTestUIWithLog { closeTimeout.addValueChangeListener(new Property.ValueChangeListener() { @Override public void valueChange(ValueChangeEvent event) { - getTooltip().setCloseTimeout( + getTooltipConfiguration().setCloseTimeout( (Integer) closeTimeout.getConvertedValue()); } }); @@ -41,7 +41,7 @@ public class TooltipConfiguration extends AbstractTestUIWithLog { maxWidth.addValueChangeListener(new Property.ValueChangeListener() { @Override public void valueChange(ValueChangeEvent event) { - getTooltip() + getTooltipConfiguration() .setMaxWidth((Integer) maxWidth.getConvertedValue()); } }); @@ -50,7 +50,7 @@ public class TooltipConfiguration extends AbstractTestUIWithLog { openDelay.addValueChangeListener(new Property.ValueChangeListener() { @Override public void valueChange(ValueChangeEvent event) { - getTooltip().setOpenDelay( + getTooltipConfiguration().setOpenDelay( (Integer) openDelay.getConvertedValue()); } }); @@ -61,7 +61,7 @@ public class TooltipConfiguration extends AbstractTestUIWithLog { .addValueChangeListener(new Property.ValueChangeListener() { @Override public void valueChange(ValueChangeEvent event) { - getTooltip().setQuickOpenDelay( + getTooltipConfiguration().setQuickOpenDelay( (Integer) quickOpenDelay.getConvertedValue()); } }); @@ -72,7 +72,7 @@ public class TooltipConfiguration extends AbstractTestUIWithLog { .addValueChangeListener(new Property.ValueChangeListener() { @Override public void valueChange(ValueChangeEvent event) { - getTooltip().setQuickOpenTimeout( + getTooltipConfiguration().setQuickOpenTimeout( (Integer) quickOpenTimeout.getConvertedValue()); } }); |