Merge remote-tracking branch 'origin/master' into grid

Conflicts:
	WebContent/release-notes.html

Change-Id: Ie05bea7142134a7a9d655fcdf6ca232fd13c742b

3 files changed, 29 insertions, 8 deletions

diff --git a/shared/src/com/vaadin/shared/ApplicationConstants.java b/shared/src/com/vaadin/shared/ApplicationConstants.java
index 15eefe3b21..44c972462a 100644
--- a/shared/src/com/vaadin/shared/ApplicationConstants.java
+++ b/shared/src/com/vaadin/shared/ApplicationConstants.java
@@ -78,6 +78,14 @@ public class ApplicationConstants implements Serializable {
     public static final String VAADIN_DIR_URL = "vaadinDir";
 
     /**
+     * The name of the javascript containing the bootstrap code. The file is
+     * located in the VAADIN directory.
+     *
+     * @since 7.3
+     */
+    public static final String VAADIN_BOOTSTRAP_JS = "vaadinBootstrap.js";
+
+    /**
      * The name of the javascript containing push support. The file is located
      * in the VAADIN directory.
      */
diff --git a/shared/src/com/vaadin/shared/ui/ui/UIState.java b/shared/src/com/vaadin/shared/ui/ui/UIState.java
index 3c3785b7d5..2f51fef6ee 100644
--- a/shared/src/com/vaadin/shared/ui/ui/UIState.java
+++ b/shared/src/com/vaadin/shared/ui/ui/UIState.java
@@ -62,6 +62,12 @@ public class UIState extends TabIndexState {
      * Configuration for the push channel
      */
     public PushConfigurationState pushConfiguration = new PushConfigurationState();
+    /**
+     * Currently used theme.
+     * 
+     * @since 7.3
+     */
+    public String theme;
     {
         primaryStyleName = "v-ui";
         // Default is 1 for legacy reasons
@@ -95,7 +101,7 @@ public class UIState extends TabIndexState {
                 NotificationRole role) {
             this.prefix = prefix;
             this.postfix = postfix;
-            this.notificationRole = role;
+            notificationRole = role;
         }
     }
 
diff --git a/shared/src/com/vaadin/shared/util/SharedUtil.java b/shared/src/com/vaadin/shared/util/SharedUtil.java
index 497a8cab01..7276f418fa 100644
--- a/shared/src/com/vaadin/shared/util/SharedUtil.java
+++ b/shared/src/com/vaadin/shared/util/SharedUtil.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 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
@@ -19,17 +19,17 @@ import java.io.Serializable;
 
 /**
  * Misc internal utility methods used by both the server and the client package.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.1
- * 
+ *
  */
 public class SharedUtil implements Serializable {
     /**
      * Checks if a and b are equals using {@link #equals(Object)}. Handles null
      * values as well. Does not ensure that objects are of the same type.
      * Assumes that the first object's equals method handle equals properly.
-     * 
+     *
      * @param o1
      *            The first value to compare
      * @param o2
@@ -46,11 +46,18 @@ public class SharedUtil implements Serializable {
 
     /**
      * Trims trailing slashes (if any) from a string.
-     * @param value The string value to be trimmed. Cannot be null.
+     *
+     * @param value
+     *            The string value to be trimmed. Cannot be null.
      * @return String value without trailing slashes.
      */
     public static String trimTrailingSlashes(String value) {
         return value.replaceAll("/*$", "");
     }
 
+    /**
+     * RegEx pattern to extract the width/height values.
+     */
+    public static final String SIZE_PATTERN = "^(-?\\d*(?:\\.\\d+)?)(%|px|em|rem|ex|in|cm|mm|pt|pc)?$";
+
 }