fixed typo, added type parameters

svn changeset:6712/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConfiguration.java b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConfiguration.java
index 06dee4db43d91fa3d215866fa5c2d53ba2c2e203..69006a81e207b4f97ae629dd4575fa34b3deb4ca 100644 (file)
--- 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 b4577d14f76e89c5cec1aaadd921e743594195a1..4418f736e0fa4f0d95069617637e2edde664da26 100755 (executable)
--- 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.");