Author: [EMAIL PROTECTED]
Date: Fri Nov 7 09:25:58 2008
New Revision: 3984
Modified:
branches/1_6_clean_events/eclipse/reference/code-museum/.classpath
branches/1_6_clean_events/eclipse/samples/DynaTable/.project
branches/1_6_clean_events/eclipse/samples/Hello/.classpath
branches/1_6_clean_events/eclipse/samples/Hello/.project
branches/1_6_clean_events/eclipse/samples/Mail/.classpath
branches/1_6_clean_events/eclipse/samples/Mail/.project
branches/1_6_clean_events/eclipse/samples/Showcase/.classpath
branches/1_6_clean_events/eclipse/samples/Showcase/.project
branches/1_6_clean_events/eclipse/user/.classpath
branches/1_6_clean_events/eclipse/user/.project
branches/1_6_clean_events/user/src/com/google/gwt/user/client/ui/Composite.java
Log:
simpler and safer onAttach in Composite (accidnetally dropped from lest
commit)
Modified: branches/1_6_clean_events/eclipse/reference/code-museum/.classpath
==============================================================================
--- branches/1_6_clean_events/eclipse/reference/code-museum/.classpath
(original)
+++ branches/1_6_clean_events/eclipse/reference/code-museum/.classpath Fri
Nov 7 09:25:58 2008
@@ -3,5 +3,6 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/gwt-user"/>
+ <classpathentry kind="con"
path="com.google.gwt.eclipse.plugin.GWT_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: branches/1_6_clean_events/eclipse/samples/DynaTable/.project
==============================================================================
--- branches/1_6_clean_events/eclipse/samples/DynaTable/.project
(original)
+++ branches/1_6_clean_events/eclipse/samples/DynaTable/.project Fri Nov
7
09:25:58 2008
@@ -15,16 +15,22 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+
<name>com.google.gwt.eclipse.plugin.gwtModuleBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
+ <nature>com.google.gwt.eclipse.plugin.gwtNature</nature>
</natures>
<linkedResources>
<link>
<name>core</name>
<type>2</type>
- <location>GWT_ROOT/samples/dynatable</location>
+ <locationURI>GWT_ROOT/samples/dynatable</locationURI>
</link>
</linkedResources>
</projectDescription>
Modified: branches/1_6_clean_events/eclipse/samples/Hello/.classpath
==============================================================================
--- branches/1_6_clean_events/eclipse/samples/Hello/.classpath (original)
+++ branches/1_6_clean_events/eclipse/samples/Hello/.classpath Fri Nov 7
09:25:58 2008
@@ -3,5 +3,6 @@
<classpathentry kind="src" path="core/src"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/gwt-user"/>
+ <classpathentry kind="con"
path="com.google.gwt.eclipse.plugin.GWT_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: branches/1_6_clean_events/eclipse/samples/Hello/.project
==============================================================================
--- branches/1_6_clean_events/eclipse/samples/Hello/.project (original)
+++ branches/1_6_clean_events/eclipse/samples/Hello/.project Fri Nov 7
09:25:58 2008
@@ -15,16 +15,22 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+
<name>com.google.gwt.eclipse.plugin.gwtModuleBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
+ <nature>com.google.gwt.eclipse.plugin.gwtNature</nature>
</natures>
<linkedResources>
<link>
<name>core</name>
<type>2</type>
- <location>GWT_ROOT/samples/hello</location>
+ <locationURI>GWT_ROOT/samples/hello</locationURI>
</link>
</linkedResources>
</projectDescription>
Modified: branches/1_6_clean_events/eclipse/samples/Mail/.classpath
==============================================================================
--- branches/1_6_clean_events/eclipse/samples/Mail/.classpath (original)
+++ branches/1_6_clean_events/eclipse/samples/Mail/.classpath Fri Nov 7
09:25:58 2008
@@ -3,5 +3,6 @@
<classpathentry kind="src" path="core/src"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/gwt-user"/>
+ <classpathentry kind="con"
path="com.google.gwt.eclipse.plugin.GWT_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: branches/1_6_clean_events/eclipse/samples/Mail/.project
==============================================================================
--- branches/1_6_clean_events/eclipse/samples/Mail/.project (original)
+++ branches/1_6_clean_events/eclipse/samples/Mail/.project Fri Nov 7
09:25:58 2008
@@ -15,16 +15,22 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+
<name>com.google.gwt.eclipse.plugin.gwtModuleBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
+ <nature>com.google.gwt.eclipse.plugin.gwtNature</nature>
</natures>
<linkedResources>
<link>
<name>core</name>
<type>2</type>
- <location>GWT_ROOT/samples/mail</location>
+ <locationURI>GWT_ROOT/samples/mail</locationURI>
</link>
</linkedResources>
</projectDescription>
Modified: branches/1_6_clean_events/eclipse/samples/Showcase/.classpath
==============================================================================
--- branches/1_6_clean_events/eclipse/samples/Showcase/.classpath
(original)
+++ branches/1_6_clean_events/eclipse/samples/Showcase/.classpath Fri Nov
7 09:25:58 2008
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" path="core/src"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src"
path="/gwt-dev-linux"/>
<classpathentry combineaccessrules="false" kind="src" path="/gwt-user"/>
+ <classpathentry combineaccessrules="false" kind="src"
path="/gwt-dev-mac"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: branches/1_6_clean_events/eclipse/samples/Showcase/.project
==============================================================================
--- branches/1_6_clean_events/eclipse/samples/Showcase/.project (original)
+++ branches/1_6_clean_events/eclipse/samples/Showcase/.project Fri Nov 7
09:25:58 2008
@@ -15,10 +15,16 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+
<name>com.google.gwt.eclipse.plugin.gwtModuleBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
+ <nature>com.google.gwt.eclipse.plugin.gwtNature</nature>
</natures>
<linkedResources>
<link>
Modified: branches/1_6_clean_events/eclipse/user/.classpath
==============================================================================
--- branches/1_6_clean_events/eclipse/user/.classpath (original)
+++ branches/1_6_clean_events/eclipse/user/.classpath Fri Nov 7 09:25:58
2008
@@ -8,6 +8,6 @@
<classpathentry exported="true" kind="var"
path="GWT_TOOLS/lib/junit/junit-3.8.1.jar"
sourcepath="/GWT_TOOLS/lib/junit/junit-3.8.1-src.zip"/>
<classpathentry exported="true" kind="var"
path="GWT_TOOLS/lib/tomcat/servlet-api-2.4.jar"
sourcepath="/GWT_TOOLS/lib/tomcat/jakarta-tomcat-5.0.28-src.zip"/>
<classpathentry kind="var"
path="GWT_TOOLS/lib/selenium/selenium-java-client-driver.jar"/>
- <classpathentry combineaccessrules="false" kind="src"
path="/gwt-dev-windows"/>
+ <classpathentry combineaccessrules="false" kind="src"
path="/gwt-dev-mac"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: branches/1_6_clean_events/eclipse/user/.project
==============================================================================
--- branches/1_6_clean_events/eclipse/user/.project (original)
+++ branches/1_6_clean_events/eclipse/user/.project Fri Nov 7 09:25:58 2008
@@ -15,10 +15,16 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+
<name>com.google.gwt.eclipse.plugin.gwtModuleBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
+ <nature>com.google.gwt.eclipse.plugin.gwtNature</nature>
</natures>
<linkedResources>
<link>
Modified:
branches/1_6_clean_events/user/src/com/google/gwt/user/client/ui/Composite.java
==============================================================================
---
branches/1_6_clean_events/user/src/com/google/gwt/user/client/ui/Composite.java
(original)
+++
branches/1_6_clean_events/user/src/com/google/gwt/user/client/ui/Composite.java
Fri Nov 7 09:25:58 2008
@@ -91,7 +91,11 @@
@Override
protected void onAttach() {
- // Call the widget's onAttach() first.
+ if (!isOrWasAttached()) {
+ widget.sinkEvents(eventsToSink);
+ eventsToSink = -1;
+ }
+
widget.onAttach();
// Clobber the widget's call to setEventListener(), causing all events
to
@@ -99,12 +103,7 @@
// default (note: it's not necessary to clear this in onDetach(),
because
// the widget's onDetach will do so).
DOM.setEventListener(getElement(), this);
- int bitsToAdd = eventsToSink;
- eventsToSink = -1;
- if (bitsToAdd > 0) {
- sinkEvents(bitsToAdd);
- }
-
+
// Call onLoad() directly, because we're not calling super.onAttach().
onLoad();
}
--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---
