</listAttribute>
<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER" javaProject="GwtClient" path="1" type="4"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/tk-trunk/build/gwt/gwt-linux-1.4.10/gwt-user.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/tk-trunk/build/gwt/gwt-linux-1.4.10/gwt-dev-linux.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/tk-trunk/build/gwt/gwt-linux-1.4.59/gwt-user.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/tk-trunk/build/gwt/gwt-linux-1.4.59/gwt-dev-linux.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/tk-trunk/src" path="3" type="2"/> "/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-noserver -whitelist "127.0.01 ^http[:][/][/]127[.]0[.]0[.]1[:]8080" -logLevel ALL -out WebContents/gwt -style PRETTY http://127.0.0.1:8080/tk/com.itmill.toolkit.terminal.gwt.Client/gwt-test.html"/>
</listAttribute>
<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER" javaProject="GwtClient" path="1" type="4"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/tk-trunk/build/gwt/gwt-mac-1.4.10/gwt-user.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/tk-trunk/build/gwt/gwt-mac-1.4.10/gwt-dev-mac.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/tk-trunk/build/gwt/gwt-mac-1.4.59/gwt-user.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/tk-trunk/build/gwt/gwt-mac-1.4.59/gwt-dev-mac.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/tk-trunk/src" path="3" type="2"/> "/>
</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-noserver -whitelist "127.0.01 ^http[:][/][/]127[.]0[.]0[.]1[:]8080" -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 "127.0.0.1 ^http[:][/][/]127[.]0[.]0[.]1[:]8080" -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">
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER" javaProject="itmill-toolkit" path="1" type="4"/> "/>\r
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento exportedEntriesOnly="false" project="itmill-toolkit"/> </runtimeClasspathEntry> "/>\r
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/itmill-toolkit/src" path="3" type="2"/> "/>\r
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/itmill-toolkit/build/gwt/gwt-windows-1.3.3/gwt-dev-windows.jar" path="3" type="2"/> "/>\r
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/itmill-toolkit/build/gwt/gwt-windows-1.3.3/gwt-user.jar" path="3" type="2"/> "/>\r
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/itmill-toolkit/build/gwt/gwt-windows-1.4.59/gwt-dev-windows.jar" path="3" type="2"/> "/>\r
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/itmill-toolkit/build/gwt/gwt-windows-1.4.59/gwt-user.jar" path="3" type="2"/> "/>\r
</listAttribute>\r
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="itmill-toolkit"/>\r
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>\r
#!/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;
-@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
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;
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>.
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 */
// 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);
}
}
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++;
}
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 {
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:'");
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();
+
}
/**
projects / vaadin-framework.git / commitdiff