From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Tue, 21 Aug 2007 07:24:02 +0000 (+0000)
Subject: updated to work with GWT 1.4.59
X-Git-Tag: 6.7.0.beta1~6083
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c48d15f7b0379ab4106f230bb818f8bdbd105d4d;p=vaadin-framework.git

updated to work with GWT 1.4.59

svn changeset:2075/svn branch:trunk
---

diff --git a/Hosted Mode Browser Linux.launch b/Hosted Mode Browser Linux.launch
index ea7dbb5a5a..085a3a2dde 100644
--- a/Hosted Mode Browser Linux.launch	
+++ b/Hosted Mode Browser Linux.launch	
@@ -8,8 +8,8 @@
 </listAttribute>
 <listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;GwtClient&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/tk-trunk/build/gwt/gwt-linux-1.4.10/gwt-user.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/tk-trunk/build/gwt/gwt-linux-1.4.10/gwt-dev-linux.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/tk-trunk/build/gwt/gwt-linux-1.4.59/gwt-user.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/tk-trunk/build/gwt/gwt-linux-1.4.59/gwt-dev-linux.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/tk-trunk/src&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-noserver -whitelist &quot;127.0.01  ^http[:][/][/]127[.]0[.]0[.]1[:]8080&quot; -logLevel ALL -out WebContents/gwt -style PRETTY  http://127.0.0.1:8080/tk/com.itmill.toolkit.terminal.gwt.Client/gwt-test.html"/>
diff --git a/Hosted Mode Browser Mac.launch b/Hosted Mode Browser Mac.launch
index 00f1937e0b..adbefe0c32 100644
--- a/Hosted Mode Browser Mac.launch	
+++ b/Hosted Mode Browser Mac.launch	
@@ -8,11 +8,11 @@
 </listAttribute>
 <listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;GwtClient&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/tk-trunk/build/gwt/gwt-mac-1.4.10/gwt-user.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/tk-trunk/build/gwt/gwt-mac-1.4.10/gwt-dev-mac.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/tk-trunk/build/gwt/gwt-mac-1.4.59/gwt-user.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/tk-trunk/build/gwt/gwt-mac-1.4.59/gwt-dev-mac.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/tk-trunk/src&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
 </listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-noserver -whitelist &quot;127.0.01  ^http[:][/][/]127[.]0[.]0[.]1[:]8080&quot; -logLevel ALL -out WebContents/gwt -style PRETTY  http://127.0.0.1:8080/tk/com.itmill.toolkit.terminal.gwt.Client/gwt-test.html"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-noserver -whitelist &quot;127.0.0.1  ^http[:][/][/]127[.]0[.]0[.]1[:]8080&quot; -logLevel ALL -out WebContents/gwt -style PRETTY  http://127.0.0.1:8080/tk/com.itmill.toolkit.terminal.gwt.Client/gwt-test.html"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="tk-trunk"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XstartOnFirstThread"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
diff --git a/Hosted Mode Browser Win.launch b/Hosted Mode Browser Win.launch
index 22d1591a15..b7d9546a03 100644
--- a/Hosted Mode Browser Win.launch	
+++ b/Hosted Mode Browser Win.launch	
@@ -8,8 +8,8 @@
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;itmill-toolkit&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#13;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;itmill-toolkit&quot;/&gt;&#13;&#10;&lt;/runtimeClasspathEntry&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/itmill-toolkit/src&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/itmill-toolkit/build/gwt/gwt-windows-1.3.3/gwt-dev-windows.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/itmill-toolkit/build/gwt/gwt-windows-1.3.3/gwt-user.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/itmill-toolkit/build/gwt/gwt-windows-1.4.59/gwt-dev-windows.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/itmill-toolkit/build/gwt/gwt-windows-1.4.59/gwt-user.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="itmill-toolkit"/>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
diff --git a/build/bin/compile-gwt-components b/build/bin/compile-gwt-components
index a5d9e66494..619840ef9f 100755
--- a/build/bin/compile-gwt-components
+++ b/build/bin/compile-gwt-components
@@ -1,2 +1,2 @@
 #!/bin/sh
-java -XstartOnFirstThread -cp "../../src:$APPDIR/bin:../gwt/gwt-mac-1.3.3/gwt-user.jar:../gwt/gwt-mac-1.3.3/gwt-dev-mac.jar" com.google.gwt.dev.GWTCompiler -out "../../WebContent" "$@" com.itmill.toolkit.terminal.gwt.Client;
+java -XstartOnFirstThread -cp "../../src:$APPDIR/bin:../gwt/gwt-mac-1.4.59/gwt-user.jar:../gwt/gwt-mac-1.4.59/gwt-dev-mac.jar" com.google.gwt.dev.GWTCompiler -out "../../WebContent" "$@" com.itmill.toolkit.terminal.gwt.Client;
diff --git a/build/bin/compile-gwt-components.bat b/build/bin/compile-gwt-components.bat
index 0a84e55e68..f1325b81e3 100644
--- a/build/bin/compile-gwt-components.bat
+++ b/build/bin/compile-gwt-components.bat
@@ -1 +1 @@
-@java -cp "%~dp0\../../src;%~dp0\bin;%~dp0\../gwt/gwt-windows-1.3.3/gwt-user.jar;%~dp0\../gwt/gwt-windows-1.3.3/gwt-dev-windows.jar" com.google.gwt.dev.GWTCompiler -out "%~dp0\../../WebContent" %* com.itmill.toolkit.terminal.gwt.Client
\ No newline at end of file
+@java -cp "%~dp0\../../src;%~dp0\bin;%~dp0\../gwt/gwt-windows-1.4.59/gwt-user.jar;%~dp0\../gwt/gwt-windows-1.4.59/gwt-dev-windows.jar" com.google.gwt.dev.GWTCompiler -out "%~dp0\../../WebContent" %* com.itmill.toolkit.terminal.gwt.Client
\ No newline at end of file
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
index 2988079379..9201b4d85f 100755
--- a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
@@ -16,7 +16,6 @@ import com.google.gwt.json.client.JSONObject;
 import com.google.gwt.json.client.JSONParser;
 import com.google.gwt.json.client.JSONString;
 import com.google.gwt.json.client.JSONValue;
