Merge commit '6f729'

Conflicts:
	src/com/vaadin/terminal/gwt/client/ui/splitpanel/VAbstractSplitPanel.java
	src/com/vaadin/ui/AbstractSplitPanel.java

3 files changed, 23 insertions, 16 deletions

diff --git a/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VAbstractSplitPanel.java b/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VAbstractSplitPanel.java
index 12ae3312c7..e112fac304 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VAbstractSplitPanel.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VAbstractSplitPanel.java
@@ -289,12 +289,12 @@ public class VAbstractSplitPanel extends ComplexPanel {
      */
     private String checkSplitPositionLimits(String pos) {
         float positionAsFloat = convertToPixels(pos);
-        float maximumAsFloat = convertToPixels(maximumPosition);
-        float minimumAsFloat = convertToPixels(minimumPosition);
 
-        if (maximumAsFloat < positionAsFloat) {
+        if (maximumPosition != null
+                && convertToPixels(maximumPosition) < positionAsFloat) {
             pos = maximumPosition;
-        } else if (minimumAsFloat > positionAsFloat) {
+        } else if (minimumPosition != null
+                && convertToPixels(minimumPosition) > positionAsFloat) {
             pos = minimumPosition;
         }
         return pos;
diff --git a/src/com/vaadin/ui/AbstractSplitPanel.java b/src/com/vaadin/ui/AbstractSplitPanel.java
index 805640387f..6a7099ba9d 100644
--- a/src/com/vaadin/ui/AbstractSplitPanel.java
+++ b/src/com/vaadin/ui/AbstractSplitPanel.java
@@ -346,7 +346,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
      *            the unit (from {@link Sizeable}) in which the size is given.
      *            Allowed units are UNITS_PERCENTAGE and UNITS_PIXELS
      */
-    public void setMinimumSplitPosition(int pos, Unit unit) {
+    public void setMinSplitPosition(int pos, Unit unit) {
         setSplitPositionLimits(pos, unit, getSplitterState().getMaxPosition(),
                 posMaxUnit);
     }
@@ -380,7 +380,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
      *            the unit (from {@link Sizeable}) in which the size is given.
      *            Allowed units are UNITS_PERCENTAGE and UNITS_PIXELS
      */
-    public void setMaxSplitPosition(int pos, Unit unit) {
+    public void setMaxSplitPosition(float pos, Unit unit) {
         setSplitPositionLimits(getSplitterState().getMinPosition(), posMinUnit,
                 pos, unit);
     }
diff --git a/src/com/vaadin/ui/Table.java b/src/com/vaadin/ui/Table.java
index 70d9570b01..5f4016de18 100644
--- a/src/com/vaadin/ui/Table.java
+++ b/src/com/vaadin/ui/Table.java
@@ -1296,31 +1296,38 @@ public class Table extends AbstractSelect implements Action.Container,
     }
 
     /**
-     * Sets whether a column can be collapsed or not.
+     * Sets whether the given column is collapsible. Note that collapsible
+     * columns can only be actually collapsed (via UI or with
+     * {@link #setColumnCollapsed(Object, boolean) setColumnCollapsed()}) if
+     * {@link #isColumnCollapsingAllowed()} is true. By default all columns are
+     * collapsible.
      * 
      * @param propertyId
      *            the propertyID identifying the column.
      * @param collapsible
-     *            the desired collapsibleness
+     *            true if the column should be collapsible, false otherwise.
      */
-    public void setColumnNoncollapsible(Object propertyId,
-            boolean noncollapsible) {
-        if (noncollapsible) {
+    public void setColumnCollapsible(Object propertyId, boolean collapsible) {
+        if (collapsible) {
+            noncollapsibleColumns.remove(propertyId);
+        } else {
             noncollapsibleColumns.add(propertyId);
             collapsedColumns.remove(propertyId);
-        } else {
-            noncollapsibleColumns.remove(propertyId);
         }
         refreshRowCache();
     }
 
     /**
-     * Checks if the column can be collapsed.
+     * Checks if the given column is collapsible. Note that even if this method
+     * returns <code>true</code>, the column can only be actually collapsed (via
+     * UI or with {@link #setColumnCollapsed(Object, boolean)
+     * setColumnCollapsed()}) if {@link #isColumnCollapsingAllowed()} is also
+     * true.
      * 
      * @return true if the column can be collapsed; false otherwise.
      */
-    public boolean isColumnNoncollapsible(Object propertyId) {
-        return noncollapsibleColumns.contains(propertyId);
+    public boolean isColumnCollapsible(Object propertyId) {
+        return !noncollapsibleColumns.contains(propertyId);
     }
 
     /**