diff options
Diffstat (limited to 'client')
3 files changed, 3 insertions, 20 deletions
diff --git a/client/src/com/vaadin/client/ApplicationConfiguration.java b/client/src/com/vaadin/client/ApplicationConfiguration.java index e364facb43..f620a39a70 100644 --- a/client/src/com/vaadin/client/ApplicationConfiguration.java +++ b/client/src/com/vaadin/client/ApplicationConfiguration.java @@ -146,25 +146,13 @@ public class ApplicationConfiguration implements EntryPoint { * * @return a string with the version * - * @see com.vaadin.server.AbstractApplicationServlet#VERSION + * @see com.vaadin.server.VaadinServlet#VERSION */ private native String getVaadinVersion() /*-{ 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); diff --git a/client/src/com/vaadin/client/ApplicationConnection.java b/client/src/com/vaadin/client/ApplicationConnection.java index 88510e7bf6..6a1474fa45 100644 --- a/client/src/com/vaadin/client/ApplicationConnection.java +++ b/client/src/com/vaadin/client/ApplicationConnection.java @@ -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 " diff --git a/client/src/com/vaadin/client/ui/AbstractComponentConnector.java b/client/src/com/vaadin/client/ui/AbstractComponentConnector.java index a17c3bc514..f461b775db 100644 --- a/client/src/com/vaadin/client/ui/AbstractComponentConnector.java +++ b/client/src/com/vaadin/client/ui/AbstractComponentConnector.java @@ -240,12 +240,12 @@ implements ComponentConnector { @Override public boolean isUndefinedHeight() { - return getState().height == null || getState().height.length() == 0; + return ComponentStateUtil.isUndefinedHeight(getState()); } @Override public boolean isUndefinedWidth() { - return getState().width == null && getState().width.length() == 0; + return ComponentStateUtil.isUndefinedWidth(getState()); } /* |