[gwt-contrib] [google-web-toolkit] r10413 committed - Adding explicit casts to the return value of certain methods to help t...

[codesite-noreply]

Revision: 10413
Author:   jlaba...@google.com
Date:     Wed Jun 29 05:16:14 2011
Log:      Adding explicit casts to the return value of certain methods to  
help the javac compiler.  Some compilers require the explicit cast.

Review at http://gwt-code-reviews.appspot.com/1463810

Review by: robertvaw...@google.com
http://code.google.com/p/google-web-toolkit/source/detail?r=10413

Modified:
  
/trunk/user/src/com/google/gwt/dom/builder/client/DomElementBuilderBase.java
  
/trunk/user/src/com/google/gwt/dom/builder/shared/HtmlElementBuilderBase.java

=======================================
---  
/trunk/user/src/com/google/gwt/dom/builder/client/DomElementBuilderBase.java	 
Tue Jun 28 15:49:07 2011
+++  
/trunk/user/src/com/google/gwt/dom/builder/client/DomElementBuilderBase.java	 
Wed Jun 29 05:16:14 2011
@@ -82,6 +82,7 @@
   @SuppressWarnings("unchecked")
   @Override
   public <B extends ElementBuilderBase<?>> B end() {
+    // An explicit cast is required to satisfy some javac compilers.
     return (B) delegate.end();
   }

@@ -91,19 +92,22 @@
     return (B) delegate.end(tagName);
   }

+  @SuppressWarnings("unchecked")
   @Override
   public <B extends ElementBuilderBase<?>> B endDiv() {
-    return end("div");
+    return (B) end("div");
   }

+  @SuppressWarnings("unchecked")
   @Override
   public <B extends ElementBuilderBase<?>> B endOption() {
-    return end("option");
+    return (B) end("option");
   }

+  @SuppressWarnings("unchecked")
   @Override
   public <B extends ElementBuilderBase<?>> B endSelect() {
-    return end("select");
+    return (B) end("select");
   }

   @Override
@@ -178,7 +182,11 @@
    * @return the element on which the attribute can be set
    */
   protected E assertCanAddAttribute() {
-    return delegate.assertCanAddAttribute().cast();
+    /*
+     * An explicit parameterized return type on cast() is required by some  
javac
+     * compilers.
+     */
+    return delegate.assertCanAddAttribute().<E> cast();
   }

   /**
=======================================
---  
/trunk/user/src/com/google/gwt/dom/builder/shared/HtmlElementBuilderBase.java	 
Tue Jun 28 15:49:07 2011
+++  
/trunk/user/src/com/google/gwt/dom/builder/shared/HtmlElementBuilderBase.java	 
Wed Jun 29 05:16:14 2011
@@ -84,6 +84,7 @@
   @SuppressWarnings("unchecked")
   @Override
   public <B extends ElementBuilderBase<?>> B end() {
+    // An explicit cast is required to satisfy some javac compilers.
     return (B) delegate.end();
   }

@@ -93,19 +94,22 @@
     return (B) delegate.end(tagName);
   }

+  @SuppressWarnings("unchecked")
   @Override
   public <B extends ElementBuilderBase<?>> B endDiv() {
-    return end("div");
+    return (B) end("div");
   }

+  @SuppressWarnings("unchecked")
   @Override
   public <B extends ElementBuilderBase<?>> B endOption() {
-    return end("option");
+    return (B) end("option");
   }

+  @SuppressWarnings("unchecked")
   @Override
   public <B extends ElementBuilderBase<?>> B endSelect() {
-    return end("select");
+    return (B) end("select");
   }

   @Override

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