From cbd900b1ea15d3fa059a38b30096f8cdd2f7590d Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Wed, 28 Nov 2012 18:18:43 +0200 Subject: [PATCH] Fixed Table to actually use converter from factory (#10408) Change-Id: I02dce8628def6ed926e79fff5762169a129f2426 --- server/src/com/vaadin/ui/Table.java | 4 +- .../TableWithCustomConverterFactory.html | 42 +++++++++ .../TableWithCustomConverterFactory.java | 91 +++++++++++++++++++ 3 files changed, 135 insertions(+), 2 deletions(-) create mode 100644 uitest/src/com/vaadin/tests/components/table/TableWithCustomConverterFactory.html create mode 100644 uitest/src/com/vaadin/tests/components/table/TableWithCustomConverterFactory.java diff --git a/server/src/com/vaadin/ui/Table.java b/server/src/com/vaadin/ui/Table.java index 91740673c4..1b72035e54 100644 --- 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 index 0000000000..d7f1ac22c7 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/table/TableWithCustomConverterFactory.html @@ -0,0 +1,42 @@ + + + + + + +New Test + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
New Test
open/run/com.vaadin.tests.server.component.table.TableWithCustomConverterFactory?debug&restartApplication
assertTextvaadin=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]Second column is 1
assertTextvaadin=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]Integer: 1
assertTextvaadin=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]Second column is 4589
assertTextvaadin=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]Integer: 4589
+ + 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 index 0000000000..60be786e8b --- /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 { + + @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 getModelType() { + return Integer.class; + } + + @Override + public Class getPresentationType() { + return String.class; + } + + } + + public static class MyConverterFactory extends DefaultConverterFactory { + @Override + protected Converter 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; + } + +} -- 2.39.5