diff options
| author | Jouni Koivuviita <jouni@vaadin.com> | 2012-08-08 22:03:39 +0300 |
|---|---|---|
| committer | Jouni Koivuviita <jouni@vaadin.com> | 2012-08-08 22:03:39 +0300 |
| commit | 0c55105c0d13692492e25bfca87b51de7758e3c4 (patch) | |
| tree | bc615a61f9b19ea2488a2bdcd9742a85f840e1a4 | |
| parent | afb01d3d1c23980ba5148edf12377e4c9ad95dde (diff) | |
| parent | 0a5ef5d891672ddb2b9b4aee1ef195870356520d (diff) | |
| download | vaadin-framework-0c55105c0d13692492e25bfca87b51de7758e3c4.tar.gz vaadin-framework-0c55105c0d13692492e25bfca87b51de7758e3c4.zip | |
Merge branch 'master' into layoutgraph
3 files changed, 6 insertions, 1 deletions
diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/StatementHelper.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/StatementHelper.java index f9458609c3..b012ce7685 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/StatementHelper.java +++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/StatementHelper.java @@ -47,6 +47,10 @@ public class StatementHelper implements Serializable { if (parameter != null) { parameters.add(parameter); dataTypes.put(parameters.size() - 1, parameter.getClass()); + } else { + throw new IllegalArgumentException( + "You cannot add null parameters using addParamaters(Object). " + + "Use addParameters(Object,Class) instead"); } } diff --git a/src/com/vaadin/terminal/gwt/client/ui/VOverlay.java b/src/com/vaadin/terminal/gwt/client/ui/VOverlay.java index f2f13d1f35..d5ae77b442 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VOverlay.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VOverlay.java @@ -242,6 +242,7 @@ public class VOverlay extends PopupPanel implements CloseHandler<PopupPanel> { // shim behind the shadow due to its transparency. shimElement.getStyle().setPosition(Position.ABSOLUTE); shimElement.getStyle().setBorderStyle(BorderStyle.NONE); + shimElement.setTabIndex(-1); shimElement.setFrameBorder(0); shimElement.setMarginHeight(0); } diff --git a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedPdf.html b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedPdf.html index 758a004445..c550b0f5d9 100644 --- a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedPdf.html +++ b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedPdf.html @@ -20,7 +20,7 @@ <tr> <td>pause</td> <td></td> - <td>4000</td> + <td>8000</td> </tr> <tr> <td>screenCapture</td> |