Merge branch 'master' into gwt

1 files changed, 134 insertions, 30 deletions

diff --git a/src/com/vaadin/ui/Table.java b/src/com/vaadin/ui/Table.java
index fc736bfa93..5d4f919704 100644
--- a/src/com/vaadin/ui/Table.java
+++ b/src/com/vaadin/ui/Table.java
@@ -39,7 +39,6 @@ import com.vaadin.event.dd.DragAndDropEvent;
 import com.vaadin.event.dd.DragSource;
 import com.vaadin.event.dd.DropHandler;
 import com.vaadin.event.dd.DropTarget;
-import com.vaadin.event.dd.acceptcriteria.ClientCriterion;
 import com.vaadin.event.dd.acceptcriteria.ServerSideCriterion;
 import com.vaadin.terminal.KeyMapper;
 import com.vaadin.terminal.LegacyPaint;
@@ -47,7 +46,6 @@ import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
 import com.vaadin.terminal.Resource;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
-import com.vaadin.terminal.gwt.client.ui.dd.VLazyInitItemIdentifiers;
 import com.vaadin.terminal.gwt.client.ui.table.VScrollTable;
 
 /**
@@ -78,8 +76,7 @@ public class Table extends AbstractSelect implements Action.Container,
         Container.Ordered, Container.Sortable, ItemClickNotifier, DragSource,
         DropTarget, HasComponents {
 
-    private static final Logger logger = Logger
-            .getLogger(Table.class.getName());
+    private transient Logger logger = null;
 
     /**
      * Modes that Table support as drag sourse.
@@ -331,7 +328,8 @@ public class Table extends AbstractSelect implements Action.Container,
     private static final double CACHE_RATE_DEFAULT = 2;
 
     private static final String ROW_HEADER_COLUMN_KEY = "0";
-    private static final Object ROW_HEADER_FAKE_PROPERTY_ID = new Object();
+    private static final Object ROW_HEADER_FAKE_PROPERTY_ID = new UniqueSerializable() {
+    };
 
     /* Private table extensions to Select */
 
@@ -356,6 +354,11 @@ public class Table extends AbstractSelect implements Action.Container,
     private LinkedList<Object> visibleColumns = new LinkedList<Object>();
 
     /**
+     * Holds noncollapsible columns.
+     */
+    private HashSet<Object> noncollapsibleColumns = new HashSet<Object>();
+
+    /**
      * Holds propertyIds of currently collapsed columns.
      */
     private final HashSet<Object> collapsedColumns = new HashSet<Object>();
@@ -1248,6 +1251,9 @@ public class Table extends AbstractSelect implements Action.Container,
         if (!isColumnCollapsingAllowed()) {
             throw new IllegalStateException("Column collapsing not allowed!");
         }
+        if (collapsed && noncollapsibleColumns.contains(propertyId)) {
+            throw new IllegalStateException("The column is noncollapsible!");
+        }
 
         if (collapsed) {
             collapsedColumns.add(propertyId);
@@ -1287,6 +1293,41 @@ public class Table extends AbstractSelect implements Action.Container,
     }
 
     /**
+     * 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
+     *            true if the column should be collapsible, false otherwise.
+     */
+    public void setColumnCollapsible(Object propertyId, boolean collapsible) {
+        if (collapsible) {
+            noncollapsibleColumns.remove(propertyId);
+        } else {
+            noncollapsibleColumns.add(propertyId);
+            collapsedColumns.remove(propertyId);
+        }
+        refreshRowCache();
+    }
+
+    /**
+     * 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 isColumnCollapsible(Object propertyId) {
+        return !noncollapsibleColumns.contains(propertyId);
+    }
+
+    /**
      * Checks if column reordering is allowed.
      * 
      * @return true if columns can be reordered; false otherwise.
@@ -1569,6 +1610,13 @@ public class Table extends AbstractSelect implements Action.Container,
             }
         } else {
             // initial load
+
+            // #8805 send one extra row in the beginning in case a partial
+            // row is shown on the UI
+            if (firstIndex > 0) {
+                firstIndex = firstIndex - 1;
+                rows = rows + 1;
+            }
             firstToBeRenderedInClient = firstIndex;
         }
         if (totalRows > 0) {
@@ -1597,6 +1645,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * this method has been called. See {@link #refreshRowCache()} for forcing
      * an update of the contents.
      */
