Moved Version class to com.vaadin.shared (#4617)

3 files changed, 2 insertions, 76 deletions

diff --git a/server/src/com/vaadin/Version.java b/server/src/com/vaadin/Version.java
deleted file mode 100644
index eb6d73e7e0..0000000000
--- a/server/src/com/vaadin/Version.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-@VaadinApache2LicenseForJavaFiles@
- */
-package com.vaadin;
-
-import java.io.Serializable;
-
-public class Version implements Serializable {
-    /**
-     * The version number of this release. For example "6.2.0". Always in the
-     * format "major.minor.revision[.build]". The build part is optional. All of
-     * major, minor, revision must be integers.
-     */
-    private static final String VERSION;
-    /**
-     * Major version number. For example 6 in 6.2.0.
-     */
-    private static final int VERSION_MAJOR;
-
-    /**
-     * Minor version number. For example 2 in 6.2.0.
-     */
-    private static final int VERSION_MINOR;
-
-    /**
-     * Version revision number. For example 0 in 6.2.0.
-     */
-    private static final int VERSION_REVISION;
-
-    /**
-     * Build identifier. For example "nightly-20091123-c9963" in
-     * 6.2.0.nightly-20091123-c9963.
-     */
-    private static final String VERSION_BUILD;
-
-    /* Initialize version numbers from string replaced by build-script. */
-    static {
-        if ("@VERSION@".equals("@" + "VERSION" + "@")) {
-            VERSION = "9.9.9.INTERNAL-DEBUG-BUILD";
-        } else {
-            VERSION = "@VERSION@";
-        }
-        final String[] digits = VERSION.split("\\.", 4);
-        VERSION_MAJOR = Integer.parseInt(digits[0]);
-        VERSION_MINOR = Integer.parseInt(digits[1]);
-        VERSION_REVISION = Integer.parseInt(digits[2]);
-        if (digits.length == 4) {
-            VERSION_BUILD = digits[3];
-        } else {
-            VERSION_BUILD = "";
-        }
-    }
-
-    public static String getFullVersion() {
-        return VERSION;
-    }
-
-    public static int getMajorVersion() {
-        return VERSION_MAJOR;
-    }
-
-    public static int getMinorVersion() {
-        return VERSION_MINOR;
-    }
-
-    public static int getRevision() {
-        return VERSION_REVISION;
-    }
-
-    public static String getBuildIdentifier() {
-        return VERSION_BUILD;
-    }
-
-}
diff --git a/server/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java b/server/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
index 3143ba2e35..cfcfc64964 100644
--- a/server/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
+++ b/server/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
@@ -49,7 +49,6 @@ import javax.servlet.http.HttpServletResponse;
 import com.vaadin.Application;
 import com.vaadin.Application.SystemMessages;
 import com.vaadin.RootRequiresMoreInformationException;
-import com.vaadin.Version;
 import com.vaadin.annotations.JavaScript;
 import com.vaadin.annotations.StyleSheet;
 import com.vaadin.external.json.JSONArray;
@@ -57,6 +56,7 @@ import com.vaadin.external.json.JSONException;
 import com.vaadin.external.json.JSONObject;
 import com.vaadin.shared.ApplicationConstants;
 import com.vaadin.shared.Connector;
+import com.vaadin.shared.Version;
 import com.vaadin.shared.communication.MethodInvocation;
 import com.vaadin.shared.communication.SharedState;
 import com.vaadin.shared.communication.UidlValue;
diff --git a/server/src/com/vaadin/terminal/gwt/server/BootstrapHandler.java b/server/src/com/vaadin/terminal/gwt/server/BootstrapHandler.java
index b308d628ce..069bf52e71 100644
--- a/server/src/com/vaadin/terminal/gwt/server/BootstrapHandler.java
+++ b/server/src/com/vaadin/terminal/gwt/server/BootstrapHandler.java
@@ -26,10 +26,10 @@ import org.jsoup.parser.Tag;
 
 import com.vaadin.Application;
 import com.vaadin.RootRequiresMoreInformationException;
-import com.vaadin.Version;
 import com.vaadin.external.json.JSONException;
 import com.vaadin.external.json.JSONObject;
 import com.vaadin.shared.ApplicationConstants;
+import com.vaadin.shared.Version;
 import com.vaadin.terminal.DeploymentConfiguration;
 import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.RequestHandler;