Merge remote branch 'origin/6.8'

9 files changed, 316 insertions, 60 deletions

diff --git a/src/com/vaadin/event/ListenerMethod.java b/src/com/vaadin/event/ListenerMethod.java
index c11f3b1424..1f1305fa69 100644
--- a/src/com/vaadin/event/ListenerMethod.java
+++ b/src/com/vaadin/event/ListenerMethod.java
@@ -517,8 +517,10 @@ public class ListenerMethod implements EventListener, Serializable {
             } catch (final java.lang.reflect.InvocationTargetException e) {
                 // An exception was thrown by the invocation target. Throw it
                 // forwards.
-                throw new MethodException("Invocation of method " + method
-                        + " failed.", e.getTargetException());
+                throw new MethodException("Invocation of method "
+                        + method.getName() + " in "
+                        + target.getClass().getName() + " failed.",
+                        e.getTargetException());
             }
         }
     }
@@ -617,49 +619,8 @@ public class ListenerMethod implements EventListener, Serializable {
     public class MethodException extends RuntimeException implements
             Serializable {
 
-        private final Throwable cause;
-
-        private String message;
-
         private MethodException(String message, Throwable cause) {
-            super(message);
-            this.cause = cause;
-        }
-
-        /**
-         * Retrieves the cause of this throwable or <code>null</code> if the
-         * cause does not exist or not known.
-         * 
-         * @return the cause of this throwable or <code>null</code> if the cause
-         *         is nonexistent or unknown.
-         * @see java.lang.Throwable#getCause()
-         */
-        @Override
-        public Throwable getCause() {
-            return cause;
-        }
-
-        /**
-         * Returns the error message string of this throwable object.
-         * 
-         * @return the error message.
-         * @see java.lang.Throwable#getMessage()
-         */
-        @Override
-        public String getMessage() {
-            return message;
-        }
-
-        /**
-         * @see java.lang.Throwable#toString()
-         */
-        @Override
-        public String toString() {
-            String msg = super.toString();
-            if (cause != null) {
-                msg += "\nCause: " + cause.toString();
-            }
-            return msg;
+            super(message, cause);
         }
 
     }
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
index b54c3dd943..0083cc83c2 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
@@ -1616,14 +1616,6 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler,
              */
             int tbWidth = Util.getRequiredWidth(tb);
 
-            if (popupWidth < 0) {
-                /*
-                 * Only use the first page popup width so the textbox will not
-                 * get resized whenever the popup is resized.
-                 */
-                popupWidth = Util.getRequiredWidth(popupOpener);
-            }
-
             /*
              * Note: iconWidth is here calculated as a negative pixel value so
              * you should consider this in further calculations.
@@ -1632,7 +1624,7 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler,
                     .measureMarginLeft(tb.getElement())
                     - Util.measureMarginLeft(selectedItemIcon.getElement()) : 0;
 
-            int w = tbWidth + popupWidth + iconWidth;
+            int w = tbWidth + getPopUpOpenerWidth() + iconWidth;
 
             /*
              * When the select has a undefined with we need to check that we are
@@ -1669,6 +1661,20 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler,
     }
 
     /**
+     * Only use the first page popup width so the textbox will not get resized
+     * whenever the popup is resized. This also resolves issue where toggling
+     * combo box between read only and normal state makes it grow larger.
+     * 
+     * @return Width of popup opener
+     */
+    private int getPopUpOpenerWidth() {
+        if (popupWidth < 0) {
+            popupWidth = Util.getRequiredWidth(popupOpener);
+        }
+        return popupWidth;
+    }
+
+    /**
      * Get the width of the select in pixels where the text area and icon has
      * been included.
      * 
@@ -1686,10 +1692,10 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler,
      */
     private void setTextboxWidth(int componentWidth) {
         int padding = getTextboxPadding();
-        int popupOpenerWidth = Util.getRequiredWidth(popupOpener);
         int iconWidth = selectedItemIcon.isAttached() ? Util
                 .getRequiredWidth(selectedItemIcon) : 0;
-        int textboxWidth = componentWidth - padding - popupOpenerWidth
+
+        int textboxWidth = componentWidth - padding - getPopUpOpenerWidth()
                 - iconWidth;
         if (textboxWidth < 0) {
             textboxWidth = 0;
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java b/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java
index 809c1a0380..9155f9932a 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java
@@ -317,13 +317,16 @@ public class VTabsheet extends VTabsheetBase {
         }
 
         public Tab addTab() {
+            // Must check this before insert as insert updates the tab count
+            boolean firstTab = (getTabCount() == 0);
+            
             Tab t = new Tab(this);
 
             // Logical attach
             int spacerIndex = getTabCount();
             insert(t, tr, spacerIndex, true);
 
-            if (getTabCount() == 0) {
+            if (firstTab) {
                 // Set the "first" style
                 t.setStyleNames(false, true);
             }
diff --git a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
index 86f2c7a2de..705bf13346 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
@@ -1234,12 +1234,16 @@ public abstract class AbstractCommunicationManager implements
                 try {
                     changeVariables(source, owner, m);
                 } catch (Exception e) {
+                    Component errorComponent = null;
                     if (owner instanceof Component) {
-                        handleChangeVariablesError(app, (Component) owner, e, m);
-                    } else {
-                        // TODO DragDropService error handling
-                        throw new RuntimeException(e);
+                        errorComponent = (Component) owner;
+                    } else if (owner instanceof DragAndDropService) {
+                        if (m.get("dhowner") instanceof Component) {
+                            errorComponent = (Component) m.get("dhowner");
+                        }
                     }
+
+                    handleChangeVariablesError(app, errorComponent, e, m);
                 }
             } else {
 
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/PopUpWidth.html b/tests/testbench/com/vaadin/tests/components/combobox/PopUpWidth.html
new file mode 100644
index 0000000000..35a6bcf29a
--- /dev/null
+++ b/tests/testbench/com/vaadin/tests/components/combobox/PopUpWidth.html
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="" />
+<title>PopUpWidth</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">PopUpWidth</td></tr>
+</thead><tbody>
+<tr>
+	<td>open</td>
+	<td>/run/com.vaadin.tests.components.combobox.PopUpWidth</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentscomboboxPopUpWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[1]</td>
+	<td>9,14</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentscomboboxPopUpWidth::Root/VFilterSelect$SuggestionPopup[0]/domChild[0]/domChild[2]/domChild[0]</td>
+	<td>106,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentscomboboxPopUpWidth::Root/VFilterSelect$SuggestionPopup[0]/domChild[0]/domChild[2]/domChild[0]</td>
+	<td>103,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentscomboboxPopUpWidth::Root/VFilterSelect$SuggestionPopup[0]/domChild[0]/domChild[2]/domChild[0]</td>
+	<td>103,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentscomboboxPopUpWidth::Root/VFilterSelect$SuggestionPopup[0]/domChild[0]/domChild[2]/domChild[0]</td>
+	<td>103,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentscomboboxPopUpWidth::Root/VFilterSelect$SuggestionPopup[0]/domChild[0]/domChild[2]/domChild[0]</td>
+	<td>103,5</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>combos-and-popup-with-same-width</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/PopUpWidth.java b/tests/testbench/com/vaadin/tests/components/combobox/PopUpWidth.java
new file mode 100644
index 0000000000..e22482ed8b
--- /dev/null
+++ b/tests/testbench/com/vaadin/tests/components/combobox/PopUpWidth.java
@@ -0,0 +1,43 @@
+package com.vaadin.tests.components.combobox;
+
+import com.vaadin.data.Item;
+import com.vaadin.terminal.Resource;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.ComboBox;
+
+public class PopUpWidth extends TestBase {
+
+    @Override
+    protected void setup() {
+
+        addComponent(createComboBox("Do not touch this"));
+        addComponent(createComboBox("Browse this (check that width does not change)"));
+    }
+
+    private ComboBox createComboBox(String caption) {
+        ComboBox cb = new ComboBox(caption);
+        cb.addContainerProperty("caption", String.class, null);
+        cb.addContainerProperty("icon", Resource.class, null);
+        for (int i = 1; i < 200 + 1; i++) {
+            Item item = cb.addItem(i);
+            item.getItemProperty("caption").setValue("Item " + i);
+            item.getItemProperty("icon").setValue(
+                    new ThemeResource("../runo/icons/16/users.png"));
+        }
+        cb.setItemIconPropertyId("icon");
+        cb.setItemCaptionPropertyId("caption");
+        return cb;
+    }
+
+    @Override
+    protected String getDescription() {
+        return "Check that width of popup or combobox does not change when paging.";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 7013;
+    }
+
+}
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/WidthToggleReadOnly.html b/tests/testbench/com/vaadin/tests/components/combobox/WidthToggleReadOnly.html
new file mode 100644
index 0000000000..b661aa2bd7
--- /dev/null
+++ b/tests/testbench/com/vaadin/tests/components/combobox/WidthToggleReadOnly.html
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="" />
+<title>WidthToggleReadOnly</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">WidthToggleReadOnly</td></tr>
+</thead><tbody>
+<tr>
+	<td>open</td>
+	<td>/run/com.vaadin.tests.components.combobox.WidthToggleReadOnly</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentscomboboxWidthToggleReadOnly::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VCheckBox[0]/domChild[0]</td>
+	<td>5,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentscomboboxWidthToggleReadOnly::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VCheckBox[0]/domChild[0]</td>
+	<td>5,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentscomboboxWidthToggleReadOnly::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VCheckBox[0]/domChild[0]</td>
+	<td>5,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentscomboboxWidthToggleReadOnly::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VCheckBox[0]/domChild[0]</td>
+	<td>5,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentscomboboxWidthToggleReadOnly::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VCheckBox[0]/domChild[0]</td>
+	<td>5,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentscomboboxWidthToggleReadOnly::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VCheckBox[0]/domChild[0]</td>
+	<td>5,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentscomboboxWidthToggleReadOnly::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VCheckBox[0]/domChild[0]</td>
+	<td>5,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentscomboboxWidthToggleReadOnly::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VCheckBox[0]/domChild[0]</td>
+	<td>5,7</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>both-combo-with-same-width</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/WidthToggleReadOnly.java b/tests/testbench/com/vaadin/tests/components/combobox/WidthToggleReadOnly.java
new file mode 100644
index 0000000000..654f42e233
--- /dev/null
+++ b/tests/testbench/com/vaadin/tests/components/combobox/WidthToggleReadOnly.java
@@ -0,0 +1,48 @@
+package com.vaadin.tests.components.combobox;
+
+import com.vaadin.data.util.MethodProperty;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.ComboBox;
+
+public class WidthToggleReadOnly extends TestBase {
+
+    @Override
+    protected void setup() {
+        ComboBox combo = createNewComboBoxA("Untouched combobox");
+        addComponent(combo);
+
+        combo = createNewComboBoxA("Toggled combobox");
+        addComponent(combo);
+        addComponent(createReadOnlyForComboBox(combo));
+    }
+
+    private ComboBox createNewComboBoxA(String caption) {
+        ComboBox combo = new ComboBox(caption);
+        combo.addItem("first");
+        combo.setValue("first");
+
+        addComponent(combo);
+
+        return combo;
+    }
+
+    private CheckBox createReadOnlyForComboBox(ComboBox combo) {
+        CheckBox readonly = new CheckBox("Second combobox is read only",
+                new MethodProperty(combo, "readOnly"));
+        readonly.setImmediate(true);
+        addComponent(readonly);
+        return readonly;
+    }
+
+    @Override
+    protected String getDescription() {
+        return "Check that toggling read only mode of second combobox does not change it's width.";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 5833;
+    }
+
+}
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetSelectionStyles.html b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetSelectionStyles.html
new file mode 100644
index 0000000000..e046cfacb4
--- /dev/null
+++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetSelectionStyles.html
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="" />
+<title>New Test</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">New Test</td></tr>
+</thead><tbody>
+<tr>
+	<td>open</td>
+	<td>/run/TabSheetIndexOperations?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>tab1-selected</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runTabSheetIndexOperations::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]</td>
+	<td>21,8</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>tab2-selected</td>
+</tr>
+<tr>
+	<td>open</td>
+	<td>/run/TabSheetIndexOperations</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>tab2-selected</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runTabSheetIndexOperations::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
+	<td>14,5</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>tab1-selected</td>
+</tr>
+<tr>
+	<td>open</td>
+	<td>/run/TabSheetIndexOperations</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>tab1-selected</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>