Browse Source

Remove Application.getVersion() (#9402)

tags/7.0.0.beta1
Leif Åstrand 11 years ago
parent
commit
55afccf800

+ 0
- 16
client/src/com/vaadin/client/ApplicationConfiguration.java View File

@@ -153,18 +153,6 @@ public class ApplicationConfiguration implements EntryPoint {
return this.getConfig("versionInfo").vaadinVersion;
}-*/;

/**
* Gets the version of the application running on the server.
*
* @return a string with the application version
*
* @see com.vaadin.Application#getVersion()
*/
private native String getApplicationVersion()
/*-{
return this.getConfig("versionInfo").applicationVersion;
}-*/;

private native String getUIDL()
/*-{
return this.getConfig("uidl");
@@ -393,10 +381,6 @@ public class ApplicationConfiguration implements EntryPoint {
return getJsoConfiguration(id).getVaadinVersion();
}

public String getApplicationVersion() {
return getJsoConfiguration(id).getApplicationVersion();
}

public Class<? extends ServerConnector> getConnectorClassByEncodedTag(
int tag) {
Class<? extends ServerConnector> type = classes.get(tag);

+ 0
- 1
client/src/com/vaadin/client/ApplicationConnection.java View File

@@ -264,7 +264,6 @@ public class ApplicationConnection {

VConsole.log("Vaadin application servlet version: "
+ cnf.getServletVersion());
VConsole.log("Application version: " + cnf.getApplicationVersion());

if (!cnf.getServletVersion().equals(Version.getFullVersion())) {
VConsole.error("Warning: your widget set seems to be built with a different "

+ 3
- 14
server/src/com/vaadin/Application.java View File

@@ -61,10 +61,10 @@ import com.vaadin.server.CombinedRequest;
import com.vaadin.server.DeploymentConfiguration;
import com.vaadin.server.GlobalResourceHandler;
import com.vaadin.server.RequestHandler;
import com.vaadin.server.ServletApplicationContext;
import com.vaadin.server.Terminal;
import com.vaadin.server.UIProvider;
import com.vaadin.server.VariableOwner;
import com.vaadin.server.ServletApplicationContext;
import com.vaadin.server.WrappedRequest;
import com.vaadin.server.WrappedRequest.BrowserDetails;
import com.vaadin.server.WrappedResponse;
@@ -867,8 +867,8 @@ public class Application implements Terminal.ErrorListener, Serializable {
* </p>
* <p>
* By default, when you are deploying your application to a servlet
* container, the implementation class is {@link ServletApplicationContext} -
* you can safely cast to this class and use the methods from there. When
* container, the implementation class is {@link ServletApplicationContext}
* - you can safely cast to this class and use the methods from there. When
* you are deploying your application as a portlet, context implementation
* is {@link PortletApplicationContext}.
* </p>
@@ -879,17 +879,6 @@ public class Application implements Terminal.ErrorListener, Serializable {
return context;
}

/**
* Override this method to return correct version number of your
* Application. Version information is delivered for example to Testing
* Tools test results. By default this returns a string "NONVERSIONED".
*
* @return version string
*/
public String getVersion() {
return "NONVERSIONED";
}

/**
* Gets the application error handler.
*

+ 0
- 1
server/src/com/vaadin/server/BootstrapHandler.java View File

@@ -401,7 +401,6 @@ public abstract class BootstrapHandler implements RequestHandler {

JSONObject versionInfo = new JSONObject();
versionInfo.put("vaadinVersion", Version.getFullVersion());
versionInfo.put("applicationVersion", application.getVersion());
appConfig.put("versionInfo", versionInfo);

appConfig.put("widgetset", context.getWidgetsetName());

Loading…
Cancel
Save