summaryrefslogtreecommitdiffstats
path: root/shared
diff options
context:
space:
mode:
authorTeemu Suo-Anttila <teemusa@vaadin.com>2014-11-14 11:26:22 +0200
committerTeemu Suo-Anttila <teemusa@vaadin.com>2014-11-14 11:27:32 +0200
commitd1cd6ffce4a3107f869f9d9256ca105d718f3e46 (patch)
tree08789066be9deb5162ad83ff3b766ea2d4c4812d /shared
parent1ac8b6bff007d997bf2cfc69954e69d8fa65e119 (diff)
parentee6f9483f36eeeecf32730016d02fb22e5cbaab3 (diff)
downloadvaadin-framework-d1cd6ffce4a3107f869f9d9256ca105d718f3e46.tar.gz
vaadin-framework-d1cd6ffce4a3107f869f9d9256ca105d718f3e46.zip
Merge remote-tracking branch 'origin/master' into grid
Change-Id: Iec61d9242be530edbb76ba952746ba0f9c9bd966
Diffstat (limited to 'shared')
-rw-r--r--shared/build.xml2
-rw-r--r--shared/src/com/vaadin/shared/VBrowserDetails.java6
-rw-r--r--shared/src/com/vaadin/shared/ui/calendar/CalendarState.java1
3 files changed, 6 insertions, 3 deletions
diff --git a/shared/build.xml b/shared/build.xml
index 197f63c027..1e7e788be5 100644
--- a/shared/build.xml
+++ b/shared/build.xml
@@ -18,7 +18,7 @@
<path id="classpath.test.custom" />
<target name="jar">
- <property name="shared.osgi.import" value="org.json;version=&quot;0.0.20131108.vaadin1&quot;, com.google.gwt.thirdparty.guava.common.annotations;version=&quot;16.0.1.vaadin1&quot;, com.google.gwt.thirdparty.guava.common.base;version=&quot;16.0.1.vaadin1&quot;, com.google.gwt.thirdparty.guava.common.base.internal;version=&quot;16.0.1.vaadin1&quot;, com.google.gwt.thirdparty.guava.common.cache;version=&quot;16.0.1.vaadin1&quot;, com.google.gwt.thirdparty.guava.common.collect;version=&quot;16.0.1.vaadin1&quot;, com.google.gwt.thirdparty.guava.common.eventbus;version=&quot;16.0.1.vaadin1&quot;, com.google.gwt.thirdparty.guava.common.io;version=&quot;16.0.1.vaadin1&quot;, com.google.gwt.thirdparty.guava.common.net;version=&quot;16.0.1.vaadin1&quot;, com.google.gwt.thirdparty.guava.common.primitives;version=&quot;16.0.1.vaadin1&quot;, com.google.gwt.thirdparty.guava.common.util.concurrent;version=&quot;16.0.1.vaadin1&quot;, com.google.gwt.thirdparty.streamhtmlparser;version=&quot;0.0.10.vaadin1&quot;, com.google.gwt.thirdparty.streamhtmlparser.impl;version=&quot;0.0.10.vaadin1&quot;, com.google.gwt.thirdparty.streamhtmlparser.util;version=&quot;0.0.10.vaadin1&quot;, org.w3c.flute.parser;version=&quot;1.3.0.gg2&quot;, org.w3c.flute.parser.selectors;version=&quot;1.3.0.gg2&quot;, org.w3c.flute.util;version=&quot;1.3.0.gg2&quot;" />
+ <property name="shared.osgi.import" value="org.json;version=&quot;0.0.20080701&quot;, com.google.gwt.thirdparty.guava.common.annotations;version=&quot;16.0.1.vaadin1&quot;, com.google.gwt.thirdparty.guava.common.base;version=&quot;16.0.1.vaadin1&quot;, com.google.gwt.thirdparty.guava.common.base.internal;version=&quot;16.0.1.vaadin1&quot;, com.google.gwt.thirdparty.guava.common.cache;version=&quot;16.0.1.vaadin1&quot;, com.google.gwt.thirdparty.guava.common.collect;version=&quot;16.0.1.vaadin1&quot;, com.google.gwt.thirdparty.guava.common.eventbus;version=&quot;16.0.1.vaadin1&quot;, com.google.gwt.thirdparty.guava.common.io;version=&quot;16.0.1.vaadin1&quot;, com.google.gwt.thirdparty.guava.common.net;version=&quot;16.0.1.vaadin1&quot;, com.google.gwt.thirdparty.guava.common.primitives;version=&quot;16.0.1.vaadin1&quot;, com.google.gwt.thirdparty.guava.common.util.concurrent;version=&quot;16.0.1.vaadin1&quot;, com.google.gwt.thirdparty.streamhtmlparser;version=&quot;0.0.10.vaadin1&quot;, com.google.gwt.thirdparty.streamhtmlparser.impl;version=&quot;0.0.10.vaadin1&quot;, com.google.gwt.thirdparty.streamhtmlparser.util;version=&quot;0.0.10.vaadin1&quot;, org.w3c.flute.parser;version=&quot;1.3.0.gg2&quot;, org.w3c.flute.parser.selectors;version=&quot;1.3.0.gg2&quot;, org.w3c.flute.util;version=&quot;1.3.0.gg2&quot;" />
<delete dir="${src.filtered}" />
<!-- Update version in Version.java -->
<copy todir="${src.filtered}">
diff --git a/shared/src/com/vaadin/shared/VBrowserDetails.java b/shared/src/com/vaadin/shared/VBrowserDetails.java
index a85d031c49..fa21bddc96 100644
--- a/shared/src/com/vaadin/shared/VBrowserDetails.java
+++ b/shared/src/com/vaadin/shared/VBrowserDetails.java
@@ -479,7 +479,8 @@ public class VBrowserDetails implements Serializable {
/**
* Tests if the browser is run on iPhone.
*
- * @return
+ * @return true if run on iPhone, false otherwise
+ * @since 7.3.3
*/
public boolean isIPhone() {
return isIPhone;
@@ -488,7 +489,8 @@ public class VBrowserDetails implements Serializable {
/**
* Tests if the browser is run on iPad.
*
- * @return
+ * @return true if run on iPad, false otherwise
+ * @since 7.3.3
*/
public boolean isIPad() {
return isIPad;
diff --git a/shared/src/com/vaadin/shared/ui/calendar/CalendarState.java b/shared/src/com/vaadin/shared/ui/calendar/CalendarState.java
index de48f1a06a..93bd05bc1e 100644
--- a/shared/src/com/vaadin/shared/ui/calendar/CalendarState.java
+++ b/shared/src/com/vaadin/shared/ui/calendar/CalendarState.java
@@ -44,6 +44,7 @@ public class CalendarState extends AbstractComponentState {
public String localizedDateFormat;
public int dayOfWeek;
public int week;
+ public int yearOfWeek;
}
public static class Action implements java.io.Serializable {