summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenri Sara <hesara@vaadin.com>2017-03-21 09:55:59 +0200
committerHenri Sara <henri.sara@gmail.com>2017-03-21 10:31:59 +0200
commit627f7a111c024eb64543b8eef99e4b2ea8dc3bce (patch)
tree9eb41bb798169e8892b365c208db445ab609dceb
parentdf56703f05b751e33ea447f537abe50120ddea23 (diff)
downloadvaadin-framework-627f7a111c024eb64543b8eef99e4b2ea8dc3bce.tar.gz
vaadin-framework-627f7a111c024eb64543b8eef99e4b2ea8dc3bce.zip
Add more 8.0.3 since tags
-rw-r--r--server/src/main/java/com/vaadin/navigator/Navigator.java18
-rw-r--r--server/src/main/java/com/vaadin/server/BootstrapHandler.java3
-rw-r--r--server/src/main/java/com/vaadin/ui/components/grid/EditorCancelEvent.java9
-rw-r--r--server/src/main/java/com/vaadin/ui/components/grid/EditorSaveEvent.java9
-rw-r--r--shared/src/main/java/com/vaadin/shared/ApplicationConstants.java4
5 files changed, 29 insertions, 14 deletions
diff --git a/server/src/main/java/com/vaadin/navigator/Navigator.java b/server/src/main/java/com/vaadin/navigator/Navigator.java
index e05244f02a..83f1dbe739 100644
--- a/server/src/main/java/com/vaadin/navigator/Navigator.java
+++ b/server/src/main/java/com/vaadin/navigator/Navigator.java
@@ -350,20 +350,26 @@ public class Navigator implements Serializable {
/**
* The {@link UI} bound with the Navigator.
+ *
+ * @since 8.0.3
*/
protected UI ui;
-
+
/**
- * The {@link NavigationStateManager} that is used to get, listen to
- * and manipulate the navigation state used by the Navigator.
+ * The {@link NavigationStateManager} that is used to get, listen to and
+ * manipulate the navigation state used by the Navigator.
+ *
+ * @since 8.0.3
*/
protected NavigationStateManager stateManager;
-
+
/**
- * The {@link ViewDisplay} used by the Navigator.
+ * The {@link ViewDisplay} used by the Navigator.
+ *
+ * @since 8.0.3
*/
protected ViewDisplay display;
-
+
private View currentView = null;
private List<ViewChangeListener> listeners = new LinkedList<>();
private List<ViewProvider> providers = new LinkedList<>();
diff --git a/server/src/main/java/com/vaadin/server/BootstrapHandler.java b/server/src/main/java/com/vaadin/server/BootstrapHandler.java
index 02a8d7ba84..81ffb2fe23 100644
--- a/server/src/main/java/com/vaadin/server/BootstrapHandler.java
+++ b/server/src/main/java/com/vaadin/server/BootstrapHandler.java
@@ -733,6 +733,9 @@ public abstract class BootstrapHandler extends SynchronizedRequestHandler {
return appConfig;
}
+ /**
+ * @since 8.0.3
+ */
protected abstract String getContextRootPath(BootstrapContext context);
protected abstract String getServiceUrl(BootstrapContext context);
diff --git a/server/src/main/java/com/vaadin/ui/components/grid/EditorCancelEvent.java b/server/src/main/java/com/vaadin/ui/components/grid/EditorCancelEvent.java
index a698687900..329b3d7f52 100644
--- a/server/src/main/java/com/vaadin/ui/components/grid/EditorCancelEvent.java
+++ b/server/src/main/java/com/vaadin/ui/components/grid/EditorCancelEvent.java
@@ -21,10 +21,10 @@ import com.vaadin.ui.Grid;
/**
* An event that is fired when a Grid editor is cancelled.
- *
+ *
* @author Vaadin Ltd
* @since 8.0
- *
+ *
* @see EditorCancelListener
* @see Editor#addCancelListener(EditorCancelListener)
*
@@ -37,7 +37,7 @@ public class EditorCancelEvent<T> extends EventObject {
/**
* Constructor for a editor cancel event.
- *
+ *
* @param editor
* the source of the event
* @param bean
@@ -56,7 +56,7 @@ public class EditorCancelEvent<T> extends EventObject {
/**
* Gets the editors' grid.
- *
+ *
* @return the editors' grid
*/
public Grid<T> getGrid() {
@@ -67,6 +67,7 @@ public class EditorCancelEvent<T> extends EventObject {
* Gets the bean being edited.
*
* @return the bean being edited
+ * @since 8.0.3
*/
public T getBean() {
return bean;
diff --git a/server/src/main/java/com/vaadin/ui/components/grid/EditorSaveEvent.java b/server/src/main/java/com/vaadin/ui/components/grid/EditorSaveEvent.java
index 44a58a900f..45cc713430 100644
--- a/server/src/main/java/com/vaadin/ui/components/grid/EditorSaveEvent.java
+++ b/server/src/main/java/com/vaadin/ui/components/grid/EditorSaveEvent.java
@@ -21,10 +21,10 @@ import com.vaadin.ui.Grid;
/**
* An event that is fired when a Grid editor is saved.
- *
+ *
* @author Vaadin Ltd
* @since 8.0
- *
+ *
* @see EditorSaveListener
* @see Editor#addSaveListener(EditorSaveListener)
*
@@ -37,7 +37,7 @@ public class EditorSaveEvent<T> extends EventObject {
/**
* Constructor for a editor save event.
- *
+ *
* @param editor
* the source of the event
* @param bean
@@ -56,7 +56,7 @@ public class EditorSaveEvent<T> extends EventObject {
/**
* Gets the editors' grid.
- *
+ *
* @return the editors' grid
*/
public Grid<T> getGrid() {
@@ -67,6 +67,7 @@ public class EditorSaveEvent<T> extends EventObject {
* Gets the bean being edited.
*
* @return the bean being edited
+ * @since 8.0.3
*/
public T getBean() {
return bean;
diff --git a/shared/src/main/java/com/vaadin/shared/ApplicationConstants.java b/shared/src/main/java/com/vaadin/shared/ApplicationConstants.java
index 8cf30e43b5..3a2b8b2b13 100644
--- a/shared/src/main/java/com/vaadin/shared/ApplicationConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ApplicationConstants.java
@@ -37,6 +37,8 @@ public class ApplicationConstants implements Serializable {
public static final String VAADIN_PROTOCOL_PREFIX = "vaadin://";
/**
* An internal protocol used for referencing the application context path.
+ *
+ * @since 8.0.3
*/
public static final String CONTEXT_PROTOCOL_PREFIX = "context://";
public static final String FONTICON_PROTOCOL_PREFIX = "fonticon://";
@@ -78,6 +80,8 @@ public class ApplicationConstants implements Serializable {
/**
* Configuration parameter giving the (in some cases relative) URL to the
* web application context root.
+ *
+ * @since 8.0.3
*/
public static final String CONTEXT_ROOT_URL = "contextRootUrl";