summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenri Sara <henri.sara@gmail.com>2017-04-27 13:46:05 +0300
committerIlia Motornyi <elmot@vaadin.com>2017-04-27 13:46:05 +0300
commitac73dd5197d2d7e58f1f069e2c28c658498c8cbe (patch)
treedc38538598752439ca7b463f4625426ec718f487
parenta1d5d964815cd2acc7516be73d0649c87070e3fd (diff)
downloadvaadin-framework-ac73dd5197d2d7e58f1f069e2c28c658498c8cbe.tar.gz
vaadin-framework-ac73dd5197d2d7e58f1f069e2c28c658498c8cbe.zip
Add since tags for 8.1
-rw-r--r--client/src/main/java/com/vaadin/client/ApplicationConfiguration.java1
-rw-r--r--client/src/main/java/com/vaadin/client/BrowserInfo.java7
-rw-r--r--client/src/main/java/com/vaadin/client/ui/VNativeSelect.java4
-rw-r--r--server/src/main/java/com/vaadin/server/WebBrowser.java1
-rw-r--r--server/src/main/java/com/vaadin/server/osgi/BootstrapContribution.java13
-rw-r--r--server/src/main/java/com/vaadin/ui/NativeSelect.java4
-rw-r--r--shared/src/main/java/com/vaadin/shared/ApplicationConstants.java17
-rw-r--r--shared/src/main/java/com/vaadin/shared/VBrowserDetails.java8
-rw-r--r--shared/src/main/java/com/vaadin/shared/VaadinUriResolver.java1
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/nativeselect/NativeSelectState.java6
10 files changed, 55 insertions, 7 deletions
diff --git a/client/src/main/java/com/vaadin/client/ApplicationConfiguration.java b/client/src/main/java/com/vaadin/client/ApplicationConfiguration.java
index bf521a198c..3065a8a097 100644
--- a/client/src/main/java/com/vaadin/client/ApplicationConfiguration.java
+++ b/client/src/main/java/com/vaadin/client/ApplicationConfiguration.java
@@ -345,6 +345,7 @@ public class ApplicationConfiguration implements EntryPoint {
* resolve to.
*
* @return the URL of the frontend protocol
+ * @since 8.1
*/
public String getFrontendUrl() {
return frontendUrl;
diff --git a/client/src/main/java/com/vaadin/client/BrowserInfo.java b/client/src/main/java/com/vaadin/client/BrowserInfo.java
index 7c5c4c8fd0..1cbbb2145d 100644
--- a/client/src/main/java/com/vaadin/client/BrowserInfo.java
+++ b/client/src/main/java/com/vaadin/client/BrowserInfo.java
@@ -253,6 +253,13 @@ public class BrowserInfo {
return browserDetails.isSafari();
}
+ /**
+ * Returns true if the browser is Safari or is a browser that is running on
+ * iOS and using the Safari rendering engine.
+ *
+ * @return true if the browser is using the Safari rendering engine
+ * @since 8.1
+ */
public boolean isSafariOrIOS() {
return browserDetails.isSafariOrIOS();
}
diff --git a/client/src/main/java/com/vaadin/client/ui/VNativeSelect.java b/client/src/main/java/com/vaadin/client/ui/VNativeSelect.java
index 80fc27ab98..a7e3097bdf 100644
--- a/client/src/main/java/com/vaadin/client/ui/VNativeSelect.java
+++ b/client/src/main/java/com/vaadin/client/ui/VNativeSelect.java
@@ -115,7 +115,7 @@ public class VNativeSelect extends FocusableFlowPanelComposite
* Sets the number of items that are visible. If only one item is visible,
* then the box will be displayed as a drop-down list (the default).
*
- * @since
+ * @since 8.1
* @param visibleItemCount
* the visible item count
*/
@@ -127,7 +127,7 @@ public class VNativeSelect extends FocusableFlowPanelComposite
* Gets the number of items that are visible. If only one item is visible,
* then the box will be displayed as a drop-down list.
*
- * @since
+ * @since 8.1
* @return the visible item count
*/
public int getVisibleItemCount() {
diff --git a/server/src/main/java/com/vaadin/server/WebBrowser.java b/server/src/main/java/com/vaadin/server/WebBrowser.java
index badc27c323..82f5e2df79 100644
--- a/server/src/main/java/com/vaadin/server/WebBrowser.java
+++ b/server/src/main/java/com/vaadin/server/WebBrowser.java
@@ -545,6 +545,7 @@ public class WebBrowser implements Serializable {
*
* @return <code>true</code> if the browser supports ES6, <code>false</code>
* otherwise.
+ * @since 8.1
*/
public boolean isEs6Supported() {
if (browserDetails == null) {
diff --git a/server/src/main/java/com/vaadin/server/osgi/BootstrapContribution.java b/server/src/main/java/com/vaadin/server/osgi/BootstrapContribution.java
index 0a320ed6e5..c68ed518ba 100644
--- a/server/src/main/java/com/vaadin/server/osgi/BootstrapContribution.java
+++ b/server/src/main/java/com/vaadin/server/osgi/BootstrapContribution.java
@@ -22,9 +22,16 @@ import org.osgi.service.http.HttpService;
import org.osgi.service.http.NamespaceException;
import com.vaadin.osgi.resources.OSGiVaadinResources;
-import com.vaadin.osgi.resources.VaadinResourceService;
import com.vaadin.osgi.resources.OSGiVaadinResources.ResourceBundleInactiveException;
+import com.vaadin.osgi.resources.VaadinResourceService;
+/**
+ * OSGi service component registering bootstrap JS as published resources in
+ * OSGi environments.
+ *
+ * @author Vaadin Ltd
+ * @since 8.1
+ */
@Component(immediate = true)
public class BootstrapContribution {
private static final String[] RESOURCES = { "vaadinBootstrap.js",
@@ -41,10 +48,10 @@ public class BootstrapContribution {
@Reference
void setHttpService(HttpService service) {
- this.httpService = service;
+ httpService = service;
}
void unsetHttpService(HttpService service) {
- this.httpService = null;
+ httpService = null;
}
}
diff --git a/server/src/main/java/com/vaadin/ui/NativeSelect.java b/server/src/main/java/com/vaadin/ui/NativeSelect.java
index a0d5741262..9800ba62df 100644
--- a/server/src/main/java/com/vaadin/ui/NativeSelect.java
+++ b/server/src/main/java/com/vaadin/ui/NativeSelect.java
@@ -208,7 +208,7 @@ public class NativeSelect<T> extends AbstractSingleSelect<T>
* Sets the number of items that are visible. If only one item is visible,
* then the box will be displayed as a drop-down list (the default).
*
- * @since
+ * @since 8.1
* @param visibleItemCount
* the visible item count
* @throws IllegalArgumentException
@@ -226,7 +226,7 @@ public class NativeSelect<T> extends AbstractSingleSelect<T>
* Gets the number of items that are visible. If only one item is visible,
* then the box will be displayed as a drop-down list.
*
- * @since
+ * @since 8.1
* @return the visible item count
*/
public int getVisibleItemCount() {
diff --git a/shared/src/main/java/com/vaadin/shared/ApplicationConstants.java b/shared/src/main/java/com/vaadin/shared/ApplicationConstants.java
index 286cd07760..963353dcd8 100644
--- a/shared/src/main/java/com/vaadin/shared/ApplicationConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ApplicationConstants.java
@@ -45,6 +45,13 @@ public class ApplicationConstants implements Serializable {
public static final String PUBLISHED_PROTOCOL_NAME = "published";
public static final String PUBLISHED_PROTOCOL_PREFIX = PUBLISHED_PROTOCOL_NAME
+ "://";
+ /**
+ * An internal protocol used for referencing frontend resources.
+ *
+ * @see #FRONTEND_URL
+ *
+ * @since 8.1
+ */
public static final String FRONTEND_PROTOCOL_PREFIX = "frontend://";
/**
@@ -106,6 +113,8 @@ public class ApplicationConstants implements Serializable {
* <p>
* By default, this is "vaadin://es6" ("vaadin://es5" for browsers which
* does not support ES6).
+ *
+ * @since 8.1
*/
public static final String FRONTEND_URL = "frontendUrl";
@@ -199,18 +208,24 @@ public class ApplicationConstants implements Serializable {
/**
* Configuration name for the {@literal frontend://} URL when using a
* browser which is not ES6 compatible (i.e. IE11 or Safari 9).
+ *
+ * @since 8.1
*/
public static final String FRONTEND_URL_ES5 = "frontend.url.es5";
/**
* Configuration name for the {@literal frontend://} URL when using an ES6
* compatible browser.
+ *
+ * @since 8.1
*/
public static final String FRONTEND_URL_ES6 = "frontend.url.es6";
/**
* Default value of the configuration of the build URL of ES6 web
* components.
+ *
+ * @since 8.1
*/
public static final String FRONTEND_URL_ES6_DEFAULT_VALUE = VAADIN_PROTOCOL_PREFIX
+ "frontend/es6/";
@@ -218,6 +233,8 @@ public class ApplicationConstants implements Serializable {
/**
* Default value of the configuration of the build URL of ES5 web
* components.
+ *
+ * @since 8.1
*/
public static final String FRONTEND_URL_ES5_DEFAULT_VALUE = VAADIN_PROTOCOL_PREFIX
+ "frontend/es5/";
diff --git a/shared/src/main/java/com/vaadin/shared/VBrowserDetails.java b/shared/src/main/java/com/vaadin/shared/VBrowserDetails.java
index 4fac5db636..6933d32326 100644
--- a/shared/src/main/java/com/vaadin/shared/VBrowserDetails.java
+++ b/shared/src/main/java/com/vaadin/shared/VBrowserDetails.java
@@ -365,6 +365,7 @@ public class VBrowserDetails implements Serializable {
* iOS).
*
* @return true if it is Safari or running on IOS, false otherwise
+ * @since 8.1
*/
public boolean isSafariOrIOS() {
return isSafari() || isIOS();
@@ -602,6 +603,13 @@ public class VBrowserDetails implements Serializable {
return false;
}
+ /**
+ * Checks whether the browser should support ES6 based on its vendor and
+ * version number.
+ *
+ * @return true if the browser supports ES6
+ * @since 8.1
+ */
public boolean isEs6Supported() {
if (isTooOldToFunctionProperly()) {
return false;
diff --git a/shared/src/main/java/com/vaadin/shared/VaadinUriResolver.java b/shared/src/main/java/com/vaadin/shared/VaadinUriResolver.java
index 6c02028d8b..e8ec60b14b 100644
--- a/shared/src/main/java/com/vaadin/shared/VaadinUriResolver.java
+++ b/shared/src/main/java/com/vaadin/shared/VaadinUriResolver.java
@@ -189,6 +189,7 @@ public abstract class VaadinUriResolver implements Serializable {
*
* @return the absolute or relative URL to the frontend files, ending with a
* slash '/'
+ * @since 8.1
*/
protected abstract String getFrontendUrl();
}
diff --git a/shared/src/main/java/com/vaadin/shared/ui/nativeselect/NativeSelectState.java b/shared/src/main/java/com/vaadin/shared/ui/nativeselect/NativeSelectState.java
index 86872298e6..450b69db67 100644
--- a/shared/src/main/java/com/vaadin/shared/ui/nativeselect/NativeSelectState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/nativeselect/NativeSelectState.java
@@ -44,6 +44,12 @@ public class NativeSelectState extends AbstractSingleSelectState {
*/
public String emptySelectionCaption = "";
+ /**
+ * The number of items that are visible. If only one item is visible, then
+ * the box will be displayed as a drop-down list.
+ *
+ * @since 8.1
+ */
@DelegateToWidget
public int visibleItemCount = 1;