### Eclipse Workspace Patch 1.0
#P org.eclipse.e4.ui.workbench.renderers.swt
Index: src/org/eclipse/e4/workbench/ui/renderers/swt/StackRenderer.java
===================================================================
RCS file: /cvsroot/eclipse/e4/org.eclipse.e4.ui/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/workbench/ui/renderers/swt/StackRenderer.java,v
retrieving revision 1.10
diff -u -r1.10 StackRenderer.java
--- src/org/eclipse/e4/workbench/ui/renderers/swt/StackRenderer.java	26 Jul 2009 13:56:22 -0000	1.10
+++ src/org/eclipse/e4/workbench/ui/renderers/swt/StackRenderer.java	6 Aug 2009 16:17:25 -0000
@@ -23,10 +23,6 @@
 import org.eclipse.e4.ui.model.application.MStack;
 import org.eclipse.e4.ui.model.application.MToolBar;
 import org.eclipse.e4.ui.services.IStylingEngine;
-import org.eclipse.e4.ui.widgets.CTabFolder;
-import org.eclipse.e4.ui.widgets.CTabFolder2Adapter;
-import org.eclipse.e4.ui.widgets.CTabFolderEvent;
-import org.eclipse.e4.ui.widgets.CTabItem;
 import org.eclipse.e4.ui.widgets.ETabFolder;
 import org.eclipse.e4.ui.widgets.ETabItem;
 import org.eclipse.e4.workbench.ui.internal.IValueFunction;
@@ -40,6 +36,10 @@
 import org.eclipse.jface.databinding.swt.ISWTObservableValue;
 import org.eclipse.jface.databinding.swt.SWTObservables;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabFolder2Adapter;
+import org.eclipse.swt.custom.CTabFolderEvent;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.DisposeEvent;
 import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.events.SelectionEvent;
Index: src/org/eclipse/e4/workbench/ui/renderers/swt/WBWRenderer.java
===================================================================
RCS file: /cvsroot/eclipse/e4/org.eclipse.e4.ui/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/workbench/ui/renderers/swt/WBWRenderer.java,v
retrieving revision 1.1
diff -u -r1.1 WBWRenderer.java
--- src/org/eclipse/e4/workbench/ui/renderers/swt/WBWRenderer.java	14 Jul 2009 18:43:31 -0000	1.1
+++ src/org/eclipse/e4/workbench/ui/renderers/swt/WBWRenderer.java	6 Aug 2009 16:17:25 -0000
@@ -30,6 +30,13 @@
 import org.eclipse.jface.databinding.swt.ISWTObservableValue;
 import org.eclipse.jface.databinding.swt.SWTObservables;
 import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.rwt.RWT;
+import org.eclipse.rwt.internal.lifecycle.HtmlResponseWriter;
+import org.eclipse.rwt.internal.service.ContextProvider;
+import org.eclipse.rwt.internal.service.IServiceStateInfo;
+import org.eclipse.rwt.lifecycle.PhaseEvent;
+import org.eclipse.rwt.lifecycle.PhaseId;
+import org.eclipse.rwt.lifecycle.PhaseListener;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ControlEvent;
 import org.eclipse.swt.events.ControlListener;
@@ -110,6 +117,29 @@
 			}
 		}
 
+		RWT.getLifeCycle().addPhaseListener(new PhaseListener() {
+
+			private static final long serialVersionUID = 1L;
+
+			public void beforePhase(final PhaseEvent event) {
+			}
+
+			public void afterPhase(final PhaseEvent event) {
+				String removeSplashJs = "var splashDiv = document.getElementById( \"splash\" );\n" //$NON-NLS-1$
+						+ "    if( splashDiv != null ) {\n" //$NON-NLS-1$
+						+ "      splashDiv.parentNode.removeChild( splashDiv );\n" //$NON-NLS-1$
+						+ "    }\n"; //$NON-NLS-1$
+				IServiceStateInfo stateInfo = ContextProvider.getStateInfo();
+				HtmlResponseWriter writer = stateInfo.getResponseWriter();
+				writer.append(removeSplashJs);
+				RWT.getLifeCycle().removePhaseListener(this);
+			}
+
+			public PhaseId getPhaseId() {
+				return PhaseId.RENDER;
+			}
+		});
+
 		return newWidget;
 	}
 
Index: src/org/eclipse/e4/workbench/ui/renderers/swt/LazyStackRenderer.java
===================================================================
RCS file: /cvsroot/eclipse/e4/org.eclipse.e4.ui/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/workbench/ui/renderers/swt/LazyStackRenderer.java,v
retrieving revision 1.2
diff -u -r1.2 LazyStackRenderer.java
--- src/org/eclipse/e4/workbench/ui/renderers/swt/LazyStackRenderer.java	16 Jul 2009 18:32:57 -0000	1.2
+++ src/org/eclipse/e4/workbench/ui/renderers/swt/LazyStackRenderer.java	6 Aug 2009 16:17:25 -0000
@@ -15,11 +15,11 @@
 import org.eclipse.e4.ui.model.application.MItemPart;
 import org.eclipse.e4.ui.model.application.MPart;
 import org.eclipse.e4.ui.model.application.MStack;
-import org.eclipse.e4.ui.widgets.CTabFolder;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.impl.AdapterImpl;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Listener;
#P org.eclipse.e4.ui.css.swt
Index: src/org/eclipse/e4/ui/css/swt/dom/SWTElement.java
===================================================================
RCS file: /cvsroot/eclipse/e4/org.eclipse.e4.ui/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/SWTElement.java,v
retrieving revision 1.10
diff -u -r1.10 SWTElement.java
--- src/org/eclipse/e4/ui/css/swt/dom/SWTElement.java	16 Jul 2009 22:28:38 -0000	1.10
+++ src/org/eclipse/e4/ui/css/swt/dom/SWTElement.java	6 Aug 2009 16:17:26 -0000
@@ -211,10 +211,13 @@
 			if (widget instanceof CTabFolder) {
 				// if it's a CTabFolder, include the child items in the count
 				childCount += ((CTabFolder) widget).getItemCount();
+				// TODO [bm] need to return early as our ETabFolder == CTabFolder of SWT
+				return childCount;
 			}
 			if (widget instanceof ETabFolder) {
 				// if it's a CTabFolder, include the child items in the count
 				childCount += ((ETabFolder) widget).getItemCount();
+				return childCount;
 			}
 		}
 		return childCount;