From 36aebc81ff63af333a36f7e72d11fe17d06dd97e Mon Sep 17 00:00:00 2001 From: Leif Åstrand Date: Thu, 18 Jul 2013 17:11:17 +0300 Subject: Update to Atmosphere 1.0.14.vaadin4 (#12242) Change-Id: I76ccbf631f8ba169f11513b7d585f39b8ab570a4 --- WebContent/VAADIN/jquery.atmosphere.js | 3 ++- push/build.xml | 4 ++-- push/ivy.xml | 4 ++-- server/src/com/vaadin/server/Constants.java | 4 +++- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/WebContent/VAADIN/jquery.atmosphere.js b/WebContent/VAADIN/jquery.atmosphere.js index bb597f01b5..28a7d033bd 100644 --- a/WebContent/VAADIN/jquery.atmosphere.js +++ b/WebContent/VAADIN/jquery.atmosphere.js @@ -49,7 +49,8 @@ jQuery.atmosphere = function() { }; return { - version : "1.0.13", + // Keep the version number in sync with push/build.xml and other locations listed in that file + version : "1.0.14.vaadin4", requests : [], callbacks : [], diff --git a/push/build.xml b/push/build.xml index 2dc05f62fd..ead3a0226e 100644 --- a/push/build.xml +++ b/push/build.xml @@ -12,8 +12,8 @@ - - + + diff --git a/push/ivy.xml b/push/ivy.xml index 615e404db3..5a2a24fb1f 100644 --- a/push/ivy.xml +++ b/push/ivy.xml @@ -26,9 +26,9 @@ rev="2.4" conf="build-provided,ide,test -> default" /> - + + rev="1.0.14.vaadin4" conf="build,ide,test -> default"> diff --git a/server/src/com/vaadin/server/Constants.java b/server/src/com/vaadin/server/Constants.java index ed65b53183..ab91ee021c 100644 --- a/server/src/com/vaadin/server/Constants.java +++ b/server/src/com/vaadin/server/Constants.java @@ -65,7 +65,9 @@ public interface Constants { + " Widgetset version: %s\n" + "================================================================="; - static final String REQUIRED_ATMOSPHERE_VERSION = "1.0.14.vaadin3"; + // Keep the version number in sync with push/build.xml and other locations + // listed in that file + static final String REQUIRED_ATMOSPHERE_VERSION = "1.0.14.vaadin4"; static final String INVALID_ATMOSPHERE_VERSION_WARNING = "\n" + "=================================================================\n" -- cgit v1.2.3 From 62c63a6a6dcf97c5a8f7b02e0115fdab096226db Mon Sep 17 00:00:00 2001 From: Johannes Dahlström Date: Fri, 19 Jul 2013 16:09:53 +0300 Subject: Only add DateRangeValidator to DateField if start or end of range is set (#12193) Change-Id: I9138a5607c1ff20f3aa7be49270f683e732ee195 --- server/src/com/vaadin/ui/DateField.java | 13 ++-- .../datefield/DateFieldConverterTest.java | 77 ++++++++++++++++++++++ 2 files changed, 84 insertions(+), 6 deletions(-) create mode 100644 server/tests/src/com/vaadin/tests/server/component/datefield/DateFieldConverterTest.java diff --git a/server/src/com/vaadin/ui/DateField.java b/server/src/com/vaadin/ui/DateField.java index 5017fac993..17dda73b95 100644 --- a/server/src/com/vaadin/ui/DateField.java +++ b/server/src/com/vaadin/ui/DateField.java @@ -402,13 +402,14 @@ public class DateField extends AbstractField implements private void updateRangeValidator() { if (currentRangeValidator != null) { removeValidator(currentRangeValidator); + currentRangeValidator = null; + } + if (getRangeStart() != null || getRangeEnd() != null) { + currentRangeValidator = new DateRangeValidator( + dateOutOfRangeMessage, getRangeStart(resolution), + getRangeEnd(resolution), null); + addValidator(currentRangeValidator); } - - currentRangeValidator = new DateRangeValidator(dateOutOfRangeMessage, - getRangeStart(resolution), getRangeEnd(resolution), null); - - addValidator(currentRangeValidator); - } /** diff --git a/server/tests/src/com/vaadin/tests/server/component/datefield/DateFieldConverterTest.java b/server/tests/src/com/vaadin/tests/server/component/datefield/DateFieldConverterTest.java new file mode 100644 index 0000000000..25ee0a38a9 --- /dev/null +++ b/server/tests/src/com/vaadin/tests/server/component/datefield/DateFieldConverterTest.java @@ -0,0 +1,77 @@ +/* + * Copyright 2000-2013 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.server.component.datefield; + +import java.util.Date; +import java.util.Locale; + +import junit.framework.TestCase; + +import com.vaadin.data.Property; +import com.vaadin.data.util.ObjectProperty; +import com.vaadin.data.util.converter.Converter; +import com.vaadin.shared.ui.datefield.Resolution; +import com.vaadin.ui.DateField; + +public class DateFieldConverterTest extends TestCase { + + private Property date; + private DateField datefield; + + @Override + public void setUp() { + date = new ObjectProperty(0L); + datefield = new DateField(); + datefield.setBuffered(false); + datefield.setConverter(new Converter() { + + @Override + public Long convertToModel(Date value, + Class targetType, Locale locale) + throws ConversionException { + return value.getTime(); + } + + @Override + public Date convertToPresentation(Long value, + Class targetType, Locale locale) + throws ConversionException { + return new Date(value); + } + + @Override + public Class getModelType() { + return Long.class; + } + + @Override + public Class getPresentationType() { + return Date.class; + } + }); + datefield.setPropertyDataSource(date); + } + + /* + * See #12193. + */ + public void testResolution() { + datefield.setValue(new Date(110, 0, 1)); + datefield.setResolution(Resolution.MINUTE); + datefield.validate(); + } +} -- cgit v1.2.3