diff options
Diffstat (limited to 'src/com/vaadin')
| -rw-r--r-- | src/com/vaadin/ui/Table.java | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/src/com/vaadin/ui/Table.java b/src/com/vaadin/ui/Table.java index b14df2cdaa..4d4293e655 100644 --- a/src/com/vaadin/ui/Table.java +++ b/src/com/vaadin/ui/Table.java @@ -2236,21 +2236,21 @@ public class Table extends AbstractSelect implements Action.Container, Object propertyId = null; if (cid != null) { propertyId = columnIdMap.get(cid.toString()); - } - Object prev = variables.get("columnResizeEventPrev"); - int previousWidth = -1; - if (prev != null) { - previousWidth = Integer.valueOf(prev.toString()); - } + Object prev = variables.get("columnResizeEventPrev"); + int previousWidth = -1; + if (prev != null) { + previousWidth = Integer.valueOf(prev.toString()); + } - Object curr = variables.get("columnResizeEventCurr"); - int currentWidth = -1; - if (curr != null) { - currentWidth = Integer.valueOf(curr.toString()); - } + Object curr = variables.get("columnResizeEventCurr"); + int currentWidth = -1; + if (curr != null) { + currentWidth = Integer.valueOf(curr.toString()); + } - fireColumnResizeEvent(propertyId, previousWidth, currentWidth); + fireColumnResizeEvent(propertyId, previousWidth, currentWidth); + } } private void handleMultipleColumnResizeEvents(Map<String, Object> variables) { @@ -2258,10 +2258,12 @@ public class Table extends AbstractSelect implements Action.Container, for (String str : events) { String[] eventDetails = str.split(":"); Object propertyId = columnIdMap.get(eventDetails[0]); - int curWidth = Integer.valueOf(eventDetails[1]); - int prevWidth = getColumnWidth(propertyId); + if (propertyId != null) { + int curWidth = Integer.valueOf(eventDetails[1]); + int prevWidth = getColumnWidth(propertyId); - fireColumnResizeEvent(propertyId, prevWidth, curWidth); + fireColumnResizeEvent(propertyId, prevWidth, curWidth); + } } } |