+
     @Override
     public void requestRepaint() {
         // Overridden only for javadoc
@@ -1714,8 +1763,9 @@ public class Table extends AbstractSelect implements Action.Container,
      * @return
      */
     private Object[][] getVisibleCellsInsertIntoCache(int firstIndex, int rows) {
-        logger.finest("Insert " + rows + " rows at index " + firstIndex
-                + " to existing page buffer requested");
+        getLogger().finest(
+                "Insert " + rows + " rows at index " + firstIndex
+                        + " to existing page buffer requested");
 
         // Page buffer must not become larger than pageLength*cacheRate before
         // or after the current page
@@ -1818,11 +1868,14 @@ public class Table extends AbstractSelect implements Action.Container,
             }
         }
         pageBuffer = newPageBuffer;
-        logger.finest("Page Buffer now contains "
-                + pageBuffer[CELL_ITEMID].length + " rows ("
-                + pageBufferFirstIndex + "-"
-                + (pageBufferFirstIndex + pageBuffer[CELL_ITEMID].length - 1)
-                + ")");
+        getLogger().finest(
+                "Page Buffer now contains "
+                        + pageBuffer[CELL_ITEMID].length
+                        + " rows ("
+                        + pageBufferFirstIndex
+                        + "-"
+                        + (pageBufferFirstIndex
+                                + pageBuffer[CELL_ITEMID].length - 1) + ")");
         return cells;
     }
 
@@ -1839,8 +1892,9 @@ public class Table extends AbstractSelect implements Action.Container,
      */
     private Object[][] getVisibleCellsNoCache(int firstIndex, int rows,
             boolean replaceListeners) {
-        logger.finest("Render visible cells for rows " + firstIndex + "-"
-                + (firstIndex + rows - 1));
+        getLogger().finest(
+                "Render visible cells for rows " + firstIndex + "-"
+                        + (firstIndex + rows - 1));
         final Object[] colids = getVisibleColumns();
         final int cols = colids.length;
 
@@ -2022,8 +2076,9 @@ public class Table extends AbstractSelect implements Action.Container,
     }
 
     protected void registerComponent(Component component) {
-        logger.finest("Registered " + component.getClass().getSimpleName()
-                + ": " + component.getCaption());
+        getLogger().finest(
+                "Registered " + component.getClass().getSimpleName() + ": "
+                        + component.getCaption());
         if (component.getParent() != this) {
             component.setParent(this);
         }
@@ -2054,8 +2109,9 @@ public class Table extends AbstractSelect implements Action.Container,
      * @param count
      */
     private void unregisterComponentsAndPropertiesInRows(int firstIx, int count) {
-        logger.finest("Unregistering components in rows " + firstIx + "-"
-                + (firstIx + count - 1));
+        getLogger().finest(
+                "Unregistering components in rows " + firstIx + "-"
+                        + (firstIx + count - 1));
         Object[] colids = getVisibleColumns();
         if (pageBuffer != null && pageBuffer[CELL_ITEMID].length > 0) {
             int bufSize = pageBuffer[CELL_ITEMID].length;
@@ -2135,8 +2191,9 @@ public class Table extends AbstractSelect implements Action.Container,
      *            a set of components that should be unregistered.
      */
     protected void unregisterComponent(Component component) {
-        logger.finest("Unregistered " + component.getClass().getSimpleName()
-                + ": " + component.getCaption());
+        getLogger().finest(
+                "Unregistered " + component.getClass().getSimpleName() + ": "
+                        + component.getCaption());
         component.setParent(null);
         /*
          * Also remove property data sources to unregister listeners keeping the
@@ -2446,6 +2503,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * @see com.vaadin.ui.Select#changeVariables(java.lang.Object,
      *      java.util.Map)
      */
+
     @Override
     public void changeVariables(Object source, Map<String, Object> variables) {
 
@@ -2505,7 +2563,7 @@ public class Table extends AbstractSelect implements Action.Container,
                         .get("lastToBeRendered")).intValue();
             } catch (Exception e) {
                 // FIXME: Handle exception
-                logger.log(Level.FINER,
+                getLogger().log(Level.FINER,
                         "Could not parse the first and/or last rows.", e);
             }
 
@@ -2525,8 +2583,9 @@ public class Table extends AbstractSelect implements Action.Container,
                     }
                 }
             }
-            logger.finest("Client wants rows " + reqFirstRowToPaint + "-"
-                    + (reqFirstRowToPaint + reqRowsToPaint - 1));
+            getLogger().finest(
+                    "Client wants rows " + reqFirstRowToPaint + "-"
+                            + (reqFirstRowToPaint + reqRowsToPaint - 1));
             clientNeedsContentRefresh = true;
         }
 
