summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorTapio Aali <tapio@vaadin.com>2012-05-31 08:34:34 +0000
committerTapio Aali <tapio@vaadin.com>2012-05-31 08:34:34 +0000
commitee7526e0876fbe5e418331e3883ad5b9a1d7a828 (patch)
tree2ba59bcff297861c49749959e949aefc3a072e82 /src/com
parent2e581760d056ad7038bfa5c04c6fd17c883a7d32 (diff)
downloadvaadin-framework-ee7526e0876fbe5e418331e3883ad5b9a1d7a828.tar.gz
vaadin-framework-ee7526e0876fbe5e418331e3883ad5b9a1d7a828.zip
Created a test for disabling and enabling max/min split position of SplitPanel. Also fixed some inconsistenties from the AbstractSplitPanel class.
svn changeset:23859/svn branch:6.8
Diffstat (limited to 'src/com')
-rw-r--r--src/com/vaadin/ui/AbstractSplitPanel.java20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/com/vaadin/ui/AbstractSplitPanel.java b/src/com/vaadin/ui/AbstractSplitPanel.java
index 586dbc81fe..0588e44d40 100644
--- a/src/com/vaadin/ui/AbstractSplitPanel.java
+++ b/src/com/vaadin/ui/AbstractSplitPanel.java
@@ -41,11 +41,11 @@ public abstract class AbstractSplitPanel extends AbstractLayout {
private boolean posReversed = false;
- private int posMin = 0;
+ private float posMin = 0;
private int posMinUnit = UNITS_PERCENTAGE;
- private int posMax = 100;
+ private float posMax = 100;
private int posMaxUnit = UNITS_PERCENTAGE;
@@ -222,10 +222,10 @@ public abstract class AbstractSplitPanel extends AbstractLayout {
final String maximumPosition = posMax + UNIT_SYMBOLS[posMaxUnit];
target.addAttribute("position", position);
- if (minimumPosition != "0%") {
+ if (!minimumPosition.equals("0%")) {
target.addAttribute("minimumPosition", minimumPosition);
}
- if (maximumPosition != "100%") {
+ if (!maximumPosition.equals("100%")) {
target.addAttribute("maximumPosition", maximumPosition);
}
@@ -348,7 +348,7 @@ public abstract class AbstractSplitPanel extends AbstractLayout {
* the unit (from {@link Sizeable}) in which the size is given.
* Allowed units are UNITS_PERCENTAGE and UNITS_PIXELS
*/
- public void setMinimumSplitPosition(int pos, int unit) {
+ public void setMinSplitPosition(float pos, int unit) {
setSplitPositionLimits(pos, unit, posMax, posMaxUnit);
}
@@ -358,7 +358,7 @@ public abstract class AbstractSplitPanel extends AbstractLayout {
*
* @return the minimum position of the splitter
*/
- public int getMinSplitPosition() {
+ public float getMinSplitPosition() {
return posMin;
}
@@ -381,7 +381,7 @@ public abstract class AbstractSplitPanel extends AbstractLayout {
* the unit (from {@link Sizeable}) in which the size is given.
* Allowed units are UNITS_PERCENTAGE and UNITS_PIXELS
*/
- public void setMaxSplitPosition(int pos, int unit) {
+ public void setMaxSplitPosition(float pos, int unit) {
setSplitPositionLimits(posMin, posMinUnit, pos, unit);
}
@@ -391,7 +391,7 @@ public abstract class AbstractSplitPanel extends AbstractLayout {
*
* @return the maximum position of the splitter
*/
- public int getMaxSplitPosition() {
+ public float getMaxSplitPosition() {
return posMax;
}
@@ -419,8 +419,8 @@ public abstract class AbstractSplitPanel extends AbstractLayout {
* the unit (from {@link Sizeable}) in which the maximum position
* is given.
*/
- private void setSplitPositionLimits(int minPos, int minPosUnit, int maxPos,
- int maxPosUnit) {
+ private void setSplitPositionLimits(float minPos, int minPosUnit,
+ float maxPos, int maxPosUnit) {
if ((minPosUnit != UNITS_PERCENTAGE && minPosUnit != UNITS_PIXELS)
|| (maxPosUnit != UNITS_PERCENTAGE && maxPosUnit != UNITS_PIXELS)) {
throw new IllegalArgumentException(