[gwt-contrib] [google-web-toolkit commit] r5439 - Merging /trunk r4820 into /releases/1.6.

[codesite-noreply]

Author: j...@google.com
Date: Wed May 20 06:49:41 2009
New Revision: 5439

Modified:
    releases/1.6/user/src/com/google/gwt/user/client/ui/CheckBox.java
    releases/1.6/user/test/com/google/gwt/user/client/ui/RadioButtonTest.java

Log:
Merging /trunk r4820 into /releases/1.6.


Modified: releases/1.6/user/src/com/google/gwt/user/client/ui/CheckBox.java
==============================================================================
--- releases/1.6/user/src/com/google/gwt/user/client/ui/CheckBox.java    
(original)
+++ releases/1.6/user/src/com/google/gwt/user/client/ui/CheckBox.java   Wed  
May 20 06:49:41 2009
@@ -389,8 +389,7 @@
      // Clear out the old input element
      setEventListener(asOld(inputElem), null);

-    getElement().removeChild(inputElem);
-    getElement().insertBefore(newInputElem, null);
+    getElement().replaceChild(newInputElem, inputElem);

      // Sink events on the new element
      Event.sinkEvents(elem, Event.getEventsSunk(inputElem));

Modified:  
releases/1.6/user/test/com/google/gwt/user/client/ui/RadioButtonTest.java
==============================================================================
---  
releases/1.6/user/test/com/google/gwt/user/client/ui/RadioButtonTest.java       
 
(original)
+++  
releases/1.6/user/test/com/google/gwt/user/client/ui/RadioButtonTest.java       
 
Wed May 20 06:49:41 2009
@@ -15,6 +15,7 @@
   */
  package com.google.gwt.user.client.ui;

+import com.google.gwt.dom.client.Element;
  import com.google.gwt.event.logical.shared.ValueChangeEvent;
  import com.google.gwt.event.logical.shared.ValueChangeHandler;
  import com.google.gwt.junit.client.GWTTestCase;
@@ -210,4 +211,22 @@
  //    InputElement r1Radio =  
InputElement.as(Element.as(radioButton.getElement().getFirstChild()));
  //    return r1Radio;
  //  }
+
+  /**
+   * Ensures that the element order doesn't get reversed when the radio's
+   * name is changed.
+   */
+  public void testOrderAfterSetName() {
+    RadioButton radio = new RadioButton("oldName");
+    assertEquals("oldName", radio.getName());
+
+    radio.setName("newName");
+    assertEquals("newName", radio.getName());
+
+    Element parent = radio.getElement();
+    Element firstChild = parent.getFirstChildElement().cast();
+    Element secondChild = firstChild.getNextSiblingElement().cast();
+    assertEquals("input", firstChild.getTagName().toLowerCase());
+    assertEquals("label", secondChild.getTagName().toLowerCase());
+  }
  }

--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---