]> source.dussan.org Git - vaadin-framework.git/commitdiff
Fixed NPE when TextField value is null (#11021)
authorArtur Signell <artur@vaadin.com>
Mon, 18 Feb 2013 17:38:28 +0000 (19:38 +0200)
committerVaadin Code Review <review@vaadin.com>
Mon, 18 Feb 2013 17:39:03 +0000 (17:39 +0000)
Ticket: 11021
Change-Id: If3b99333a116e6191ba3f563738e456a07173ab4

client/src/com/vaadin/client/ui/textfield/TextFieldConnector.java
uitest/src/com/vaadin/tests/components/textfield/TextFieldWithDataSourceAndInputPrompt.html [new file with mode: 0644]
uitest/src/com/vaadin/tests/components/textfield/TextFieldWithDataSourceAndInputPrompt.java [new file with mode: 0644]

index 922e8d4a32df169211a6cdf7afa7f83c11b5567d..e2ede121b6c4bb973d83388bc2093e29bbb8cc3b 100644 (file)
@@ -77,8 +77,10 @@ public class TextFieldConnector extends AbstractFieldConnector implements
         }
         getWidget().setColumns(getState().columns);
 
-        final String text = getState().text;
-
+        String text = getState().text;
+        if (text == null) {
+            text = "";
+        }
         /*
          * We skip the text content update if field has been repainted, but text
          * has not been changed. Additional sanity check verifies there is no
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextFieldWithDataSourceAndInputPrompt.html b/uitest/src/com/vaadin/tests/components/textfield/TextFieldWithDataSourceAndInputPrompt.html
new file mode 100644 (file)
index 0000000..cf08d89
--- /dev/null
@@ -0,0 +1,31 @@
+<?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="http://localhost:8888/" />
+<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/com.vaadin.tests.components.textfield.TextFieldWithDataSourceAndInputPrompt?restartApplication</td>
+       <td></td>
+</tr>
+<tr>
+       <td>assertValue</td>
+       <td>vaadin=runcomvaadintestscomponentstextfieldTextFieldWithDataSourceAndInputPrompt::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VTextField[0]</td>
+       <td>Me is input prompt</td>
+</tr>
+<tr>
+       <td>assertValue</td>
+       <td>vaadin=runcomvaadintestscomponentstextfieldTextFieldWithDataSourceAndInputPrompt::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VTextField[0]</td>
+       <td>Me is input prompt</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextFieldWithDataSourceAndInputPrompt.java b/uitest/src/com/vaadin/tests/components/textfield/TextFieldWithDataSourceAndInputPrompt.java
new file mode 100644 (file)
index 0000000..881aa11
--- /dev/null
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2012 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.tests.components.textfield;
+
+import com.vaadin.data.util.BeanItem;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.TextField;
+
+public class TextFieldWithDataSourceAndInputPrompt extends AbstractTestUI {
+    public static class Pojo {
+        private String string;
+
+        public String getString() {
+            return string;
+        }
+
+        public void setString(String string) {
+            this.string = string;
+        }
+    }
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        TextField textField = new TextField("TextField with null value");
+        textField.setInputPrompt("Me is input prompt");
+        textField.setNullRepresentation(null);
+        textField.setValue(null);
+        addComponent(textField);
+
+        TextField textField2 = new TextField(
+                "TextField with null data source value");
+        textField2.setInputPrompt("Me is input prompt");
+        textField2.setNullRepresentation(null);
+        BeanItem<Pojo> beanItem = new BeanItem<Pojo>(new Pojo());
+        textField2.setPropertyDataSource(beanItem.getItemProperty("string"));
+        addComponent(textField2);
+    }
+
+    @Override
+    protected String getTestDescription() {
+        return "Input prompt should be shown when data source provides null";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 11021;
+    }
+
+}