Use shared Version in client side also (#4617)

3 files changed, 7 insertions, 21 deletions

diff --git a/client/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java b/client/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
index ae5e8ed42e..2af000f6ec 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
+++ b/client/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
@@ -182,20 +182,6 @@ public class ApplicationConfiguration implements EntryPoint {
         }-*/;
     }
 
-    /**
-     * Builds number. For example 0-custom_tag in 5.0.0-custom_tag.
-     */
-    public static final String VERSION;
-
-    /* Initialize version numbers from string replaced by build-script. */
-    static {
-        if ("@VERSION@".equals("@" + "VERSION" + "@")) {
-            VERSION = "9.9.9.INTERNAL-DEBUG-BUILD";
-        } else {
-            VERSION = "@VERSION@";
-        }
-    }
-
     private static WidgetSet widgetSet = GWT.create(WidgetSet.class);
 
     private String id;
diff --git a/client/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java b/client/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
index 906e1292a0..2e0e32210b 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
+++ b/client/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
@@ -41,6 +41,7 @@ import com.google.gwt.user.client.ui.HasWidgets;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.shared.ApplicationConstants;
 import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.Version;
 import com.vaadin.shared.communication.MethodInvocation;
 import com.vaadin.shared.communication.SharedState;
 import com.vaadin.shared.communication.UidlValue;
@@ -196,7 +197,7 @@ public class ApplicationConnection {
                 + cnf.getServletVersion());
         VConsole.log("Application version: " + cnf.getApplicationVersion());
 
-        if (!cnf.getServletVersion().equals(ApplicationConfiguration.VERSION)) {
+        if (!cnf.getServletVersion().equals(Version.getFullVersion())) {
             VConsole.error("Warning: your widget set seems to be built with a different "
                     + "version than the one used on server. Unexpected "
                     + "behavior may occur.");
@@ -1818,7 +1819,7 @@ public class ApplicationConnection {
             if (!extraParams.isEmpty()) {
                 extraParams += "&";
             }
-            String widgetsetVersion = ApplicationConfiguration.VERSION;
+            String widgetsetVersion = Version.getFullVersion();
             extraParams += "wsver=" + widgetsetVersion;
 
             getConfiguration().setWidgetsetVersionSent();
diff --git a/client/src/com/vaadin/terminal/gwt/client/VDebugConsole.java b/client/src/com/vaadin/terminal/gwt/client/VDebugConsole.java
index 5753e032d4..0d2855807c 100644
--- a/client/src/com/vaadin/terminal/gwt/client/VDebugConsole.java
+++ b/client/src/com/vaadin/terminal/gwt/client/VDebugConsole.java
@@ -55,6 +55,7 @@ import com.google.gwt.user.client.ui.Panel;
 import com.google.gwt.user.client.ui.RootPanel;
 import com.google.gwt.user.client.ui.VerticalPanel;
 import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.shared.Version;
 import com.vaadin.terminal.gwt.client.ui.VLazyExecutor;
 import com.vaadin.terminal.gwt.client.ui.VOverlay;
 import com.vaadin.terminal.gwt.client.ui.notification.VNotification;
@@ -851,13 +852,11 @@ public class VDebugConsole extends VOverlay implements Console {
         log("Starting Vaadin client side engine. Widgetset: "
                 + GWT.getModuleName());
 
-        log("Widget set is built on version: "
-                + ApplicationConfiguration.VERSION);
+        log("Widget set is built on version: " + Version.getFullVersion());
 
         logToDebugWindow("<div class=\"v-theme-version v-theme-version-"
-                + ApplicationConfiguration.VERSION.replaceAll("\\.", "_")
-                + "\">Warning: widgetset version "
-                + ApplicationConfiguration.VERSION
+                + Version.getFullVersion().replaceAll("\\.", "_")
+                + "\">Warning: widgetset version " + Version.getFullVersion()
                 + " does not seem to match theme version </div>", true);
 
     }