-import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.FocusListener;
 import com.google.gwt.user.client.ui.FocusWidget;
 import com.google.gwt.user.client.ui.HasWidgets;
@@ -24,7 +23,6 @@ import com.google.gwt.user.client.ui.RootPanel;
 import com.google.gwt.user.client.ui.Widget;
 import com.itmill.toolkit.terminal.gwt.client.ui.IContextMenu;
 import com.itmill.toolkit.terminal.gwt.client.ui.IView;
-import com.itmill.toolkit.terminal.gwt.client.ui.IWindow;
 
 /**
  * Entry point classes define <code>onModuleLoad()</code>.
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java
index 05d10eb997..9a41127abb 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java
@@ -307,8 +307,9 @@ public class ICustomLayout extends ComplexPanel implements Paintable, Layout {
 		if (cw != null) {
 			widgetToCaptionWrapper.remove(w);
 			return super.remove(cw);
-		} else 
+		} else if(w != null)
 			return super.remove(w);
+		return false;
 	}
 
 	/** Adding widget without specifying location is not supported */
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java
index 534851672a..56078a53a1 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java
@@ -186,12 +186,13 @@ public abstract class IOrderedLayout extends ComplexPanel implements Layout {
 			// captions go into same container element as their
 			// owners
 			Element container = DOM.getParent(((UIObject) c.getOwner()).getElement());
-			DOM.insertChild(container, w.getElement(), 0);
-			insert(w, null, beforeIndex);
+			Element captionContainer = DOM.createDiv();
+			DOM.insertChild(container, captionContainer, 0);
+			insert(w, captionContainer, beforeIndex, false);
 		} else {
 			Element container = createWidgetWrappper();
 			DOM.insertChild(childContainer, container, beforeIndex);
-			insert(w, container, beforeIndex);
+			insert(w, container, beforeIndex, false);
 		}
 	}
 	
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java
index c21ba67a3d..a62a140fb2 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java
@@ -87,11 +87,11 @@ public class ITabsheet extends TabPanel implements Paintable {
 					Widget content = client.getWidget(tab
 							.getChildUIDL(0));
 					tb.selectTab(index);
-					dp.remove(index);
-					dp.insert(content, index);
+					remove(index);
+					insert(content, (String) captions.get(index), index);
 					((Paintable)content).updateFromUIDL(tab
 							.getChildUIDL(0), client);
-					dp.showWidget(index);
+					this.selectTab(index);
 				}
 				index++;
 			}
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITree.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITree.java
index 472a7764bc..aca8345453 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITree.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITree.java
@@ -120,7 +120,7 @@ public class ITree extends Tree implements Paintable {
 				if (!selectable) return;
 				String key = n.key;
 				if (key != null) {
-					if(selectedIds.contains(key)) {
+					if(selectedIds.contains(key) && multiselect) {
 						selectedIds.remove(key);
 						n.setISelected(false);
 					} else {
diff --git a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
index 27f8f75942..3366ef49c5 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
+++ b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
@@ -429,11 +429,8 @@ public class ApplicationServlet extends HttpServlet {
 		page
 				.write("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" "
 						+ "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n");
-
-		
 		
 		page.write("<html>\n<head>\n<title>IT Mill Toolkit 5</title>\n" +
-				"<meta name='gwt:module' content='"+ (hasSlash ? "../" : "") +"com.itmill.toolkit.terminal.gwt.Client=com.itmill.toolkit.terminal.gwt.Client'>\n" +
 				"<script type=\"text/javascript\">\n" +
 				"	var itmtk = {\n" +
 				"		appUri:'");
@@ -453,16 +450,19 @@ public class ApplicationServlet extends HttpServlet {
 		
 		page.write("'\n};\n" +
 				"</script>\n" +
+				
+				"<script language='javascript' src='"+ (hasSlash ? "../" : "") + "com.itmill.toolkit.terminal.gwt.Client/com.itmill.toolkit.terminal.gwt.Client.nocache.js'></script>" +
+
 				"<link REL=\"stylesheet\" TYPE=\"text/css\" HREF=\""+request.getContextPath() + THEME_DIRECTORY_PATH+themeName+"/style.css\">" + 
-				"</head>\n<body>\n<script language=\"javascript\" src=\""+ (hasSlash ? "../" : "") +"com.itmill.toolkit.terminal.gwt.Client/gwt.js\"></script>\n" +
+				"</head>\n<body>\n" +
 				"	<iframe id=\"__gwt_historyFrame\" style=\"width:0;height:0;border:0\"></iframe>\n" +
 				"	<div id=\"itmtk-ajax-window\"></div>" +
-				"	<div style=\"position: absolute; right: 5px; top: 5px; color: gray;\"><strong>IT Mill Toolkit 5 Prototype</strong></div>\n" + 
 				"	</body>\n" + 
 				"</html>\n");
 	
 
 		page.close();
+
 	}
 
 	/**