diff options
author | Fabian Lange <lange.fabian@gmail.com> | 2014-07-01 13:31:08 +0200 |
---|---|---|
committer | Sauli Tähkäpää <sauli@vaadin.com> | 2014-07-01 15:48:30 +0300 |
commit | 0ceccae58fb7fbeac867b79766e3bf8296d9e075 (patch) | |
tree | 0f403aabc9890d0ffcff231067ea94b6c5a9c7a2 /server/src/com/vaadin/ui/AbstractSplitPanel.java | |
parent | 264e617c58d537d12a03b5f3fb73f5129fcadc09 (diff) | |
download | vaadin-framework-0ceccae58fb7fbeac867b79766e3bf8296d9e075.tar.gz vaadin-framework-0ceccae58fb7fbeac867b79766e3bf8296d9e075.zip |
Reading properties of components should not set state to dirty (#14060).
Fixed issue with SplitPanels which were not marking sets as dirty.
Change-Id: I23bb8bfca87a825aef132f249e05871cf7b36a34
Diffstat (limited to 'server/src/com/vaadin/ui/AbstractSplitPanel.java')
-rw-r--r-- | server/src/com/vaadin/ui/AbstractSplitPanel.java | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/server/src/com/vaadin/ui/AbstractSplitPanel.java b/server/src/com/vaadin/ui/AbstractSplitPanel.java index 1c69ebf87e..09f881cf46 100644 --- a/server/src/com/vaadin/ui/AbstractSplitPanel.java +++ b/server/src/com/vaadin/ui/AbstractSplitPanel.java @@ -335,7 +335,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer { * @return position of the splitter */ public float getSplitPosition() { - return getSplitterState().position; + return getSplitterState(false).position; } /** @@ -358,7 +358,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer { * Allowed units are UNITS_PERCENTAGE and UNITS_PIXELS */ public void setMinSplitPosition(float pos, Unit unit) { - setSplitPositionLimits(pos, unit, getSplitterState().maxPosition, + setSplitPositionLimits(pos, unit, getSplitterState(false).maxPosition, posMaxUnit); } @@ -369,7 +369,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer { * @return the minimum position of the splitter */ public float getMinSplitPosition() { - return getSplitterState().minPosition; + return getSplitterState(false).minPosition; } /** @@ -392,8 +392,8 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer { * Allowed units are UNITS_PERCENTAGE and UNITS_PIXELS */ public void setMaxSplitPosition(float pos, Unit unit) { - setSplitPositionLimits(getSplitterState().minPosition, posMinUnit, pos, - unit); + setSplitPositionLimits(getSplitterState(false).minPosition, posMinUnit, + pos, unit); } /** @@ -403,7 +403,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer { * @return the maximum position of the splitter */ public float getMaxSplitPosition() { - return getSplitterState().maxPosition; + return getSplitterState(false).maxPosition; } /** @@ -467,7 +467,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer { * @return <code>true</code> if locked, <code>false</code> otherwise. */ public boolean isLocked() { - return getSplitterState().locked; + return getSplitterState(false).locked; } /** @@ -540,6 +540,10 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer { } private SplitterState getSplitterState() { - return getState(false).splitterState; + return ((AbstractSplitPanelState) super.getState()).splitterState; + } + + private SplitterState getSplitterState(boolean markAsDirty) { + return ((AbstractSplitPanelState) super.getState(markAsDirty)).splitterState; } } |