@@ -2572,7 +2631,7 @@ public class Table extends AbstractSelect implements Action.Container,
                     }
                 } catch (final Exception e) {
                     // FIXME: Handle exception
-                    logger.log(Level.FINER,
+                    getLogger().log(Level.FINER,
                             "Could not determine column collapsing state", e);
                 }
                 clientNeedsContentRefresh = true;
@@ -2594,7 +2653,7 @@ public class Table extends AbstractSelect implements Action.Container,
                     }
                 } catch (final Exception e) {
                     // FIXME: Handle exception
-                    logger.log(Level.FINER,
+                    getLogger().log(Level.FINER,
                             "Could not determine column reordering state", e);
                 }
                 clientNeedsContentRefresh = true;
@@ -2767,6 +2826,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * @see com.vaadin.ui.AbstractSelect#paintContent(com.vaadin.
      * terminal.PaintTarget)
      */
+
     @Override
     public void paintContent(PaintTarget target) throws PaintException {
         /*
@@ -2884,8 +2944,9 @@ public class Table extends AbstractSelect implements Action.Container,
         target.startTag("prows");
 
         if (!shouldHideAddedRows()) {
-            logger.finest("Paint rows for add. Index: " + firstIx + ", count: "
-                    + count + ".");
+            getLogger().finest(
+                    "Paint rows for add. Index: " + firstIx + ", count: "
+                            + count + ".");
 
             // Partial row additions bypass the normal caching mechanism.
             Object[][] cells = getVisibleCellsInsertIntoCache(firstIx, count);
@@ -2908,8 +2969,9 @@ public class Table extends AbstractSelect implements Action.Container,
                         indexInRowbuffer, itemId);
             }
         } else {
-            logger.finest("Paint rows for remove. Index: " + firstIx
-                    + ", count: " + count + ".");
+            getLogger().finest(
+                    "Paint rows for remove. Index: " + firstIx + ", count: "
+                            + count + ".");
             removeRowsFromCacheAndFillBottom(firstIx, count);
             target.addAttribute("hide", true);
         }
@@ -3108,7 +3170,17 @@ public class Table extends AbstractSelect implements Action.Container,
                 }
             }
             target.addVariable(this, "collapsedcolumns", collapsedKeys);
+
+            final String[] noncollapsibleKeys = new String[noncollapsibleColumns
+                    .size()];
+            nextColumn = 0;
+            for (Object colId : noncollapsibleColumns) {
+                noncollapsibleKeys[nextColumn++] = columnIdMap.key(colId);
+            }
+            target.addVariable(this, "noncollapsiblecolumns",
+                    noncollapsibleKeys);
         }
+
     }
 
     private void paintActions(PaintTarget target, final Set<Action> actionSet)
@@ -3613,6 +3685,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * 
      * @see com.vaadin.event.Action.Container#addActionHandler(Action.Handler)
      */
+
     public void addActionHandler(Action.Handler actionHandler) {
 
         if (actionHandler != null) {
@@ -3639,6 +3712,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * 
      * @see com.vaadin.event.Action.Container#removeActionHandler(Action.Handler)
      */
+
     public void removeActionHandler(Action.Handler actionHandler) {
 
         if (actionHandlers != null && actionHandlers.contains(actionHandler)) {
@@ -3678,6 +3752,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * 
      * @see com.vaadin.data.Property.ValueChangeListener#valueChange(Property.ValueChangeEvent)
      */
+
     @Override
     public void valueChange(Property.ValueChangeEvent event) {
         if (event.getProperty() == this
@@ -3708,6 +3783,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * 
      * @see com.vaadin.ui.Component#attach()
      */
+
     @Override
     public void attach() {
         super.attach();
@@ -3720,6 +3796,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * 
      * @see com.vaadin.ui.Component#detach()
      */
+
     @Override
     public void detach() {
         super.detach();
@@ -3730,6 +3807,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * 
      * @see com.vaadin.data.Container#removeAllItems()
      */
+
     @Override
     public boolean removeAllItems() {
         currentPageFirstItemId = null;
@@ -3742,6 +3820,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * 
      * @see com.vaadin.data.Container#removeItem(Object)
      */
+
     @Override
     public boolean removeItem(Object itemId) {
         final Object nextItemId = nextItemId(itemId);
@@ -3760,6 +3839,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * 
      * @see com.vaadin.data.Container#removeContainerProperty(Object)
      */
+
     @Override
     public boolean removeContainerProperty(Object propertyId)
             throws UnsupportedOperationException {
@@ -3786,6 +3866,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * @see com.vaadin.data.Container#addContainerProperty(Object, Class,
      *      Object)
      */
+
     @Override
     public boolean addContainerProperty(Object propertyId, Class<?> type,
             Object defaultValue) throws UnsupportedOperationException {
@@ -3941,6 +4022,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * 
      * @see com.vaadin.ui.Select#getVisibleItemIds()
      */
+
     @Override
     public Collection<?> getVisibleItemIds() {
 
@@ -3964,6 +4046,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * 
      * @see com.vaadin.data.Container.ItemSetChangeListener#containerItemSetChange(com.vaadin.data.Container.ItemSetChangeEvent)
      */
+
     @Override
     public void containerItemSetChange(Container.ItemSetChangeEvent event) {
         super.containerItemSetChange(event);
@@ -3980,6 +4063,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * 
      * @see com.vaadin.data.Container.PropertySetChangeListener#containerPropertySetChange(com.vaadin.data.Container.PropertySetChangeEvent)
      */
+
     @Override
     public void containerPropertySetChange(
             Container.PropertySetChangeEvent event) {
@@ -4023,6 +4107,7 @@ public class Table extends AbstractSelect implements Action.Container,
      *             if set to true.
      * @see com.vaadin.ui.Select#setNewItemsAllowed(boolean)
      */
+
     @Override
     public void setNewItemsAllowed(boolean allowNewOptions)
             throws UnsupportedOperationException {
@@ -4036,6 +4121,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * 
      * @see com.vaadin.data.Container.Ordered#nextItemId(java.lang.Object)
      */
+
     public Object nextItemId(Object itemId) {
         return ((Container.Ordered) items).nextItemId(itemId);
     }
@@ -4046,6 +4132,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * 
      * @see com.vaadin.data.Container.Ordered#prevItemId(java.lang.Object)
      */
+
     public Object prevItemId(Object itemId) {
         return ((Container.Ordered) items).prevItemId(itemId);
     }
@@ -4055,6 +4142,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * 
      * @see com.vaadin.data.Container.Ordered#firstItemId()
      */
+
     public Object firstItemId() {
         return ((Container.Ordered) items).firstItemId();
     }
@@ -4064,6 +4152,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * 
      * @see com.vaadin.data.Container.Ordered#lastItemId()
      */
+
     public Object lastItemId() {
         return ((Container.Ordered) items).lastItemId();
     }
@@ -4074,6 +4163,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * 
      * @see com.vaadin.data.Container.Ordered#isFirstId(java.lang.Object)
      */
+
     public boolean isFirstId(Object itemId) {
         return ((Container.Ordered) items).isFirstId(itemId);
     }
@@ -4084,6 +4174,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * 
      * @see com.vaadin.data.Container.Ordered#isLastId(java.lang.Object)
      */
+
     public boolean isLastId(Object itemId) {
         return ((Container.Ordered) items).isLastId(itemId);
     }
@@ -4093,6 +4184,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * 
      * @see com.vaadin.data.Container.Ordered#addItemAfter(java.lang.Object)
      */
+
     public Object addItemAfter(Object previousItemId)
             throws UnsupportedOperationException {
         Object itemId = ((Container.Ordered) items)
@@ -4109,6 +4201,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * @see com.vaadin.data.Container.Ordered#addItemAfter(java.lang.Object,
      *      java.lang.Object)
      */
+
     public Item addItemAfter(Object previousItemId, Object newItemId)
             throws UnsupportedOperationException {
         Item item = ((Container.Ordered) items).addItemAfter(previousItemId,
@@ -4201,6 +4294,7 @@ public class Table extends AbstractSelect implements Action.Container,
      *      boolean[])
      * 
      */
+
     public void sort(Object[] propertyId, boolean[] ascending)
             throws UnsupportedOperationException {
         final Container c = getContainerDataSource();
@@ -4236,6 +4330,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * 
      * @see com.vaadin.data.Container.Sortable#getSortableContainerPropertyIds()
      */
+
     public Collection<?> getSortableContainerPropertyIds() {
         final Container c = getContainerDataSource();
         if (c instanceof Container.Sortable && !isSortDisabled()) {
@@ -4436,6 +4531,7 @@ public class Table extends AbstractSelect implements Action.Container,
     }
 
     // Identical to AbstractCompoenentContainer.setEnabled();
+
     @Override
     public void setEnabled(boolean enabled) {
         super.setEnabled(enabled);
@@ -4560,7 +4656,6 @@ public class Table extends AbstractSelect implements Action.Container,
      * initialized from server and no subsequent requests requests are needed
      * during that drag and drop operation.
      */
-    @ClientCriterion(VLazyInitItemIdentifiers.class)
     public static abstract class TableDropCriterion extends ServerSideCriterion {
 
         private Table table;
@@ -4574,6 +4669,7 @@ public class Table extends AbstractSelect implements Action.Container,
          * com.vaadin.event.dd.acceptcriteria.ServerSideCriterion#getIdentifier
          * ()
          */
+
         @Override
         protected String getIdentifier() {
             return TableDropCriterion.class.getCanonicalName();
@@ -4605,6 +4701,7 @@ public class Table extends AbstractSelect implements Action.Container,
          * com.vaadin.event.dd.acceptcriteria.AcceptCriterion#paintResponse(
          * com.vaadin.terminal.PaintTarget)
          */
+
         @Override
         public void paintResponse(PaintTarget target) throws PaintException {
             /*
@@ -5276,4 +5373,11 @@ public class Table extends AbstractSelect implements Action.Container,
     public boolean isComponentVisible(Component childComponent) {
         return true;
     }
+
+    private final Logger getLogger() {
+        if (logger == null) {
+            logger = Logger.getLogger(Table.class.getName());
+        }
+        return logger;
+    }
 }