Fix docs/warnings

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

Review by: jat@google.com

git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@9873 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/core/src/com/google/gwt/core/ext/DefaultSelectionProperty.java b/dev/core/src/com/google/gwt/core/ext/DefaultSelectionProperty.java
index dc4e804..bf6cafd 100644
--- a/dev/core/src/com/google/gwt/core/ext/DefaultSelectionProperty.java
+++ b/dev/core/src/com/google/gwt/core/ext/DefaultSelectionProperty.java
@@ -56,7 +56,7 @@
    * @param possibleValues the set of possible values, must not be null and
    *     will be returned to callers, so a copy should be passed into this
    *     ctor if the caller will use this set later
-   * @param map the map propertyValue to fallback values
+   * @param fallbackValueMap the map propertyValue to fallback values
    */
   public DefaultSelectionProperty(String currentValue, String fallbackValue,
       String name, SortedSet<String> possibleValues,
diff --git a/dev/core/src/com/google/gwt/core/ext/Linker.java b/dev/core/src/com/google/gwt/core/ext/Linker.java
index 2288481..82c1731 100644
--- a/dev/core/src/com/google/gwt/core/ext/Linker.java
+++ b/dev/core/src/com/google/gwt/core/ext/Linker.java
@@ -152,7 +152,9 @@
   }
 
   /**
-   * Does this linker support DevMode?
+   * Returns {@code true} if this linker supports DevMode.
+   * 
+   * @param context a LinkerContext
    */
   public boolean supportsDevModeInJunit(LinkerContext context) {
     // By default, linkers do not support Dev Mode
diff --git a/dev/core/src/com/google/gwt/core/ext/linker/impl/ResourceInjectionUtil.java b/dev/core/src/com/google/gwt/core/ext/linker/impl/ResourceInjectionUtil.java
index 1c5fa8f..b8b661d 100644
--- a/dev/core/src/com/google/gwt/core/ext/linker/impl/ResourceInjectionUtil.java
+++ b/dev/core/src/com/google/gwt/core/ext/linker/impl/ResourceInjectionUtil.java
@@ -28,7 +28,7 @@
  */
 public class ResourceInjectionUtil {
   /**
-   * Installs stylesheets and scripts
+   * Installs stylesheets and scripts.
    */
   public static StringBuffer injectResources(StringBuffer selectionScript,
       ArtifactSet artifacts) {
@@ -75,7 +75,6 @@
     return selectionScript;
   }
   
-  
   private static String generateScriptInjector(String scriptUrl) {
     if (isRelativeURL(scriptUrl)) {
       return "  if (!__gwt_scriptsLoaded['"
diff --git a/dev/core/src/com/google/gwt/core/ext/linker/impl/SelectionScriptLinker.java b/dev/core/src/com/google/gwt/core/ext/linker/impl/SelectionScriptLinker.java
index 6666bc1..ba701bf 100644
--- a/dev/core/src/com/google/gwt/core/ext/linker/impl/SelectionScriptLinker.java
+++ b/dev/core/src/com/google/gwt/core/ext/linker/impl/SelectionScriptLinker.java
@@ -53,7 +53,6 @@
    * goes away?
    */
 
-
   /**
    * File name for computeScriptBase.js.
    */
@@ -79,7 +78,6 @@
    */
   protected static final String PROCESS_METAS_JS = "com/google/gwt/core/ext/linker/impl/processMetasOld.js";
 
-
   protected static void replaceAll(StringBuffer buf, String search,
       String replace) {
     int len = search.length();
@@ -181,7 +179,7 @@
   
   /**
    * Generate a selection script. The selection information should previously
-   * have been scanned using {@link #setupPermutationsMap(ArtifactSet)}.
+   * have been scanned using {@link PermutationsUtil#setupPermutationsMap(ArtifactSet)}.
    */
   protected String fillSelectionScriptTemplate(StringBuffer selectionScript,
       TreeLogger logger, LinkerContext context, ArtifactSet artifacts,
@@ -299,7 +297,6 @@
   
   protected abstract String getSelectionScriptTemplate(TreeLogger logger,
       LinkerContext context) throws UnableToCompleteException;
-
   
   /**
    * Add the Development Mode file to the artifact set.
diff --git a/dev/core/src/com/google/gwt/core/ext/soyc/impl/StoryImpl.java b/dev/core/src/com/google/gwt/core/ext/soyc/impl/StoryImpl.java
index 04d317e..4993a47 100644
--- a/dev/core/src/com/google/gwt/core/ext/soyc/impl/StoryImpl.java
+++ b/dev/core/src/com/google/gwt/core/ext/soyc/impl/StoryImpl.java
@@ -18,7 +18,6 @@
 import com.google.gwt.core.ext.soyc.Member;
 import com.google.gwt.core.ext.soyc.Story;
 
-import java.io.Serializable;
 import java.util.Comparator;
 import java.util.SortedSet;
 
@@ -31,7 +30,7 @@
  * 
  * @see SnippetIterator#next()
  */
-public class StoryImpl implements Story, Serializable {
+public class StoryImpl implements Story {
   /**
    * Orders StoryImpl's by their id number.
    */
diff --git a/dev/core/src/com/google/gwt/core/ext/typeinfo/JType.java b/dev/core/src/com/google/gwt/core/ext/typeinfo/JType.java
index 3d777af..5590cb1 100644
--- a/dev/core/src/com/google/gwt/core/ext/typeinfo/JType.java
+++ b/dev/core/src/com/google/gwt/core/ext/typeinfo/JType.java
@@ -69,7 +69,7 @@
   String getSimpleSourceName();
 
   /**
-   * Returns this instance as a {@link JAnnotationType#} if it is a annotation
+   * Returns this instance as a {@link JAnnotationType} if it is an annotation
    * or <code>null</code> if it is not.
    */
   JAnnotationType isAnnotation();
@@ -95,7 +95,7 @@
   JPrimitiveType isPrimitive();
 
   /**
-   * Returns the raw type if this is a {@link JRawType#}, otherwise returns
+   * Returns the raw type if this is a {@link JRawType}, otherwise returns
    * <code>null</code>.
    */
   JRawType isRawType();
diff --git a/dev/core/src/com/google/gwt/core/linker/CrossSiteIframeLinker.java b/dev/core/src/com/google/gwt/core/linker/CrossSiteIframeLinker.java
index 58f7d26..19b16db 100644
--- a/dev/core/src/com/google/gwt/core/linker/CrossSiteIframeLinker.java
+++ b/dev/core/src/com/google/gwt/core/linker/CrossSiteIframeLinker.java
@@ -52,7 +52,7 @@
 public class CrossSiteIframeLinker extends SelectionScriptLinker {
   /**
    * A configuration property that can be used to have the linker ignore the
-   * script tags in gwt.xml rather than fail to compile if they are present
+   * script tags in gwt.xml rather than fail to compile if they are present.
    */
   private static final String FAIL_IF_SCRIPT_TAG_PROPERTY = "xsiframe.failIfScriptTag";
 
@@ -95,6 +95,7 @@
         }
       }
       if (failIfScriptTags) {
+        // CHECKSTYLE_OFF
         String msg =
             "The " + getDescription()
                 + " linker does not support <script> tags in the gwt.xml files, but the"
@@ -105,6 +106,7 @@
                 + " this error, you will need to remove the script tags from the"
                 + " gwt.xml file, or add this property to the gwt.xml file:"
                 + " <set-configuration-property name='xsiframe.failIfScriptTag' value='FALSE'/>";
+        // CHECKSTYLE_ON
         logger.log(TreeLogger.ERROR, msg);
         throw new UnableToCompleteException();
       } else {
@@ -140,40 +142,96 @@
     return context.getModuleName() + "." + getHostedFilename();
   }
 
+  /**
+   * Returns the name of the {@code ComputeScriptBase} script.  By default,
+   * returns {@code "com/google/gwt/core/ext/linker/impl/computeScriptBase.js"}.
+   *
+   * @param context a LinkerContext
+   */
   protected String getJsComputeScriptBase(LinkerContext context) {
     return "com/google/gwt/core/ext/linker/impl/computeScriptBase.js";
   }
 
+  /**
+   * Returns the name of the {@code UrlForResource} script.  By default,
+   * returns {@code "com/google/gwt/core/ext/linker/impl/computeUrlForResource.js"}.
+   *
+   * @param context a LinkerContext
+   */
   protected String getJsComputeUrlForResource(LinkerContext context) {
     return "com/google/gwt/core/ext/linker/impl/computeUrlForResource.js";
   }
 
+  /**
+   * Returns the name of the {@code JsInstallLocation} script.  By default,
+   * returns {@code "com/google/gwt/core/ext/linker/impl/installLocationIframe.js"}.
+   *
+   * @param context a LinkerContext
+   */
   protected String getJsInstallLocation(LinkerContext context) {
     return "com/google/gwt/core/ext/linker/impl/installLocationIframe.js";
   }
 
-  // If you override this to return installScriptDirect.js, then you should
-  // also override shouldInstallCode() to return false
+  /**
+   * Returns the name of the {@code JsInstallScript} script.  By default,
+   * returns {@code "com/google/gwt/core/ext/linker/impl/installScriptEarlyDownload.js"}.
+   *
+   * <p> If you override this to return {@code installScriptDirect.js}, then you
+   * should also override {@link #shouldInstallCode(LinkerContext)} to return
+   * {@code false}.
+   *
+   * @param context a LinkerContext
+   */
   protected String getJsInstallScript(LinkerContext context) {
     return "com/google/gwt/core/ext/linker/impl/installScriptEarlyDownload.js";
   }
 
+  /**
+   * Returns the name of the {@code JsLoadExternalStylesheets} script.  By default,
+   * returns {@code "com/google/gwt/core/ext/linker/impl/loadExternalStylesheets.js"}.
+   *
+   * @param context a LinkerContext
+   */
   protected String getJsLoadExternalStylesheets(LinkerContext context) {
     return "com/google/gwt/core/ext/linker/impl/loadExternalStylesheets.js";
   }
 
+  /**
+   * Returns the name of the {@code JsPermutations} script.  By default,
+   * returns {@code "com/google/gwt/core/ext/linker/impl/permutations.js"}.
+   *
+   * @param context a LinkerContext
+   */
   protected String getJsPermutations(LinkerContext context) {
     return "com/google/gwt/core/ext/linker/impl/permutations.js";
   }
 
+  /**
+   * Returns the name of the {@code JsProcessMetas} script.  By default,
+   * returns {@code "com/google/gwt/core/ext/linker/impl/processMetas.js"}.
+   *
+   * @param context a LinkerContext
+   */
   protected String getJsProcessMetas(LinkerContext context) {
     return "com/google/gwt/core/ext/linker/impl/processMetas.js";
   }
 
+  /**
+   * Returns the name of the {@code JsProperties} script.  By default,
+   * returns {@code "com/google/gwt/core/ext/linker/impl/properties.js"}.
+   *
+   * @param context a LinkerContext
+   */
   protected String getJsProperties(LinkerContext context) {
     return "com/google/gwt/core/ext/linker/impl/properties.js";
   }
 
+  /**
+   * Returns the name of the {@code JsWaitForBodyLoaded} script.  By default,
+   * returns {@code "com/google/gwt/core/ext/linker/impl/waitForBodyLoaded.js"}.
+   *
+   * @param context a LinkerContext
+   */
   protected String getJsWaitForBodyLoaded(LinkerContext context) {
     return "com/google/gwt/core/ext/linker/impl/waitForBodyLoaded.js";
   }
@@ -305,7 +363,9 @@
     EmittedArtifact serializedMap;
     try {
       String mappings = mappingArtifact.getSerialized();
+      // CHECKSTYLE_OFF
       mappings = mappings.concat("Devmode:" + getHostedFilename());
+      // CHECKSTYLE_ON
       serializedMap = emitString(logger, mappings, "compilation-mappings.txt");
       // TODO(unnurg): make this Deploy
       serializedMap.setVisibility(Visibility.Public);
diff --git a/dev/core/src/com/google/gwt/core/linker/SingleScriptLinker.java b/dev/core/src/com/google/gwt/core/linker/SingleScriptLinker.java
index 5296cc8..99332ac 100644
--- a/dev/core/src/com/google/gwt/core/linker/SingleScriptLinker.java
+++ b/dev/core/src/com/google/gwt/core/linker/SingleScriptLinker.java
@@ -135,7 +135,7 @@
 
   /**
    * Unimplemented. Normally required by
-   * {@link #doEmitCompilation(TreeLogger, LinkerContext, CompilationResult)}.
+   * {@link #doEmitCompilation(TreeLogger, LinkerContext, CompilationResult, ArtifactSet)}.
    */
   @Override
   protected String getCompilationExtension(TreeLogger logger,
@@ -145,7 +145,7 @@
 
   /**
    * Unimplemented. Normally required by
-   * {@link #doEmitCompilation(TreeLogger, LinkerContext, CompilationResult)}.
+   * {@link #doEmitCompilation(TreeLogger, LinkerContext, CompilationResult, ArtifactSet)}.
    */
   @Override
   protected String getModulePrefix(TreeLogger logger, LinkerContext context,
@@ -155,7 +155,7 @@
 
   /**
    * Unimplemented. Normally required by
-   * {@link #doEmitCompilation(TreeLogger, LinkerContext, CompilationResult)}.
+   * {@link #doEmitCompilation(TreeLogger, LinkerContext, CompilationResult, ArtifactSet)}.
    */
   @Override
   protected String getModuleSuffix(TreeLogger logger, LinkerContext context)
diff --git a/dev/core/src/com/google/gwt/core/linker/SoycReportLinker.java b/dev/core/src/com/google/gwt/core/linker/SoycReportLinker.java
index eadeb71..b76801e 100644
--- a/dev/core/src/com/google/gwt/core/linker/SoycReportLinker.java
+++ b/dev/core/src/com/google/gwt/core/linker/SoycReportLinker.java
@@ -140,7 +140,7 @@
   }
 
   /**
-   * Check whether an artifact set contains any compilerMetrics
+   * Check whether an artifact set contains any compilerMetrics.
    */  
   boolean anyCompilerMetricsPresent(ArtifactSet artifacts) {
     return  !artifacts.find(ModuleMetricsArtifact.class).isEmpty(); 
diff --git a/dev/core/src/com/google/gwt/dev/Link.java b/dev/core/src/com/google/gwt/dev/Link.java
index 261f522..f2e4c64 100644
--- a/dev/core/src/com/google/gwt/dev/Link.java
+++ b/dev/core/src/com/google/gwt/dev/Link.java
@@ -83,7 +83,7 @@
   /**
    * Options for Link.
    */
-  public interface LinkOptions extends CompileTaskOptions, OptionExtraDir,
+  public interface LinkOptions extends OptionExtraDir,
       OptionWarDir, OptionDeployDir, LegacyLinkOptions {
   }
 
@@ -211,7 +211,6 @@
    * permutation. It sees the generated artifacts for one permutation compile,
    * and it runs the per-permutation part of each shardable linker.
    */
-  @SuppressWarnings("unchecked")
   public static void linkOnePermutationToJar(TreeLogger logger,
       ModuleDef module, ArtifactSet generatedArtifacts,
       PermutationResult permResult, File jarFile,
@@ -307,7 +306,7 @@
    * emitted artifacts, and all other artifacts are dropped except @Transferable
    * ones. This method simulates the thinning that happens in a parallel build.
    */
-  @SuppressWarnings("unchecked")
+  @SuppressWarnings("rawtypes")
   public static ArtifactSet simulateTransferThinning(ArtifactSet artifacts,
       StandardLinkerContext context) {
     ArtifactSet thinnedArtifacts = new ArtifactSet();
diff --git a/dev/core/src/com/google/gwt/dev/Precompilation.java b/dev/core/src/com/google/gwt/dev/Precompilation.java
index c8b68b5..6524f52 100644
--- a/dev/core/src/com/google/gwt/dev/Precompilation.java
+++ b/dev/core/src/com/google/gwt/dev/Precompilation.java
@@ -24,14 +24,13 @@
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.io.Serializable;
 import java.util.Collection;
 
 /**
  * The result of compilation phase 1, includes a unified AST and metadata
  * relevant to each permutation.
  */
-public class Precompilation implements Serializable, PrecompilationResult {
+public class Precompilation implements PrecompilationResult {
   /*
    * TODO: don't make this whole class serializable, instead dump the
    * independent members out to a file so that the generated artifacts are
diff --git a/dev/core/src/com/google/gwt/dev/Precompile.java b/dev/core/src/com/google/gwt/dev/Precompile.java
index b93af9e..3cf837e 100644
--- a/dev/core/src/com/google/gwt/dev/Precompile.java
+++ b/dev/core/src/com/google/gwt/dev/Precompile.java
@@ -72,7 +72,6 @@
 
 import java.awt.GraphicsEnvironment;
 import java.io.File;
-import java.io.Serializable;
 import java.lang.management.ManagementFactory;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -129,8 +128,7 @@
     }
   }
 
-  static class PrecompileOptionsImpl extends CompileTaskOptionsImpl implements PrecompileOptions,
-      Serializable {
+  static class PrecompileOptionsImpl extends CompileTaskOptionsImpl implements PrecompileOptions {
     private boolean disableUpdateCheck;
     private boolean enableGeneratingOnShards = true;
     private File genDir;
diff --git a/dev/core/src/com/google/gwt/dev/cfg/ConditionWhenPropertyIs.java b/dev/core/src/com/google/gwt/dev/cfg/ConditionWhenPropertyIs.java
index bef8e5b..57586d5 100644
--- a/dev/core/src/com/google/gwt/dev/cfg/ConditionWhenPropertyIs.java
+++ b/dev/core/src/com/google/gwt/dev/cfg/ConditionWhenPropertyIs.java
@@ -90,8 +90,7 @@
               cost--;
             }
           }
-        }
-        catch (BadPropertyValueException e) {
+        } catch (BadPropertyValueException e) {
           // do nothing - currently, only selection
           // properties support fall back values
         }
diff --git a/dev/core/src/com/google/gwt/dev/cfg/ModuleDefSchema.java b/dev/core/src/com/google/gwt/dev/cfg/ModuleDefSchema.java
index 9d829ca..2526f25 100644
--- a/dev/core/src/com/google/gwt/dev/cfg/ModuleDefSchema.java
+++ b/dev/core/src/com/google/gwt/dev/cfg/ModuleDefSchema.java
@@ -1277,7 +1277,6 @@
     }
   }
 
-  
   /**
    * Converts a comma-separated string into an array of property value tokens.
    */
diff --git a/dev/core/src/com/google/gwt/dev/javac/typemodel/TypeOracle.java b/dev/core/src/com/google/gwt/dev/javac/typemodel/TypeOracle.java
index 459d2ea..b2ee426 100644
--- a/dev/core/src/com/google/gwt/dev/javac/typemodel/TypeOracle.java
+++ b/dev/core/src/com/google/gwt/dev/javac/typemodel/TypeOracle.java
@@ -442,9 +442,9 @@
    * has a stable identity so as to guarantee that all calls to this method with
    * the same arguments return the same object.
    * 
-   * @param genericType a generic base class
-   * @param enclosingType
-   * @param typeArgs the type arguments bound to the specified generic type
+   * @param extGenericType a generic base class
+   * @param extEnclosingType
+   * @param extTypeArgs the type arguments bound to the specified generic type
    * @return a type object representing this particular binding of type
    *         arguments to the specified generic
    * @throws IllegalArgumentException if the parameterization of a non-static
diff --git a/dev/core/src/com/google/gwt/dev/jjs/JJSOptions.java b/dev/core/src/com/google/gwt/dev/jjs/JJSOptions.java
index 7b2bd41..10bf933 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/JJSOptions.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/JJSOptions.java
@@ -16,7 +16,6 @@
 package com.google.gwt.dev.jjs;
 
 import com.google.gwt.dev.util.arg.OptionAggressivelyOptimize;
-import com.google.gwt.dev.util.arg.OptionCompilerMetricsEnabled;
 import com.google.gwt.dev.util.arg.OptionDisableCastChecking;
 import com.google.gwt.dev.util.arg.OptionDisableClassMetadata;
 import com.google.gwt.dev.util.arg.OptionEnableAssertions;
@@ -37,5 +36,5 @@
     OptionEnableAssertions, OptionEnableGeneratorResultCaching, 
     OptionRunAsyncEnabled, OptionScriptStyle,
     OptionSoycEnabled, OptionSoycDetailed, OptionOptimizePrecompile,
-    OptionStrict, OptionCompilerMetricsEnabled {
+    OptionStrict {
 }
diff --git a/dev/core/src/com/google/gwt/dev/jjs/SourceInfoCorrelation.java b/dev/core/src/com/google/gwt/dev/jjs/SourceInfoCorrelation.java
index 320376e..70eeb59 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/SourceInfoCorrelation.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/SourceInfoCorrelation.java
@@ -18,14 +18,12 @@
 import com.google.gwt.dev.jjs.Correlation.Axis;
 import com.google.gwt.dev.jjs.CorrelationFactory.RealCorrelationFactory;
 
-import java.io.Serializable;
-
 /**
  * Tracks file and line information for AST nodes.
  * 
  * TODO: make this package-protected?
  */
-public class SourceInfoCorrelation implements SourceInfo, Serializable {
+public class SourceInfoCorrelation implements SourceInfo {
 
   private static final int NUM_AXES = Axis.values().length;
 
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/GwtAstBuilder.java b/dev/core/src/com/google/gwt/dev/jjs/impl/GwtAstBuilder.java
index 3780c90..95e97ca 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/GwtAstBuilder.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/GwtAstBuilder.java
@@ -1608,6 +1608,7 @@
       }
     }
 
+    @Override
     public boolean visit(ForStatement x, BlockScope scope) {
       // SEE NOTE ON JDT FORCED OPTIMIZATIONS
       if (isOptimizedFalse(x.condition)) {
@@ -1616,6 +1617,7 @@
       return true;
     }
 
+    @Override
     public boolean visit(IfStatement x, BlockScope scope) {
       // SEE NOTE ON JDT FORCED OPTIMIZATIONS
       if (isOptimizedFalse(x.condition)) {
@@ -1716,7 +1718,8 @@
     public boolean visit(TypeDeclaration x, CompilationUnitScope scope) {
       return visit(x);
     }
-
+    
+    @Override
     public boolean visit(WhileStatement x, BlockScope scope) {
       // SEE NOTE ON JDT FORCED OPTIMIZATIONS
       if (isOptimizedFalse(x.condition)) {
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/ImplementClassLiteralsAsFields.java b/dev/core/src/com/google/gwt/dev/jjs/impl/ImplementClassLiteralsAsFields.java
index a02032c..d6b6a2e 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/ImplementClassLiteralsAsFields.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/ImplementClassLiteralsAsFields.java
@@ -273,7 +273,6 @@
     return typeName;
   }
 
-
   private JType normalizeJsoType(JType type) {
     if (program.isJavaScriptObject(type)) {
       return program.getJavaScriptObject();
@@ -291,7 +290,7 @@
   }
 
   /**
-   * Takes the form:
+   * Resolve a class literal field.  Takes the form:
    * 
    * <pre>
    * class ClassLiteralHolder {
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/JsoDevirtualizer.java b/dev/core/src/com/google/gwt/dev/jjs/impl/JsoDevirtualizer.java
index c399579..2ef127c 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/JsoDevirtualizer.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/JsoDevirtualizer.java
@@ -192,7 +192,6 @@
     return findOverridingMethod(method, target.getSuperClass());
   }
 
-
   /**
     * Create a conditional method to discriminate between static and virtual
     * dispatch.
@@ -220,7 +219,6 @@
       return polyMethodToDevirtualMethods.get(polyMethod);
     }
 
-
     JClassType jsoType = program.getJavaScriptObject();
     SourceInfo sourceInfo = jsoType.getSourceInfo()
         .makeChild(SourceOrigin.UNKNOWN);
@@ -282,7 +280,6 @@
         polyMethod.getType(),
         condition, thenValue, elseValue);
 
-
     multi.exprs.add(conditional);
 
     JReturnStatement returnStatement = new JReturnStatement(sourceInfo,
diff --git a/dev/core/src/com/google/gwt/dev/js/JsNamer.java b/dev/core/src/com/google/gwt/dev/js/JsNamer.java
index 388f4fe..f9c8b7f 100644
--- a/dev/core/src/com/google/gwt/dev/js/JsNamer.java
+++ b/dev/core/src/com/google/gwt/dev/js/JsNamer.java
@@ -39,30 +39,37 @@
   private static Set<JsName> collectReferencedNames(JsProgram program) {
     final Set<JsName> referenced = new HashSet<JsName>();
     new JsVisitor() {
+      @Override
       public void endVisit(JsForIn x, JsContext ctx) {
         reference(x.getIterVarName());
       }
 
+      @Override
       public void endVisit(JsFunction x, JsContext ctx) {
         reference(x.getName());
       };
 
+      @Override
       public void endVisit(JsLabel x, JsContext ctx) {
         reference(x.getName());
       };
 
+      @Override
       public void endVisit(JsNameOf x, JsContext ctx) {
         reference(x.getName());
       };
 
+      @Override
       public void endVisit(JsNameRef x, JsContext ctx) {
         reference(x.getName());
       };
 
+      @Override
       public void endVisit(JsParameter x, JsContext ctx) {
         reference(x.getName());
       };
 
+      @Override
       public void endVisit(JsVars.JsVar x, JsContext ctx) {
         reference(x.getName());
       };
diff --git a/dev/core/src/com/google/gwt/dev/js/ast/JsNestingScope.java b/dev/core/src/com/google/gwt/dev/js/ast/JsNestingScope.java
index 36b83e7..bfba6a6 100644
--- a/dev/core/src/com/google/gwt/dev/js/ast/JsNestingScope.java
+++ b/dev/core/src/com/google/gwt/dev/js/ast/JsNestingScope.java
@@ -17,13 +17,12 @@
 
 import com.google.gwt.dev.util.collect.Lists;
 
-import java.io.Serializable;
 import java.util.List;
 
 /**
  * A normal scope that has a parent and children.
  */
-public abstract class JsNestingScope extends JsScope implements Serializable {
+public abstract class JsNestingScope extends JsScope {
 
   /**
    * Transient because children will add themselves to the parent after
diff --git a/dev/core/src/com/google/gwt/dev/js/ast/JsNormalScope.java b/dev/core/src/com/google/gwt/dev/js/ast/JsNormalScope.java
index ce4dcf6..c27a734 100644
--- a/dev/core/src/com/google/gwt/dev/js/ast/JsNormalScope.java
+++ b/dev/core/src/com/google/gwt/dev/js/ast/JsNormalScope.java
@@ -18,7 +18,6 @@
 import com.google.gwt.dev.util.StringInterner;
 import com.google.gwt.dev.util.collect.Maps;
 
-import java.io.Serializable;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.Map;
@@ -26,7 +25,7 @@
 /**
  * A normal scope that has a parent and children.
  */
-public class JsNormalScope extends JsNestingScope implements Serializable {
+public class JsNormalScope extends JsNestingScope {
 
   private Map<String, JsName> names = Collections.emptyMap();
 
diff --git a/dev/core/src/com/google/gwt/dev/shell/GWTShellServlet.java b/dev/core/src/com/google/gwt/dev/shell/GWTShellServlet.java
index b3543df..452817b 100644
--- a/dev/core/src/com/google/gwt/dev/shell/GWTShellServlet.java
+++ b/dev/core/src/com/google/gwt/dev/shell/GWTShellServlet.java
@@ -967,7 +967,7 @@
 
         // We create proxies for ServletContext and ServletConfig to enable
         // RemoteServiceServlets to load public and generated resources via
-        // ServeletContext.getResourceAsStream()
+        // ServletContext.getResourceAsStream()
         //
         ServletContext context = new HostedModeServletContextProxy(
             getServletContext(), moduleDef, getShellWorkDirs());
diff --git a/dev/core/src/com/google/gwt/dev/shell/Jsni.java b/dev/core/src/com/google/gwt/dev/shell/Jsni.java
index c6650fc..24a3962 100644
--- a/dev/core/src/com/google/gwt/dev/shell/Jsni.java
+++ b/dev/core/src/com/google/gwt/dev/shell/Jsni.java
@@ -231,8 +231,6 @@
   /**
    * Gets the body of a JSNI method, with Java refs escaped for hosted mode
    * injection.
-   * 
-   * @param logger a TreeLogger
    */
   public static String getJavaScriptForHostedMode(
       DispatchIdOracle dispatchInfo, JsniMethod jsniMethod) {
diff --git a/dev/core/src/com/google/gwt/dev/shell/WrapLayout.java b/dev/core/src/com/google/gwt/dev/shell/WrapLayout.java
index a242e49..b6a737b 100644
--- a/dev/core/src/com/google/gwt/dev/shell/WrapLayout.java
+++ b/dev/core/src/com/google/gwt/dev/shell/WrapLayout.java
@@ -163,8 +163,9 @@
 
       int targetWidth = target.getSize().width;
 
-      if (targetWidth == 0)
+      if (targetWidth == 0) {
         targetWidth = Integer.MAX_VALUE;
+      }
 
       int hgap = getHgap();
       int vgap = getVgap();
diff --git a/dev/core/src/com/google/gwt/dev/util/Either.java b/dev/core/src/com/google/gwt/dev/util/Either.java
index 2c892de..0c966c4 100644
--- a/dev/core/src/com/google/gwt/dev/util/Either.java
+++ b/dev/core/src/com/google/gwt/dev/util/Either.java
@@ -46,7 +46,7 @@
     right = b;
   }
 
-  @SuppressWarnings("unchecked")
+  @SuppressWarnings("rawtypes")
   @Override
   public boolean equals(Object obj) {
     if (this == obj) {
diff --git a/dev/core/src/com/google/gwt/dev/util/Pair.java b/dev/core/src/com/google/gwt/dev/util/Pair.java
index 5f630ff..7bd2c04 100644
--- a/dev/core/src/com/google/gwt/dev/util/Pair.java
+++ b/dev/core/src/com/google/gwt/dev/util/Pair.java
@@ -32,7 +32,7 @@
     this.right = right;
   }
 
-  @SuppressWarnings("unchecked")
+  @SuppressWarnings("rawtypes")
   @Override
   public boolean equals(Object obj) {
     if (this == obj) {
diff --git a/dev/core/src/com/google/gwt/soyc/MakeTopLevelHtmlForPerm.java b/dev/core/src/com/google/gwt/soyc/MakeTopLevelHtmlForPerm.java
index 56297fa..3cfe2da 100644
--- a/dev/core/src/com/google/gwt/soyc/MakeTopLevelHtmlForPerm.java
+++ b/dev/core/src/com/google/gwt/soyc/MakeTopLevelHtmlForPerm.java
@@ -253,7 +253,6 @@
       }
       outFile.println("];");
 
-
       // array of split point descriptions
       outFile.println("  var spl = [");
       for (int sp = 1; sp <= globalInformation.getNumSplitPoints(); sp++) {
diff --git a/user/src/com/google/gwt/autobean/client/impl/ClientPropertyContext.java b/user/src/com/google/gwt/autobean/client/impl/ClientPropertyContext.java
index c89ae2d..baab19b 100644
--- a/user/src/com/google/gwt/autobean/client/impl/ClientPropertyContext.java
+++ b/user/src/com/google/gwt/autobean/client/impl/ClientPropertyContext.java
@@ -18,7 +18,6 @@
 import com.google.gwt.autobean.shared.AutoBeanVisitor.CollectionPropertyContext;
 import com.google.gwt.autobean.shared.AutoBeanVisitor.MapPropertyContext;
 import com.google.gwt.autobean.shared.AutoBeanVisitor.ParameterizationVisitor;
-import com.google.gwt.autobean.shared.AutoBeanVisitor.PropertyContext;
 import com.google.gwt.core.client.JavaScriptObject;
 
 import java.util.List;
@@ -28,8 +27,7 @@
 /**
  * Provides base methods for generated implementations of PropertyContext.
  */
-public final class ClientPropertyContext implements PropertyContext,
-    CollectionPropertyContext, MapPropertyContext {
+public final class ClientPropertyContext implements CollectionPropertyContext, MapPropertyContext {
 
   /**
    * A reference to an instance setter method.
diff --git a/user/src/com/google/gwt/autobean/server/AutoBeanFactoryMagic.java b/user/src/com/google/gwt/autobean/server/AutoBeanFactoryMagic.java
index 6ab47d1..13c5e44 100644
--- a/user/src/com/google/gwt/autobean/server/AutoBeanFactoryMagic.java
+++ b/user/src/com/google/gwt/autobean/server/AutoBeanFactoryMagic.java
@@ -23,7 +23,6 @@
 import com.google.gwt.autobean.shared.AutoBeanFactory.NoWrap;
 import com.google.gwt.autobean.shared.impl.EnumMap;
 
-
 /**
  * Generates JVM-compatible implementations of AutoBeanFactory and AutoBean
  * types.
diff --git a/user/src/com/google/gwt/autobean/server/impl/BeanPropertyContext.java b/user/src/com/google/gwt/autobean/server/impl/BeanPropertyContext.java
index 8b1a7a5..f17e879 100644
--- a/user/src/com/google/gwt/autobean/server/impl/BeanPropertyContext.java
+++ b/user/src/com/google/gwt/autobean/server/impl/BeanPropertyContext.java
@@ -15,7 +15,6 @@
  */
 package com.google.gwt.autobean.server.impl;
 
-
 import java.lang.reflect.Method;
 import java.util.Map;
 
diff --git a/user/src/com/google/gwt/autobean/server/impl/GetterPropertyContext.java b/user/src/com/google/gwt/autobean/server/impl/GetterPropertyContext.java
index ba7814d..fac60fa 100644
--- a/user/src/com/google/gwt/autobean/server/impl/GetterPropertyContext.java
+++ b/user/src/com/google/gwt/autobean/server/impl/GetterPropertyContext.java
@@ -15,7 +15,6 @@
  */
 package com.google.gwt.autobean.server.impl;
 
-
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
diff --git a/user/src/com/google/gwt/autobean/server/impl/ProxyAutoBean.java b/user/src/com/google/gwt/autobean/server/impl/ProxyAutoBean.java
index 4c93baa..4f8e3be 100644
--- a/user/src/com/google/gwt/autobean/server/impl/ProxyAutoBean.java
+++ b/user/src/com/google/gwt/autobean/server/impl/ProxyAutoBean.java
@@ -217,6 +217,7 @@
   /**
    * Allow access by {@link ShimHandler}.
    */
+  @Override
   protected T getWrapped() {
     return super.getWrapped();
   }
diff --git a/user/src/com/google/gwt/autobean/server/impl/TypeUtils.java b/user/src/com/google/gwt/autobean/server/impl/TypeUtils.java
index c7c64ab..cf769c1 100644
--- a/user/src/com/google/gwt/autobean/server/impl/TypeUtils.java
+++ b/user/src/com/google/gwt/autobean/server/impl/TypeUtils.java
@@ -50,7 +50,7 @@
     temp.put(char.class, (char) 0);
     temp.put(double.class, (double) 0);
     temp.put(float.class, (float) 0);
-    temp.put(int.class, (int) 0);
+    temp.put(int.class, 0);
     temp.put(long.class, (long) 0);
     temp.put(short.class, (short) 0);
     temp.put(void.class, null);
diff --git a/user/src/com/google/gwt/autobean/shared/AutoBeanVisitor.java b/user/src/com/google/gwt/autobean/shared/AutoBeanVisitor.java
index 39358ac..189c31b 100644
--- a/user/src/com/google/gwt/autobean/shared/AutoBeanVisitor.java
+++ b/user/src/com/google/gwt/autobean/shared/AutoBeanVisitor.java
@@ -95,6 +95,8 @@
 
     /**
      * Called when finished with a type.
+     * 
+     * @param type a Class object
      */
     public void endVisitType(Class<?> type) {
     }
@@ -111,6 +113,7 @@
     /**
      * Called when visiting a possibly parameterized type.
      * 
+     * @param type a Class object
      * @return {@code true} if the type should be visited
      */
     public boolean visitType(Class<?> type) {
diff --git a/user/src/com/google/gwt/autobean/shared/ValueCodex.java b/user/src/com/google/gwt/autobean/shared/ValueCodex.java
index b4fb321..b5e103d 100644
--- a/user/src/com/google/gwt/autobean/shared/ValueCodex.java
+++ b/user/src/com/google/gwt/autobean/shared/ValueCodex.java
@@ -135,7 +135,11 @@
       @Override
       public String toJsonExpression(Object value) {
         // Longs cannot be expressed as a JS double
-        return StringQuoter.quote(String.valueOf((Long) value));
+        if (value instanceof Long) {
+          return StringQuoter.quote(String.valueOf(value));
+        } else {
+          throw new IllegalArgumentException("value should be a Long");
+        }
       }
     },
     SHORT(Short.class, short.class, (short) 0) {
@@ -178,6 +182,8 @@
     /**
      * Determines whether or not the Type can handle the given value via
      * upcasting semantics.
+     * 
+     * @param value a value Object
      */
     public boolean canUpcast(Object value) {
       // Most value types are final, so this method is meaningless
diff --git a/user/src/com/google/gwt/canvas/dom/client/ImageData.java b/user/src/com/google/gwt/canvas/dom/client/ImageData.java
index b0057b0..f6be8d0 100644
--- a/user/src/com/google/gwt/canvas/dom/client/ImageData.java
+++ b/user/src/com/google/gwt/canvas/dom/client/ImageData.java
@@ -30,7 +30,6 @@
    * 
    * Because image data is stored as RGBA, this is 4.
    */
-  @SuppressWarnings("unused")
   private static final int NUM_COLORS = 4;
 
   /**
diff --git a/user/src/com/google/gwt/cell/client/Cell.java b/user/src/com/google/gwt/cell/client/Cell.java
index 2f32358..c8239c9 100644
--- a/user/src/com/google/gwt/cell/client/Cell.java
+++ b/user/src/com/google/gwt/cell/client/Cell.java
@@ -94,7 +94,7 @@
   /**
    * Get the set of events that this cell consumes. The container that uses this
    * cell should only pass these events to
-   * {@link #onBrowserEvent(Context, Element, Object, NativeEvent, ValueUpdater))}
+   * {@link #onBrowserEvent(Context, Element, Object, NativeEvent, ValueUpdater)}
    * when the event occurs.
    * 
    * <p>
@@ -170,8 +170,8 @@
   /**
    * This method may be used by cell containers to set the value on a single
    * cell directly, rather than using {@link Element#setInnerHTML(String)}. See
-   * {@link AbstractCell#setValue(Context)} for a default implementation that
-   * uses {@link #render(Context, SafeHtmlBuilder))}.
+   * {@link AbstractCell#setValue(Context, Element, Object)} for a default
+   * implementation that uses {@link #render(Context, Object, SafeHtmlBuilder)}.
    * 
    * @param context the {@link Context} of the cell
    * @param parent the parent Element
diff --git a/user/src/com/google/gwt/cell/client/CompositeCell.java b/user/src/com/google/gwt/cell/client/CompositeCell.java
index c1328b6..30727b8 100644
--- a/user/src/com/google/gwt/cell/client/CompositeCell.java
+++ b/user/src/com/google/gwt/cell/client/CompositeCell.java
@@ -185,7 +185,7 @@
    * focus away from the containing widget.
    * </p>
    * 
-   * @param context the {@link Context} of the cell
+   * @param context the {@link com.google.gwt.cell.client.Cell.Context Context} of the cell
    * @param value the cell value to be rendered
    * @param sb the {@link SafeHtmlBuilder} to be written to
    * @param hasCell a {@link HasCell} instance containing the cells to be
diff --git a/user/src/com/google/gwt/core/client/CodeDownloadException.java b/user/src/com/google/gwt/core/client/CodeDownloadException.java
index 72f98eb..0607cac 100644
--- a/user/src/com/google/gwt/core/client/CodeDownloadException.java
+++ b/user/src/com/google/gwt/core/client/CodeDownloadException.java
@@ -40,7 +40,7 @@
     this.reason = reason;
   }
 
-  public final Reason getReason() {
+  public Reason getReason() {
     return reason;
   }
 }
diff --git a/user/src/com/google/gwt/core/client/JsonUtils.java b/user/src/com/google/gwt/core/client/JsonUtils.java
index 4fd9942..e44bb35 100644
--- a/user/src/com/google/gwt/core/client/JsonUtils.java
+++ b/user/src/com/google/gwt/core/client/JsonUtils.java
@@ -19,10 +19,8 @@
  * Provides JSON-related utility methods.
  */
 public class JsonUtils {
-  @SuppressWarnings("unused")
   private static JavaScriptObject escapeTable = initEscapeTable();
 
-  @SuppressWarnings("unused")
   private static final boolean hasJsonParse = hasJsonParse();
 
   /**
@@ -120,7 +118,6 @@
     throw new IllegalArgumentException(message);
   }
 
-  @SuppressWarnings("unused")
   private static native String escapeChar(String c) /*-{
     var lookedUp = @com.google.gwt.core.client.JsonUtils::escapeTable[c.charCodeAt(0)];
     return (lookedUp == null) ? c : lookedUp;
diff --git a/user/src/com/google/gwt/core/client/impl/CrossSiteIframeLoadingStrategy.java b/user/src/com/google/gwt/core/client/impl/CrossSiteIframeLoadingStrategy.java
index ec7386d..b056482 100644
--- a/user/src/com/google/gwt/core/client/impl/CrossSiteIframeLoadingStrategy.java
+++ b/user/src/com/google/gwt/core/client/impl/CrossSiteIframeLoadingStrategy.java
@@ -43,7 +43,6 @@
       return (IntToIntMap) JavaScriptObject.createArray();
     }
 
-    @SuppressWarnings("unused")
     protected IntToIntMap() {
     }
 
@@ -69,7 +68,6 @@
    * chain of references between the script tag and the function callback, and
    * IE 6/7 can't garbage collect them.
    */
-  @SuppressWarnings("unused")
   private static native void clearCallbacks(JavaScriptObject script) /*-{
     var nop = new Function('');
     script.onerror = script.onload = script.onreadystatechange = nop;
@@ -78,7 +76,6 @@
   /**
    * Clear the success callback for fragment <code>fragment</code>.
    */
-  @SuppressWarnings("unused")
   private static native void clearOnSuccess(int fragment) /*-{
     delete __gwtModuleFunction['runAsyncCallback'+fragment];
   }-*/;
diff --git a/user/src/com/google/gwt/core/client/impl/CrossSiteLoadingStrategy.java b/user/src/com/google/gwt/core/client/impl/CrossSiteLoadingStrategy.java
index bae5332..53d3aad 100644
--- a/user/src/com/google/gwt/core/client/impl/CrossSiteLoadingStrategy.java
+++ b/user/src/com/google/gwt/core/client/impl/CrossSiteLoadingStrategy.java
@@ -40,7 +40,6 @@
       return (IntToIntMap) JavaScriptObject.createArray();
     }
 
-    @SuppressWarnings("unused")
     protected IntToIntMap() {
     }
 
@@ -56,7 +55,6 @@
     }-*/;
   }
 
-  @SuppressWarnings("unused")
   private static RuntimeException LoadTerminated = new RuntimeException(
       "Code download terminated");
 
@@ -66,7 +64,6 @@
    * chain of references between the script tag and the function callback, and
    * IE 6/7 can't garbage collect them.
    */
-  @SuppressWarnings("unused")
   private static native void clearCallbacks(JavaScriptObject script) /*-{
     var nop = new Function('');
     script.onerror = script.onload = script.onreadystatechange = nop;
@@ -75,7 +72,6 @@
   /**
    * Clear the success callback for fragment <code>fragment</code>.
    */
-  @SuppressWarnings("unused")
   private static native void clearOnSuccess(int fragment) /*-{
     delete __gwtModuleFunction['runAsyncCallback'+fragment];
   }-*/;
diff --git a/user/src/com/google/gwt/core/client/impl/Impl.java b/user/src/com/google/gwt/core/client/impl/Impl.java
index 70fc457..8a90a7f 100644
--- a/user/src/com/google/gwt/core/client/impl/Impl.java
+++ b/user/src/com/google/gwt/core/client/impl/Impl.java
@@ -193,7 +193,6 @@
   /**
    * Implements {@link #entry(JavaScriptObject)}.
    */
-  @SuppressWarnings("unused")
   private static Object entry0(Object jsFunction, Object thisObj,
       Object arguments) throws Throwable {
     boolean initialEntry = enter();
@@ -252,7 +251,6 @@
    * <li>{@link com.google.gwt.user.client.rpc.impl.SerializerBase}</li>
    * </ul>
    */
-  @SuppressWarnings("unused")
   private static int getNextHashId() {
     return ++sNextHashId;
   }
diff --git a/user/src/com/google/gwt/core/client/impl/SchedulerImpl.java b/user/src/com/google/gwt/core/client/impl/SchedulerImpl.java
index 8dfaf7d..845bcb0 100644
--- a/user/src/com/google/gwt/core/client/impl/SchedulerImpl.java
+++ b/user/src/com/google/gwt/core/client/impl/SchedulerImpl.java
@@ -134,7 +134,6 @@
   /**
    * Called from scheduledFixedInterval to give $entry a static function.
    */
-  @SuppressWarnings("unused")
   private static boolean execute(RepeatingCommand cmd) {
     return cmd.execute();
   }
diff --git a/user/src/com/google/gwt/core/client/impl/StringBuilderImpl.java b/user/src/com/google/gwt/core/client/impl/StringBuilderImpl.java
index d2f39fa..6fb07fd 100644
--- a/user/src/com/google/gwt/core/client/impl/StringBuilderImpl.java
+++ b/user/src/com/google/gwt/core/client/impl/StringBuilderImpl.java
@@ -82,7 +82,6 @@
    * strings.
    */
   public static class ImplPush extends StringBuilderImpl {
-    @SuppressWarnings("unused")
     private String[] array = new String[0];
 
     @Override
diff --git a/user/src/com/google/gwt/dom/client/ButtonElement.java b/user/src/com/google/gwt/dom/client/ButtonElement.java
index 7bf3899..dcc5a1d 100644
--- a/user/src/com/google/gwt/dom/client/ButtonElement.java
+++ b/user/src/com/google/gwt/dom/client/ButtonElement.java
@@ -59,6 +59,7 @@
    * @see <a href="http://www.w3.org/TR/1999/REC-html401-19991224/interact/forms.html#adef-disabled">W3C HTML Specification</a>
    * @deprecated use {@link #isDisabled()} instead.
    */
+  @Deprecated
   public final native String getDisabled() /*-{
      return this.disabled;
    }-*/;
@@ -131,6 +132,7 @@
    * @see <a href="http://www.w3.org/TR/1999/REC-html401-19991224/interact/forms.html#adef-disabled">W3C HTML Specification</a>
    * @deprecated use {@link #setDisabled(boolean)} instead
    */
+  @Deprecated
   public final native void setDisabled(String disabled) /*-{
      this.disabled = disabled;
    }-*/;
diff --git a/user/src/com/google/gwt/dom/client/DOMImplMozilla.java b/user/src/com/google/gwt/dom/client/DOMImplMozilla.java
index 7891f97..fc68ef6 100644
--- a/user/src/com/google/gwt/dom/client/DOMImplMozilla.java
+++ b/user/src/com/google/gwt/dom/client/DOMImplMozilla.java
@@ -35,7 +35,6 @@
    * 
    * @return true if using Gecko 1.9.0 (Firefox 3) or earlier
    */
-  @SuppressWarnings("unused")
   private static boolean isGecko190OrBefore() {
     int geckoVersion = getGeckoVersion();
     return (geckoVersion != -1) && (geckoVersion <= 1009000);
@@ -46,7 +45,6 @@
    * 
    * @return true if using Gecko 1.9.1 (Firefox 3.5) or earlier
    */
-  @SuppressWarnings("unused")
   private static boolean isGecko191OrBefore() {
     int geckoVersion = getGeckoVersion();
     return (geckoVersion != -1) && (geckoVersion <= 1009001);
@@ -57,7 +55,6 @@
    * 
    * @return true if using Gecko 2.0.0 (Firefox 4.0) or earlier
    */
-  @SuppressWarnings("unused")
   private static boolean isGecko2OrBefore() {
     int geckoVersion = getGeckoVersion();
     return (geckoVersion != -1) && (geckoVersion < 2000000);
diff --git a/user/src/com/google/gwt/dom/client/DOMImplOpera.java b/user/src/com/google/gwt/dom/client/DOMImplOpera.java
index 234e62d..a205126 100644
--- a/user/src/com/google/gwt/dom/client/DOMImplOpera.java
+++ b/user/src/com/google/gwt/dom/client/DOMImplOpera.java
@@ -108,7 +108,6 @@
     elem.scrollIntoView();
   }-*/;
 
-  @SuppressWarnings("unused")
   private native NativeEvent createKeyEvent(Document doc, String type,
       boolean canBubble, boolean cancelable, boolean ctrlKey, boolean altKey,
       boolean shiftKey, boolean metaKey) /*-{
diff --git a/user/src/com/google/gwt/dom/client/DOMImplStandardBase.java b/user/src/com/google/gwt/dom/client/DOMImplStandardBase.java
index a2deb0d..ab620f7 100644
--- a/user/src/com/google/gwt/dom/client/DOMImplStandardBase.java
+++ b/user/src/com/google/gwt/dom/client/DOMImplStandardBase.java
@@ -24,7 +24,6 @@
 
   private static class ClientRect extends JavaScriptObject {
     
-    @SuppressWarnings("unused")
     protected ClientRect() {
     }
 
@@ -281,7 +280,6 @@
     doc.getBody().setScrollTop(top);
   }
 
-  @SuppressWarnings("unused")
   private native NativeEvent createKeyEvent(Document doc, String type,
       boolean canBubble, boolean cancelable, boolean ctrlKey, boolean altKey,
       boolean shiftKey, boolean metaKey) /*-{
diff --git a/user/src/com/google/gwt/dom/client/DOMImplWebkit.java b/user/src/com/google/gwt/dom/client/DOMImplWebkit.java
index d292af9..cff3081 100644
--- a/user/src/com/google/gwt/dom/client/DOMImplWebkit.java
+++ b/user/src/com/google/gwt/dom/client/DOMImplWebkit.java
@@ -25,7 +25,6 @@
    * 
    * @return true if using Webkit 525.x (Safari 3) or earlier.
    */
-  @SuppressWarnings("unused")
   private static native boolean isWebkit525OrBefore() /*-{
     var result = /safari\/([\d.]+)/.exec(navigator.userAgent.toLowerCase());
     if (result) {
diff --git a/user/src/com/google/gwt/dom/client/LinkElement.java b/user/src/com/google/gwt/dom/client/LinkElement.java
index 979243e..7169bc2 100644
--- a/user/src/com/google/gwt/dom/client/LinkElement.java
+++ b/user/src/com/google/gwt/dom/client/LinkElement.java
@@ -43,6 +43,7 @@
    * links, and may be used to activate or deactivate style sheets.
    * @deprecated use {@link #isDisabled()} instead.
    */
+  @Deprecated
   public final native boolean getDisabled() /*-{
     return !!this.disabled;
   }-*/;
diff --git a/user/src/com/google/gwt/dom/client/OptGroupElement.java b/user/src/com/google/gwt/dom/client/OptGroupElement.java
index 2527d38..1b1511b 100644
--- a/user/src/com/google/gwt/dom/client/OptGroupElement.java
+++ b/user/src/com/google/gwt/dom/client/OptGroupElement.java
@@ -43,6 +43,7 @@
    * @see <a href="http://www.w3.org/TR/1999/REC-html401-19991224/interact/forms.html#adef-disabled">W3C HTML Specification</a>
    * @deprecated use {@link #isDisabled()} instead.
    */
+  @Deprecated
   public final native String getDisabled() /*-{
      return this.disabled;
    }-*/;
diff --git a/user/src/com/google/gwt/dom/client/SelectElement.java b/user/src/com/google/gwt/dom/client/SelectElement.java
index 70d2234..7fc7c5e 100644
--- a/user/src/com/google/gwt/dom/client/SelectElement.java
+++ b/user/src/com/google/gwt/dom/client/SelectElement.java
@@ -68,6 +68,7 @@
    * @see <a href="http://www.w3.org/TR/1999/REC-html401-19991224/interact/forms.html#adef-disabled">W3C HTML Specification</a>
    * @deprecated use {@link #isDisabled()} instead.
    */
+  @Deprecated
   public final native String getDisabled() /*-{
      return this.disabled;
    }-*/;
diff --git a/user/src/com/google/gwt/dom/client/StyleElement.java b/user/src/com/google/gwt/dom/client/StyleElement.java
index 9f3e3d6..4469062 100644
--- a/user/src/com/google/gwt/dom/client/StyleElement.java
+++ b/user/src/com/google/gwt/dom/client/StyleElement.java
@@ -50,6 +50,7 @@
    * Enables/disables the style sheet.
    * @deprecated use {@link #isDisabled()} instead
    */
+  @Deprecated
   public final native boolean getDisabled() /*-{
      return !!this.disabled;
    }-*/;
diff --git a/user/src/com/google/gwt/dom/client/TextAreaElement.java b/user/src/com/google/gwt/dom/client/TextAreaElement.java
index dfded7d..b1b7d16 100644
--- a/user/src/com/google/gwt/dom/client/TextAreaElement.java
+++ b/user/src/com/google/gwt/dom/client/TextAreaElement.java
@@ -67,6 +67,7 @@
   /**
    * @deprecated use {@link #isDisabled()} instead
    */
+  @Deprecated
   public final native boolean getDisabled() /*-{
     return !!this.disabled;
   }-*/;
@@ -91,6 +92,7 @@
   /**
    * @deprecated use {@link #isReadOnly()} instead.
    */
+  @Deprecated
   public final native boolean getReadOnly() /*-{
     return !!this.readOnly;
   }-*/;
diff --git a/user/src/com/google/gwt/editor/client/EditorDriver.java b/user/src/com/google/gwt/editor/client/EditorDriver.java
index 8fff6c6..97dda76 100644
--- a/user/src/com/google/gwt/editor/client/EditorDriver.java
+++ b/user/src/com/google/gwt/editor/client/EditorDriver.java
@@ -59,7 +59,7 @@
 
   /**
    * Returns {@code true} if any of the Editors in the hierarchy have been
-   * modified relative to the last value passed into {@link #edit(Object)}.
+   * modified relative to the last value passed into {@link SimpleBeanEditorDriver#edit(Object)}.
    * <p>
    * This method is not affected by {@link #flush()} to support the following
    * workflow:
diff --git a/user/src/com/google/gwt/editor/client/impl/AbstractEditorContext.java b/user/src/com/google/gwt/editor/client/impl/AbstractEditorContext.java
index 8f33519..0123552 100644
--- a/user/src/com/google/gwt/editor/client/impl/AbstractEditorContext.java
+++ b/user/src/com/google/gwt/editor/client/impl/AbstractEditorContext.java
@@ -48,15 +48,15 @@
      * TODO(bobv): Determine if pre-casting is better than demand-casting or
      * generating the asFoo methods.
      */
-    compositeEditor = editor instanceof CompositeEditor
+    compositeEditor = editor instanceof CompositeEditor<?, ?, ?>
         ? (CompositeEditor<?, ?, ?>) editor : null;
-    hasEditorDelegate = editor instanceof HasEditorDelegate
+    hasEditorDelegate = editor instanceof HasEditorDelegate<?>
         ? (HasEditorDelegate<T>) editor : null;
-    hasEditorErrors = editor instanceof HasEditorErrors
+    hasEditorErrors = editor instanceof HasEditorErrors<?>
         ? (HasEditorErrors<T>) editor : null;
-    leafValueEditor = editor instanceof LeafValueEditor
+    leafValueEditor = editor instanceof LeafValueEditor<?>
         ? (LeafValueEditor<T>) editor : null;
-    valueAwareEditor = editor instanceof ValueAwareEditor
+    valueAwareEditor = editor instanceof ValueAwareEditor<?>
         ? (ValueAwareEditor<T>) editor : null;
   }
 
diff --git a/user/src/com/google/gwt/editor/client/impl/Flusher.java b/user/src/com/google/gwt/editor/client/impl/Flusher.java
index 4b682b7..d00643e 100644
--- a/user/src/com/google/gwt/editor/client/impl/Flusher.java
+++ b/user/src/com/google/gwt/editor/client/impl/Flusher.java
@@ -43,7 +43,6 @@
     assert delegate != null;
 
     if (asValue != null) {
-      assert delegate != null : "ValueAwareEditor without delegate";
       if (delegate.shouldFlush()) {
         asValue.flush();
       }
diff --git a/user/src/com/google/gwt/editor/client/impl/Refresher.java b/user/src/com/google/gwt/editor/client/impl/Refresher.java
index dd34bde..dee6f18 100644
--- a/user/src/com/google/gwt/editor/client/impl/Refresher.java
+++ b/user/src/com/google/gwt/editor/client/impl/Refresher.java
@@ -25,6 +25,7 @@
  * the editor and delegate hiererchy.
  */
 public class Refresher extends EditorVisitor {
+  @Override
   public <Q> boolean visit(EditorContext<Q> ctx) {
     Q toSet = ctx.getFromModel();
     @SuppressWarnings("unchecked")
diff --git a/user/src/com/google/gwt/editor/client/impl/SimpleViolation.java b/user/src/com/google/gwt/editor/client/impl/SimpleViolation.java
index bfa4d03..1293477 100644
--- a/user/src/com/google/gwt/editor/client/impl/SimpleViolation.java
+++ b/user/src/com/google/gwt/editor/client/impl/SimpleViolation.java
@@ -73,14 +73,17 @@
       this.v = v;
     }
 
+    @Override
     public Object getKey() {
       return v.getLeafBean();
     }
 
+    @Override
     public String getMessage() {
       return v.getMessage();
     }
 
+    @Override
     public String getPath() {
       /*
        * TODO(bobv,nchalko): Determine the correct way to extract this
@@ -89,6 +92,7 @@
       return v.getPropertyPath().toString();
     }
 
+    @Override
     public Object getUserDataObject() {
       return v;
     }
diff --git a/user/src/com/google/gwt/event/dom/client/PrivateMap.java b/user/src/com/google/gwt/event/dom/client/PrivateMap.java
index 0a03cf0..9f264bf 100644
--- a/user/src/com/google/gwt/event/dom/client/PrivateMap.java
+++ b/user/src/com/google/gwt/event/dom/client/PrivateMap.java
@@ -38,7 +38,6 @@
       return JavaScriptObject.createObject().cast();
     }
 
-    @SuppressWarnings("unused")
     protected JsMap() {
     }
 
diff --git a/user/src/com/google/gwt/event/shared/HandlerManager.java b/user/src/com/google/gwt/event/shared/HandlerManager.java
index 73d181e..7b01a51 100644
--- a/user/src/com/google/gwt/event/shared/HandlerManager.java
+++ b/user/src/com/google/gwt/event/shared/HandlerManager.java
@@ -25,7 +25,7 @@
  * While widget authors should continue to use
  * {@link com.google.gwt.user.client.ui.Widget#addDomHandler(EventHandler, com.google.gwt.event.dom.client.DomEvent.Type)}
  * and
- * {@link com.google.gwt.user.client.ui.Widget#addHandler(EventHandler, Type)},
+ * {@link com.google.gwt.user.client.ui.Widget#addHandler(EventHandler, com.google.gwt.event.shared.GwtEvent.Type)},
  * application developers are strongly discouraged from using a HandlerManager
  * instance as a global event dispatch mechanism.
  */
diff --git a/user/src/com/google/gwt/i18n/client/impl/ConstantMap.java b/user/src/com/google/gwt/i18n/client/impl/ConstantMap.java
index 5d206e2..54cd42c 100644
--- a/user/src/com/google/gwt/i18n/client/impl/ConstantMap.java
+++ b/user/src/com/google/gwt/i18n/client/impl/ConstantMap.java
@@ -98,7 +98,6 @@
    * Stores a fast lookup in a JSO using ':' to prevent conflict with built-in
    * JavaScript properties.
    */
-  @SuppressWarnings("unused")
   private JavaScriptObject map;
 
   public ConstantMap(String keys[], String values[]) {
diff --git a/user/src/com/google/gwt/i18n/rebind/AbstractLocalizableImplCreator.java b/user/src/com/google/gwt/i18n/rebind/AbstractLocalizableImplCreator.java
index 1d9db90..a9285ed 100644
--- a/user/src/com/google/gwt/i18n/rebind/AbstractLocalizableImplCreator.java
+++ b/user/src/com/google/gwt/i18n/rebind/AbstractLocalizableImplCreator.java
@@ -58,7 +58,6 @@
  * Represents generic functionality needed for <code>Constants</code> and
  * <code>Messages</code> classes.
  */
-@SuppressWarnings("deprecation")
 abstract class AbstractLocalizableImplCreator extends
     AbstractGeneratorClassCreator {
 
diff --git a/user/src/com/google/gwt/i18n/rebind/AnnotationsResource.java b/user/src/com/google/gwt/i18n/rebind/AnnotationsResource.java
index 78992c7..8fde38c 100644
--- a/user/src/com/google/gwt/i18n/rebind/AnnotationsResource.java
+++ b/user/src/com/google/gwt/i18n/rebind/AnnotationsResource.java
@@ -479,11 +479,9 @@
         entry.description = description.value();
       }
       // use full name to avoid deprecation warnings in the imports
-      @SuppressWarnings("deprecation")
       com.google.gwt.i18n.client.Messages.PluralText pluralText = method
           .getAnnotation(com.google.gwt.i18n.client.Messages.PluralText.class);
       if (pluralText != null) {
-        @SuppressWarnings("deprecation")
         String[] pluralForms = pluralText.value();
         if ((pluralForms.length & 1) != 0) {
           throw new AnnotationsError(
diff --git a/user/src/com/google/gwt/i18n/server/MessageFormatUtils.java b/user/src/com/google/gwt/i18n/server/MessageFormatUtils.java
index 7303301..6400d85 100644
--- a/user/src/com/google/gwt/i18n/server/MessageFormatUtils.java
+++ b/user/src/com/google/gwt/i18n/server/MessageFormatUtils.java
@@ -339,7 +339,6 @@
       }
     };
 
-
     /**
      * Assemble a message from its parsed chunks.
      * 
diff --git a/user/src/com/google/gwt/i18n/shared/AlternateMessageSelector.java b/user/src/com/google/gwt/i18n/shared/AlternateMessageSelector.java
index 18bd259..d2456c3 100644
--- a/user/src/com/google/gwt/i18n/shared/AlternateMessageSelector.java
+++ b/user/src/com/google/gwt/i18n/shared/AlternateMessageSelector.java
@@ -15,7 +15,6 @@
  */
 package com.google.gwt.i18n.shared;
 
-
 /**
  * Defines a way of choosing between alternate messages based on a parameter
  * value.
diff --git a/user/src/com/google/gwt/i18n/shared/BidiFormatterBase.java b/user/src/com/google/gwt/i18n/shared/BidiFormatterBase.java
index 91f83fe..d604a2e 100644
--- a/user/src/com/google/gwt/i18n/shared/BidiFormatterBase.java
+++ b/user/src/com/google/gwt/i18n/shared/BidiFormatterBase.java
@@ -194,7 +194,7 @@
   }
 
   /**
-   * @see BidiFormatter#knownDirAttr(Direction)
+   * @see BidiFormatter#knownDirAttr(HasDirection.Direction)
    *
    * @param dir Given direction
    * @return "dir=rtl" for RTL text in non-RTL context; "dir=ltr" for LTR text
@@ -246,7 +246,7 @@
   }
 
   /**
-   * @see BidiFormatter#spanWrapWithKnownDir(Direction, String, boolean, boolean)
+   * @see BidiFormatter#spanWrapWithKnownDir(HasDirection.Direction, String, boolean, boolean)
    *
    * @param dir {@code str}'s direction
    * @param str The input string
@@ -304,7 +304,7 @@
   }
 
   /**
-   * @see BidiFormatter#unicodeWrapWithKnownDir(Direction, String, boolean, boolean)
+   * @see BidiFormatter#unicodeWrapWithKnownDir(HasDirection.Direction, String, boolean, boolean)
    *
    * @param dir {@code str}'s direction
    * @param str The input string
diff --git a/user/src/com/google/gwt/json/client/JSONArray.java b/user/src/com/google/gwt/json/client/JSONArray.java
index cc8aa31..fc38f8b 100644
--- a/user/src/com/google/gwt/json/client/JSONArray.java
+++ b/user/src/com/google/gwt/json/client/JSONArray.java
@@ -25,7 +25,6 @@
   /**
    * Called from {@link #getUnwrapper()}. 
    */
-  @SuppressWarnings("unused")
   private static JavaScriptObject unwrap(JSONArray value) {
     return value.jsArray;
   }
diff --git a/user/src/com/google/gwt/json/client/JSONBoolean.java b/user/src/com/google/gwt/json/client/JSONBoolean.java
index d92b8f1..8057f9b 100644
--- a/user/src/com/google/gwt/json/client/JSONBoolean.java
+++ b/user/src/com/google/gwt/json/client/JSONBoolean.java
@@ -45,7 +45,6 @@
   /**
    * Called from {@link #getUnwrapper()}. 
    */
-  @SuppressWarnings("unused")
   private static boolean unwrap(JSONBoolean value) {
     return value.value;
   }
diff --git a/user/src/com/google/gwt/json/client/JSONNull.java b/user/src/com/google/gwt/json/client/JSONNull.java
index d9717c5..8da5c87 100644
--- a/user/src/com/google/gwt/json/client/JSONNull.java
+++ b/user/src/com/google/gwt/json/client/JSONNull.java
@@ -34,7 +34,6 @@
   /**
    * Called from {@link #getUnwrapper()}. 
    */
-  @SuppressWarnings("unused")
   private static JavaScriptObject unwrap() {
     return null;
   }
diff --git a/user/src/com/google/gwt/json/client/JSONNumber.java b/user/src/com/google/gwt/json/client/JSONNumber.java
index 1b9eea3..36bdd68 100644
--- a/user/src/com/google/gwt/json/client/JSONNumber.java
+++ b/user/src/com/google/gwt/json/client/JSONNumber.java
@@ -25,7 +25,6 @@
   /**
    * Called from {@link #getUnwrapper()}. 
    */
-  @SuppressWarnings("unused")
   private static double unwrap(JSONNumber value) {
     return value.value;
   }
diff --git a/user/src/com/google/gwt/json/client/JSONObject.java b/user/src/com/google/gwt/json/client/JSONObject.java
index bc186e7..7bc225c 100644
--- a/user/src/com/google/gwt/json/client/JSONObject.java
+++ b/user/src/com/google/gwt/json/client/JSONObject.java
@@ -35,7 +35,6 @@
   /**
    * Called from {@link #getUnwrapper()}. 
    */
-  @SuppressWarnings("unused")
   private static JavaScriptObject unwrap(JSONObject value) {
     return value.jsObject;
   }
diff --git a/user/src/com/google/gwt/json/client/JSONParser.java b/user/src/com/google/gwt/json/client/JSONParser.java
index 20320dd..7ab1855 100644
--- a/user/src/com/google/gwt/json/client/JSONParser.java
+++ b/user/src/com/google/gwt/json/client/JSONParser.java
@@ -99,7 +99,6 @@
   /**
    * Called from {@link #initTypeMap()}.
    */
-  @SuppressWarnings("unused")
   private static JSONValue createBoolean(boolean v) {
     return JSONBoolean.getInstance(v);
   }
@@ -107,7 +106,6 @@
   /**
    * Called from {@link #initTypeMap()}.
    */
-  @SuppressWarnings("unused")
   private static JSONValue createNumber(double v) {
     return new JSONNumber(v);
   }
@@ -117,7 +115,6 @@
    * either <code>null</code> (not <code>undefined</code>) or a JavaScript
    * object.
    */
-  @SuppressWarnings("unused")
   private static native JSONValue createObject(Object o) /*-{
     if (!o) {
       return @com.google.gwt.json.client.JSONNull::getInstance()();
@@ -143,7 +140,6 @@
   /**
    * Called from {@link #initTypeMap()}.
    */
-  @SuppressWarnings("unused")
   private static JSONValue createString(String v) {
     return new JSONString(v);
   }
@@ -152,7 +148,6 @@
    * Called from {@link #initTypeMap()}. This method returns a <code>null</code>
    * pointer, representing JavaScript <code>undefined</code>.
    */
-  @SuppressWarnings("unused")
   private static JSONValue createUndefined() {
     return null;
   }
diff --git a/user/src/com/google/gwt/json/client/JSONString.java b/user/src/com/google/gwt/json/client/JSONString.java
index abdb44d..2e17877 100644
--- a/user/src/com/google/gwt/json/client/JSONString.java
+++ b/user/src/com/google/gwt/json/client/JSONString.java
@@ -26,7 +26,6 @@
   /**
    * Called from {@link #getUnwrapper()}. 
    */
-  @SuppressWarnings("unused")
   private static String unwrap(JSONString value) {
     return value.value;
   }
diff --git a/user/src/com/google/gwt/jsonp/client/JsonpRequest.java b/user/src/com/google/gwt/jsonp/client/JsonpRequest.java
index c2859af..f450558 100644
--- a/user/src/com/google/gwt/jsonp/client/JsonpRequest.java
+++ b/user/src/com/google/gwt/jsonp/client/JsonpRequest.java
@@ -34,7 +34,6 @@
   /**
    * A global JS variable that holds the next index to use.
    */
-  @SuppressWarnings("unused") // accessed from JSNI
   private static final String CALLBACKS_COUNTER_NAME = "__gwt_jsonp_counter__";
 
   /**
@@ -44,7 +43,7 @@
   private static final JavaScriptObject CALLBACKS = getOrCreateCallbacksObject();
 
   /**
-   * Prefix appended to all id's that are determined by the callbacks counter
+   * Prefix appended to all id's that are determined by the callbacks counter.
    */
   private static final String INCREMENTAL_ID_PREFIX = "P";
 
@@ -99,7 +98,6 @@
   /**
    * Whether the result is expected to be an integer or not.
    */
-  @SuppressWarnings("unused") // used by JSNI
   private final boolean expectInteger;
 
   private final String callbackParam;
@@ -225,7 +223,6 @@
     getHeadElement().appendChild(script);
   }
   
-  @SuppressWarnings("unused") // used by JSNI
   private void onFailure(String message) {
     onFailure(new Exception(message));
   }
@@ -241,7 +238,6 @@
     }
   }
 
-  @SuppressWarnings("unused") // used by JSNI
   private void onSuccess(T data) {
     timer.cancel();
     try {
diff --git a/user/src/com/google/gwt/junit/tools/GWTTestSuite.java b/user/src/com/google/gwt/junit/tools/GWTTestSuite.java
index 7b1fe59..08a81a3 100644
--- a/user/src/com/google/gwt/junit/tools/GWTTestSuite.java
+++ b/user/src/com/google/gwt/junit/tools/GWTTestSuite.java
@@ -109,7 +109,6 @@
    * Breaks non-homogeneous suites into two or more homogeneous suites. A
    * homogeneous suite is one in which all tests run within a single module.
    */
-  @SuppressWarnings("unchecked")
   private TestSuite[] homogenize(TestSuite suite) {
     String suiteName = suite.getName();
 
diff --git a/user/src/com/google/gwt/layout/client/LayoutImplIE6.java b/user/src/com/google/gwt/layout/client/LayoutImplIE6.java
index 70a0856..8e7513c 100644
--- a/user/src/com/google/gwt/layout/client/LayoutImplIE6.java
+++ b/user/src/com/google/gwt/layout/client/LayoutImplIE6.java
@@ -52,7 +52,6 @@
     return styleRuler;
   }
 
-  @SuppressWarnings("unused") // called from JSNI
   private static void hookWindowResize(final Element elem) {
     Window.addResizeHandler(new ResizeHandler() {
       public void onResize(ResizeEvent event) {
@@ -61,7 +60,6 @@
     });
   }
 
-  @SuppressWarnings("unused") // called from JSNI
   private static native void measureDecoration(Element elem) /*-{
     var ruler = elem.__styleRuler;
     var inner = ruler.children[0];
@@ -246,7 +244,6 @@
     ruler.onresize = null;
   }-*/;
 
-  @SuppressWarnings("unused") // called from JSNI
   private void resizeHandler(Element parent) {
     resizeHandler(parent, false);
   }
diff --git a/user/src/com/google/gwt/media/dom/client/package-info.java b/user/src/com/google/gwt/media/dom/client/package-info.java
index 88e740d..3d4652e 100644
--- a/user/src/com/google/gwt/media/dom/client/package-info.java
+++ b/user/src/com/google/gwt/media/dom/client/package-info.java
@@ -15,7 +15,6 @@
  */
 
 /**
- * <p>
  * DOM classes for HTML Audio and Video support.
  */
 @com.google.gwt.util.PreventSpuriousRebuilds
diff --git a/user/src/com/google/gwt/place/shared/PlaceHistoryHandler.java b/user/src/com/google/gwt/place/shared/PlaceHistoryHandler.java
index 51aa52f..7117169 100644
--- a/user/src/com/google/gwt/place/shared/PlaceHistoryHandler.java
+++ b/user/src/com/google/gwt/place/shared/PlaceHistoryHandler.java
@@ -59,7 +59,7 @@
      * Adds a {@link com.google.gwt.event.logical.shared.ValueChangeEvent}
      * handler to be informed of changes to the browser's history stack.
      * 
-     * @param handler the handler
+     * @param valueChangeHandler the handler
      * @return the registration used to remove this value change handler
      */
     HandlerRegistration addValueChangeHandler(
diff --git a/user/src/com/google/gwt/requestfactory/client/DefaultRequestTransport.java b/user/src/com/google/gwt/requestfactory/client/DefaultRequestTransport.java
index 6cc5306..259fa04 100644
--- a/user/src/com/google/gwt/requestfactory/client/DefaultRequestTransport.java
+++ b/user/src/com/google/gwt/requestfactory/client/DefaultRequestTransport.java
@@ -117,7 +117,7 @@
    * {@link com.google.gwt.requestfactory.shared.RequestTransport.TransportReceiver
    * TransportReceiver} interface.
    * 
-   * @param receiver a {@link TransportReceiver}
+   * @param receiver a {@link com.google.gwt.requestfactory.shared.RequestTransport.TransportReceiver TransportReceiver}
    * @return a {@link RequestCallback} instance
    */
   protected RequestCallback createRequestCallback(
diff --git a/user/src/com/google/gwt/requestfactory/client/HasRequestContext.java b/user/src/com/google/gwt/requestfactory/client/HasRequestContext.java
index 0482875..ceab7e5 100644
--- a/user/src/com/google/gwt/requestfactory/client/HasRequestContext.java
+++ b/user/src/com/google/gwt/requestfactory/client/HasRequestContext.java
@@ -33,8 +33,8 @@
    * {@code null} if {@link RequestFactoryEditorDriver#display(Object)
    * display()} is called.
    * 
-   * @param the RequestContext associated with the current editing session which
-   *          may be {@code null}
+   * @param ctx the RequestContext associated with the current editing session
+   *          which may be {@code null}
    */
   void setRequestContext(RequestContext ctx);
 }
diff --git a/user/src/com/google/gwt/requestfactory/client/RequestFactoryEditorDriver.java b/user/src/com/google/gwt/requestfactory/client/RequestFactoryEditorDriver.java
index 71cb681..72e4bf5 100644
--- a/user/src/com/google/gwt/requestfactory/client/RequestFactoryEditorDriver.java
+++ b/user/src/com/google/gwt/requestfactory/client/RequestFactoryEditorDriver.java
@@ -44,8 +44,7 @@
  * @param <P> the type of Proxy being edited
  * @param <E> the type of Editor that will edit the Record
  * @see HasRequestContext
- * @see {@link com.google.gwt.requestfactory.client.testing.MockRequestFactoryEditorDriver
- *      MockRequestFactoryEditorDriver}
+ * @see com.google.gwt.requestfactory.client.testing.MockRequestFactoryEditorDriver MockRequestFactoryEditorDriver
  */
 public interface RequestFactoryEditorDriver<P, E extends Editor<? super P>>
     extends EditorDriver<RequestContext> {
diff --git a/user/src/com/google/gwt/requestfactory/client/impl/AbstractRequestFactoryEditorDriver.java b/user/src/com/google/gwt/requestfactory/client/impl/AbstractRequestFactoryEditorDriver.java
index d60cf8c..3a44c48 100644
--- a/user/src/com/google/gwt/requestfactory/client/impl/AbstractRequestFactoryEditorDriver.java
+++ b/user/src/com/google/gwt/requestfactory/client/impl/AbstractRequestFactoryEditorDriver.java
@@ -60,18 +60,22 @@
       this.v = v;
     }
 
+    @Override
     public Object getKey() {
       return v.getOriginalProxy();
     }
 
+    @Override
     public String getMessage() {
       return v.getMessage();
     }
 
+    @Override
     public String getPath() {
       return v.getPath();
     }
 
+    @Override
     public Object getUserDataObject() {
       return v;
     }
diff --git a/user/src/com/google/gwt/requestfactory/client/impl/PathCollector.java b/user/src/com/google/gwt/requestfactory/client/impl/PathCollector.java
index 01a5fdf..0b71f8c 100644
--- a/user/src/com/google/gwt/requestfactory/client/impl/PathCollector.java
+++ b/user/src/com/google/gwt/requestfactory/client/impl/PathCollector.java
@@ -39,6 +39,7 @@
     return new ArrayList<String>(paths);
   }
 
+  @Override
   public <T> boolean visit(EditorContext<T> ctx) {
     String path = ctx.getAbsolutePath();
     if (path.length() > 0) {
diff --git a/user/src/com/google/gwt/requestfactory/server/Logging.java b/user/src/com/google/gwt/requestfactory/server/Logging.java
index cbcb1b0..b825e68 100644
--- a/user/src/com/google/gwt/requestfactory/server/Logging.java
+++ b/user/src/com/google/gwt/requestfactory/server/Logging.java
@@ -35,8 +35,8 @@
   /**
    * Logs a message.
    * 
-   * @param serializedLogRecordString a json serialized LogRecord, as provided by
-   * {@link com.google.gwt.logging.client.JsonLogRecordClientUtil.logRecordAsJsonObject(LogRecord)}
+   * @param logRecordJson a json serialized LogRecord, as provided by
+   * {@link com.google.gwt.logging.client.JsonLogRecordClientUtil#logRecordAsJsonObject(LogRecord)}
    * @throws RemoteLoggingException if logging fails
    */
   public static void logMessage(String logRecordJson)
diff --git a/user/src/com/google/gwt/requestfactory/server/RequestFactoryInterfaceValidator.java b/user/src/com/google/gwt/requestfactory/server/RequestFactoryInterfaceValidator.java
index f558697..1fe1c84 100644
--- a/user/src/com/google/gwt/requestfactory/server/RequestFactoryInterfaceValidator.java
+++ b/user/src/com/google/gwt/requestfactory/server/RequestFactoryInterfaceValidator.java
@@ -497,10 +497,12 @@
       return found.toArray(new Type[found.size()]);
     }
 
+    @Override
     public SignatureVisitor visitArrayType() {
       return this;
     }
 
+    @Override
     public SignatureVisitor visitClassBound() {
       return this;
     }
@@ -510,30 +512,37 @@
       found.add(Type.getObjectType(name));
     }
 
+    @Override
     public SignatureVisitor visitExceptionType() {
       return this;
     }
 
+    @Override
     public SignatureVisitor visitInterface() {
       return this;
     }
 
+    @Override
     public SignatureVisitor visitInterfaceBound() {
       return this;
     }
 
+    @Override
     public SignatureVisitor visitParameterType() {
       return this;
     }
 
+    @Override
     public SignatureVisitor visitReturnType() {
       return this;
     }
 
+    @Override
     public SignatureVisitor visitSuperclass() {
       return this;
     }
 
+    @Override
     public SignatureVisitor visitTypeArgument(char wildcard) {
       return this;
     }
diff --git a/user/src/com/google/gwt/requestfactory/server/RequestState.java b/user/src/com/google/gwt/requestfactory/server/RequestState.java
index 520e6d7..79eda0a 100644
--- a/user/src/com/google/gwt/requestfactory/server/RequestState.java
+++ b/user/src/com/google/gwt/requestfactory/server/RequestState.java
@@ -185,7 +185,7 @@
 
   /**
    * If the given domain object has been previously associated with an id,
-   * return it
+   * return it.
    */
   public SimpleProxyId<?> getStableId(Object domain) {
     return domainObjectsToId.get(domain);
diff --git a/user/src/com/google/gwt/requestfactory/server/Resolver.java b/user/src/com/google/gwt/requestfactory/server/Resolver.java
index 5762f28..b7be1ce 100644
--- a/user/src/com/google/gwt/requestfactory/server/Resolver.java
+++ b/user/src/com/google/gwt/requestfactory/server/Resolver.java
@@ -217,9 +217,9 @@
       return domain;
     } else if (maybeEntityProxy instanceof Collection<?>) {
       Collection<Object> accumulator;
-      if (maybeEntityProxy instanceof List) {
+      if (maybeEntityProxy instanceof List<?>) {
         accumulator = new ArrayList<Object>();
-      } else if (maybeEntityProxy instanceof Set) {
+      } else if (maybeEntityProxy instanceof Set<?>) {
         accumulator = new HashSet<Object>();
       } else {
         throw new ReportableException("Unsupported collection type "
diff --git a/user/src/com/google/gwt/requestfactory/server/ServiceLayer.java b/user/src/com/google/gwt/requestfactory/server/ServiceLayer.java
index 7a58918..db37806 100644
--- a/user/src/com/google/gwt/requestfactory/server/ServiceLayer.java
+++ b/user/src/com/google/gwt/requestfactory/server/ServiceLayer.java
@@ -283,8 +283,7 @@
    * @param domainClass the server-side type to be transported to the client
    * @param clientType the type to which the returned type must be assignable
    * @param required if {@code true} and no mapping is available, throw an
-   *          {@link UnexpectedException}, othrewise the method will return
-   *          {@code null}
+   *          exception, otherwise the method will return {@code null}
    * @return a class that represents {@code domainClass} on the client which is
    *         assignable to {@code clientType}
    */
@@ -335,7 +334,7 @@
   /**
    * Given a RequestContext method declaration, resolve the
    * {@link ServiceLocator} that should be used when invoking the domain method.
-   * This method will only be called if {@link #requiresServiceLocator(Method)}
+   * This method will only be called if {@link #requiresServiceLocator(Method, Method)}
    * returned {@code true} for the associated domain method.
    * 
    * @param contextMethod a RequestContext method declaration
diff --git a/user/src/com/google/gwt/requestfactory/server/ServiceLayerDecorator.java b/user/src/com/google/gwt/requestfactory/server/ServiceLayerDecorator.java
index 27bcbf4..92293c2 100644
--- a/user/src/com/google/gwt/requestfactory/server/ServiceLayerDecorator.java
+++ b/user/src/com/google/gwt/requestfactory/server/ServiceLayerDecorator.java
@@ -211,8 +211,8 @@
    * Report an exception thrown by code that is under the control of the
    * end-developer.
    * 
-   * @param an {@link InvocationTargetException} thrown by an invocation of
-   *          user-provided code
+   * @param userGeneratedException an {@link InvocationTargetException} thrown
+   *          by an invocation of user-provided code
    * @throws ReportableException this method never returns normally
    */
   protected final <T> T report(InvocationTargetException userGeneratedException)
diff --git a/user/src/com/google/gwt/requestfactory/server/testing/InProcessRequestContext.java b/user/src/com/google/gwt/requestfactory/server/testing/InProcessRequestContext.java
index 2f74d22..3ef94cf 100644
--- a/user/src/com/google/gwt/requestfactory/server/testing/InProcessRequestContext.java
+++ b/user/src/com/google/gwt/requestfactory/server/testing/InProcessRequestContext.java
@@ -38,7 +38,7 @@
 import java.util.Collection;
 
 /**
- * An in-process implementation of RequestContext
+ * An in-process implementation of RequestContext.
  */
 class InProcessRequestContext extends AbstractRequestContext {
   class RequestContextHandler implements InvocationHandler {
diff --git a/user/src/com/google/gwt/requestfactory/shared/EntityProxyChange.java b/user/src/com/google/gwt/requestfactory/shared/EntityProxyChange.java
index 1c59370..0f8b1a4 100644
--- a/user/src/com/google/gwt/requestfactory/shared/EntityProxyChange.java
+++ b/user/src/com/google/gwt/requestfactory/shared/EntityProxyChange.java
@@ -85,7 +85,7 @@
   /**
    * Returns the type associated with this instance.
    *
-   * @return an instance of {@link GwtEvent.Type} of type Handler&lt;P&gt
+   * @return an instance of {@link com.google.gwt.event.shared.GwtEvent.Type Type} of type Handler&lt;P&gt
    */
   @SuppressWarnings({"unchecked", "rawtypes"})
   @Override
diff --git a/user/src/com/google/gwt/requestfactory/shared/LoggingRequest.java b/user/src/com/google/gwt/requestfactory/shared/LoggingRequest.java
index 776d9f4..3dfe6d8 100644
--- a/user/src/com/google/gwt/requestfactory/shared/LoggingRequest.java
+++ b/user/src/com/google/gwt/requestfactory/shared/LoggingRequest.java
@@ -31,7 +31,7 @@
    * Log a message on the server.
    *
    * @param serializedLogRecordString a json serialized LogRecord, as provided by
-   * {@link com.google.gwt.logging.client.JsonLogRecordClientUtil.logRecordAsJsonObject(LogRecord)}
+   * {@link com.google.gwt.logging.client.JsonLogRecordClientUtil#logRecordAsJsonObject(LogRecord)}
    * @return a Void {@link Request}
    */
   Request<Void> logMessage(String serializedLogRecordString);
diff --git a/user/src/com/google/gwt/requestfactory/shared/RequestTransport.java b/user/src/com/google/gwt/requestfactory/shared/RequestTransport.java
index b3947cb..80e5842 100644
--- a/user/src/com/google/gwt/requestfactory/shared/RequestTransport.java
+++ b/user/src/com/google/gwt/requestfactory/shared/RequestTransport.java
@@ -36,7 +36,8 @@
     /**
      * Called to report a transmission failure as a ServerFailure.
      * 
-     * @param message the String error message
+     * @param failure a ServerFailure instance indicating the nature
+     *     of the failure
      */
     void onTransportFailure(ServerFailure failure);
   }
@@ -45,7 +46,8 @@
    * Called by the RequestFactory implementation.
    * 
    * @param payload the String payload
-   * @param receiver a {@link TransportReceiver} instance
+   * @param receiver the {@link TransportReceiver} instance that will
+   *    receive the payload
    */
   void send(String payload, TransportReceiver receiver);
 }
diff --git a/user/src/com/google/gwt/requestfactory/shared/impl/BaseProxyCategory.java b/user/src/com/google/gwt/requestfactory/shared/impl/BaseProxyCategory.java
index 9782088..a1ddabf 100644
--- a/user/src/com/google/gwt/requestfactory/shared/impl/BaseProxyCategory.java
+++ b/user/src/com/google/gwt/requestfactory/shared/impl/BaseProxyCategory.java
@@ -54,7 +54,7 @@
       return toReturn;
     }
 
-    if (returnValue instanceof Poser) {
+    if (returnValue instanceof Poser<?>) {
       ((Poser<?>) returnValue).setFrozen(false);
     }
 
diff --git a/user/src/com/google/gwt/resources/css/ClassRenamer.java b/user/src/com/google/gwt/resources/css/ClassRenamer.java
index 0e69b54..8fc2a57 100644
--- a/user/src/com/google/gwt/resources/css/ClassRenamer.java
+++ b/user/src/com/google/gwt/resources/css/ClassRenamer.java
@@ -93,7 +93,6 @@
   private final boolean strict;
   private final Set<String> unknownClasses = new HashSet<String>();
 
-  
   public ClassRenamer(TreeLogger logger,
       Map<String, Map<JMethod, String>> classReplacementsWithPrefix,
       boolean strict, Set<String> externalClasses) {
diff --git a/user/src/com/google/gwt/resources/ext/ClientBundleRequirements.java b/user/src/com/google/gwt/resources/ext/ClientBundleRequirements.java
index a54ade8..ca627e9 100644
--- a/user/src/com/google/gwt/resources/ext/ClientBundleRequirements.java
+++ b/user/src/com/google/gwt/resources/ext/ClientBundleRequirements.java
@@ -27,18 +27,18 @@
  * method.
  */
 public interface ClientBundleRequirements {
-  
+
   /**
    * Indicates that the ResourcePrototype implementation generated by a
    * ResourceGenerator is sensitive to the values of the specified
    * configuration property.
-   * 
+   *
    * @param propertyName the name of the configuration property
    * @throws BadPropertyValueException
    */
-  void addConfigurationProperty(String propertyName) 
+  void addConfigurationProperty(String propertyName)
       throws BadPropertyValueException;
-  
+
   /**
    * Indicates that the ResourcePrototype implementation generated by a
    * ResourceGenerator is sensitive to the value of the specified
@@ -50,14 +50,14 @@
    * <p>
    * If a deferred-binding property does not exist, an attempt is made to check
    * whether a configuration property by the same name exists.
-   * 
+   *
    * @param propertyName the name of the deferred-binding property
    * @throws BadPropertyValueException if <code>propertyName</code> is neither a
    *           valid deferred-binding property nor a valid configuration
    *           property.
    */
   void addPermutationAxis(String propertyName) throws BadPropertyValueException;
-  
+
   /**
    * Indicates that the ResourcePrototype implementation generated by a
    * ResourceGenerator is sensitive to a dependent resource.  This method takes
@@ -68,27 +68,27 @@
    * URL, as well as its content.
    * <p>
    * The implementation for resolving a resource url from a partial path is
-   * contained in {@link ResourceGeneratorUtil}, and is based on an ordered set 
+   * contained in {@link ResourceGeneratorUtil}, and is based on an ordered set
    * of 'locator' implementations, which are tried in sequence.  Example
    * 'locator' implementations include looking up a resource file by name, which
-   * usually amounts to a freshly generated temporary file (see 
-   * {@link ResourceGeneratorUtil.addNamedFile}), or by using the partial path
+   * usually amounts to a freshly generated temporary file (see
+   * {@link ResourceGeneratorUtil#addNamedFile}), or by using the partial path
    * as a classpath resource used by a class loader, which can be affected by
    * classpath shadowing.
    * <p>
    * The current resolution for a resource partial path can be checked via
-   * {@link ResourceGeneratorUtil.tryFindResource}.
-   * 
+   * {@link ResourceGeneratorUtil#tryFindResource}.
+   *
    * @param partialPath a partial path representing a dependent resource.
    * @param resolvedResourceUrl a located resolved URL for a dependent resource.
    */
   void addResolvedResource(String partialPath, URL resolvedResourceUrl);
-  
+
   /**
    * Indicates that the ResourcePrototype implementation generated by a
    * ResourceGenerator is sensitive to structural changes to the given type, as
    * well as any of it's super type hierarchy.
-   * 
+   *
    * @param type a type
    */
   void addTypeHierarchy(JClassType type);
diff --git a/user/src/com/google/gwt/resources/ext/ResourceGeneratorUtil.java b/user/src/com/google/gwt/resources/ext/ResourceGeneratorUtil.java
index 5e632a5..e926f69 100644
--- a/user/src/com/google/gwt/resources/ext/ResourceGeneratorUtil.java
+++ b/user/src/com/google/gwt/resources/ext/ResourceGeneratorUtil.java
@@ -366,13 +366,14 @@
 
     return currentMethod;
   }
-  
+
   /**
    * Try to find a resource with the given resourceName.  It will use the default
    * search order to locate the resource as is used by {@link #findResources}.
    * 
    * @param logger
-   * @param context
+   * @param genContext
+   * @param resourceContext
    * @param resourceName
    * @return a URL for the resource, if found
    */
@@ -397,7 +398,7 @@
    * @param context
    * @param method
    */
-  private static void addTypeRequirementsForMethod(ResourceContext context, 
+  private static void addTypeRequirementsForMethod(ResourceContext context,
       JMethod method) {
     ClientBundleRequirements reqs = context.getRequirements();
     if (reqs != null) {
@@ -405,7 +406,7 @@
       reqs.addTypeHierarchy((JClassType) method.getReturnType());
     }
   }
-  
+
   /**
    * We want to warn the user about any annotations from ImageBundle or the old
    * incubator code.
@@ -422,7 +423,7 @@
       }
     }
   }
-  
+
   /**
    * Main implementation of findResources.
    */
@@ -445,7 +446,7 @@
           logger.log(TreeLogger.SPAM, "Trying default extension " + extension);
           for (Locator locator : locators) {
             URL resourceUrl = tryFindResource(locator, context,
-                getPathRelativeToPackage(method.getEnclosingType().getPackage(), 
+                getPathRelativeToPackage(method.getEnclosingType().getPackage(),
                     method.getName() + extension), locale);
 
             // Take the first match
@@ -510,7 +511,7 @@
     addTypeRequirementsForMethod(context, method);
     return toReturn;
   }
- 
+
   /**
    * Get default list of resource Locators, in the default order.
    * 
@@ -522,10 +523,10 @@
       NamedFileLocator.INSTANCE,
       new ResourceOracleLocator(genContext.getResourcesOracle()),
       new ClassLoaderLocator(Thread.currentThread().getContextClassLoader())};
-    
+
     return locators;
   }
- 
+
   /**
    * Get the current locale string.
    * 
@@ -595,7 +596,7 @@
 
     return toReturn;
   }
- 
+
   /**
    * Performs the locale lookup function for a given resource name.  Will also
    * add the located resource to the requirements object for the context.
@@ -609,7 +610,7 @@
    */
   private static URL tryFindResource(Locator locator, ResourceContext context,
       String resourceName, String locale) {
-    
+
     URL toReturn = tryFindResource(locator, resourceName, locale);
     if (toReturn != null && context != null) {
       ClientBundleRequirements reqs = context.getRequirements();
@@ -617,7 +618,7 @@
         reqs.addResolvedResource(resourceName, toReturn);
       }
     }
-    
+
     return toReturn;
   }
 
diff --git a/user/src/com/google/gwt/rpc/client/impl/CommandClientSerializationStreamWriter.java b/user/src/com/google/gwt/rpc/client/impl/CommandClientSerializationStreamWriter.java
index 4711981..14416e3 100644
--- a/user/src/com/google/gwt/rpc/client/impl/CommandClientSerializationStreamWriter.java
+++ b/user/src/com/google/gwt/rpc/client/impl/CommandClientSerializationStreamWriter.java
@@ -189,7 +189,6 @@
     return x;
   }
 
-  @SuppressWarnings("unused")
   @UnsafeNativeLong
   private native ValueCommand makeValue(Object value) /*-{
     var type;
diff --git a/user/src/com/google/gwt/rpc/server/Pair.java b/user/src/com/google/gwt/rpc/server/Pair.java
index 082cab2..0b64b48 100644
--- a/user/src/com/google/gwt/rpc/server/Pair.java
+++ b/user/src/com/google/gwt/rpc/server/Pair.java
@@ -30,8 +30,9 @@
     this.b = b;
   }
 
+  @Override
   public boolean equals(Object o) {
-    if (!(o instanceof Pair)) {
+    if (!(o instanceof Pair<?, ?>)) {
       return false;
     }
     Pair<?, ?> other = (Pair<?, ?>) o;
@@ -46,6 +47,7 @@
     return b;
   }
 
+  @Override
   public int hashCode() {
     return a.hashCode() * 13 + b.hashCode() * 7;
   }
diff --git a/user/src/com/google/gwt/rpc/server/SimplePayloadDecoder.java b/user/src/com/google/gwt/rpc/server/SimplePayloadDecoder.java
index 834ca55..a9fd42d 100644
--- a/user/src/com/google/gwt/rpc/server/SimplePayloadDecoder.java
+++ b/user/src/com/google/gwt/rpc/server/SimplePayloadDecoder.java
@@ -205,7 +205,7 @@
         // use ordinal (and not name), since name might have been obfuscated
         int ordinal = readCommand(IntValueCommand.class).getValue();
 
-        @SuppressWarnings("unchecked")
+        @SuppressWarnings("rawtypes")
         Class<? extends Enum> clazz = findClass(token).asSubclass(Enum.class);
         
         /*
diff --git a/user/src/com/google/gwt/storage/client/Storage.java b/user/src/com/google/gwt/storage/client/Storage.java
index 4c5fd9e..809f20a 100644
--- a/user/src/com/google/gwt/storage/client/Storage.java
+++ b/user/src/com/google/gwt/storage/client/Storage.java
@@ -43,6 +43,11 @@
  * Note: Storage events into other windows are not supported.
  * </p>
  *
+ *
+ * <p>
+ * This may not be supported on all browsers.
+ * </p>
+ *
  * @see <a href="http://www.w3.org/TR/webstorage/#storage-0">W3C Web Storage -
  *      Storage</a>
  * @see <a
@@ -51,11 +56,7 @@
  *      Key-Value Storage</a>
  * @see <a href="http://quirksmode.org/dom/html5.html#t00">Quirksmode.org -
  *      HTML5 Compatibility - Storage</a>
- * @see <a
- *      href="http://code.google.com/p/gwt-mobile-webkit/wiki/StorageApi">Wiki
- *      - Quickstart Guide</a>
- *
- *      This may not be supported on all browsers.
+ * @see <a href="http://code.google.com/p/gwt-mobile-webkit/wiki/StorageApi">Wiki - Quickstart Guide</a>
  */
 // TODO(pdr): Add support for Object values, instead of just Strings. The
 // Storage API spec specifies this, but browser support poor at the moment.
diff --git a/user/src/com/google/gwt/storage/client/StorageEvent.java b/user/src/com/google/gwt/storage/client/StorageEvent.java
index 6f01b56..eb68f75 100644
--- a/user/src/com/google/gwt/storage/client/StorageEvent.java
+++ b/user/src/com/google/gwt/storage/client/StorageEvent.java
@@ -47,7 +47,7 @@
    * 
    * <p>
    * Apply your StorageEventHandler using
-   * {@link Storage#addStorageEventHandler(Handler)}.
+   * {@link Storage#addStorageEventHandler(StorageEvent.Handler)}.
    * </p>
    * 
    * @see StorageEvent
@@ -124,4 +124,3 @@
     return this.url || this.uri;  // Older Safari browsers have 'uri' instead of 'url'
   }-*/;
 }
-
diff --git a/user/src/com/google/gwt/storage/client/StorageImplMozilla.java b/user/src/com/google/gwt/storage/client/StorageImplMozilla.java
index 00e2b38..c8ca4d8 100644
--- a/user/src/com/google/gwt/storage/client/StorageImplMozilla.java
+++ b/user/src/com/google/gwt/storage/client/StorageImplMozilla.java
@@ -16,7 +16,6 @@
 
 package com.google.gwt.storage.client;
 
-
 /**
  * Mozilla-specific implementation of a Storage.
  *
diff --git a/user/src/com/google/gwt/storage/client/StorageImplNonNativeEvents.java b/user/src/com/google/gwt/storage/client/StorageImplNonNativeEvents.java
index 97dcf47..cedb23f 100644
--- a/user/src/com/google/gwt/storage/client/StorageImplNonNativeEvents.java
+++ b/user/src/com/google/gwt/storage/client/StorageImplNonNativeEvents.java
@@ -37,7 +37,6 @@
     };
   }-*/;
 
-  @SuppressWarnings("unused")
   private static void fireStorageEvent(
       String key, String oldValue, String newValue, String storage) {
     if (hasStorageEventHandlers()) {
@@ -46,6 +45,7 @@
     }
   }
 
+  @Override
   public void clear(String storage) {
     super.clear(storage);
     fireStorageEvent(null, null, null, storage);
diff --git a/user/src/com/google/gwt/storage/client/StorageMap.java b/user/src/com/google/gwt/storage/client/StorageMap.java
index 6a4c892..0bea93c 100644
--- a/user/src/com/google/gwt/storage/client/StorageMap.java
+++ b/user/src/com/google/gwt/storage/client/StorageMap.java
@@ -49,7 +49,7 @@
  * (or other Collection) methods mandate the use of a
  * {@link NullPointerException} if some argument is <code>null</code> (e.g.
  * {@link #remove(Object)} remove(null)). this Map emits
- * {@link JavaScriptException}s instead;</li>
+ * {@link com.google.gwt.core.client.JavaScriptException}s instead;</li>
  * <li><em>String values and keys</em> - All keys and values in this Map are
  * String types.</li>
  * </ol>
@@ -67,7 +67,7 @@
     }
 
     @Override
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings("rawtypes")
     public boolean equals(Object obj) {
       if (obj == null) {
         return false;
@@ -145,11 +145,13 @@
    * Represents a Set<Map.Entry> over all Storage items
    */
   private class StorageEntrySet extends AbstractSet<Map.Entry<String, String>> {
+    @Override
     public void clear() {
       StorageMap.this.clear();
     }
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings("rawtypes")
+    @Override
     public boolean contains(Object o) {
       if (o == null || !(o instanceof Map.Entry)) {
         return false;
@@ -159,11 +161,13 @@
       return key != null && containsKey(key) && eq(get(key), e.getValue());
     }
 
+    @Override
     public Iterator<Map.Entry<String, String>> iterator() {
       return new StorageEntryIterator();
     }
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings("rawtypes")
+    @Override
     public boolean remove(Object o) {
       if (o == null || !(o instanceof Map.Entry)) {
         return false;
@@ -180,6 +184,7 @@
       return false;
     }
 
+    @Override
     public int size() {
       return StorageMap.this.size();
     }
@@ -205,6 +210,7 @@
    *
    * @see Storage#clear()
    */
+  @Override
   public void clear() {
     storage.clear();
   }
@@ -213,6 +219,7 @@
    * Returns <code>true</code> if the Storage contains the specified key, <code>
    * false</code> otherwise.
    */
+  @Override
   public boolean containsKey(Object key) {
     return storage.getItem(key.toString()) != null;
   }
@@ -222,6 +229,7 @@
    * <code>false</code> otherwise (or if the specified key is <code>null</code>
    * ).
    */
+  @Override
   public boolean containsValue(Object value) {
     int s = size();
     for (int i = 0; i < s; i++) {
@@ -235,6 +243,7 @@
   /**
    * Returns a Set containing all entries of the Storage.
    */
+  @Override
   public Set<Map.Entry<String, String>> entrySet() {
     if (entrySet == null) {
       entrySet = new StorageEntrySet();
@@ -248,6 +257,7 @@
    * @param key the key identifying the value
    * @see Storage#getItem(String)
    */
+  @Override
   public String get(Object key) {
     if (key == null) {
       return null;
@@ -262,6 +272,7 @@
    * @param value the value associated with the key (not <code>null</code>)
    * @see Storage#setItem(String, String)
    */
+  @Override
   public String put(String key, String value) {
     if (key == null || value == null) {
       throw new IllegalArgumentException("Key and value cannot be null!");
@@ -279,6 +290,7 @@
    *         was not present in the Storage
    * @see Storage#removeItem(String)
    */
+  @Override
   public String remove(Object key) {
     String k = key.toString();
     String old = storage.getItem(k);
@@ -292,6 +304,7 @@
    * @return the number of items
    * @see Storage#getLength()
    */
+  @Override
   public int size() {
     return storage.getLength();
   }
diff --git a/user/src/com/google/gwt/touch/client/Momentum.java b/user/src/com/google/gwt/touch/client/Momentum.java
index 21d7ba8..6ae96fb 100644
--- a/user/src/com/google/gwt/touch/client/Momentum.java
+++ b/user/src/com/google/gwt/touch/client/Momentum.java
@@ -41,7 +41,6 @@
      *          current position
      * @param initialVelocity the initial velocity in pixels per millisecond,
      *          which is also set to the current velocity
-     * @param elapsedMillis the elapsed time since the momentum took over
      */
     public State(Point initialPosition, Point initialVelocity) {
       this.initialPosition = initialPosition;
diff --git a/user/src/com/google/gwt/touch/client/TouchScroller.java b/user/src/com/google/gwt/touch/client/TouchScroller.java
index 5c05a36..c0c3eec 100644
--- a/user/src/com/google/gwt/touch/client/TouchScroller.java
+++ b/user/src/com/google/gwt/touch/client/TouchScroller.java
@@ -305,7 +305,6 @@
    * Construct a new {@link TouchScroller}. This constructor should be called
    * using the static method {@link #createIfSupported()}.
    * 
-   * @param widget the widget to augment
    * @see #createIfSupported()
    */
   protected TouchScroller() {
diff --git a/user/src/com/google/gwt/uibinder/attributeparsers/FieldReferenceConverter.java b/user/src/com/google/gwt/uibinder/attributeparsers/FieldReferenceConverter.java
index 2e99553..9133cf9 100644
--- a/user/src/com/google/gwt/uibinder/attributeparsers/FieldReferenceConverter.java
+++ b/user/src/com/google/gwt/uibinder/attributeparsers/FieldReferenceConverter.java
@@ -25,7 +25,7 @@
  * Deals with field references, e.g. the bits in braces here: <code>&lt;div
  * class="{style.enabled} fancy {style.impressive}" /></code>, by converting
  * them to java expressions (with the help of a
- * {@link FieldReferenceConverter.Delegate}).
+ * {@link com.google.gwt.uibinder.attributeparsers.FieldReferenceConverter.Delegate Delegate}).
  * <p>
  * A field reference is one or more segments separated by dots. The first
  * segment is considered to be a reference to a ui field, and succeeding
@@ -45,7 +45,7 @@
  */
 public class FieldReferenceConverter {
   /**
-   * May be thrown by the {@link FieldReferenceConverter.Delegate} for badly
+   * May be thrown by the {@link com.google.gwt.uibinder.attributeparsers.FieldReferenceConverter.Delegate Delegate} for badly
    * formatted input.
    */
   @SuppressWarnings("serial")
diff --git a/user/src/com/google/gwt/user/cellview/client/CellBasedWidgetImplStandard.java b/user/src/com/google/gwt/user/cellview/client/CellBasedWidgetImplStandard.java
index 2f4e298..dae9719 100644
--- a/user/src/com/google/gwt/user/cellview/client/CellBasedWidgetImplStandard.java
+++ b/user/src/com/google/gwt/user/cellview/client/CellBasedWidgetImplStandard.java
@@ -49,7 +49,6 @@
    *
    * @param event the event to handle.
    */
-  @SuppressWarnings("unused")
   private static void handleNonBubblingEvent(Event event) {
     // Get the event target.
     EventTarget eventTarget = event.getEventTarget();
diff --git a/user/src/com/google/gwt/user/cellview/client/CellList.java b/user/src/com/google/gwt/user/cellview/client/CellList.java
index 7a85a9d..0d97de4 100644
--- a/user/src/com/google/gwt/user/cellview/client/CellList.java
+++ b/user/src/com/google/gwt/user/cellview/client/CellList.java
@@ -288,7 +288,7 @@
    * @param html the message to display when there are no results
    * @see #getEmptyListMessage()
    * @deprecated as of GWT 2.3, use
-   *             {@link #setEmptyDataWidget(com.google.gwt.user.client.ui.Widget)}
+   *             {@link #setEmptyListWidget(com.google.gwt.user.client.ui.Widget)}
    *             instead
    */
   @Deprecated
diff --git a/user/src/com/google/gwt/user/cellview/client/ColumnSortEvent.java b/user/src/com/google/gwt/user/cellview/client/ColumnSortEvent.java
index 6eb3ecc..099767a 100644
--- a/user/src/com/google/gwt/user/cellview/client/ColumnSortEvent.java
+++ b/user/src/com/google/gwt/user/cellview/client/ColumnSortEvent.java
@@ -46,7 +46,8 @@
 
   /**
    * A default handler used with views attached to asynchronous data providers
-   * such as {@link AsyncDataProvider}. This handler calls
+   * such as {@link com.google.gwt.view.client.AsyncDataProvider AsyncDataProvider}.
+   * This handler calls
    * {@link HasData#setVisibleRangeAndClearData(com.google.gwt.view.client.Range, boolean)},
    * which clears the current data and triggers the data provider's range change
    * handler.
diff --git a/user/src/com/google/gwt/user/client/BaseListenerWrapper.java b/user/src/com/google/gwt/user/client/BaseListenerWrapper.java
index ec7f8fb..059e3f5 100644
--- a/user/src/com/google/gwt/user/client/BaseListenerWrapper.java
+++ b/user/src/com/google/gwt/user/client/BaseListenerWrapper.java
@@ -173,7 +173,7 @@
    */
   // This is an internal helper method with the current formulation, we have
   // lost the info needed to make it safe by this point.
-  @SuppressWarnings("unchecked")
+  @SuppressWarnings("rawtypes")
   protected static <H extends EventHandler> void baseRemove(
       HandlerManager manager, Object listener, Type... types) {
     if (manager != null) {
diff --git a/user/src/com/google/gwt/user/client/DeferredCommand.java b/user/src/com/google/gwt/user/client/DeferredCommand.java
index 3601913..45fcdb5 100644
--- a/user/src/com/google/gwt/user/client/DeferredCommand.java
+++ b/user/src/com/google/gwt/user/client/DeferredCommand.java
@@ -90,6 +90,7 @@
    * @deprecated with no replacement because the presence of this method causes
    *             arbitrary scheduling decisions
    */
+  @Deprecated
   public static void addPause() {
     commandExecutor.submit((Command) null);
   }
diff --git a/user/src/com/google/gwt/user/client/impl/DOMImplStandard.java b/user/src/com/google/gwt/user/client/impl/DOMImplStandard.java
index 087e8a9..dd70a3a 100644
--- a/user/src/com/google/gwt/user/client/impl/DOMImplStandard.java
+++ b/user/src/com/google/gwt/user/client/impl/DOMImplStandard.java
@@ -26,19 +26,14 @@
  */
 abstract class DOMImplStandard extends DOMImpl {
 
-  @SuppressWarnings("unused")
   private static JavaScriptObject captureElem;
 
-  @SuppressWarnings("unused")
   private static JavaScriptObject dispatchCapturedEvent;
 
-  @SuppressWarnings("unused")
   private static JavaScriptObject dispatchCapturedMouseEvent;
 
-  @SuppressWarnings("unused")
   private static JavaScriptObject dispatchEvent;
 
-  @SuppressWarnings("unused")
   private static JavaScriptObject dispatchUnhandledEvent;
 
   @Override
diff --git a/user/src/com/google/gwt/user/client/impl/DOMImplTrident.java b/user/src/com/google/gwt/user/client/impl/DOMImplTrident.java
index 36b1b26..474cd7d 100644
--- a/user/src/com/google/gwt/user/client/impl/DOMImplTrident.java
+++ b/user/src/com/google/gwt/user/client/impl/DOMImplTrident.java
@@ -24,16 +24,12 @@
  * {@link com.google.gwt.user.client.impl.DOMImpl}.
  */
 public abstract class DOMImplTrident extends DOMImpl {
-  @SuppressWarnings("unused")
   private static JavaScriptObject callDispatchEvent;
 
-  @SuppressWarnings("unused")
   private static JavaScriptObject callDispatchDblClickEvent;
 
-  @SuppressWarnings("unused")
   private static JavaScriptObject callDispatchOnLoadEvent;
 
-  @SuppressWarnings("unused")
   private static JavaScriptObject callDispatchUnhandledEvent;
 
   /**
@@ -42,7 +38,6 @@
    * 
    * @return <code>false</code> to cancel the event
    */
-  @SuppressWarnings("unused")
   private static native boolean previewEventImpl() /*-{
     var isCancelled = false; 
     for (var i = 0; i < $wnd.__gwt_globalEventArray.length; i++) {
diff --git a/user/src/com/google/gwt/user/client/impl/HistoryImpl.java b/user/src/com/google/gwt/user/client/impl/HistoryImpl.java
index a711fb7..0e71be8 100644
--- a/user/src/com/google/gwt/user/client/impl/HistoryImpl.java
+++ b/user/src/com/google/gwt/user/client/impl/HistoryImpl.java
@@ -21,7 +21,6 @@
 import com.google.gwt.event.shared.GwtEvent;
 import com.google.gwt.event.shared.HandlerManager;
 import com.google.gwt.event.shared.HandlerRegistration;
-import com.google.gwt.event.shared.HasHandlers;
 
 /**
  * Native implementation associated with
@@ -33,7 +32,7 @@
  * determine when the URL hash identifier changes.
  * </p>
  */
-public class HistoryImpl implements HasValueChangeHandlers<String>, HasHandlers {
+public class HistoryImpl implements HasValueChangeHandlers<String> {
 
   private static String token = "";
 
diff --git a/user/src/com/google/gwt/user/client/impl/HistoryImplIE6.java b/user/src/com/google/gwt/user/client/impl/HistoryImplIE6.java
index 83e64ef..66af35e 100644
--- a/user/src/com/google/gwt/user/client/impl/HistoryImplIE6.java
+++ b/user/src/com/google/gwt/user/client/impl/HistoryImplIE6.java
@@ -32,7 +32,6 @@
    * @param maybeHtml untrusted string that may contain html
    * @return sanitized string
    */
-  @SuppressWarnings("unused")
   private static String escapeHtml(String maybeHtml) {
     final Element div = DOM.createDiv();
     DOM.setInnerText(div, maybeHtml);
@@ -47,7 +46,6 @@
    * For IE6, reading from $wnd.location.hash drops part of the fragment if the
    * fragment contains a '?'. To avoid this bug, we use location.href instead.
    */
-  @SuppressWarnings("unused")
   private static native String getLocationHash() /*-{
     var href = $wnd.location.href;
     var hashLoc = href.lastIndexOf("#");
@@ -114,7 +112,6 @@
    * 
    * @return true if a canceled window reload was handled
    */
-  @SuppressWarnings("unused")
   private boolean handleWindowReloadCanceled() {
     if (reloadedWindow) {
       reloadedWindow = false;
@@ -198,7 +195,6 @@
     doc.close();
   }-*/;
 
-  @SuppressWarnings("unused")
   private void reloadWindow() {
     reloadedWindow = true;
     Location.reload();
diff --git a/user/src/com/google/gwt/user/client/rpc/RpcTokenExceptionHandler.java b/user/src/com/google/gwt/user/client/rpc/RpcTokenExceptionHandler.java
index f34aedd..1e551d4 100644
--- a/user/src/com/google/gwt/user/client/rpc/RpcTokenExceptionHandler.java
+++ b/user/src/com/google/gwt/user/client/rpc/RpcTokenExceptionHandler.java
@@ -25,5 +25,5 @@
    * 
    * @param exception exception that occurred during RPC token processing.
    */
-  public void onRpcTokenException(RpcTokenException exception);
+  void onRpcTokenException(RpcTokenException exception);
 }
diff --git a/user/src/com/google/gwt/user/client/rpc/XsrfProtectedService.java b/user/src/com/google/gwt/user/client/rpc/XsrfProtectedService.java
index eab0ca5..655da63 100644
--- a/user/src/com/google/gwt/user/client/rpc/XsrfProtectedService.java
+++ b/user/src/com/google/gwt/user/client/rpc/XsrfProtectedService.java
@@ -21,7 +21,6 @@
  * XSRF protected equivalent of {@link RemoteService}.
  * All calls on RPC interfaces extending this interface will be XSRF protected.
  */
-@SuppressWarnings("rpc-validation")
 @XsrfProtect
 public interface XsrfProtectedService extends RemoteService {
 }
diff --git a/user/src/com/google/gwt/user/client/rpc/core/java/lang/Boolean_CustomFieldSerializer.java b/user/src/com/google/gwt/user/client/rpc/core/java/lang/Boolean_CustomFieldSerializer.java
index 4deb604..a2b39b3 100644
--- a/user/src/com/google/gwt/user/client/rpc/core/java/lang/Boolean_CustomFieldSerializer.java
+++ b/user/src/com/google/gwt/user/client/rpc/core/java/lang/Boolean_CustomFieldSerializer.java
@@ -41,7 +41,8 @@
       Boolean instance) throws SerializationException {
     streamWriter.writeBoolean(instance.booleanValue());
   }
-
+  
+  @Override
   public void deserializeInstance(SerializationStreamReader streamReader,
       Boolean instance) throws SerializationException {
     deserialize(streamReader, instance);
@@ -57,7 +58,8 @@
       throws SerializationException {
     return instantiate(streamReader);
   }
-
+  
+  @Override
   public void serializeInstance(SerializationStreamWriter streamWriter,
       Boolean instance) throws SerializationException {
     serialize(streamWriter, instance);
diff --git a/user/src/com/google/gwt/user/client/rpc/core/java/lang/Byte_CustomFieldSerializer.java b/user/src/com/google/gwt/user/client/rpc/core/java/lang/Byte_CustomFieldSerializer.java
index ee21d33..c5797bf 100644
--- a/user/src/com/google/gwt/user/client/rpc/core/java/lang/Byte_CustomFieldSerializer.java
+++ b/user/src/com/google/gwt/user/client/rpc/core/java/lang/Byte_CustomFieldSerializer.java
@@ -42,6 +42,7 @@
     streamWriter.writeByte(instance.byteValue());
   }
 
+  @Override
   public void deserializeInstance(SerializationStreamReader streamReader,
       Byte instance) throws SerializationException {
     deserialize(streamReader, instance);
@@ -58,6 +59,7 @@
     return instantiate(streamReader);
   }
 
+  @Override
   public void serializeInstance(SerializationStreamWriter streamWriter,
       Byte instance) throws SerializationException {
     serialize(streamWriter, instance);
diff --git a/user/src/com/google/gwt/user/client/rpc/core/java/lang/Character_CustomFieldSerializer.java b/user/src/com/google/gwt/user/client/rpc/core/java/lang/Character_CustomFieldSerializer.java
index 58e6554..9872a2d 100644
--- a/user/src/com/google/gwt/user/client/rpc/core/java/lang/Character_CustomFieldSerializer.java
+++ b/user/src/com/google/gwt/user/client/rpc/core/java/lang/Character_CustomFieldSerializer.java
@@ -42,6 +42,7 @@
     streamWriter.writeChar(instance.charValue());
   }
 
+  @Override
   public void deserializeInstance(SerializationStreamReader streamReader,
       Character instance) throws SerializationException {
     deserialize(streamReader, instance);
@@ -58,6 +59,7 @@
     return instantiate(streamReader);
   }
 
+  @Override
   public void serializeInstance(SerializationStreamWriter streamWriter,
       Character instance) throws SerializationException {
     serialize(streamWriter, instance);
diff --git a/user/src/com/google/gwt/user/client/rpc/core/java/lang/Double_CustomFieldSerializer.java b/user/src/com/google/gwt/user/client/rpc/core/java/lang/Double_CustomFieldSerializer.java
index f0a706b..f8ca4c5 100644
--- a/user/src/com/google/gwt/user/client/rpc/core/java/lang/Double_CustomFieldSerializer.java
+++ b/user/src/com/google/gwt/user/client/rpc/core/java/lang/Double_CustomFieldSerializer.java
@@ -42,6 +42,7 @@
     streamWriter.writeDouble(instance.doubleValue());
   }
 
+  @Override
   public void deserializeInstance(SerializationStreamReader streamReader,
       Double instance) throws SerializationException {
     deserialize(streamReader, instance);
@@ -58,6 +59,7 @@
     return instantiate(streamReader);
   }
 
+  @Override
   public void serializeInstance(SerializationStreamWriter streamWriter,
       Double instance) throws SerializationException {
     serialize(streamWriter, instance);
diff --git a/user/src/com/google/gwt/user/client/rpc/core/java/lang/Float_CustomFieldSerializer.java b/user/src/com/google/gwt/user/client/rpc/core/java/lang/Float_CustomFieldSerializer.java
index 10ff4c4..d4d0408 100644
--- a/user/src/com/google/gwt/user/client/rpc/core/java/lang/Float_CustomFieldSerializer.java
+++ b/user/src/com/google/gwt/user/client/rpc/core/java/lang/Float_CustomFieldSerializer.java
@@ -42,6 +42,7 @@
     streamWriter.writeFloat(instance.floatValue());
   }
 
+  @Override
   public void deserializeInstance(SerializationStreamReader streamReader,
       Float instance) throws SerializationException {
     deserialize(streamReader, instance);
@@ -58,6 +59,7 @@
     return instantiate(streamReader);
   }
 
+  @Override
   public void serializeInstance(SerializationStreamWriter streamWriter,
       Float instance) throws SerializationException {
     serialize(streamWriter, instance);
diff --git a/user/src/com/google/gwt/user/client/rpc/core/java/lang/Integer_CustomFieldSerializer.java b/user/src/com/google/gwt/user/client/rpc/core/java/lang/Integer_CustomFieldSerializer.java
index 2e4a253..41d38a8 100644
--- a/user/src/com/google/gwt/user/client/rpc/core/java/lang/Integer_CustomFieldSerializer.java
+++ b/user/src/com/google/gwt/user/client/rpc/core/java/lang/Integer_CustomFieldSerializer.java
@@ -42,6 +42,7 @@
     streamWriter.writeInt(instance.intValue());
   }
 
+  @Override
   public void deserializeInstance(SerializationStreamReader streamReader,
       Integer instance) throws SerializationException {
     deserialize(streamReader, instance);
@@ -58,6 +59,7 @@
     return instantiate(streamReader);
   }
 
+  @Override
   public void serializeInstance(SerializationStreamWriter streamWriter,
       Integer instance) throws SerializationException {
     serialize(streamWriter, instance);
diff --git a/user/src/com/google/gwt/user/client/rpc/core/java/lang/Long_CustomFieldSerializer.java b/user/src/com/google/gwt/user/client/rpc/core/java/lang/Long_CustomFieldSerializer.java
index b2938a6..6a0bc83 100644
--- a/user/src/com/google/gwt/user/client/rpc/core/java/lang/Long_CustomFieldSerializer.java
+++ b/user/src/com/google/gwt/user/client/rpc/core/java/lang/Long_CustomFieldSerializer.java
@@ -42,6 +42,7 @@
     streamWriter.writeLong(instance.longValue());
   }
 
+  @Override
   public void deserializeInstance(SerializationStreamReader streamReader,
       Long instance) throws SerializationException {
     deserialize(streamReader, instance);
@@ -58,6 +59,7 @@
     return instantiate(streamReader);
   }
 
+  @Override
   public void serializeInstance(SerializationStreamWriter streamWriter,
       Long instance) throws SerializationException {
     serialize(streamWriter, instance);
diff --git a/user/src/com/google/gwt/user/client/rpc/core/java/lang/Object_Array_CustomFieldSerializer.java b/user/src/com/google/gwt/user/client/rpc/core/java/lang/Object_Array_CustomFieldSerializer.java
index e7a5ef9..730e470 100644
--- a/user/src/com/google/gwt/user/client/rpc/core/java/lang/Object_Array_CustomFieldSerializer.java
+++ b/user/src/com/google/gwt/user/client/rpc/core/java/lang/Object_Array_CustomFieldSerializer.java
@@ -42,11 +42,13 @@
     }
   }
 
+  @Override
   public void deserializeInstance(SerializationStreamReader streamReader,
       Object[] instance) throws SerializationException {
     deserialize(streamReader, instance);
   }
 
+  @Override
   public void serializeInstance(SerializationStreamWriter streamWriter,
       Object[] instance) throws SerializationException {
     serialize(streamWriter, instance);
diff --git a/user/src/com/google/gwt/user/client/rpc/core/java/lang/Short_CustomFieldSerializer.java b/user/src/com/google/gwt/user/client/rpc/core/java/lang/Short_CustomFieldSerializer.java
index 180c471..33a808b 100644
--- a/user/src/com/google/gwt/user/client/rpc/core/java/lang/Short_CustomFieldSerializer.java
+++ b/user/src/com/google/gwt/user/client/rpc/core/java/lang/Short_CustomFieldSerializer.java
@@ -42,6 +42,7 @@
     streamWriter.writeShort(instance.shortValue());
   }
 
+  @Override
   public void deserializeInstance(SerializationStreamReader streamReader,
       Short instance) throws SerializationException {
     deserialize(streamReader, instance);
@@ -58,6 +59,7 @@
     return instantiate(streamReader);
   }
 
+  @Override
   public void serializeInstance(SerializationStreamWriter streamWriter,
       Short instance) throws SerializationException {
     serialize(streamWriter, instance);
diff --git a/user/src/com/google/gwt/user/client/rpc/core/java/lang/StackTraceElement_CustomFieldSerializer.java b/user/src/com/google/gwt/user/client/rpc/core/java/lang/StackTraceElement_CustomFieldSerializer.java
index d86374b..6f756dc 100644
--- a/user/src/com/google/gwt/user/client/rpc/core/java/lang/StackTraceElement_CustomFieldSerializer.java
+++ b/user/src/com/google/gwt/user/client/rpc/core/java/lang/StackTraceElement_CustomFieldSerializer.java
@@ -48,6 +48,7 @@
     streamWriter.writeInt(instance.getLineNumber());
   }
 
+  @Override
   public void deserializeInstance(SerializationStreamReader streamReader,
       StackTraceElement instance) throws SerializationException {
     deserialize(streamReader, instance);
@@ -64,6 +65,7 @@
     return instantiate(streamReader);
   }
 
+  @Override
   public void serializeInstance(SerializationStreamWriter streamWriter,
       StackTraceElement instance) throws SerializationException {
     serialize(streamWriter, instance);
diff --git a/user/src/com/google/gwt/user/client/rpc/core/java/lang/String_CustomFieldSerializer.java b/user/src/com/google/gwt/user/client/rpc/core/java/lang/String_CustomFieldSerializer.java
index 523e17c..1488376 100644
--- a/user/src/com/google/gwt/user/client/rpc/core/java/lang/String_CustomFieldSerializer.java
+++ b/user/src/com/google/gwt/user/client/rpc/core/java/lang/String_CustomFieldSerializer.java
@@ -42,6 +42,7 @@
     streamWriter.writeString(instance);
   }
 
+  @Override
   public void deserializeInstance(SerializationStreamReader streamReader,
       String instance) throws SerializationException {
     deserialize(streamReader, instance);
@@ -58,6 +59,7 @@
     return instantiate(streamReader);
   }
 
+  @Override
   public void serializeInstance(SerializationStreamWriter streamWriter,
       String instance) throws SerializationException {
     serialize(streamWriter, instance);
diff --git a/user/src/com/google/gwt/user/client/rpc/core/java/lang/Void_CustomFieldSerializer.java b/user/src/com/google/gwt/user/client/rpc/core/java/lang/Void_CustomFieldSerializer.java
index a8f97d5..4ce7ba7 100644
--- a/user/src/com/google/gwt/user/client/rpc/core/java/lang/Void_CustomFieldSerializer.java
+++ b/user/src/com/google/gwt/user/client/rpc/core/java/lang/Void_CustomFieldSerializer.java
@@ -42,6 +42,7 @@
       Void instance) throws SerializationException {
   }
 
+  @Override
   public void deserializeInstance(SerializationStreamReader streamReader,
       Void instance) throws SerializationException {
     deserialize(streamReader, instance);
@@ -58,6 +59,7 @@
     return instantiate(streamReader);
   }
 
+  @Override
   public void serializeInstance(SerializationStreamWriter streamWriter,
       Void instance) throws SerializationException {
     serialize(streamWriter, instance);
diff --git a/user/src/com/google/gwt/user/client/rpc/core/java/math/BigDecimal_CustomFieldSerializer.java b/user/src/com/google/gwt/user/client/rpc/core/java/math/BigDecimal_CustomFieldSerializer.java
index 8feb009..ad34e42 100644
--- a/user/src/com/google/gwt/user/client/rpc/core/java/math/BigDecimal_CustomFieldSerializer.java
+++ b/user/src/com/google/gwt/user/client/rpc/core/java/math/BigDecimal_CustomFieldSerializer.java
@@ -49,6 +49,7 @@
     streamWriter.writeString(instance.toString());
   }
 
+  @Override
   public void deserializeInstance(SerializationStreamReader streamReader,
       BigDecimal instance) throws SerializationException {
     deserialize(streamReader, instance);
@@ -65,6 +66,7 @@
     return instantiate(streamReader);
   }
 
+  @Override
   public void serializeInstance(SerializationStreamWriter streamWriter,
       BigDecimal instance) throws SerializationException {
     serialize(streamWriter, instance);
diff --git a/user/src/com/google/gwt/user/client/rpc/core/java/math/BigInteger_CustomFieldSerializer.java b/user/src/com/google/gwt/user/client/rpc/core/java/math/BigInteger_CustomFieldSerializer.java
index 3aed572..4d2c399 100644
--- a/user/src/com/google/gwt/user/client/rpc/core/java/math/BigInteger_CustomFieldSerializer.java
+++ b/user/src/com/google/gwt/user/client/rpc/core/java/math/BigInteger_CustomFieldSerializer.java
@@ -49,6 +49,7 @@
     streamWriter.writeString(instance.toString());
   }
 
+  @Override
   public void deserializeInstance(SerializationStreamReader streamReader,
       BigInteger instance) throws SerializationException {
     deserialize(streamReader, instance);
@@ -65,6 +66,7 @@
     return instantiate(streamReader);
   }
 
+  @Override
   public void serializeInstance(SerializationStreamWriter streamWriter,
       BigInteger instance) throws SerializationException {
     serialize(streamWriter, instance);
diff --git a/user/src/com/google/gwt/user/client/rpc/core/java/math/MathContext_CustomFieldSerializer.java b/user/src/com/google/gwt/user/client/rpc/core/java/math/MathContext_CustomFieldSerializer.java
index 2d46243..8f57c99 100644
--- a/user/src/com/google/gwt/user/client/rpc/core/java/math/MathContext_CustomFieldSerializer.java
+++ b/user/src/com/google/gwt/user/client/rpc/core/java/math/MathContext_CustomFieldSerializer.java
@@ -52,6 +52,7 @@
     streamWriter.writeInt(instance.getRoundingMode().ordinal());
   }
 
+  @Override
   public void deserializeInstance(SerializationStreamReader streamReader,
       MathContext instance) throws SerializationException {
     deserialize(streamReader, instance);
@@ -68,6 +69,7 @@
     return instantiate(streamReader);
   }
 
+  @Override
   public void serializeInstance(SerializationStreamWriter streamWriter,
       MathContext instance) throws SerializationException {
     serialize(streamWriter, instance);
diff --git a/user/src/com/google/gwt/user/client/rpc/core/java/sql/Date_CustomFieldSerializer.java b/user/src/com/google/gwt/user/client/rpc/core/java/sql/Date_CustomFieldSerializer.java
index bedcfb4..7cf59f6 100644
--- a/user/src/com/google/gwt/user/client/rpc/core/java/sql/Date_CustomFieldSerializer.java
+++ b/user/src/com/google/gwt/user/client/rpc/core/java/sql/Date_CustomFieldSerializer.java
@@ -46,6 +46,7 @@
     streamWriter.writeLong(instance.getTime());
   }
 
+  @Override
   public void deserializeInstance(SerializationStreamReader streamReader,
       Date instance) throws SerializationException {
     deserialize(streamReader, instance);
@@ -62,6 +63,7 @@
     return instantiate(streamReader);
   }
 
+  @Override
   public void serializeInstance(SerializationStreamWriter streamWriter,
       Date instance) throws SerializationException {
     serialize(streamWriter, instance);
diff --git a/user/src/com/google/gwt/user/client/rpc/core/java/sql/Time_CustomFieldSerializer.java b/user/src/com/google/gwt/user/client/rpc/core/java/sql/Time_CustomFieldSerializer.java
index 60d9d0b..77054bf 100644
--- a/user/src/com/google/gwt/user/client/rpc/core/java/sql/Time_CustomFieldSerializer.java
+++ b/user/src/com/google/gwt/user/client/rpc/core/java/sql/Time_CustomFieldSerializer.java
@@ -46,6 +46,7 @@
     streamWriter.writeLong(instance.getTime());
   }
 
+  @Override
   public void deserializeInstance(SerializationStreamReader streamReader,
       Time instance) throws SerializationException {
     deserialize(streamReader, instance);
@@ -62,6 +63,7 @@
     return instantiate(streamReader);
   }
 
+  @Override
   public void serializeInstance(SerializationStreamWriter streamWriter,
       Time instance) throws SerializationException {
     serialize(streamWriter, instance);
diff --git a/user/src/com/google/gwt/user/client/rpc/core/java/sql/Timestamp_CustomFieldSerializer.java b/user/src/com/google/gwt/user/client/rpc/core/java/sql/Timestamp_CustomFieldSerializer.java
index 9923de8..ed6f7a3 100644
--- a/user/src/com/google/gwt/user/client/rpc/core/java/sql/Timestamp_CustomFieldSerializer.java
+++ b/user/src/com/google/gwt/user/client/rpc/core/java/sql/Timestamp_CustomFieldSerializer.java
@@ -44,6 +44,7 @@
     streamWriter.writeInt(instance.getNanos());
   }
 
+  @Override
   public void deserializeInstance(SerializationStreamReader streamReader,
       Timestamp instance) throws SerializationException {
     deserialize(streamReader, instance);
@@ -60,6 +61,7 @@
     return instantiate(streamReader);
   }
 
+  @Override
   public void serializeInstance(SerializationStreamWriter streamWriter,
       Timestamp instance) throws SerializationException {
     serialize(streamWriter, instance);
diff --git a/user/src/com/google/gwt/user/client/rpc/core/java/util/ArrayList_CustomFieldSerializer.java b/user/src/com/google/gwt/user/client/rpc/core/java/util/ArrayList_CustomFieldSerializer.java
index e0a6b62..8182c89 100644
--- a/user/src/com/google/gwt/user/client/rpc/core/java/util/ArrayList_CustomFieldSerializer.java
+++ b/user/src/com/google/gwt/user/client/rpc/core/java/util/ArrayList_CustomFieldSerializer.java
@@ -25,26 +25,27 @@
 /**
  * Custom field serializer for {@link java.util.ArrayList}.
  */
+@SuppressWarnings("rawtypes")
 public final class ArrayList_CustomFieldSerializer extends
     CustomFieldSerializer<ArrayList> {
 
-  @SuppressWarnings("unchecked")
   public static void deserialize(SerializationStreamReader streamReader,
       ArrayList instance) throws SerializationException {
     Collection_CustomFieldSerializerBase.deserialize(streamReader, instance);
   }
 
-  @SuppressWarnings("unchecked")
   public static void serialize(SerializationStreamWriter streamWriter,
       ArrayList instance) throws SerializationException {
     Collection_CustomFieldSerializerBase.serialize(streamWriter, instance);
   }
 
+  @Override
   public void deserializeInstance(SerializationStreamReader streamReader,
       ArrayList instance) throws SerializationException {
     deserialize(streamReader, instance);
   }
 
+  @Override
   public void serializeInstance(SerializationStreamWriter streamWriter,
       ArrayList instance) throws SerializationException {
     serialize(streamWriter, instance);
diff --git a/user/src/com/google/gwt/user/client/rpc/core/java/util/Arrays.java b/user/src/com/google/gwt/user/client/rpc/core/java/util/Arrays.java
index 9a477c6..2c41d4a 100644
--- a/user/src/com/google/gwt/user/client/rpc/core/java/util/Arrays.java
+++ b/user/src/com/google/gwt/user/client/rpc/core/java/util/Arrays.java
@@ -31,6 +31,7 @@
   /**
    * Custom field serializer for {@link java.util.Arrays.ArrayList}.
    */
+  @SuppressWarnings("rawtypes")
   public static final class ArrayList_CustomFieldSerializer extends
       CustomFieldSerializer<List> {
 
@@ -70,6 +71,7 @@
       streamWriter.writeObject(array);
     }
 
+    @Override
     public void deserializeInstance(SerializationStreamReader streamReader,
         List instance) throws SerializationException {
       deserialize(streamReader, instance);
@@ -86,6 +88,7 @@
       return instantiate(streamReader);
     }
 
+    @Override
     public void serializeInstance(SerializationStreamWriter streamWriter,
         List instance) throws SerializationException {
       serialize(streamWriter, instance);
diff --git a/user/src/com/google/gwt/user/client/rpc/core/java/util/Collection_CustomFieldSerializerBase.java b/user/src/com/google/gwt/user/client/rpc/core/java/util/Collection_CustomFieldSerializerBase.java
index 71dfc73..c0006ad 100644
--- a/user/src/com/google/gwt/user/client/rpc/core/java/util/Collection_CustomFieldSerializerBase.java
+++ b/user/src/com/google/gwt/user/client/rpc/core/java/util/Collection_CustomFieldSerializerBase.java
@@ -24,9 +24,9 @@
 /**
  * Custom field serializer for {@link java.util.ArrayList}.
  */
+@SuppressWarnings("unchecked")
 public final class Collection_CustomFieldSerializerBase {
 
-  @SuppressWarnings("unchecked")
   public static void deserialize(SerializationStreamReader streamReader,
       Collection instance) throws SerializationException {
     int size = streamReader.readInt();
@@ -36,7 +36,6 @@
     }
   }
 
-  @SuppressWarnings("unchecked")
   public static void serialize(SerializationStreamWriter streamWriter,
       Collection instance) throws SerializationException {
     int size = instance.size();
diff --git a/user/src/com/google/gwt/user/client/rpc/core/java/util/Collections.java b/user/src/com/google/gwt/user/client/rpc/core/java/util/Collections.java
index 8ee6e70..b4ee38f 100644
--- a/user/src/com/google/gwt/user/client/rpc/core/java/util/Collections.java
+++ b/user/src/com/google/gwt/user/client/rpc/core/java/util/Collections.java
@@ -32,6 +32,7 @@
   /**
    * Custom field serializer for {@link java.util.Collections.EmptyList}.
    */
+  @SuppressWarnings("rawtypes")
   public static final class EmptyList_CustomFieldSerializer extends
       CustomFieldSerializer<List> {
 
@@ -39,24 +40,25 @@
       return java.util.Collections.emptyList().getClass().getName();
     }
 
-    @SuppressWarnings({"unused", "unchecked"})
+    @SuppressWarnings("unused")
     public static void deserialize(SerializationStreamReader streamReader,
         List instance) throws SerializationException {
       // Handled in instantiate.
     }
 
-    @SuppressWarnings({"unused", "unchecked"})
+    @SuppressWarnings("unused")
     public static List instantiate(SerializationStreamReader streamReader)
         throws SerializationException {
       return java.util.Collections.emptyList();
     }
 
-    @SuppressWarnings({"unused", "unchecked"})
+    @SuppressWarnings("unused")
     public static void serialize(SerializationStreamWriter streamWriter,
         List instance) throws SerializationException {
       // Nothing to serialize -- instantiate always returns the same thing
     }
 
+    @Override
     public void deserializeInstance(SerializationStreamReader streamReader,
         List instance) throws SerializationException {
       deserialize(streamReader, instance);
@@ -73,6 +75,7 @@
       return instantiate(streamReader);
     }
 
+    @Override
     public void serializeInstance(SerializationStreamWriter streamWriter,
         List instance) throws SerializationException {
       serialize(streamWriter, instance);
@@ -82,6 +85,7 @@
   /**
    * Custom field serializer for {@link java.util.Collections.EmptyMap}.
    */
+  @SuppressWarnings("rawtypes")
   public static final class EmptyMap_CustomFieldSerializer extends
       CustomFieldSerializer<Map> {
 
@@ -89,24 +93,25 @@
       return java.util.Collections.emptyMap().getClass().getName();
     }
 
-    @SuppressWarnings({"unused", "unchecked"})
+    @SuppressWarnings("unused")
     public static void deserialize(SerializationStreamReader streamReader,
         Map instance) throws SerializationException {
       // Handled in instantiate.
     }
 
-    @SuppressWarnings({"unused", "unchecked"})
+    @SuppressWarnings("unused")
     public static Map instantiate(SerializationStreamReader streamReader)
         throws SerializationException {
       return java.util.Collections.emptyMap();
     }
 
-    @SuppressWarnings({"unused", "unchecked"})
+    @SuppressWarnings("unused")
     public static void serialize(SerializationStreamWriter streamWriter,
         Map instance) throws SerializationException {
       // Nothing to serialize -- instantiate always returns the same thing
     }
 
+    @Override
     public void deserializeInstance(SerializationStreamReader streamReader,
         Map instance) throws SerializationException {
       deserialize(streamReader, instance);
@@ -123,6 +128,7 @@
       return instantiate(streamReader);
     }
 
+    @Override
     public void serializeInstance(SerializationStreamWriter streamWriter,
         Map instance) throws SerializationException {
       serialize(streamWriter, instance);
@@ -132,6 +138,7 @@
   /**
    * Custom field serializer for {@link java.util.Collections.EmptySet}.
    */
+  @SuppressWarnings("rawtypes")
   public static final class EmptySet_CustomFieldSerializer extends
       CustomFieldSerializer<Set> {
 
@@ -139,24 +146,25 @@
       return java.util.Collections.emptySet().getClass().getName();
     }
 
-    @SuppressWarnings({"unused", "unchecked"})
+    @SuppressWarnings("unused")
     public static void deserialize(SerializationStreamReader streamReader,
         Set instance) throws SerializationException {
       // Handled in instantiate.
     }
 
-    @SuppressWarnings({"unused", "unchecked"})
+    @SuppressWarnings("unused")
     public static Set instantiate(SerializationStreamReader streamReader)
         throws SerializationException {
       return java.util.Collections.emptySet();
     }
 
-    @SuppressWarnings({"unused", "unchecked"})
+    @SuppressWarnings("unused")
     public static void serialize(SerializationStreamWriter streamWriter,
         Set instance) throws SerializationException {
       // Nothing to serialize -- instantiate always returns the same thing
     }
 
+    @Override
     public void deserializeInstance(SerializationStreamReader streamReader,
         Set instance) throws SerializationException {
       deserialize(streamReader, instance);
@@ -173,6 +181,7 @@
       return instantiate(streamReader);
     }
 
+    @Override
     public void serializeInstance(SerializationStreamWriter streamWriter,
         Set instance) throws SerializationException {
       serialize(streamWriter, instance);
@@ -182,6 +191,7 @@
   /**
    * Custom field serializer for {@link java.util.Collections.SingletonList}.
    */
+  @SuppressWarnings("rawtypes")
   public static final class SingletonList_CustomFieldSerializer extends
       CustomFieldSerializer<List> {
 
@@ -189,23 +199,22 @@
       return java.util.Collections.singletonList(null).getClass().getName();
     }
 
-    @SuppressWarnings({"unused", "unchecked"})
+    @SuppressWarnings("unused")
     public static void deserialize(SerializationStreamReader streamReader,
         List instance) throws SerializationException {
     }
 
-    @SuppressWarnings("unchecked")
     public static List instantiate(SerializationStreamReader streamReader)
         throws SerializationException {
       return java.util.Collections.singletonList(streamReader.readObject());
     }
 
-    @SuppressWarnings("unchecked")
     public static void serialize(SerializationStreamWriter streamWriter,
         List instance) throws SerializationException {
       streamWriter.writeObject(instance.get(0));
     }
 
+    @Override
     public void deserializeInstance(SerializationStreamReader streamReader,
         List instance) throws SerializationException {
       deserialize(streamReader, instance);
@@ -222,6 +231,7 @@
       return instantiate(streamReader);
     }
 
+    @Override
     public void serializeInstance(SerializationStreamWriter streamWriter,
         List instance) throws SerializationException {
       serialize(streamWriter, instance);
diff --git a/user/src/com/google/gwt/user/client/rpc/core/java/util/Date_CustomFieldSerializer.java b/user/src/com/google/gwt/user/client/rpc/core/java/util/Date_CustomFieldSerializer.java
index 42409ec..1a9601c 100644
--- a/user/src/com/google/gwt/user/client/rpc/core/java/util/Date_CustomFieldSerializer.java
+++ b/user/src/com/google/gwt/user/client/rpc/core/java/util/Date_CustomFieldSerializer.java
@@ -47,6 +47,7 @@
     streamWriter.writeLong(instance.getTime());
   }
 
+  @Override
   public void deserializeInstance(SerializationStreamReader streamReader,
       Date instance) throws SerializationException {
     deserialize(streamReader, instance);
@@ -63,6 +64,7 @@
     return instantiate(streamReader);
   }
 
+  @Override
   public void serializeInstance(SerializationStreamWriter streamWriter,
       Date instance) throws SerializationException {
     serialize(streamWriter, instance);
diff --git a/user/src/com/google/gwt/user/client/rpc/core/java/util/HashMap_CustomFieldSerializer.java b/user/src/com/google/gwt/user/client/rpc/core/java/util/HashMap_CustomFieldSerializer.java
index 007f787..748c4d3 100644
--- a/user/src/com/google/gwt/user/client/rpc/core/java/util/HashMap_CustomFieldSerializer.java
+++ b/user/src/com/google/gwt/user/client/rpc/core/java/util/HashMap_CustomFieldSerializer.java
@@ -25,26 +25,27 @@
 /**
  * Custom field serializer for {@link java.util.HashMap}.
  */
+@SuppressWarnings("rawtypes")
 public final class HashMap_CustomFieldSerializer extends
     CustomFieldSerializer<HashMap> {
 
-  @SuppressWarnings("unchecked")
   public static void deserialize(SerializationStreamReader streamReader,
       HashMap instance) throws SerializationException {
     Map_CustomFieldSerializerBase.deserialize(streamReader, instance);
   }
 
-  @SuppressWarnings("unchecked")
   public static void serialize(SerializationStreamWriter streamWriter,
       HashMap instance) throws SerializationException {
     Map_CustomFieldSerializerBase.serialize(streamWriter, instance);
   }
 
+  @Override
   public void deserializeInstance(SerializationStreamReader streamReader,
       HashMap instance) throws SerializationException {
     deserialize(streamReader, instance);
   }
 
+  @Override
   public void serializeInstance(SerializationStreamWriter streamWriter,
       HashMap instance) throws SerializationException {
     serialize(streamWriter, instance);
diff --git a/user/src/com/google/gwt/user/client/rpc/core/java/util/HashSet_CustomFieldSerializer.java b/user/src/com/google/gwt/user/client/rpc/core/java/util/HashSet_CustomFieldSerializer.java
index 925a280..1e2303c 100644
--- a/user/src/com/google/gwt/user/client/rpc/core/java/util/HashSet_CustomFieldSerializer.java
+++ b/user/src/com/google/gwt/user/client/rpc/core/java/util/HashSet_CustomFieldSerializer.java
@@ -25,26 +25,27 @@
 /**
  * Custom field serializer for {@link java.util.HashSet}.
  */
+@SuppressWarnings("rawtypes")
 public final class HashSet_CustomFieldSerializer extends
     CustomFieldSerializer<HashSet> {
 
-  @SuppressWarnings("unchecked")
   public static void deserialize(SerializationStreamReader streamReader,
       HashSet instance) throws SerializationException {
     Collection_CustomFieldSerializerBase.deserialize(streamReader, instance);
   }
 
-  @SuppressWarnings("unchecked")
   public static void serialize(SerializationStreamWriter streamWriter,
       HashSet instance) throws SerializationException {
     Collection_CustomFieldSerializerBase.serialize(streamWriter, instance);
   }
 
+  @Override
   public void deserializeInstance(SerializationStreamReader streamReader,
       HashSet instance) throws SerializationException {
     deserialize(streamReader, instance);
   }
 
+  @Override
   public void serializeInstance(SerializationStreamWriter streamWriter,
       HashSet instance) throws SerializationException {
     serialize(streamWriter, instance);
diff --git a/user/src/com/google/gwt/user/client/rpc/core/java/util/IdentityHashMap_CustomFieldSerializer.java b/user/src/com/google/gwt/user/client/rpc/core/java/util/IdentityHashMap_CustomFieldSerializer.java
index 858e6ff..a3da3f2 100644
--- a/user/src/com/google/gwt/user/client/rpc/core/java/util/IdentityHashMap_CustomFieldSerializer.java
+++ b/user/src/com/google/gwt/user/client/rpc/core/java/util/IdentityHashMap_CustomFieldSerializer.java
@@ -25,26 +25,27 @@
 /**
  * Custom field serializer for {@link java.util.HashMap}.
  */
+@SuppressWarnings("rawtypes")
 public final class IdentityHashMap_CustomFieldSerializer extends
     CustomFieldSerializer<IdentityHashMap> {
 
-  @SuppressWarnings("unchecked")
   public static void deserialize(SerializationStreamReader streamReader,
       IdentityHashMap instance) throws SerializationException {
     Map_CustomFieldSerializerBase.deserialize(streamReader, instance);
   }
 
-  @SuppressWarnings("unchecked")
   public static void serialize(SerializationStreamWriter streamWriter,
       IdentityHashMap instance) throws SerializationException {
     Map_CustomFieldSerializerBase.serialize(streamWriter, instance);
   }
 
+  @Override
   public void deserializeInstance(SerializationStreamReader streamReader,
       IdentityHashMap instance) throws SerializationException {
     deserialize(streamReader, instance);
   }
 
+  @Override
   public void serializeInstance(SerializationStreamWriter streamWriter,
       IdentityHashMap instance) throws SerializationException {
     serialize(streamWriter, instance);
diff --git a/user/src/com/google/gwt/user/client/rpc/core/java/util/LinkedHashMap_CustomFieldSerializer.java b/user/src/com/google/gwt/user/client/rpc/core/java/util/LinkedHashMap_CustomFieldSerializer.java
index efca74a..440bfca 100644
--- a/user/src/com/google/gwt/user/client/rpc/core/java/util/LinkedHashMap_CustomFieldSerializer.java
+++ b/user/src/com/google/gwt/user/client/rpc/core/java/util/LinkedHashMap_CustomFieldSerializer.java
@@ -29,7 +29,7 @@
  * Custom field serializer for {@link java.util.LinkedHashMap} for the server
  * (uses reflection).
  */
-@SuppressWarnings("unchecked")
+@SuppressWarnings("rawtypes")
 public final class LinkedHashMap_CustomFieldSerializer extends
     CustomFieldSerializer<LinkedHashMap> {
 
@@ -62,6 +62,7 @@
    * @param instance the instance to check
    * @return the value of instance.accessOrder
    */
+  @SuppressWarnings("unchecked")
   public static boolean getAccessOrderNoReflection(LinkedHashMap instance) {
     /*
      * Clone the instance so our modifications won't affect the original. In
@@ -129,6 +130,7 @@
     return getAccessOrderNoReflection(instance);
   }
 
+  @Override
   public void deserializeInstance(SerializationStreamReader streamReader,
       LinkedHashMap instance) throws SerializationException {
     deserialize(streamReader, instance);
@@ -145,6 +147,7 @@
     return instantiate(streamReader);
   }
 
+  @Override
   public void serializeInstance(SerializationStreamWriter streamWriter,
       LinkedHashMap instance) throws SerializationException {
     serialize(streamWriter, instance);
diff --git a/user/src/com/google/gwt/user/client/rpc/core/java/util/LinkedList_CustomFieldSerializer.java b/user/src/com/google/gwt/user/client/rpc/core/java/util/LinkedList_CustomFieldSerializer.java
index 1e57dbf..3cff596 100644
--- a/user/src/com/google/gwt/user/client/rpc/core/java/util/LinkedList_CustomFieldSerializer.java
+++ b/user/src/com/google/gwt/user/client/rpc/core/java/util/LinkedList_CustomFieldSerializer.java
@@ -25,26 +25,27 @@
 /**
  * Custom field serializer for {@link java.util.ArrayList}.
  */
+@SuppressWarnings("rawtypes")
 public final class LinkedList_CustomFieldSerializer extends
     CustomFieldSerializer<LinkedList> {
 
-  @SuppressWarnings("unchecked")
   public static void deserialize(SerializationStreamReader streamReader,
       LinkedList instance) throws SerializationException {
     Collection_CustomFieldSerializerBase.deserialize(streamReader, instance);
   }
 
-  @SuppressWarnings("unchecked")
   public static void serialize(SerializationStreamWriter streamWriter,
       LinkedList instance) throws SerializationException {
     Collection_CustomFieldSerializerBase.serialize(streamWriter, instance);
   }
 
+  @Override
   public void deserializeInstance(SerializationStreamReader streamReader,
       LinkedList instance) throws SerializationException {
     deserialize(streamReader, instance);
   }
 
+  @Override
   public void serializeInstance(SerializationStreamWriter streamWriter,
       LinkedList instance) throws SerializationException {
     serialize(streamWriter, instance);
diff --git a/user/src/com/google/gwt/user/client/rpc/core/java/util/Map_CustomFieldSerializerBase.java b/user/src/com/google/gwt/user/client/rpc/core/java/util/Map_CustomFieldSerializerBase.java
index 6f88c33..2ca3a3d 100644
--- a/user/src/com/google/gwt/user/client/rpc/core/java/util/Map_CustomFieldSerializerBase.java
+++ b/user/src/com/google/gwt/user/client/rpc/core/java/util/Map_CustomFieldSerializerBase.java
@@ -26,6 +26,7 @@
 /**
  * Custom field serializer for {@link java.util.HashMap}.
  */
+@SuppressWarnings("rawtypes")
 public final class Map_CustomFieldSerializerBase {
 
   @SuppressWarnings("unchecked")
@@ -52,5 +53,4 @@
       streamWriter.writeObject(entry.getValue());
     }
   }
-
 }
\ No newline at end of file
diff --git a/user/src/com/google/gwt/user/client/rpc/core/java/util/TreeMap_CustomFieldSerializer.java b/user/src/com/google/gwt/user/client/rpc/core/java/util/TreeMap_CustomFieldSerializer.java
index ea1ff62..111fbd8 100644
--- a/user/src/com/google/gwt/user/client/rpc/core/java/util/TreeMap_CustomFieldSerializer.java
+++ b/user/src/com/google/gwt/user/client/rpc/core/java/util/TreeMap_CustomFieldSerializer.java
@@ -26,7 +26,7 @@
 /**
  * Custom field serializer for {@link java.util.TreeMap}.
  */
-@SuppressWarnings("unchecked")
+@SuppressWarnings("rawtypes")
 public class TreeMap_CustomFieldSerializer extends
     CustomFieldSerializer<TreeMap> {
 
@@ -36,6 +36,7 @@
     Map_CustomFieldSerializerBase.deserialize(streamReader, instance);
   }
 
+  @SuppressWarnings("unchecked")
   public static TreeMap instantiate(SerializationStreamReader streamReader)
       throws SerializationException {
     return new TreeMap((Comparator) streamReader.readObject());
@@ -47,6 +48,7 @@
     Map_CustomFieldSerializerBase.serialize(streamWriter, instance);
   }
 
+  @Override
   public void deserializeInstance(SerializationStreamReader streamReader,
       TreeMap instance) throws SerializationException {
     deserialize(streamReader, instance);
@@ -63,6 +65,7 @@
     return instantiate(streamReader);
   }
 
+  @Override
   public void serializeInstance(SerializationStreamWriter streamWriter,
       TreeMap instance) throws SerializationException {
     serialize(streamWriter, instance);
diff --git a/user/src/com/google/gwt/user/client/rpc/core/java/util/TreeSet_CustomFieldSerializer.java b/user/src/com/google/gwt/user/client/rpc/core/java/util/TreeSet_CustomFieldSerializer.java
index e6458b8..ba2d8cb 100644
--- a/user/src/com/google/gwt/user/client/rpc/core/java/util/TreeSet_CustomFieldSerializer.java
+++ b/user/src/com/google/gwt/user/client/rpc/core/java/util/TreeSet_CustomFieldSerializer.java
@@ -26,7 +26,7 @@
 /**
  * Custom field serializer for {@link java.util.TreeMap}.
  */
-@SuppressWarnings("unchecked")
+@SuppressWarnings("rawtypes")
 public class TreeSet_CustomFieldSerializer extends
     CustomFieldSerializer<TreeSet> {
 
@@ -36,6 +36,7 @@
     Collection_CustomFieldSerializerBase.deserialize(streamReader, instance);
   }
 
+  @SuppressWarnings("unchecked")
   public static TreeSet instantiate(SerializationStreamReader streamReader)
       throws SerializationException {
     return new TreeSet((Comparator) streamReader.readObject());
@@ -47,6 +48,7 @@
     Collection_CustomFieldSerializerBase.serialize(streamWriter, instance);
   }
 
+  @Override
   public void deserializeInstance(SerializationStreamReader streamReader,
       TreeSet instance) throws SerializationException {
     deserialize(streamReader, instance);
@@ -63,6 +65,7 @@
     return instantiate(streamReader);
   }
 
+  @Override
   public void serializeInstance(SerializationStreamWriter streamWriter,
       TreeSet instance) throws SerializationException {
     serialize(streamWriter, instance);
diff --git a/user/src/com/google/gwt/user/client/rpc/core/java/util/Vector_CustomFieldSerializer.java b/user/src/com/google/gwt/user/client/rpc/core/java/util/Vector_CustomFieldSerializer.java
index a887bd1..ca76ece 100644
--- a/user/src/com/google/gwt/user/client/rpc/core/java/util/Vector_CustomFieldSerializer.java
+++ b/user/src/com/google/gwt/user/client/rpc/core/java/util/Vector_CustomFieldSerializer.java
@@ -25,26 +25,27 @@
 /**
  * Custom field serializer for {@link java.util.Vector}.
  */
+@SuppressWarnings("rawtypes")
 public final class Vector_CustomFieldSerializer extends
     CustomFieldSerializer<Vector> {
 
-  @SuppressWarnings("unchecked")
   public static void deserialize(SerializationStreamReader streamReader,
       Vector instance) throws SerializationException {
     Collection_CustomFieldSerializerBase.deserialize(streamReader, instance);
   }
 
-  @SuppressWarnings("unchecked")
   public static void serialize(SerializationStreamWriter streamWriter,
       Vector instance) throws SerializationException {
     Collection_CustomFieldSerializerBase.serialize(streamWriter, instance);
   }
 
+  @Override
   public void deserializeInstance(SerializationStreamReader streamReader,
       Vector instance) throws SerializationException {
     deserialize(streamReader, instance);
   }
 
+  @Override
   public void serializeInstance(SerializationStreamWriter streamWriter,
       Vector instance) throws SerializationException {
     serialize(streamWriter, instance);
diff --git a/user/src/com/google/gwt/user/client/rpc/impl/ClientSerializationStreamWriter.java b/user/src/com/google/gwt/user/client/rpc/impl/ClientSerializationStreamWriter.java
index 571bdad..aee6a81 100644
--- a/user/src/com/google/gwt/user/client/rpc/impl/ClientSerializationStreamWriter.java
+++ b/user/src/com/google/gwt/user/client/rpc/impl/ClientSerializationStreamWriter.java
@@ -30,7 +30,6 @@
   /**
    * Used by JSNI, see {@link #quoteString(String)}.
    */
-  @SuppressWarnings("unused")
   private static JavaScriptObject regex = getQuotingRegex();
 
   /**
diff --git a/user/src/com/google/gwt/user/client/rpc/impl/ReflectionHelper.java b/user/src/com/google/gwt/user/client/rpc/impl/ReflectionHelper.java
index 4fce9fb..5937070 100644
--- a/user/src/com/google/gwt/user/client/rpc/impl/ReflectionHelper.java
+++ b/user/src/com/google/gwt/user/client/rpc/impl/ReflectionHelper.java
@@ -49,8 +49,8 @@
     }
   }
 
-  private static final Cache<Class<?>, Constructor> constructorCache
-      = new Cache<Class<?>, Constructor>();
+  private static final Cache<Class<?>, Constructor<?>> constructorCache
+      = new Cache<Class<?>, Constructor<?>>();
 
   private static final Cache<Pair<Class<?>,String>, Field> fieldCache
       = new Cache<Pair<Class<?>,String>, Field>();
diff --git a/user/src/com/google/gwt/user/client/rpc/impl/RemoteServiceProxy.java b/user/src/com/google/gwt/user/client/rpc/impl/RemoteServiceProxy.java
index d24dcbb..5d6b4ac 100644
--- a/user/src/com/google/gwt/user/client/rpc/impl/RemoteServiceProxy.java
+++ b/user/src/com/google/gwt/user/client/rpc/impl/RemoteServiceProxy.java
@@ -280,7 +280,6 @@
    * RpcToken.RpcTokenImplementation} annotation.
    *
    * @param token currently set {@link RpcToken}.
-   * @throws RpcTokenException if types mismatch.
    */
   protected void checkRpcTokenType(RpcToken token) {
   }
diff --git a/user/src/com/google/gwt/user/client/ui/CellPanel.java b/user/src/com/google/gwt/user/client/ui/CellPanel.java
index 43be0b1..8391239 100644
--- a/user/src/com/google/gwt/user/client/ui/CellPanel.java
+++ b/user/src/com/google/gwt/user/client/ui/CellPanel.java
@@ -138,7 +138,7 @@
   /**
    * Overloaded version for IsWidget.
    * 
-   * @see #setCellHorizontalAlignment(Widget,HorizontalAlignmentConstant)
+   * @see #setCellHorizontalAlignment(Widget,HasHorizontalAlignment.HorizontalAlignmentConstant)
    */
   public void setCellHorizontalAlignment(IsWidget w,
       HorizontalAlignmentConstant align) {
@@ -152,7 +152,7 @@
    * @param align the widget's vertical alignment, as defined in
    *          {@link HasVerticalAlignment}.
    */
-  public void setCellVerticalAlignment(Widget w, VerticalAlignmentConstant align) {
+  public void setCellVerticalAlignment(Widget w, HasVerticalAlignment.VerticalAlignmentConstant align) {
     Element td = getWidgetTd(w);
     if (td != null) {
       setCellVerticalAlignment(td, align);
@@ -162,7 +162,7 @@
   /**
    * Overloaded version for IsWidget.
    * 
-   * @see #setCellVerticalAlignment(Widget,VerticalAlignmentConstant)
+   * @see #setCellVerticalAlignment(Widget,HasVerticalAlignment.VerticalAlignmentConstant)
    */
   public void setCellVerticalAlignment(IsWidget w, VerticalAlignmentConstant align) {
     this.setCellVerticalAlignment(w.asWidget(),align);
diff --git a/user/src/com/google/gwt/user/client/ui/DateLabel.java b/user/src/com/google/gwt/user/client/ui/DateLabel.java
index 0c925a8..1af0b05 100644
--- a/user/src/com/google/gwt/user/client/ui/DateLabel.java
+++ b/user/src/com/google/gwt/user/client/ui/DateLabel.java
@@ -34,7 +34,7 @@
  * The format can be given with one of these attributes:
  * <dl>
  * <dt>format</dt><dd>a reference to a {@link DateTimeFormat} instance.</dd>
- * <dt>predefinedFormat</dt><dd>a {@link DateTimeFormat.PredefinedFormat}.</dd>
+ * <dt>predefinedFormat</dt><dd>a {@link com.google.gwt.i18n.client.DateTimeFormat.PredefinedFormat DateTimeFormat.PredefinedFormat}.</dd>
  * <dt>customFormat</dt><dd>a date time pattern that can be passed to {@link DateTimeFormat#getFormat(String)}.</dd>
  * </dl>
  * <p>
diff --git a/user/src/com/google/gwt/user/client/ui/DialogBox.java b/user/src/com/google/gwt/user/client/ui/DialogBox.java
index 313995d..50f3666 100644
--- a/user/src/com/google/gwt/user/client/ui/DialogBox.java
+++ b/user/src/com/google/gwt/user/client/ui/DialogBox.java
@@ -382,7 +382,7 @@
 
   /**
    * Sets the html string inside the caption by calling its
-   * {@link #setHTML(SafeHTML)} method.
+   * {@link #setHTML(SafeHtml)} method.
    *
    * Use {@link #setWidget(Widget)} to set the contents inside the
    * {@link DialogBox}.
diff --git a/user/src/com/google/gwt/user/client/ui/DisclosurePanel.java b/user/src/com/google/gwt/user/client/ui/DisclosurePanel.java
index 506ef09..92d81d3 100644
--- a/user/src/com/google/gwt/user/client/ui/DisclosurePanel.java
+++ b/user/src/com/google/gwt/user/client/ui/DisclosurePanel.java
@@ -427,6 +427,7 @@
    * @param header the widget to be used as a header
    * @deprecated use {@link #DisclosurePanel()} and {@link #setHeader(Widget)}
    */
+  @Deprecated
   public DisclosurePanel(Widget header) {
     this();
     setHeader(header);
diff --git a/user/src/com/google/gwt/user/client/ui/InlineHTML.java b/user/src/com/google/gwt/user/client/ui/InlineHTML.java
index 09f8f98..a744994 100644
--- a/user/src/com/google/gwt/user/client/ui/InlineHTML.java
+++ b/user/src/com/google/gwt/user/client/ui/InlineHTML.java
@@ -18,7 +18,6 @@
 import com.google.gwt.dom.client.Document;
 import com.google.gwt.dom.client.Element;
 
-
 import com.google.gwt.i18n.shared.DirectionEstimator;
 import com.google.gwt.safehtml.shared.SafeHtml;
 
diff --git a/user/src/com/google/gwt/user/client/ui/InlineLabel.java b/user/src/com/google/gwt/user/client/ui/InlineLabel.java
index 5a33856..a6b9efc 100644
--- a/user/src/com/google/gwt/user/client/ui/InlineLabel.java
+++ b/user/src/com/google/gwt/user/client/ui/InlineLabel.java
@@ -18,7 +18,6 @@
 import com.google.gwt.dom.client.Document;
 import com.google.gwt.dom.client.Element;
 
-
 import com.google.gwt.i18n.shared.DirectionEstimator;
 
 /**
diff --git a/user/src/com/google/gwt/user/client/ui/LayoutPanel.java b/user/src/com/google/gwt/user/client/ui/LayoutPanel.java
index 4662c7a..be65129 100644
--- a/user/src/com/google/gwt/user/client/ui/LayoutPanel.java
+++ b/user/src/com/google/gwt/user/client/ui/LayoutPanel.java
@@ -233,7 +233,7 @@
   /**
    * Overloaded version for IsWidget.
    * 
-   * @see #setWidgetBottomHeight(Widget,double, Unit, double, Unit)
+   * @see #setWidgetBottomHeight(Widget,double, Style.Unit, double, Style.Unit)
    */
   public void setWidgetBottomHeight(IsWidget child, double bottom,
       Unit bottomUnit, double height, Unit heightUnit) {
@@ -271,7 +271,7 @@
   /**
    * Overloaded version for IsWidget.
    * 
-   * @see #setWidgetLeftRight(Widget,double, Unit, double, Unit)
+   * @see #setWidgetLeftRight(Widget,double, Style.Unit, double, Style.Unit)
    */
   public void setWidgetLeftRight(IsWidget child, double left, Unit leftUnit,
       double right, Unit rightUnit) {
@@ -297,7 +297,7 @@
   /**
    * Overloaded version for IsWidget.
    * 
-   * @see #setWidgetLeftWidth(Widget,double, Unit, double, Unit)
+   * @see #setWidgetLeftWidth(Widget,double, Style.Unit, double, Style.Unit)
    */
   public void setWidgetLeftWidth(IsWidget child, double left, Unit leftUnit,
       double width, Unit widthUnit) {
@@ -323,7 +323,7 @@
   /**
    * Overloaded version for IsWidget.
    * 
-   * @see #setWidgetRightWidth(Widget,double, Unit, double, Unit)
+   * @see #setWidgetRightWidth(Widget,double, Style.Unit, double, Style.Unit)
    */
   public void setWidgetRightWidth(IsWidget child, double right, Unit rightUnit,
       double width, Unit widthUnit) {
@@ -349,7 +349,7 @@
   /**
    * Overloaded version for IsWidget.
    * 
-   * @see #setWidgetTopBottom(Widget,double, Unit, double, Unit)
+   * @see #setWidgetTopBottom(Widget,double, Style.Unit, double, Style.Unit)
    */
   public void setWidgetTopBottom(IsWidget child, double top, Unit topUnit,
       double bottom, Unit bottomUnit) {
@@ -375,7 +375,7 @@
   /**
    * Overloaded version for IsWidget.
    * 
-   * @see #setWidgetTopHeight(Widget,double, Unit, double, Unit)
+   * @see #setWidgetTopHeight(Widget,double, Style.Unit, double, Style.Unit)
    */
   public void setWidgetTopHeight(IsWidget child, double top, Unit topUnit,
       double height, Unit heightUnit) {
diff --git a/user/src/com/google/gwt/user/client/ui/ListBox.java b/user/src/com/google/gwt/user/client/ui/ListBox.java
index afe11c5..e363a93 100644
--- a/user/src/com/google/gwt/user/client/ui/ListBox.java
+++ b/user/src/com/google/gwt/user/client/ui/ListBox.java
@@ -404,7 +404,7 @@
   /**
    * {@inheritDoc}
    * See note at
-   * {@link #setDirectionEstimator(com.google.gwt.i18n.shared.DirectionEstimator)}
+   * {@link #setDirectionEstimator(com.google.gwt.i18n.shared.DirectionEstimator)}.
    */
   public void setDirectionEstimator(boolean enabled) {
     setDirectionEstimator(enabled ? DEFAULT_DIRECTION_ESTIMATOR : null);
diff --git a/user/src/com/google/gwt/user/client/ui/ListenerWrapper.java b/user/src/com/google/gwt/user/client/ui/ListenerWrapper.java
index f75735d..9b4a1b4 100644
--- a/user/src/com/google/gwt/user/client/ui/ListenerWrapper.java
+++ b/user/src/com/google/gwt/user/client/ui/ListenerWrapper.java
@@ -802,7 +802,7 @@
    */
   // This is an internal helper method with the current formulation, we have
   // lost the info needed to make it safe by this point.
-  @SuppressWarnings("unchecked")
+  @SuppressWarnings("rawtypes")
   protected static <H extends EventHandler> void baseRemove(Widget eventSource,
       EventListener listener, Type... types) {
     HandlerManager manager = eventSource.getHandlerManager();
diff --git a/user/src/com/google/gwt/user/client/ui/MenuBar.java b/user/src/com/google/gwt/user/client/ui/MenuBar.java
index fc3061a..5810adf 100644
--- a/user/src/com/google/gwt/user/client/ui/MenuBar.java
+++ b/user/src/com/google/gwt/user/client/ui/MenuBar.java
@@ -881,50 +881,48 @@
     // Ensure that the item is selected.
     selectItem(item);
 
-    if (item != null) {
-      // if the command should be fired and the item has one, fire it
-      if (fireCommand && item.getCommand() != null) {
-        // Close this menu and all of its parents.
-        closeAllParents();
+    // if the command should be fired and the item has one, fire it
+    if (fireCommand && item.getCommand() != null) {
+      // Close this menu and all of its parents.
+      closeAllParents();
 
-        // Fire the item's command. The command must be fired in the same event
-        // loop or popup blockers will prevent popups from opening.
-        final Command cmd = item.getCommand();
-        Scheduler.get().scheduleFinally(new Scheduler.ScheduledCommand() {
-          public void execute() {
-            cmd.execute();
-          }
-        });
+      // Fire the item's command. The command must be fired in the same event
+      // loop or popup blockers will prevent popups from opening.
+      final Command cmd = item.getCommand();
+      Scheduler.get().scheduleFinally(new Scheduler.ScheduledCommand() {
+        public void execute() {
+          cmd.execute();
+        }
+      });
 
-        // hide any open submenus of this item
-        if (shownChildMenu != null) {
-          shownChildMenu.onHide(focus);
-          popup.hide();
-          shownChildMenu = null;
-          selectItem(null);
-        }
-      } else if (item.getSubMenu() != null) {
-        if (shownChildMenu == null) {
-          // open this submenu
-          openPopup(item);
-        } else if (item.getSubMenu() != shownChildMenu) {
-          // close the other submenu and open this one
-          shownChildMenu.onHide(focus);
-          popup.hide();
-          openPopup(item);
-        } else if (fireCommand && !autoOpen) {
-          // close this submenu
-          shownChildMenu.onHide(focus);
-          popup.hide();
-          shownChildMenu = null;
-          selectItem(item);
-        }
-      } else if (autoOpen && shownChildMenu != null) {
-        // close submenu
+      // hide any open submenus of this item
+      if (shownChildMenu != null) {
         shownChildMenu.onHide(focus);
         popup.hide();
         shownChildMenu = null;
+        selectItem(null);
       }
+    } else if (item.getSubMenu() != null) {
+      if (shownChildMenu == null) {
+        // open this submenu
+        openPopup(item);
+      } else if (item.getSubMenu() != shownChildMenu) {
+        // close the other submenu and open this one
+        shownChildMenu.onHide(focus);
+        popup.hide();
+        openPopup(item);
+      } else if (fireCommand && !autoOpen) {
+        // close this submenu
+        shownChildMenu.onHide(focus);
+        popup.hide();
+        shownChildMenu = null;
+        selectItem(item);
+      }
+    } else if (autoOpen && shownChildMenu != null) {
+      // close submenu
+      shownChildMenu.onHide(focus);
+      popup.hide();
+      shownChildMenu = null;
     }
   }
 
diff --git a/user/src/com/google/gwt/user/client/ui/NamedFrame.java b/user/src/com/google/gwt/user/client/ui/NamedFrame.java
index 6fb5dbd..c290e00 100644
--- a/user/src/com/google/gwt/user/client/ui/NamedFrame.java
+++ b/user/src/com/google/gwt/user/client/ui/NamedFrame.java
@@ -36,7 +36,6 @@
 
   // Used inside JSNI, so please don't delete this field just because
   // your compiler or IDE says it's unused.
-  @SuppressWarnings("unused")
   private static JavaScriptObject PATTERN_NAME;
 
   static {
diff --git a/user/src/com/google/gwt/user/client/ui/PrefixTree.java b/user/src/com/google/gwt/user/client/ui/PrefixTree.java
index 1a653f1..302b696 100644
--- a/user/src/com/google/gwt/user/client/ui/PrefixTree.java
+++ b/user/src/com/google/gwt/user/client/ui/PrefixTree.java
@@ -41,7 +41,6 @@
    */
   private static class PrefixTreeIterator implements Iterator<String> {
 
-    @SuppressWarnings("unused")
     // Called from JSNI.
     private JavaScriptObject stack;
 
@@ -206,7 +205,6 @@
    *  @param s The String to make safe
    *  @return A safe version of <code>s</code>
    */
-  @SuppressWarnings("unused") // called from JSNI
   private static String safe(String s) {
     return ':' + s;
   }
@@ -217,7 +215,6 @@
    *  @param s A String returned from safe()
    *  @return The original String passed into safe()
    */
-  @SuppressWarnings("unused") // called from JSNI
   private static String unsafe(String s) {
     return s.substring(1);
   }
@@ -484,7 +481,6 @@
    * @param output the collection into which the prefixes will be dumped
    * @param prefix the prefix to filter with
    */
-  @SuppressWarnings("unused") // called from JSNI
   private void dump(Collection<String> output, String prefix) {
     for (String s : this) {
       output.add(prefix + s);
diff --git a/user/src/com/google/gwt/user/client/ui/SuggestBox.java b/user/src/com/google/gwt/user/client/ui/SuggestBox.java
index a95bb5a..7a1f431 100644
--- a/user/src/com/google/gwt/user/client/ui/SuggestBox.java
+++ b/user/src/com/google/gwt/user/client/ui/SuggestBox.java
@@ -105,7 +105,7 @@
  */
 @SuppressWarnings("deprecation")
 public class SuggestBox extends Composite implements HasText, HasFocus,
-    HasAnimation, SourcesClickEvents, SourcesFocusEvents, SourcesChangeEvents,
+    HasAnimation, SourcesClickEvents, SourcesChangeEvents,
     SourcesKeyboardEvents, FiresSuggestionEvents, HasAllKeyHandlers,
     HasValue<String>, HasSelectionHandlers<Suggestion>,
     IsEditor<LeafValueEditor<String>> {
diff --git a/user/src/com/google/gwt/user/client/ui/UIObject.java b/user/src/com/google/gwt/user/client/ui/UIObject.java
index 43069aa..d891873 100644
--- a/user/src/com/google/gwt/user/client/ui/UIObject.java
+++ b/user/src/com/google/gwt/user/client/ui/UIObject.java
@@ -129,7 +129,6 @@
    * Stores a regular expression object to extract float values from the
    * leading portion of an input string.
    */
-  @SuppressWarnings("unused")
   private static JavaScriptObject numberRegex;
 
   /*
diff --git a/user/src/com/google/gwt/user/client/ui/ValueBoxBase.java b/user/src/com/google/gwt/user/client/ui/ValueBoxBase.java
index 05d416e..78ae1a0 100644
--- a/user/src/com/google/gwt/user/client/ui/ValueBoxBase.java
+++ b/user/src/com/google/gwt/user/client/ui/ValueBoxBase.java
@@ -54,21 +54,25 @@
    */
   public enum TextAlignment {
     CENTER {
+      @Override
       String getTextAlignString() {
         return "center";
       }
     },
     JUSTIFY {
+      @Override
       String getTextAlignString() {
         return "justify";
       }
     },
     LEFT {
+      @Override
       String getTextAlignString() {
         return "left";
       }
     },
     RIGHT {
+      @Override
       String getTextAlignString() {
         return "right";
       }
diff --git a/user/src/com/google/gwt/user/client/ui/ValueLabel.java b/user/src/com/google/gwt/user/client/ui/ValueLabel.java
index 92e29db..98d1f7a 100644
--- a/user/src/com/google/gwt/user/client/ui/ValueLabel.java
+++ b/user/src/com/google/gwt/user/client/ui/ValueLabel.java
@@ -99,7 +99,6 @@
   /**
    * Creates an empty value label.
    * 
-   * @param inline
    * @param renderer
    */
   @UiConstructor
diff --git a/user/src/com/google/gwt/user/client/ui/impl/RichTextAreaImplStandard.java b/user/src/com/google/gwt/user/client/ui/impl/RichTextAreaImplStandard.java
index 7a69af9..67a6737 100644
--- a/user/src/com/google/gwt/user/client/ui/impl/RichTextAreaImplStandard.java
+++ b/user/src/com/google/gwt/user/client/ui/impl/RichTextAreaImplStandard.java
@@ -25,9 +25,7 @@
 /**
  * Basic rich text platform implementation.
  */
-@SuppressWarnings("deprecation")
 public abstract class RichTextAreaImplStandard extends RichTextAreaImpl implements
-    RichTextArea.BasicFormatter, RichTextArea.ExtendedFormatter,
     RichTextArea.Formatter {
 
   /**
diff --git a/user/src/com/google/gwt/user/datepicker/client/CellGridImpl.java b/user/src/com/google/gwt/user/datepicker/client/CellGridImpl.java
index c507003..77ce3b0 100644
--- a/user/src/com/google/gwt/user/datepicker/client/CellGridImpl.java
+++ b/user/src/com/google/gwt/user/datepicker/client/CellGridImpl.java
@@ -34,7 +34,6 @@
  * 
  * @param <V> type of value in grid.
  */
-@SuppressWarnings("unchecked")
 abstract class CellGridImpl<V> extends Grid {
 
   /**
diff --git a/user/src/com/google/gwt/user/linker/rpc/RpcLogArtifact.java b/user/src/com/google/gwt/user/linker/rpc/RpcLogArtifact.java
index f326cf3..ef9987b 100644
--- a/user/src/com/google/gwt/user/linker/rpc/RpcLogArtifact.java
+++ b/user/src/com/google/gwt/user/linker/rpc/RpcLogArtifact.java
@@ -46,9 +46,6 @@
     diskCacheToken = diskCache.writeString(rpcLog);
   }
 
-  /**
-   * @param logger a TreeLogger
-   */
   public byte[] getContents() {
     return diskCache.readByteArray(diskCacheToken);
   }
diff --git a/user/src/com/google/gwt/user/rebind/rpc/TypeConstrainer.java b/user/src/com/google/gwt/user/rebind/rpc/TypeConstrainer.java
index 888838d..7a20c4a 100644
--- a/user/src/com/google/gwt/user/rebind/rpc/TypeConstrainer.java
+++ b/user/src/com/google/gwt/user/rebind/rpc/TypeConstrainer.java
@@ -84,10 +84,6 @@
     return false;
   }
 
-  private static JClassType[] makeArray(JClassType... classTypes) {
-    return classTypes;
-  }
-
   /**
    * Check whether <code>param</code> occurs anywhere within <code>type</code>.
    */
diff --git a/user/src/com/google/gwt/user/server/rpc/impl/SerializabilityUtil.java b/user/src/com/google/gwt/user/server/rpc/impl/SerializabilityUtil.java
index db212f3..46cf9be 100644
--- a/user/src/com/google/gwt/user/server/rpc/impl/SerializabilityUtil.java
+++ b/user/src/com/google/gwt/user/server/rpc/impl/SerializabilityUtil.java
@@ -100,7 +100,7 @@
    * Custom Field Serializer does not implement the
    * {@link CustomFieldSerializer} interface.
    */
-  private static final CustomFieldSerializer NO_SUCH_SERIALIZER =
+  private static final CustomFieldSerializer<?> NO_SUCH_SERIALIZER =
       new CustomFieldSerializer<Object>() {
         @Override
         public void deserializeInstance(SerializationStreamReader
@@ -303,7 +303,7 @@
       if (CustomFieldSerializer.class.isAssignableFrom(customSerializerClass)) {
         try {
           customFieldSerializer =
-              (CustomFieldSerializer) customSerializerClass.newInstance();
+              (CustomFieldSerializer<?>) customSerializerClass.newInstance();
         } catch (InstantiationException e) {
           throw new SerializationException(e);
 
diff --git a/user/src/com/google/gwt/user/server/rpc/impl/ServerSerializationStreamReader.java b/user/src/com/google/gwt/user/server/rpc/impl/ServerSerializationStreamReader.java
index b78efb7..f50faf8 100644
--- a/user/src/com/google/gwt/user/server/rpc/impl/ServerSerializationStreamReader.java
+++ b/user/src/com/google/gwt/user/server/rpc/impl/ServerSerializationStreamReader.java
@@ -885,7 +885,7 @@
       IllegalArgumentException, InvocationTargetException,
       NoSuchMethodException, SerializationException {
     if (customSerializer != null) {
-      CustomFieldSerializer customFieldSerializer =
+      CustomFieldSerializer<?> customFieldSerializer =
           SerializabilityUtil.loadCustomFieldSerializer(customSerializer);
       if (customFieldSerializer == null) {
         for (Method method : customSerializer.getMethods()) {
diff --git a/user/src/com/google/gwt/validation/client/ValidationMessageResolver.java b/user/src/com/google/gwt/validation/client/ValidationMessageResolver.java
index 5b96dd9..37020b9 100644
--- a/user/src/com/google/gwt/validation/client/ValidationMessageResolver.java
+++ b/user/src/com/google/gwt/validation/client/ValidationMessageResolver.java
@@ -16,7 +16,7 @@
 package com.google.gwt.validation.client;
 
 /**
- * Users and Validation providers implement this to resolve ValidationMessages
+ * Users and Validation providers implement this to resolve ValidationMessages.
  */
 public interface ValidationMessageResolver {
 
diff --git a/user/src/com/google/gwt/validation/client/impl/NodeImpl.java b/user/src/com/google/gwt/validation/client/impl/NodeImpl.java
index 910585c..4328a40 100644
--- a/user/src/com/google/gwt/validation/client/impl/NodeImpl.java
+++ b/user/src/com/google/gwt/validation/client/impl/NodeImpl.java
@@ -49,7 +49,6 @@
 
   private final Object key;
 
-
   private NodeImpl(String name, Object key, Integer index, boolean iterable) {
     this.name = name;
     this.key = key;
diff --git a/user/src/com/google/gwt/validation/rebind/BeanHelper.java b/user/src/com/google/gwt/validation/rebind/BeanHelper.java
index af494e6..84ec7cb 100644
--- a/user/src/com/google/gwt/validation/rebind/BeanHelper.java
+++ b/user/src/com/google/gwt/validation/rebind/BeanHelper.java
@@ -70,7 +70,7 @@
   };
 
   /**
-   * Visible for testing
+   * Visible for testing.
    */
   public static void clearBeanHelpersForTests() {
     threadLocalHelperMap.get().clear();
diff --git a/user/src/com/google/gwt/validation/rebind/GwtSpecificValidatorCreator.java b/user/src/com/google/gwt/validation/rebind/GwtSpecificValidatorCreator.java
index 9a4eee5..5f52eba 100644
--- a/user/src/com/google/gwt/validation/rebind/GwtSpecificValidatorCreator.java
+++ b/user/src/com/google/gwt/validation/rebind/GwtSpecificValidatorCreator.java
@@ -142,7 +142,7 @@
         return sb.toString();
       }
 
-      if (value instanceof Class) {
+      if (value instanceof Class<?>) {
         return ((Class<?>) ((Class<?>) value)).getCanonicalName() + ".class";
       }
       if (value instanceof Double) {
@@ -1633,7 +1633,6 @@
     }
   }
 
-
   private void writeWrappers(SourceWriter sw) {
     sw.println("// Write the wrappers after we know which are needed");
     for (JField field : fieldsToWrap) {
diff --git a/user/src/com/google/gwt/validation/rebind/GwtSpecificValidatorGenerator.java b/user/src/com/google/gwt/validation/rebind/GwtSpecificValidatorGenerator.java
index 10c0448..42428d9 100644
--- a/user/src/com/google/gwt/validation/rebind/GwtSpecificValidatorGenerator.java
+++ b/user/src/com/google/gwt/validation/rebind/GwtSpecificValidatorGenerator.java
@@ -31,7 +31,6 @@
  */
 public class GwtSpecificValidatorGenerator extends Generator {
 
-
   @Override
   public String generate(TreeLogger logger, GeneratorContext context,
       String typeName) throws UnableToCompleteException {
diff --git a/user/src/com/google/gwt/validation/rebind/ValidatorCreator.java b/user/src/com/google/gwt/validation/rebind/ValidatorCreator.java
index ff00dee..4387ec7 100644
--- a/user/src/com/google/gwt/validation/rebind/ValidatorCreator.java
+++ b/user/src/com/google/gwt/validation/rebind/ValidatorCreator.java
@@ -117,7 +117,6 @@
     sw.println("}");
   }
 
-
   private void writeContext(SourceWriter sw, BeanHelper bean, String objectName) {
     // GwtValidationContext<T> context = new GwtValidationContext<T>(
     sw.print(GwtValidationContext.class.getSimpleName());
@@ -257,7 +256,6 @@
     sourceWriter.outdent();
   }
 
-
   private void writeValidate(SourceWriter sw) {
     // public <T> Set<ConstraintViolation<T>> validate(T object, Class<?>...
     // groups) {
diff --git a/user/src/com/google/gwt/view/client/DefaultSelectionEventManager.java b/user/src/com/google/gwt/view/client/DefaultSelectionEventManager.java
index 5651fe4..fd752b6 100644
--- a/user/src/com/google/gwt/view/client/DefaultSelectionEventManager.java
+++ b/user/src/com/google/gwt/view/client/DefaultSelectionEventManager.java
@@ -473,7 +473,7 @@
         : translator.translateSelectionEvent(event);
 
     // Handle the event based on the SelectionModel type.
-    if (selectionModel instanceof MultiSelectionModel) {
+    if (selectionModel instanceof MultiSelectionModel<?>) {
       // Add shift key support for MultiSelectionModel.
       handleMultiSelectionEvent(event, action,
           (MultiSelectionModel<? super T>) selectionModel);
diff --git a/user/src/com/google/gwt/xml/client/impl/XMLParserImplIE6.java b/user/src/com/google/gwt/xml/client/impl/XMLParserImplIE6.java
index b09b771..275afa2 100644
--- a/user/src/com/google/gwt/xml/client/impl/XMLParserImplIE6.java
+++ b/user/src/com/google/gwt/xml/client/impl/XMLParserImplIE6.java
@@ -27,7 +27,6 @@
    * different versions of IE and Windows having different available DOM
    * implementations.
    */
-  @SuppressWarnings("unused")
   private static native JavaScriptObject selectDOMDocumentVersion() /*-{
     try { return new ActiveXObject("Msxml2.DOMDocument"); } catch (e) { }
     try { return new ActiveXObject("MSXML.DOMDocument"); } catch (e) { }
diff --git a/user/src/com/google/gwt/xml/client/impl/XMLParserImplSafari.java b/user/src/com/google/gwt/xml/client/impl/XMLParserImplSafari.java
index 817cf4e..dd7dfd4 100644
--- a/user/src/com/google/gwt/xml/client/impl/XMLParserImplSafari.java
+++ b/user/src/com/google/gwt/xml/client/impl/XMLParserImplSafari.java
@@ -33,7 +33,6 @@
     return ((result) ? parseInt(result[1]) : 0) || 0;
   }-*/;
   
-  @SuppressWarnings("unused")
   private static void throwDOMParseException(String message) {
     throw new DOMParseException(message);
   }
diff --git a/user/test/com/google/gwt/activity/shared/ActivityManagerTest.java b/user/test/com/google/gwt/activity/shared/ActivityManagerTest.java
index 46e2892..7287d92 100644
--- a/user/test/com/google/gwt/activity/shared/ActivityManagerTest.java
+++ b/user/test/com/google/gwt/activity/shared/ActivityManagerTest.java
@@ -353,7 +353,7 @@
   }
   
   /**
-   * http://code.google.com/p/google-web-toolkit/issues/detail?id=5375
+   * @see http://code.google.com/p/google-web-toolkit/issues/detail?id=5375
    */
   public void testNullDisplayOnPlaceChange() {
     manager.setDisplay(realDisplay);
diff --git a/user/test/com/google/gwt/cell/client/CellTestBase.java b/user/test/com/google/gwt/cell/client/CellTestBase.java
index dcc851e..e7d0fc0 100644
--- a/user/test/com/google/gwt/cell/client/CellTestBase.java
+++ b/user/test/com/google/gwt/cell/client/CellTestBase.java
@@ -61,7 +61,6 @@
     public void assertLastParentElement(Element expected) {
       assertEquals(expected, lastParentElement);
     }
-
     
     @Override
     public boolean dependsOnSelection() {
diff --git a/user/test/com/google/gwt/core/client/JavaScriptExceptionTest.java b/user/test/com/google/gwt/core/client/JavaScriptExceptionTest.java
index cbd8e17..54d2eed 100644
--- a/user/test/com/google/gwt/core/client/JavaScriptExceptionTest.java
+++ b/user/test/com/google/gwt/core/client/JavaScriptExceptionTest.java
@@ -77,9 +77,11 @@
         assertFalse(
             "message contains 'extraField', but shouldn't: " + e.getMessage(),
             e.getMessage().contains("extraField"));
+        // CHECKSTYLE_OFF
         assertFalse(
             "message contains 'extraData', but shouldn't:" + e.getMessage(),
             e.getMessage().contains("extraData"));
+        // CHECKSTYLE_ON
       }
     }
   }
diff --git a/user/test/com/google/gwt/dom/client/SelectTests.java b/user/test/com/google/gwt/dom/client/SelectTests.java
index 2084dbc..402904d 100644
--- a/user/test/com/google/gwt/dom/client/SelectTests.java
+++ b/user/test/com/google/gwt/dom/client/SelectTests.java
@@ -131,7 +131,7 @@
   }
   
   /**
-   * optgroups
+   * Test optgroups.
    * 
    * @see <a href="http://code.google.com/p/google-web-toolkit/issues/detail?id=4916">Issue 4916</a>
    */
diff --git a/user/test/com/google/gwt/place/shared/PlaceChangeRequestEventTest.java b/user/test/com/google/gwt/place/shared/PlaceChangeRequestEventTest.java
index 46df9d9..b50c3d8 100644
--- a/user/test/com/google/gwt/place/shared/PlaceChangeRequestEventTest.java
+++ b/user/test/com/google/gwt/place/shared/PlaceChangeRequestEventTest.java
@@ -15,7 +15,6 @@
  */
 package com.google.gwt.place.shared;
 
-
 import junit.framework.TestCase;
 
 /**
diff --git a/user/test/com/google/gwt/requestfactory/client/RequestFactoryTest.java b/user/test/com/google/gwt/requestfactory/client/RequestFactoryTest.java
index ad85e81..699ed40 100644
--- a/user/test/com/google/gwt/requestfactory/client/RequestFactoryTest.java
+++ b/user/test/com/google/gwt/requestfactory/client/RequestFactoryTest.java
@@ -642,6 +642,7 @@
     simpleFooRequest().getTripletReference().with(
         "selfOneToManyField.selfOneToManyField.fooField").fire(
         new Receiver<SimpleFooProxy>() {
+          @Override
           public void onSuccess(SimpleFooProxy response) {
             response = checkSerialization(response);
             assertNotNull(response.getSelfOneToManyField().get(0));
diff --git a/user/test/com/google/gwt/storage/client/StorageMapTest.java b/user/test/com/google/gwt/storage/client/StorageMapTest.java
index a61c4c4..1af24b8 100644
--- a/user/test/com/google/gwt/storage/client/StorageMapTest.java
+++ b/user/test/com/google/gwt/storage/client/StorageMapTest.java
@@ -22,7 +22,7 @@
 import java.util.Map;
 
 /**
- * Tests {@link StorageMap}
+ * Tests {@link StorageMap}.
  * 
  * Because HtmlUnit does not support Storage, you will need to run these tests
  * manually by adding this line to your VM args: -Dgwt.args="-runStyle Manual:1"
diff --git a/user/test/com/google/gwt/storage/client/StorageTest.java b/user/test/com/google/gwt/storage/client/StorageTest.java
index 08b8c85..7298186 100644
--- a/user/test/com/google/gwt/storage/client/StorageTest.java
+++ b/user/test/com/google/gwt/storage/client/StorageTest.java
@@ -23,7 +23,7 @@
 import com.google.gwt.user.client.Timer;
 
 /**
- * Tests {@link Storage}
+ * Tests {@link Storage}.
  * 
  * Because HtmlUnit does not support Storage, you will need to run these tests
  * manually by adding this line to your VM args: -Dgwt.args="-runStyle Manual:1"
diff --git a/user/test/com/google/gwt/user/client/rpc/EnumsTestService.java b/user/test/com/google/gwt/user/client/rpc/EnumsTestService.java
index 54bb24c..fe84b22 100644
--- a/user/test/com/google/gwt/user/client/rpc/EnumsTestService.java
+++ b/user/test/com/google/gwt/user/client/rpc/EnumsTestService.java
@@ -92,7 +92,7 @@
   }
   
   /**
-   * Wrapper class containing an enum field
+   * Wrapper class containing an enum field.
    */
   public class FieldEnumWrapper implements Serializable {
     private FieldEnum fieldEnum = FieldEnum.Z;
diff --git a/user/test/com/google/gwt/user/client/rpc/RecursiveClassTest.java b/user/test/com/google/gwt/user/client/rpc/RecursiveClassTest.java
index e0cb51b..e3b84df 100644
--- a/user/test/com/google/gwt/user/client/rpc/RecursiveClassTest.java
+++ b/user/test/com/google/gwt/user/client/rpc/RecursiveClassTest.java
@@ -18,7 +18,6 @@
 import com.google.gwt.user.client.rpc.RecursiveClassTestService.ResultNode;
 import com.google.gwt.core.client.GWT;
 
-
 /**
  * Class used to test generics with wild cards and recursive references.
  */
diff --git a/user/test/com/google/gwt/user/client/rpc/RecursiveClassTestService.java b/user/test/com/google/gwt/user/client/rpc/RecursiveClassTestService.java
index 6d7ac83..1cec8a9 100644
--- a/user/test/com/google/gwt/user/client/rpc/RecursiveClassTestService.java
+++ b/user/test/com/google/gwt/user/client/rpc/RecursiveClassTestService.java
@@ -38,7 +38,6 @@
     public String data;
     public T next;
 
-
     public ResultNode() {
     }
   }
diff --git a/user/test/com/google/gwt/user/client/rpc/RecursiveClassTestServiceAsync.java b/user/test/com/google/gwt/user/client/rpc/RecursiveClassTestServiceAsync.java
index 2914b04..61fd819 100644
--- a/user/test/com/google/gwt/user/client/rpc/RecursiveClassTestServiceAsync.java
+++ b/user/test/com/google/gwt/user/client/rpc/RecursiveClassTestServiceAsync.java
@@ -18,7 +18,7 @@
 import com.google.gwt.user.client.rpc.RecursiveClassTestService.ResultNode;
 
 /**
- * Service used to test generics with wild cards and recursive references
+ * Service used to test generics with wild cards and recursive references.
  */
 public interface RecursiveClassTestServiceAsync {
   <U extends ResultNode<?>> void greetServer(String input, AsyncCallback<ResultNode> callback)
diff --git a/user/test/com/google/gwt/user/client/rpc/RpcTokenTest.java b/user/test/com/google/gwt/user/client/rpc/RpcTokenTest.java
index 60ceba2..67e99a9 100644
--- a/user/test/com/google/gwt/user/client/rpc/RpcTokenTest.java
+++ b/user/test/com/google/gwt/user/client/rpc/RpcTokenTest.java
@@ -23,14 +23,14 @@
 public class RpcTokenTest extends RpcTestBase {
 
   /**
-   * First RpcToken implementation
+   * First RpcToken implementation.
    */
   public static class TestRpcToken implements RpcToken {
     String tokenValue;
   }
 
   /**
-   * Second RpcToken implementation
+   * Second RpcToken implementation.
    */
   public static class AnotherTestRpcToken implements RpcToken {
     int token;
diff --git a/user/test/com/google/gwt/user/client/ui/HTMLTableTestBase.java b/user/test/com/google/gwt/user/client/ui/HTMLTableTestBase.java
index ce44b5a..70ec470 100644
--- a/user/test/com/google/gwt/user/client/ui/HTMLTableTestBase.java
+++ b/user/test/com/google/gwt/user/client/ui/HTMLTableTestBase.java
@@ -259,7 +259,7 @@
   /**
    * Ensures that {@link HTMLTable#setWidget(int, int, IsWidget)} does
    * <b>NOT</b> throws a {@link NullPointerException} when the Widget argument
-   * is <code>null</code>, for compatibility with setWidget(Widget) foolishness
+   * is <code>null</code>, for compatibility with setWidget(Widget) foolishness.
    */
   public void testSetNullWidgetAsIsWidget() {
     HTMLTable t = getTable(2, 2);
diff --git a/user/test/com/google/gwt/validation/tck/ConstraintApplicationGwtSuite.java b/user/test/com/google/gwt/validation/tck/ConstraintApplicationGwtSuite.java
index 56a7303..dfb0670 100644
--- a/user/test/com/google/gwt/validation/tck/ConstraintApplicationGwtSuite.java
+++ b/user/test/com/google/gwt/validation/tck/ConstraintApplicationGwtSuite.java
@@ -15,7 +15,6 @@
  */
 package com.google.gwt.validation.tck;
 
-
 import junit.framework.Test;
 
 import org.hibernate.jsr303.tck.tests.constraints.application.ValidationRequirementGwtTest;
diff --git a/user/test/com/google/gwt/validation/tck/ConstraintCompositionGwtSuite.java b/user/test/com/google/gwt/validation/tck/ConstraintCompositionGwtSuite.java
index 0a798ab..6f75797 100644
--- a/user/test/com/google/gwt/validation/tck/ConstraintCompositionGwtSuite.java
+++ b/user/test/com/google/gwt/validation/tck/ConstraintCompositionGwtSuite.java
@@ -15,7 +15,6 @@
  */
 package com.google.gwt.validation.tck;
 
-
 import junit.framework.Test;
 
 import org.hibernate.jsr303.tck.tests.constraints.constraintcomposition.ConstraintCompositionCompileTest;
diff --git a/user/test/com/google/gwt/validation/tck/ConstraintsGroupsGwtSuite.java b/user/test/com/google/gwt/validation/tck/ConstraintsGroupsGwtSuite.java
index 70b5111..633998e 100644
--- a/user/test/com/google/gwt/validation/tck/ConstraintsGroupsGwtSuite.java
+++ b/user/test/com/google/gwt/validation/tck/ConstraintsGroupsGwtSuite.java
@@ -15,7 +15,6 @@
  */
 package com.google.gwt.validation.tck;
 
-
 import junit.framework.Test;
 
 import org.hibernate.jsr303.tck.tests.constraints.groups.GroupGwtTest;
diff --git a/user/test/com/google/gwt/validation/tck/ConstraintsInheritanceGwtSuite.java b/user/test/com/google/gwt/validation/tck/ConstraintsInheritanceGwtSuite.java
index 9834fcc..2ed23e3 100644
--- a/user/test/com/google/gwt/validation/tck/ConstraintsInheritanceGwtSuite.java
+++ b/user/test/com/google/gwt/validation/tck/ConstraintsInheritanceGwtSuite.java
@@ -15,7 +15,6 @@
  */
 package com.google.gwt.validation.tck;
 
-
 import junit.framework.Test;
 
 import org.hibernate.jsr303.tck.tests.constraints.inheritance.ConstraintInheritanceGwtTest;
diff --git a/user/test/com/google/gwt/validation/tck/CustomConstraintGwtSuite.java b/user/test/com/google/gwt/validation/tck/CustomConstraintGwtSuite.java
index 09beccb..0ca6128 100644
--- a/user/test/com/google/gwt/validation/tck/CustomConstraintGwtSuite.java
+++ b/user/test/com/google/gwt/validation/tck/CustomConstraintGwtSuite.java
@@ -15,7 +15,6 @@
  */
 package com.google.gwt.validation.tck;
 
-
 import junit.framework.Test;
 
 import org.hibernate.jsr303.tck.tests.constraints.customconstraint.CustomConstraintValidatorGwtTest;
diff --git a/user/test/com/google/gwt/validation/tck/MessageInterpolationGwtSuite.java b/user/test/com/google/gwt/validation/tck/MessageInterpolationGwtSuite.java
index ad5e4db..d90ec24 100644
--- a/user/test/com/google/gwt/validation/tck/MessageInterpolationGwtSuite.java
+++ b/user/test/com/google/gwt/validation/tck/MessageInterpolationGwtSuite.java
@@ -15,7 +15,6 @@
  */
 package com.google.gwt.validation.tck;
 
-
 import junit.framework.Test;
 
 import org.hibernate.jsr303.tck.tests.messageinterpolation.MessageInterpolationGwtTest;
diff --git a/user/test/com/google/gwt/validation/tck/MetadataGwtSuite.java b/user/test/com/google/gwt/validation/tck/MetadataGwtSuite.java
index 3a147fb..63ce408 100644
--- a/user/test/com/google/gwt/validation/tck/MetadataGwtSuite.java
+++ b/user/test/com/google/gwt/validation/tck/MetadataGwtSuite.java
@@ -15,8 +15,6 @@
  */
 package com.google.gwt.validation.tck;
 
-
-
 import junit.framework.Test;
 
 import org.hibernate.jsr303.tck.tests.metadata.BeanDescriptorGwtTest;
diff --git a/user/test/com/google/gwt/validation/tck/ValidatorFactoryGwtSuite.java b/user/test/com/google/gwt/validation/tck/ValidatorFactoryGwtSuite.java
index b9ff6d7..64cbd28 100644
--- a/user/test/com/google/gwt/validation/tck/ValidatorFactoryGwtSuite.java
+++ b/user/test/com/google/gwt/validation/tck/ValidatorFactoryGwtSuite.java
@@ -15,8 +15,6 @@
  */
 package com.google.gwt.validation.tck;
 
-
-
 import junit.framework.Test;
 
 import org.hibernate.jsr303.tck.tests.validatorfactory.CustomConstraintValidatorGwtTest;
diff --git a/user/test/com/google/gwt/validation/tck/ValidatorResolutionGwtSuite.java b/user/test/com/google/gwt/validation/tck/ValidatorResolutionGwtSuite.java
index fb204fb..6020e4d 100644
--- a/user/test/com/google/gwt/validation/tck/ValidatorResolutionGwtSuite.java
+++ b/user/test/com/google/gwt/validation/tck/ValidatorResolutionGwtSuite.java
@@ -15,7 +15,6 @@
  */
 package com.google.gwt.validation.tck;
 
-
 import junit.framework.Test;
 
 import org.hibernate.jsr303.tck.tests.constraints.validatorresolution.ValidatorResolutionCompileTest;