aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatti Tahvonen <matti.tahvonen@itmill.com>2009-02-03 13:35:33 +0000
committerMatti Tahvonen <matti.tahvonen@itmill.com>2009-02-03 13:35:33 +0000
commit8c99b93ebc1080c6109b8779cf37ac282004b209 (patch)
tree4b782979773f354f72b0de174d6c583100a07fe9 /src
parenta3eade38cbfa146093a6bf4fed4fbe240e74bf38 (diff)
downloadvaadin-framework-8c99b93ebc1080c6109b8779cf37ac282004b209.tar.gz
vaadin-framework-8c99b93ebc1080c6109b8779cf37ac282004b209.zip
fixed typo, added type parameters
svn changeset:6712/svn branch:trunk
Diffstat (limited to 'src')
-rw-r--r--src/com/itmill/toolkit/terminal/gwt/client/ApplicationConfiguration.java11
-rwxr-xr-xsrc/com/itmill/toolkit/terminal/gwt/client/IDebugConsole.java4
2 files changed, 7 insertions, 8 deletions
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConfiguration.java b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConfiguration.java
index 06dee4db43..69006a81e2 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConfiguration.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConfiguration.java
@@ -131,11 +131,11 @@ public class ApplicationConfiguration {
throw new IllegalStateException(msg);
}
initedWidgetSet = widgetset;
- ArrayList appIds = new ArrayList();
+ ArrayList<String> appIds = new ArrayList<String>();
loadAppIdListFromDOM(appIds);
- for (Iterator it = appIds.iterator(); it.hasNext();) {
- String appId = (String) it.next();
+ for (Iterator<String> it = appIds.iterator(); it.hasNext();) {
+ String appId = it.next();
ApplicationConfiguration appConf = getConfigFromDOM(appId);
ApplicationConnection a = new ApplicationConnection(widgetset,
appConf);
@@ -166,9 +166,8 @@ public class ApplicationConfiguration {
return runningApplications;
}
- private native static void loadAppIdListFromDOM(ArrayList list)
+ private native static void loadAppIdListFromDOM(ArrayList<String> list)
/*-{
-
var j;
for(j in $wnd.itmill.toolkitConfigurations) {
list.@java.util.Collection::add(Ljava/lang/Object;)(j);
@@ -182,7 +181,7 @@ public class ApplicationConfiguration {
return conf;
}
- public native String getSerletVersion()
+ public native String getServletVersion()
/*-{
return this.@com.itmill.toolkit.terminal.gwt.client.ApplicationConfiguration::versionInfo.toolkitVersion;
}-*/;
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/IDebugConsole.java b/src/com/itmill/toolkit/terminal/gwt/client/IDebugConsole.java
index b4577d14f7..4418f736e0 100755
--- a/src/com/itmill/toolkit/terminal/gwt/client/IDebugConsole.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/IDebugConsole.java
@@ -169,11 +169,11 @@ public final class IDebugConsole extends IToolkitOverlay implements Console {
}
- log("Toolkit application servlet version: " + cnf.getSerletVersion());
+ log("Toolkit application servlet version: " + cnf.getServletVersion());
log("Widget set is built on version: " + VERSION);
log("Application version: " + cnf.getApplicationVersion());
- if (!cnf.getSerletVersion().equals(VERSION)) {
+ if (!cnf.getServletVersion().equals(VERSION)) {
error("Warning: your widget set seems to be built with a different "
+ "version than the one used on server. Unexpected "
+ "behavior may occur.");