]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 57e82ef)
Fixed Table to actually use converter from factory (#10408) 15/415/2
authorArtur Signell <artur@vaadin.com>
Wed, 28 Nov 2012 16:18:43 +0000 (18:18 +0200)
committerArtur Signell <artur@vaadin.com>
Wed, 28 Nov 2012 16:24:54 +0000 (18:24 +0200)
Change-Id: I02dce8628def6ed926e79fff5762169a129f2426

server/src/com/vaadin/ui/Table.java patch | blob | history
uitest/src/com/vaadin/tests/components/table/TableWithCustomConverterFactory.html [new file with mode: 0644] patch | blob
uitest/src/com/vaadin/tests/components/table/TableWithCustomConverterFactory.java [new file with mode: 0644] patch | blob

diff --git a/server/src/com/vaadin/ui/Table.java b/server/src/com/vaadin/ui/Table.java
index 91740673c41cc90ee5650db633f37355d331ab1d..1b72035e5411be860463efa08dda303b5f1641df 100644 (file)
--- a/server/src/com/vaadin/ui/Table.java
+++ b/server/src/com/vaadin/ui/Table.java
@@ -3725,8 +3725,8 @@ public class Table extends AbstractSelect implements Action.Container,
         if (hasConverter(colId)) {
             converter = getConverter(colId);
         } else {
-            ConverterUtil.getConverter(String.class, property.getType(),
-                    getSession());
+            converter = (Converter) ConverterUtil.getConverter(String.class,
+                    property.getType(), getSession());
         }
         Object value = property.getValue();
         if (converter != null) {
diff --git a/uitest/src/com/vaadin/tests/components/table/TableWithCustomConverterFactory.html b/uitest/src/com/vaadin/tests/components/table/TableWithCustomConverterFactory.html
new file mode 100644 (file)
index 0000000..d7f1ac2
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/table/TableWithCustomConverterFactory.html
@@ -0,0 +1,42 @@
+<?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://arturwin.office.itmill.com: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.server.component.table.TableWithCustomConverterFactory?debug&amp;restartApplication</td>
+       <td></td>
+</tr>
+<tr>
+       <td>assertText</td>
+       <td>vaadin=runcomvaadintestsservercomponenttableTableWithCustomConverterFactory::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
+       <td>Second column is 1</td>
+</tr>
+<tr>
+       <td>assertText</td>
+       <td>vaadin=runcomvaadintestsservercomponenttableTableWithCustomConverterFactory::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[0]</td>
+       <td>Integer: 1</td>
+</tr>
+<tr>
+       <td>assertText</td>
+       <td>vaadin=runcomvaadintestsservercomponenttableTableWithCustomConverterFactory::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>
+       <td>Second column is 4589</td>
+</tr>
+<tr>
+       <td>assertText</td>
+       <td>vaadin=runcomvaadintestsservercomponenttableTableWithCustomConverterFactory::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[1]/domChild[0]</td>
+       <td>Integer: 4589</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/uitest/src/com/vaadin/tests/components/table/TableWithCustomConverterFactory.java b/uitest/src/com/vaadin/tests/components/table/TableWithCustomConverterFactory.java
new file mode 100644 (file)
index 0000000..60be786
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/table/TableWithCustomConverterFactory.java
@@ -0,0 +1,91 @@
+/*
+ * 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.table;
+
+import java.util.Locale;
+
+import com.vaadin.data.util.converter.Converter;
+import com.vaadin.data.util.converter.DefaultConverterFactory;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Table;
+
+public class TableWithCustomConverterFactory extends AbstractTestUI {
+
+    public static class MyIntegerConverter implements
+            Converter<String, Integer> {
+
+        @Override
+        public Integer convertToModel(String value, Locale locale)
+                throws com.vaadin.data.util.converter.Converter.ConversionException {
+            // TODO Auto-generated method stub
+            return null;
+        }
+
+        @Override
+        public String convertToPresentation(Integer value, Locale locale)
+                throws com.vaadin.data.util.converter.Converter.ConversionException {
+            return "Integer: " + value;
+        }
+
+        @Override
+        public Class<Integer> getModelType() {
+            return Integer.class;
+        }
+
+        @Override
+        public Class<String> getPresentationType() {
+            return String.class;
+        }
+
+    }
+
+    public static class MyConverterFactory extends DefaultConverterFactory {
+        @Override
+        protected Converter<String, ?> createStringConverter(Class<?> sourceType) {
+            if (Integer.class.isAssignableFrom(sourceType)) {
+                return new MyIntegerConverter();
+            } else {
+                return super.createStringConverter(sourceType);
+            }
+        }
+    }
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        getSession().setConverterFactory(new MyConverterFactory());
+        Table t = new Table();
+        t.addContainerProperty("String column", String.class, "");
+        t.addContainerProperty("Integer column", Integer.class, "");
+        t.addItem(new Object[] { "Second column is 1", 1 }, "item1");
+        t.addItem(new Object[] { "Second column is 4589", 4589 }, "item2");
+
+        addComponent(t);
+    }
+
+    @Override
+    protected String getTestDescription() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+}
Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework