Checkstyle update to 5.7 and style fixes.
Turned on checkstyle on tests and super.
Fixed quite a few style errors (mostly automatic); no functional
changes.
Change-Id: I824e1ed80cb55591b2b9c01c43c93bc2cb196df1
diff --git a/build.xml b/build.xml
index 446f8e6..25d5dc8 100755
--- a/build.xml
+++ b/build.xml
@@ -1,11 +1,11 @@
<project name="GWT" default="dist" basedir=".">
- <property name="gwt.root" location="." />
- <property name="project.tail" value="" />
- <import file="${gwt.root}/common.ant.xml" />
+ <property name="gwt.root" location="."/>
+ <property name="project.tail" value=""/>
+ <import file="${gwt.root}/common.ant.xml"/>
<!-- "build" is the default when subprojects are directly targetted -->
- <property name="target" value="build" />
- <property name="emma.merged.out" value="${project.build}/emma-coverage" />
+ <property name="target" value="build"/>
+ <property name="emma.merged.out" value="${project.build}/emma-coverage"/>
<!--
Convenience for the lateral calls we make. Use gwt.ant to
@@ -21,99 +21,107 @@
In other words, DO NOT USE DEPENDS=... IN A TARGET WITH GWT.ANT.
-->
<macrodef name="call-subproject">
- <attribute name="subproject" />
- <attribute name="subtarget" />
+ <attribute name="subproject"/>
+ <attribute name="subtarget"/>
<sequential>
<antcall target="@{subproject}">
- <param name="target" value="@{subtarget}" />
+ <param name="target" value="@{subtarget}"/>
</antcall>
</sequential>
</macrodef>
<property name="gwt.apicheck.config"
- location="tools/api-checker/config/gwt26_27userApi.conf"/>
+ location="tools/api-checker/config/gwt26_27userApi.conf"/>
<property name="gwt.apicheck.referencelibs"
- value="${gwt.tools}/api-checker-reference/2.6.0/gwt-dev-modified.jar:${gwt.tools}/api-checker-reference/2.6.0/gwt-user-modified.jar"/>
+ value="${gwt.tools}/api-checker-reference/2.6.0/gwt-dev-modified.jar:${gwt.tools}/api-checker-reference/2.6.0/gwt-user-modified.jar"/>
<target name="buildonly"
description="[action] Minimal one-platform devel build, without distro packaging">
- <call-subproject subproject="dev" subtarget="build" />
- <call-subproject subproject="codeserver" subtarget="build" />
- <call-subproject subproject="user" subtarget="build" />
- <call-subproject subproject="requestfactory" subtarget="build" />
- <call-subproject subproject="servlet" subtarget="build" />
- <call-subproject subproject="jni" subtarget="build" />
+ <call-subproject subproject="dev" subtarget="build"/>
+ <call-subproject subproject="codeserver" subtarget="build"/>
+ <call-subproject subproject="user" subtarget="build"/>
+ <call-subproject subproject="requestfactory" subtarget="build"/>
+ <call-subproject subproject="servlet" subtarget="build"/>
+ <call-subproject subproject="jni" subtarget="build"/>
</target>
<target name="dist" depends="build, doc" description="[action] Make all the distributions">
- <gwt.ant dir="distro-source" />
+ <gwt.ant dir="distro-source"/>
</target>
- <target name="dist-dev" depends="buildonly" description="[action] Make this platform's distribution, minus doc and samples">
- <gwt.ant dir="distro-source" target="build" />
+ <target name="dist-dev" depends="buildonly"
+ description="[action] Make this platform's distribution, minus doc and samples">
+ <gwt.ant dir="distro-source" target="build"/>
</target>
<target name="dev" description="[subdir] Builds (or runs ${target} if set) all the dev libraries">
- <call-subproject subproject="buildtools" subtarget="build" />
- <gwt.ant dir="dev" />
+ <call-subproject subproject="buildtools" subtarget="build"/>
+ <gwt.ant dir="dev"/>
</target>
- <target name="codeserver" description="[subdir] Builds (or runs ${target} if set) only the SuperDevMode">
- <call-subproject subproject="dev" subtarget="build" />
- <gwt.ant dir="dev/codeserver" />
- </target>
-
- <target name="user" description="[subdir] Builds (or runs ${target} if set) only the user library">
+ <target name="codeserver"
+ description="[subdir] Builds (or runs ${target} if set) only the SuperDevMode">
<call-subproject subproject="dev" subtarget="build"/>
- <gwt.ant dir="user" />
+ <gwt.ant dir="dev/codeserver"/>
</target>
- <target name="elemental" description="[subdir] Builds (or runs ${target} if set) only the elemental library">
+ <target name="user"
+ description="[subdir] Builds (or runs ${target} if set) only the user library">
+ <call-subproject subproject="dev" subtarget="build"/>
+ <gwt.ant dir="user"/>
+ </target>
+
+ <target name="elemental"
+ description="[subdir] Builds (or runs ${target} if set) only the elemental library">
<call-subproject subproject="user" subtarget="build"/>
- <gwt.ant dir="elemental" />
+ <gwt.ant dir="elemental"/>
</target>
- <target name="soyc" description="[subdir] Builds (or runs ${target} if set) only the soyc library">
+ <target name="soyc"
+ description="[subdir] Builds (or runs ${target} if set) only the soyc library">
<call-subproject subproject="dev" subtarget="build"/>
<call-subproject subproject="user" subtarget="build"/>
- <gwt.ant dir="tools/soyc-vis" />
+ <gwt.ant dir="tools/soyc-vis"/>
</target>
<target name="tools" description="[subdir] Builds (or runs ${target} if set) only the tools">
<call-subproject subproject="user" subtarget="build"/>
- <gwt.ant dir="tools" />
+ <gwt.ant dir="tools"/>
</target>
- <target name="requestfactory" description="[subdir] Builds (or runs ${target} if set) only the requestfactory jars">
- <call-subproject subproject="user" subtarget="build" />
- <gwt.ant dir="requestfactory" />
+ <target name="requestfactory"
+ description="[subdir] Builds (or runs ${target} if set) only the requestfactory jars">
+ <call-subproject subproject="user" subtarget="build"/>
+ <gwt.ant dir="requestfactory"/>
</target>
- <target name="servlet" description="[subdir] Builds (or runs ${target} if set) only the servlet jar">
- <call-subproject subproject="user" subtarget="build" />
- <gwt.ant dir="servlet" />
+ <target name="servlet"
+ description="[subdir] Builds (or runs ${target} if set) only the servlet jar">
+ <call-subproject subproject="user" subtarget="build"/>
+ <gwt.ant dir="servlet"/>
</target>
<target name="jni" description="[subdir] Builds (or runs ${target} if set) jni for all platforms">
- <gwt.ant dir="jni" />
+ <gwt.ant dir="jni"/>
</target>
<target name="doc" description="[subdir] Builds (or runs ${target} if set) the doc">
- <call-subproject subproject="user" subtarget="build" />
- <gwt.ant dir="doc" />
+ <call-subproject subproject="user" subtarget="build"/>
+ <gwt.ant dir="doc"/>
</target>
<target name="samples" description="[subdir] Builds (or runs ${target} if set) the samples">
- <call-subproject subproject="user" subtarget="build" />
- <call-subproject subproject="codeserver" subtarget="build" />
- <gwt.ant dir="samples" />
+ <call-subproject subproject="user" subtarget="build"/>
+ <call-subproject subproject="codeserver" subtarget="build"/>
+ <gwt.ant dir="samples"/>
</target>
<target name="buildtools" description="[subdir] Build (or runs ${target} if set) the build tools">
- <gwt.ant dir="build_tools" />
+ <gwt.ant dir="build_tools"/>
</target>
- <target name="build" description="[action] Builds GWT, including samples, but without distro packaging">
+ <target name="build"
+ description="[action] Builds GWT, including samples, but without distro packaging">
<call-subproject subproject="dev" subtarget="build"/>
<call-subproject subproject="codeserver" subtarget="build"/>
<call-subproject subproject="user" subtarget="build"/>
@@ -125,51 +133,51 @@
</target>
<target name="checkstyle" description="[action] Does static analysis of GWT source">
- <call-subproject subproject="buildtools" subtarget="checkstyle" />
- <call-subproject subproject="dev" subtarget="checkstyle" />
- <call-subproject subproject="codeserver" subtarget="checkstyle" />
- <call-subproject subproject="user" subtarget="checkstyle" />
- <call-subproject subproject="requestfactory" subtarget="checkstyle" />
- <call-subproject subproject="servlet" subtarget="checkstyle" />
+ <call-subproject subproject="buildtools" subtarget="checkstyle"/>
+ <call-subproject subproject="dev" subtarget="checkstyle"/>
+ <call-subproject subproject="codeserver" subtarget="checkstyle"/>
+ <call-subproject subproject="user" subtarget="checkstyle"/>
+ <call-subproject subproject="requestfactory" subtarget="checkstyle"/>
+ <call-subproject subproject="servlet" subtarget="checkstyle"/>
<!-- servlet needed for tools/benchmark-viewer -->
- <call-subproject subproject="servlet" subtarget="build" />
- <call-subproject subproject="tools" subtarget="checkstyle" />
- <call-subproject subproject="samples" subtarget="checkstyle" />
+ <call-subproject subproject="servlet" subtarget="build"/>
+ <call-subproject subproject="tools" subtarget="checkstyle"/>
+ <call-subproject subproject="samples" subtarget="checkstyle"/>
</target>
<target name="test" depends="dist-dev,apicheck,checkstyle"
description="[action] Runs all the GWT tests, including checkstyle and apicheck">
- <call-subproject subproject="buildtools" subtarget="test" />
- <call-subproject subproject="dev" subtarget="test" />
- <call-subproject subproject="codeserver" subtarget="test" />
- <call-subproject subproject="user" subtarget="test" />
- <call-subproject subproject="requestfactory" subtarget="test" />
- <call-subproject subproject="servlet" subtarget="test" />
- <call-subproject subproject="tools" subtarget="test" />
+ <call-subproject subproject="buildtools" subtarget="test"/>
+ <call-subproject subproject="dev" subtarget="test"/>
+ <call-subproject subproject="codeserver" subtarget="test"/>
+ <call-subproject subproject="user" subtarget="test"/>
+ <call-subproject subproject="requestfactory" subtarget="test"/>
+ <call-subproject subproject="servlet" subtarget="test"/>
+ <call-subproject subproject="tools" subtarget="test"/>
</target>
<target name="testrf" depends="dist-dev"
description="[action] Runs the GWT RequestFactory tests">
- <call-subproject subproject="dev" subtarget="compile.tests" />
- <call-subproject subproject="user" subtarget="compile.tests" />
- <call-subproject subproject="requestfactory" subtarget="test" />
+ <call-subproject subproject="dev" subtarget="compile.tests"/>
+ <call-subproject subproject="user" subtarget="compile.tests"/>
+ <call-subproject subproject="requestfactory" subtarget="test"/>
</target>
<path id="emma.classpath.src">
- <pathelement location="${gwt.root}/user/src" />
- <pathelement location="${gwt.root}/dev/**/src/com/google" />
- <pathelement location="${gwt.root}/build_tools/**/src/com/google" />
- <pathelement location="${gwt.root}/tools/**/src/com/google" />
+ <pathelement location="${gwt.root}/user/src"/>
+ <pathelement location="${gwt.root}/dev/**/src/com/google"/>
+ <pathelement location="${gwt.root}/build_tools/**/src/com/google"/>
+ <pathelement location="${gwt.root}/tools/**/src/com/google"/>
</path>
<target name="emma.merge" description="Merges coverage data for all projects">
- <delete dir="${emma.merged.out}" />
- <mkdir dir="${emma.merged.out}" />
+ <delete dir="${emma.merged.out}"/>
+ <mkdir dir="${emma.merged.out}"/>
<emma>
- <merge outfile="${emma.merged.out}/merged.emma" >
+ <merge outfile="${emma.merged.out}/merged.emma">
<fileset dir="${project.build}">
- <include name="**/*.emma" />
- <exclude name="**/merged.emma" />
+ <include name="**/*.emma"/>
+ <exclude name="**/merged.emma"/>
</fileset>
</merge>
</emma>
@@ -180,33 +188,34 @@
<include name="**/metadata.emma"/>
</patternset>
</fileset>
- <fileset file="${emma.merged.out}/merged.emma" />
- <txt outfile="${emma.merged.out}/coverage.txt" />
- <html outfile="${emma.merged.out}/coverage.html" />
- <xml outfile="${emma.merged.out}/coverage.xml" />
+ <fileset file="${emma.merged.out}/merged.emma"/>
+ <txt outfile="${emma.merged.out}/coverage.txt"/>
+ <html outfile="${emma.merged.out}/coverage.html"/>
+ <xml outfile="${emma.merged.out}/coverage.xml"/>
</report>
</emma>
</target>
<target name="clean" description="[action] Cleans the entire GWT build">
- <delete dir="${gwt.build}" />
- <delete file="${gwt.root}/doc/packages.properties" />
+ <delete dir="${gwt.build}"/>
+ <delete file="${gwt.root}/doc/packages.properties"/>
</target>
- <target name ="presubmit" description="[action] Deprecated for test, which now does checkstyle and apicheck"
+ <target name="presubmit"
+ description="[action] Deprecated for test, which now does checkstyle and apicheck"
depends="test">
</target>
<target name="apicheck-nobuild"
- description="[action] Checks API compatibility to prior GWT revision">
+ description="[action] Checks API compatibility to prior GWT revision">
<java failonerror="true" fork="true"
classname="com.google.gwt.tools.apichecker.ApiCompatibilityChecker">
- <jvmarg line="-Xmx512m" />
+ <jvmarg line="-Xmx512m"/>
<classpath>
<pathelement location="${gwt.build.out}/tools/api-checker/bin"/>
- <fileset dir="${gwt.build.lib}" includes="gwt-user.jar,gwt-dev.jar" />
+ <fileset dir="${gwt.build.lib}" includes="gwt-user.jar,gwt-dev.jar"/>
<pathelement path="${java.class.path}"/>
- <pathelement location="${gwt.tools.lib}/apache/ant-1.6.5.jar" />
+ <pathelement location="${gwt.tools.lib}/apache/ant-1.6.5.jar"/>
</classpath>
<arg value="-refJar"/>
<arg path="${gwt.apicheck.referencelibs}"/>
@@ -215,8 +224,8 @@
<arg value="-logLevel"/>
<arg value="ERROR"/>
<!-- Needed for checking types that include validation APIs -->
- <arg value="-validationSourceJars" />
- <arg path="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA-sources.jar" />
+ <arg value="-validationSourceJars"/>
+ <arg path="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA-sources.jar"/>
</java>
</target>
diff --git a/common.ant.xml b/common.ant.xml
index 775f263..c661ecc 100755
--- a/common.ant.xml
+++ b/common.ant.xml
@@ -3,7 +3,7 @@
personal property settings, if any, persistently. For example, you
might use it to set gwt.junit.testcase.includes to a narrower subset
of test cases to exercise. -->
- <property file="local.ant.properties" />
+ <property file="local.ant.properties"/>
<!-- gwt.build.iscasesensitivefs is true if the filesystem of the
build machine is case-sensitive, false otherwise. Update with
@@ -18,138 +18,144 @@
</not>
</condition>
- <property name="test.ant.file" location="${gwt.root}/${project.tail}/build.xml" />
+ <property name="test.ant.file" location="${gwt.root}/${project.tail}/build.xml"/>
<condition property="project.valid">
<equals arg1="${ant.file}" arg2="${test.ant.file}"
- casesensitive="${gwt.build.iscasesensitivefs}"/>
+ casesensitive="${gwt.build.iscasesensitivefs}"/>
</condition>
- <fail unless="project.valid" message="This build file is in an inconsistent state (${ant.file} != ${test.ant.file})." />
+ <fail unless="project.valid"
+ message="This build file is in an inconsistent state (${ant.file} != ${test.ant.file})."/>
<!-- Global Properties -->
- <property environment="env" />
+ <property environment="env"/>
<condition property="gwt.version" value="${env.GWT_VERSION}" else="0.0.0">
- <isset property="env.GWT_VERSION" />
+ <isset property="env.GWT_VERSION"/>
</condition>
<condition property="gwt.tools.check" value="${env.GWT_TOOLS}" else="${gwt.root}/../tools">
- <isset property="env.GWT_TOOLS" />
+ <isset property="env.GWT_TOOLS"/>
</condition>
- <property name="gwt.tools" location="${gwt.tools.check}" />
- <property name="gwt.tools.lib" location="${gwt.tools}/lib" />
- <property name="gwt.tools.antlib" location="${gwt.tools}/antlib" />
- <property name="gwt.tools.redist" location="${gwt.tools}/redist" />
- <property name="gwt.build" location="${gwt.root}/build" />
- <property name="gwt.build.out" location="${gwt.build}/out" />
- <property name="gwt.build.lib" location="${gwt.build}/lib" />
- <property name="gwt.build.jni" location="${gwt.build}/jni" />
- <property name="gwt.build.staging" location="${gwt.build}/staging" />
- <property name="gwt.build.dist" location="${gwt.build}/dist" />
- <!-- gwt.threadsPerProcessor supercedes gwt.threadCount unless set to 0 -->
- <property name="gwt.threadsPerProcessor" value="1" />
- <property name="gwt.threadCount" value="1" />
- <property name="project.build" location="${gwt.build.out}/${project.tail}" />
- <property name="project.lib" location="${gwt.build.lib}/gwt-${ant.project.name}.jar" />
- <property name="project.jni" location="${gwt.build}/${project.tail}" />
- <property name="javac.out" location="${project.build}/bin" />
- <property name="javac.junit.out" location="${project.build}/bin-test" />
- <property name="javac.emma.out" location="${project.build}/bin-emma" />
- <property name="javac.debug" value="true" />
- <property name="javac.debuglevel" value="lines,vars,source" />
- <property name="javac.encoding" value="utf-8" />
- <property name="javac.source" value="1.6" />
- <property name="javac.target" value="1.6" />
- <property name="javac.nowarn" value="true" />
- <property name="junit.out" location="${project.build}/test" />
- <property name="emma.dir" value="${gwt.tools.redist}/emma" />
- <property name="emma.filter.exclude" value="" />
-
+ <property name="gwt.tools" location="${gwt.tools.check}"/>
+ <property name="gwt.tools.lib" location="${gwt.tools}/lib"/>
+ <property name="gwt.tools.antlib" location="${gwt.tools}/antlib"/>
+ <property name="gwt.tools.redist" location="${gwt.tools}/redist"/>
+ <property name="gwt.build" location="${gwt.root}/build"/>
+ <property name="gwt.build.out" location="${gwt.build}/out"/>
+ <property name="gwt.build.lib" location="${gwt.build}/lib"/>
+ <property name="gwt.build.jni" location="${gwt.build}/jni"/>
+ <property name="gwt.build.staging" location="${gwt.build}/staging"/>
+ <property name="gwt.build.dist" location="${gwt.build}/dist"/>
+ <!-- gwt.threadsPerProcessor supercedes gwt.threadCount unless set to 0 -->
+ <property name="gwt.threadsPerProcessor" value="1"/>
+ <property name="gwt.threadCount" value="1"/>
+ <property name="project.build" location="${gwt.build.out}/${project.tail}"/>
+ <property name="project.lib" location="${gwt.build.lib}/gwt-${ant.project.name}.jar"/>
+ <property name="project.jni" location="${gwt.build}/${project.tail}"/>
+ <property name="javac.out" location="${project.build}/bin"/>
+ <property name="javac.junit.out" location="${project.build}/bin-test"/>
+ <property name="javac.emma.out" location="${project.build}/bin-emma"/>
+ <property name="javac.debug" value="true"/>
+ <property name="javac.debuglevel" value="lines,vars,source"/>
+ <property name="javac.encoding" value="utf-8"/>
+ <property name="javac.source" value="1.6"/>
+ <property name="javac.target" value="1.6"/>
+ <property name="javac.nowarn" value="true"/>
+ <property name="junit.out" location="${project.build}/test"/>
+ <property name="emma.dir" value="${gwt.tools.redist}/emma"/>
+ <property name="emma.filter.exclude" value=""/>
+
<!-- Sanity check -->
- <available file="${gwt.tools}" type="dir" property="gwt.tools.exists" />
- <fail unless="gwt.tools.exists" message="Cannot find '${gwt.tools}' tools directory; perhaps you should define the GWT_TOOLS environment variable" />
+ <available file="${gwt.tools}" type="dir" property="gwt.tools.exists"/>
+ <fail unless="gwt.tools.exists"
+ message="Cannot find '${gwt.tools}' tools directory; perhaps you should define the GWT_TOOLS environment variable"/>
<!-- Platform identification -->
<condition property="build.host.islinux">
<and>
- <os family="unix" />
+ <os family="unix"/>
<not>
- <contains string="${os.name}" substring="mac" casesensitive="false" />
+ <contains string="${os.name}" substring="mac" casesensitive="false"/>
</not>
</and>
</condition>
<condition property="build.host.platform" value="linux">
- <isset property="build.host.islinux" />
+ <isset property="build.host.islinux"/>
</condition>
<condition property="build.host.ismac">
<and>
- <os family="unix" />
- <contains string="${os.name}" substring="mac" casesensitive="false" />
+ <os family="unix"/>
+ <contains string="${os.name}" substring="mac" casesensitive="false"/>
</and>
</condition>
<condition property="build.host.platform" value="mac">
- <isset property="build.host.ismac" />
+ <isset property="build.host.ismac"/>
</condition>
<condition property="build.host.iswindows">
- <os family="windows" />
+ <os family="windows"/>
</condition>
<condition property="build.host.platform" value="windows">
- <isset property="build.host.iswindows" />
+ <isset property="build.host.iswindows"/>
</condition>
- <fail unless="build.host.platform" message="Building on ${os.name} is not supported" />
-
+ <fail unless="build.host.platform" message="Building on ${os.name} is not supported"/>
+
<!-- JVM -->
<condition property="build.jvm.is15">
- <equals arg1="${ant.java.version}" arg2="1.5"/>
- </condition>
+ <equals arg1="${ant.java.version}" arg2="1.5"/>
+ </condition>
<condition property="build.jvm.is16">
- <equals arg1="${ant.java.version}" arg2="1.6"/>
- </condition>
-
+ <equals arg1="${ant.java.version}" arg2="1.6"/>
+ </condition>
+
<!-- JUnit support -->
- <property name="gwt.dev.staging.jar" location="${gwt.build.staging}/gwt-${gwt.version}/gwt-dev.jar" />
- <property name="gwt.junit.port" value="8888" />
+ <property name="gwt.dev.staging.jar"
+ location="${gwt.build.staging}/gwt-${gwt.version}/gwt-dev.jar"/>
+ <property name="gwt.junit.port" value="8888"/>
<property name="gwt.junit.testcase.includes" value="**/*Suite.class"/>
<!-- Shared class paths -->
<path id="project.classpath.class">
- <pathelement location="${javac.out}" />
+ <pathelement location="${javac.out}"/>
</path>
<path id="project.classpath.src">
- <pathelement location="${gwt.root}/${project.tail}/src" />
+ <pathelement location="${gwt.root}/${project.tail}/src"/>
</path>
<!-- Pulls in tasks defined in ant-contrib, i.e. foreach -->
<taskdef resource="net/sf/antcontrib/antlib.xml">
<classpath>
- <pathelement location="${gwt.tools.antlib}/ant-contrib-1.0b3.jar" />
+ <pathelement location="${gwt.tools.antlib}/ant-contrib-1.0b3.jar"/>
</classpath>
</taskdef>
-
-
+
+
<!-- Pulls in tasks defined in antcount, i.e. countfilter -->
<taskdef resource="net/sf/antcount/antlib.xml">
<classpath>
- <pathelement location="${gwt.tools.antlib}/antcount-1.2.jar" />
+ <pathelement location="${gwt.tools.antlib}/antcount-1.2.jar"/>
</classpath>
</taskdef>
-
+
<!-- Global Custom Tasks -->
<presetdef name="gwt.ant">
<ant inheritall="false" target="${target}">
<propertyset>
- <propertyref name="gwt.version" />
- <propertyref name="gwt.junit.port" />
- <propertyref name="gwt.remote.browsers" />
- <propertyref name="emma.enabled" />
- <propertyref name="emma.compiled" />
+ <propertyref name="gwt.version"/>
+ <propertyref name="gwt.junit.port"/>
+ <propertyref name="gwt.remote.browsers"/>
+ <propertyref name="emma.enabled"/>
+ <propertyref name="emma.compiled"/>
</propertyset>
</ant>
</presetdef>
<presetdef name="gwt.javac">
- <javac srcdir="src" destdir="${javac.out}" debug="${javac.debug}" debuglevel="${javac.debuglevel}" source="${javac.source}" target="${javac.target}" nowarn="${javac.nowarn}" encoding="${javac.encoding}" fork="true" memoryMaximumSize="1024m" includeantruntime="false" />
+ <javac srcdir="src" destdir="${javac.out}" debug="${javac.debug}"
+ debuglevel="${javac.debuglevel}" source="${javac.source}" target="${javac.target}"
+ nowarn="${javac.nowarn}" encoding="${javac.encoding}" fork="true"
+ memoryMaximumSize="1024m" includeantruntime="false"/>
</presetdef>
<macrodef name="gwt.jar">
@@ -159,11 +165,11 @@
<element name="jarcontents" implicit="true"/>
<sequential>
<taskdef name="jar.bydate"
- classname="com.google.gwt.ant.taskdefs.LatestTimeJar"
- classpath="${gwt.build.lib}/ant-gwt.jar" />
+ classname="com.google.gwt.ant.taskdefs.LatestTimeJar"
+ classpath="${gwt.build.lib}/ant-gwt.jar"/>
<jar.bydate destfile="@{destfile}" duplicate="@{duplicate}" filesonly="false"
- index="true" update="@{update}">
+ index="true" update="@{update}">
<jarcontents/>
</jar.bydate>
</sequential>
@@ -174,90 +180,90 @@
for it (and we use extraclasspaths entries instead). Once we lose SWT, we can
consolidate dev/core and dev/oophm, and that can instead more to the normal
pattern. Note also special casing regarding (dev/) core/test. -->
- <attribute name="test.args" default="" />
- <attribute name="test.jvmargs" default="" />
- <attribute name="test.out" default="" />
- <attribute name="test.reports" default="@{test.out}/reports" />
- <attribute name="test.emma.coverage" default="@{test.out}/emma-coverage" />
- <attribute name="test.cases" default="" />
- <attribute name="test.name" default="" />
- <attribute name="test.extra.jvmargs" default="" />
- <attribute name="haltonfailure" default="true" />
- <element name="extraclasspaths" optional="true" />
+ <attribute name="test.args" default=""/>
+ <attribute name="test.jvmargs" default=""/>
+ <attribute name="test.out" default=""/>
+ <attribute name="test.reports" default="@{test.out}/reports"/>
+ <attribute name="test.emma.coverage" default="@{test.out}/emma-coverage"/>
+ <attribute name="test.cases" default=""/>
+ <attribute name="test.name" default=""/>
+ <attribute name="test.extra.jvmargs" default=""/>
+ <attribute name="haltonfailure" default="true"/>
+ <element name="extraclasspaths" optional="true"/>
<sequential>
<taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask">
<classpath>
- <pathelement location="${gwt.tools.lib}/junit/junit-4.8.2.jar" />
- <pathelement location="${gwt.tools.antlib}/ant-junit-1.6.5.jar" />
- <pathelement location="${gwt.tools.lib}/selenium/selenium-java-client-driver.jar" />
+ <pathelement location="${gwt.tools.lib}/junit/junit-4.8.2.jar"/>
+ <pathelement location="${gwt.tools.antlib}/ant-junit-1.6.5.jar"/>
+ <pathelement location="${gwt.tools.lib}/selenium/selenium-java-client-driver.jar"/>
</classpath>
</taskdef>
- <echo message="Writing test results to @{test.reports} for @{test.cases}" />
- <mkdir dir="@{test.reports}" />
+ <echo message="Writing test results to @{test.reports} for @{test.cases}"/>
+ <mkdir dir="@{test.reports}"/>
<antcall target="-create.emma.coverage.if.enabled">
- <param name="test.emma.coverage" value="@{test.emma.coverage}"/>
+ <param name="test.emma.coverage" value="@{test.emma.coverage}"/>
</antcall>
<condition property="emma.lib" value="${emma.dir}/emma-2.0.5312-patched.jar"
- else="${emma.dir}/no-emma-requested">
- <isset property="emma.enabled" />
+ else="${emma.dir}/no-emma-requested">
+ <isset property="emma.enabled"/>
</condition>
<junit dir="@{test.out}" fork="yes" printsummary="yes"
failureproperty="junit.failure" tempdir="@{test.out}">
- <jvmarg line="-Xmx1024m" />
- <jvmarg line="-Xss4M" />
- <jvmarg value="-Demma.coverage.out.file=@{test.emma.coverage}/coverage.emma" />
- <jvmarg value="-Demma.coverage.out.merge=true" />
- <jvmarg value="-Dcom.google.gwt.junit.reportPath=reports" />
- <jvmarg line="@{test.jvmargs}" />
- <sysproperty key="gwt.args" value="@{test.args}" />
- <sysproperty key="java.awt.headless" value="true" />
+ <jvmarg line="-Xmx1024m"/>
+ <jvmarg line="-Xss4M"/>
+ <jvmarg value="-Demma.coverage.out.file=@{test.emma.coverage}/coverage.emma"/>
+ <jvmarg value="-Demma.coverage.out.merge=true"/>
+ <jvmarg value="-Dcom.google.gwt.junit.reportPath=reports"/>
+ <jvmarg line="@{test.jvmargs}"/>
+ <sysproperty key="gwt.args" value="@{test.args}"/>
+ <sysproperty key="java.awt.headless" value="true"/>
<classpath>
- <path refid="project.classpath.src" />
- <pathelement location="${gwt.root}/${project.tail}/super" />
- <pathelement location="${gwt.root}/${project.tail}/test" />
+ <path refid="project.classpath.src"/>
+ <pathelement location="${gwt.root}/${project.tail}/super"/>
+ <pathelement location="${gwt.root}/${project.tail}/test"/>
<!-- TODO: this is here because e.g. ClassPathEntryTest otherwise fails,
expecting the src entry (core/test) to be earlier than the bin entry
(${javac.junit.out}). -->
- <pathelement location="${gwt.root}/${project.tail}/core/test" />
+ <pathelement location="${gwt.root}/${project.tail}/core/test"/>
<!-- Emma compiled classes must appear before non-emma compiled
classes to generate code coverage stats. javac.emma.out is
empty unless emma is enabled. -->
- <pathelement location="${javac.emma.out}" />
- <pathelement location="${javac.junit.out}" />
- <path refid="project.classpath.class" />
- <pathelement location="${emma.lib}" />
- <pathelement location="${gwt.dev.staging.jar}" />
- <pathelement location="${gwt.tools.lib}/junit/junit-4.8.2.jar" />
- <pathelement location="${gwt.tools.lib}/selenium/selenium-java-client-driver.jar" />
- <pathelement location="${gwt.tools.lib}/w3c/sac/sac-1.3.jar" />
- <pathelement location="${gwt.tools.lib}/w3c/flute/flute-1.3-gg2.jar" />
- <extraclasspaths />
+ <pathelement location="${javac.emma.out}"/>
+ <pathelement location="${javac.junit.out}"/>
+ <path refid="project.classpath.class"/>
+ <pathelement location="${emma.lib}"/>
+ <pathelement location="${gwt.dev.staging.jar}"/>
+ <pathelement location="${gwt.tools.lib}/junit/junit-4.8.2.jar"/>
+ <pathelement location="${gwt.tools.lib}/selenium/selenium-java-client-driver.jar"/>
+ <pathelement location="${gwt.tools.lib}/w3c/sac/sac-1.3.jar"/>
+ <pathelement location="${gwt.tools.lib}/w3c/flute/flute-1.3-gg2.jar"/>
+ <extraclasspaths/>
</classpath>
- <formatter type="plain" />
- <formatter type="xml" />
+ <formatter type="plain"/>
+ <formatter type="xml"/>
<batchtest todir="@{test.reports}">
- <fileset refid="@{test.cases}" />
+ <fileset refid="@{test.cases}"/>
</batchtest>
</junit>
<emma enabled="${emma.enabled}">
<report sourcepath="${project.classpath.src}">
- <fileset file="${javac.emma.out}/metadata.emma" />
+ <fileset file="${javac.emma.out}/metadata.emma"/>
<fileset dir="@{test.emma.coverage}">
- <include name="*.emma" />
+ <include name="*.emma"/>
</fileset>
- <txt outfile="@{test.emma.coverage}/coverage.txt" />
- <html outfile="@{test.emma.coverage}/coverage.html" />
- <xml outfile="@{test.emma.coverage}/coverage.xml" />
+ <txt outfile="@{test.emma.coverage}/coverage.txt"/>
+ <html outfile="@{test.emma.coverage}/coverage.html"/>
+ <xml outfile="@{test.emma.coverage}/coverage.xml"/>
</report>
</emma>
- <condition property="junit.stop.build" value="true">
+ <condition property="junit.stop.build" value="true">
<and>
<istrue value="@{haltonfailure}"/>
<isset property="junit.failure"/>
@@ -265,18 +271,19 @@
</condition>
<fail
message="One or more junit tests failed for target: @{test.name} @{test.args}"
- if="junit.stop.build" status="2" />
+ if="junit.stop.build" status="2"/>
</sequential>
</macrodef>
<macrodef name="gwt.tgz.cat">
- <attribute name="destfile" />
- <attribute name="compression" default="gzip" />
- <element name="tar.elements" implicit="true" optional="true" />
+ <attribute name="destfile"/>
+ <attribute name="compression" default="gzip"/>
+ <element name="tar.elements" implicit="true" optional="true"/>
<sequential>
- <taskdef name="tar.cat" classname="com.google.gwt.ant.taskdefs.TarCat" classpath="${gwt.build.lib}/ant-gwt.jar" />
+ <taskdef name="tar.cat" classname="com.google.gwt.ant.taskdefs.TarCat"
+ classpath="${gwt.build.lib}/ant-gwt.jar"/>
<tar.cat destfile="@{destfile}" compression="@{compression}" longfile="gnu">
- <tar.elements />
+ <tar.elements/>
</tar.cat>
</sequential>
</macrodef>
@@ -290,26 +297,26 @@
be noticed as invalidating the previously-generated filter output. This property
names where such a sentinel lives; it is tested with <available/> and created
with <touch/> -->
- <mkdir dir="${project.build}/sentinels" />
- <property name="filter.sentinel"
- location="${project.build}/sentinels/gwt-${gwt.version}-git-${gwt.gitrev}" />
+ <mkdir dir="${project.build}/sentinels"/>
+ <property name="filter.sentinel"
+ location="${project.build}/sentinels/gwt-${gwt.version}-git-${gwt.gitrev}"/>
</sequential>
</macrodef>
-
+
<macrodef name="gwt.revfilter" description="Filters files for versioning">
<attribute name="todir" description="Destination for the filtered copy"/>
-
- <element name="src.fileset" implicit="true"
- description="Source for the filtered copy"/>
+
+ <element name="src.fileset" implicit="true"
+ description="Source for the filtered copy"/>
<sequential>
<!-- These files must be filtered for versioning -->
<echo message="Branding as GWT version ${gwt.version}, GIT commit ${gwt.gitrev}"/>
- <mkdir dir="@{todir}" />
+ <mkdir dir="@{todir}"/>
<copy todir="@{todir}" overwrite="true">
<src.fileset/>
<filterset>
- <filter token="GWT_VERSION" value="${gwt.version}" />
- <filter token="GWT_GITREV" value="${gwt.gitrev}" />
+ <filter token="GWT_VERSION" value="${gwt.version}"/>
+ <filter token="GWT_GITREV" value="${gwt.gitrev}"/>
</filterset>
</copy>
</sequential>
@@ -319,9 +326,9 @@
<attribute name="name"/>
<element name="timer.elements" implicit="true" optional="false"/>
<sequential>
- <taskdef name="timer"
- classname="com.google.gwt.ant.taskdefs.Timer"
- classpath="${gwt.build.lib}/ant-gwt.jar" />
+ <taskdef name="timer"
+ classname="com.google.gwt.ant.taskdefs.Timer"
+ classpath="${gwt.build.lib}/ant-gwt.jar"/>
<timer name="@{name}">
<timer.elements/>
</timer>
@@ -330,98 +337,110 @@
<macrodef name="gwt.checkstyle">
<attribute name="outputdirectory" default="${project.build}"/>
- <element name="sourcepath" implicit="yes" optional="true" />
+ <element name="sourcepath" implicit="yes" optional="true"/>
<sequential>
- <taskdef resource="checkstyletask.properties" classpath="${gwt.tools.antlib}/checkstyle-all-4.2.jar" />
+ <taskdef resource="checkstyletask.properties"
+ classpath="${gwt.tools.antlib}/checkstyle-5.7-all.jar"/>
<mkdir dir="@{outputdirectory}"/>
- <checkstyle config="${gwt.root}/eclipse/settings/code-style/gwt-checkstyle.xml" maxErrors="0" failOnViolation="false" failureProperty="gwt.checkstyle.failed">
+ <checkstyle config="${gwt.root}/eclipse/settings/code-style/gwt-checkstyle.xml" maxErrors="0"
+ failOnViolation="false" failureProperty="gwt.checkstyle.failed">
<formatter type="xml" toFile="@{outputdirectory}/checkstyle_log.xml"/>
- <property key="checkstyle.header.file" file="${gwt.root}/eclipse/settings/code-style/google.header" />
- <sourcepath />
+ <property key="checkstyle.header.file"
+ file="${gwt.root}/eclipse/settings/code-style/google.header"/>
+ <sourcepath/>
</checkstyle>
- <fail message="Checkstyle errors exist, and are reported at @{outputdirectory}/checkstyle_log.xml" if="gwt.checkstyle.failed" />
+ <fail
+ message="Checkstyle errors exist, and are reported at @{outputdirectory}/checkstyle_log.xml"
+ if="gwt.checkstyle.failed"/>
</sequential>
</macrodef>
<macrodef name="gwt.checkstyle.tests">
<attribute name="outputdirectory" default="${project.build}"/>
- <element name="sourcepath" implicit="yes" optional="true" />
+ <element name="sourcepath" implicit="yes" optional="true"/>
<sequential>
- <taskdef resource="checkstyletask.properties" classpath="${gwt.tools.antlib}/checkstyle-all-4.2.jar" />
+ <taskdef resource="checkstyletask.properties"
+ classpath="${gwt.tools.antlib}/checkstyle-5.7-all.jar"/>
<mkdir dir="@{outputdirectory}"/>
- <checkstyle config="${gwt.root}/eclipse/settings/code-style/gwt-checkstyle-tests.xml" maxErrors="0" failOnViolation="false" failureProperty="gwt.checkstyle-tests.failed">
+ <checkstyle config="${gwt.root}/eclipse/settings/code-style/gwt-checkstyle-tests.xml"
+ maxErrors="0" failOnViolation="false"
+ failureProperty="gwt.checkstyle-tests.failed">
<formatter type="xml" toFile="@{outputdirectory}/checkstyle_tests_log.xml"/>
- <property key="checkstyle.header.file" file="${gwt.root}/eclipse/settings/code-style/google.header" />
- <sourcepath />
+ <property key="checkstyle.header.file"
+ file="${gwt.root}/eclipse/settings/code-style/google.header"/>
+ <sourcepath/>
</checkstyle>
- <fail message="Checkstyle errors exist in tests, and are reported at @{outputdirectory}/checkstyle_tests_log.xml" if="gwt.checkstyle-tests.failed" />
+ <fail
+ message="Checkstyle errors exist in tests, and are reported at @{outputdirectory}/checkstyle_tests_log.xml"
+ if="gwt.checkstyle-tests.failed"/>
</sequential>
</macrodef>
<macrodef name="property.ensure">
- <attribute name="name" />
- <attribute name="location" />
- <attribute name="message" default="Cannot find dependency ${@{name}}" />
- <attribute name="unless" default="__nonexistent_property__" />
+ <attribute name="name"/>
+ <attribute name="location"/>
+ <attribute name="message" default="Cannot find dependency ${@{name}}"/>
+ <attribute name="unless" default="__nonexistent_property__"/>
<sequential>
- <property name="@{name}" location="@{location}" />
+ <property name="@{name}" location="@{location}"/>
<condition property="@{name}.exists">
<or>
- <available file="${@{name}}" />
- <isset property="@{unless}" />
+ <available file="${@{name}}"/>
+ <isset property="@{unless}"/>
</or>
</condition>
- <fail unless="@{name}.exists" message="@{message}" />
+ <fail unless="@{name}.exists" message="@{message}"/>
</sequential>
</macrodef>
- <!-- Targets for emma support. To run tests with emma enabled, use
+ <!-- Targets for emma support. To run tests with emma enabled, use
ant <test-target> -Demma.enabled=true -->
<path id="emma.taskdef.lib">
- <pathelement location="${emma.dir}/emma-2.0.5312-patched.jar" />
- <pathelement location="${emma.dir}/emma_ant-2.0.5312.jar" />
+ <pathelement location="${emma.dir}/emma-2.0.5312-patched.jar"/>
+ <pathelement location="${emma.dir}/emma_ant-2.0.5312.jar"/>
</path>
- <taskdef resource="emma_ant.properties" classpathref="emma.taskdef.lib" />
+ <taskdef resource="emma_ant.properties" classpathref="emma.taskdef.lib"/>
<!-- Instruments emma classes -->
<target name="compile.emma.if.enabled" unless="emma.compiled">
- <delete dir="${javac.emma.out}" />
- <property name="emma.compiled" value="true" />
- <antcall target="-compile.emma.if.enabled" />
+ <delete dir="${javac.emma.out}"/>
+ <property name="emma.compiled" value="true"/>
+ <antcall target="-compile.emma.if.enabled"/>
</target>
<!-- Instruments emma classes -->
<target name="-compile.emma.if.enabled" if="emma.enabled">
- <mkdir dir="${javac.emma.out}" />
+ <mkdir dir="${javac.emma.out}"/>
<path id="emma.classpath">
- <pathelement location="${javac.out}" />
+ <pathelement location="${javac.out}"/>
</path>
- <emma enabled="${emma.enabled}" >
- <instr instrpathref="emma.classpath" destdir="${javac.emma.out}" metadatafile="${javac.emma.out}/metadata.emma" merge="false">
- <filter includes="com.google.*" />
- <filter excludes="${emma.filter.exclude}" />
+ <emma enabled="${emma.enabled}">
+ <instr instrpathref="emma.classpath" destdir="${javac.emma.out}"
+ metadatafile="${javac.emma.out}/metadata.emma" merge="false">
+ <filter includes="com.google.*"/>
+ <filter excludes="${emma.filter.exclude}"/>
</instr>
</emma>
</target>
<!-- Create the emma coverage directory -->
<target name="-create.emma.coverage.if.enabled" if="emma.enabled">
- <delete dir="${test.emma.coverage}" />
- <mkdir dir="${test.emma.coverage}" />
+ <delete dir="${test.emma.coverage}"/>
+ <mkdir dir="${test.emma.coverage}"/>
</target>
<!-- Default implementations of the required targets; projects should
override the ones that matter -->
- <target name="all" depends="verify" />
+ <target name="all" depends="verify"/>
<target name="verify" depends="checkstyle, test"
- description="Runs tests and checkstyle static analysis" />
- <target name="checkstyle" />
- <target name="test" depends="build" />
- <target name="build" />
+ description="Runs tests and checkstyle static analysis"/>
+ <target name="checkstyle"/>
+ <target name="test" depends="build"/>
+ <target name="build"/>
<target name="clean">
- <delete dir="${project.build}" />
+ <delete dir="${project.build}"/>
</target>
</project>
diff --git a/dev/build.xml b/dev/build.xml
index 66dbc84..e6be4a9 100755
--- a/dev/build.xml
+++ b/dev/build.xml
@@ -1,98 +1,102 @@
<project name="dev" default="build" basedir=".">
- <property name="gwt.root" location=".." />
- <property name="project.tail" value="dev" />
- <property name="test.args" value="-ea" />
- <property name="test.jvmargs" value="-ea" />
- <import file="${gwt.root}/platforms.ant.xml" />
- <import file="${gwt.root}/common.ant.xml" />
+ <property name="gwt.root" location=".."/>
+ <property name="project.tail" value="dev"/>
+ <property name="test.args" value="-ea"/>
+ <property name="test.jvmargs" value="-ea"/>
+ <import file="${gwt.root}/platforms.ant.xml"/>
+ <import file="${gwt.root}/common.ant.xml"/>
- <property name="alldeps.jar" location="${project.build}/alldeps.jar" />
- <property name="gwt.junit.testcase.dev.core.includes" value="**/com/google/**/*Test.class" />
+ <property name="alldeps.jar" location="${project.build}/alldeps.jar"/>
+ <property name="gwt.junit.testcase.dev.core.includes" value="**/com/google/**/*Test.class"/>
<!-- BrowserManagerTest is brought in from user and is not instantiable. -->
- <property name="gwt.junit.testcase.dev.core.excludes" value="**/BrowserManagerTest.class" />
+ <property name="gwt.junit.testcase.dev.core.excludes" value="**/BrowserManagerTest.class"/>
<target name="clean" description="Cleans this project's intermediate and output files">
- <delete dir="${project.build}" failonerror="false" />
- <delete file="${project.lib}" failonerror="false" />
+ <delete dir="${project.build}" failonerror="false"/>
+ <delete file="${project.lib}" failonerror="false"/>
<delete failonerror="false">
- <fileset dir="${gwt.build.lib}" includes="gwt-dev.jar"/>
+ <fileset dir="${gwt.build.lib}" includes="gwt-dev.jar"/>
</delete>
</target>
- <target name="compile.tests" depends="build, compile.emma.if.enabled, build.alldeps.jar" description="Compiles the test code for this project">
- <mkdir dir="${javac.junit.out}" />
+ <target name="compile.tests" depends="build, compile.emma.if.enabled, build.alldeps.jar"
+ description="Compiles the test code for this project">
+ <mkdir dir="${javac.junit.out}"/>
<gwt.javac srcdir="" destdir="${javac.junit.out}">
- <src path="core/src" />
- <src path="core/test" />
+ <src path="core/src"/>
+ <src path="core/test"/>
<classpath>
- <pathelement location="${javac.out}" />
- <pathelement location="${alldeps.jar}" />
- <pathelement location="${gwt.tools.lib}/junit/junit-4.8.2.jar" />
+ <pathelement location="${javac.out}"/>
+ <pathelement location="${alldeps.jar}"/>
+ <pathelement location="${gwt.tools.lib}/junit/junit-4.8.2.jar"/>
</classpath>
</gwt.javac>
<gwt.javac srcdir="${gwt.root}/user/src" destdir="${javac.junit.out}"
- excludes="**/super/**">
+ excludes="**/super/**">
<classpath>
- <pathelement location="${javac.out}" />
- <pathelement location="${gwt.tools.lib}/junit/junit-4.8.2.jar" />
- <pathelement location="${gwt.tools.lib}/selenium/selenium-java-client-driver.jar" />
- <pathelement location="${gwt.tools.lib}/w3c/sac/sac-1.3.jar" />
- <pathelement location="${gwt.tools.lib}/w3c/flute/flute-1.3-gg2.jar" />
- <pathelement location="${gwt.tools.lib}/hibernate/validator/hibernate-validator-4.1.0.Final.jar" />
- <pathelement location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA.jar" />
- <pathelement location="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar" />
- <pathelement location="${gwt.build.lib}/gwt-dev-${build.host.platform}.jar" />
- <pathelement location="${alldeps.jar}" />
+ <pathelement location="${javac.out}"/>
+ <pathelement location="${gwt.tools.lib}/junit/junit-4.8.2.jar"/>
+ <pathelement location="${gwt.tools.lib}/selenium/selenium-java-client-driver.jar"/>
+ <pathelement location="${gwt.tools.lib}/w3c/sac/sac-1.3.jar"/>
+ <pathelement location="${gwt.tools.lib}/w3c/flute/flute-1.3-gg2.jar"/>
+ <pathelement
+ location="${gwt.tools.lib}/hibernate/validator/hibernate-validator-4.1.0.Final.jar"/>
+ <pathelement
+ location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA.jar"/>
+ <pathelement
+ location="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar"/>
+ <pathelement location="${gwt.build.lib}/gwt-dev-${build.host.platform}.jar"/>
+ <pathelement location="${alldeps.jar}"/>
</classpath>
</gwt.javac>
</target>
<target name="build.alldeps.jar" description="Merges all dependency jars into a single jar">
- <mkdir dir="${project.build}" />
+ <mkdir dir="${project.build}"/>
<outofdate> <!-- saves rescanning all the source jars' contents -->
<sourcefiles>
<fileset dir="${gwt.tools.lib}">
- <include name="apache/tapestry-util-text-4.0.2.jar" />
- <include name="apache/ant-1.6.5.jar" />
- <include name="eclipse/org.eclipse.jdt.core_3.8.3.v20130121-145325.jar" />
- <include name="eclipse/jdtCompilerAdapter-3.8.3.v20130121-145325.jar" />
- <include name="guava/guava-16.0.1/guava-16.0.1-rebased.jar" />
- <include name="icu4j/50.1.1/icu4j.jar" />
- <include name="jetty/jetty-8.1.12.v20130726/jetty-8.1.12.v20130726.jar" />
- <include name="jetty/jetty-8.1.12.v20130726/servlet-api-3.0-NoMetaInf.jar" />
- <include name="jscomp/20131118/compiler-rebased.jar" />
- <include name="jscomp/20131118/sourcemap-rebased.jar" />
- <include name="jsr305/jsr305.jar" />
- <include name="protobuf/protobuf-2.5.0/protobuf-java-rebased-2.5.0.jar" />
+ <include name="apache/tapestry-util-text-4.0.2.jar"/>
+ <include name="apache/ant-1.6.5.jar"/>
+ <include name="eclipse/org.eclipse.jdt.core_3.8.3.v20130121-145325.jar"/>
+ <include name="eclipse/jdtCompilerAdapter-3.8.3.v20130121-145325.jar"/>
+ <include name="guava/guava-16.0.1/guava-16.0.1-rebased.jar"/>
+ <include name="icu4j/50.1.1/icu4j.jar"/>
+ <include name="jetty/jetty-8.1.12.v20130726/jetty-8.1.12.v20130726.jar"/>
+ <include name="jetty/jetty-8.1.12.v20130726/servlet-api-3.0-NoMetaInf.jar"/>
+ <include name="jscomp/20131118/compiler-rebased.jar"/>
+ <include name="jscomp/20131118/sourcemap-rebased.jar"/>
+ <include name="jsr305/jsr305.jar"/>
+ <include name="protobuf/protobuf-2.5.0/protobuf-java-rebased-2.5.0.jar"/>
<!-- dependencies needed for JSP support in DevMode: BEGIN -->
- <include name="tomcat/commons-el-1.0.jar" />
- <include name="tomcat/jasper-compiler-1.0.jar" />
- <include name="tomcat/jasper-runtime-1.0.jar" />
- <include name="tomcat/jsp-api-2.0.jar" />
+ <include name="tomcat/commons-el-1.0.jar"/>
+ <include name="tomcat/jasper-compiler-1.0.jar"/>
+ <include name="tomcat/jasper-runtime-1.0.jar"/>
+ <include name="tomcat/jsp-api-2.0.jar"/>
<!-- dependencies needed for JSP support in DevMode: END -->
- <include name="apache/commons/commons-collections-3.2.1.jar" />
+ <include name="apache/commons/commons-collections-3.2.1.jar"/>
<!-- htmlunit dependencies not already included: BEGIN -->
- <include name="apache/http/httpclient-4.3.1.jar" />
- <include name="apache/http/httpcore-4.3.jar" />
- <include name="apache/http/httpmime-4.3.1.jar" />
- <include name="apache/james/apache-mime4j-0.6.jar" />
- <include name="apache/commons/commons-codec-1.8.jar" />
- <include name="apache/commons/commons-io-2.4.jar" />
- <include name="apache/commons/commons-lang3-3.1.jar" />
- <include name="apache/commons/commons-logging-1.1.3.jar" />
- <include name="cssparser/cssparser-0.9.11.jar" />
- <include name="htmlunit/htmlunit-2.13/htmlunit-2.13.jar" />
- <include name="htmlunit/htmlunit-2.13/htmlunit-core-js-2.13.jar" />
- <include name="nekohtml/nekohtml-1.9.19.jar" />
- <include name="cup/java-cup-11a.jar" />
- <include name="xalan/xalan-2.7.1-nocup.jar" />
- <include name="xerces/xerces-2_11_0/serializer-2.7.1.jar" />
- <include name="xerces/xerces-2_11_0/xercesImpl-2.11.0.jar" />
- <include name="xerces/xerces-2_11_0/xml-apis-1.4.01.jar" />
- <include name="w3c/sac/sac-1.3.jar" />
+ <include name="apache/http/httpclient-4.3.1.jar"/>
+ <include name="apache/http/httpcore-4.3.jar"/>
+ <include name="apache/http/httpmime-4.3.1.jar"/>
+ <include name="apache/james/apache-mime4j-0.6.jar"/>
+ <include name="apache/commons/commons-codec-1.8.jar"/>
+ <include name="apache/commons/commons-io-2.4.jar"/>
+ <include name="apache/commons/commons-lang3-3.1.jar"/>
+ <include name="apache/commons/commons-logging-1.1.3.jar"/>
+ <include name="cssparser/cssparser-0.9.11.jar"/>
+ <include name="htmlunit/htmlunit-2.13/htmlunit-2.13.jar"/>
+ <include name="htmlunit/htmlunit-2.13/htmlunit-core-js-2.13.jar"/>
+ <include name="nekohtml/nekohtml-1.9.19.jar"/>
+ <include name="cup/java-cup-11a.jar"/>
+ <include name="xalan/xalan-2.7.1-nocup.jar"/>
+ <include name="xerces/xerces-2_11_0/serializer-2.7.1.jar"/>
+ <include name="xerces/xerces-2_11_0/xercesImpl-2.11.0.jar"/>
+ <include name="xerces/xerces-2_11_0/xml-apis-1.4.01.jar"/>
+ <include name="w3c/sac/sac-1.3.jar"/>
<!-- htmlunit dependencies not already included: END -->
- <include name="json/android-sdk-19.1/json-android.jar" />
+ <include name="json/android-sdk-19.1/json-android.jar"/>
</fileset>
<fileset file="build.xml"/>
</sourcefiles>
@@ -101,63 +105,71 @@
</targetfiles>
<sequential>
<gwt.jar destfile="${alldeps.jar}">
- <zipfileset src="${gwt.tools.lib}/apache/tapestry-util-text-4.0.2.jar" />
- <zipfileset src="${gwt.tools.lib}/apache/ant-1.6.5.jar" />
- <zipfileset src="${gwt.tools.lib}/eclipse/org.eclipse.jdt.core_3.8.3.v20130121-145325.jar" />
- <zipfileset src="${gwt.tools.lib}/eclipse/jdtCompilerAdapter-3.8.3.v20130121-145325.jar" />
- <zipfileset src="${gwt.tools.lib}/guava/guava-16.0.1/guava-16.0.1-rebased.jar" />
- <zipfileset src="${gwt.tools.lib}/icu4j/50.1.1/icu4j.jar" />
- <zipfileset src="${gwt.tools.lib}/jetty/jetty-8.1.12.v20130726/jetty-8.1.12.v20130726.jar" />
- <zipfileset src="${gwt.tools.lib}/jetty/jetty-8.1.12.v20130726/servlet-api-3.0-NoMetaInf.jar" />
- <zipfileset src="${gwt.tools.lib}/jscomp/20131118/compiler-rebased.jar" />
- <zipfileset src="${gwt.tools.lib}/jscomp/20131118/sourcemap-rebased.jar" />
- <zipfileset src="${gwt.tools.lib}/jsr305/jsr305.jar" />
- <zipfileset src="${gwt.tools.lib}/protobuf/protobuf-2.5.0/protobuf-java-rebased-2.5.0.jar" />
+ <zipfileset src="${gwt.tools.lib}/apache/tapestry-util-text-4.0.2.jar"/>
+ <zipfileset src="${gwt.tools.lib}/apache/ant-1.6.5.jar"/>
+ <zipfileset
+ src="${gwt.tools.lib}/eclipse/org.eclipse.jdt.core_3.8.3.v20130121-145325.jar"/>
+ <zipfileset
+ src="${gwt.tools.lib}/eclipse/jdtCompilerAdapter-3.8.3.v20130121-145325.jar"/>
+ <zipfileset src="${gwt.tools.lib}/guava/guava-16.0.1/guava-16.0.1-rebased.jar"/>
+ <zipfileset src="${gwt.tools.lib}/icu4j/50.1.1/icu4j.jar"/>
+ <zipfileset
+ src="${gwt.tools.lib}/jetty/jetty-8.1.12.v20130726/jetty-8.1.12.v20130726.jar"/>
+ <zipfileset
+ src="${gwt.tools.lib}/jetty/jetty-8.1.12.v20130726/servlet-api-3.0-NoMetaInf.jar"/>
+ <zipfileset src="${gwt.tools.lib}/jscomp/20131118/compiler-rebased.jar"/>
+ <zipfileset src="${gwt.tools.lib}/jscomp/20131118/sourcemap-rebased.jar"/>
+ <zipfileset src="${gwt.tools.lib}/jsr305/jsr305.jar"/>
+ <zipfileset
+ src="${gwt.tools.lib}/protobuf/protobuf-2.5.0/protobuf-java-rebased-2.5.0.jar"/>
<!-- dependencies needed for JSP support in DevMode: BEGIN -->
- <zipfileset src="${gwt.tools.lib}/tomcat/commons-el-1.0.jar" />
- <zipfileset src="${gwt.tools.lib}/tomcat/jasper-compiler-1.0.jar" />
- <zipfileset src="${gwt.tools.lib}/tomcat/jasper-runtime-1.0.jar" />
- <zipfileset src="${gwt.tools.lib}/tomcat/jsp-api-2.0.jar" />
+ <zipfileset src="${gwt.tools.lib}/tomcat/commons-el-1.0.jar"/>
+ <zipfileset src="${gwt.tools.lib}/tomcat/jasper-compiler-1.0.jar"/>
+ <zipfileset src="${gwt.tools.lib}/tomcat/jasper-runtime-1.0.jar"/>
+ <zipfileset src="${gwt.tools.lib}/tomcat/jsp-api-2.0.jar"/>
<!-- dependencies needed for JSP support in DevMode: END -->
- <zipfileset src="${gwt.tools.lib}/apache/commons/commons-collections-3.2.1.jar" />
+ <zipfileset
+ src="${gwt.tools.lib}/apache/commons/commons-collections-3.2.1.jar"/>
<!-- htmlunit dependencies not already included: BEGIN -->
- <zipfileset src="${gwt.tools.lib}/apache/http/httpclient-4.3.1.jar" />
- <zipfileset src="${gwt.tools.lib}/apache/http/httpcore-4.3.jar" />
- <zipfileset src="${gwt.tools.lib}/apache/http/httpmime-4.3.1.jar" />
- <zipfileset src="${gwt.tools.lib}/apache/james/apache-mime4j-0.6.jar" />
- <zipfileset src="${gwt.tools.lib}/apache/commons/commons-codec-1.8.jar" />
- <zipfileset src="${gwt.tools.lib}/apache/commons/commons-io-2.4.jar" />
- <zipfileset src="${gwt.tools.lib}/apache/commons/commons-lang3-3.1.jar" />
- <zipfileset src="${gwt.tools.lib}/apache/commons/commons-logging-1.1.3.jar" />
- <zipfileset src="${gwt.tools.lib}/cssparser/cssparser-0.9.11.jar" />
- <zipfileset src="${gwt.tools.lib}/htmlunit/htmlunit-2.13/htmlunit-2.13.jar" />
- <zipfileset src="${gwt.tools.lib}/htmlunit/htmlunit-2.13/htmlunit-core-js-2.13.jar" />
- <zipfileset src="${gwt.tools.lib}/nekohtml/nekohtml-1.9.19.jar" />
- <zipfileset src="${gwt.tools.lib}/cup/java-cup-11a.jar" />
- <zipfileset src="${gwt.tools.lib}/xalan/xalan-2.7.1-nocup.jar" />
- <zipfileset src="${gwt.tools.lib}/xerces/xerces-2_11_0/serializer-2.7.1.jar" />
- <zipfileset src="${gwt.tools.lib}/xerces/xerces-2_11_0/xercesImpl-2.11.0.jar" />
- <zipfileset src="${gwt.tools.lib}/xerces/xerces-2_11_0/xml-apis-1.4.01.jar" />
- <zipfileset src="${gwt.tools.lib}/w3c/sac/sac-1.3.jar" />
+ <zipfileset src="${gwt.tools.lib}/apache/http/httpclient-4.3.1.jar"/>
+ <zipfileset src="${gwt.tools.lib}/apache/http/httpcore-4.3.jar"/>
+ <zipfileset src="${gwt.tools.lib}/apache/http/httpmime-4.3.1.jar"/>
+ <zipfileset src="${gwt.tools.lib}/apache/james/apache-mime4j-0.6.jar"/>
+ <zipfileset src="${gwt.tools.lib}/apache/commons/commons-codec-1.8.jar"/>
+ <zipfileset src="${gwt.tools.lib}/apache/commons/commons-io-2.4.jar"/>
+ <zipfileset src="${gwt.tools.lib}/apache/commons/commons-lang3-3.1.jar"/>
+ <zipfileset src="${gwt.tools.lib}/apache/commons/commons-logging-1.1.3.jar"/>
+ <zipfileset src="${gwt.tools.lib}/cssparser/cssparser-0.9.11.jar"/>
+ <zipfileset src="${gwt.tools.lib}/htmlunit/htmlunit-2.13/htmlunit-2.13.jar"/>
+ <zipfileset
+ src="${gwt.tools.lib}/htmlunit/htmlunit-2.13/htmlunit-core-js-2.13.jar"/>
+ <zipfileset src="${gwt.tools.lib}/nekohtml/nekohtml-1.9.19.jar"/>
+ <zipfileset src="${gwt.tools.lib}/cup/java-cup-11a.jar"/>
+ <zipfileset src="${gwt.tools.lib}/xalan/xalan-2.7.1-nocup.jar"/>
+ <zipfileset src="${gwt.tools.lib}/xerces/xerces-2_11_0/serializer-2.7.1.jar"/>
+ <zipfileset src="${gwt.tools.lib}/xerces/xerces-2_11_0/xercesImpl-2.11.0.jar"/>
+ <zipfileset src="${gwt.tools.lib}/xerces/xerces-2_11_0/xml-apis-1.4.01.jar"/>
+ <zipfileset src="${gwt.tools.lib}/w3c/sac/sac-1.3.jar"/>
<!-- htmlunit dependencies not already included: END -->
- <zipfileset src="${gwt.tools.lib}/json/android-sdk-19.1/json-android.jar" />
+ <zipfileset src="${gwt.tools.lib}/json/android-sdk-19.1/json-android.jar"/>
</gwt.jar>
</sequential>
</outofdate>
</target>
- <property name="filter.pattern" value="com/google/gwt/dev/About.properties" />
+ <property name="filter.pattern" value="com/google/gwt/dev/About.properties"/>
<target name="-filter.props" description="Creates filtered About.properties with version info"
- unless="filter.uptodate">
+ unless="filter.uptodate">
<gwt.revfilter todir="${javac.out}">
- <fileset dir="core/src" includes="${filter.pattern}" />
+ <fileset dir="core/src" includes="${filter.pattern}"/>
</gwt.revfilter>
- <touch file="${filter.sentinel}" />
+ <touch file="${filter.sentinel}"/>
</target>
- <target name="compiler.standalone" description="Validates that the standalone gwt-compiler project can build.">
- <mkdir dir="${javac.out}" />
+ <target name="compiler.standalone"
+ description="Validates that the standalone gwt-compiler project can build.">
+ <mkdir dir="${javac.out}"/>
<gwt.javac srcdir="core/super" excludes="com/google/gwt/dev/jjs/intrinsic/"/>
<gwt.javac srcdir="core/src">
<include name="com/google/gwt/core/ext/**"/>
@@ -178,25 +190,31 @@
<include name="com/google/gwt/util/**"/>
<include name="org/eclipse/jdt/**"/>
<classpath>
- <pathelement location="${gwt.tools.lib}/apache/ant-1.6.5.jar" />
- <pathelement location="${gwt.tools.lib}/apache/commons/commons-collections-3.2.1.jar" />
- <pathelement location="${gwt.tools.lib}/eclipse/org.eclipse.jdt.core_3.8.3.v20130121-145325.jar" />
- <pathelement location="${gwt.tools.lib}/eclipse/jdtCompilerAdapter-3.8.3.v20130121-145325.jar" />
- <pathelement location="${gwt.tools.lib}/guava/guava-16.0.1/guava-16.0.1-rebased.jar" />
- <pathelement location="${gwt.tools.lib}/jscomp/20131118/compiler-rebased.jar" />
- <pathelement location="${gwt.tools.lib}/jscomp/20131118/sourcemap-rebased.jar" />
- <pathelement location="${gwt.tools.lib}/json/android-sdk-19.1/json-android.jar" />
- <pathelement location="${gwt.tools.lib}/jsr305/jsr305.jar" />
- <pathelement location="${gwt.tools.lib}/protobuf/protobuf-2.5.0/protobuf-java-rebased-2.5.0.jar" />
+ <pathelement location="${gwt.tools.lib}/apache/ant-1.6.5.jar"/>
+ <pathelement
+ location="${gwt.tools.lib}/apache/commons/commons-collections-3.2.1.jar"/>
+ <pathelement
+ location="${gwt.tools.lib}/eclipse/org.eclipse.jdt.core_3.8.3.v20130121-145325.jar"/>
+ <pathelement
+ location="${gwt.tools.lib}/eclipse/jdtCompilerAdapter-3.8.3.v20130121-145325.jar"/>
+ <pathelement
+ location="${gwt.tools.lib}/guava/guava-16.0.1/guava-16.0.1-rebased.jar"/>
+ <pathelement location="${gwt.tools.lib}/jscomp/20131118/compiler-rebased.jar"/>
+ <pathelement location="${gwt.tools.lib}/jscomp/20131118/sourcemap-rebased.jar"/>
+ <pathelement location="${gwt.tools.lib}/json/android-sdk-19.1/json-android.jar"/>
+ <pathelement location="${gwt.tools.lib}/jsr305/jsr305.jar"/>
+ <pathelement
+ location="${gwt.tools.lib}/protobuf/protobuf-2.5.0/protobuf-java-rebased-2.5.0.jar"/>
</classpath>
</gwt.javac>
</target>
- <target name="compile" depends="compiler.standalone, build.alldeps.jar" description="Compiles this project">
+ <target name="compile" depends="compiler.standalone, build.alldeps.jar"
+ description="Compiles this project">
<gwt.javac srcdir="" excludes="${filter.pattern}">
- <src path="core/src" />
+ <src path="core/src"/>
<classpath>
- <pathelement location="${alldeps.jar}" />
+ <pathelement location="${alldeps.jar}"/>
</classpath>
</gwt.javac>
<copy todir="${javac.out}">
@@ -204,86 +222,102 @@
</copy>
<!-- Files with hardcoded version information must be filtered -->
- <gwt.getgitinfo />
+ <gwt.getgitinfo/>
<condition property="filter.uptodate">
<and>
- <available file="${filter.sentinel}" />
+ <available file="${filter.sentinel}"/>
<uptodate>
- <srcfiles dir="core/src" includes="${filter.pattern}" />
- <globmapper from="*" to="${javac.out}/*" />
+ <srcfiles dir="core/src" includes="${filter.pattern}"/>
+ <globmapper from="*" to="${javac.out}/*"/>
</uptodate>
</and>
</condition>
- <antcall target="-filter.props" />
+ <antcall target="-filter.props"/>
</target>
<target name="generate.remotemessageproto.java">
<!-- Generate the java code -->
<exec executable="protoc" failonerror="true">
- <arg value="--java_out=core/src"/>
- <arg value="./core/src/com/google/gwt/dev/shell/remoteui/remotemessage.proto"/>
+ <arg value="--java_out=core/src"/>
+ <arg value="./core/src/com/google/gwt/dev/shell/remoteui/remotemessage.proto"/>
</exec>
<!-- Rebase the java code to match the rebased protobuf library -->
<replace file="./core/src/com/google/gwt/dev/shell/remoteui/RemoteMessageProto.java">
- <replacefilter token="com.google.protobuf" value="com.google.gwt.dev.protobuf"/>
+ <replacefilter token="com.google.protobuf" value="com.google.gwt.dev.protobuf"/>
</replace>
</target>
- <target name="checkstyle" description="Static analysis of source">
+ <target name="checkstyle-source" description="Static analysis of source">
<gwt.checkstyle>
<fileset dir="core/src">
- <filename name="com/google/gwt/dev/shell/remoteui/RemoteMessageProto.java" negate="yes" />
- <filename name="com/google/gwt/dev/asm/**/*.java" negate="yes" />
- <filename name="com/google/gwt/dev/js/rhino/**/*.java" negate="yes" />
- <filename name="org/eclipse/**/*.java" negate="yes" />
- <filename name="org/apache/**/*.java" negate="yes" />
+ <filename name="com/google/gwt/dev/shell/remoteui/RemoteMessageProto.java"
+ negate="yes"/>
+ <filename name="com/google/gwt/dev/asm/**/*.java" negate="yes"/>
+ <filename name="com/google/gwt/dev/js/rhino/**/*.java" negate="yes"/>
+ <filename name="org/eclipse/**/*.java" negate="yes"/>
+ <filename name="org/apache/**/*.java" negate="yes"/>
</fileset>
+ <fileset dir="core/super"/>
</gwt.checkstyle>
-
- <gwt.checkstyle>
- <fileset dir="core/super/com/google/gwt/dev/jjs/intrinsic" />
- </gwt.checkstyle>
-
</target>
- <target name="test" depends="build, compile.tests" description="Run unit tests for this project.">
- <fileset id="tests.dev.core" dir="${javac.junit.out}" includes="${gwt.junit.testcase.dev.core.includes}" excludes="${gwt.junit.testcase.dev.core.excludes}" />
+ <target name="checkstyle-tests" description="Static analysis of tests">
+ <gwt.checkstyle.tests>
+ <fileset dir="core/test">
+ <filename name="com/google/gwt/dev/asm/**/*.java" negate="yes"/>
+ <filename name="com/google/gwt/dev/js/rhino/**/*.java" negate="yes"/>
+ <filename name="org/eclipse/**/*.java" negate="yes"/>
+ <filename name="org/apache/**/*.java" negate="yes"/>
+ </fileset>
+ </gwt.checkstyle.tests>
+ </target>
+
+ <target name="checkstyle" description="Static analysis of source"
+ depends="checkstyle-tests,checkstyle-source">
+ </target>
+
+ <target name="test" depends="build, compile.tests"
+ description="Run unit tests for this project.">
+ <fileset id="tests.dev.core" dir="${javac.junit.out}"
+ includes="${gwt.junit.testcase.dev.core.includes}"
+ excludes="${gwt.junit.testcase.dev.core.excludes}"/>
<gwt.junit test.name="dev" test.out="${junit.out}"
- test.args="${test.args}"
- test.jvmargs="${test.jvmargs}"
- test.cases="tests.dev.core" >
+ test.args="${test.args}"
+ test.jvmargs="${test.jvmargs}"
+ test.cases="tests.dev.core">
<extraclasspaths>
- <pathelement location="${alldeps.jar}" />
+ <pathelement location="${alldeps.jar}"/>
<!-- TODO: the following six items are needed because dev (alone) does
not adhere to the .../{src,super,test} convention, having a split
between core and (historically) oophm and the OS platforms. When
that unifies, these should go away. -->
- <pathelement location="${gwt.root}/${project.tail}/core/src" />
- <pathelement location="${gwt.root}/${project.tail}/core/super" />
- <pathelement location="${gwt.root}/${project.tail}/core/test" />
+ <pathelement location="${gwt.root}/${project.tail}/core/src"/>
+ <pathelement location="${gwt.root}/${project.tail}/core/super"/>
+ <pathelement location="${gwt.root}/${project.tail}/core/test"/>
<!-- Pull in gwt-dev and gwt-user sources for .gwt.xml files -->
- <pathelement location="${gwt.root}/user/src/" />
- <pathelement location="${gwt.root}/user/super/" />
+ <pathelement location="${gwt.root}/user/src/"/>
+ <pathelement location="${gwt.root}/user/super/"/>
<!-- CompilerTest compiles the hello sample. -->
- <pathelement location="${gwt.root}/samples/hello/src/" />
+ <pathelement location="${gwt.root}/samples/hello/src/"/>
</extraclasspaths>
</gwt.junit>
</target>
- <property.ensure name="gwt.tools.soyc" location="${gwt.root}/tools/soyc-vis" />
+ <property.ensure name="gwt.tools.soyc" location="${gwt.root}/tools/soyc-vis"/>
<target name="build" depends="compile" description="Build and package this project">
- <mkdir dir="${gwt.build.lib}" />
+ <mkdir dir="${gwt.build.lib}"/>
<outofdate>
<sourcefiles>
<fileset dir="core/src">
<exclude name="**/package.html"/>
- <exclude name="**/*.properties"/> <!-- copied and/or filtered into bin -->
+ <exclude name="**/*.properties"/>
+ <!-- copied and/or filtered into bin -->
</fileset>
- <fileset dir="core/super" excludes="**/package.html" />
- <fileset dir="${javac.out}" />
- <fileset dir="${project.build}/bin" />
- <fileset file="${project.build}/alldeps.jar" />
+ <fileset dir="core/super" excludes="**/package.html"/>
+ <fileset dir="${javac.out}"/>
+ <fileset dir="${project.build}/bin"/>
+ <fileset file="${project.build}/alldeps.jar"/>
<fileset file="${gwt.tools.soyc}/classLevel.css"/>
<fileset file="${gwt.tools.soyc}/roundedCorners.css"/>
</sourcefiles>
@@ -294,17 +328,20 @@
<gwt.jar>
<fileset dir="core/src">
<exclude name="**/package.html"/>
- <exclude name="**/*.properties"/> <!-- copied and/or filtered into bin -->
+ <exclude name="**/*.properties"/>
+ <!-- copied and/or filtered into bin -->
</fileset>
- <fileset dir="core/super" excludes="**/package.html" />
- <fileset dir="${javac.out}" />
- <zipfileset src="${alldeps.jar}" />
+ <fileset dir="core/super" excludes="**/package.html"/>
+ <fileset dir="${javac.out}"/>
+ <zipfileset src="${alldeps.jar}"/>
- <zipfileset file="${gwt.tools.soyc}/classLevel.css" prefix="com/google/gwt/soyc/resources/"/>
- <zipfileset file="${gwt.tools.soyc}/roundedCorners.css" prefix="com/google/gwt/soyc/resources/"/>
+ <zipfileset file="${gwt.tools.soyc}/classLevel.css"
+ prefix="com/google/gwt/soyc/resources/"/>
+ <zipfileset file="${gwt.tools.soyc}/roundedCorners.css"
+ prefix="com/google/gwt/soyc/resources/"/>
<manifest>
- <attribute name="Main-Class" value="com.google.gwt.dev.GWTMain" />
+ <attribute name="Main-Class" value="com.google.gwt.dev.GWTMain"/>
</manifest>
</gwt.jar>
</sequential>
diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/HtmlWriter.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/HtmlWriter.java
index ddf7db4..91fa680 100644
--- a/dev/codeserver/java/com/google/gwt/dev/codeserver/HtmlWriter.java
+++ b/dev/codeserver/java/com/google/gwt/dev/codeserver/HtmlWriter.java
@@ -1,5 +1,18 @@
-// Copyright 2012 Google Inc. All Rights Reserved.
-
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package com.google.gwt.dev.codeserver;
import java.io.IOException;
@@ -11,8 +24,6 @@
/**
* Writes HTML to a stream.
- *
- * @author skybrian@google.com (Brian Slesinsky)
*/
class HtmlWriter {
private static final Set<String> ALLOWED_TAGS =
diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/Options.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/Options.java
index 7965cfb..ddb966f 100644
--- a/dev/codeserver/java/com/google/gwt/dev/codeserver/Options.java
+++ b/dev/codeserver/java/com/google/gwt/dev/codeserver/Options.java
@@ -214,7 +214,6 @@
protected String getName() {
return CodeServer.class.getName();
}
-
}
private class NoPrecompileFlag extends ArgHandlerFlag {
@@ -285,8 +284,8 @@
@Override
public boolean setString(String newValue) {
try {
- InetAddress bindAddress = InetAddress.getByName(newValue);
- if (bindAddress.isAnyLocalAddress()) {
+ InetAddress newBindAddress = InetAddress.getByName(newValue);
+ if (newBindAddress.isAnyLocalAddress()) {
preferredHost = InetAddress.getLocalHost().getHostName();
} else {
preferredHost = newValue;
diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/PageUtil.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/PageUtil.java
index 74f0e2e..b13895c 100644
--- a/dev/codeserver/java/com/google/gwt/dev/codeserver/PageUtil.java
+++ b/dev/codeserver/java/com/google/gwt/dev/codeserver/PageUtil.java
@@ -37,8 +37,6 @@
/**
* Static utility methods for sending web pages.
- *
- * @author skybrian@google.com (Brian Slesinsky)
*/
class PageUtil {
diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/RecompileListener.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/RecompileListener.java
index 907f3cb..b8b688a 100644
--- a/dev/codeserver/java/com/google/gwt/dev/codeserver/RecompileListener.java
+++ b/dev/codeserver/java/com/google/gwt/dev/codeserver/RecompileListener.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package com.google.gwt.dev.codeserver;
/**
diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/Recompiler.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/Recompiler.java
index be5d5d7..c1ee126 100644
--- a/dev/codeserver/java/com/google/gwt/dev/codeserver/Recompiler.java
+++ b/dev/codeserver/java/com/google/gwt/dev/codeserver/Recompiler.java
@@ -223,7 +223,7 @@
// Check that we have a compatible linker.
Class<? extends Linker> linker = moduleDef.getActivePrimaryLinker();
- if (! CrossSiteIframeLinker.class.isAssignableFrom(linker)) {
+ if (!CrossSiteIframeLinker.class.isAssignableFrom(linker)) {
logger.log(TreeLogger.ERROR,
"linkers other than CrossSiteIFrameLinker aren't supported. Found: " + linker.getName());
throw new UnableToCompleteException();
diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/SourceMap.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/SourceMap.java
index b44dc98..0ca184c 100644
--- a/dev/codeserver/java/com/google/gwt/dev/codeserver/SourceMap.java
+++ b/dev/codeserver/java/com/google/gwt/dev/codeserver/SourceMap.java
@@ -33,13 +33,13 @@
/**
* In-memory representation of a SourceMap.
- *
- * @author skybrian@google.com (Brian Slesinsky)
*/
class SourceMap {
private final JsonObject json;
- /** @see #load */
+ /**
+ *@see #load
+ */
private SourceMap(JsonObject json) {
this.json = json;
}
diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/WebServer.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/WebServer.java
index 6699312..831b15a 100644
--- a/dev/codeserver/java/com/google/gwt/dev/codeserver/WebServer.java
+++ b/dev/codeserver/java/com/google/gwt/dev/codeserver/WebServer.java
@@ -26,7 +26,6 @@
import com.google.gwt.thirdparty.org.eclipse.jetty.server.Request;
import com.google.gwt.thirdparty.org.eclipse.jetty.server.Server;
import com.google.gwt.thirdparty.org.eclipse.jetty.server.nio.SelectChannelConnector;
-import com.google.gwt.thirdparty.org.eclipse.jetty.servlet.FilterHolder;
import com.google.gwt.thirdparty.org.eclipse.jetty.servlet.ServletContextHandler;
import com.google.gwt.thirdparty.org.eclipse.jetty.servlet.ServletHolder;
import com.google.gwt.thirdparty.org.eclipse.jetty.servlets.GzipFilter;
@@ -44,8 +43,8 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.servlet.ServletException;
import javax.servlet.DispatcherType;
+import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -113,27 +112,27 @@
connector.setReuseAddress(false);
connector.setSoLingerTime(0);
- Server server = new Server();
- server.addConnector(connector);
+ Server newServer = new Server();
+ newServer.addConnector(connector);
- ServletContextHandler handler = new ServletContextHandler(ServletContextHandler.SESSIONS);
- handler.setContextPath("/");
- handler.addServlet(new ServletHolder(new HttpServlet() {
+ ServletContextHandler newHandler = new ServletContextHandler(ServletContextHandler.SESSIONS);
+ newHandler.setContextPath("/");
+ newHandler.addServlet(new ServletHolder(new HttpServlet() {
@Override
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
handleRequest(request.getPathInfo(), request, response);
}
}), "/*");
- handler.addFilter(GzipFilter.class, "/*", EnumSet.allOf(DispatcherType.class));
- server.setHandler(handler);
+ newHandler.addFilter(GzipFilter.class, "/*", EnumSet.allOf(DispatcherType.class));
+ newServer.setHandler(newHandler);
try {
- server.start();
+ newServer.start();
} catch (Exception e) {
logger.log(TreeLogger.ERROR, "cannot start web server", e);
throw new UnableToCompleteException();
}
- this.server = server;
+ this.server = newServer;
}
public int getPort() {
diff --git a/dev/core/src/com/google/gwt/core/ext/debug/JsoEval.java b/dev/core/src/com/google/gwt/core/ext/debug/JsoEval.java
index 2b140f0..c6f3585 100644
--- a/dev/core/src/com/google/gwt/core/ext/debug/JsoEval.java
+++ b/dev/core/src/com/google/gwt/core/ext/debug/JsoEval.java
@@ -1,12 +1,12 @@
/*
* Copyright 2011 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,7 +26,7 @@
import java.util.Map;
/**
- * Provides facilities for debuggers to call methods on
+ * Provides facilities for debuggers to call methods on
* {@link com.google.gwt.core.client.JavaScriptObject JavaScriptObjects}.
* <p/>
* Because devmode does extensive rewriting of JSO bytecode, debuggers can't
@@ -38,23 +38,22 @@
* Example uses:
* <code><pre>
* JsoEval.call(Element.class, myElement, "getAbsoluteTop");
- * JsoEval.call(Node.class, myNode, "cloneNode", Boolean.TRUE);
- * JsoEval.call(Element.class, element.getFirstChildElement(), "setPropertyString", "phase",
- * "gamma");
- * </pre></code>
- * @noinspection UnusedDeclaration
+ * JsoEval.call(Node.class, myNode, "cloneNode", Boolean.TRUE);
+ * JsoEval.call(Element.class, element.getFirstChildElement(), "setPropertyString", "phase",
+ * "gamma");
+ * </pre></code>
*/
public class JsoEval {
-
+
/* TODO: Error messages generated from JsoEval are reported with mangled
* method names and signatures instead of original source code values.
* We could de-mangle the names for the errors, but it really only matters
* for users who don't have IDE support.
*/
-
+
// TODO: Update the wiki doc to include a better description of JSO transformations and reference
// it from here.
-
+
private static Map<Class,Class> boxedTypeForPrimitiveType = new HashMap<Class,Class>(8);
private static Map<Class,Class> primitiveTypeForBoxedType = new HashMap<Class,Class>(8);
@@ -69,15 +68,15 @@
boxedTypeForPrimitiveType.put(float.class, Float.class);
boxedTypeForPrimitiveType.put(long.class, Long.class);
boxedTypeForPrimitiveType.put(double.class, Double.class);
-
+
for (Map.Entry<Class,Class> entry : boxedTypeForPrimitiveType.entrySet()) {
primitiveTypeForBoxedType.put(entry.getValue(), entry.getKey());
}
}
/**
- * Reflectively invokes a method on a JavaScriptObject.
- *
+ * Reflectively invokes a method on a JavaScriptObject.
+ *
* @param klass Either a class of type JavaScriptObject or an interface
* implemented by a JavaScriptObject. The class must contain the method to
* be invoked.
@@ -86,7 +85,7 @@
* @param methodName The name of the method
* @param types The types of the arguments
* @param args The values of the arguments
- *
+ *
* @return The result of the method invocation or the failure as a String
*/
public static Object call(Class klass, Object obj, String methodName, Class[] types,
@@ -99,11 +98,11 @@
}
/**
- * A convenience form of
+ * A convenience form of
* {@link #call(Class, Object, String, Class[], Object...)} for use directly
* by users in a debugger. This method guesses at the types of the method
* based on the values of {@code args}.
- *
+ *
* @return The result of the method invocation or the failure as a String
*/
public static Object call(Class klass, Object obj, String methodName, Object... args) {
@@ -113,10 +112,10 @@
return toString(e);
}
}
-
+
/**
- * Reflectively invokes a method on a JavaScriptObject.
- *
+ * Reflectively invokes a method on a JavaScriptObject.
+ *
* @param klass Either a class of type JavaScriptObject or an interface
* implemented by a JavaScriptObject. The class must contain the method to
* be invoked.
@@ -125,7 +124,7 @@
* @param methodName The name of the method
* @param types The types of the arguments
* @param args The values of the arguments
- *
+ *
* @return The result of the method invocation
*/
public static Object callEx(Class klass, Object obj, String methodName, Class[] types,
@@ -136,7 +135,7 @@
}
/**
- * A convenience form of
+ * A convenience form of
* {@link #call(Class, Object, String, Class[], Object...)} for use directly
* by users in a debugger. This method guesses at the types of the method
* based on the values of {@code args}.
@@ -145,7 +144,7 @@
throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException,
IllegalAccessException {
if (args == null) {
- // A single-argument varargs null can come in unboxed
+ // A single-argument varargs null can come in unboxed
args = new Object[]{null};
}
@@ -171,7 +170,7 @@
return m.invoke(obj, args);
}
}
-
+
ClassLoader ccl = getCompilingClassLoader(klass, obj);
boolean isJso = isJso(ccl, klass);
boolean isStaticifiedDispatch = isJso && obj != null;
@@ -181,7 +180,7 @@
isJso ? getSisterJsoImpl(klass, ccl).getMethods() : getJsoImplClass(ccl).getMethods()));
String mangledMethodName = mangleMethod(klass, methodName, isJso, isStaticifiedDispatch);
-
+
// Filter the methods in multiple passes to give better error messages.
for (Iterator<Method> it = matchingMethods.iterator(); it.hasNext();) {
Method m = it.next();
@@ -196,7 +195,7 @@
}
ArrayList<Method> candidates = new ArrayList<Method>(matchingMethods);
-
+
for (Iterator<Method> it = matchingMethods.iterator(); it.hasNext();) {
Method m = it.next();
if (m.getParameterTypes().length != actualNumArgs) {
@@ -209,9 +208,9 @@
"No methods by the name, " + methodName + ", in " + klass + " accept "
+ args.length + " parameters. Candidates are:\n" + candidates);
}
-
+
candidates = new ArrayList<Method>(matchingMethods);
-
+
nextMethod: for (Iterator<Method> it = matchingMethods.iterator(); it.hasNext();) {
Method m = it.next();
Class[] methodTypes = m.getParameterTypes();
@@ -230,7 +229,7 @@
}
candidates = new ArrayList<Method>(matchingMethods);
-
+
if (matchingMethods.size() > 1) {
// Try to filter by exact name on the crazy off chance there are two
// methods by same name but different case.
@@ -239,7 +238,7 @@
if (!m.getName().equals(mangledMethodName)) {
it.remove();
}
- }
+ }
}
if (matchingMethods.isEmpty()) {
@@ -247,19 +246,19 @@
"Multiple methods with a case-insensitive match were found for, " + methodName
+ ", in " + klass + ". Candidates:\n" + candidates);
}
-
+
if (matchingMethods.size() > 1) {
throw new RuntimeException(
"Found more than one matching method. Please specify the types of the parameters. "
+ "Candidates:\n" + matchingMethods);
}
-
+
return invoke(klass, obj, matchingMethods.get(0), args);
}
-
+
/**
* Reflectively invokes a static method on a JavaScriptObject. Has the same
- * effect as calling {@link #call(Class, Object, String, Class[], Object...)
+ * effect as calling {@link #call(Class, Object, String, Class[], Object...)
* call(klass, null, methodName, types, args)}
*
* @return The result of the method invocation or the failure as a String
@@ -271,7 +270,7 @@
return toString(e);
}
}
-
+
/**
* Reflectively invokes a static method on a JavaScriptObject. Has the same
* effect as calling {@link #call(Class, Object, String, Class[], Object...)
@@ -282,13 +281,13 @@
IllegalAccessException {
return call(klass, null, methodName, types, args);
}
-
+
/**
- * Try to find the CompilingClassLoader. This can fail if<ol>
+ * Try to find the CompilingClassLoader. This can fail if<ol>
* <li> the user provides an object that isn't a JSO or
* <li>the user provides a null JSO and a Class that wasn't loaded by the
* CompilingClassLoader
- * </ol>
+ * </ol>
* I don't have any great solutions for that scenario.
*/
private static ClassLoader getCompilingClassLoader(Class klass, Object obj) {
@@ -301,7 +300,7 @@
ccl = klass.getClassLoader();
}
- if (ccl == null ||
+ if (ccl == null ||
!ccl.getClass().getName().equals("com.google.gwt.dev.shell.CompilingClassLoader")) {
if (obj != null) {
throw new RuntimeException(
@@ -311,7 +310,7 @@
} else {
throw new RuntimeException(
"The class, " + klass + ", does not appear to be a JavaScriptObject or an interface " +
- "implemented by a JavaScriptObject. GWT could not find a CompilingClassLoader " +
+ "implemented by a JavaScriptObject. GWT could not find a CompilingClassLoader " +
" for it.");
}
}
@@ -349,7 +348,7 @@
throw new RuntimeException(obj + " is not a JavaScriptObject.");
}
}
-
+
// First see if it's a method inherited from java.lang.Object
Method[] methods = Object.class.getMethods();
for (Method m : methods) {
@@ -357,12 +356,12 @@
return m;
}
}
-
+
ClassLoader ccl = getCompilingClassLoader(klass, obj);
boolean isJso = isJso(ccl, klass);
- boolean isStaticifiedDispatch = isJso && obj != null;
+ boolean isStaticifiedDispatch = isJso && obj != null;
String mangledMethod = mangleMethod(klass, methodName, isJso, isStaticifiedDispatch);
-
+
if (!isJso) {
// If this is interface dispatch, then the method lives on
// JavaScriptObject$ and is mangled so that it doesn't conflict with any
@@ -377,9 +376,9 @@
}
// All other methods lives on the impl subclass of JavaScriptObject$,
- // and have been rewritten to be static dispatch.
+ // and have been rewritten to be static dispatch.
Class jsoImplSubclass = getSisterJsoImpl(klass, ccl);
-
+
if (obj != null) {
// If this is an instance method, we need to insert obj as the "this" ref
// in the args
@@ -388,7 +387,7 @@
System.arraycopy(types, 0, newTypes, 1, types.length);
types = newTypes;
}
-
+
return jsoImplSubclass.getMethod(mangledMethod, types);
}
@@ -401,10 +400,10 @@
throws InvocationTargetException, IllegalAccessException, ClassNotFoundException,
NoSuchMethodException {
if (args == null) {
- // A single-argument varargs null can come in unboxed
+ // A single-argument varargs null can come in unboxed
args = new Object[]{null};
}
-
+
ClassLoader ccl = getCompilingClassLoader(klass, obj);
if (!isJso(ccl, klass)) {
@@ -414,9 +413,9 @@
}
// All other methods lives on the impl subclass of JavaScriptObject$,
- // and have been rewritten to be static dispatch.
+ // and have been rewritten to be static dispatch.
if (obj != null) {
- // If this is an instance method, we need to insert obj as the "this"
+ // If this is an instance method, we need to insert obj as the "this"
// ref in the args
Object[] newArgs = new Object[args.length + 1];
newArgs[0] = obj;
@@ -446,26 +445,26 @@
private static boolean isJso(ClassLoader ccl, Class klass) {
return getJsoClass(ccl).isAssignableFrom(klass);
}
-
- private static String mangleMethod(Class klass, String methodName, boolean isJso,
+
+ private static String mangleMethod(Class klass, String methodName, boolean isJso,
boolean isVirtual) {
// If this is interface dispatch from a non-JSO, then the method lives on
// JavaScriptObject$ and is mangled with the fully qualified class name so
// that it doesn't conflict with methods from other classes. Otherwise
- // virtual dispatch is re-written to static dispatch, and a '$' is
- // appended to the name of the method.
+ // virtual dispatch is re-written to static dispatch, and a '$' is
+ // appended to the name of the method.
return isJso ? isVirtual ? methodName + '$' : methodName
: klass.getName().replace('.', '_') + '_' + methodName;
}
-
+
private static String toString(Exception e) {
StringWriter sw = new StringWriter();
PrintWriter w = new PrintWriter(sw);
e.printStackTrace(w);
w.close();
- return sw.toString();
+ return sw.toString();
}
-
- private JsoEval() {
- }
+
+ private JsoEval() {
+ }
}
diff --git a/dev/core/src/com/google/gwt/core/ext/linker/impl/PropertiesUtil.java b/dev/core/src/com/google/gwt/core/ext/linker/impl/PropertiesUtil.java
index 89fd135..29a2050 100644
--- a/dev/core/src/com/google/gwt/core/ext/linker/impl/PropertiesUtil.java
+++ b/dev/core/src/com/google/gwt/core/ext/linker/impl/PropertiesUtil.java
@@ -1,12 +1,12 @@
/*
* Copyright 2010 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -18,8 +18,8 @@
import com.google.gwt.core.ext.LinkerContext;
import com.google.gwt.core.ext.TreeLogger;
-import com.google.gwt.core.ext.linker.CompilationResult;
import com.google.gwt.core.ext.UnableToCompleteException;
+import com.google.gwt.core.ext.linker.CompilationResult;
import com.google.gwt.core.ext.linker.ConfigurationProperty;
import com.google.gwt.core.ext.linker.SelectionProperty;
diff --git a/dev/core/src/com/google/gwt/core/ext/soyc/impl/DependencyRecorder.java b/dev/core/src/com/google/gwt/core/ext/soyc/impl/DependencyRecorder.java
index 032fac4..b081f06 100644
--- a/dev/core/src/com/google/gwt/core/ext/soyc/impl/DependencyRecorder.java
+++ b/dev/core/src/com/google/gwt/core/ext/soyc/impl/DependencyRecorder.java
@@ -1,12 +1,12 @@
/*
* Copyright 2009 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -20,8 +20,8 @@
import com.google.gwt.dev.jjs.ast.JMethod;
import com.google.gwt.dev.jjs.ast.JProgram;
import com.google.gwt.dev.jjs.ast.JRunAsync;
-import com.google.gwt.dev.jjs.impl.codesplitter.MultipleDependencyGraphRecorder;
import com.google.gwt.dev.jjs.impl.ControlFlowAnalyzer;
+import com.google.gwt.dev.jjs.impl.codesplitter.MultipleDependencyGraphRecorder;
import com.google.gwt.util.tools.Utility;
import java.io.IOException;
diff --git a/dev/core/src/com/google/gwt/core/linker/SymbolMapsLinker.java b/dev/core/src/com/google/gwt/core/linker/SymbolMapsLinker.java
index 2273864..6ba1bd1 100644
--- a/dev/core/src/com/google/gwt/core/linker/SymbolMapsLinker.java
+++ b/dev/core/src/com/google/gwt/core/linker/SymbolMapsLinker.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.core.linker;
-import com.google.gwt.thirdparty.debugging.sourcemap.SourceMapGeneratorV3;
import com.google.gwt.core.ext.LinkerContext;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
@@ -34,6 +33,7 @@
import com.google.gwt.core.ext.linker.SyntheticArtifact;
import com.google.gwt.dev.util.Util;
import com.google.gwt.dev.util.collect.HashMap;
+import com.google.gwt.thirdparty.debugging.sourcemap.SourceMapGeneratorV3;
import com.google.gwt.thirdparty.debugging.sourcemap.SourceMapGeneratorV3.ExtensionMergeAction;
import java.io.ByteArrayOutputStream;
@@ -253,7 +253,7 @@
ByteArrayOutputStream out = new ByteArrayOutputStream();
for (CompilationResult result : artifacts.find(CompilationResult.class)) {
-
+
boolean makeSymbolMaps = true;
for (SoftPermutation perm : result.getSoftPermutations()) {
diff --git a/dev/core/src/com/google/gwt/dev/ServletValidator.java b/dev/core/src/com/google/gwt/dev/ServletValidator.java
index 0439564..d666013 100644
--- a/dev/core/src/com/google/gwt/dev/ServletValidator.java
+++ b/dev/core/src/com/google/gwt/dev/ServletValidator.java
@@ -1,12 +1,12 @@
/*
* Copyright 2009 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,9 +28,9 @@
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import java.util.Stack;
-import java.util.Map.Entry;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
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 37b76da..1b6ba0d 100644
--- a/dev/core/src/com/google/gwt/dev/cfg/ModuleDefSchema.java
+++ b/dev/core/src/com/google/gwt/dev/cfg/ModuleDefSchema.java
@@ -45,6 +45,7 @@
import java.util.regex.Pattern;
// CHECKSTYLE_NAMING_OFF
+
/**
* Configures a module definition object using XML.
*/
diff --git a/dev/core/src/com/google/gwt/dev/generator/NameFactory.java b/dev/core/src/com/google/gwt/dev/generator/NameFactory.java
index 749d62a..1f8b98a 100644
--- a/dev/core/src/com/google/gwt/dev/generator/NameFactory.java
+++ b/dev/core/src/com/google/gwt/dev/generator/NameFactory.java
@@ -1,12 +1,12 @@
/*
* Copyright 2007 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,9 +15,9 @@
*/
package com.google.gwt.dev.generator;
-import java.util.Set;
-import java.util.HashSet;
import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
/**
* Generates unqiue identifiers. Use this class to avoid generating conflicting
@@ -31,7 +31,7 @@
/**
* Creates a new <code>NameFactory</code> that knows about
* <code>existingNames</code>.
- *
+ *
* @param existingNames a list of names that may be <code>null</code>.
*/
public NameFactory(Collection<String> existingNames) {
@@ -51,7 +51,7 @@
/**
* Reserves a known name. Asserts that the name is not already in this set.
- *
+ *
* @param name a not <code>null</code> name
*/
public void addName(String name) {
@@ -62,7 +62,7 @@
/**
* Creates a new unique name based off of <code>name</code> and adds it to
* the list of known names.
- *
+ *
* @param name a not <code>null</code> name to base the new unique name from
* @return a new unique, not <code>null</code> name. This name may be
* possibly identical to <code>name</code>.
diff --git a/dev/core/src/com/google/gwt/dev/generator/ast/Statement.java b/dev/core/src/com/google/gwt/dev/generator/ast/Statement.java
index 0768625..41a85a2 100644
--- a/dev/core/src/com/google/gwt/dev/generator/ast/Statement.java
+++ b/dev/core/src/com/google/gwt/dev/generator/ast/Statement.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,8 +15,8 @@
*/
package com.google.gwt.dev.generator.ast;
-import java.util.List;
import java.util.Arrays;
+import java.util.List;
/**
* A {@link Node} that represents a single Java statement.
@@ -33,7 +33,7 @@
* Creates a new <code>Statement</code> from a {@link String} of code
* representing an {@link Expression}. Automatically appends a semicolon to
* <code>code</code>.
- *
+ *
* @param code A textual {@link Expression}. Should not end with a semicolon.
*/
public Statement(String code) {
@@ -43,7 +43,7 @@
/**
* Creates a new <code>Statement</code> from an {@link Expression}.
- *
+ *
* @param expression A non <code>null</code> {@link Expression}.
*/
public Statement(Expression expression) {
diff --git a/dev/core/src/com/google/gwt/dev/javac/PersistentUnitCache.java b/dev/core/src/com/google/gwt/dev/javac/PersistentUnitCache.java
index a1e6cca..c566026 100644
--- a/dev/core/src/com/google/gwt/dev/javac/PersistentUnitCache.java
+++ b/dev/core/src/com/google/gwt/dev/javac/PersistentUnitCache.java
@@ -1,12 +1,12 @@
/*
* Copyright 2011 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -23,9 +23,9 @@
import com.google.gwt.dev.util.log.speedtracer.DevModeEventType;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
-import com.google.gwt.util.tools.Utility;
import com.google.gwt.thirdparty.guava.common.hash.Hashing;
import com.google.gwt.thirdparty.guava.common.io.Files;
+import com.google.gwt.util.tools.Utility;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
diff --git a/dev/core/src/com/google/gwt/dev/javac/asm/CollectReferencesVisitor.java b/dev/core/src/com/google/gwt/dev/javac/asm/CollectReferencesVisitor.java
index a0b0cb2..af175f9 100644
--- a/dev/core/src/com/google/gwt/dev/javac/asm/CollectReferencesVisitor.java
+++ b/dev/core/src/com/google/gwt/dev/javac/asm/CollectReferencesVisitor.java
@@ -1,12 +1,12 @@
/*
* Copyright 2009 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -20,9 +20,9 @@
import com.google.gwt.dev.asm.MethodVisitor;
import com.google.gwt.dev.asm.Opcodes;
import com.google.gwt.dev.asm.Type;
-import com.google.gwt.dev.javac.asmbridge.EmptyVisitor;
import com.google.gwt.dev.asm.signature.SignatureReader;
import com.google.gwt.dev.asm.signature.SignatureVisitor;
+import com.google.gwt.dev.javac.asmbridge.EmptyVisitor;
import java.util.HashSet;
import java.util.Set;
@@ -34,7 +34,7 @@
/**
* Collect type names from generic signatures.
- *
+ *
* All we care about is picking up type names, so we just return ourselves for
* nested visitors.
*/
diff --git a/dev/core/src/com/google/gwt/dev/javac/typemodel/JParameterizedType.java b/dev/core/src/com/google/gwt/dev/javac/typemodel/JParameterizedType.java
index 2878732..0385a27 100644
--- a/dev/core/src/com/google/gwt/dev/javac/typemodel/JParameterizedType.java
+++ b/dev/core/src/com/google/gwt/dev/javac/typemodel/JParameterizedType.java
@@ -16,8 +16,8 @@
package com.google.gwt.dev.javac.typemodel;
import com.google.gwt.core.ext.typeinfo.JType;
-import com.google.gwt.core.ext.typeinfo.NotFoundException;
import com.google.gwt.core.ext.typeinfo.JWildcardType.BoundType;
+import com.google.gwt.core.ext.typeinfo.NotFoundException;
import com.google.gwt.dev.util.collect.IdentityHashMap;
import com.google.gwt.dev.util.collect.Lists;
import com.google.gwt.dev.util.collect.Maps;
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 d220083..10a3a52 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/JJSOptions.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/JJSOptions.java
@@ -15,8 +15,8 @@
*/
package com.google.gwt.dev.jjs;
-import com.google.gwt.dev.util.arg.OptionCheckedMode;
import com.google.gwt.dev.util.arg.OptionAggressivelyOptimize;
+import com.google.gwt.dev.util.arg.OptionCheckedMode;
import com.google.gwt.dev.util.arg.OptionClusterSimilarFunctions;
import com.google.gwt.dev.util.arg.OptionDisableCastChecking;
import com.google.gwt.dev.util.arg.OptionDisableClassMetadata;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/LibraryJavaToJavaScriptCompiler.java b/dev/core/src/com/google/gwt/dev/jjs/LibraryJavaToJavaScriptCompiler.java
index a12fd25..1405d70 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/LibraryJavaToJavaScriptCompiler.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/LibraryJavaToJavaScriptCompiler.java
@@ -41,11 +41,11 @@
import com.google.gwt.dev.jjs.impl.CatchBlockNormalizer;
import com.google.gwt.dev.jjs.impl.ComputeExhaustiveCastabilityInformation;
import com.google.gwt.dev.jjs.impl.DeadCodeElimination;
+import com.google.gwt.dev.jjs.impl.Devirtualizer;
import com.google.gwt.dev.jjs.impl.EqualityNormalizer;
import com.google.gwt.dev.jjs.impl.Finalizer;
import com.google.gwt.dev.jjs.impl.ImplementCastsAndTypeChecks;
import com.google.gwt.dev.jjs.impl.JavaToJavaScriptMap;
-import com.google.gwt.dev.jjs.impl.Devirtualizer;
import com.google.gwt.dev.jjs.impl.LongCastNormalizer;
import com.google.gwt.dev.jjs.impl.LongEmulationNormalizer;
import com.google.gwt.dev.jjs.impl.PostOptimizationCompoundAssignmentNormalizer;
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 30d9f6e..f3f1c9e 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
@@ -106,8 +106,8 @@
import com.google.gwt.dev.util.StringInterner;
import com.google.gwt.thirdparty.guava.common.base.Function;
import com.google.gwt.thirdparty.guava.common.base.Preconditions;
-import com.google.gwt.thirdparty.guava.common.collect.Lists;
import com.google.gwt.thirdparty.guava.common.collect.Interner;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import com.google.gwt.thirdparty.guava.common.collect.Maps;
import com.google.gwt.thirdparty.guava.common.collect.Sets;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/ResolveRebinds.java b/dev/core/src/com/google/gwt/dev/jjs/impl/ResolveRebinds.java
index ba463cd..9e1a0db 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/ResolveRebinds.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/ResolveRebinds.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -17,8 +17,8 @@
import com.google.gwt.dev.jjs.InternalCompilerException;
import com.google.gwt.dev.jjs.SourceInfo;
-import com.google.gwt.dev.jjs.ast.AccessModifier;
import com.google.gwt.dev.jjs.SourceOrigin;
+import com.google.gwt.dev.jjs.ast.AccessModifier;
import com.google.gwt.dev.jjs.ast.Context;
import com.google.gwt.dev.jjs.ast.JBlock;
import com.google.gwt.dev.jjs.ast.JCaseStatement;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/constants/ConstantConditionTransformation.java b/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/constants/ConstantConditionTransformation.java
index 2a504f3..51d90d8 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/constants/ConstantConditionTransformation.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/constants/ConstantConditionTransformation.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -21,21 +21,21 @@
import com.google.gwt.dev.jjs.ast.JModVisitor;
import com.google.gwt.dev.jjs.ast.JNode;
import com.google.gwt.dev.jjs.impl.gflow.TransformationFunction.Transformation;
+import com.google.gwt.dev.jjs.impl.gflow.cfg.Cfg;
import com.google.gwt.dev.jjs.impl.gflow.cfg.CfgCaseNode;
-import com.google.gwt.dev.jjs.impl.gflow.cfg.CfgTransformer;
import com.google.gwt.dev.jjs.impl.gflow.cfg.CfgConditionalNode;
import com.google.gwt.dev.jjs.impl.gflow.cfg.CfgEdge;
-import com.google.gwt.dev.jjs.impl.gflow.cfg.Cfg;
import com.google.gwt.dev.jjs.impl.gflow.cfg.CfgNode;
import com.google.gwt.dev.jjs.impl.gflow.cfg.CfgNopNode;
+import com.google.gwt.dev.jjs.impl.gflow.cfg.CfgTransformer;
import com.google.gwt.thirdparty.guava.common.base.Preconditions;
/**
* Transformation to be applied when CfgConditionalNode's condition is constant
- * value. Transformation replaces conditional node with CfgNop node depending
+ * value. Transformation replaces conditional node with CfgNop node depending
* on condition value. It leaves the edge, which will be never executed
* unconnected at source, thus making sure that it will be unreachable.
- *
+ *
* Doesn't try to optimize unreachable branches, since this is subject to other
* optimizations.
*/
@@ -62,7 +62,7 @@
// TODO: support case node optimization
return false;
}
-
+
final JExpression oldCondition = node.getCondition();
final JExpression newCondition = JBooleanLiteral.get(conditionValue);
JModVisitor visitor = new JModVisitor() {
@@ -80,7 +80,7 @@
Preconditions.checkState(visitor.didChange(),
"Couldn't replace %s with %s in %s",
oldCondition, newCondition, startNode);
-
+
return visitor.didChange();
}
};
@@ -91,7 +91,7 @@
Cfg newSubgraph = new Cfg();
CfgNode<?> newNode = new CfgNopNode(node.getParent(), node.getJNode());
newSubgraph.addNode(newNode);
-
+
// Add all incoming edges.
for (int i = 0; i < graph.getInEdges(node).size(); ++i) {
CfgEdge edge = new CfgEdge();
@@ -104,7 +104,7 @@
newSubgraph.addGraphOutEdge(edge);
if (e.getRole() != null
- && ((e.getRole().equals(CfgConditionalNode.ELSE) && conditionValue) ||
+ && ((e.getRole().equals(CfgConditionalNode.ELSE) && conditionValue) ||
(e.getRole().equals(CfgConditionalNode.THEN) && !conditionValue))) {
// Do not connect this edge due to constant condition.
} else {
@@ -117,7 +117,7 @@
@Override
public String toString() {
- return "ConstantConditionTransformation(node=" + node +
+ return "ConstantConditionTransformation(node=" + node +
", conditionValue=" + conditionValue + ")";
}
}
\ No newline at end of file
diff --git a/dev/core/src/com/google/gwt/dev/js/JsSourceGenerationVisitorWithSizeBreakdown.java b/dev/core/src/com/google/gwt/dev/js/JsSourceGenerationVisitorWithSizeBreakdown.java
index 96b9ec0..2289283 100644
--- a/dev/core/src/com/google/gwt/dev/js/JsSourceGenerationVisitorWithSizeBreakdown.java
+++ b/dev/core/src/com/google/gwt/dev/js/JsSourceGenerationVisitorWithSizeBreakdown.java
@@ -1,12 +1,12 @@
/*
* Copyright 2009 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -21,8 +21,8 @@
import com.google.gwt.dev.jjs.ast.JDeclaredType;
import com.google.gwt.dev.jjs.ast.JField;
import com.google.gwt.dev.jjs.ast.JMethod;
-import com.google.gwt.dev.jjs.impl.codesplitter.FragmentExtractor;
import com.google.gwt.dev.jjs.impl.JavaToJavaScriptMap;
+import com.google.gwt.dev.jjs.impl.codesplitter.FragmentExtractor;
import com.google.gwt.dev.js.ast.JsBlock;
import com.google.gwt.dev.js.ast.JsContext;
import com.google.gwt.dev.js.ast.JsName;
diff --git a/dev/core/src/com/google/gwt/dev/js/JsToStringGenerationVisitor.java b/dev/core/src/com/google/gwt/dev/js/JsToStringGenerationVisitor.java
index fb153d0..6eb3caa 100644
--- a/dev/core/src/com/google/gwt/dev/js/JsToStringGenerationVisitor.java
+++ b/dev/core/src/com/google/gwt/dev/js/JsToStringGenerationVisitor.java
@@ -856,7 +856,8 @@
return false;
}
- // CHECKSTYLE_NAMING_OFF
+// CHECKSTYLE_NAMING_OFF
+
protected void _newline() {
p.newline();
}
@@ -1266,7 +1267,7 @@
p.print(CHARS_WHILE);
}
- // CHECKSTYLE_NAMING_ON
+// CHECKSTYLE_NAMING_ON
private void indent() {
p.indentIn();
diff --git a/dev/core/src/com/google/gwt/dev/shell/JavaObject.java b/dev/core/src/com/google/gwt/dev/shell/JavaObject.java
index 553d5cd..19a31f9 100644
--- a/dev/core/src/com/google/gwt/dev/shell/JavaObject.java
+++ b/dev/core/src/com/google/gwt/dev/shell/JavaObject.java
@@ -1,12 +1,12 @@
/*
* Copyright 2009 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -18,8 +18,8 @@
import com.google.gwt.dev.shell.BrowserChannel.InvokeOnServerMessage;
import com.google.gwt.dev.shell.BrowserChannel.JavaObjectRef;
import com.google.gwt.dev.shell.BrowserChannel.ReturnMessage;
-import com.google.gwt.dev.shell.BrowserChannel.Value;
import com.google.gwt.dev.shell.BrowserChannel.SessionHandler.ExceptionOrReturnValue;
+import com.google.gwt.dev.shell.BrowserChannel.Value;
import net.sourceforge.htmlunit.corejs.javascript.Context;
import net.sourceforge.htmlunit.corejs.javascript.Function;
@@ -108,7 +108,7 @@
/**
* Called when the JavaObject is invoked as a function. We ignore the
* thisObj argument, which is usually the window object.
- *
+ *
* Returns a JS array, with the first element being a boolean indicating
* that an exception occured, and the second element is either the return
* value or the exception which was thrown. In this case, we always return
diff --git a/dev/core/src/com/google/gwt/dev/shell/ServerMethods.java b/dev/core/src/com/google/gwt/dev/shell/ServerMethods.java
index 9d71953..af2d1a5 100644
--- a/dev/core/src/com/google/gwt/dev/shell/ServerMethods.java
+++ b/dev/core/src/com/google/gwt/dev/shell/ServerMethods.java
@@ -1,12 +1,12 @@
/*
* Copyright 2009 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -18,8 +18,8 @@
import com.google.gwt.dev.shell.BrowserChannel.FreeMessage;
import com.google.gwt.dev.shell.BrowserChannel.InvokeSpecialMessage;
import com.google.gwt.dev.shell.BrowserChannel.ReturnMessage;
-import com.google.gwt.dev.shell.BrowserChannel.Value;
import com.google.gwt.dev.shell.BrowserChannel.SessionHandler.SpecialDispatchId;
+import com.google.gwt.dev.shell.BrowserChannel.Value;
import com.google.gwt.dev.shell.BrowserChannelClient.SessionHandlerClient;
import java.io.IOException;
@@ -31,7 +31,7 @@
/**
* Tell the server that the client no longer has any references to the
* specified Java object.
- *
+ *
* @param ids IDs of objects to free
* @return false if an error occurred
*/
@@ -50,7 +50,7 @@
/**
* Get the value of a property on an object.
- *
+ *
* @param objectRef ID of object to fetch field on
* @param dispatchId dispatch ID of field
* @return the value of the property, undef if none (or on error)
@@ -80,10 +80,10 @@
}
return new Value();
}
-
+
/**
* Set the value of a property on an object.
- *
+ *
* @param objectRef ID of object to fetch field on
* @param dispatchId dispatch ID of field
* @param value value to store in the property
diff --git a/dev/core/src/com/google/gwt/dev/shell/remoteui/DevModeServiceRequestProcessor.java b/dev/core/src/com/google/gwt/dev/shell/remoteui/DevModeServiceRequestProcessor.java
index 12e0270..4ebed01 100644
--- a/dev/core/src/com/google/gwt/dev/shell/remoteui/DevModeServiceRequestProcessor.java
+++ b/dev/core/src/com/google/gwt/dev/shell/remoteui/DevModeServiceRequestProcessor.java
@@ -1,12 +1,12 @@
/*
* Copyright 2009 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -16,16 +16,16 @@
package com.google.gwt.dev.shell.remoteui;
import com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request;
-import com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response;
import com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest;
import com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.RequestType;
+import com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response;
import com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse;
import com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange;
/**
* A request processor that handles DevModeService requests. There should only
* be one instance of this class for a given {@link RemoteUI} instance.
- *
+ *
* TODO: We currently reference protobuf classes directly. We're going to be
* re-basing the protobuf API, and we don't want to expose these rebased classes
* directly to users of this API. We need to provide a level of indirection
diff --git a/dev/core/src/com/google/gwt/dev/shell/remoteui/ViewerServiceClient.java b/dev/core/src/com/google/gwt/dev/shell/remoteui/ViewerServiceClient.java
index e7973c3..52140a5 100644
--- a/dev/core/src/com/google/gwt/dev/shell/remoteui/ViewerServiceClient.java
+++ b/dev/core/src/com/google/gwt/dev/shell/remoteui/ViewerServiceClient.java
@@ -1,12 +1,12 @@
/*
* Copyright 2009 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -21,10 +21,10 @@
import com.google.gwt.dev.protobuf.ByteString;
import com.google.gwt.dev.shell.remoteui.MessageTransport.RequestException;
import com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request;
-import com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response;
import com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest;
import com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData;
import com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.RequestType;
+import com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response;
import com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse;
import com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange.Capability;
import com.google.gwt.dev.util.Callback;
@@ -36,7 +36,7 @@
/**
* Used for making requests to a remote ViewerService server.
- *
+ *
* TODO: If this becomes part of the public API, we'll need to provide a level
* of indirection in front of the protobuf classes; We're going to be rebasing
* the protobuf library, and we don't want to expose the rebased API as public.
@@ -48,7 +48,7 @@
/**
* Create a new instance.
- *
+ *
* @param processor A MessageProcessor that is used to communicate with the
* ViewerService server.
*/
@@ -60,7 +60,7 @@
/**
* Add an entry that also serves as a log branch.
- *
+ *
* @param indexInParent The index of this entry/branch within the parent
* logger
* @param type The severity of the log message.
@@ -106,7 +106,7 @@
/**
* Add a log entry.
- *
+ *
* @param indexInParent The index of this entry within the parent logger
* @param type The severity of the log message.
* @param msg The message.
@@ -149,7 +149,7 @@
* Add a new Module logger. This method should not be called multiple times
* with the exact same arguments (as there should only be one logger
* associated with that set of arguments).
- *
+ *
* @param remoteSocket name of remote socket endpoint in host:port format
* @param url URL of top-level window
* @param tabKey stable browser tab identifier, or the empty string if no such
@@ -194,7 +194,7 @@
* Check the capabilities of the ViewerService. Ensures that the ViewerService
* supports: adding a log, adding a log branch, adding a log entry, and
* disconnecting a log.
- *
+ *
* TODO: Should we be checking the specific capability of the
* ViewerService to support logs of type MAIN, SERVER, and MODULE? Right now,
* we assume that if they can support the addition of logs, they can handle
@@ -230,9 +230,9 @@
/**
* Disconnect the log. Indicate to the log that the process which was logging
* messages to it is now dead, and no more messages will be logged to it.
- *
+ *
* Note that the log handle should refer to a top-level log, not a branch log.
- *
+ *
* @param logHandle the handle of the top-level log to disconnect
*/
public void disconnectLog(int logHandle) {
@@ -327,10 +327,10 @@
/**
* Waits for response and throws a checked exception if the request failed.
- *
+ *
* Requests can fail if the other side does not understand the message -- for
* example, if it is running an older version.
- *
+ *
* @throws RequestException if the request failed
*/
private Response waitForResponse(Future<Response> future)
diff --git a/dev/core/src/com/google/gwt/dev/shell/rewrite/HostedModeClassRewriter.java b/dev/core/src/com/google/gwt/dev/shell/rewrite/HostedModeClassRewriter.java
index 233f2e3..7d1843b 100644
--- a/dev/core/src/com/google/gwt/dev/shell/rewrite/HostedModeClassRewriter.java
+++ b/dev/core/src/com/google/gwt/dev/shell/rewrite/HostedModeClassRewriter.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -20,8 +20,8 @@
import com.google.gwt.dev.asm.ClassVisitor;
import com.google.gwt.dev.asm.ClassWriter;
import com.google.gwt.dev.asm.Opcodes;
-import com.google.gwt.dev.javac.asmbridge.EmptyVisitor;
import com.google.gwt.dev.asm.commons.Method;
+import com.google.gwt.dev.javac.asmbridge.EmptyVisitor;
import com.google.gwt.dev.shell.JsValueGlue;
import com.google.gwt.dev.util.log.speedtracer.DevModeEventType;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
@@ -54,7 +54,7 @@
* <li>JavaScriptObject$ implements all the interface types and is the only
* instantiable type.</li>
* </ol>
- *
+ *
* @see RewriteJsniMethods
* @see RewriteRefsToJsoClasses
* @see WriteJsoInterface
@@ -79,7 +79,7 @@
* JSO subtype), find the class in which that method was originally
* declared. Methods declared on Object will return "java/lang/Object".
* Static methods will always return <code>declaredClass</code>.
- *
+ *
* @param declaredClass a descriptor of the static type of the qualifier
* @param signature the binary signature of the method
* @return the descriptor of the class in which that method was declared,
@@ -162,7 +162,7 @@
/**
* Creates a new {@link HostedModeClassRewriter} for a specified set of
* subclasses of JavaScriptObject.
- *
+ *
* @param jsoSubtypes a set of binary type names representing JavaScriptObject
* and all of its subtypes of
* @param mapper maps methods to the class in which they are declared
@@ -212,7 +212,7 @@
/**
* Performs rewriting transformations on a class.
- *
+ *
* @param typeOracle a typeOracle modeling the user classes
* @param className the name of the class
* @param classBytes the bytes of the class
@@ -233,7 +233,7 @@
// v = new CheckClassAdapter(v);
// v = new TraceClassVisitor(v, new PrintWriter(System.out));
v = new UseMirroredClasses(v, className);
-
+
v = new RewriteSingleJsoImplDispatches(v, typeOracle, jsoData);
v = new RewriteRefsToJsoClasses(v, jsoIntfDescs, mapper);
diff --git a/dev/core/src/com/google/gwt/util/tools/Utility.java b/dev/core/src/com/google/gwt/util/tools/Utility.java
index 586fe87..09aaccb 100644
--- a/dev/core/src/com/google/gwt/util/tools/Utility.java
+++ b/dev/core/src/com/google/gwt/util/tools/Utility.java
@@ -34,8 +34,8 @@
import java.net.URL;
import java.util.Iterator;
import java.util.Map;
-import java.util.Set;
import java.util.Map.Entry;
+import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
diff --git a/dev/core/test/com/google/gwt/core/ext/linker/ArtifactSetTest.java b/dev/core/test/com/google/gwt/core/ext/linker/ArtifactSetTest.java
index 0121abf..b7db647 100644
--- a/dev/core/test/com/google/gwt/core/ext/linker/ArtifactSetTest.java
+++ b/dev/core/test/com/google/gwt/core/ext/linker/ArtifactSetTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -63,7 +63,6 @@
assertSame(fooScript, found.first());
assertSame(barScript, found.last());
}
-
}
public void testStyleOrder() {
@@ -104,6 +103,5 @@
assertSame(fooStyle, found.first());
assertSame(barStyle, found.last());
}
-
}
}
diff --git a/dev/core/test/com/google/gwt/core/ext/util/UtilSuite.java b/dev/core/test/com/google/gwt/core/ext/util/UtilSuite.java
index 93c0bb7..b6a8c74 100644
--- a/dev/core/test/com/google/gwt/core/ext/util/UtilSuite.java
+++ b/dev/core/test/com/google/gwt/core/ext/util/UtilSuite.java
@@ -1,12 +1,12 @@
/*
* Copyright 2009 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -18,6 +18,9 @@
import junit.framework.Test;
import junit.framework.TestSuite;
+/**
+ * Test suite for {@link Util}
+ */
public class UtilSuite {
public static Test suite() {
TestSuite suite = new TestSuite("Test suite for Util");
diff --git a/dev/core/test/com/google/gwt/core/linker/SoycReportLinkerTest.java b/dev/core/test/com/google/gwt/core/linker/SoycReportLinkerTest.java
index 74ee60e..0e10531 100644
--- a/dev/core/test/com/google/gwt/core/linker/SoycReportLinkerTest.java
+++ b/dev/core/test/com/google/gwt/core/linker/SoycReportLinkerTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2010 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/dev/core/test/com/google/gwt/dev/DevelModeTabKeyTest.java b/dev/core/test/com/google/gwt/dev/DevelModeTabKeyTest.java
index 0971e47..554c7d2 100644
--- a/dev/core/test/com/google/gwt/dev/DevelModeTabKeyTest.java
+++ b/dev/core/test/com/google/gwt/dev/DevelModeTabKeyTest.java
@@ -1,12 +1,12 @@
-/**
+/*
* Copyright 2009 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -21,7 +21,7 @@
* Tests for DevelModeTabKey.
*/
public class DevelModeTabKeyTest extends TestCase {
-
+
public void testConstructor() {
DevelModeTabKey key = new DevelModeTabKey("ua1",
"http://example.org/foo.html", "tabkey1", "host:9999");
@@ -32,7 +32,7 @@
key = new DevelModeTabKey("ua1",
"http://example.org/foo.html?param=value#hash", "tabkey1", "host:9999");
assertEquals("http://example.org/foo.html", key.getUrl());
-
+
// check acceptance/rejection of nulls
try {
key = new DevelModeTabKey(null,
@@ -53,14 +53,14 @@
} catch (IllegalArgumentException expected) {
}
}
-
+
public void testEquals() {
DevelModeTabKey key1 = new DevelModeTabKey("ua1",
"http://example.org/foo.html", "tabkey1", "host:9999");
DevelModeTabKey key2 = new DevelModeTabKey("ua1",
"http://example.org/foo.html", "tabkey1", "host:9999");
assertEquals(key1, key2);
-
+
// query parameters and the history token don't matter
key2 = new DevelModeTabKey("ua1",
"http://example.org/foo.html?param=value#hash", "tabkey1", "host:9999");
diff --git a/dev/core/test/com/google/gwt/dev/HostedModeTest.java b/dev/core/test/com/google/gwt/dev/HostedModeTest.java
index edb55af..9e1f01b 100644
--- a/dev/core/test/com/google/gwt/dev/HostedModeTest.java
+++ b/dev/core/test/com/google/gwt/dev/HostedModeTest.java
@@ -30,7 +30,7 @@
*/
public class HostedModeTest extends ArgProcessorTestBase {
- public static class MySCL extends ServletContainerLauncher {
+ static class MySCL extends ServletContainerLauncher {
@Override
public ServletContainer start(TreeLogger logger, int port, File appRootDir)
throws BindException, Exception {
diff --git a/dev/core/test/com/google/gwt/dev/SessionModuleTest.java b/dev/core/test/com/google/gwt/dev/SessionModuleTest.java
index 2fecb61..aa70e90 100644
--- a/dev/core/test/com/google/gwt/dev/SessionModuleTest.java
+++ b/dev/core/test/com/google/gwt/dev/SessionModuleTest.java
@@ -1,12 +1,12 @@
-/**
+/*
* Copyright 2009 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -21,7 +21,7 @@
* Tests for SessionModule.
*/
public class SessionModuleTest extends TestCase {
-
+
public static final Disconnectable mockDisc1 = new Disconnectable() {
@Override
public void disconnect() {
@@ -32,7 +32,7 @@
return false;
}
};
-
+
public static final Disconnectable mockDisc2 = new Disconnectable() {
@Override
public void disconnect() {
@@ -43,7 +43,7 @@
return false;
}
};
-
+
public void testInstanceCache() {
String sessionKey1 = "session1";
String moduleName1 = "module1";
diff --git a/dev/core/test/com/google/gwt/dev/SwingTreeLoggerTestApp.java b/dev/core/test/com/google/gwt/dev/SwingTreeLoggerTestApp.java
index 60b30d6..2bf1e38 100644
--- a/dev/core/test/com/google/gwt/dev/SwingTreeLoggerTestApp.java
+++ b/dev/core/test/com/google/gwt/dev/SwingTreeLoggerTestApp.java
@@ -1,5 +1,17 @@
-/**
- *
+/*
+ * Copyright 2009 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
*/
package com.google.gwt.dev;
diff --git a/dev/core/test/com/google/gwt/dev/cfg/MockModuleDef.java b/dev/core/test/com/google/gwt/dev/cfg/MockModuleDef.java
index ab3a170..7f1395c 100644
--- a/dev/core/test/com/google/gwt/dev/cfg/MockModuleDef.java
+++ b/dev/core/test/com/google/gwt/dev/cfg/MockModuleDef.java
@@ -1,12 +1,12 @@
/*
* Copyright 2007 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -23,6 +23,9 @@
import java.io.ByteArrayInputStream;
import java.io.InputStream;
+/**
+ * Mock for {@link ModuleDef}.
+ */
public class MockModuleDef extends ModuleDef {
private Resource publicResource = new Resource() {
diff --git a/dev/core/test/com/google/gwt/dev/cfg/ModuleDefTest.java b/dev/core/test/com/google/gwt/dev/cfg/ModuleDefTest.java
index 9827bd4..c52b394 100644
--- a/dev/core/test/com/google/gwt/dev/cfg/ModuleDefTest.java
+++ b/dev/core/test/com/google/gwt/dev/cfg/ModuleDefTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2009 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -21,8 +21,8 @@
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.core.ext.linker.ArtifactSet;
import com.google.gwt.core.ext.linker.LinkerOrder;
-import com.google.gwt.core.ext.linker.Shardable;
import com.google.gwt.core.ext.linker.LinkerOrder.Order;
+import com.google.gwt.core.ext.linker.Shardable;
import junit.framework.TestCase;
@@ -244,15 +244,15 @@
assertFalse(ModuleDef.isValidModuleName("com..Foo"));
assertFalse(ModuleDef.isValidModuleName("com.7.Foo"));
assertFalse(ModuleDef.isValidModuleName("com.7foo.Foo"));
-
+
assertTrue(ModuleDef.isValidModuleName("com.foo.Foo"));
assertTrue(ModuleDef.isValidModuleName("com.$foo.Foo"));
assertTrue(ModuleDef.isValidModuleName("com._foo.Foo"));
assertTrue(ModuleDef.isValidModuleName("com.foo7.Foo"));
-
- // For legacy reasons, allow the last part of the name is not
- // required to be a valid ident. In the past, naming rules
- // were enforced for top level modules, but not nested modules.
+
+ // For legacy reasons, allow the last part of the name is not
+ // required to be a valid ident. In the past, naming rules
+ // were enforced for top level modules, but not nested modules.
assertTrue(ModuleDef.isValidModuleName("com.foo.F-oo"));
assertTrue(ModuleDef.isValidModuleName("com.foo.7Foo"));
assertTrue(ModuleDef.isValidModuleName("com.foo.+Foo"));
diff --git a/dev/core/test/com/google/gwt/dev/cfg/testdata/merging/client/InOne.java b/dev/core/test/com/google/gwt/dev/cfg/testdata/merging/client/InOne.java
index 1ad2fde..a24fa1e 100644
--- a/dev/core/test/com/google/gwt/dev/cfg/testdata/merging/client/InOne.java
+++ b/dev/core/test/com/google/gwt/dev/cfg/testdata/merging/client/InOne.java
@@ -1,5 +1,23 @@
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package com.google.gwt.dev.cfg.testdata.merging.client;
+/**
+ * Test class for module loading.
+ */
public class InOne {
// test class
}
diff --git a/dev/core/test/com/google/gwt/dev/cfg/testdata/merging/client/InTwo.java b/dev/core/test/com/google/gwt/dev/cfg/testdata/merging/client/InTwo.java
index 64ae942..8110f88 100644
--- a/dev/core/test/com/google/gwt/dev/cfg/testdata/merging/client/InTwo.java
+++ b/dev/core/test/com/google/gwt/dev/cfg/testdata/merging/client/InTwo.java
@@ -1,5 +1,23 @@
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package com.google.gwt.dev.cfg.testdata.merging.client;
+/**
+ * Test class for module loading.
+ */
public class InTwo {
// test class
}
diff --git a/dev/core/test/com/google/gwt/dev/cfg/testdata/merging/client/Shared.java b/dev/core/test/com/google/gwt/dev/cfg/testdata/merging/client/Shared.java
index 790baf4..54835b9 100644
--- a/dev/core/test/com/google/gwt/dev/cfg/testdata/merging/client/Shared.java
+++ b/dev/core/test/com/google/gwt/dev/cfg/testdata/merging/client/Shared.java
@@ -1,5 +1,23 @@
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package com.google.gwt.dev.cfg.testdata.merging.client;
+/**
+ * Test class for module loading.
+ */
public class Shared {
// test class
}
diff --git a/dev/core/test/com/google/gwt/dev/cfg/testdata/merging/client/Toxic.java b/dev/core/test/com/google/gwt/dev/cfg/testdata/merging/client/Toxic.java
index 10a0aa2..0d42453 100644
--- a/dev/core/test/com/google/gwt/dev/cfg/testdata/merging/client/Toxic.java
+++ b/dev/core/test/com/google/gwt/dev/cfg/testdata/merging/client/Toxic.java
@@ -1,5 +1,23 @@
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package com.google.gwt.dev.cfg.testdata.merging.client;
+/**
+ * Test class for module loading.
+ */
public class Toxic {
// test class
}
diff --git a/dev/core/test/com/google/gwt/dev/cfg/testdata/merging/public/Public.java b/dev/core/test/com/google/gwt/dev/cfg/testdata/merging/public/Public.java
index a51298f..12a61a9 100644
--- a/dev/core/test/com/google/gwt/dev/cfg/testdata/merging/public/Public.java
+++ b/dev/core/test/com/google/gwt/dev/cfg/testdata/merging/public/Public.java
@@ -1,4 +1,21 @@
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
/**
* Just a placeholder for public directory resource detection assertions.
*/
-public class Public {}
+public class Public {
+}
diff --git a/dev/core/test/com/google/gwt/dev/cfg/testdata/merging/resources/NotAResource.java b/dev/core/test/com/google/gwt/dev/cfg/testdata/merging/resources/NotAResource.java
index 49ec1d4..bd238f6 100644
--- a/dev/core/test/com/google/gwt/dev/cfg/testdata/merging/resources/NotAResource.java
+++ b/dev/core/test/com/google/gwt/dev/cfg/testdata/merging/resources/NotAResource.java
@@ -1,5 +1,23 @@
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package com.google.gwt.dev.cfg.testdata.merging.resources;
+/**
+ * Test class for module loading.
+ */
public class NotAResource {
// test class
}
diff --git a/dev/core/test/com/google/gwt/dev/cfg/testdata/naming/client/Mock.java b/dev/core/test/com/google/gwt/dev/cfg/testdata/naming/client/Mock.java
index 9bbfe12..719251e 100644
--- a/dev/core/test/com/google/gwt/dev/cfg/testdata/naming/client/Mock.java
+++ b/dev/core/test/com/google/gwt/dev/cfg/testdata/naming/client/Mock.java
@@ -1,4 +1,22 @@
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package com.google.gwt.dev.cfg.testdata.naming.client;
+/**
+ * Test class for module loading.
+ */
public class Mock {
}
diff --git a/dev/core/test/com/google/gwt/dev/cfg/testdata/separate/filesetone/client/FileSetOne.java b/dev/core/test/com/google/gwt/dev/cfg/testdata/separate/filesetone/client/FileSetOne.java
index 2689092..2fa0289 100644
--- a/dev/core/test/com/google/gwt/dev/cfg/testdata/separate/filesetone/client/FileSetOne.java
+++ b/dev/core/test/com/google/gwt/dev/cfg/testdata/separate/filesetone/client/FileSetOne.java
@@ -1,5 +1,23 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package com.google.gwt.dev.cfg.testdata.separate.filesetone.client;
+/**
+ * Test class for module loading.
+ */
public class FileSetOne {
// For testing.
}
diff --git a/dev/core/test/com/google/gwt/dev/cfg/testdata/separate/libraryone/client/LibraryOne.java b/dev/core/test/com/google/gwt/dev/cfg/testdata/separate/libraryone/client/LibraryOne.java
index 2e17b86..775a541 100644
--- a/dev/core/test/com/google/gwt/dev/cfg/testdata/separate/libraryone/client/LibraryOne.java
+++ b/dev/core/test/com/google/gwt/dev/cfg/testdata/separate/libraryone/client/LibraryOne.java
@@ -1,5 +1,23 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package com.google.gwt.dev.cfg.testdata.separate.libraryone.client;
+/**
+ * Test class for module loading.
+ */
public class LibraryOne {
// For testing.
}
diff --git a/dev/core/test/com/google/gwt/dev/cfg/testdata/separate/librarytwo/client/LibraryTwo.java b/dev/core/test/com/google/gwt/dev/cfg/testdata/separate/librarytwo/client/LibraryTwo.java
index d16a2d6..dc57a8d 100644
--- a/dev/core/test/com/google/gwt/dev/cfg/testdata/separate/librarytwo/client/LibraryTwo.java
+++ b/dev/core/test/com/google/gwt/dev/cfg/testdata/separate/librarytwo/client/LibraryTwo.java
@@ -1,5 +1,23 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package com.google.gwt.dev.cfg.testdata.separate.librarytwo.client;
+/**
+ * Test class for module loading.
+ */
public class LibraryTwo {
// For testing.
}
diff --git a/dev/core/test/com/google/gwt/dev/javac/ArtificialRescueCheckerTest.java b/dev/core/test/com/google/gwt/dev/javac/ArtificialRescueCheckerTest.java
index 7ad8712..7018865 100644
--- a/dev/core/test/com/google/gwt/dev/javac/ArtificialRescueCheckerTest.java
+++ b/dev/core/test/com/google/gwt/dev/javac/ArtificialRescueCheckerTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2009 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -18,7 +18,7 @@
import com.google.gwt.core.client.impl.ArtificialRescue;
/**
- * Tests for the ArtificialRescueChecker.
+ * Tests for {@link ArtificialRescueChecker}.
*/
public class ArtificialRescueCheckerTest extends CheckerTestCase {
diff --git a/dev/core/test/com/google/gwt/dev/javac/CompilationStateTest.java b/dev/core/test/com/google/gwt/dev/javac/CompilationStateTest.java
index 5db7394..b54ca8d 100644
--- a/dev/core/test/com/google/gwt/dev/javac/CompilationStateTest.java
+++ b/dev/core/test/com/google/gwt/dev/javac/CompilationStateTest.java
@@ -180,7 +180,6 @@
JavaResourceBase.FOO,
new TweakedMockJavaResource(JavaResourceBase.BAR)},
Collections.singleton(JavaResourceBase.FOO.getTypeName()));
-
}
public void testInitialization() {
diff --git a/dev/core/test/com/google/gwt/dev/javac/CompilationUnitArchiveTest.java b/dev/core/test/com/google/gwt/dev/javac/CompilationUnitArchiveTest.java
index 2f7a054..23a43e1 100644
--- a/dev/core/test/com/google/gwt/dev/javac/CompilationUnitArchiveTest.java
+++ b/dev/core/test/com/google/gwt/dev/javac/CompilationUnitArchiveTest.java
@@ -24,6 +24,9 @@
import java.util.Collections;
import java.util.List;
+/**
+ * Tests for {@link CompilationUnitArchive}.
+ */
public class CompilationUnitArchiveTest extends CompilationStateTestBase {
public void testReadWrite() throws IOException, ClassNotFoundException {
diff --git a/dev/core/test/com/google/gwt/dev/javac/CompilationUnitInvalidatorTest.java b/dev/core/test/com/google/gwt/dev/javac/CompilationUnitInvalidatorTest.java
index e344590..b01ec86 100644
--- a/dev/core/test/com/google/gwt/dev/javac/CompilationUnitInvalidatorTest.java
+++ b/dev/core/test/com/google/gwt/dev/javac/CompilationUnitInvalidatorTest.java
@@ -27,6 +27,9 @@
import java.util.List;
import java.util.Map;
+/**
+ * Tests for {@link CompilationUnitInvalidator}.
+ */
public class CompilationUnitInvalidatorTest extends TestCase {
public void testRetainValidUnits() {
@@ -115,4 +118,4 @@
}
};
}
-}
\ No newline at end of file
+}
diff --git a/dev/core/test/com/google/gwt/dev/javac/CompilationUnitTypeOracleUpdaterFromSourceTest.java b/dev/core/test/com/google/gwt/dev/javac/CompilationUnitTypeOracleUpdaterFromSourceTest.java
index 8ba7355..a6a8e72 100644
--- a/dev/core/test/com/google/gwt/dev/javac/CompilationUnitTypeOracleUpdaterFromSourceTest.java
+++ b/dev/core/test/com/google/gwt/dev/javac/CompilationUnitTypeOracleUpdaterFromSourceTest.java
@@ -1,10 +1,26 @@
-
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package com.google.gwt.dev.javac;
import com.google.gwt.core.ext.typeinfo.JClassType;
-import com.google.gwt.core.ext.typeinfo.TypeOracle;
import com.google.gwt.core.ext.typeinfo.TypeOracleException;
+/**
+ * Tests for {@link TypeOracleUpdater} when provided sources.
+ */
public class CompilationUnitTypeOracleUpdaterFromSourceTest extends TypeOracleUpdaterTestBase {
protected CheckedJavaResource CU_HasSyntaxErrors = new CheckedJavaResource(
diff --git a/dev/core/test/com/google/gwt/dev/javac/CompiledClassTest.java b/dev/core/test/com/google/gwt/dev/javac/CompiledClassTest.java
index be9de32..4482ec1 100644
--- a/dev/core/test/com/google/gwt/dev/javac/CompiledClassTest.java
+++ b/dev/core/test/com/google/gwt/dev/javac/CompiledClassTest.java
@@ -22,6 +22,9 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+/**
+ * Test for {@link CompiledClass}.
+ */
public class CompiledClassTest extends TestCase {
static byte[] dummyByteCode = {
(byte) 0xDE, (byte) 0xAD, (byte)0xBE, (byte)0xEF
@@ -36,7 +39,7 @@
CompiledClass readObject = Util.readStreamAsObject(inputStream, CompiledClass.class);
assertEquals(4, readObject.getBytes().length);
byte[] readBytes = readObject.getBytes();
- for (int i = 0; i < 4 ; ++i) {
+ for (int i = 0; i < 4; ++i) {
assertEquals(dummyByteCode[i], readBytes[i]);
}
}
diff --git a/dev/core/test/com/google/gwt/dev/javac/GeneratedClassnameTest.java b/dev/core/test/com/google/gwt/dev/javac/GeneratedClassnameTest.java
index 3a70b0a..e147f4d 100644
--- a/dev/core/test/com/google/gwt/dev/javac/GeneratedClassnameTest.java
+++ b/dev/core/test/com/google/gwt/dev/javac/GeneratedClassnameTest.java
@@ -1,7 +1,24 @@
+/*
+ * Copyright 2009 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package com.google.gwt.dev.javac;
import junit.framework.TestCase;
-
+/**
+ * Tests for {@link CompilationUnit#isClassNameGenerated}.
+ */
public class GeneratedClassnameTest extends TestCase {
/**
diff --git a/dev/core/test/com/google/gwt/dev/javac/Java7JdtCompilerTest.java b/dev/core/test/com/google/gwt/dev/javac/Java7JdtCompilerTest.java
index bcf297b..67cf994 100644
--- a/dev/core/test/com/google/gwt/dev/javac/Java7JdtCompilerTest.java
+++ b/dev/core/test/com/google/gwt/dev/javac/Java7JdtCompilerTest.java
@@ -16,11 +16,8 @@
package com.google.gwt.dev.javac;
import com.google.gwt.dev.javac.testing.impl.Java7MockResources;
-import com.google.gwt.dev.javac.testing.impl.JavaResourceBase;
-import com.google.gwt.dev.javac.testing.impl.MockJavaResource;
import com.google.gwt.dev.util.arg.SourceLevel;
-import java.util.List;
/**
* Test class for language features introduced in Java 7.
diff --git a/dev/core/test/com/google/gwt/dev/javac/MockCompiledClass.java b/dev/core/test/com/google/gwt/dev/javac/MockCompiledClass.java
index 6c7ed5f..979358a 100644
--- a/dev/core/test/com/google/gwt/dev/javac/MockCompiledClass.java
+++ b/dev/core/test/com/google/gwt/dev/javac/MockCompiledClass.java
@@ -1,7 +1,20 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package com.google.gwt.dev.javac;
-import com.google.gwt.dev.cfg.LibraryGroupTest;
-
/**
* Used by {@link LibraryGroupTest} and {@link MockCompilationUnit}.
*/
@@ -15,4 +28,4 @@
public byte[] getBytes() {
return new byte[0];
}
-}
\ No newline at end of file
+}
diff --git a/dev/core/test/com/google/gwt/dev/javac/TypeOracleUpdaterTestBase.java b/dev/core/test/com/google/gwt/dev/javac/TypeOracleUpdaterTestBase.java
index c3bb93e..d09df97 100644
--- a/dev/core/test/com/google/gwt/dev/javac/TypeOracleUpdaterTestBase.java
+++ b/dev/core/test/com/google/gwt/dev/javac/TypeOracleUpdaterTestBase.java
@@ -87,6 +87,9 @@
*/
public abstract class TypeOracleUpdaterTestBase extends TestCase {
+ /**
+ * A Java resource that provides a check() method.
+ */
protected static abstract class CheckedJavaResource extends MutableJavaResource {
private final String[] shortTypeNames;
@@ -114,6 +117,9 @@
}
}
+ /**
+ * A mutable Java resource.
+ */
protected static abstract class MutableJavaResource extends MockJavaResource {
private static byte[] getByteCode(Class<?> aClass) {
String resourcePath = aClass.getName().replace(".", "/") + ".class";
@@ -358,7 +364,6 @@
private void checkNested(JClassType type) {
assertEquals(getTypeName() + ".Nested", type.getQualifiedSourceName());
-
}
};
diff --git a/dev/core/test/com/google/gwt/dev/javac/asm/CollectClassDataTest.java b/dev/core/test/com/google/gwt/dev/javac/asm/CollectClassDataTest.java
index 7b42da1..fc3892f 100644
--- a/dev/core/test/com/google/gwt/dev/javac/asm/CollectClassDataTest.java
+++ b/dev/core/test/com/google/gwt/dev/javac/asm/CollectClassDataTest.java
@@ -33,7 +33,10 @@
*/
public class CollectClassDataTest extends AsmTestCase {
- public static class LongDoubleArgs {
+ /**
+ * Test class used in {@link CollectClassData#testLongDoubleArgs}.
+ */
+ static class LongDoubleArgs {
@SuppressWarnings("unused")
public LongDoubleArgs(int x, long y, double z, Object o) {
@@ -44,6 +47,9 @@
}
}
+ /**
+ * Test class used in {@link CollectClassData#testOne}.
+ */
public static class One extends EmptyVisitor {
@Override
@@ -58,15 +64,24 @@
}
}
+ /**
+ * Test class used in {@link CollectClassData#testPseudoInner}.
+ */
protected static class Pseudo$Inner {
- public static class Deepest {
+ static class Deepest {
}
}
+ /**
+ * Test class used in {@link CollectClassData#testTwo}.
+ */
@PrimitiveValuesAnnotation(b = 42, i = 42)
protected static class Two {
+ /**
+ * Test class used in {@link CollectClassData#testTwoInner}.
+ */
public class TwoInner {
}
diff --git a/dev/core/test/com/google/gwt/dev/javac/asm/CollectReferencesVisitorTest.java b/dev/core/test/com/google/gwt/dev/javac/asm/CollectReferencesVisitorTest.java
index 42bb6f8..5c8c519 100644
--- a/dev/core/test/com/google/gwt/dev/javac/asm/CollectReferencesVisitorTest.java
+++ b/dev/core/test/com/google/gwt/dev/javac/asm/CollectReferencesVisitorTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2009 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,8 +15,8 @@
*/
package com.google.gwt.dev.javac.asm;
-import com.google.gwt.dev.javac.typemodel.test.TestAnnotation;
import com.google.gwt.dev.asm.ClassReader;
+import com.google.gwt.dev.javac.typemodel.test.TestAnnotation;
import com.google.gwt.dev.util.Name.BinaryName;
import java.util.Map;
diff --git a/dev/core/test/com/google/gwt/dev/javac/asm/ResolveGenericsTest.java b/dev/core/test/com/google/gwt/dev/javac/asm/ResolveGenericsTest.java
index 1d31059..bf23b08 100644
--- a/dev/core/test/com/google/gwt/dev/javac/asm/ResolveGenericsTest.java
+++ b/dev/core/test/com/google/gwt/dev/javac/asm/ResolveGenericsTest.java
@@ -49,6 +49,9 @@
*/
public class ResolveGenericsTest extends AsmTestCase {
+ /**
+ * A logger that fails the tests if an error is logged.
+ */
public static class FailErrorTreeLogger extends TreeLogger {
@Override
public TreeLogger branch(com.google.gwt.core.ext.TreeLogger.Type type,
diff --git a/dev/core/test/com/google/gwt/dev/javac/asm/TestHandler.java b/dev/core/test/com/google/gwt/dev/javac/asm/TestHandler.java
index bf8527a..6e2f119 100644
--- a/dev/core/test/com/google/gwt/dev/javac/asm/TestHandler.java
+++ b/dev/core/test/com/google/gwt/dev/javac/asm/TestHandler.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,5 +15,8 @@
*/
package com.google.gwt.dev.javac.asm;
+/**
+ * An interface used in {@link ResolveGenericsTest}.
+ */
public interface TestHandler {
}
diff --git a/dev/core/test/com/google/gwt/dev/javac/asm/TestHandler1.java b/dev/core/test/com/google/gwt/dev/javac/asm/TestHandler1.java
index 4aa7b1e..5ddad03 100644
--- a/dev/core/test/com/google/gwt/dev/javac/asm/TestHandler1.java
+++ b/dev/core/test/com/google/gwt/dev/javac/asm/TestHandler1.java
@@ -1,12 +1,12 @@
/*
* Copyright 2009 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -17,8 +17,6 @@
/**
* Test class for generic signature validation.
- *
- * @param <V>
*/
public class TestHandler1<V> implements TestHandler {
}
diff --git a/dev/core/test/com/google/gwt/dev/javac/asm/TestOuter0.java b/dev/core/test/com/google/gwt/dev/javac/asm/TestOuter0.java
index ef11363..f871093 100644
--- a/dev/core/test/com/google/gwt/dev/javac/asm/TestOuter0.java
+++ b/dev/core/test/com/google/gwt/dev/javac/asm/TestOuter0.java
@@ -1,12 +1,12 @@
/*
* Copyright 2009 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,7 +15,13 @@
*/
package com.google.gwt.dev.javac.asm;
+/**
+ * A class used in {@link ResolveGenericsTest}.
+ */
public abstract class TestOuter0<H extends TestHandler> {
+ /**
+ * A class used in {@link ResolveGenericsTest}.
+ */
public static class Type<H> {
public Type() {
}
diff --git a/dev/core/test/com/google/gwt/dev/javac/asm/TestOuter1.java b/dev/core/test/com/google/gwt/dev/javac/asm/TestOuter1.java
index 93f4fb0..f5b4623 100644
--- a/dev/core/test/com/google/gwt/dev/javac/asm/TestOuter1.java
+++ b/dev/core/test/com/google/gwt/dev/javac/asm/TestOuter1.java
@@ -1,12 +1,12 @@
/*
* Copyright 2009 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,6 +15,9 @@
*/
package com.google.gwt.dev.javac.asm;
+/**
+ * A class used in {@link ResolveGenericsTest}.
+ */
public class TestOuter1<V> extends TestOuter0<TestHandler1<V>> {
@Override
diff --git a/dev/core/test/com/google/gwt/dev/javac/asm/TestOuter2.java b/dev/core/test/com/google/gwt/dev/javac/asm/TestOuter2.java
index 35f2440..8bbdc27 100644
--- a/dev/core/test/com/google/gwt/dev/javac/asm/TestOuter2.java
+++ b/dev/core/test/com/google/gwt/dev/javac/asm/TestOuter2.java
@@ -1,12 +1,12 @@
/*
* Copyright 2009 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,6 +15,9 @@
*/
package com.google.gwt.dev.javac.asm;
+/**
+ * A class used in {@link ResolveGenericsTest}.
+ */
public class TestOuter2 extends TestOuter1<String> {
@Override
diff --git a/dev/core/test/com/google/gwt/dev/javac/mediatortest/AfterAssimilate.java b/dev/core/test/com/google/gwt/dev/javac/mediatortest/AfterAssimilate.java
index c10a0cf..18b5539 100644
--- a/dev/core/test/com/google/gwt/dev/javac/mediatortest/AfterAssimilate.java
+++ b/dev/core/test/com/google/gwt/dev/javac/mediatortest/AfterAssimilate.java
@@ -1,8 +1,25 @@
-/**
- * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
*/
package com.google.gwt.dev.javac.mediatortest;
+/**
+ * A class that will be added after {@link BeforeAssimilate} is already assimilated.<p>
+ *
+ * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
+ */
public class AfterAssimilate extends BeforeAssimilate {
}
diff --git a/dev/core/test/com/google/gwt/dev/javac/mediatortest/BaseInterface.java b/dev/core/test/com/google/gwt/dev/javac/mediatortest/BaseInterface.java
index 610ab7f..55474d0 100644
--- a/dev/core/test/com/google/gwt/dev/javac/mediatortest/BaseInterface.java
+++ b/dev/core/test/com/google/gwt/dev/javac/mediatortest/BaseInterface.java
@@ -1,7 +1,25 @@
-/**
- * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
- * */
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
package com.google.gwt.dev.javac.mediatortest;
+/**
+ * A base interface.<p>
+ *
+ * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
+ */
public interface BaseInterface {
}
diff --git a/dev/core/test/com/google/gwt/dev/javac/mediatortest/BeforeAssimilate.java b/dev/core/test/com/google/gwt/dev/javac/mediatortest/BeforeAssimilate.java
index b4aa82b..3118d3e 100644
--- a/dev/core/test/com/google/gwt/dev/javac/mediatortest/BeforeAssimilate.java
+++ b/dev/core/test/com/google/gwt/dev/javac/mediatortest/BeforeAssimilate.java
@@ -1,8 +1,25 @@
-/**
- * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
*/
package com.google.gwt.dev.javac.mediatortest;
+/**
+ * A class to test assimilation in stages.<p>
+ *
+ * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
+ */
public class BeforeAssimilate {
}
diff --git a/dev/core/test/com/google/gwt/dev/javac/mediatortest/BindToTypeScope.java b/dev/core/test/com/google/gwt/dev/javac/mediatortest/BindToTypeScope.java
index ad4164b..7a2330c 100644
--- a/dev/core/test/com/google/gwt/dev/javac/mediatortest/BindToTypeScope.java
+++ b/dev/core/test/com/google/gwt/dev/javac/mediatortest/BindToTypeScope.java
@@ -1,10 +1,34 @@
-/**
- * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
*/
+
package com.google.gwt.dev.javac.mediatortest;
+/**
+ * A class to test loading of nested classes.<p>
+ *
+ * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
+ */
public class BindToTypeScope {
+ /**
+ * A simple nested class.
+ */
public static class Object { }
// Fails when loaded from bytecode
+ /**
+ * A nested class that extends another nested class from the same scope.
+ */
public static class DerivedObject extends Object { }
}
diff --git a/dev/core/test/com/google/gwt/dev/javac/mediatortest/CircularA.java b/dev/core/test/com/google/gwt/dev/javac/mediatortest/CircularA.java
index 94f0ff4..3c51a7b 100644
--- a/dev/core/test/com/google/gwt/dev/javac/mediatortest/CircularA.java
+++ b/dev/core/test/com/google/gwt/dev/javac/mediatortest/CircularA.java
@@ -1,9 +1,26 @@
-/**
- * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
*/
package com.google.gwt.dev.javac.mediatortest;
+/**
+ * A class part of a use cycle..<p>
+ *
+ * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
+ */
public class CircularA {
public CircularB circularB;
}
diff --git a/dev/core/test/com/google/gwt/dev/javac/mediatortest/CircularB.java b/dev/core/test/com/google/gwt/dev/javac/mediatortest/CircularB.java
index 92a8af7..c71d61e 100644
--- a/dev/core/test/com/google/gwt/dev/javac/mediatortest/CircularB.java
+++ b/dev/core/test/com/google/gwt/dev/javac/mediatortest/CircularB.java
@@ -1,9 +1,26 @@
-/**
- * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
*/
package com.google.gwt.dev.javac.mediatortest;
+/**
+ * A class part of a use cycle.<p>
+ *
+ * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
+ */
public class CircularB {
public CircularA circularA;
}
diff --git a/dev/core/test/com/google/gwt/dev/javac/mediatortest/ConstrainedList.java b/dev/core/test/com/google/gwt/dev/javac/mediatortest/ConstrainedList.java
index e81c2b0..825330d 100644
--- a/dev/core/test/com/google/gwt/dev/javac/mediatortest/ConstrainedList.java
+++ b/dev/core/test/com/google/gwt/dev/javac/mediatortest/ConstrainedList.java
@@ -1,7 +1,25 @@
-/**
- * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
*/
+
package com.google.gwt.dev.javac.mediatortest;
+/**
+ * A parametrzed class with an upper bound constrain.<p>
+ *
+ * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
+ */
public interface ConstrainedList <E extends Throwable> {
}
diff --git a/dev/core/test/com/google/gwt/dev/javac/mediatortest/ConstrainedListAsField.java b/dev/core/test/com/google/gwt/dev/javac/mediatortest/ConstrainedListAsField.java
index 4689077..4117359 100644
--- a/dev/core/test/com/google/gwt/dev/javac/mediatortest/ConstrainedListAsField.java
+++ b/dev/core/test/com/google/gwt/dev/javac/mediatortest/ConstrainedListAsField.java
@@ -1,8 +1,26 @@
-/**
- * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
*/
+
package com.google.gwt.dev.javac.mediatortest;
+/**
+ * A class containing a generic type parametrized by an unbounded wildcard as a field.<p>
+ *
+ * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
+ */
public class ConstrainedListAsField {
private ConstrainedList<?> field;
}
diff --git a/dev/core/test/com/google/gwt/dev/javac/mediatortest/DeclaresGenericInnerInterface.java b/dev/core/test/com/google/gwt/dev/javac/mediatortest/DeclaresGenericInnerInterface.java
index a3c1be5..f938d1b 100644
--- a/dev/core/test/com/google/gwt/dev/javac/mediatortest/DeclaresGenericInnerInterface.java
+++ b/dev/core/test/com/google/gwt/dev/javac/mediatortest/DeclaresGenericInnerInterface.java
@@ -1,13 +1,28 @@
-/**
- * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
*/
package com.google.gwt.dev.javac.mediatortest;
/**
- * Test of a parameterized interface declared inside another interface.
+ * A paramtrized class that declares a parametrized inner interface.<p>
*
- * @param <T>
+ * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}.
*/
public class DeclaresGenericInnerInterface<T> {
- public interface Inner<T> {}
+ /**
+ * A generic inner interface
+ */
+ public interface Inner<T> { }
}
diff --git a/dev/core/test/com/google/gwt/dev/javac/mediatortest/DeclaresGenericInnerType.java b/dev/core/test/com/google/gwt/dev/javac/mediatortest/DeclaresGenericInnerType.java
index daae4a5..7cc72f1 100644
--- a/dev/core/test/com/google/gwt/dev/javac/mediatortest/DeclaresGenericInnerType.java
+++ b/dev/core/test/com/google/gwt/dev/javac/mediatortest/DeclaresGenericInnerType.java
@@ -1,13 +1,28 @@
-/**
- * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
*/
package com.google.gwt.dev.javac.mediatortest;
/**
- * Test of a parameterized class declared inside another class.
+ * A parametrized class that declares a parametrized inner interface.<p>
*
- * @param <T> Some type
+ * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
*/
public class DeclaresGenericInnerType<T> {
- public interface Inner<T> {}
+ /**
+ * A generic inner class.
+ */
+ public interface Inner<T> { }
}
diff --git a/dev/core/test/com/google/gwt/dev/javac/mediatortest/DefaultClass.java b/dev/core/test/com/google/gwt/dev/javac/mediatortest/DefaultClass.java
index c6fa2a8..8cd33a7 100644
--- a/dev/core/test/com/google/gwt/dev/javac/mediatortest/DefaultClass.java
+++ b/dev/core/test/com/google/gwt/dev/javac/mediatortest/DefaultClass.java
@@ -1,11 +1,24 @@
-/**
- * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
*/
package com.google.gwt.dev.javac.mediatortest;
/**
- * A plain class that extends {@link java.lang.Object}.
+ * A regular class.<p>
*
+ * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}.
*/
public class DefaultClass extends Object {
}
diff --git a/dev/core/test/com/google/gwt/dev/javac/mediatortest/Derived.java b/dev/core/test/com/google/gwt/dev/javac/mediatortest/Derived.java
index 0c50e3e..fdd7ae7 100644
--- a/dev/core/test/com/google/gwt/dev/javac/mediatortest/Derived.java
+++ b/dev/core/test/com/google/gwt/dev/javac/mediatortest/Derived.java
@@ -1,9 +1,29 @@
-/**
- * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
*/
package com.google.gwt.dev.javac.mediatortest;
+/**
+ * A class that extends and inner interface.<p>
+ *
+ * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}.
+ */
public class Derived extends Outer.Inner {
+ /**
+ * A nested inner class extending the same inner class as its parent.
+ */
public static class Nested extends Outer.Inner implements DerivedInterface { }
}
diff --git a/dev/core/test/com/google/gwt/dev/javac/mediatortest/DerivedInterface.java b/dev/core/test/com/google/gwt/dev/javac/mediatortest/DerivedInterface.java
index be83c36..73b38c5 100644
--- a/dev/core/test/com/google/gwt/dev/javac/mediatortest/DerivedInterface.java
+++ b/dev/core/test/com/google/gwt/dev/javac/mediatortest/DerivedInterface.java
@@ -1,7 +1,24 @@
-/**
- * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
*/
package com.google.gwt.dev.javac.mediatortest;
+/**
+ * A derived interface.<p>
+ *
+ * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}.
+ */
public interface DerivedInterface extends BaseInterface {
}
diff --git a/dev/core/test/com/google/gwt/dev/javac/mediatortest/Enclosing.java b/dev/core/test/com/google/gwt/dev/javac/mediatortest/Enclosing.java
index 8ced463..bfaa091 100644
--- a/dev/core/test/com/google/gwt/dev/javac/mediatortest/Enclosing.java
+++ b/dev/core/test/com/google/gwt/dev/javac/mediatortest/Enclosing.java
@@ -1,8 +1,25 @@
-/**
- * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
*/
package com.google.gwt.dev.javac.mediatortest;
+/**
+ * A class that encloses an anonymous inner class. <p>
+ *
+ * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
+ */
public class Enclosing {
public static Object getLocal() {
return new Object() { };
diff --git a/dev/core/test/com/google/gwt/dev/javac/mediatortest/EnclosingLocal.java b/dev/core/test/com/google/gwt/dev/javac/mediatortest/EnclosingLocal.java
index ecd7074..f870533 100644
--- a/dev/core/test/com/google/gwt/dev/javac/mediatortest/EnclosingLocal.java
+++ b/dev/core/test/com/google/gwt/dev/javac/mediatortest/EnclosingLocal.java
@@ -1,10 +1,30 @@
-/**
- * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
*/
package com.google.gwt.dev.javac.mediatortest;
+/**
+ * A class that encloses an inner class declared in a method. <p>
+ *
+ * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}.
+ */
public class EnclosingLocal {
public static Object getLocal() {
+ /**
+ * Class defined inside a method.
+ */
class MyObject { }
return new MyObject();
}
diff --git a/dev/core/test/com/google/gwt/dev/javac/mediatortest/EnclosingLocalWithMember.java b/dev/core/test/com/google/gwt/dev/javac/mediatortest/EnclosingLocalWithMember.java
index 9a4da37..53c8fd5 100644
--- a/dev/core/test/com/google/gwt/dev/javac/mediatortest/EnclosingLocalWithMember.java
+++ b/dev/core/test/com/google/gwt/dev/javac/mediatortest/EnclosingLocalWithMember.java
@@ -1,11 +1,31 @@
-/**
- * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
*/
package com.google.gwt.dev.javac.mediatortest;
+/**
+ * A class that declares an inner class in a method that has some member. <p>
+ *
+ * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}.
+ */
public class EnclosingLocalWithMember {
public int foo;
public Object getLocal() {
+ /**
+ * Class defined in a method.
+ */
class MyObject {
int getFoo() {
return foo;
diff --git a/dev/core/test/com/google/gwt/dev/javac/mediatortest/ExtendsGenericList.java b/dev/core/test/com/google/gwt/dev/javac/mediatortest/ExtendsGenericList.java
index feb914d..d239b41 100644
--- a/dev/core/test/com/google/gwt/dev/javac/mediatortest/ExtendsGenericList.java
+++ b/dev/core/test/com/google/gwt/dev/javac/mediatortest/ExtendsGenericList.java
@@ -1,7 +1,24 @@
-/**
- * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
*/
package com.google.gwt.dev.javac.mediatortest;
+/**
+ * A class that extends a generic class. <p>
+ *
+ * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
+ */
public class ExtendsGenericList extends GenericList<Object> {
}
diff --git a/dev/core/test/com/google/gwt/dev/javac/mediatortest/ExtendsGenericOuter.java b/dev/core/test/com/google/gwt/dev/javac/mediatortest/ExtendsGenericOuter.java
index 5908f50..5bfdb86 100644
--- a/dev/core/test/com/google/gwt/dev/javac/mediatortest/ExtendsGenericOuter.java
+++ b/dev/core/test/com/google/gwt/dev/javac/mediatortest/ExtendsGenericOuter.java
@@ -1,9 +1,29 @@
-/**
- * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
*/
package com.google.gwt.dev.javac.mediatortest;
+/**
+ * A class that extends a generic class that has an inner class that is also extended.<p>
+ *
+ * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
+ */
public class ExtendsGenericOuter extends GenericOuter<String> {
- public class ExtendsInner extends Inner {
- }
+ /**
+ * Class that extends an inner interface of GenericOuter<String>.
+ */
+ public class ExtendsInner extends Inner {
+ }
}
diff --git a/dev/core/test/com/google/gwt/dev/javac/mediatortest/ExtendsParameterizedInterface.java b/dev/core/test/com/google/gwt/dev/javac/mediatortest/ExtendsParameterizedInterface.java
index d2bdd65..2929211 100644
--- a/dev/core/test/com/google/gwt/dev/javac/mediatortest/ExtendsParameterizedInterface.java
+++ b/dev/core/test/com/google/gwt/dev/javac/mediatortest/ExtendsParameterizedInterface.java
@@ -1,7 +1,24 @@
-/**
- * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
*/
package com.google.gwt.dev.javac.mediatortest;
+/**
+ * A class the extends a generic class that declares an inner interface. <p>
+ *
+ * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
+ */
public class ExtendsParameterizedInterface extends DeclaresGenericInnerInterface<Object> {
}
diff --git a/dev/core/test/com/google/gwt/dev/javac/mediatortest/Fields.java b/dev/core/test/com/google/gwt/dev/javac/mediatortest/Fields.java
index a1aac4c..495d491 100644
--- a/dev/core/test/com/google/gwt/dev/javac/mediatortest/Fields.java
+++ b/dev/core/test/com/google/gwt/dev/javac/mediatortest/Fields.java
@@ -1,8 +1,25 @@
-/**
- * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
*/
package com.google.gwt.dev.javac.mediatortest;
+/**
+ * A class that contains fields of various types. <p>
+ *
+ * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}.
+ */
public class Fields {
private int privateInt;
private DefaultClass privateSomeType;
diff --git a/dev/core/test/com/google/gwt/dev/javac/mediatortest/GenericList.java b/dev/core/test/com/google/gwt/dev/javac/mediatortest/GenericList.java
index 06f14dc..cd5bf30 100644
--- a/dev/core/test/com/google/gwt/dev/javac/mediatortest/GenericList.java
+++ b/dev/core/test/com/google/gwt/dev/javac/mediatortest/GenericList.java
@@ -1,8 +1,25 @@
-/**
- * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
*/
package com.google.gwt.dev.javac.mediatortest;
+/**
+ * A generic class. <p>
+ *
+ * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}.
+ */
public class GenericList<T> {
public static final int CONSTANT = 0;
}
diff --git a/dev/core/test/com/google/gwt/dev/javac/mediatortest/GenericOuter.java b/dev/core/test/com/google/gwt/dev/javac/mediatortest/GenericOuter.java
index ebf5625..e5ab9cf 100644
--- a/dev/core/test/com/google/gwt/dev/javac/mediatortest/GenericOuter.java
+++ b/dev/core/test/com/google/gwt/dev/javac/mediatortest/GenericOuter.java
@@ -1,12 +1,32 @@
-/**
- * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
*/
package com.google.gwt.dev.javac.mediatortest;
import java.util.List;
+/**
+ * A generic class that declares an inner class with a fields using the generic type. <p>
+ *
+ * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}.
+ */
public class GenericOuter<V> {
- public class Inner {
+ /**
+ * An inner class.
+ */
+ public class Inner {
private V field;
private List<V> list;
}
diff --git a/dev/core/test/com/google/gwt/dev/javac/mediatortest/Implementations.java b/dev/core/test/com/google/gwt/dev/javac/mediatortest/Implementations.java
index 74f91c7..8b02d87 100644
--- a/dev/core/test/com/google/gwt/dev/javac/mediatortest/Implementations.java
+++ b/dev/core/test/com/google/gwt/dev/javac/mediatortest/Implementations.java
@@ -1,9 +1,32 @@
-/**
- * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
*/
package com.google.gwt.dev.javac.mediatortest;
+/**
+ * A class containing static inner classes that implement outer and inner interfaces. <p>
+ *
+ * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}.
+ */
public class Implementations {
- public static class OuterImpl<K,V> implements OuterInt<K,V> {}
- public static class InnerImpl<V> implements OuterInt.InnerInt<V> {}
+ /**
+ * Class that implements a top level interface.
+ */
+ public static class OuterImpl<K,V> implements OuterInt<K,V> { }
+ /**
+ * Class that implements an inner interface.
+ */
+ public static class InnerImpl<V> implements OuterInt.InnerInt<V> { }
}
diff --git a/dev/core/test/com/google/gwt/dev/javac/mediatortest/ListAsField.java b/dev/core/test/com/google/gwt/dev/javac/mediatortest/ListAsField.java
index afa6dc6..bb5577d 100644
--- a/dev/core/test/com/google/gwt/dev/javac/mediatortest/ListAsField.java
+++ b/dev/core/test/com/google/gwt/dev/javac/mediatortest/ListAsField.java
@@ -1,10 +1,27 @@
-/**
- * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
*/
package com.google.gwt.dev.javac.mediatortest;
import java.util.List;
+/**
+ * A class that contains a field of a generic class. <p>
+ *
+ * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}.
+ */
public class ListAsField {
private List<Object> field;
}
diff --git a/dev/core/test/com/google/gwt/dev/javac/mediatortest/Methods.java b/dev/core/test/com/google/gwt/dev/javac/mediatortest/Methods.java
index 056f5f4..cd7647c 100644
--- a/dev/core/test/com/google/gwt/dev/javac/mediatortest/Methods.java
+++ b/dev/core/test/com/google/gwt/dev/javac/mediatortest/Methods.java
@@ -1,8 +1,25 @@
-/**
- * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
*/
package com.google.gwt.dev.javac.mediatortest;
+/**
+ * A class with various methods. <p>
+ *
+ * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}.
+ */
public class Methods {
private int returnsInt() { return 0; };
private Object returnsSomeType() { return null; }
diff --git a/dev/core/test/com/google/gwt/dev/javac/mediatortest/Outer.java b/dev/core/test/com/google/gwt/dev/javac/mediatortest/Outer.java
index 2979e76..69fd937 100644
--- a/dev/core/test/com/google/gwt/dev/javac/mediatortest/Outer.java
+++ b/dev/core/test/com/google/gwt/dev/javac/mediatortest/Outer.java
@@ -1,8 +1,28 @@
-/**
- * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
*/
package com.google.gwt.dev.javac.mediatortest;
+/**
+ * A class with a static inner class. <p>
+ *
+ * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}.
+ */
public class Outer {
+ /**
+ * A static inner class.
+ */
public static class Inner { };
}
diff --git a/dev/core/test/com/google/gwt/dev/javac/mediatortest/OuterInt.java b/dev/core/test/com/google/gwt/dev/javac/mediatortest/OuterInt.java
index 666bfef..3b41d63 100644
--- a/dev/core/test/com/google/gwt/dev/javac/mediatortest/OuterInt.java
+++ b/dev/core/test/com/google/gwt/dev/javac/mediatortest/OuterInt.java
@@ -1,8 +1,28 @@
-/**
- * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
*/
package com.google.gwt.dev.javac.mediatortest;
+/**
+ * A parametrized interface with a parametrized inner interface. <p>
+ *
+ * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}.
+ */
public interface OuterInt<K,V> {
+ /**
+ * A parameterized inner interface.
+ */
public interface InnerInt<V> { }
}
diff --git a/dev/core/test/com/google/gwt/dev/javac/mediatortest/ReferencesGenericListConstant.java b/dev/core/test/com/google/gwt/dev/javac/mediatortest/ReferencesGenericListConstant.java
index e1af9dd..9c3073a 100644
--- a/dev/core/test/com/google/gwt/dev/javac/mediatortest/ReferencesGenericListConstant.java
+++ b/dev/core/test/com/google/gwt/dev/javac/mediatortest/ReferencesGenericListConstant.java
@@ -1,8 +1,25 @@
-/**
- * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
*/
package com.google.gwt.dev.javac.mediatortest;
+/**
+ * Test class used in test for {@link TypeOracleUpdater}. <p>
+ *
+ * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}.
+ */
public class ReferencesGenericListConstant {
}
diff --git a/dev/core/test/com/google/gwt/dev/javac/mediatortest/ReferencesParameterizedTypeBeforeItsGenericFormHasBeenProcessed.java b/dev/core/test/com/google/gwt/dev/javac/mediatortest/ReferencesParameterizedTypeBeforeItsGenericFormHasBeenProcessed.java
index 9dd03e2..291133f 100644
--- a/dev/core/test/com/google/gwt/dev/javac/mediatortest/ReferencesParameterizedTypeBeforeItsGenericFormHasBeenProcessed.java
+++ b/dev/core/test/com/google/gwt/dev/javac/mediatortest/ReferencesParameterizedTypeBeforeItsGenericFormHasBeenProcessed.java
@@ -1,8 +1,25 @@
-/**
- * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
*/
package com.google.gwt.dev.javac.mediatortest;
+/**
+ * Test class used in test for {@link TypeOracleUpdater}.<p>
+ *
+ * This code must be kept in sync with {@link com.google.gwt.dev.javac.TypeOracleUpdaterTestBase}.
+ */
public class ReferencesParameterizedTypeBeforeItsGenericFormHasBeenProcessed
implements ExtendsParameterizedInterface.Inner<Object> {
}
diff --git a/dev/core/test/com/google/gwt/dev/javac/typemodel/JArrayTypeTest.java b/dev/core/test/com/google/gwt/dev/javac/typemodel/JArrayTypeTest.java
index ab21a45..8a8af8c 100644
--- a/dev/core/test/com/google/gwt/dev/javac/typemodel/JArrayTypeTest.java
+++ b/dev/core/test/com/google/gwt/dev/javac/typemodel/JArrayTypeTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2007 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -165,7 +165,6 @@
// MyList[] is assignable to MyCustomList[]
assertFalse(getTestArrayType().isAssignableTo(testArraySubtype));
-
}
private JArrayType getTestArrayType() throws NotFoundException {
diff --git a/dev/core/test/com/google/gwt/dev/javac/typemodel/JRawTypeTest.java b/dev/core/test/com/google/gwt/dev/javac/typemodel/JRawTypeTest.java
index f90caf0..5fae2f8 100644
--- a/dev/core/test/com/google/gwt/dev/javac/typemodel/JRawTypeTest.java
+++ b/dev/core/test/com/google/gwt/dev/javac/typemodel/JRawTypeTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2007 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,8 +24,6 @@
import com.google.gwt.dev.javac.typemodel.test.MyList;
import com.google.gwt.dev.util.log.PrintWriterTreeLogger;
-import java.util.ArrayList;
-
/**
* Test for {@link JRawType}.
*/
diff --git a/dev/core/test/com/google/gwt/dev/javac/typemodel/TypeOracleSuite.java b/dev/core/test/com/google/gwt/dev/javac/typemodel/TypeOracleSuite.java
index cdd2f1b..a580f68 100644
--- a/dev/core/test/com/google/gwt/dev/javac/typemodel/TypeOracleSuite.java
+++ b/dev/core/test/com/google/gwt/dev/javac/typemodel/TypeOracleSuite.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -18,6 +18,9 @@
import junit.framework.Test;
import junit.framework.TestSuite;
+/**
+ * A suite testing {@link TypeOracle}.
+ */
public class TypeOracleSuite {
public static Test suite() {
TestSuite suite = new TestSuite("Test suite for TypeOracle");
diff --git a/dev/core/test/com/google/gwt/dev/javac/typemodel/test/AnnotatedAnnotation.java b/dev/core/test/com/google/gwt/dev/javac/typemodel/test/AnnotatedAnnotation.java
index eb52600..d597f46 100644
--- a/dev/core/test/com/google/gwt/dev/javac/typemodel/test/AnnotatedAnnotation.java
+++ b/dev/core/test/com/google/gwt/dev/javac/typemodel/test/AnnotatedAnnotation.java
@@ -1,12 +1,12 @@
/*
* Copyright 2007 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/dev/core/test/com/google/gwt/dev/javac/typemodel/test/AnnotatedClass.java b/dev/core/test/com/google/gwt/dev/javac/typemodel/test/AnnotatedClass.java
index 53a468b..41ac9fc 100644
--- a/dev/core/test/com/google/gwt/dev/javac/typemodel/test/AnnotatedClass.java
+++ b/dev/core/test/com/google/gwt/dev/javac/typemodel/test/AnnotatedClass.java
@@ -1,12 +1,12 @@
/*
* Copyright 2007 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/dev/core/test/com/google/gwt/dev/javac/typemodel/test/CA.java b/dev/core/test/com/google/gwt/dev/javac/typemodel/test/CA.java
index 104b96f..332334f 100644
--- a/dev/core/test/com/google/gwt/dev/javac/typemodel/test/CA.java
+++ b/dev/core/test/com/google/gwt/dev/javac/typemodel/test/CA.java
@@ -1,5 +1,23 @@
+/*
+ * Copyright 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package com.google.gwt.dev.javac.typemodel.test;
+/**
+ * Classes used for {@link TypeOracle} and related tests.
+ */
public abstract class CA implements IA {
public final void caNotOverridableFinal() {
diff --git a/dev/core/test/com/google/gwt/dev/javac/typemodel/test/CB.java b/dev/core/test/com/google/gwt/dev/javac/typemodel/test/CB.java
index 6a41f88..5375dfe 100644
--- a/dev/core/test/com/google/gwt/dev/javac/typemodel/test/CB.java
+++ b/dev/core/test/com/google/gwt/dev/javac/typemodel/test/CB.java
@@ -1,5 +1,23 @@
+/*
+ * Copyright 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package com.google.gwt.dev.javac.typemodel.test;
+/**
+ * Classes used for {@link TypeOracle} and related tests.
+ */
public abstract class CB extends CA implements IB {
@Override
diff --git a/dev/core/test/com/google/gwt/dev/javac/typemodel/test/CC.java b/dev/core/test/com/google/gwt/dev/javac/typemodel/test/CC.java
index 668a524..9e4e4cf 100644
--- a/dev/core/test/com/google/gwt/dev/javac/typemodel/test/CC.java
+++ b/dev/core/test/com/google/gwt/dev/javac/typemodel/test/CC.java
@@ -1,5 +1,22 @@
+/*
+ * Copyright 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package com.google.gwt.dev.javac.typemodel.test;
+/**
+ * Classes used for {@link TypeOracle} and related tests.
+ */
public abstract class CC extends CB implements IC {
-
}
diff --git a/dev/core/test/com/google/gwt/dev/javac/typemodel/test/ClassAnnotatedWithBinaryOnlyAnnotation.java b/dev/core/test/com/google/gwt/dev/javac/typemodel/test/ClassAnnotatedWithBinaryOnlyAnnotation.java
index ca49bdc..376c811 100644
--- a/dev/core/test/com/google/gwt/dev/javac/typemodel/test/ClassAnnotatedWithBinaryOnlyAnnotation.java
+++ b/dev/core/test/com/google/gwt/dev/javac/typemodel/test/ClassAnnotatedWithBinaryOnlyAnnotation.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/dev/core/test/com/google/gwt/dev/javac/typemodel/test/ClassLiteralReferenceAnnotation.java b/dev/core/test/com/google/gwt/dev/javac/typemodel/test/ClassLiteralReferenceAnnotation.java
index 989f241..93d9994 100644
--- a/dev/core/test/com/google/gwt/dev/javac/typemodel/test/ClassLiteralReferenceAnnotation.java
+++ b/dev/core/test/com/google/gwt/dev/javac/typemodel/test/ClassLiteralReferenceAnnotation.java
@@ -1,5 +1,17 @@
-/**
- *
+/*
+ * Copyright 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
*/
package com.google.gwt.dev.javac.typemodel.test;
diff --git a/dev/core/test/com/google/gwt/dev/javac/typemodel/test/GenericClass.java b/dev/core/test/com/google/gwt/dev/javac/typemodel/test/GenericClass.java
index 631a2ce..e7d1a09 100644
--- a/dev/core/test/com/google/gwt/dev/javac/typemodel/test/GenericClass.java
+++ b/dev/core/test/com/google/gwt/dev/javac/typemodel/test/GenericClass.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -21,21 +21,17 @@
import java.util.List;
/**
- * Generic class.
- *
- * @param <T>
- *
- * NOTE: It seems that the JDT 3.1 will not allow:
- * GenericClass<Integer> if the definition of GenericClass is as
- * follows: class GenericClass<T extends Serializable & Comparable<T>>
- * implements Comparable<T> { ... }
+ * Generic class. <p>
+ *
+ * NOTE: It seems that the JDT 3.1 will not allow:
+ * GenericClass<Integer> if the definition of GenericClass is as
+ * follows: class GenericClass<T extends Serializable & Comparable<T>>
+ * implements Comparable<T> { ... }
*/
public class GenericClass<T extends Serializable> implements Comparable<T>,
Serializable {
/**
* Non-static, generic inner class.
- *
- * @param <U>
*/
public class GenericInnerClass<U> {
T t2;
@@ -50,7 +46,13 @@
T t3;
}
+ /**
+ * A class with a inner class.
+ */
public class Foo {
+ /**
+ * An inner class.
+ */
public class Bar {
T t4;
}
@@ -117,4 +119,4 @@
public void setT(T t) throws Exception {
this.typeParameterField = t;
}
-}
\ No newline at end of file
+}
diff --git a/dev/core/test/com/google/gwt/dev/javac/typemodel/test/GenericClassWithDependentTypeBounds.java b/dev/core/test/com/google/gwt/dev/javac/typemodel/test/GenericClassWithDependentTypeBounds.java
index 4cdc8b0..7adb240 100644
--- a/dev/core/test/com/google/gwt/dev/javac/typemodel/test/GenericClassWithDependentTypeBounds.java
+++ b/dev/core/test/com/google/gwt/dev/javac/typemodel/test/GenericClassWithDependentTypeBounds.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -20,13 +20,11 @@
/**
* Tests a generic class that has type parameters that depend on each other.
* Also tests a generic method with type parameters that depend on each other.
- *
- * @param <C>
- * @param <M>
*/
-public class GenericClassWithDependentTypeBounds<C extends GenericClassWithTypeBound<M>, M extends Serializable> {
+public class GenericClassWithDependentTypeBounds<C
+ extends GenericClassWithTypeBound<M>, M extends Serializable> {
- public <Q extends GenericClassWithTypeBound<P>, P extends Serializable> void genericMethod(
- Q param) {
+ public <Q extends GenericClassWithTypeBound<P>, P extends Serializable>
+ void genericMethod(Q param) {
}
}
diff --git a/dev/core/test/com/google/gwt/dev/javac/typemodel/test/GenericClassWithTypeBound.java b/dev/core/test/com/google/gwt/dev/javac/typemodel/test/GenericClassWithTypeBound.java
index a7a592f..4deacd1 100644
--- a/dev/core/test/com/google/gwt/dev/javac/typemodel/test/GenericClassWithTypeBound.java
+++ b/dev/core/test/com/google/gwt/dev/javac/typemodel/test/GenericClassWithTypeBound.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -19,8 +19,6 @@
/**
* Auxillary test class used by {@link GenericClassWithDependentTypeBounds}.
- *
- * @param <M>
*/
public class GenericClassWithTypeBound<M extends Serializable> {
}
diff --git a/dev/core/test/com/google/gwt/dev/javac/typemodel/test/IA.java b/dev/core/test/com/google/gwt/dev/javac/typemodel/test/IA.java
index 18f76ce..72bb87e 100644
--- a/dev/core/test/com/google/gwt/dev/javac/typemodel/test/IA.java
+++ b/dev/core/test/com/google/gwt/dev/javac/typemodel/test/IA.java
@@ -1,5 +1,23 @@
+/*
+ * Copyright 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package com.google.gwt.dev.javac.typemodel.test;
+/**
+ * Classes used for {@link TypeOracle} and related tests.
+ */
public interface IA {
void foo();
diff --git a/dev/core/test/com/google/gwt/dev/javac/typemodel/test/IB.java b/dev/core/test/com/google/gwt/dev/javac/typemodel/test/IB.java
index 421dfa9..3ea90a5 100644
--- a/dev/core/test/com/google/gwt/dev/javac/typemodel/test/IB.java
+++ b/dev/core/test/com/google/gwt/dev/javac/typemodel/test/IB.java
@@ -1,5 +1,23 @@
+/*
+ * Copyright 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package com.google.gwt.dev.javac.typemodel.test;
+/**
+ * Classes used for {@link TypeOracle} and related tests.
+ */
public interface IB extends IA {
@Override
diff --git a/dev/core/test/com/google/gwt/dev/javac/typemodel/test/IC.java b/dev/core/test/com/google/gwt/dev/javac/typemodel/test/IC.java
index 4d5ba5e..2c6319c 100644
--- a/dev/core/test/com/google/gwt/dev/javac/typemodel/test/IC.java
+++ b/dev/core/test/com/google/gwt/dev/javac/typemodel/test/IC.java
@@ -1,5 +1,23 @@
+/*
+ * Copyright 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package com.google.gwt.dev.javac.typemodel.test;
+/**
+ * Classes used for {@link TypeOracle} and related tests.
+ */
public interface IC extends IB, IA {
@Override
diff --git a/dev/core/test/com/google/gwt/dev/javac/typemodel/test/MyArrayList.java b/dev/core/test/com/google/gwt/dev/javac/typemodel/test/MyArrayList.java
index 26a5756..3289d81 100644
--- a/dev/core/test/com/google/gwt/dev/javac/typemodel/test/MyArrayList.java
+++ b/dev/core/test/com/google/gwt/dev/javac/typemodel/test/MyArrayList.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package com.google.gwt.dev.javac.typemodel.test;
import java.util.ArrayList;
diff --git a/dev/core/test/com/google/gwt/dev/javac/typemodel/test/MyCustomList.java b/dev/core/test/com/google/gwt/dev/javac/typemodel/test/MyCustomList.java
index 77ceb3a..b56e753 100644
--- a/dev/core/test/com/google/gwt/dev/javac/typemodel/test/MyCustomList.java
+++ b/dev/core/test/com/google/gwt/dev/javac/typemodel/test/MyCustomList.java
@@ -1,12 +1,12 @@
/*
* Copyright 2007 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/ComputeExhaustiveCastabilityInformationTest.java b/dev/core/test/com/google/gwt/dev/jjs/impl/ComputeExhaustiveCastabilityInformationTest.java
index d614960..7a90e71 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/ComputeExhaustiveCastabilityInformationTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/ComputeExhaustiveCastabilityInformationTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package com.google.gwt.dev.jjs.impl;
import com.google.gwt.core.ext.UnableToCompleteException;
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/ControlFlowAnalyzerTest.java b/dev/core/test/com/google/gwt/dev/jjs/impl/ControlFlowAnalyzerTest.java
index 8488901..0fae9fa 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/ControlFlowAnalyzerTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/ControlFlowAnalyzerTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/FinalizerTest.java b/dev/core/test/com/google/gwt/dev/jjs/impl/FinalizerTest.java
index 394d42a..3228a79 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/FinalizerTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/FinalizerTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2010 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -19,8 +19,11 @@
import com.google.gwt.dev.jjs.ast.JMethod;
import com.google.gwt.dev.jjs.ast.JProgram;
+/**
+ * Test for {@link Finalizer}.
+ */
public class FinalizerTest extends OptimizerTestBase {
-
+
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -32,7 +35,7 @@
Result result = optimize("void", "");
assertFinal(result.findClass("EntryPoint$Foo"));
}
-
+
public void testFinalizeLocal() throws Exception {
optimize("void", "int i = 5;").into("final int i = 5;");
}
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/JJSTestBase.java b/dev/core/test/com/google/gwt/dev/jjs/impl/JJSTestBase.java
index 0095b76..8a18f9c 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/JJSTestBase.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/JJSTestBase.java
@@ -270,7 +270,10 @@
return new Result("void", codeSnippet, mainMethod.getBody().toSource());
}
- public final class Result {
+ /**
+ * Holds the result of a optimizations to compare with expected results.
+ */
+ protected final class Result {
private final String optimized;
private final String returnType;
private final String userCode;
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/OptimizerTestBase.java b/dev/core/test/com/google/gwt/dev/jjs/impl/OptimizerTestBase.java
index 3167b33..ac6ac76 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/OptimizerTestBase.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/OptimizerTestBase.java
@@ -49,6 +49,9 @@
public abstract class OptimizerTestBase extends JJSTestBase {
protected boolean runDeadCodeElimination = false;
+ /**
+ * Holds the result of optimization to compare agains expected results.
+ */
protected final class Result {
private final String returnType;
private final String originalCode;
@@ -93,23 +96,23 @@
String expectedSource =
OptimizerTestBase.findMethod(program, methodName).getBody().toSource();
String actualSource =
- OptimizerTestBase.findMethod(optimizedProgram, methodName).
- getBody().toSource();
+ OptimizerTestBase.findMethod(optimizedProgram, methodName)
+ .getBody().toSource();
assertEquals(originalCode, expectedSource, actualSource);
}
public void intoString(String... expected) {
String expectedSource = Joiner.on("\n").join(expected);
String actualSource =
- OptimizerTestBase.findMethod(optimizedProgram, methodName).
- getBody().toSource();
+ OptimizerTestBase.findMethod(optimizedProgram, methodName)
+ .getBody().toSource();
// Trim surrounding {} and unindent body once
assertTrue(actualSource.startsWith("{"));
assertTrue(actualSource.endsWith("}"));
actualSource = actualSource.substring(1, actualSource.length() - 2).trim();
- actualSource = Pattern.compile("^ ", Pattern.MULTILINE).
- matcher(actualSource).replaceAll("");
+ actualSource = Pattern.compile("^ ", Pattern.MULTILINE)
+ .matcher(actualSource).replaceAll("");
assertEquals(originalCode, expectedSource, actualSource);
}
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/PostOptimizationCompoundAssignmentNormalizerTest.java b/dev/core/test/com/google/gwt/dev/jjs/impl/PostOptimizationCompoundAssignmentNormalizerTest.java
index 8f8e77a..ad4ae0d 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/PostOptimizationCompoundAssignmentNormalizerTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/PostOptimizationCompoundAssignmentNormalizerTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ * \
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,7 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl;
-import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.dev.jjs.ast.JMethod;
import com.google.gwt.dev.jjs.ast.JProgram;
@@ -54,7 +53,7 @@
optimize("void", "float x=2; double d=3.0; x += d;").into(
"float x=2; double d=3.0; x += d;");
}
-
+
@Override
protected boolean optimizeMethod(JProgram program, JMethod method) {
PostOptimizationCompoundAssignmentNormalizer.exec(program);
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/PrunerTest.java b/dev/core/test/com/google/gwt/dev/jjs/impl/PrunerTest.java
index 4a392bd..e468fe9 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/PrunerTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/PrunerTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2010 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -19,6 +19,9 @@
import com.google.gwt.dev.jjs.ast.JProgram;
import com.google.gwt.dev.jjs.ast.js.JsniMethodBody;
+/**
+ * Test for {@link Pruner}.
+ */
public class PrunerTest extends OptimizerTestBase {
@Override
protected void setUp() throws Exception {
@@ -66,7 +69,7 @@
addSnippetClassDecl("interface UnusedInterface { void foo(); }");
Result result;
- (result = optimize("void",
+ (result = optimize("void",
"usedMethod();",
"unreadField = 1;", // should be pruned because it's not read.
"foo(unassignedField);",
@@ -89,7 +92,7 @@
"new EntryPoint$UsedClass();",
"new EntryPoint$UsedClass((EntryPoint.returnUninstantiatedClass(), EntryPoint.returnUninstantiatedClass()));"
);
-
+
assertNotNull(result.findMethod("usedMethod"));
// We do not assign to the field, but we use its default value.
// Shouldn't be pruned.
@@ -116,27 +119,27 @@
" return null;\n" +
"}",
result.findMethod("returnUninstantiatedClass").toSource());
-
+
assertEquals(
"static void methodWithUninstantiatedParam(){\n" +
"}",
result.findMethod("methodWithUninstantiatedParam").toSource());
assertEquals(
- "[final null nullField, int field2]",
- ((JsniMethodBody) result.findMethod("usedNativeMethod").getBody()).
- getJsniFieldRefs().toString());
+ "[final null nullField, int field2]",
+ ((JsniMethodBody) result.findMethod("usedNativeMethod").getBody())
+ .getJsniFieldRefs().toString());
assertEquals(
- "[public final null nullMethod(), public void method2()]",
- ((JsniMethodBody) result.findMethod("usedNativeMethod").getBody()).
- getJsniMethodRefs().toString());
+ "[public final null nullMethod(), public void method2()]",
+ ((JsniMethodBody) result.findMethod("usedNativeMethod").getBody())
+ .getJsniMethodRefs().toString());
assertEquals(
"interface EntryPoint$UsedInterface {\n" +
" private static final void $clinit(){\n" +
" }\n" +
"\n" +
- "}",
+ "}",
result.findClass("EntryPoint$UsedInterface").toSource());
}
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/RunAsyncNameTest.java b/dev/core/test/com/google/gwt/dev/jjs/impl/RunAsyncNameTest.java
index c637d91..fcbd38b 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/RunAsyncNameTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/RunAsyncNameTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2009 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/SameParameterValueOptimizerTest.java b/dev/core/test/com/google/gwt/dev/jjs/impl/SameParameterValueOptimizerTest.java
index 51aadb4..a94ef8d 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/SameParameterValueOptimizerTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/SameParameterValueOptimizerTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2009 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
// Copyright 2009 Google Inc. All Rights Reserved.
package com.google.gwt.dev.jjs.impl;
@@ -26,7 +41,7 @@
public void testNonConstParameter() throws Exception {
addSnippetClassDecl("static int foo(int i) { return i; }");
-
+
optimizeMethod("foo", "void", "foo(foo(1));").intoString(
"return i;");
}
@@ -114,7 +129,7 @@
" var foo = @test.EntryPoint::foo(Ljava/lang/String;)" +
"}-*/");
addSnippetClassDecl("static void foo(String s) { String p = s; }");
-
+
optimizeMethod(
"foo",
"void",
@@ -143,7 +158,7 @@
optimizeMethod("foo", "void", "new EntryPoint().foo(1);").intoString(
"int j = i;");
}
-
+
@Override
protected boolean optimizeMethod(JProgram program, JMethod method) {
MakeCallsStatic.exec(new JJSOptionsImpl(), program);
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/codesplitter/CodeSplitterTest.java b/dev/core/test/com/google/gwt/dev/jjs/impl/codesplitter/CodeSplitterTest.java
index fb5c57f..801ee02 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/codesplitter/CodeSplitterTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/codesplitter/CodeSplitterTest.java
@@ -95,7 +95,6 @@
new ConfigurationProperty[]{initialSequenceProp});
super.setUp();
jsProgram = new JsProgram();
-
}
public void testSimple() throws UnableToCompleteException {
@@ -105,7 +104,7 @@
code.append("import com.google.gwt.core.client.RunAsyncCallback;\n");
code.append("public class EntryPoint {\n");
code.append("static {");
- //code.append(" functionC();");
+ // code.append(" functionC();");
code.append("}");
code.append(functionA);
code.append(functionB);
@@ -347,8 +346,8 @@
// This is a non negative number always
assertEquals(0, CodeSplitters.getNumberOfExclusiveFragmentFromExpectedFragmentCount(2, 1));
-
}
+
public void testDontMergeLeftOvers() throws UnableToCompleteException {
StringBuffer code = new StringBuffer();
code.append("package test;\n");
@@ -494,7 +493,7 @@
private static String createRunAsync(String cast, String body) {
StringBuffer code = new StringBuffer();
- code.append("GWT.runAsync(" + cast + "new "+ "RunAsyncCallback() {\n");
+ code.append("GWT.runAsync(" + cast + "new " + "RunAsyncCallback() {\n");
code.append(" public void onFailure(Throwable reason) {}\n");
code.append(" public void onSuccess() {\n");
code.append(" " + body);
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/codesplitter/FragmentExtractorTest.java b/dev/core/test/com/google/gwt/dev/jjs/impl/codesplitter/FragmentExtractorTest.java
index 263a905..b18b7c0 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/codesplitter/FragmentExtractorTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/codesplitter/FragmentExtractorTest.java
@@ -48,7 +48,7 @@
private static class MockSourceInfo implements SourceInfo {
@Override
- public void addCorrelation(Correlation c) {}
+ public void addCorrelation(Correlation c) { }
@Override
public Correlation getCorrelation(Axis axis) {
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/codesplitter/FragmentPartitioningResultTest.java b/dev/core/test/com/google/gwt/dev/jjs/impl/codesplitter/FragmentPartitioningResultTest.java
index 502afed..67c2b32 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/codesplitter/FragmentPartitioningResultTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/codesplitter/FragmentPartitioningResultTest.java
@@ -35,7 +35,7 @@
@Override
public void setUp() {
// Create some runAsyncs.
- for (int i=1; i <= NUM_RUNASYNCS; i++) {
+ for (int i = 1; i <= NUM_RUNASYNCS; i++) {
runAsyncs[i] = new JRunAsync(SourceOrigin.UNKNOWN, i, "runAsync" + i, false,
JNullLiteral.INSTANCE, JNullLiteral.INSTANCE);
}
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/codesplitter/ReplaceRunAsyncsErrorMessagesTest.java b/dev/core/test/com/google/gwt/dev/jjs/impl/codesplitter/ReplaceRunAsyncsErrorMessagesTest.java
index 9f375fa..3bd7f05 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/codesplitter/ReplaceRunAsyncsErrorMessagesTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/codesplitter/ReplaceRunAsyncsErrorMessagesTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -21,7 +21,6 @@
import com.google.gwt.dev.javac.testing.impl.MockJavaResource;
import com.google.gwt.dev.jjs.ast.JProgram;
import com.google.gwt.dev.jjs.impl.JJSTestBase;
-import com.google.gwt.dev.jjs.impl.codesplitter.ReplaceRunAsyncs;
import com.google.gwt.dev.util.UnitTestTreeLogger;
/**
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/CfgAnalysisTestBase.java b/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/CfgAnalysisTestBase.java
index dccd3a9..551d0fe 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/CfgAnalysisTestBase.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/CfgAnalysisTestBase.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2009 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package com.google.gwt.dev.jjs.impl.gflow;
import com.google.gwt.core.ext.UnableToCompleteException;
@@ -13,6 +28,9 @@
import java.util.Map;
+/**
+ * A base class for tests of {@link DataflowAnalyzer} components.
+ */
public abstract class CfgAnalysisTestBase<A extends Assumption<A>>
extends JJSTestBase {
protected boolean forward = true;
@@ -36,6 +54,9 @@
protected abstract Analysis<CfgNode<?>, CfgEdge, Cfg, A> createAnalysis();
+ /**
+ * The result of an analysis.
+ */
protected class AnalysisResult {
private final Map<CfgEdge, A> assumptions;
private final Cfg graph;
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/CfgIntegratedAnalysisTestBase.java b/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/CfgIntegratedAnalysisTestBase.java
index ef3c35b..2bb3acc 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/CfgIntegratedAnalysisTestBase.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/CfgIntegratedAnalysisTestBase.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2009 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package com.google.gwt.dev.jjs.impl.gflow;
import com.google.gwt.core.ext.UnableToCompleteException;
@@ -11,10 +26,13 @@
import com.google.gwt.dev.jjs.impl.gflow.cfg.CfgNode;
import com.google.gwt.dev.jjs.impl.gflow.cfg.CfgTransformer;
+/**
+ * A base class for testing integrated analysis.
+ */
public abstract class CfgIntegratedAnalysisTestBase<A extends Assumption<A>>
extends OptimizerTestBase {
protected boolean forward = true;
-
+
@Override
protected boolean optimizeMethod(JProgram program, JMethod method) {
JMethodBody body = (JMethodBody) method.getBody();
@@ -24,12 +42,12 @@
return AnalysisSolver.solveIntegrated(cfgGraph, createIntegratedAnalysis(), forward);
}
-
- protected Result transform(String returnType, String...snippet)
+
+ protected Result transform(String returnType, String...snippet)
throws UnableToCompleteException {
return optimize(returnType, snippet);
}
- protected abstract IntegratedAnalysis<CfgNode<?>, CfgEdge,
+ protected abstract IntegratedAnalysis<CfgNode<?>, CfgEdge,
CfgTransformer, Cfg, A> createIntegratedAnalysis();
}
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/DataflowOptimizerTest.java b/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/DataflowOptimizerTest.java
index 6eabaa3..9d73e11 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/DataflowOptimizerTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/DataflowOptimizerTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2009 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package com.google.gwt.dev.jjs.impl.gflow;
import com.google.gwt.dev.jjs.ast.JMethod;
@@ -6,11 +21,14 @@
import com.google.gwt.dev.jjs.impl.MethodInliner;
import com.google.gwt.dev.jjs.impl.OptimizerTestBase;
+/**
+ * Tests for {@link DataflowOptimizer}
+ */
public class DataflowOptimizerTest extends OptimizerTestBase {
@Override
protected void setUp() throws Exception {
super.setUp();
-
+
/*
* TODO: Each of these snippets shouldn't be setup for every test, and thus should be moved
* to the individual test cases they are needed for (or to shared methods if needed).
@@ -24,18 +42,18 @@
addSnippetClassDecl("static class CheckedException extends Exception {}");
addSnippetClassDecl("static class UncheckedException1 extends RuntimeException {}");
addSnippetClassDecl("static class UncheckedException2 extends RuntimeException {}");
-
+
addSnippetClassDecl("static void throwUncheckedException1() " +
"throws UncheckedException1 {}");
addSnippetClassDecl("static void throwCheckedException() " +
"throws CheckedException {}");
addSnippetClassDecl("static void throwSeveralExceptions() " +
"throws CheckedException, UncheckedException1 {}");
-
+
addSnippetClassDecl("static class Foo { int i; int j; int k; }");
addSnippetClassDecl("static Foo createFoo() {return null;}");
addSnippetClassDecl("static Foo staticFooInstance;");
-
+
runMethodInliner = false;
runDCE = false;
}
@@ -105,10 +123,10 @@
"int i = 1; int j = 0; if (i != 1) { j = 2; } else { j = 3; } return j;").into(
"int i; int j; return 3; ");
}
-
+
public void testDeadIfBranch4() throws Exception {
addSnippetClassDecl("static Object f = null;");
- optimize("void",
+ optimize("void",
"Object e = null;" +
"if (e == null && f == null) {" +
" return;" +
@@ -130,13 +148,13 @@
"int i = 1; int j = 0; while (j > 0) { if (i != 1) { i++; j++; } } return i;").into(
"int i; int j; return 1;");
}
-
+
public void testComplexCode2() throws Exception {
optimize("void",
"boolean b = bar(); if (b) { baz(b); return; }").into(
"boolean b = bar(); if (b) { baz(true); return; }");
}
-
+
public void testAssert() throws Exception {
optimize("void",
"boolean b = true;",
@@ -170,7 +188,7 @@
"foo.i = 1;"
).noChange();
}
-
+
public void testSwapValues() throws Exception {
optimize("int",
"int i = genInt(); int j = genInt(); int t;",
@@ -187,9 +205,9 @@
addSnippetClassDecl("int calculate(int i, int j) {" +
"int t;" +
"if (i > j) { t = i; i = j; j = t; }" +
- "return multiply(i, j);" +
+ "return multiply(i, j);" +
"}");
-
+
optimizeMethod("calculate", "int", "return 1;"
).intoString(
"int t;",
@@ -209,18 +227,18 @@
addSnippetClassDecl("static String getCsvString() { return null; }");
addSnippetClassDecl(
- "static class JsArrayString {" +
+ "static class JsArrayString {" +
" static JsArrayString createArray() { return null; }" +
" JsArrayString cast() { return this; }" +
" void push(String s) { }" +
"}");
addSnippetClassDecl(
- "static class StringBuilder {" +
+ "static class StringBuilder {" +
" void append(char c) { }" +
"}");
- optimize("JsArrayString",
+ optimize("JsArrayString",
"int state;",
"String csvString = getCsvString();",
"JsArrayString results = JsArrayString.createArray().cast();",
@@ -377,33 +395,33 @@
}
public void testImplicitConversion() throws Exception {
- optimize("long",
+ optimize("long",
"int bar = 0x12345678;",
"bar = bar * 1234;",
"long lng = bar;",
"long lng8 = lng << 8;",
"return lng8;"
).into(
- " int bar;",
- " long lng = -1068970384;",
- " long lng8 = lng << 8;",
+ " int bar;",
+ " long lng = -1068970384;",
+ " long lng8 = lng << 8;",
" return lng8;");
}
-
+
/*
* This test is a regression for an issue where inlined multiexpressions were getting removed
* by the ConstantsTransformationFunction, based on the constant value of the multi-expression,
* despite there being side-effects of the multi-expression. So, we want to test that inlining
* proceeds, but not further constant transformation.
- *
+ *
* TODO(rluble): This test may need to evolve over time, as the specifics of the
* optimizers change.
*/
public void testInlinedConstantExpressionWithSideEffects() throws Exception {
-
+
runDCE = true;
runMethodInliner = true;
-
+
addSnippetClassDecl("static void fail() {" +
" throw new RuntimeException();" +
"}");
@@ -412,7 +430,7 @@
" x = (Integer) n;" +
" return true;" +
"}");
-
+
optimize("int",
"Integer n = new Integer(1);",
"if (!copy(n)) {",
@@ -422,9 +440,8 @@
.into("Integer n = new Integer(1);",
"x = n;",
"return x;");
-
}
-
+
private boolean runDCE;
private boolean runMethodInliner;
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/GflowTests.java b/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/GflowTests.java
index 8dede28..17d957f 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/GflowTests.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/GflowTests.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -16,11 +16,11 @@
package com.google.gwt.dev.jjs.impl.gflow;
import com.google.gwt.dev.jjs.impl.gflow.cfg.CfgBuilderTest;
-import com.google.gwt.dev.jjs.impl.gflow.constants.ConstantsAssumptionTest;
-import com.google.gwt.dev.jjs.impl.gflow.constants.ExpressionEvaluatorTest;
import com.google.gwt.dev.jjs.impl.gflow.constants.AssumptionsDeducerTest;
import com.google.gwt.dev.jjs.impl.gflow.constants.ConstantsAnalysisTest;
import com.google.gwt.dev.jjs.impl.gflow.constants.ConstantsAnalysisTransformationTest;
+import com.google.gwt.dev.jjs.impl.gflow.constants.ConstantsAssumptionTest;
+import com.google.gwt.dev.jjs.impl.gflow.constants.ExpressionEvaluatorTest;
import com.google.gwt.dev.jjs.impl.gflow.copy.CopyAnalysisTest;
import com.google.gwt.dev.jjs.impl.gflow.copy.CopyAnalysisTransformationTest;
import com.google.gwt.dev.jjs.impl.gflow.liveness.LivenessAnalysisTest;
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/cfg/CfgBuilderTest.java b/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/cfg/CfgBuilderTest.java
index fcb4192..e64ed8b 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/cfg/CfgBuilderTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/cfg/CfgBuilderTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package com.google.gwt.dev.jjs.impl.gflow.cfg;
import com.google.gwt.core.ext.UnableToCompleteException;
@@ -39,7 +54,7 @@
addSnippetClassDecl("static int[] jj;");
addSnippetClassDecl("static void throwCheckedException() " +
- "throws CheckedException {}");
+ "throws CheckedException {}");
addSnippetClassDecl("static void throwUncheckedException() {}");
addSnippetClassDecl("static void throwSeveralExceptions() " +
"throws CheckedException, UncheckedException1 {}");
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/constants/AssumptionsDeducerTest.java b/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/constants/AssumptionsDeducerTest.java
index f272074..d5d5d2d 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/constants/AssumptionsDeducerTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/constants/AssumptionsDeducerTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,28 +24,30 @@
import com.google.gwt.dev.jjs.ast.JProgram;
import com.google.gwt.dev.jjs.ast.JStatement;
import com.google.gwt.dev.jjs.impl.JJSTestBase;
-import com.google.gwt.dev.jjs.impl.gflow.constants.AssumptionDeducer;
-import com.google.gwt.dev.jjs.impl.gflow.constants.ConstantsAssumption;
import com.google.gwt.dev.jjs.impl.gflow.constants.ConstantsAssumption.Updater;
import java.util.List;
+/**
+ * Test for {@Link AssumptionsDeducer} dataflow analysis.
+ */
public class AssumptionsDeducerTest extends JJSTestBase {
@Override
protected void setUp() throws Exception {
super.setUp();
-
- addSnippetClassDecl("static class Foo { " +
- "public int i;" +
- "public Object o;" +
- "}");
+
+ addSnippetClassDecl(
+ "static class Foo { " +
+ " public int i;" +
+ " public Object o;" +
+ "}");
}
public void testBooleanVar() throws Exception {
from("boolean b = false;", "b", true).deduce("{b = true}");
from("boolean b = false;", "b", false).deduce("{b = false}");
}
-
+
public void testEq() throws Exception {
from("int i = 0;", "i == 10", true).deduce("{i = 10}");
from("int i = 0;", "i == 10", false).deduce("T");
@@ -107,13 +109,13 @@
JBlock block = ((JMethodBody) mainMethod.getBody()).getBlock();
List<JStatement> statements = block.getStatements();
JIfStatement ifStatement = (JIfStatement) statements.get(statements.size() - 1);
-
+
Updater assumptions = new Updater(ConstantsAssumption.TOP);
- AssumptionDeducer.deduceAssumption(ifStatement.getIfExpr(),
+ AssumptionDeducer.deduceAssumption(ifStatement.getIfExpr(),
JBooleanLiteral.get(b), assumptions);
return new Result(assumptions.unwrap());
}
-
+
private class Result {
private final ConstantsAssumption assumptions;
@@ -124,6 +126,5 @@
public void deduce(String expected) {
assertEquals(expected, assumptions.toDebugString());
}
-
}
}
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/constants/ConstantsAnalysisTest.java b/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/constants/ConstantsAnalysisTest.java
index d3c36e0..1ff7322 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/constants/ConstantsAnalysisTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/constants/ConstantsAnalysisTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -21,6 +21,9 @@
import com.google.gwt.dev.jjs.impl.gflow.cfg.CfgEdge;
import com.google.gwt.dev.jjs.impl.gflow.cfg.CfgNode;
+/**
+ * Tests for {@link ConstantAnalysis} dataflow analysis.
+ */
public class ConstantsAnalysisTest extends CfgAnalysisTestBase<ConstantsAssumption> {
@Override
protected void setUp() throws Exception {
@@ -87,7 +90,7 @@
"WRITE(j, 2) -> [* {i = 1, j = 2}]",
"END");
}
-
+
public void testSequence() throws Exception {
analyze("void", "int i = 1; int j = i; int k = j; int l = k;").into(
"BLOCK -> [* T]",
@@ -104,7 +107,7 @@
"WRITE(l, k) -> [* {i = 1, j = 1, k = 1, l = 1}]",
"END");
}
-
+
public void testIfStatement() throws Exception {
analyze("void", "int i = k; if (i == 1) { int j = i; } else { int j = i; } ").into(
"BLOCK -> [* T]",
@@ -156,7 +159,7 @@
"GOTO -> [* T]",
"2: END");
}
-
+
public void testWhileLoop1() throws Exception {
analyze("void", "int j = 1; while (j > 0) ++j;").into(
"BLOCK -> [* T]",
@@ -169,7 +172,7 @@
"READWRITE(j, null) -> [1 T]",
"2: END");
}
-
+
public void testWhileLoop2() throws Exception {
analyze("void", "int j = 0; while (j > 0) {};").into(
"BLOCK -> [* T]",
@@ -181,7 +184,7 @@
"BLOCK -> [1 {j = 0}]",
"2: END");
}
-
+
public void testConditionalExpressions() throws Exception {
analyze("void", "boolean b1 = false; boolean b2 = false; if (b1 && (b2 = true)) b1 = true;").into(
"BLOCK -> [* T]",
@@ -202,12 +205,12 @@
// Various real-world stuff
public void testVariousStuff() throws Exception {
addSnippetClassDecl("static Object f = null;");
-
- analyze("void",
+
+ analyze("void",
"Object e = null;" +
- "if (f != null) if (e == null)" +
- " return;" +
- "boolean b = e == null;").into(
+ "if (f != null) if (e == null)" +
+ " return;" +
+ "boolean b = e == null;").into(
"BLOCK -> [* T]",
"STMT -> [* T]",
"WRITE(e, null) -> [* {e = null}]",
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/constants/ConstantsAnalysisTransformationTest.java b/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/constants/ConstantsAnalysisTransformationTest.java
index 6b7af48..93810d4 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/constants/ConstantsAnalysisTransformationTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/constants/ConstantsAnalysisTransformationTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -23,10 +23,10 @@
import com.google.gwt.dev.jjs.impl.gflow.cfg.CfgTransformer;
/**
- *
+ * Test for {@link CfgTransformer}.
*/
public class ConstantsAnalysisTransformationTest extends CfgIntegratedAnalysisTestBase<ConstantsAssumption> {
-
+
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -51,14 +51,14 @@
"i = 1 + 1;",
"int j = 2;");
}
-
+
public void testSequence() throws Exception {
transform("void", "int i = 1; int j = i; int k = j;").into(
"int i = 1;",
"int j = 1;",
"int k = 1;");
}
-
+
public void testIfStatement() throws Exception {
transform("void", "int i = 1; if (i_ == i) { i = 2; int j = i;} ").into(
"int i = 1;",
@@ -74,13 +74,13 @@
" int j = i;",
"}");
}
-
+
public void testReplaceInMethodCall() throws Exception {
transform("void", "int i = 1; bar(i);").into(
"int i = 1;",
"EntryPoint.bar(1);");
}
-
+
public void testExpressionEvaluation() throws Exception {
transform("void", "int i = 1; int j = i + 1;").into(
"int i = 1;",
@@ -92,18 +92,16 @@
"int i = 1;",
"boolean b = 1 == 1;");
}
-
+
public void testWhile() throws Exception {
transform("void", "int j = 0; while (j > 0) { }").intoString(
"int j = 0;");
-
}
public void testConstantCondition() throws Exception {
transform("void", "while (true) { }").into(
"while (true) {",
"}" );
-
}
public void testNullValue() throws Exception {
@@ -115,7 +113,7 @@
"Object e = null;",
"boolean b = false;" );
}
-
+
public void testIncDec() throws Exception {
transform("void",
"int i = 0;",
@@ -129,29 +127,29 @@
"++i;"
);
}
-
+
public void testNotNull() throws Exception {
transform("boolean", "String s = baz(); if (s == null) return false; return s != null;").into(
"String s = EntryPoint.baz();", "if (s == null)", " return false;", "return s != null;");
}
-
+
public void testImplicitCasts() throws Exception {
- transform("long",
+ transform("long",
"int bar = 0x12345678;",
"bar = bar * 1234;",
"long lng = bar;",
"long lng8 = lng << 8;",
"return lng8;"
).into(
- " int bar = 305419896;",
+ " int bar = 305419896;",
" bar = -1068970384;",
- " long lng = -1068970384;",
- " long lng8 = lng << 8;",
+ " long lng = -1068970384;",
+ " long lng8 = lng << 8;",
" return lng8;");
}
@Override
- protected IntegratedAnalysis<CfgNode<?>, CfgEdge, CfgTransformer, Cfg,
+ protected IntegratedAnalysis<CfgNode<?>, CfgEdge, CfgTransformer, Cfg,
ConstantsAssumption> createIntegratedAnalysis() {
return new ConstantsAnalysis();
}
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/constants/ExpressionEvaluatorTest.java b/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/constants/ExpressionEvaluatorTest.java
index b5dd879..b1fd7dc 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/constants/ExpressionEvaluatorTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/constants/ExpressionEvaluatorTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,13 +25,11 @@
import com.google.gwt.dev.jjs.ast.JStatement;
import com.google.gwt.dev.jjs.ast.JValueLiteral;
import com.google.gwt.dev.jjs.impl.JJSTestBase;
-import com.google.gwt.dev.jjs.impl.gflow.constants.ConstantsAssumption;
-import com.google.gwt.dev.jjs.impl.gflow.constants.ExpressionEvaluator;
import java.util.List;
/**
- * Tests for ExpressionEvaluator - testing evaluation expressions based on
+ * Tests for ExpressionEvaluator - testing evaluation expressions based on
* assumptions.
*/
public class ExpressionEvaluatorTest extends JJSTestBase {
@@ -45,7 +43,7 @@
assertThat("i", "int",
"int i = 1;").evaluatesInto("1");
}
-
+
public void testEq() throws Exception {
assertThat("i == 1", "boolean",
"int i = 1;").evaluatesInto("true");
@@ -73,7 +71,7 @@
assertThat("i / 0", "int", "int i = 1;").evaluatesInto("<null>");
assertThat("4 / 0", "int", "int i = 0;").evaluatesInto("<null>");
}
-
+
private static class Result {
private final JValueLiteral literal;
@@ -86,10 +84,10 @@
assertEquals(string, actual);
}
}
-
- private Result assertThat(String expr, String type,
+
+ private Result assertThat(String expr, String type,
String decls) throws UnableToCompleteException {
- ConstantsAssumption.Updater updater =
+ ConstantsAssumption.Updater updater =
new ConstantsAssumption.Updater(new ConstantsAssumption());
String codeSnippet = decls;
@@ -106,14 +104,14 @@
}
JDeclarationStatement decl = (JDeclarationStatement) stmt;
if (decl.getInitializer() != null) {
- updater.set(decl.getVariableRef().getTarget(),
+ updater.set(decl.getVariableRef().getTarget(),
(JValueLiteral) decl.getInitializer());
}
}
- JReturnStatement returnStatement =
+ JReturnStatement returnStatement =
(JReturnStatement) statements.get(statements.size() - 1);
- return new Result(ExpressionEvaluator.evaluate(returnStatement.getExpr(),
+ return new Result(ExpressionEvaluator.evaluate(returnStatement.getExpr(),
updater.unwrap()));
}
}
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/copy/CopyAnalysisTest.java b/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/copy/CopyAnalysisTest.java
index 5c87dc7..0351302 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/copy/CopyAnalysisTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/copy/CopyAnalysisTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package com.google.gwt.dev.jjs.impl.gflow.copy;
import com.google.gwt.dev.jjs.impl.gflow.Analysis;
@@ -6,6 +21,9 @@
import com.google.gwt.dev.jjs.impl.gflow.cfg.CfgEdge;
import com.google.gwt.dev.jjs.impl.gflow.cfg.CfgNode;
+/**
+ * Test for {@link CopyAnalysis} dataflow analysis.
+ */
public class CopyAnalysisTest extends CfgAnalysisTestBase<CopyAssumption> {
@Override
protected void setUp() throws Exception {
diff --git a/dev/core/test/com/google/gwt/dev/js/ComparingVisitor.java b/dev/core/test/com/google/gwt/dev/js/ComparingVisitor.java
index 9aa5c9a..b1c14b8 100644
--- a/dev/core/test/com/google/gwt/dev/js/ComparingVisitor.java
+++ b/dev/core/test/com/google/gwt/dev/js/ComparingVisitor.java
@@ -1,12 +1,12 @@
/*
* Copyright 2007 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -68,6 +68,9 @@
import java.util.List;
+/**
+ * A visitor that comparares two Js AST trees and fails if they are different.
+ */
public class ComparingVisitor extends JsVisitor {
public static void exec(List<JsStatement> expected, List<JsStatement> actual) {
diff --git a/dev/core/test/com/google/gwt/dev/js/JsDuplicateFunctionRemoverTest.java b/dev/core/test/com/google/gwt/dev/js/JsDuplicateFunctionRemoverTest.java
index 47d5139..141d0e4 100644
--- a/dev/core/test/com/google/gwt/dev/js/JsDuplicateFunctionRemoverTest.java
+++ b/dev/core/test/com/google/gwt/dev/js/JsDuplicateFunctionRemoverTest.java
@@ -16,7 +16,6 @@
package com.google.gwt.dev.js;
import com.google.gwt.dev.jjs.SourceOrigin;
-
import com.google.gwt.dev.js.ast.JsBinaryOperation;
import com.google.gwt.dev.js.ast.JsBinaryOperator;
import com.google.gwt.dev.js.ast.JsContext;
@@ -28,11 +27,11 @@
import com.google.gwt.dev.js.ast.JsScope;
import com.google.gwt.dev.js.ast.JsStatement;
import com.google.gwt.dev.js.ast.JsVisitor;
-import com.google.gwt.dev.util.TextOutput;
import com.google.gwt.dev.util.DefaultTextOutput;
+import com.google.gwt.dev.util.TextOutput;
-import java.lang.reflect.Method;
import java.io.StringReader;
+import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -88,7 +87,7 @@
String firstName = new MockNameGenerator().getFreshName();
assertEquals("_.method1=" + firstName + ";_.method2=" + firstName +
";_.method1();_.method2();function " + firstName + "(){}\n",
- optimize(program, JsSymbolResolver.class, JsDuplicateFunctionRemoverProxy.class));
+ optimize(program, JsSymbolResolver.class, JsDuplicateFunctionRemoverProxy.class));
}
@@ -195,7 +194,6 @@
// the same.
assertTrue(assignments.get("_.b") != assignments.get("_.c") ||
topScope_a.getShortIdent().equals(f2_a.getShortIdent()));
-
}
private static void setAllFromJava(JsProgram program) {
diff --git a/dev/core/test/com/google/gwt/dev/js/JsParserTest.java b/dev/core/test/com/google/gwt/dev/js/JsParserTest.java
index 0ba1c6d..de365eb 100644
--- a/dev/core/test/com/google/gwt/dev/js/JsParserTest.java
+++ b/dev/core/test/com/google/gwt/dev/js/JsParserTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2010 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,7 +28,9 @@
* Tests {@link JsParser}.
*/
public class JsParserTest extends TestCase {
-
+ /**
+ * The result of parsing Js code.
+ */
public class Result {
private String source;
diff --git a/dev/core/test/com/google/gwt/dev/js/JsStackEmulatorTest.java b/dev/core/test/com/google/gwt/dev/js/JsStackEmulatorTest.java
index a8189ce..b10627c 100644
--- a/dev/core/test/com/google/gwt/dev/js/JsStackEmulatorTest.java
+++ b/dev/core/test/com/google/gwt/dev/js/JsStackEmulatorTest.java
@@ -153,7 +153,7 @@
private static void checkOnModuleLoad(JsProgram program, String expectedJavascript) {
JsName onModuleLoad = program.getScope().findExistingName("test_EntryPoint_onModuleLoad__V");
assertNotNull(onModuleLoad);
- assert(onModuleLoad.getStaticRef() instanceof JsFunction);
+ assert onModuleLoad.getStaticRef() instanceof JsFunction;
assertEquals(expectedJavascript, serializeJs(onModuleLoad.getStaticRef()));
}
diff --git a/dev/core/test/com/google/gwt/dev/js/JsToStringGenerationVisitorAccuracyTest.java b/dev/core/test/com/google/gwt/dev/js/JsToStringGenerationVisitorAccuracyTest.java
index 117ead1..ee56995 100644
--- a/dev/core/test/com/google/gwt/dev/js/JsToStringGenerationVisitorAccuracyTest.java
+++ b/dev/core/test/com/google/gwt/dev/js/JsToStringGenerationVisitorAccuracyTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,6 +28,9 @@
import java.io.StringReader;
import java.util.List;
+/**
+ * Test the accuracy of the JavaScript parser.
+ */
public class JsToStringGenerationVisitorAccuracyTest extends TestCase {
public void testAdditionPositive() throws Exception {
diff --git a/dev/core/test/com/google/gwt/dev/js/JsToStringGenerationVisitorConcisenessTest.java b/dev/core/test/com/google/gwt/dev/js/JsToStringGenerationVisitorConcisenessTest.java
index 9242f6e..7bd9cd5 100644
--- a/dev/core/test/com/google/gwt/dev/js/JsToStringGenerationVisitorConcisenessTest.java
+++ b/dev/core/test/com/google/gwt/dev/js/JsToStringGenerationVisitorConcisenessTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,6 +27,9 @@
import java.io.StringReader;
import java.util.List;
+/**
+ * Tests the ability of the JavaScript parser to remove redundant constructs.
+ */
public class JsToStringGenerationVisitorConcisenessTest extends TestCase {
public void testComplexDecrement() throws Exception {
diff --git a/dev/core/test/com/google/gwt/dev/json/JsonTest.java b/dev/core/test/com/google/gwt/dev/json/JsonTest.java
index 734208a..66859c3 100644
--- a/dev/core/test/com/google/gwt/dev/json/JsonTest.java
+++ b/dev/core/test/com/google/gwt/dev/json/JsonTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2010 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,14 +15,6 @@
*/
package com.google.gwt.dev.json;
-import com.google.gwt.dev.json.JsonArray;
-import com.google.gwt.dev.json.JsonBoolean;
-import com.google.gwt.dev.json.JsonException;
-import com.google.gwt.dev.json.JsonNumber;
-import com.google.gwt.dev.json.JsonObject;
-import com.google.gwt.dev.json.JsonString;
-import com.google.gwt.dev.json.JsonValue;
-
import junit.framework.TestCase;
import java.io.IOException;
@@ -54,9 +46,6 @@
/**
* Tests updating elements in a {@link JsonArray}.
- *
- * @throws IOException
- * @throws JsonException
*/
public void testWriteArray() throws IOException, JsonException {
final JsonArray a = new JsonArray();
@@ -72,7 +61,7 @@
final JsonArray b = JsonArray.parse(new StringReader(json));
assertEquals(6, b.getLength());
-
+
assertTrue(b.get(0).asBoolean().getBoolean());
assertEquals("foo", b.get(1).asString().getString());
assertEquals(230, b.get(2).asNumber().getInteger());
@@ -83,9 +72,6 @@
/**
* Tests updating properties in a {@link JsonObject}.
- *
- * @throws IOException
- * @throws JsonException
*/
public void testWriteObject() throws IOException, JsonException {
final JsonObject a = new JsonObject();
@@ -108,7 +94,7 @@
assertTrue(b.get("f").asBoolean().getBoolean());
assertFalse(b.get("g").asBoolean().getBoolean());
}
-
+
/**
* Tests {@link JsonValue#copyDeeply()}.
*/
@@ -121,7 +107,7 @@
a.put("e", new JsonArray());
a.put("f", true);
a.put("g", JsonValue.NULL);
-
+
// Get JsonValues for all of a's properties.
final JsonNumber aa = a.get("a").asNumber();
final JsonNumber ab = a.get("b").asNumber();
@@ -137,7 +123,7 @@
final JsonObject bd = b.get("d").asObject();
final JsonArray be = b.get("e").asArray();
final JsonBoolean bf = b.get("f").asBoolean();
- final JsonValue bg = b.get("g");
+ final JsonValue bg = b.get("g");
// Test non-interned types.
// Integer
@@ -151,20 +137,20 @@
// String
assertEquals("json\n\r\f\t\b\u8730", bc.getString());
assertNotSame(ac, bc);
-
+
// Object
assertTrue(bd.isEmpty());
assertNotSame(ad, bd);
-
+
// Array
assertEquals(0, be.getLength());
assertNotSame(ae, be);
-
+
// Test interned types.
// Boolean
assertTrue(bf.getBoolean());
-
+
// NULL
assertEquals(bg, JsonValue.NULL);
}
diff --git a/dev/core/test/com/google/gwt/dev/json/TokenizerTest.java b/dev/core/test/com/google/gwt/dev/json/TokenizerTest.java
index 912254f..6969e4b 100644
--- a/dev/core/test/com/google/gwt/dev/json/TokenizerTest.java
+++ b/dev/core/test/com/google/gwt/dev/json/TokenizerTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2010 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,12 +15,6 @@
*/
package com.google.gwt.dev.json;
-import com.google.gwt.dev.json.JsonArray;
-import com.google.gwt.dev.json.JsonException;
-import com.google.gwt.dev.json.JsonObject;
-import com.google.gwt.dev.json.JsonValue;
-import com.google.gwt.dev.json.Tokenizer;
-
import junit.framework.TestCase;
import java.io.IOException;
@@ -36,8 +30,6 @@
/**
* Tests {@link Tokenizer#back(char)}.
- *
- * @throws IOException
*/
public void testBack() throws IOException {
final Tokenizer tokenizer = tokenizerFor("ab c");
@@ -52,8 +44,6 @@
/**
* Tests {@link Tokenizer#next()}.
- *
- * @throws IOException
*/
public void testNext() throws IOException {
final Tokenizer tokenizer = tokenizerFor("abc");
@@ -66,8 +56,6 @@
/**
* Tests {@link Tokenizer#nextNonWhitespace()}.
- *
- * @throws IOException
*/
public void testNextNonWhite() throws IOException {
final Tokenizer tokenizer = tokenizerFor(" a\n\tbc ");
@@ -80,9 +68,6 @@
/**
* Tests {@link Tokenizer#nextString()}.
- *
- * @throws IOException
- * @throws JsonException
*/
public void testNextString() throws IOException, JsonException {
assertEquals("json json", tokenizerFor("\"json json\"").nextString());
@@ -93,9 +78,6 @@
/**
* Tests {@link Tokenizer#nextValue()} for array values.
- *
- * @throws IOException
- * @throws JsonException
*/
public void testNextValueForArrays() throws IOException, JsonException {
final JsonValue a = tokenizerFor("[]").nextValue();
@@ -116,9 +98,6 @@
/**
* Tests {@link Tokenizer#nextValue()} for literals.
- *
- * @throws IOException
- * @throws JsonException
*/
public void testNextValueForLiterals() throws IOException, JsonException {
final JsonValue a = tokenizerFor("null").nextValue();
@@ -153,9 +132,6 @@
/**
* Tests {@link Tokenizer#nextValue()} for object values.
- *
- * @throws IOException
- * @throws JsonException
*/
public void testNextValueForObjects() throws IOException, JsonException {
final JsonValue a = tokenizerFor("{}").nextValue();
diff --git a/dev/core/test/com/google/gwt/dev/resource/impl/ClassPathEntryTest.java b/dev/core/test/com/google/gwt/dev/resource/impl/ClassPathEntryTest.java
index d415548..85ce306 100644
--- a/dev/core/test/com/google/gwt/dev/resource/impl/ClassPathEntryTest.java
+++ b/dev/core/test/com/google/gwt/dev/resource/impl/ClassPathEntryTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -21,6 +21,9 @@
import java.net.URISyntaxException;
import java.util.Set;
+/**
+ * Resource realted tests.
+ */
public class ClassPathEntryTest extends AbstractResourceOrientedTestBase {
public void testAllCpe1FilesFound() throws URISyntaxException, IOException {
@@ -46,11 +49,11 @@
testPathPrefixSetChanges(cpe1jar, cpe2jar);
testPathPrefixSetChanges(cpe1dir, cpe2jar);
testPathPrefixSetChanges(cpe1zip, cpe2jar);
-
+
testPathPrefixSetChanges(cpe1dir, cpe2dir);
testPathPrefixSetChanges(cpe1jar, cpe2dir);
testPathPrefixSetChanges(cpe1zip, cpe2dir);
-
+
testPathPrefixSetChanges(cpe1dir, cpe2zip);
testPathPrefixSetChanges(cpe1jar, cpe2zip);
testPathPrefixSetChanges(cpe1zip, cpe2zip);
@@ -69,11 +72,11 @@
testUseOfPrefixesWithFiltering(cpe1jar, cpe2jar);
testUseOfPrefixesWithFiltering(cpe1dir, cpe2jar);
testUseOfPrefixesWithFiltering(cpe1zip, cpe2jar);
-
+
testUseOfPrefixesWithFiltering(cpe1dir, cpe2dir);
testUseOfPrefixesWithFiltering(cpe1jar, cpe2dir);
testUseOfPrefixesWithFiltering(cpe1zip, cpe2dir);
-
+
testUseOfPrefixesWithFiltering(cpe1dir, cpe2zip);
testUseOfPrefixesWithFiltering(cpe1jar, cpe2zip);
testUseOfPrefixesWithFiltering(cpe1zip, cpe2zip);
@@ -92,11 +95,11 @@
testUseOfPrefixesWithoutFiltering(cpe1jar, cpe2jar);
testUseOfPrefixesWithoutFiltering(cpe1dir, cpe2jar);
testUseOfPrefixesWithoutFiltering(cpe1zip, cpe2jar);
-
+
testUseOfPrefixesWithoutFiltering(cpe1dir, cpe2dir);
testUseOfPrefixesWithoutFiltering(cpe1jar, cpe2dir);
testUseOfPrefixesWithoutFiltering(cpe1zip, cpe2dir);
-
+
testUseOfPrefixesWithoutFiltering(cpe1dir, cpe2zip);
testUseOfPrefixesWithoutFiltering(cpe1jar, cpe2zip);
testUseOfPrefixesWithoutFiltering(cpe1zip, cpe2zip);
diff --git a/dev/core/test/com/google/gwt/dev/resource/impl/DefaultFiltersTest.java b/dev/core/test/com/google/gwt/dev/resource/impl/DefaultFiltersTest.java
index 9c2eedf..72e04b5 100644
--- a/dev/core/test/com/google/gwt/dev/resource/impl/DefaultFiltersTest.java
+++ b/dev/core/test/com/google/gwt/dev/resource/impl/DefaultFiltersTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,18 +27,18 @@
/**
* An implementation for DefaultExcludesFilterTest.
- *
+ *
* Tests:
- *
+ *
* 1. The filter conversion from ant to Java regex. Which cases can we handle,
* and confirm that we perform correctly in all cases.
- *
+ *
* 2. checking the 4 defaultFilters, one for each combination of defaultExcludes
* and isJava.
- *
+ *
* 3. Checking whether customFilter work correctly, both in presence and absence
* of Ant.
- *
+ *
* TODO (amitmanjhi): clean up this test code.
*/
public class DefaultFiltersTest extends TestCase {
@@ -59,7 +59,7 @@
"testing", false).toArray(EMPTY_ARRAY),
getMiscPaths("a/bc/de", false).toArray(EMPTY_ARRAY))) {
assertEquals(path + suffix, expected, actual);
- }
+ }
}
void testAdvancedPathAnt(ResourceFilterString expected,
@@ -75,7 +75,7 @@
testAdvancedPath(expected, actual, suffix);
new BasicPaths().testBasicPath(expected, actual, suffix);
}
-
+
void testAdvancedClassFilesPathAnt(ResourceFilterString expected,
ResourceFilterString actual) {
testAdvancedPathAnt(expected, actual, CLASS_FILE_SUFFIX);
@@ -83,9 +83,9 @@
void testAdvancedJavaPathAnt(ResourceFilterString expected,
ResourceFilterString actual) {
- testAdvancedPathAnt(expected, actual, JAVA_FILE_SUFFIX);
+ testAdvancedPathAnt(expected, actual, JAVA_FILE_SUFFIX);
}
-
+
void testAdvancedPath(ResourceFilterString expected,
ResourceFilterString actual) {
for (String path : mergeArrays(baseIncluded, baseExcluded, getMiscPaths(
@@ -131,7 +131,7 @@
assertEquals(EXCLUDED_CHARS + str + suffix, expected, actual);
assertEquals(EXCLUDED_CHARS + str + EXCLUDED_CHARS + suffix,
expected, actual);
- }
+ }
}
void testBasicPath(ResourceFilterString expected,
@@ -165,7 +165,7 @@
private static final boolean DEFAULT_INCLUDES = false;
private static final String JAVA_FILE_SUFFIX = ".java";
private static final String CLASS_FILE_SUFFIX = ".class";
-
+
private static final String MERGED_PATTERNS[] = {
"**/testing/**", "Foo", "Bar", "fooz/**", "barz/hello/**"};
@@ -225,9 +225,9 @@
public void testEmptyFilters() {
BasicPaths basicPaths = new BasicPaths();
FilterFileType fileType;
-
+
// first arg: ant filter, second arg: our custom filter
- fileType= FilterFileType.RESOURCE_FILES;
+ fileType = FilterFileType.RESOURCE_FILES;
basicPaths.testBasicPath(getAntFilter(EMPTY_ARRAY, EMPTY_ARRAY,
EMPTY_ARRAY, DEFAULT_EXCLUDES, fileType, "antDefaultFilter"),
new ResourceFilterString(fileType.getDefaultFilter(),
diff --git a/dev/core/test/com/google/gwt/dev/resource/impl/FileResourceTest.java b/dev/core/test/com/google/gwt/dev/resource/impl/FileResourceTest.java
index ef6e475..69e3f7c 100644
--- a/dev/core/test/com/google/gwt/dev/resource/impl/FileResourceTest.java
+++ b/dev/core/test/com/google/gwt/dev/resource/impl/FileResourceTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -23,6 +23,9 @@
import java.io.IOException;
import java.io.InputStream;
+/**
+ * Tests related FileResources.
+ */
public class FileResourceTest extends TestCase {
public void testBasic() {
diff --git a/dev/core/test/com/google/gwt/dev/resource/impl/MockAbstractResource.java b/dev/core/test/com/google/gwt/dev/resource/impl/MockAbstractResource.java
index 5b75a3d..6c8c756 100644
--- a/dev/core/test/com/google/gwt/dev/resource/impl/MockAbstractResource.java
+++ b/dev/core/test/com/google/gwt/dev/resource/impl/MockAbstractResource.java
@@ -19,6 +19,9 @@
import java.io.InputStream;
+/**
+ * Mock for {@link AbstractResource}.
+ */
public final class MockAbstractResource extends AbstractResource {
private final MockClassPathEntry mockClassPathEntry;
diff --git a/dev/core/test/com/google/gwt/dev/resource/impl/MockClassPathEntry.java b/dev/core/test/com/google/gwt/dev/resource/impl/MockClassPathEntry.java
index b6a8567..e01514a 100644
--- a/dev/core/test/com/google/gwt/dev/resource/impl/MockClassPathEntry.java
+++ b/dev/core/test/com/google/gwt/dev/resource/impl/MockClassPathEntry.java
@@ -24,6 +24,9 @@
import java.util.IdentityHashMap;
import java.util.Map;
+/**
+ * Mock for {@link ClassPathEntry}.
+ */
public class MockClassPathEntry extends ClassPathEntry {
final String pathRoot;
diff --git a/dev/core/test/com/google/gwt/dev/resource/impl/ResourceOracleImplRealClasspathTest.java b/dev/core/test/com/google/gwt/dev/resource/impl/ResourceOracleImplRealClasspathTest.java
index 758f1dd..212a949 100644
--- a/dev/core/test/com/google/gwt/dev/resource/impl/ResourceOracleImplRealClasspathTest.java
+++ b/dev/core/test/com/google/gwt/dev/resource/impl/ResourceOracleImplRealClasspathTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,16 +15,15 @@
*/
package com.google.gwt.dev.resource.impl;
+import static com.google.gwt.dev.resource.impl.ResourceOracleImplTest.assertResourcesEqual;
+
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.dev.resource.Resource;
import java.util.Map;
-import static com.google.gwt.dev.resource.impl.ResourceOracleImplTest.assertResourcesEqual;
-
/**
* Tests {@link ResourceOracleImpl} using the real class path.
- *
*/
public class ResourceOracleImplRealClasspathTest extends
AbstractResourceOrientedTestBase {
diff --git a/dev/core/test/com/google/gwt/dev/resource/impl/ResourceTests.java b/dev/core/test/com/google/gwt/dev/resource/impl/ResourceTests.java
index 4ed79e8..9938d2c 100644
--- a/dev/core/test/com/google/gwt/dev/resource/impl/ResourceTests.java
+++ b/dev/core/test/com/google/gwt/dev/resource/impl/ResourceTests.java
@@ -1,12 +1,12 @@
/*
* Copyright 2011 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,8 +15,6 @@
*/
package com.google.gwt.dev.resource.impl;
-import com.google.gwt.dev.resource.Resource;
-
import junit.framework.Test;
import junit.framework.TestSuite;
diff --git a/dev/core/test/com/google/gwt/dev/resource/impl/testdata/cpe1/com/google/gwt/user/client/Command.java b/dev/core/test/com/google/gwt/dev/resource/impl/testdata/cpe1/com/google/gwt/user/client/Command.java
index 42ba14b..a678c04 100644
--- a/dev/core/test/com/google/gwt/dev/resource/impl/testdata/cpe1/com/google/gwt/user/client/Command.java
+++ b/dev/core/test/com/google/gwt/dev/resource/impl/testdata/cpe1/com/google/gwt/user/client/Command.java
@@ -1,5 +1,23 @@
+/*
+ * Copyright 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package com.google.gwt.dev.resource.impl.testdata.cpe1.com.google.gwt.user.client;
+/**
+ * Classes for testing resource infrastructure.
+ */
public class Command {
// test class
-}
\ No newline at end of file
+}
diff --git a/dev/core/test/com/google/gwt/dev/resource/impl/testdata/cpe1/com/google/gwt/user/client/Timer.java b/dev/core/test/com/google/gwt/dev/resource/impl/testdata/cpe1/com/google/gwt/user/client/Timer.java
index d845e45..cbdc0c7 100644
--- a/dev/core/test/com/google/gwt/dev/resource/impl/testdata/cpe1/com/google/gwt/user/client/Timer.java
+++ b/dev/core/test/com/google/gwt/dev/resource/impl/testdata/cpe1/com/google/gwt/user/client/Timer.java
@@ -1,5 +1,23 @@
+/*
+ * Copyright 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package com.google.gwt.dev.resource.impl.testdata.cpe1.com.google.gwt.user.client;
+/**
+ * Classes for testing resource infrastructure.
+ */
public class Timer {
// test class
-}
\ No newline at end of file
+}
diff --git a/dev/core/test/com/google/gwt/dev/resource/impl/testdata/cpe1/com/google/gwt/user/client/ui/Widget.java b/dev/core/test/com/google/gwt/dev/resource/impl/testdata/cpe1/com/google/gwt/user/client/ui/Widget.java
index 79acdc7..9cd41f7 100644
--- a/dev/core/test/com/google/gwt/dev/resource/impl/testdata/cpe1/com/google/gwt/user/client/ui/Widget.java
+++ b/dev/core/test/com/google/gwt/dev/resource/impl/testdata/cpe1/com/google/gwt/user/client/ui/Widget.java
@@ -1,5 +1,23 @@
+/*
+ * Copyright 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package com.google.gwt.dev.resource.impl.testdata.cpe1.com.google.gwt.user.client.ui;
+/**
+ * Classes for testing resource infrastructure.
+ */
public class Widget {
// test class
-}
\ No newline at end of file
+}
diff --git a/dev/core/test/com/google/gwt/dev/resource/impl/testdata/cpe1/org/example/foo/client/FooClient.java b/dev/core/test/com/google/gwt/dev/resource/impl/testdata/cpe1/org/example/foo/client/FooClient.java
index 9b02688..0819b16 100644
--- a/dev/core/test/com/google/gwt/dev/resource/impl/testdata/cpe1/org/example/foo/client/FooClient.java
+++ b/dev/core/test/com/google/gwt/dev/resource/impl/testdata/cpe1/org/example/foo/client/FooClient.java
@@ -1,5 +1,23 @@
+/*
+ * Copyright 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package com.google.gwt.dev.resource.impl.testdata.cpe1.org.example.foo.client;
+/**
+ * Classes for testing resource infrastructure.
+ */
public class FooClient {
// test class
-}
\ No newline at end of file
+}
diff --git a/dev/core/test/com/google/gwt/dev/resource/impl/testdata/cpe1/org/example/foo/server/FooServer.java b/dev/core/test/com/google/gwt/dev/resource/impl/testdata/cpe1/org/example/foo/server/FooServer.java
index 6f2c68c..be31466 100644
--- a/dev/core/test/com/google/gwt/dev/resource/impl/testdata/cpe1/org/example/foo/server/FooServer.java
+++ b/dev/core/test/com/google/gwt/dev/resource/impl/testdata/cpe1/org/example/foo/server/FooServer.java
@@ -1,5 +1,23 @@
-package com.google.gwt.dev.resource.impl.testdata.cpe1.org.example.foo.server;
+/*
+ * Copyright 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.gwt.dev.resource.impl.testdata.cpe2.org.example.foo.server;
+/**
+ * Classes for testing resource infrastructure.
+ */
public class FooServer {
// test class
-}
\ No newline at end of file
+}
diff --git a/dev/core/test/com/google/gwt/dev/resource/impl/testdata/cpe2/com/google/gwt/i18n/client/Messages.java b/dev/core/test/com/google/gwt/dev/resource/impl/testdata/cpe2/com/google/gwt/i18n/client/Messages.java
index dff41a8..cb7dc46 100644
--- a/dev/core/test/com/google/gwt/dev/resource/impl/testdata/cpe2/com/google/gwt/i18n/client/Messages.java
+++ b/dev/core/test/com/google/gwt/dev/resource/impl/testdata/cpe2/com/google/gwt/i18n/client/Messages.java
@@ -1,5 +1,23 @@
-package com.google.gwt.dev.resource.impl.testdata.cpe2.com.google.gwt.i18n.client;
+/*
+ * Copyright 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.gwt.dev.resource.impl.testdata.cpe2.com.google.gwt.i18n.rebind;
+/**
+ * Classes for testing resource infrastructure.
+ */
public class Messages {
// test class
-}
\ No newline at end of file
+}
diff --git a/dev/core/test/com/google/gwt/dev/resource/impl/testdata/cpe2/com/google/gwt/i18n/rebind/LocalizableGenerator.java b/dev/core/test/com/google/gwt/dev/resource/impl/testdata/cpe2/com/google/gwt/i18n/rebind/LocalizableGenerator.java
index dae8c55..98dfb5b 100644
--- a/dev/core/test/com/google/gwt/dev/resource/impl/testdata/cpe2/com/google/gwt/i18n/rebind/LocalizableGenerator.java
+++ b/dev/core/test/com/google/gwt/dev/resource/impl/testdata/cpe2/com/google/gwt/i18n/rebind/LocalizableGenerator.java
@@ -1,5 +1,23 @@
+/*
+ * Copyright 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package com.google.gwt.dev.resource.impl.testdata.cpe2.com.google.gwt.i18n.rebind;
+/**
+ * Classes for testing resource infrastructure.
+ */
public class LocalizableGenerator {
// test class
}
diff --git a/dev/core/test/com/google/gwt/dev/shell/BrowserChannelTest.java b/dev/core/test/com/google/gwt/dev/shell/BrowserChannelTest.java
index bd6722c..2f85970 100644
--- a/dev/core/test/com/google/gwt/dev/shell/BrowserChannelTest.java
+++ b/dev/core/test/com/google/gwt/dev/shell/BrowserChannelTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2009 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,11 +15,6 @@
*/
package com.google.gwt.dev.shell;
-import com.google.gwt.dev.util.TemporaryBufferStream;
-import com.google.gwt.dev.shell.BrowserChannel.MessageType;
-import com.google.gwt.dev.shell.BrowserChannel.Value;
-import com.google.gwt.dev.shell.BrowserChannel.SessionHandler.SpecialDispatchId;
-import com.google.gwt.dev.shell.BrowserChannel.Value.ValueType;
import com.google.gwt.dev.shell.BrowserChannel.CheckVersionsMessage;
import com.google.gwt.dev.shell.BrowserChannel.ChooseTransportMessage;
import com.google.gwt.dev.shell.BrowserChannel.FatalErrorMessage;
@@ -30,13 +25,18 @@
import com.google.gwt.dev.shell.BrowserChannel.JavaObjectRef;
import com.google.gwt.dev.shell.BrowserChannel.LoadJsniMessage;
import com.google.gwt.dev.shell.BrowserChannel.LoadModuleMessage;
+import com.google.gwt.dev.shell.BrowserChannel.MessageType;
import com.google.gwt.dev.shell.BrowserChannel.OldLoadModuleMessage;
import com.google.gwt.dev.shell.BrowserChannel.ProtocolVersionMessage;
import com.google.gwt.dev.shell.BrowserChannel.QuitMessage;
import com.google.gwt.dev.shell.BrowserChannel.RequestIconMessage;
import com.google.gwt.dev.shell.BrowserChannel.ReturnMessage;
+import com.google.gwt.dev.shell.BrowserChannel.SessionHandler.SpecialDispatchId;
import com.google.gwt.dev.shell.BrowserChannel.SwitchTransportMessage;
import com.google.gwt.dev.shell.BrowserChannel.UserAgentIconMessage;
+import com.google.gwt.dev.shell.BrowserChannel.Value;
+import com.google.gwt.dev.shell.BrowserChannel.Value.ValueType;
+import com.google.gwt.dev.util.TemporaryBufferStream;
import junit.framework.TestCase;
@@ -50,7 +50,7 @@
*/
public class BrowserChannelTest extends TestCase {
// TODO(jat): add more tests for Value types
-
+
private TemporaryBufferStream bufferStream = new TemporaryBufferStream();
private DataInputStream iStr = new DataInputStream(
@@ -124,7 +124,7 @@
Value thisRef = new Value();
thisRef.setJavaObject(new JavaObjectRef(42));
Value[] args = new Value[] {
- new Value(), new Value(),
+ new Value(), new Value(),
};
args[0].setInt(0);
args[1].setInt(1);
@@ -150,7 +150,7 @@
Value thisRef = new Value();
thisRef.setJavaObject(new JavaObjectRef(42));
Value[] args = new Value[] {
- new Value(), new Value(),
+ new Value(), new Value(),
};
args[0].setInt(0);
args[1].setInt(1);
@@ -173,7 +173,7 @@
public void testInvokeSpecialMessage() throws IOException,
BrowserChannelException {
Value[] args = new Value[] {
- new Value(), new Value(),
+ new Value(), new Value(),
};
args[0].setInt(0);
args[1].setInt(1);
@@ -232,13 +232,13 @@
assertEquals(sessionKey, message.getSessionKey());
assertEquals(moduleName, message.getModuleName());
assertEquals(userAgent, message.getUserAgent());
-
+
// create a separate channel so we don't cause problems with partial
// messages written to the stream
TemporaryBufferStream tempBufferStream = new TemporaryBufferStream();
TestBrowserChannel trashableChannel = new TestBrowserChannel(
tempBufferStream.getInputStream(),
- tempBufferStream.getOutputStream());
+ tempBufferStream.getOutputStream());
try {
new LoadModuleMessage(trashableChannel, null, tabKey, sessionKey, moduleName,
@@ -392,6 +392,6 @@
@Override
protected void setUp() throws Exception {
channel = new TestBrowserChannel(bufferStream.getInputStream(),
- bufferStream.getOutputStream());
+ bufferStream.getOutputStream());
}
}
diff --git a/dev/core/test/com/google/gwt/dev/shell/DevModeSessionTestUtil.java b/dev/core/test/com/google/gwt/dev/shell/DevModeSessionTestUtil.java
index f6443cd..3cfda64 100644
--- a/dev/core/test/com/google/gwt/dev/shell/DevModeSessionTestUtil.java
+++ b/dev/core/test/com/google/gwt/dev/shell/DevModeSessionTestUtil.java
@@ -1,13 +1,24 @@
-// Copyright 2011 Google Inc. All Rights Reserved.
-
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package com.google.gwt.dev.shell;
/**
* Provides public method for convenience in unit tests. Allows access of
* package-private member
* {@link DevModeSession#setSessionForCurrentThread(DevModeSession)}.
- *
- * @author jhumphries@google.com (Joshua Humphries)
*/
public class DevModeSessionTestUtil {
public static DevModeSession createSession(String moduleName, String userAgent,
diff --git a/dev/core/test/com/google/gwt/dev/shell/remoteui/MessageTransportTest.java b/dev/core/test/com/google/gwt/dev/shell/remoteui/MessageTransportTest.java
index 300d96d..f1e3d43 100644
--- a/dev/core/test/com/google/gwt/dev/shell/remoteui/MessageTransportTest.java
+++ b/dev/core/test/com/google/gwt/dev/shell/remoteui/MessageTransportTest.java
@@ -1,12 +1,27 @@
+/*
+ * Copyright 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package com.google.gwt.dev.shell.remoteui;
import com.google.gwt.dev.shell.remoteui.MessageTransport.RequestException;
import com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message;
import com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Failure;
import com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request;
-import com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response;
import com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest;
import com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.RequestType;
+import com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response;
import com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse;
import junit.framework.TestCase;
@@ -20,6 +35,9 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
+/**
+ * Tests for {@link MessageTransport}.
+ */
public class MessageTransportTest extends TestCase {
private static class MockNetwork {
@@ -75,7 +93,7 @@
/**
* Tests that sending an async request to a server when the server's socket is
* closed with result in an ExecutionException on a call to future.get().
- *
+ *
* @throws ExecutionException
* @throws InterruptedException
* @throws IOException
@@ -313,7 +331,7 @@
* Tests that a client request is successfully received by the
* RequestProcessor, and the response generated by the RequestProcessor is
* successfully received by the client.
- *
+ *
* @throws IOException
* @throws ExecutionException
* @throws InterruptedException
@@ -388,7 +406,7 @@
* Tests that a client request is successfully received by the
* RequestProcessor, and the exception thrown by the RequestProcessor is
* passed back in the form of an error response to the client.
- *
+ *
* @throws IOException
* @throws ExecutionException
* @throws InterruptedException
diff --git a/dev/core/test/com/google/gwt/dev/typeinfo/test/InteractiveTypeOracle.java b/dev/core/test/com/google/gwt/dev/typeinfo/test/InteractiveTypeOracle.java
index 7691e1b..5440701 100644
--- a/dev/core/test/com/google/gwt/dev/typeinfo/test/InteractiveTypeOracle.java
+++ b/dev/core/test/com/google/gwt/dev/typeinfo/test/InteractiveTypeOracle.java
@@ -36,9 +36,12 @@
import java.util.Map;
import java.util.Set;
+/**
+ * Command line tool to query a TypeOracle.
+ */
public class InteractiveTypeOracle {
- public static interface CommandHandler {
+ static interface CommandHandler {
/**
* Specifies the keyword causes this handler to be invoked.
*/
diff --git a/dev/core/test/com/google/gwt/dev/util/UtilityTest.java b/dev/core/test/com/google/gwt/dev/util/UtilityTest.java
index 8120815..1ec4183 100644
--- a/dev/core/test/com/google/gwt/dev/util/UtilityTest.java
+++ b/dev/core/test/com/google/gwt/dev/util/UtilityTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2007 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package com.google.gwt.dev.util;
import com.google.gwt.util.tools.Utility;
@@ -8,14 +23,12 @@
/** Pure junit test of Utility functionality*/
public class UtilityTest extends TestCase {
-
-
-
+
/** Tests that URLAsChars correctly processes unicode*/
public void testUnicode() {
URL r = this.getClass().getResource("unicodeTest.txt");
assertNotNull(r);
-
+
char[] x = Util.readURLAsChars(r);
assertEquals(2,x.length);
char a = '\u4F60';
@@ -36,7 +49,7 @@
try {
Utility.versionCompare("1.4.3.22.1.dodo", "1.4.3.22.1");
- fail("Should have trown a IllegalArgumentException") ;
+ fail("Should have trown a IllegalArgumentException");
} catch (IllegalArgumentException e) {
}
try {
@@ -44,6 +57,5 @@
fail("Should have trown a IllegalArgumentException");
} catch (IllegalArgumentException e) {
}
-
}
}
diff --git a/dev/core/test/com/google/gwt/dev/util/collect/IdentityHashMapTest.java b/dev/core/test/com/google/gwt/dev/util/collect/IdentityHashMapTest.java
index 4e17349..c4e0e99 100644
--- a/dev/core/test/com/google/gwt/dev/util/collect/IdentityHashMapTest.java
+++ b/dev/core/test/com/google/gwt/dev/util/collect/IdentityHashMapTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2009 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,6 +27,9 @@
*/
public class IdentityHashMapTest {
+ /**
+ * Tests that {@link IdentityHashMap} satisfies HashMap tests.
+ */
public static class HashMapExtTest extends HashMapTest {
public HashMapExtTest(String testName) {
super(testName);
@@ -50,6 +53,9 @@
}
}
+ /**
+ * Tests that {@link IdentityHashMap} satisfies IdentityMap tests.
+ */
public static class IdentityMapExtTest extends TestIdentityMap {
public static Test suite() {
return new TestSuite(IdentityMapExtTest.class);
diff --git a/dev/core/test/com/google/gwt/dev/util/editdistance/CharIndexTest.java b/dev/core/test/com/google/gwt/dev/util/editdistance/CharIndexTest.java
index cdd2490..1cff115 100644
--- a/dev/core/test/com/google/gwt/dev/util/editdistance/CharIndexTest.java
+++ b/dev/core/test/com/google/gwt/dev/util/editdistance/CharIndexTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2010 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,22 +15,19 @@
*/
package com.google.gwt.dev.util.editdistance;
-import com.google.gwt.dev.util.editdistance.CharIndex;
-
import junit.framework.TestCase;
/**
* Tests for {@link CharIndex}.
*/
public class CharIndexTest extends TestCase {
-
/**
* Tests a mapping where the masked reduction fails (where
* the low-order bits of several characters overlap.
*/
public void testFullHash() throws Exception {
String string = "abc\u0001\u0101\u0201\u0301";
- CharIndex idx = CharIndex.getInstance(string+string);
+ CharIndex idx = CharIndex.getInstance(string + string);
assertEquals(idx.getClass(), CharIndex.FullHash.class);
assertEquals(idx.lookup('c'), 3);
assertEquals(idx.nullElement(), 0);
@@ -54,10 +51,10 @@
*/
public void testMasked() throws Exception {
String string = "\u0141\u0142\u0171\u0131";
- CharIndex idx = CharIndex.getInstance(string+string);
+ CharIndex idx = CharIndex.getInstance(string + string);
assertEquals(idx.getClass(), CharIndex.Masked.class);
assertEquals(idx.lookup('\u0141'), 0x0041);
- assertEquals(idx.size(), (idx.nullElement()+1));
+ assertEquals(idx.size(), (idx.nullElement() + 1));
generalVerify(idx, string, "xyz012\u0123\u1234");
}
@@ -67,10 +64,10 @@
*/
public void testStraight() throws Exception {
String string = "abcdandmore";
- CharIndex idx = CharIndex.getInstance(string+string);
+ CharIndex idx = CharIndex.getInstance(string + string);
assertEquals(idx.getClass(), CharIndex.Straight.class);
assertEquals(idx.lookup('a'), 'a');
- assertEquals(idx.size(), (idx.nullElement()+1));
+ assertEquals(idx.size(), (idx.nullElement() + 1));
generalVerify(idx, string, "xyz012\u0123\u1234");
}
diff --git a/dev/core/test/com/google/gwt/dev/util/editdistance/GeneralEditDistanceTest.java b/dev/core/test/com/google/gwt/dev/util/editdistance/GeneralEditDistanceTest.java
index 62e4017..261ca7a 100644
--- a/dev/core/test/com/google/gwt/dev/util/editdistance/GeneralEditDistanceTest.java
+++ b/dev/core/test/com/google/gwt/dev/util/editdistance/GeneralEditDistanceTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2010 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,9 +15,6 @@
*/
package com.google.gwt.dev.util.editdistance;
-import com.google.gwt.dev.util.editdistance.GeneralEditDistance;
-import com.google.gwt.dev.util.editdistance.GeneralEditDistances;
-
import junit.framework.TestCase;
/**
@@ -143,7 +140,7 @@
* the results of better algorithms.
*/
public static int dynamicProgrammingLevenshtein(String s1, String s2) {
- int[] lastRow = new int[s1.length()+1];
+ int[] lastRow = new int[s1.length() + 1];
for (int i = 0; i < lastRow.length; i++) {
lastRow[i] = i;
}
@@ -152,12 +149,12 @@
thisRow[0] = j + 1;
char s2c = s2.charAt(j);
for (int i = 1; i < thisRow.length; i++) {
- thisRow[i] = Math.min(Math.min(lastRow[i]+1,thisRow[i-1]+1),
- lastRow[i-1] + ((s2c == s1.charAt(i-1)) ? 0 : 1));
+ thisRow[i] = Math.min(Math.min(lastRow[i] + 1,thisRow[i - 1] + 1),
+ lastRow[i - 1] + ((s2c == s1.charAt(i - 1)) ? 0 : 1));
}
lastRow = thisRow;
}
- return lastRow[lastRow.length-1];
+ return lastRow[lastRow.length - 1];
}
/**
@@ -189,7 +186,7 @@
}
return edits;
}
-
+
/**
* Generates a long random alphabetic string,
* suitable for use with testSomeEdits (using digits for the alphabet).
@@ -216,7 +213,7 @@
if (s1.length() < 500) {
/*
- * For small strings, try every limit
+ * For small strings, try every limit
*/
int max = Math.max(s1.length(), s2.length()) + 2;
for (int k = 0; k < max; k++) {
@@ -243,7 +240,7 @@
}
/* Always try near MAX_VALUE */
- assertEquals(ed.getDistance(s2, Integer.MAX_VALUE-1), expectedResult);
+ assertEquals(ed.getDistance(s2, Integer.MAX_VALUE - 1), expectedResult);
assertEquals(ed.getDistance(s2, Integer.MAX_VALUE), expectedResult);
}
@@ -316,7 +313,7 @@
assertEquals(
GeneralEditDistances.atMostOneError("unchanged", un.append("changed")),
0);
-
+
assertEquals(GeneralEditDistances.atMostOneError("shirt", "short"), 1);
assertEquals(GeneralEditDistances.atMostOneError("shirt", "shirts"), 1);
assertEquals(GeneralEditDistances.atMostOneError("sort", "short"), 1);
diff --git a/dev/core/test/com/google/gwt/dev/util/editdistance/ModifiedBerghelRoachEditDistanceTest.java b/dev/core/test/com/google/gwt/dev/util/editdistance/ModifiedBerghelRoachEditDistanceTest.java
index be95e82..17de917 100644
--- a/dev/core/test/com/google/gwt/dev/util/editdistance/ModifiedBerghelRoachEditDistanceTest.java
+++ b/dev/core/test/com/google/gwt/dev/util/editdistance/ModifiedBerghelRoachEditDistanceTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2010 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,14 +15,12 @@
*/
package com.google.gwt.dev.util.editdistance;
-import com.google.gwt.dev.util.editdistance.GeneralEditDistance;
-import com.google.gwt.dev.util.editdistance.ModifiedBerghelRoachEditDistance;
-import com.google.gwt.dev.util.editdistance.GeneralEditDistanceTest.AbstractLevenshteinTestCase;
-
import static com.google.gwt.dev.util.editdistance.GeneralEditDistanceTest.MAGNA;
import static com.google.gwt.dev.util.editdistance.GeneralEditDistanceTest.generateRandomString;
import static com.google.gwt.dev.util.editdistance.GeneralEditDistanceTest.testSomeEdits;
+import com.google.gwt.dev.util.editdistance.GeneralEditDistanceTest.AbstractLevenshteinTestCase;
+
/**
* Test cases for the ModifiedBerghelRoachEditDistance class.
*
diff --git a/dev/core/test/com/google/gwt/dev/util/editdistance/MyersBitParallelEditDistanceTest.java b/dev/core/test/com/google/gwt/dev/util/editdistance/MyersBitParallelEditDistanceTest.java
index 9998788..0e94055 100644
--- a/dev/core/test/com/google/gwt/dev/util/editdistance/MyersBitParallelEditDistanceTest.java
+++ b/dev/core/test/com/google/gwt/dev/util/editdistance/MyersBitParallelEditDistanceTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2010 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,9 +15,6 @@
*/
package com.google.gwt.dev.util.editdistance;
-import com.google.gwt.dev.util.editdistance.GeneralEditDistance;
-import com.google.gwt.dev.util.editdistance.MyersBitParallelEditDistance;
-
import junit.framework.TestCase;
/**
@@ -43,7 +40,7 @@
s1, s2,
1);
GeneralEditDistanceTest.genericVerification(generate(s1),
- s1, s2+"x",
+ s1, s2 + "x",
1);
}
@@ -65,7 +62,7 @@
s1, s2,
5 /*fN@05*/);
}
-
+
/*
* Some tests with strings exactly 32 characters long -- just enough
* for an "int" bitmap.
@@ -78,7 +75,7 @@
s1, s2,
1);
GeneralEditDistanceTest.genericVerification(generate(s1),
- s1, s2+"x",
+ s1, s2 + "x",
1);
}
@@ -96,30 +93,30 @@
public void test64end() {
String s1 = "abcdefghijklmnopqrstuvwxyz0123456";
String s2 = "abcdefghijklmnopqrstuvwxyz012345";
- GeneralEditDistanceTest.genericVerification(generate(s1+s1),
- s1+s1, s1+s2,
+ GeneralEditDistanceTest.genericVerification(generate(s1 + s1),
+ s1 + s1, s1 + s2,
1);
- GeneralEditDistanceTest.genericVerification(generate(s1+s1),
- s1+s1, s1+s2+"x",
+ GeneralEditDistanceTest.genericVerification(generate(s1 + s1),
+ s1 + s1, s1 + s2 + "x",
1);
}
public void test64middle() {
String s1 = "abcdefghijklmnopqrstuvwxyz0123456";
String s2 = "abcdefghijklmnopqrstuvwxyz012345";
- GeneralEditDistanceTest.genericVerification(generate(s1+s1),
- s1+s1, s1+"x"+s2,
+ GeneralEditDistanceTest.genericVerification(generate(s1 + s1),
+ s1 + s1, s1 + "x" + s2,
2);
- GeneralEditDistanceTest.genericVerification(generate(s1+s1),
- s1+s1, s2+"x"+s1,
+ GeneralEditDistanceTest.genericVerification(generate(s1 + s1),
+ s1 + s1, s2 + "x" + s1,
1);
}
public void test64start() {
String s1 = "abcdefghijklmnopqrstuvwxyz0123456";
String s2 = "Abcdefghijklmnopqrstuvwxyz0123456";
- GeneralEditDistanceTest.genericVerification(generate(s1+s1),
- s1+s1, s2+s1,
+ GeneralEditDistanceTest.genericVerification(generate(s1 + s1),
+ s1 + s1, s2 + s1,
1);
GeneralEditDistanceTest.genericVerification(generate(s1),
s1, s2.substring(1),
@@ -137,7 +134,7 @@
GeneralEditDistanceTest.genericVerification(generate(s1),
s1, s2,
- 5+4 /*fN@05, aG$6*/);
+ 5 + 4 /*fN@05, aG$6*/);
}
/** Verifies the choice of bit array sizing */
@@ -147,11 +144,11 @@
MyersBitParallelEditDistance.Empty.class);
assertEquals(generate(thirtyTwo).getClass(),
MyersBitParallelEditDistance.TYPEint.class);
- assertEquals(generate(thirtyTwo+"x").getClass(),
+ assertEquals(generate(thirtyTwo + "x").getClass(),
MyersBitParallelEditDistance.TYPElong.class);
- assertEquals(generate(thirtyTwo+thirtyTwo).getClass(),
+ assertEquals(generate(thirtyTwo + thirtyTwo).getClass(),
MyersBitParallelEditDistance.TYPElong.class);
- assertEquals(generate(thirtyTwo+thirtyTwo+"x").getClass(),
+ assertEquals(generate(thirtyTwo + thirtyTwo + "x").getClass(),
MyersBitParallelEditDistance.Multi.class);
}
diff --git a/dev/core/test/com/google/gwt/dev/util/editdistance/PatternBitmapTest.java b/dev/core/test/com/google/gwt/dev/util/editdistance/PatternBitmapTest.java
index 8941315..c86a861 100644
--- a/dev/core/test/com/google/gwt/dev/util/editdistance/PatternBitmapTest.java
+++ b/dev/core/test/com/google/gwt/dev/util/editdistance/PatternBitmapTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2010 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,16 +15,13 @@
*/
package com.google.gwt.dev.util.editdistance;
-import com.google.gwt.dev.util.editdistance.CharIndex;
-import com.google.gwt.dev.util.editdistance.PatternBitmap;
-
import junit.framework.TestCase;
/**
* Tests for {@link PatternBitmap}.
*/
public class PatternBitmapTest extends TestCase {
-
+
/** Reverses a string */
public static String reverse(String s) {
StringBuilder b = new StringBuilder();
@@ -55,7 +52,7 @@
int where = string.indexOf(c);
if (where >= 0) {
assertTrue("Map for pattern character '" + c + "' should be non-zero",
- (map[idx.lookup(c)] & (1<<where)) != 0);
+ (map[idx.lookup(c)] & (1 << where)) != 0);
} else {
assertEquals("Map for unused character '" + c + "' should be zero",
0, map[idx.lookup(c)]);
@@ -78,9 +75,9 @@
wordSize);
/* Spot check some */
- assertEquals(1<<0, map[idx.lookup('x')][0]);
- assertEquals(1<<20, map[idx.lookup('x')][1]);
- assertEquals(1<<5, map[idx.lookup('x')][2]);
+ assertEquals(1 << 0, map[idx.lookup('x')][0]);
+ assertEquals(1 << 20, map[idx.lookup('x')][1]);
+ assertEquals(1 << 5, map[idx.lookup('x')][2]);
/* Check all others for null element/not */
int[] notThere = map[idx.lookup('\u0000')];
@@ -91,7 +88,7 @@
assertTrue("Map for pattern character '" + c + "'"
+ " should be non-zero",
(map[idx.lookup(c)] != notThere));
- int bit = map[idx.lookup(c)][where/wordSize] & (1 << (where%wordSize));
+ int bit = map[idx.lookup(c)][where / wordSize] & (1 << (where % wordSize));
assertTrue("Map for pattern character '" + c + "'"
+ " should have " + where + " bit on",
(bit != 0));
@@ -127,7 +124,7 @@
int where = string.indexOf(c);
if (where >= 0) {
assertTrue("Map for pattern character '" + c + "' should be non-zero",
- (map[idx.lookup(c)] & (1L<<where)) != 0);
+ (map[idx.lookup(c)] & (1L << where)) != 0);
} else {
assertEquals("Map for unused character '" + c + "' should be zero",
0, map[idx.lookup(c)]);
diff --git a/dev/core/test/com/google/gwt/dev/util/log/dashboard/SpeedTracerLoggerTestMockNotifier.java b/dev/core/test/com/google/gwt/dev/util/log/dashboard/SpeedTracerLoggerTestMockNotifier.java
index 354366a..ecedd22 100644
--- a/dev/core/test/com/google/gwt/dev/util/log/dashboard/SpeedTracerLoggerTestMockNotifier.java
+++ b/dev/core/test/com/google/gwt/dev/util/log/dashboard/SpeedTracerLoggerTestMockNotifier.java
@@ -1,12 +1,12 @@
/*
* Copyright 2010 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -44,7 +44,7 @@
this.startTimeNanos = startTimeNanos;
this.durationNanos = durationNanos;
}
-
+
public DevModeEvent(Event e) {
this.session = e.getDevModeSession();
this.eventType = e.getType().getName();
@@ -55,7 +55,7 @@
public DevModeSession getDevModeSession() {
return session;
}
-
+
@Override
public boolean equals(Object o) {
if (o != null && o instanceof DevModeEvent) {
@@ -69,14 +69,14 @@
@Override
public int hashCode() {
int hash = 37;
- hash = hash*19 + session.hashCode();
- hash = hash*19 + eventType.hashCode();
- hash = hash*19 + Long.valueOf(startTimeNanos).hashCode();
- hash = hash*19 + Long.valueOf(durationNanos).hashCode();
+ hash = hash * 19 + session.hashCode();
+ hash = hash * 19 + eventType.hashCode();
+ hash = hash * 19 + Long.valueOf(startTimeNanos).hashCode();
+ hash = hash * 19 + Long.valueOf(durationNanos).hashCode();
return hash;
}
}
-
+
/**
* Activates this mock object. After calling this, the notifier factory will
* be setup so that dashboard notifications are enabled and the notifier
@@ -100,7 +100,7 @@
+ "before call DashboardNotifier.devModeEventEnd()", started);
started = true;
}
-
+
@Override
public void devModeEventEnd(DevModeSession session, String eventType, long startTimeNanos,
long durationNanos) {
@@ -129,7 +129,7 @@
* Returns the sequence of events posted to the notifier. Also validates that
* the notifier is in a valid state (i.e. not between calls to beginning and
* ending an event).
- *
+ *
* @return the sequence of events posted to the notifier
*/
public LinkedList<DevModeEvent> getEventSequence() {
diff --git a/dev/core/test/com/google/gwt/lang/LongLibTest.java b/dev/core/test/com/google/gwt/lang/LongLibTest.java
index 93beb66..7249fe5 100644
--- a/dev/core/test/com/google/gwt/lang/LongLibTest.java
+++ b/dev/core/test/com/google/gwt/lang/LongLibTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package com.google.gwt.lang;
import com.google.gwt.lang.LongLibBase.LongEmul;
@@ -8,6 +23,9 @@
import java.util.Set;
import java.util.TreeSet;
+/**
+ * Tests for {@link LongLib}.
+ */
public class LongLibTest extends TestCase {
private static abstract class BinaryOp extends Op {
diff --git a/dev/core/test/com/google/gwt/util/tools/shared/JavaScriptStringTest.java b/dev/core/test/com/google/gwt/util/tools/shared/JavaScriptStringTest.java
index 0c92fe9..4fa703c 100644
--- a/dev/core/test/com/google/gwt/util/tools/shared/JavaScriptStringTest.java
+++ b/dev/core/test/com/google/gwt/util/tools/shared/JavaScriptStringTest.java
@@ -1,5 +1,18 @@
-// Copyright 2010 Google Inc. All Rights Reserved.
-
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package com.google.gwt.util.tools.shared;
import com.google.gwt.dev.js.rhino.TokenStream;
diff --git a/eclipse/README.txt b/eclipse/README.txt
index e080e25..20bb796 100644
--- a/eclipse/README.txt
+++ b/eclipse/README.txt
@@ -129,7 +129,7 @@
Eclipse is optional, since it is also run as part of the acceptance
test suite.
-1. Install Checkstyle version 4.4.3 (newer versions will not work)
+1. Install Checkstyle version 5.7.
The Eclipse Checkstyle plugin can be found at:
http://eclipse-cs.sourceforge.net/
diff --git a/eclipse/settings/code-style/gwt-checkstyle-tests.xml b/eclipse/settings/code-style/gwt-checkstyle-tests.xml
index bbd1205..99e9b97 100644
--- a/eclipse/settings/code-style/gwt-checkstyle-tests.xml
+++ b/eclipse/settings/code-style/gwt-checkstyle-tests.xml
@@ -10,7 +10,19 @@
<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
<module name="Checker">
<property name="severity" value="warning"/>
+ <module name="RegexpHeader">
+ <property name="fileExtensions" value="java"/>
+ <property name="severity" value="error"/>
+ <property name="header" value="^/\*[ ]*$\n^ \* Copyright 20(0[6789]|[12][0-9]) Google Inc\.$\n^ \*[ ]*$\n^ \* Licensed under the Apache License, Version 2\.0 \(the "License"\); you may not( use this file except)?$\n^ \* (use this file except )?in compliance with the License\. You may obtain a copy of( the License at)?$\n^ \* the License at$\n^ \*[ ]*$\n^ \* http://www\.apache\.org/licenses/LICENSE-2\.0$\n^ \*[ ]*\n \* Unless required by applicable law or agreed to in writing, software( distributed under the License)?$\n^ \* (distributed under the License )?is distributed on an "AS IS" BASIS, WITHOUT( WARRANTIES OR CONDITIONS OF ANY KIND, either express)?$\n^ \* (WARRANTIES OR CONDITIONS OF ANY KIND, either express )?or implied\. See the( License for the specific language governing permissions and limitations under)?$\n^ \* License for the specific language governing permissions and limitations under$\n^ \* the License\.$\n^ \*/$"/>
+ <property name="multiLines" value="6,13"/>
+ </module>
+ <module name="FileTabCharacter">
+ <property name="fileExtensions" value="java"/>
+ <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="no tabs"/>
+ <property name="severity" value="error"/>
+ </module>
<module name="TreeWalker">
+ <property name="fileExtensions" value="java"/>
<module name="FileContentsHolder"/>
<module name="InterfaceIsType">
<metadata name="com.atlassw.tools.eclipse.checkstyle.lastEnabledSeverity" value="error"/>
@@ -25,6 +37,7 @@
<module name="JavadocType">
<property name="severity" value="error"/>
<property name="scope" value="protected"/>
+ <property name="allowMissingParamTags" value="true"/>
</module>
<module name="PackageName">
<property name="severity" value="error"/>
@@ -87,20 +100,12 @@
<property name="logLoadErrors" value="true"/>
<property name="tokens" value="METHOD_DEF"/>
</module>
- <module name="RegexpHeader">
- <property name="severity" value="error"/>
- <property name="header" value="^/\*[ ]*$\n^ \* Copyright 20(0[6789]|[12][0-9]) Google Inc\.$\n^ \*[ ]*$\n^ \* Licensed under the Apache License, Version 2\.0 \(the "License"\); you may not( use this file except)?$\n^ \* (use this file except )?in compliance with the License\. You may obtain a copy of( the License at)?$\n^ \* the License at$\n^ \*[ ]*$\n^ \* http://www\.apache\.org/licenses/LICENSE-2\.0$\n^ \*[ ]*\n \* Unless required by applicable law or agreed to in writing, software( distributed under the License)?$\n^ \* (distributed under the License )?is distributed on an "AS IS" BASIS, WITHOUT( WARRANTIES OR CONDITIONS OF ANY KIND, either express)?$\n^ \* (WARRANTIES OR CONDITIONS OF ANY KIND, either express )?or implied\. See the( License for the specific language governing permissions and limitations under)?$\n^ \* License for the specific language governing permissions and limitations under$\n^ \* the License\.$\n^ \*/$"/>
- <property name="multiLines" value="6,13"/>
- </module>
<module name="ImportOrder">
<property name="severity" value="error"/>
<property name="groups" value="com.google, com, junit, net,org, java,javax"/>
- <property name="ordered" value="false"/>
+ <property name="ordered" value="true"/>
<property name="separated" value="true"/>
- </module>
- <module name="TabCharacter">
- <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="no tabs"/>
- <property name="severity" value="error"/>
+ <property name="option" value="top"/>
</module>
<module name="DefaultComesLast">
<metadata name="com.atlassw.tools.eclipse.checkstyle.lastEnabledSeverity" value="error"/>
@@ -153,16 +158,12 @@
<module name="AvoidStarImport">
<property name="severity" value="error"/>
</module>
- <module name="GenericIllegalRegexp">
+ <module name="RegexpSinglelineJava">
<metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="bad // comment"/>
<property name="severity" value="error"/>
<property name="format" value=" [/][/][A-z]"/>
<property name="message" value="// comments must be followed by a space and be on their own line"/>
</module>
- <module name="DoubleCheckedLocking">
- <metadata name="com.atlassw.tools.eclipse.checkstyle.lastEnabledSeverity" value="error"/>
- <property name="severity" value="ignore"/>
- </module>
<module name="EmptyStatement">
<metadata name="com.atlassw.tools.eclipse.checkstyle.lastEnabledSeverity" value="error"/>
<property name="severity" value="ignore"/>
@@ -195,6 +196,11 @@
<property name="severity" value="ignore"/>
<property name="format" value="^[a-z_][a-zA-Z0-9_]*$"/>
</module>
+ <module name="NoWhitespaceAfter">
+ <property name="severity" value="error"/>
+ <property name="allowLineBreaks" value="false"/>
+ <property name="tokens" value="BNOT,DEC,DOT,INC,LNOT,UNARY_MINUS,UNARY_PLUS"/>
+ </module>
<module name="WhitespaceAfter">
<property name="tokens" value="TYPECAST"/>
</module>
@@ -216,7 +222,7 @@
<module name="RedundantModifier"/>
<module name="EqualsHashCode"/>
</module>
- <module name="PackageHtml">
+ <module name="JavadocPackage">
<property name="severity" value="ignore"/>
</module>
<module name="SuppressionCommentFilter">
@@ -224,10 +230,21 @@
<property name="onCommentFormat" value="CHECKSTYLE_ON"/>
</module>
<module name="SuppressionCommentFilter">
- <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Avoid name checking"/>
- <property name="offCommentFormat" value="CHECKSTYLE_NAMING_OFF"/>
- <property name="onCommentFormat" value="CHECKSTYLE_NAMING_ON"/>
- <property name="checkFormat" value=".*Name.*"/>
- <property name="messageFormat" value=".*name.*"/>
+ <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Avoid name checking"/>
+ <property name="offCommentFormat" value="CHECKSTYLE_NAMING_OFF"/>
+ <property name="onCommentFormat" value="CHECKSTYLE_NAMING_ON"/>
+ <property name="checkFormat" value="MethodName"/>
+ </module>
+ <module name="SuppressionCommentFilter">
+ <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Avoid name checking"/>
+ <property name="offCommentFormat" value="CHECKSTYLE_NAMING_OFF"/>
+ <property name="onCommentFormat" value="CHECKSTYLE_NAMING_ON"/>
+ <property name="checkFormat" value="MemberName"/>
+ </module>
+ <module name="SuppressionCommentFilter">
+ <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Avoid name checking"/>
+ <property name="offCommentFormat" value="CHECKSTYLE_NAMING_OFF"/>
+ <property name="onCommentFormat" value="CHECKSTYLE_NAMING_ON"/>
+ <property name="checkFormat" value="ParameterName"/>
</module>
</module>
diff --git a/eclipse/settings/code-style/gwt-checkstyle.xml b/eclipse/settings/code-style/gwt-checkstyle.xml
index 0206954..a71fe5a 100644
--- a/eclipse/settings/code-style/gwt-checkstyle.xml
+++ b/eclipse/settings/code-style/gwt-checkstyle.xml
@@ -10,9 +10,21 @@
<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
<module name="Checker">
<property name="severity" value="warning"/>
+ <module name="RegexpHeader">
+ <property name="fileExtensions" value="java"/>
+ <property name="severity" value="error"/>
+ <property name="header" value="^/\*[ ]*$\n^ \* Copyright 20(0[6789]|[12][0-9]) Google Inc\.$\n^ \*[ ]*$\n^ \* Licensed under the Apache License, Version 2\.0 \(the "License"\); you may not( use this file except)?$\n^ \* (use this file except )?in compliance with the License\. You may obtain a copy of( the License at)?$\n^ \* the License at$\n^ \*[ ]*$\n^ \* http://www\.apache\.org/licenses/LICENSE-2\.0$\n^ \*[ ]*\n \* Unless required by applicable law or agreed to in writing, software( distributed under the License)?$\n^ \* (distributed under the License )?is distributed on an "AS IS" BASIS, WITHOUT( WARRANTIES OR CONDITIONS OF ANY KIND, either express)?$\n^ \* (WARRANTIES OR CONDITIONS OF ANY KIND, either express )?or implied\. See the( License for the specific language governing permissions and limitations under)?$\n^ \* License for the specific language governing permissions and limitations under$\n^ \* the License\.$\n^ \*/$"/>
+ <property name="multiLines" value="6,13"/>
+ </module>
+ <module name="FileTabCharacter">
+ <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="no tabs"/>
+ <property name="fileExtensions" value="java"/>
+ <property name="severity" value="error"/>
+ </module>
<module name="TreeWalker">
- <module name="FileContentsHolder"/>
- <module name="InterfaceIsType">
+ <property name="fileExtensions" value="java"/>
+ <module name="FileContentsHolder" />
+ <module name="InterfaceIsType">
<property name="severity" value="ignore"/>
</module>
<module name="RedundantImport">
@@ -80,20 +92,12 @@
<property name="logLoadErrors" value="true"/>
<property name="tokens" value="METHOD_DEF"/>
</module>
- <module name="RegexpHeader">
- <property name="severity" value="error"/>
- <property name="header" value="^/\*[ ]*$\n^ \* Copyright 20(0[6789]|[12][0-9]) Google Inc\.$\n^ \*[ ]*$\n^ \* Licensed under the Apache License, Version 2\.0 \(the "License"\); you may not( use this file except)?$\n^ \* (use this file except )?in compliance with the License\. You may obtain a copy of( the License at)?$\n^ \* the License at$\n^ \*[ ]*$\n^ \* http://www\.apache\.org/licenses/LICENSE-2\.0$\n^ \*[ ]*\n \* Unless required by applicable law or agreed to in writing, software( distributed under the License)?$\n^ \* (distributed under the License )?is distributed on an "AS IS" BASIS, WITHOUT( WARRANTIES OR CONDITIONS OF ANY KIND, either express)?$\n^ \* (WARRANTIES OR CONDITIONS OF ANY KIND, either express )?or implied\. See the( License for the specific language governing permissions and limitations under)?$\n^ \* License for the specific language governing permissions and limitations under$\n^ \* the License\.$\n^ \*/$"/>
- <property name="multiLines" value="6,13"/>
- </module>
<module name="ImportOrder">
<property name="severity" value="error"/>
<property name="groups" value="com.google, com, junit, net,org, java,javax"/>
- <property name="ordered" value="false"/>
+ <property name="ordered" value="true"/>
<property name="separated" value="true"/>
- </module>
- <module name="TabCharacter">
- <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="no tabs"/>
- <property name="severity" value="error"/>
+ <property name="option" value="top"/>
</module>
<module name="DefaultComesLast">
<property name="severity" value="error"/>
@@ -141,15 +145,12 @@
<module name="AvoidStarImport">
<property name="severity" value="error"/>
</module>
- <module name="GenericIllegalRegexp">
+ <module name="RegexpSinglelineJava">
<metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="bad // comment"/>
<property name="severity" value="error"/>
<property name="format" value=" [/][/][A-z]"/>
<property name="message" value="// comments must be followed by a space and be on their own line"/>
</module>
- <module name="DoubleCheckedLocking">
- <property name="severity" value="error"/>
- </module>
<module name="EmptyStatement">
<property name="severity" value="error"/>
</module>
@@ -199,18 +200,29 @@
<module name="RedundantModifier"/>
<module name="EqualsHashCode"/>
</module>
- <module name="PackageHtml">
+ <module name="JavadocPackage">
<property name="severity" value="ignore"/>
</module>
- <module name="SuppressionCommentFilter">
- <property name="offCommentFormat" value="CHECKSTYLE_OFF"/>
- <property name="onCommentFormat" value="CHECKSTYLE_ON"/>
+ <module name="SuppressionCommentFilter">
+ <property name="offCommentFormat" value="CHECKSTYLE_OFF"/>
+ <property name="onCommentFormat" value="CHECKSTYLE_ON"/>
</module>
<module name="SuppressionCommentFilter">
- <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Avoid name checking"/>
- <property name="offCommentFormat" value="CHECKSTYLE_NAMING_OFF"/>
- <property name="onCommentFormat" value="CHECKSTYLE_NAMING_ON"/>
- <property name="checkFormat" value=".*Name.*"/>
- <property name="messageFormat" value=".*name.*"/>
+ <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Avoid name checking"/>
+ <property name="offCommentFormat" value="CHECKSTYLE_NAMING_OFF"/>
+ <property name="onCommentFormat" value="CHECKSTYLE_NAMING_ON"/>
+ <property name="checkFormat" value="MethodName"/>
+ </module>
+ <module name="SuppressionCommentFilter">
+ <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Avoid name checking"/>
+ <property name="offCommentFormat" value="CHECKSTYLE_NAMING_OFF"/>
+ <property name="onCommentFormat" value="CHECKSTYLE_NAMING_ON"/>
+ <property name="checkFormat" value="MemberName"/>
+ </module>
+ <module name="SuppressionCommentFilter">
+ <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Avoid name checking"/>
+ <property name="offCommentFormat" value="CHECKSTYLE_NAMING_OFF"/>
+ <property name="onCommentFormat" value="CHECKSTYLE_NAMING_ON"/>
+ <property name="checkFormat" value="ParameterName"/>
</module>
</module>
diff --git a/platforms.ant.xml b/platforms.ant.xml
index 72a03c9..d4b6ccb 100755
--- a/platforms.ant.xml
+++ b/platforms.ant.xml
@@ -1,31 +1,31 @@
<project name="platforms">
- <import file="${gwt.root}/common.ant.xml" />
+ <import file="${gwt.root}/common.ant.xml"/>
<!-- "build" is the default when subprojects are directly targetted -->
- <property name="target" value="build" />
+ <property name="target" value="build"/>
- <available file="core/build.xml" type="file" property="core.exists" />
+ <available file="core/build.xml" type="file" property="core.exists"/>
<target name="core" description="Run core" if="core.exists">
- <gwt.ant dir="core" />
+ <gwt.ant dir="core"/>
</target>
- <target name="-do" depends="core" description="Run all platforms" />
+ <target name="-do" depends="core" description="Run all platforms"/>
<target name="build" description="Build each platforms">
<antcall target="-do">
- <param name="target" value="build" />
+ <param name="target" value="build"/>
</antcall>
</target>
<target name="checkstyle" description="Static analysis of source for each platform">
<antcall target="-do">
- <param name="target" value="checkstyle" />
+ <param name="target" value="checkstyle"/>
</antcall>
</target>
<target name="test" description="Test each platform">
<antcall target="-do">
- <param name="target" value="test" />
+ <param name="target" value="test"/>
</antcall>
</target>
diff --git a/samples/BUILD b/samples/BUILD
index d39d623..cb8e518 100644
--- a/samples/BUILD
+++ b/samples/BUILD
@@ -33,7 +33,10 @@
# Note: ant_test.sh replaces this build.xml file with its own stub.
filegroup(
name = "ant",
- srcs = ["build.xml"],
+ srcs = glob([
+ "build.xml",
+ "**/*.java",
+ ]),
)
Zip(
diff --git a/samples/logexample/src/com/google/gwt/sample/logexample/client/ServerLoggingArea.java b/samples/logexample/src/com/google/gwt/sample/logexample/client/ServerLoggingArea.java
index 98fe14a..8fd6edd 100644
--- a/samples/logexample/src/com/google/gwt/sample/logexample/client/ServerLoggingArea.java
+++ b/samples/logexample/src/com/google/gwt/sample/logexample/client/ServerLoggingArea.java
@@ -17,10 +17,10 @@
package com.google.gwt.sample.logexample.client;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.sample.logexample.shared.MyService;
import com.google.gwt.sample.logexample.shared.MyServiceAsync;
import com.google.gwt.sample.logexample.shared.SharedClass;
-import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiHandler;
import com.google.gwt.user.client.Window;
diff --git a/samples/mail/src/com/google/gwt/sample/mail/client/MailList.java b/samples/mail/src/com/google/gwt/sample/mail/client/MailList.java
index 06b7fec..adf1b82 100644
--- a/samples/mail/src/com/google/gwt/sample/mail/client/MailList.java
+++ b/samples/mail/src/com/google/gwt/sample/mail/client/MailList.java
@@ -1,12 +1,12 @@
/*
* Copyright 2007 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -22,10 +22,10 @@
import com.google.gwt.uibinder.client.UiField;
import com.google.gwt.uibinder.client.UiHandler;
import com.google.gwt.user.client.ui.FlexTable;
+import com.google.gwt.user.client.ui.HTMLTable.Cell;
import com.google.gwt.user.client.ui.HasHorizontalAlignment;
import com.google.gwt.user.client.ui.ResizeComposite;
import com.google.gwt.user.client.ui.Widget;
-import com.google.gwt.user.client.ui.HTMLTable.Cell;
/**
* A composite that displays a list of emails that can be selected.
@@ -33,7 +33,7 @@
public class MailList extends ResizeComposite {
/**
- * Callback when mail items are selected.
+ * Callback when mail items are selected.
*/
public interface Listener {
void onItemSelected(MailItem item);
@@ -135,7 +135,7 @@
/**
* Selects the given row (relative to the current page).
- *
+ *
* @param row the row to be selected
*/
private void selectRow(int row) {
diff --git a/samples/showcase/src/com/google/gwt/sample/showcase/client/content/i18n/CwDateTimeFormat.java b/samples/showcase/src/com/google/gwt/sample/showcase/client/content/i18n/CwDateTimeFormat.java
index 2a2a0dd..c83b64c 100644
--- a/samples/showcase/src/com/google/gwt/sample/showcase/client/content/i18n/CwDateTimeFormat.java
+++ b/samples/showcase/src/com/google/gwt/sample/showcase/client/content/i18n/CwDateTimeFormat.java
@@ -30,12 +30,12 @@
import com.google.gwt.sample.showcase.client.ShowcaseAnnotations.ShowcaseStyle;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.Grid;
+import com.google.gwt.user.client.ui.HTMLTable.CellFormatter;
import com.google.gwt.user.client.ui.HasVerticalAlignment;
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.ListBox;
import com.google.gwt.user.client.ui.TextBox;
import com.google.gwt.user.client.ui.Widget;
-import com.google.gwt.user.client.ui.HTMLTable.CellFormatter;
import java.util.Date;
diff --git a/samples/showcase/src/com/google/gwt/sample/showcase/client/content/i18n/PluralMessages.java b/samples/showcase/src/com/google/gwt/sample/showcase/client/content/i18n/PluralMessages.java
index a9b1947..ab0afb1 100644
--- a/samples/showcase/src/com/google/gwt/sample/showcase/client/content/i18n/PluralMessages.java
+++ b/samples/showcase/src/com/google/gwt/sample/showcase/client/content/i18n/PluralMessages.java
@@ -1,12 +1,12 @@
/*
* Copyright 2009 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,8 +15,8 @@
*/
package com.google.gwt.sample.showcase.client.content.i18n;
-import com.google.gwt.i18n.client.Messages;
import com.google.gwt.i18n.client.LocalizableResource.DefaultLocale;
+import com.google.gwt.i18n.client.Messages;
/**
* Internationalized messages used by {@link CwPluralFormsExample}. Used to
diff --git a/samples/showcase/src/com/google/gwt/sample/showcase/client/content/panels/CwDecoratorPanel.java b/samples/showcase/src/com/google/gwt/sample/showcase/client/content/panels/CwDecoratorPanel.java
index 0546e6c..aadae0c 100644
--- a/samples/showcase/src/com/google/gwt/sample/showcase/client/content/panels/CwDecoratorPanel.java
+++ b/samples/showcase/src/com/google/gwt/sample/showcase/client/content/panels/CwDecoratorPanel.java
@@ -25,10 +25,10 @@
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.DecoratorPanel;
import com.google.gwt.user.client.ui.FlexTable;
+import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter;
import com.google.gwt.user.client.ui.HasHorizontalAlignment;
import com.google.gwt.user.client.ui.TextBox;
import com.google.gwt.user.client.ui.Widget;
-import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter;
/**
* Example file.
diff --git a/samples/showcase/src/com/google/gwt/sample/showcase/client/content/panels/CwDisclosurePanel.java b/samples/showcase/src/com/google/gwt/sample/showcase/client/content/panels/CwDisclosurePanel.java
index 789a196..9f3cc96 100644
--- a/samples/showcase/src/com/google/gwt/sample/showcase/client/content/panels/CwDisclosurePanel.java
+++ b/samples/showcase/src/com/google/gwt/sample/showcase/client/content/panels/CwDisclosurePanel.java
@@ -26,6 +26,7 @@
import com.google.gwt.user.client.ui.DecoratorPanel;
import com.google.gwt.user.client.ui.DisclosurePanel;
import com.google.gwt.user.client.ui.FlexTable;
+import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter;
import com.google.gwt.user.client.ui.Grid;
import com.google.gwt.user.client.ui.HasHorizontalAlignment;
import com.google.gwt.user.client.ui.HorizontalPanel;
@@ -33,7 +34,6 @@
import com.google.gwt.user.client.ui.TextBox;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
-import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter;
/**
* Example file.
diff --git a/samples/showcase/src/com/google/gwt/sample/showcase/client/content/tables/CwFlexTable.java b/samples/showcase/src/com/google/gwt/sample/showcase/client/content/tables/CwFlexTable.java
index 0c2a294..b5ed6d3 100644
--- a/samples/showcase/src/com/google/gwt/sample/showcase/client/content/tables/CwFlexTable.java
+++ b/samples/showcase/src/com/google/gwt/sample/showcase/client/content/tables/CwFlexTable.java
@@ -28,12 +28,12 @@
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.FlexTable;
+import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter;
import com.google.gwt.user.client.ui.HasHorizontalAlignment;
import com.google.gwt.user.client.ui.HasVerticalAlignment;
import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
-import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter;
/**
* Example file.
diff --git a/samples/showcase/src/com/google/gwt/sample/showcase/client/content/widgets/CwFileUpload.java b/samples/showcase/src/com/google/gwt/sample/showcase/client/content/widgets/CwFileUpload.java
index 7f91c4c..68613d8 100644
--- a/samples/showcase/src/com/google/gwt/sample/showcase/client/content/widgets/CwFileUpload.java
+++ b/samples/showcase/src/com/google/gwt/sample/showcase/client/content/widgets/CwFileUpload.java
@@ -17,6 +17,8 @@
import com.google.gwt.core.client.GWT;
import com.google.gwt.core.client.RunAsyncCallback;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.i18n.client.Constants;
import com.google.gwt.sample.showcase.client.ContentWidget;
import com.google.gwt.sample.showcase.client.ShowcaseAnnotations.ShowcaseData;
@@ -25,8 +27,6 @@
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.Button;
-import com.google.gwt.event.dom.client.ClickHandler;
-import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.user.client.ui.FileUpload;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.VerticalPanel;
diff --git a/samples/showcase/src/com/google/gwt/sample/showcase/client/content/widgets/CwHyperlink.java b/samples/showcase/src/com/google/gwt/sample/showcase/client/content/widgets/CwHyperlink.java
index 3c9c2e6..2f10d51 100644
--- a/samples/showcase/src/com/google/gwt/sample/showcase/client/content/widgets/CwHyperlink.java
+++ b/samples/showcase/src/com/google/gwt/sample/showcase/client/content/widgets/CwHyperlink.java
@@ -20,10 +20,10 @@
import com.google.gwt.i18n.client.Constants;
import com.google.gwt.sample.showcase.client.ContentWidget;
import com.google.gwt.sample.showcase.client.Showcase;
-import com.google.gwt.sample.showcase.client.ShowcaseConstants;
import com.google.gwt.sample.showcase.client.ShowcaseAnnotations.ShowcaseData;
import com.google.gwt.sample.showcase.client.ShowcaseAnnotations.ShowcaseSource;
import com.google.gwt.sample.showcase.client.ShowcaseAnnotations.ShowcaseStyle;
+import com.google.gwt.sample.showcase.client.ShowcaseConstants;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.Hyperlink;
diff --git a/samples/showcase/src/com/google/gwt/sample/showcase/generator/ShowcaseGenerator.java b/samples/showcase/src/com/google/gwt/sample/showcase/generator/ShowcaseGenerator.java
index 019347c..1d29d56 100644
--- a/samples/showcase/src/com/google/gwt/sample/showcase/generator/ShowcaseGenerator.java
+++ b/samples/showcase/src/com/google/gwt/sample/showcase/generator/ShowcaseGenerator.java
@@ -23,11 +23,11 @@
import com.google.gwt.core.ext.typeinfo.NotFoundException;
import com.google.gwt.sample.showcase.client.ContentWidget;
import com.google.gwt.sample.showcase.client.Showcase;
-import com.google.gwt.sample.showcase.client.ShowcaseConstants;
import com.google.gwt.sample.showcase.client.ShowcaseAnnotations.ShowcaseData;
import com.google.gwt.sample.showcase.client.ShowcaseAnnotations.ShowcaseRaw;
import com.google.gwt.sample.showcase.client.ShowcaseAnnotations.ShowcaseSource;
import com.google.gwt.sample.showcase.client.ShowcaseAnnotations.ShowcaseStyle;
+import com.google.gwt.sample.showcase.client.ShowcaseConstants;
import java.io.BufferedReader;
import java.io.IOException;
diff --git a/samples/validation/src/main/java/com/google/gwt/sample/validation/client/SampleValidatorFactory.java b/samples/validation/src/main/java/com/google/gwt/sample/validation/client/SampleValidatorFactory.java
index fd5ae12..bea841a 100644
--- a/samples/validation/src/main/java/com/google/gwt/sample/validation/client/SampleValidatorFactory.java
+++ b/samples/validation/src/main/java/com/google/gwt/sample/validation/client/SampleValidatorFactory.java
@@ -18,8 +18,8 @@
import com.google.gwt.core.client.GWT;
import com.google.gwt.sample.validation.shared.ClientGroup;
import com.google.gwt.sample.validation.shared.Person;
-import com.google.gwt.validation.client.GwtValidation;
import com.google.gwt.validation.client.AbstractGwtValidatorFactory;
+import com.google.gwt.validation.client.GwtValidation;
import com.google.gwt.validation.client.impl.AbstractGwtValidator;
import javax.validation.Validator;
diff --git a/samples/validation/src/main/java/com/google/gwt/sample/validation/client/ValidationMessages.java b/samples/validation/src/main/java/com/google/gwt/sample/validation/client/ValidationMessages.java
index ae526ff..ed344bc 100644
--- a/samples/validation/src/main/java/com/google/gwt/sample/validation/client/ValidationMessages.java
+++ b/samples/validation/src/main/java/com/google/gwt/sample/validation/client/ValidationMessages.java
@@ -32,5 +32,8 @@
*/
@DefaultStringValue("Name must be at least {min} characters long.")
@Key("custom.name.size.message")
+
+// CHECKSTYLE_NAMING_OFF
String custom_name_size_message();
+// CHECKSTYLE_NAMING_ON
}
diff --git a/samples/validation/src/main/java/com/google/gwt/sample/validation/server/GreetingServiceImpl.java b/samples/validation/src/main/java/com/google/gwt/sample/validation/server/GreetingServiceImpl.java
index 9d6418f..316f693 100644
--- a/samples/validation/src/main/java/com/google/gwt/sample/validation/server/GreetingServiceImpl.java
+++ b/samples/validation/src/main/java/com/google/gwt/sample/validation/server/GreetingServiceImpl.java
@@ -4,7 +4,7 @@
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
@@ -15,12 +15,12 @@
*/
package com.google.gwt.sample.validation.server;
-import com.google.gwt.user.server.rpc.RemoteServiceServlet;
import com.google.gwt.safehtml.shared.SafeHtml;
import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
import com.google.gwt.sample.validation.client.GreetingService;
import com.google.gwt.sample.validation.shared.Person;
import com.google.gwt.sample.validation.shared.ServerGroup;
+import com.google.gwt.user.server.rpc.RemoteServiceServlet;
import org.hibernate.validator.engine.ValidationSupport;
diff --git a/user/build.xml b/user/build.xml
index 109423b..cd19da8 100755
--- a/user/build.xml
+++ b/user/build.xml
@@ -1,46 +1,51 @@
<project name="user" default="build" basedir=".">
- <property name="gwt.root" location=".." />
- <property name="project.tail" value="user" />
- <property name="test.args" value="-ea" />
- <property name="test.jvmargs" value="-ea" />
+ <property name="gwt.root" location=".."/>
+ <property name="project.tail" value="user"/>
+ <property name="test.args" value="-ea"/>
+ <property name="test.jvmargs" value="-ea"/>
<!-- support old variables names -->
<condition property="gwt.hosts.web.remote" value="${gwt.remote.browsers}">
- <isset property="gwt.remote.browsers" />
+ <isset property="gwt.remote.browsers"/>
</condition>
<condition property="gwt.hosts.web.selenium" value="${gwt.selenium.hosts}">
- <isset property="gwt.selenium.hosts" />
+ <isset property="gwt.selenium.hosts"/>
</condition>
<!--
BrowserManagerServer_Stub compiled using rmic, which doesn't generate
full source code
-->
- <property name="emma.filter.exclude" value="*BrowserManagerServer_Stub*" />
+ <property name="emma.filter.exclude" value="*BrowserManagerServer_Stub*"/>
- <import file="${gwt.root}/common.ant.xml" />
+ <import file="${gwt.root}/common.ant.xml"/>
- <property name="test.timeout" value="5" />
- <property name="emma.merged.out" value="${junit.out}/emma-coverage" />
- <property name="gwt.junit.testcase.web.includes" value="${gwt.junit.testcase.includes}" />
- <property name="gwt.junit.testcase.web.excludes" value="**/*JreSuite.class" />
+ <property name="test.timeout" value="5"/>
+ <property name="emma.merged.out" value="${junit.out}/emma-coverage"/>
+ <property name="gwt.junit.testcase.web.includes" value="${gwt.junit.testcase.includes}"/>
+ <property name="gwt.junit.testcase.web.excludes" value="**/*JreSuite.class"/>
- <property name="gwt.junit.testcase.dev.includes" value="${gwt.junit.testcase.includes}" />
- <property name="gwt.junit.testcase.dev.excludes" value="**/*JreSuite.class" />
+ <property name="gwt.junit.testcase.dev.includes" value="${gwt.junit.testcase.includes}"/>
+ <property name="gwt.junit.testcase.dev.excludes" value="**/*JreSuite.class"/>
- <property name="gwt.tck.testcase.dev.includes" value="com/google/gwt/validation/tck/**/*GwtSuite.class" />
- <property name="gwt.tct.testcase.dev.excludes" value="" />
+ <property name="gwt.tck.testcase.dev.includes"
+ value="com/google/gwt/validation/tck/**/*GwtSuite.class"/>
+ <property name="gwt.tct.testcase.dev.excludes" value=""/>
- <property name="gwt.nongwt.testcase.includes" value="**/*JreSuite.class" />
- <property name="gwt.nongwt.testcase.excludes" value="" />
+ <property name="gwt.nongwt.testcase.includes" value="**/*JreSuite.class"/>
+ <property name="gwt.nongwt.testcase.excludes" value=""/>
<!--
Test args can be specified per test target type.
-->
- <property name="test.args.dev.remote" value="${test.args} -out www -standardsMode -runStyle RemoteWeb:${gwt.hosts.dev.remote}" />
- <property name="test.args.dev.selenium" value='${test.args} -out www -standardsMode -runStyle "Selenium:${gwt.hosts.dev.selenium}"' />
- <property name="test.args.web.remote" value="${test.args} -out www -prod -standardsMode -runStyle RemoteWeb:${gwt.hosts.web.remote}" />
- <property name="test.args.web.selenium" value='${test.args} -prod -standardsMode -out www -runStyle "Selenium:${gwt.hosts.web.selenium}"' />
+ <property name="test.args.dev.remote"
+ value="${test.args} -out www -standardsMode -runStyle RemoteWeb:${gwt.hosts.dev.remote}"/>
+ <property name="test.args.dev.selenium"
+ value='${test.args} -out www -standardsMode -runStyle "Selenium:${gwt.hosts.dev.selenium}"'/>
+ <property name="test.args.web.remote"
+ value="${test.args} -out www -prod -standardsMode -runStyle RemoteWeb:${gwt.hosts.web.remote}"/>
+ <property name="test.args.web.selenium"
+ value='${test.args} -prod -standardsMode -out www -runStyle "Selenium:${gwt.hosts.web.selenium}"'/>
<!--
Whether I18NSuite should test e.g. Foo$InnerMsgs_fr.properties (if the
@@ -49,70 +54,82 @@
<property name="gwt.i18n.test.InnerClassChar" value="dollar"/>
<!-- Platform shouldn't matter here, just picking one -->
- <property.ensure name="gwt.dev.jar" location="${gwt.build.lib}/gwt-dev.jar" />
+ <property.ensure name="gwt.dev.jar" location="${gwt.build.lib}/gwt-dev.jar"/>
<!--
Classpaths added for test cases
-->
<path id="test.extraclasspath">
- <pathelement location="${gwt.build}/out/dev/bin-test" />
- <pathelement location="test-super" />
- <pathelement location="test_i18n_${gwt.i18n.test.InnerClassChar}" />
- <pathelement location="${gwt.tools.lib}/apache/log4j/log4j-1.2.16.jar" />
+ <pathelement location="${gwt.build}/out/dev/bin-test"/>
+ <pathelement location="test-super"/>
+ <pathelement location="test_i18n_${gwt.i18n.test.InnerClassChar}"/>
+ <pathelement location="${gwt.tools.lib}/apache/log4j/log4j-1.2.16.jar"/>
<pathelement location="${gwt.tools.lib}/cglib/cglib-2.2.jar"/>
<pathelement location="${gwt.tools.lib}/objenesis/objenesis-1.2.jar"/>
<pathelement location="${gwt.tools.lib}/easymock/easymock-3.0.jar"/>
<pathelement location="${gwt.tools.lib}/objectweb/asm-3.1.jar"/>
- <pathelement location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA.jar" />
- <pathelement location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA-sources.jar" />
- <pathelement location="${gwt.tools.lib}/hibernate/validator/hibernate-validator-4.1.0.Final.jar" />
- <pathelement location="${gwt.tools.lib}/hibernate/validator/hibernate-validator-4.1.0.Final-sources.jar" />
- <pathelement location="${gwt.tools.lib}/slf4j/slf4j-api/slf4j-api-1.6.1.jar" />
- <pathelement location="${gwt.tools.lib}/slf4j/slf4j-log4j12/slf4j-log4j12-1.6.1.jar" />
- <pathelement location="${gwt.tools.lib}/json/android-sdk-19.1/json-android.jar" />
- <pathelement location="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar" />
+ <pathelement location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA.jar"/>
+ <pathelement location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA-sources.jar"/>
+ <pathelement
+ location="${gwt.tools.lib}/hibernate/validator/hibernate-validator-4.1.0.Final.jar"/>
+ <pathelement
+ location="${gwt.tools.lib}/hibernate/validator/hibernate-validator-4.1.0.Final-sources.jar"/>
+ <pathelement location="${gwt.tools.lib}/slf4j/slf4j-api/slf4j-api-1.6.1.jar"/>
+ <pathelement location="${gwt.tools.lib}/slf4j/slf4j-log4j12/slf4j-log4j12-1.6.1.jar"/>
+ <pathelement location="${gwt.tools.lib}/json/android-sdk-19.1/json-android.jar"/>
+ <pathelement
+ location="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar"/>
<!-- TCK jars -->
- <pathelement location="${gwt.tools.lib}/hibernate/validator/tck/jsr303-tck-1.0.3.GA-sources.jar" />
- <pathelement location="${gwt.tools.lib}/hibernate/validator/tck/jsr303-tck-1.0.3.GA.jar" />
- <pathelement location="${gwt.tools.lib}/jboss/test-audit/jboss-test-audit-api-1.0.0-sources.jar" />
- <pathelement location="${gwt.tools.lib}/jboss/test-audit/jboss-test-audit-api-1.0.0.jar" />
- <pathelement location="${gwt.tools.lib}/jboss/test-harness/jboss-test-harness-1.0.0-sources.jar" />
- <pathelement location="${gwt.tools.lib}/jboss/test-harness/jboss-test-harness-1.0.0.jar" />
- <pathelement location="${gwt.tools.lib}/jboss/test-harness/jboss-test-harness-api-1.0.0-sources.jar" />
- <pathelement location="${gwt.tools.lib}/jboss/test-harness/jboss-test-harness-api-1.0.0.jar" />
- <pathelement location="${gwt.tools.lib}/testng/testng-5.14.1-sources.jar" />
- <pathelement location="${gwt.tools.lib}/testng/testng-5.14.1-nojunit.jar" />
- <pathelement location="${gwt.dev.jar}" />
+ <pathelement
+ location="${gwt.tools.lib}/hibernate/validator/tck/jsr303-tck-1.0.3.GA-sources.jar"/>
+ <pathelement location="${gwt.tools.lib}/hibernate/validator/tck/jsr303-tck-1.0.3.GA.jar"/>
+ <pathelement
+ location="${gwt.tools.lib}/jboss/test-audit/jboss-test-audit-api-1.0.0-sources.jar"/>
+ <pathelement location="${gwt.tools.lib}/jboss/test-audit/jboss-test-audit-api-1.0.0.jar"/>
+ <pathelement
+ location="${gwt.tools.lib}/jboss/test-harness/jboss-test-harness-1.0.0-sources.jar"/>
+ <pathelement location="${gwt.tools.lib}/jboss/test-harness/jboss-test-harness-1.0.0.jar"/>
+ <pathelement
+ location="${gwt.tools.lib}/jboss/test-harness/jboss-test-harness-api-1.0.0-sources.jar"/>
+ <pathelement location="${gwt.tools.lib}/jboss/test-harness/jboss-test-harness-api-1.0.0.jar"/>
+ <pathelement location="${gwt.tools.lib}/testng/testng-5.14.1-sources.jar"/>
+ <pathelement location="${gwt.tools.lib}/testng/testng-5.14.1-nojunit.jar"/>
+ <pathelement location="${gwt.dev.jar}"/>
</path>
<target name="compile" description="Compile all class files"
- unless="compile.complete">
- <mkdir dir="${javac.out}" />
+ unless="compile.complete">
+ <mkdir dir="${javac.out}"/>
<gwt.javac excludes="**/super/**">
<classpath>
- <pathelement location="${gwt.tools.lib}/jetty/jetty-8.1.12.v20130726/servlet-api-3.0-NoMetaInf.jar" />
- <pathelement location="${gwt.tools.lib}/junit/junit-4.8.2.jar" />
- <pathelement location="${gwt.tools.lib}/selenium/selenium-java-client-driver.jar" />
- <pathelement location="${gwt.tools.lib}/w3c/sac/sac-1.3.jar" />
- <pathelement location="${gwt.tools.lib}/w3c/flute/flute-1.3-gg2.jar" />
- <pathelement location="${gwt.tools.lib}/json/android-sdk-19.1/json-android.jar" />
- <pathelement location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA.jar" />
+ <pathelement
+ location="${gwt.tools.lib}/jetty/jetty-8.1.12.v20130726/servlet-api-3.0-NoMetaInf.jar"/>
+ <pathelement location="${gwt.tools.lib}/junit/junit-4.8.2.jar"/>
+ <pathelement location="${gwt.tools.lib}/selenium/selenium-java-client-driver.jar"/>
+ <pathelement location="${gwt.tools.lib}/w3c/sac/sac-1.3.jar"/>
+ <pathelement location="${gwt.tools.lib}/w3c/flute/flute-1.3-gg2.jar"/>
+ <pathelement location="${gwt.tools.lib}/json/android-sdk-19.1/json-android.jar"/>
+ <pathelement location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA.jar"/>
<!-- The source is included so validation is available from client code -->
- <pathelement location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA-sources.jar" />
- <!-- Hibernate is included until we can provide the super source as an third party jar" -->
- <pathelement location="${gwt.tools.lib}/hibernate/validator/hibernate-validator-4.1.0.Final.jar" />
- <pathelement location="${gwt.tools.lib}/hibernate/validator/hibernate-validator-4.1.0.Final-sources.jar" />
+ <pathelement
+ location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA-sources.jar"/>
+ <!-- Hibernate is included until we can provide the super source as an third party jar" -->
+ <pathelement
+ location="${gwt.tools.lib}/hibernate/validator/hibernate-validator-4.1.0.Final.jar"/>
+ <pathelement
+ location="${gwt.tools.lib}/hibernate/validator/hibernate-validator-4.1.0.Final-sources.jar"/>
<!-- Bootstrap support needed for obfuscated type tokens for JRE runtime -->
- <pathelement location="${gwt.tools.lib}/requestfactory/requestfactory-apt.jar" />
- <pathelement location="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar" />
- <pathelement location="${gwt.dev.jar}" />
+ <pathelement location="${gwt.tools.lib}/requestfactory/requestfactory-apt.jar"/>
+ <pathelement
+ location="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar"/>
+ <pathelement location="${gwt.dev.jar}"/>
</classpath>
</gwt.javac>
<!-- Build the BrowserManagerServer_Stub to allow remote browser testing -->
<rmic base="${javac.out}"
- classname="com.google.gwt.junit.remote.BrowserManagerServer"
- stubversion="1.2"/>
+ classname="com.google.gwt.junit.remote.BrowserManagerServer"
+ stubversion="1.2"/>
</target>
<!--
@@ -120,24 +137,24 @@
Compiles test dependencies in dev/core
-->
<target name="compile.dev.tests">
- <gwt.ant dir="../dev" target="compile.tests" />
+ <gwt.ant dir="../dev" target="compile.tests"/>
</target>
<!--
Compiles the test code for this project
-->
<target name="compile.tests"
- depends="compile.dev.tests, compile.emma.if.enabled"
- unless="compile.tests.complete">
- <mkdir dir="${javac.junit.out}" />
+ depends="compile.dev.tests, compile.emma.if.enabled"
+ unless="compile.tests.complete">
+ <mkdir dir="${javac.junit.out}"/>
<gwt.javac srcdir="test" excludes="com/google/gwt/langtest/**" destdir="${javac.junit.out}">
<classpath>
- <pathelement location="${javac.out}" />
- <pathelement location="${gwt.tools.lib}/junit/junit-4.8.2.jar" />
- <pathelement location="${gwt.tools.lib}/selenium/selenium-java-client-driver.jar" />
+ <pathelement location="${javac.out}"/>
+ <pathelement location="${gwt.tools.lib}/junit/junit-4.8.2.jar"/>
+ <pathelement location="${gwt.tools.lib}/selenium/selenium-java-client-driver.jar"/>
<!-- Bootstrap support needed for obfuscated type tokens for JRE runtime -->
- <pathelement location="${gwt.tools.lib}/requestfactory/requestfactory-apt.jar" />
- <path refid="test.extraclasspath" />
+ <pathelement location="${gwt.tools.lib}/requestfactory/requestfactory-apt.jar"/>
+ <path refid="test.extraclasspath"/>
</classpath>
</gwt.javac>
</target>
@@ -148,30 +165,32 @@
<target name="precompile.modules" depends="compile">
<outofdate>
<sourcefiles>
- <fileset dir="${gwt.root}/user/src" >
+ <fileset dir="${gwt.root}/user/src">
<exclude name="com/google/web/bindery/requestfactory/apt/**"/>
</fileset>
- <fileset dir="${gwt.root}/user/super" />
- <fileset dir="${gwt.root}/dev/core/src" />
- <fileset dir="${gwt.root}/dev/core/super" />
- <fileset file="${gwt.dev.jar}" />
+ <fileset dir="${gwt.root}/user/super"/>
+ <fileset dir="${gwt.root}/dev/core/src"/>
+ <fileset dir="${gwt.root}/dev/core/super"/>
+ <fileset file="${gwt.dev.jar}"/>
</sourcefiles>
<targetfiles>
<!-- TODO(zundel): this is a mechanical transform -->
<!-- from module name. There must be a better way. -->
- <pathelement location="${project.build}/bin/com/google/gwt/core/Core.gwtar" />
- <pathelement location="${project.build}/bin/com/google/gwt/json/JSON.gwtar" />
- <pathelement location="${project.build}/bin/com/google/gwt/regexp/RegExp.gwtar" />
- <pathelement location="${project.build}/bin/com/google/gwt/user/User.gwtar" />
- <pathelement location="${project.build}/bin/com/google/gwt/xml/XML.gwtar" />
- <pathelement location="${project.build}/bin/com/google/gwt/rpc/RPC.gwtar" />
- <pathelement location="${project.build}/bin/com/google/gwt/debug/Debug.gwtar" />
- <pathelement location="${project.build}/bin/com/google/gwt/place/Place.gwtar" />
- <pathelement location="${project.build}/bin/com/google/gwt/activity/Activity.gwtar" />
- <pathelement location="${project.build}/bin/com/google/web/bindery/event/Event.gwtar" />
- <pathelement location="${project.build}/bin/com/google/web/bindery/autobean/AutoBean.gwtar" />
- <pathelement location="${project.build}/bin/com/google/web/bindery/requestfactory/RequestFactory.gwtar" />
- <pathelement location="${project.build}/bin/com/google/gwt/logging/Logging.gwtar" />
+ <pathelement location="${project.build}/bin/com/google/gwt/core/Core.gwtar"/>
+ <pathelement location="${project.build}/bin/com/google/gwt/json/JSON.gwtar"/>
+ <pathelement location="${project.build}/bin/com/google/gwt/regexp/RegExp.gwtar"/>
+ <pathelement location="${project.build}/bin/com/google/gwt/user/User.gwtar"/>
+ <pathelement location="${project.build}/bin/com/google/gwt/xml/XML.gwtar"/>
+ <pathelement location="${project.build}/bin/com/google/gwt/rpc/RPC.gwtar"/>
+ <pathelement location="${project.build}/bin/com/google/gwt/debug/Debug.gwtar"/>
+ <pathelement location="${project.build}/bin/com/google/gwt/place/Place.gwtar"/>
+ <pathelement location="${project.build}/bin/com/google/gwt/activity/Activity.gwtar"/>
+ <pathelement location="${project.build}/bin/com/google/web/bindery/event/Event.gwtar"/>
+ <pathelement
+ location="${project.build}/bin/com/google/web/bindery/autobean/AutoBean.gwtar"/>
+ <pathelement
+ location="${project.build}/bin/com/google/web/bindery/requestfactory/RequestFactory.gwtar"/>
+ <pathelement location="${project.build}/bin/com/google/gwt/logging/Logging.gwtar"/>
</targetfiles>
<sequential>
<compileModule>
@@ -179,23 +198,23 @@
<!-- Order is important! Modules that inherit from -->
<!-- others should come later in the list. -->
<!-- All modules depend on Core -->
- <arg value="com.google.gwt.core.Core" />
- <arg value="com.google.gwt.json.JSON" />
- <arg value="com.google.gwt.regexp.RegExp" />
- <arg value="com.google.gwt.user.User" />
+ <arg value="com.google.gwt.core.Core"/>
+ <arg value="com.google.gwt.json.JSON"/>
+ <arg value="com.google.gwt.regexp.RegExp"/>
+ <arg value="com.google.gwt.user.User"/>
<!-- Below are modules that depend on User -->
- <arg value="com.google.gwt.xml.XML" />
- <arg value="com.google.gwt.rpc.RPC" />
- <arg value="com.google.gwt.debug.Debug" />
- <arg value="com.google.gwt.logging.Logging" />
+ <arg value="com.google.gwt.xml.XML"/>
+ <arg value="com.google.gwt.rpc.RPC"/>
+ <arg value="com.google.gwt.debug.Debug"/>
+ <arg value="com.google.gwt.logging.Logging"/>
- <arg value="com.google.gwt.place.Place" />
- <arg value="com.google.gwt.activity.Activity" />
+ <arg value="com.google.gwt.place.Place"/>
+ <arg value="com.google.gwt.activity.Activity"/>
- <arg value="com.google.web.bindery.event.Event" />
- <arg value="com.google.web.bindery.autobean.AutoBean" />
- <arg value="com.google.web.bindery.requestfactory.RequestFactory" />
+ <arg value="com.google.web.bindery.event.Event"/>
+ <arg value="com.google.web.bindery.autobean.AutoBean"/>
+ <arg value="com.google.web.bindery.requestfactory.RequestFactory"/>
</module>
</compileModule>
</sequential>
@@ -203,22 +222,24 @@
</target>
<target name="build" depends="precompile.modules"
- description="Build and package this project">
- <mkdir dir="${gwt.build.lib}" />
+ description="Build and package this project">
+ <mkdir dir="${gwt.build.lib}"/>
<gwt.jar>
- <fileset dir="src" excludes="**/package.html" />
- <fileset dir="super" excludes="**/package.html" />
- <fileset dir="${javac.out}" />
- <zipfileset src="${gwt.tools.lib}/jetty/jetty-8.1.12.v20130726/servlet-api-3.0-NoMetaInf.jar" excludes="**/*.java"/>
- <zipfileset src="${gwt.tools.lib}/w3c/sac/sac-1.3.jar" />
- <zipfileset src="${gwt.tools.lib}/w3c/flute/flute-1.3-gg2.jar" />
- <zipfileset src="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar" />
+ <fileset dir="src" excludes="**/package.html"/>
+ <fileset dir="super" excludes="**/package.html"/>
+ <fileset dir="${javac.out}"/>
+ <zipfileset src="${gwt.tools.lib}/jetty/jetty-8.1.12.v20130726/servlet-api-3.0-NoMetaInf.jar"
+ excludes="**/*.java"/>
+ <zipfileset src="${gwt.tools.lib}/w3c/sac/sac-1.3.jar"/>
+ <zipfileset src="${gwt.tools.lib}/w3c/flute/flute-1.3-gg2.jar"/>
+ <zipfileset
+ src="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar"/>
</gwt.jar>
</target>
- <target name="checkstyle" description="Static analysis of source">
+ <target name="checkstyle-source" description="Static analysis of source">
<gwt.checkstyle>
- <fileset dir="src" >
+ <fileset dir="src">
<exclude name="javax/validation/super/javax/validation/constraints/Pattern.java"/>
<exclude name="javax/validation/super/javax/validation/spi/ConfigurationState.java"/>
<exclude name="javax/validation/super/javax/validation/MessageInterpolator.java"/>
@@ -227,142 +248,149 @@
<exclude name="org/hibernate/validator/super/org/hibernate/validator/**/*.java"/>
<exclude name="org/hibernate/validator/ValidationMessages.java"/>
</fileset>
- <fileset dir="super/com/google/gwt/emul" />
- <fileset dir="super/com/google/gwt/junit/translatable" />
+ <fileset dir="super/com/google/gwt/emul"/>
+ <fileset dir="super/com/google/gwt/junit/translatable"/>
</gwt.checkstyle>
+ </target>
+ <target name="checkstyle-tests" description="Static analysis of source">
<gwt.checkstyle.tests>
<fileset dir="test">
- <include name="com/google/**/*.java" />
- <include name="test/**" />
+ <include name="com/google/**/*.java"/>
+ <include name="test/**"/>
</fileset>
</gwt.checkstyle.tests>
</target>
+ <target name="checkstyle" description="Static analysis of source"
+ depends="checkstyle-tests,checkstyle-source">
+ </target>
+
<target name="test.remoteweb" depends="test.web.remote">
<echo message="DEPRECATED: test.remoteweb has been renamed test.web.remote"/>
</target>
<target name="test.web.remote"
- description="Run web test with remote browsers"
- if="gwt.hosts.web.remote"
- unless="test.web.remote.disable">
- <echo message="Performing web remote testing at ${gwt.hosts.web.remote}" />
- <property name="test.web.remote.args" value="${test.args.web.remote}" />
+ description="Run web test with remote browsers"
+ if="gwt.hosts.web.remote"
+ unless="test.web.remote.disable">
+ <echo message="Performing web remote testing at ${gwt.hosts.web.remote}"/>
+ <property name="test.web.remote.args" value="${test.args.web.remote}"/>
<fileset id="test.web.remote.tests" dir="${javac.junit.out}"
- includes="${gwt.junit.testcase.web.includes}"
- excludes="${gwt.junit.testcase.web.excludes}" />
+ includes="${gwt.junit.testcase.web.includes}"
+ excludes="${gwt.junit.testcase.web.excludes}"/>
<gwt.junit test.name="test.web.remote"
- test.args="${test.web.remote.args}"
- test.jvmargs="${test.jvmargs}"
- test.out="${junit.out}/web-remote"
- test.cases="test.web.remote.tests" >
+ test.args="${test.web.remote.args}"
+ test.jvmargs="${test.jvmargs}"
+ test.out="${junit.out}/web-remote"
+ test.cases="test.web.remote.tests">
<extraclasspaths>
- <path refid="test.extraclasspath" />
+ <path refid="test.extraclasspath"/>
</extraclasspaths>
</gwt.junit>
</target>
<target name="test.dev.remote"
- depends="compile, compile.tests"
- description="Run dev-mode tests with remote browsers"
- if="gwt.hosts.dev.remote"
- unless="test.dev.remote.disable">
- <echo message="Performing dev-mode remote testing at ${gwt.remote.browsers}" />
- <property name="test.dev.remote.args" value="${test.args.dev.remote}" />
+ depends="compile, compile.tests"
+ description="Run dev-mode tests with remote browsers"
+ if="gwt.hosts.dev.remote"
+ unless="test.dev.remote.disable">
+ <echo message="Performing dev-mode remote testing at ${gwt.remote.browsers}"/>
+ <property name="test.dev.remote.args" value="${test.args.dev.remote}"/>
<fileset id="test.dev.remote.tests" dir="${javac.junit.out}"
- includes="${gwt.junit.testcase.dev.includes}"
- excludes="${gwt.junit.testcase.dev.excludes}" />
+ includes="${gwt.junit.testcase.dev.includes}"
+ excludes="${gwt.junit.testcase.dev.excludes}"/>
<gwt.junit test.name="test.dev.remote"
- test.args="${test.dev.remote.args}"
- test.jvmargs="${test.jvmargs}"
- test.out="${junit.out}/dev-remote" test.cases="test.dev.remote.tests" >
+ test.args="${test.dev.remote.args}"
+ test.jvmargs="${test.jvmargs}"
+ test.out="${junit.out}/dev-remote" test.cases="test.dev.remote.tests">
<extraclasspaths>
- <path refid="test.extraclasspath" />
+ <path refid="test.extraclasspath"/>
</extraclasspaths>
</gwt.junit>
</target>
<target name="test.emma.remote"
- depends="compile, compile.tests"
- description="Run emma tests with remote browsers"
- if="gwt.hosts.dev.remote"
- unless="test.emma.remote.disable">
- <echo message="Performing emma remote testing at ${gwt.hosts.dev.remote}" />
- <property name="test.emma.remote.args" value="${test.args.dev.remote}" />
+ depends="compile, compile.tests"
+ description="Run emma tests with remote browsers"
+ if="gwt.hosts.dev.remote"
+ unless="test.emma.remote.disable">
+ <echo message="Performing emma remote testing at ${gwt.hosts.dev.remote}"/>
+ <property name="test.emma.remote.args" value="${test.args.dev.remote}"/>
<fileset id="test.emma.remote.tests" dir="${javac.junit.out}"
- includes="${gwt.junit.testcase.dev.includes}"
- excludes="${gwt.junit.testcase.dev.excludes}" />
- <gwt.junit test.name="test.emma.remote"
- test.args="${test.emma.remote.args}"
- test.jvmargs="${test.jvmargs}"
- test.out="${junit.out}/emma-remote"
- test.cases="test.emma.remote.tests" >
+ includes="${gwt.junit.testcase.dev.includes}"
+ excludes="${gwt.junit.testcase.dev.excludes}"/>
+ <gwt.junit test.name="test.emma.remote"
+ test.args="${test.emma.remote.args}"
+ test.jvmargs="${test.jvmargs}"
+ test.out="${junit.out}/emma-remote"
+ test.cases="test.emma.remote.tests">
<extraclasspaths>
- <path refid="test.extraclasspath" />
- <pathelement location="${gwt.tools.redist}/emma/emma.jar" />
+ <path refid="test.extraclasspath"/>
+ <pathelement location="${gwt.tools.redist}/emma/emma.jar"/>
</extraclasspaths>
</gwt.junit>
</target>
<target name="test.emma.selenium"
- depends="compile, compile.tests"
- description="Run emma tests with Selenium-RC servers"
- if="gwt.hosts.dev.selenium"
- unless="test.emma.selenium.disable">
- <echo message="Performing emma selenium testing at ${gwt.hosts.dev.selenium}" />
- <property name="test.emma.selenium.args" value="${test.args.dev.selenium}" />
+ depends="compile, compile.tests"
+ description="Run emma tests with Selenium-RC servers"
+ if="gwt.hosts.dev.selenium"
+ unless="test.emma.selenium.disable">
+ <echo message="Performing emma selenium testing at ${gwt.hosts.dev.selenium}"/>
+ <property name="test.emma.selenium.args" value="${test.args.dev.selenium}"/>
<fileset id="test.emma.selenium.tests" dir="${javac.junit.out}"
- includes="${gwt.junit.testcase.dev.includes}"
- excludes="${gwt.junit.testcase.dev.excludes}" />
+ includes="${gwt.junit.testcase.dev.includes}"
+ excludes="${gwt.junit.testcase.dev.excludes}"/>
<gwt.junit test.name="test.emma.selenium"
- test.args='${test.emma.selenium.args}'
- test.jvmargs="${test.jvmargs}"
- test.out="${junit.out}/emma-selenium"
- test.cases="test.emma.selenium.tests" >
+ test.args='${test.emma.selenium.args}'
+ test.jvmargs="${test.jvmargs}"
+ test.out="${junit.out}/emma-selenium"
+ test.cases="test.emma.selenium.tests">
<extraclasspaths>
- <path refid="test.extraclasspath" />
- <pathelement location="${gwt.tools.redist}/emma/emma.jar" />
+ <path refid="test.extraclasspath"/>
+ <pathelement location="${gwt.tools.redist}/emma/emma.jar"/>
</extraclasspaths>
</gwt.junit>
</target>
<target name="test.draft.remote"
- depends="compile, compile.tests"
- description="Run draft compiled tests with remote browsers"
- if="gwt.hosts.web.remote"
- unless="test.draft.remote.disable">
- <echo message="Performing draft remote testing at ${gwt.hosts.web.remote}" />
- <property name="test.draft.remote.args" value="${test.args.web.remote} -draftCompile" />
+ depends="compile, compile.tests"
+ description="Run draft compiled tests with remote browsers"
+ if="gwt.hosts.web.remote"
+ unless="test.draft.remote.disable">
+ <echo message="Performing draft remote testing at ${gwt.hosts.web.remote}"/>
+ <property name="test.draft.remote.args" value="${test.args.web.remote} -draftCompile"/>
<fileset id="test.draft.remote.tests" dir="${javac.junit.out}"
- includes="${gwt.junit.testcase.web.includes}"
- excludes="${gwt.junit.testcase.web.excludes}" />
+ includes="${gwt.junit.testcase.web.includes}"
+ excludes="${gwt.junit.testcase.web.excludes}"/>
<gwt.junit test.name="test.draft.remote"
- test.args="${test.draft.remote.args}"
- test.jvmargs="${test.jvmargs}"
- test.out="${junit.out}/draft-remote"
- test.cases="test.draft.remote.tests" >
+ test.args="${test.draft.remote.args}"
+ test.jvmargs="${test.jvmargs}"
+ test.out="${junit.out}/draft-remote"
+ test.cases="test.draft.remote.tests">
<extraclasspaths>
- <path refid="test.extraclasspath" />
+ <path refid="test.extraclasspath"/>
</extraclasspaths>
</gwt.junit>
</target>
<target name="test.nometa.remote"
- description="Run -XdisableClassMetadata tests with remote browsers"
- if="gwt.hosts.web.remote"
- unless="test.nometa.remote.disable">
- <echo message="Performing nometa remote testing at ${gwt.hosts.web.remote}" />
- <property name="test.nometa.remote.args" value="${test.args.web.remote} -XdisableClassMetadata" />
+ description="Run -XdisableClassMetadata tests with remote browsers"
+ if="gwt.hosts.web.remote"
+ unless="test.nometa.remote.disable">
+ <echo message="Performing nometa remote testing at ${gwt.hosts.web.remote}"/>
+ <property name="test.nometa.remote.args"
+ value="${test.args.web.remote} -XdisableClassMetadata"/>
<fileset id="test.nometa.remote.tests" dir="${javac.junit.out}"
- includes="${gwt.junit.testcase.web.includes}"
- excludes="${gwt.junit.testcase.web.excludes}" />
+ includes="${gwt.junit.testcase.web.includes}"
+ excludes="${gwt.junit.testcase.web.excludes}"/>
<gwt.junit test.name="test.nometa.remote"
- test.args="${test.nometa.remote.args}"
- test.jvmargs="${test.jvmargs}"
- test.out="${junit.out}/nometa-remote"
- test.cases="test.nometa.remote.tests" >
+ test.args="${test.nometa.remote.args}"
+ test.jvmargs="${test.jvmargs}"
+ test.out="${junit.out}/nometa-remote"
+ test.cases="test.nometa.remote.tests">
<extraclasspaths>
- <path refid="test.extraclasspath" />
+ <path refid="test.extraclasspath"/>
</extraclasspaths>
</gwt.junit>
</target>
@@ -372,122 +400,122 @@
</target>
<target name="test.web.selenium"
- depends="compile, compile.tests"
- description="Run web tests using Selenium RC"
- if="gwt.hosts.web.selenium"
- unless="test.web.selenium.disable">
- <echo message="Performing web testing using Selenium RC at ${gwt.hosts.web.selenium}" />
- <property name="test.web.selenium.args" value="${test.args.web.selenium}" />
+ depends="compile, compile.tests"
+ description="Run web tests using Selenium RC"
+ if="gwt.hosts.web.selenium"
+ unless="test.web.selenium.disable">
+ <echo message="Performing web testing using Selenium RC at ${gwt.hosts.web.selenium}"/>
+ <property name="test.web.selenium.args" value="${test.args.web.selenium}"/>
<fileset id="test.web.selenium.tests" dir="${javac.junit.out}"
- includes="${gwt.junit.testcase.web.includes}"
- excludes="${gwt.junit.testcase.web.excludes}" />
+ includes="${gwt.junit.testcase.web.includes}"
+ excludes="${gwt.junit.testcase.web.excludes}"/>
<gwt.junit test.name="test.web.selenium"
- test.args='${test.web.selenium.args}'
- test.jvmargs="${test.jvmargs}"
- test.out="${junit.out}/web-selenium"
- test.cases="test.web.selenium.tests" >
+ test.args='${test.web.selenium.args}'
+ test.jvmargs="${test.jvmargs}"
+ test.out="${junit.out}/web-selenium"
+ test.cases="test.web.selenium.tests">
<extraclasspaths>
- <path refid="test.extraclasspath" />
+ <path refid="test.extraclasspath"/>
</extraclasspaths>
</gwt.junit>
</target>
<target name="test.dev.selenium"
- depends="compile, compile.tests"
- description="Run dev-mode tests using Selenium RC servers"
- if="gwt.hosts.dev.selenium"
- unless="test.dev.selenium.disable">
- <echo message="Performing dev-mode testing using Selenium RC at ${gwt.hosts.dev.selenium}" />
- <property name="test.dev.selenium.args" value="${test.args.dev.selenium}" />
+ depends="compile, compile.tests"
+ description="Run dev-mode tests using Selenium RC servers"
+ if="gwt.hosts.dev.selenium"
+ unless="test.dev.selenium.disable">
+ <echo message="Performing dev-mode testing using Selenium RC at ${gwt.hosts.dev.selenium}"/>
+ <property name="test.dev.selenium.args" value="${test.args.dev.selenium}"/>
<fileset id="test.dev.selenium.tests" dir="${javac.junit.out}"
- includes="${gwt.junit.testcase.dev.includes}"
- excludes="${gwt.junit.testcase.dev.excludes}" />
+ includes="${gwt.junit.testcase.dev.includes}"
+ excludes="${gwt.junit.testcase.dev.excludes}"/>
<gwt.junit test.name="test.dev.selenium"
- test.args='${test.dev.selenium.args}'
- test.jvmargs="${test.jvmargs}"
- test.out="${junit.out}/dev-selenium"
- test.cases="test.dev.selenium.tests" >
+ test.args='${test.dev.selenium.args}'
+ test.jvmargs="${test.jvmargs}"
+ test.out="${junit.out}/dev-selenium"
+ test.cases="test.dev.selenium.tests">
<extraclasspaths>
- <path refid="test.extraclasspath" />
+ <path refid="test.extraclasspath"/>
</extraclasspaths>
</gwt.junit>
</target>
<target name="test.nometa.selenium"
- description="Run nometa tests using Selenium RC"
- if="gwt.hosts.web.selenium"
- unless="test.nometa.selenium.disable">
- <echo message="Performing nometa testing using Selenium RC at ${gwt.hosts.web.selenium}" />
+ description="Run nometa tests using Selenium RC"
+ if="gwt.hosts.web.selenium"
+ unless="test.nometa.selenium.disable">
+ <echo message="Performing nometa testing using Selenium RC at ${gwt.hosts.web.selenium}"/>
<property name="test.nometa.selenium.args"
- value="${test.args.web.selenium} -XdisableClassMetadata" />
+ value="${test.args.web.selenium} -XdisableClassMetadata"/>
<fileset id="test.nometa.selenium.tests" dir="${javac.junit.out}"
- includes="${gwt.junit.testcase.web.includes}"
- excludes="${gwt.junit.testcase.web.excludes}" />
+ includes="${gwt.junit.testcase.web.includes}"
+ excludes="${gwt.junit.testcase.web.excludes}"/>
<gwt.junit test.name="test.nometa.selenium"
- test.args='${test.nometa.selenium.args}'
- test.jvmargs="${test.jvmargs}"
- test.out="${junit.out}/nometa-selenium"
- test.cases="test.nometa.selenium.tests" >
+ test.args='${test.nometa.selenium.args}'
+ test.jvmargs="${test.jvmargs}"
+ test.out="${junit.out}/nometa-selenium"
+ test.cases="test.nometa.selenium.tests">
<extraclasspaths>
- <path refid="test.extraclasspath" />
+ <path refid="test.extraclasspath"/>
</extraclasspaths>
</gwt.junit>
</target>
<target name="test.draft.selenium"
- description="Run draft compiled tests using Selenium RC"
- if="gwt.hosts.web.selenium"
- unless="test.draft.selenium.disable">
- <echo message="Performing draft testing using Selenium RC at ${gwt.hosts.web.selenium}" />
+ description="Run draft compiled tests using Selenium RC"
+ if="gwt.hosts.web.selenium"
+ unless="test.draft.selenium.disable">
+ <echo message="Performing draft testing using Selenium RC at ${gwt.hosts.web.selenium}"/>
<property name="test.draft.selenium.args"
- value="${test.args.web.selenium} -draftCompile" />
+ value="${test.args.web.selenium} -draftCompile"/>
<fileset id="test.draft.selenium.tests" dir="${javac.junit.out}"
- includes="${gwt.junit.testcase.web.includes}"
- excludes="${gwt.junit.testcase.web.excludes}" />
+ includes="${gwt.junit.testcase.web.includes}"
+ excludes="${gwt.junit.testcase.web.excludes}"/>
<gwt.junit test.name="test.draft.selenium"
- test.args='${test.draft.selenium.args}'
- test.jvmargs="${test.jvmargs}"
- test.out="${junit.out}/draft-selenium"
- test.cases="test.draft.selenium.tests" >
+ test.args='${test.draft.selenium.args}'
+ test.jvmargs="${test.jvmargs}"
+ test.out="${junit.out}/draft-selenium"
+ test.cases="test.draft.selenium.tests">
<extraclasspaths>
- <path refid="test.extraclasspath" />
+ <path refid="test.extraclasspath"/>
</extraclasspaths>
</gwt.junit>
</target>
<target name="test.emma.htmlunit"
- depends="compile, compile.tests"
- description="Run emma tests with HtmlUnit"
- unless="test.emma.htmlunit.disable">
- <fileset id="test.emma.htmlunit.tests" dir="${javac.junit.out}"
- includes="${gwt.junit.testcase.dev.includes}"
- excludes="${gwt.junit.testcase.dev.excludes}" />
- <gwt.junit test.name="test.emma.htmlunit"
- test.args="${test.args} -standardsMode "
- test.jvmargs="${test.jvmargs}"
- test.out="${junit.out}/emma-htmlunit"
- test.cases="test.emma.htmlunit.tests" >
+ depends="compile, compile.tests"
+ description="Run emma tests with HtmlUnit"
+ unless="test.emma.htmlunit.disable">
+ <fileset id="test.emma.htmlunit.tests" dir="${javac.junit.out}"
+ includes="${gwt.junit.testcase.dev.includes}"
+ excludes="${gwt.junit.testcase.dev.excludes}"/>
+ <gwt.junit test.name="test.emma.htmlunit"
+ test.args="${test.args} -standardsMode "
+ test.jvmargs="${test.jvmargs}"
+ test.out="${junit.out}/emma-htmlunit"
+ test.cases="test.emma.htmlunit.tests">
<extraclasspaths>
- <path refid="test.extraclasspath" />
- <pathelement location="${gwt.tools.redist}/emma/emma.jar" />
+ <path refid="test.extraclasspath"/>
+ <pathelement location="${gwt.tools.redist}/emma/emma.jar"/>
</extraclasspaths>
</gwt.junit>
</target>
<target name="test.dev.htmlunit"
- depends="compile, compile.tests"
- description="Run dev-mode tests with HtmlUnit."
- unless="test.dev.htmlunit.disable">
+ depends="compile, compile.tests"
+ description="Run dev-mode tests with HtmlUnit."
+ unless="test.dev.htmlunit.disable">
<fileset id="test.dev.htmlunit.tests" dir="${javac.junit.out}"
- includes="${gwt.junit.testcase.dev.includes}"
- excludes="${gwt.junit.testcase.dev.excludes}" />
+ includes="${gwt.junit.testcase.dev.includes}"
+ excludes="${gwt.junit.testcase.dev.excludes}"/>
<gwt.junit test.name="test.dev.htmlunit"
- test.args="${test.args} -standardsMode "
- test.jvmargs="${test.jvmargs}"
- test.out="${junit.out}/dev-htmlunit"
- test.cases="test.dev.htmlunit.tests" >
+ test.args="${test.args} -standardsMode "
+ test.jvmargs="${test.jvmargs}"
+ test.out="${junit.out}/dev-htmlunit"
+ test.cases="test.dev.htmlunit.tests">
<extraclasspaths>
- <path refid="test.extraclasspath" />
+ <path refid="test.extraclasspath"/>
</extraclasspaths>
</gwt.junit>
</target>
@@ -501,247 +529,247 @@
</target>
<target name="test.web.htmlunit"
- depends="compile, compile.tests"
- description="Run web-mode tests with HtmlUnit."
- unless="test.web.htmlunit.disable">
+ depends="compile, compile.tests"
+ description="Run web-mode tests with HtmlUnit."
+ unless="test.web.htmlunit.disable">
<fileset id="test.web.htmlunit.tests" dir="${javac.junit.out}"
- includes="${gwt.junit.testcase.web.includes}"
- excludes="${gwt.junit.testcase.web.excludes}" />
+ includes="${gwt.junit.testcase.web.includes}"
+ excludes="${gwt.junit.testcase.web.excludes}"/>
<gwt.junit test.name="test.web.htmlunit"
- test.args="${test.args} -out www -prod -standardsMode"
- test.jvmargs="${test.jvmargs}"
- test.out="${junit.out}/web-htmlunit"
- test.cases="test.web.htmlunit.tests">
+ test.args="${test.args} -out www -prod -standardsMode"
+ test.jvmargs="${test.jvmargs}"
+ test.out="${junit.out}/web-htmlunit"
+ test.cases="test.web.htmlunit.tests">
<extraclasspaths>
- <path refid="test.extraclasspath" />
+ <path refid="test.extraclasspath"/>
</extraclasspaths>
</gwt.junit>
</target>
<target name="test.nometa.htmlunit"
- depends="compile, compile.tests"
- description="Run -XdisableClassMetadata tests with HtmlUnit."
- unless="test.nometa.htmlunit.disable">
+ depends="compile, compile.tests"
+ description="Run -XdisableClassMetadata tests with HtmlUnit."
+ unless="test.nometa.htmlunit.disable">
<fileset id="test.nometa.htmlunit.tests" dir="${javac.junit.out}"
- includes="${gwt.junit.testcase.web.includes}"
- excludes="${gwt.junit.testcase.web.excludes}" />
+ includes="${gwt.junit.testcase.web.includes}"
+ excludes="${gwt.junit.testcase.web.excludes}"/>
<gwt.junit test.name="test.nometa.htmlunit"
- test.args="${test.args} -XdisableClassMetadata -out www -prod -standardsMode"
- test.jvmargs="${test.jvmargs}"
- test.out="${junit.out}/nometa-htmlunit"
- test.cases="test.nometa.htmlunit.tests" >
+ test.args="${test.args} -XdisableClassMetadata -out www -prod -standardsMode"
+ test.jvmargs="${test.jvmargs}"
+ test.out="${junit.out}/nometa-htmlunit"
+ test.cases="test.nometa.htmlunit.tests">
<extraclasspaths>
- <path refid="test.extraclasspath" />
+ <path refid="test.extraclasspath"/>
</extraclasspaths>
</gwt.junit>
</target>
<target name="test.draft.htmlunit"
- depends="compile, compile.tests"
- description="Run draft compiled HtmlUnit tests (no batching on purpose)"
- unless="test.draft.htmlunit.disable">
+ depends="compile, compile.tests"
+ description="Run draft compiled HtmlUnit tests (no batching on purpose)"
+ unless="test.draft.htmlunit.disable">
<fileset id="test.draft.htmlunit.tests" dir="${javac.junit.out}"
- includes="${gwt.junit.testcase.web.includes}"
- excludes="${gwt.junit.testcase.web.excludes}" />
+ includes="${gwt.junit.testcase.web.includes}"
+ excludes="${gwt.junit.testcase.web.excludes}"/>
<gwt.junit test.name="test.draft.htmlunit"
- test.args="${test.args} -draftCompile -out www -prod -standardsMode"
- test.jvmargs="${test.jvmargs}"
- test.out="${junit.out}/draft-htmlunit"
- test.cases="test.draft.htmlunit.tests" >
+ test.args="${test.args} -draftCompile -out www -prod -standardsMode"
+ test.jvmargs="${test.jvmargs}"
+ test.out="${junit.out}/draft-htmlunit"
+ test.cases="test.draft.htmlunit.tests">
<extraclasspaths>
- <path refid="test.extraclasspath" />
+ <path refid="test.extraclasspath"/>
</extraclasspaths>
</gwt.junit>
</target>
<target name="test.coverage.htmlunit"
- depends="compile, compile.tests"
- description="Run tests for coverage support">
- <fileset id="test.coverage.htmlunit.tests" dir="${javac.junit.out}"
- includes="com/google/gwt/dev/js/client/CoverageTest.class"
- excludes="" />
- <gwt.junit test.name="test.coverage.htmlunit"
- test.args="${test.args} -draftCompile -out www -prod"
- test.jvmargs="${test.jvmargs} -Dgwt.coverage=com/google/gwt/dev/js/client/CoverageTestModule.java,"
- test.out="${junit.out}/coverage-htmlunit"
- test.cases="test.coverage.htmlunit.tests" >
+ depends="compile, compile.tests"
+ description="Run tests for coverage support">
+ <fileset id="test.coverage.htmlunit.tests" dir="${javac.junit.out}"
+ includes="com/google/gwt/dev/js/client/CoverageTest.class"
+ excludes=""/>
+ <gwt.junit test.name="test.coverage.htmlunit"
+ test.args="${test.args} -draftCompile -out www -prod"
+ test.jvmargs="${test.jvmargs} -Dgwt.coverage=com/google/gwt/dev/js/client/CoverageTestModule.java,"
+ test.out="${junit.out}/coverage-htmlunit"
+ test.cases="test.coverage.htmlunit.tests">
<extraclasspaths>
- <path refid="test.extraclasspath" />
+ <path refid="test.extraclasspath"/>
</extraclasspaths>
</gwt.junit>
</target>
<target name="test"
- depends="compile, compile.tests"
- description="Run all tests for this project.">
+ depends="compile, compile.tests"
+ description="Run all tests for this project.">
<!-- Prevent compilation for every target. -->
<property name="compile.complete" value="true"/>
<property name="compile.tests.complete" value="true"/>
<property.ensure name="distro.built" location="${gwt.dev.staging.jar}"
- message="GWT must be built before performing any tests. This can be fixed by running ant in the ${gwt.root} directory." />
+ message="GWT must be built before performing any tests. This can be fixed by running ant in the ${gwt.root} directory."/>
<limit failonerror="true" hours="${test.timeout}">
- <parallel threadsPerProcessor="${gwt.threadsPerProcessor}"
- threadCount="${gwt.threadCount}">
- <!--
- The remote targets must be run sequentially or BrowserManager will queue
- requests, which will cause some tests to timeout while waiting.
- -->
- <sequential>
- <antcall target="test.dev.remote"/>
- <antcall target="test.emma.remote"/>
- <antcall target="test.web.remote"/>
- <antcall target="test.draft.remote"/>
- <antcall target="test.nometa.remote"/>
- </sequential>
- <antcall target="test.dev.selenium"/>
- <antcall target="test.emma.selenium"/>
- <antcall target="test.web.selenium"/>
- <antcall target="test.draft.selenium"/>
- <antcall target="test.nometa.selenium"/>
- <antcall target="test.dev.htmlunit"/>
- <antcall target="test.emma.htmlunit"/>
- <antcall target="test.web.htmlunit"/>
- <antcall target="test.draft.htmlunit"/>
- <antcall target="test.nometa.htmlunit"/>
- <antcall target="test.nongwt"/>
- <antcall target="test.coverage.htmlunit"/>
- </parallel>
+ <parallel threadsPerProcessor="${gwt.threadsPerProcessor}"
+ threadCount="${gwt.threadCount}">
+ <!--
+ The remote targets must be run sequentially or BrowserManager will queue
+ requests, which will cause some tests to timeout while waiting.
+ -->
+ <sequential>
+ <antcall target="test.dev.remote"/>
+ <antcall target="test.emma.remote"/>
+ <antcall target="test.web.remote"/>
+ <antcall target="test.draft.remote"/>
+ <antcall target="test.nometa.remote"/>
+ </sequential>
+ <antcall target="test.dev.selenium"/>
+ <antcall target="test.emma.selenium"/>
+ <antcall target="test.web.selenium"/>
+ <antcall target="test.draft.selenium"/>
+ <antcall target="test.nometa.selenium"/>
+ <antcall target="test.dev.htmlunit"/>
+ <antcall target="test.emma.htmlunit"/>
+ <antcall target="test.web.htmlunit"/>
+ <antcall target="test.draft.htmlunit"/>
+ <antcall target="test.nometa.htmlunit"/>
+ <antcall target="test.nongwt"/>
+ <antcall target="test.coverage.htmlunit"/>
+ </parallel>
</limit>
</target>
<target name="test.htmlunit"
- depends="compile, compile.tests"
- description="Run all HtmlUnit tests">
+ depends="compile, compile.tests"
+ description="Run all HtmlUnit tests">
<!-- Prevent compilation for every target. -->
<property name="compile.complete" value="true"/>
<property name="compile.tests.complete" value="true"/>
<property.ensure name="distro.built" location="${gwt.dev.staging.jar}"
- message="GWT must be built before performing any tests. This can be fixed by running ant in the ${gwt.root} directory." />
+ message="GWT must be built before performing any tests. This can be fixed by running ant in the ${gwt.root} directory."/>
<limit failonerror="true" hours="${test.timeout}">
- <parallel threadsPerProcessor="${gwt.threadsPerProcessor}"
- threadCount="${gwt.threadCount}">
- <antcall target="test.dev.htmlunit"/>
- <antcall target="test.emma.htmlunit"/>
- <antcall target="test.web.htmlunit"/>
- <antcall target="test.draft.htmlunit"/>
- <antcall target="test.nometa.htmlunit"/>
- <antcall target="test.coverage.htmlunit"/>
- </parallel>
+ <parallel threadsPerProcessor="${gwt.threadsPerProcessor}"
+ threadCount="${gwt.threadCount}">
+ <antcall target="test.dev.htmlunit"/>
+ <antcall target="test.emma.htmlunit"/>
+ <antcall target="test.web.htmlunit"/>
+ <antcall target="test.draft.htmlunit"/>
+ <antcall target="test.nometa.htmlunit"/>
+ <antcall target="test.coverage.htmlunit"/>
+ </parallel>
</limit>
</target>
<target name="test.nongwt"
- depends="compile, compile.tests"
- description="Run JRE-only tests."
- unless="test.nongwt.disable">
+ depends="compile, compile.tests"
+ description="Run JRE-only tests."
+ unless="test.nongwt.disable">
<fileset id="test.nongwt.tests" dir="${javac.junit.out}"
- includes="${gwt.nongwt.testcase.includes}"
- excludes="${gwt.nongwt.testcase.excludes}" />
+ includes="${gwt.nongwt.testcase.includes}"
+ excludes="${gwt.nongwt.testcase.excludes}"/>
<gwt.junit test.name="test.nongwt"
- test.args="${test.args}"
- test.jvmargs="${test.jvmargs}"
- test.out="${junit.out}/nongwt"
- test.cases="test.nongwt.tests" >
+ test.args="${test.args}"
+ test.jvmargs="${test.jvmargs}"
+ test.out="${junit.out}/nongwt"
+ test.cases="test.nongwt.tests">
<extraclasspaths>
- <path refid="test.extraclasspath" />
+ <path refid="test.extraclasspath"/>
</extraclasspaths>
</gwt.junit>
</target>
<target name="test.dev"
- depends="compile, compile.tests"
- description="Run dev-mode tests for this project.">
+ depends="compile, compile.tests"
+ description="Run dev-mode tests for this project.">
<!-- Prevent compilation for every target. -->
<property name="compile.complete" value="true"/>
<property name="compile.tests.complete" value="true"/>
<limit failonerror="true" hours="${test.timeout}">
- <parallel threadsPerProcessor="${gwt.threadsPerProcessor}"
- threadCount="${gwt.threadCount}">
- <antcall target="test.dev.htmlunit"/>
- <!-- no-op unless gwt.hosts.dev.remote is defined -->
- <antcall target="test.dev.remote"/>
- <!-- no-op unless gwt.hosts.dev.selenium is defined -->
- <antcall target="test.dev.selenium"/>
- </parallel>
+ <parallel threadsPerProcessor="${gwt.threadsPerProcessor}"
+ threadCount="${gwt.threadCount}">
+ <antcall target="test.dev.htmlunit"/>
+ <!-- no-op unless gwt.hosts.dev.remote is defined -->
+ <antcall target="test.dev.remote"/>
+ <!-- no-op unless gwt.hosts.dev.selenium is defined -->
+ <antcall target="test.dev.selenium"/>
+ </parallel>
</limit>
</target>
<target name="test.web"
- depends="compile, compile.tests"
- description="Run web-mode tests for this project.">
+ depends="compile, compile.tests"
+ description="Run web-mode tests for this project.">
<!-- Prevent compilation for every target. -->
<property name="compile.complete" value="true"/>
<property name="compile.tests.complete" value="true"/>
<limit failonerror="true" hours="${test.timeout}">
- <parallel threadsPerProcessor="${gwt.threadsPerProcessor}"
- threadCount="${gwt.threadCount}">
- <antcall target="test.web.htmlunit"/>
- <!-- no-op unless gwt.hosts.web.remote is defined -->
- <antcall target="test.web.remote"/>
- <!-- no-op unless gwt.hosts.web.selenium is defined -->
- <antcall target="test.web.selenium"/>
- </parallel>
+ <parallel threadsPerProcessor="${gwt.threadsPerProcessor}"
+ threadCount="${gwt.threadCount}">
+ <antcall target="test.web.htmlunit"/>
+ <!-- no-op unless gwt.hosts.web.remote is defined -->
+ <antcall target="test.web.remote"/>
+ <!-- no-op unless gwt.hosts.web.selenium is defined -->
+ <antcall target="test.web.selenium"/>
+ </parallel>
</limit>
</target>
<target name="test.emma"
- depends="compile, compile.tests"
- description="Run emma tests for this project.">
+ depends="compile, compile.tests"
+ description="Run emma tests for this project.">
<!-- Prevent compilation for every target. -->
<property name="compile.complete" value="true"/>
<property name="compile.tests.complete" value="true"/>
<limit failonerror="true" hours="${test.timeout}">
- <parallel threadsPerProcessor="${gwt.threadsPerProcessor}"
- threadCount="${gwt.threadCount}">
- <antcall target="test.emma.htmlunit"/>
- <!-- no-op unless gwt.hosts.dev.remote is defined -->
- <antcall target="test.emma.remote"/>
- <!-- no-op unless gwt.hosts.dev.selenium is defined -->
- <antcall target="test.emma.selenium"/>
- </parallel>
+ <parallel threadsPerProcessor="${gwt.threadsPerProcessor}"
+ threadCount="${gwt.threadCount}">
+ <antcall target="test.emma.htmlunit"/>
+ <!-- no-op unless gwt.hosts.dev.remote is defined -->
+ <antcall target="test.emma.remote"/>
+ <!-- no-op unless gwt.hosts.dev.selenium is defined -->
+ <antcall target="test.emma.selenium"/>
+ </parallel>
</limit>
</target>
<target name="test.draft"
- depends="compile, compile.tests"
- description="Run draft compiled tests for this project.">
+ depends="compile, compile.tests"
+ description="Run draft compiled tests for this project.">
<!-- Prevent compilation for every target. -->
<property name="compile.complete" value="true"/>
<property name="compile.tests.complete" value="true"/>
<limit failonerror="true" hours="${test.timeout}">
- <parallel threadsPerProcessor="${gwt.threadsPerProcessor}"
- threadCount="${gwt.threadCount}">
- <antcall target="test.draft.htmlunit"/>
- <!-- no-op unless gwt.hosts.web.remote is defined -->
- <antcall target="test.draft.remote"/>
- <!-- no-op unless gwt.hosts.web.selenium is defined -->
- <antcall target="test.draft.selenium"/>
- </parallel>
+ <parallel threadsPerProcessor="${gwt.threadsPerProcessor}"
+ threadCount="${gwt.threadCount}">
+ <antcall target="test.draft.htmlunit"/>
+ <!-- no-op unless gwt.hosts.web.remote is defined -->
+ <antcall target="test.draft.remote"/>
+ <!-- no-op unless gwt.hosts.web.selenium is defined -->
+ <antcall target="test.draft.selenium"/>
+ </parallel>
</limit>
</target>
<target name="test.nometa"
- depends="compile, compile.tests"
- description="Run -XdisableClassMetadata tests for this project.">
+ depends="compile, compile.tests"
+ description="Run -XdisableClassMetadata tests for this project.">
<!-- Prevent compilation for every target. -->
<property name="compile.complete" value="true"/>
<property name="compile.tests.complete" value="true"/>
<limit failonerror="true" hours="${test.timeout}">
- <parallel threadsPerProcessor="${gwt.threadsPerProcessor}"
- threadCount="${gwt.threadCount}">
- <antcall target="test.web.htmlunit"/>
- <!-- no-op unless gwt.hosts.web.remote is defined -->
- <antcall target="test.nometa.remote"/>
- <!-- no-op unless gwt.hosts.web.selenium is defined -->
- <antcall target="test.nometa.selenium"/>
- </parallel>
+ <parallel threadsPerProcessor="${gwt.threadsPerProcessor}"
+ threadCount="${gwt.threadCount}">
+ <antcall target="test.web.htmlunit"/>
+ <!-- no-op unless gwt.hosts.web.remote is defined -->
+ <antcall target="test.nometa.remote"/>
+ <!-- no-op unless gwt.hosts.web.selenium is defined -->
+ <antcall target="test.nometa.selenium"/>
+ </parallel>
</limit>
</target>
@@ -750,172 +778,174 @@
<!-- TODO(nchalko) move the tck target to user/build.xml and then delete
all of samples/validaitontck -->
- <target name="tck"
- depends="tck.run,tck.report"
- description="Run all tests for this project.">
- <fail
- message="One or more junit tests failed for target: @{test.name} @{test.args}"
- if="junit.failure" status="2" />
- </target>
+ <target name="tck"
+ depends="tck.run,tck.report"
+ description="Run all tests for this project.">
+ <fail
+ message="One or more junit tests failed for target: @{test.name} @{test.args}"
+ if="junit.failure" status="2"/>
+ </target>
- <target name="tck.run"
- depends="compile, compile.tests"
- description="Run all tests for this project.">
- <!-- Prevent compilation for every target. -->
- <property name="compile.complete" value="true"/>
- <property name="compile.tests.complete" value="true"/>
+ <target name="tck.run"
+ depends="compile, compile.tests"
+ description="Run all tests for this project.">
+ <!-- Prevent compilation for every target. -->
+ <property name="compile.complete" value="true"/>
+ <property name="compile.tests.complete" value="true"/>
- <property.ensure name="distro.built" location="${gwt.dev.staging.jar}"
- message="GWT must be built before performing any tests. This can be fixed by running ant in the ${gwt.root} directory." />
- <limit failonerror="true" hours="${test.timeout}">
+ <property.ensure name="distro.built" location="${gwt.dev.staging.jar}"
+ message="GWT must be built before performing any tests. This can be fixed by running ant in the ${gwt.root} directory."/>
+ <limit failonerror="true" hours="${test.timeout}">
- <antcall target="tck.dev.htmlunit"/>
- </limit>
+ <antcall target="tck.dev.htmlunit"/>
+ </limit>
- <fail
- message="One or more tck tests failed for target: @{test.name} @{test.args}"
- if="junit.failure" status="2" />
- </target>
+ <fail
+ message="One or more tck tests failed for target: @{test.name} @{test.args}"
+ if="junit.failure" status="2"/>
+ </target>
- <macrodef name="countMarkedTests">
- <attribute name="annotation" default="NOT SET" />
- <attribute name="outputproperty" default="jsr303.marked.@{annotation}" />
- <sequential>
+ <macrodef name="countMarkedTests">
+ <attribute name="annotation" default="NOT SET"/>
+ <attribute name="outputproperty" default="jsr303.marked.@{annotation}"/>
+ <sequential>
- </sequential>
- </macrodef>
+ </sequential>
+ </macrodef>
- <macrodef name="compileModule">
- <element name="module" />
- <sequential>
- <gwt.timer name="Pre-compile module">
- <java classname="com.google.gwt.dev.CompileModule" fork="yes" failonerror="true">
- <classpath>
- <pathelement location="${gwt.root}/user/src" />
- <pathelement location="${gwt.root}/user/super" />
- <pathelement location="${gwt.root}/dev/core/src" />
- <pathelement location="${gwt.root}/dev/core/super" />
- <pathelement location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA.jar" />
- <pathelement location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA-sources.jar" />
- <pathelement location="${gwt.root}/build/out/user/bin" />
- <pathelement location="${gwt.dev.jar}" />
- </classpath>
- <jvmarg value="-Xmx512M" />
- <module />
- <arg value="-strict" />
- <arg value="-sourceLevel" />
- <arg value="${javac.source}" />
- <arg value="-out" />
- <arg value="${project.build}/bin" />
- </java>
- </gwt.timer>
- </sequential>
- </macrodef>
+ <macrodef name="compileModule">
+ <element name="module"/>
+ <sequential>
+ <gwt.timer name="Pre-compile module">
+ <java classname="com.google.gwt.dev.CompileModule" fork="yes" failonerror="true">
+ <classpath>
+ <pathelement location="${gwt.root}/user/src"/>
+ <pathelement location="${gwt.root}/user/super"/>
+ <pathelement location="${gwt.root}/dev/core/src"/>
+ <pathelement location="${gwt.root}/dev/core/super"/>
+ <pathelement location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA.jar"/>
+ <pathelement
+ location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA-sources.jar"/>
+ <pathelement location="${gwt.root}/build/out/user/bin"/>
+ <pathelement location="${gwt.dev.jar}"/>
+ </classpath>
+ <jvmarg value="-Xmx512M"/>
+ <module/>
+ <arg value="-strict"/>
+ <arg value="-sourceLevel"/>
+ <arg value="${javac.source}"/>
+ <arg value="-out"/>
+ <arg value="${project.build}/bin"/>
+ </java>
+ </gwt.timer>
+ </sequential>
+ </macrodef>
- <target name="tck.report">
- <mkdir dir="${junit.out}/tck-report" />
- <mkdir dir="${junit.out}/tck-report/text" />
+ <target name="tck.report">
+ <mkdir dir="${junit.out}/tck-report"/>
+ <mkdir dir="${junit.out}/tck-report/text"/>
- <scan>
- <fileset dir="test/org/hibernate/jsr303/tck/tests" id="id"/>
- <filterchain>
- <countfilter match="@Failing" property="jsr303.marked.Failing" init="0"/>
- <countfilter match="@NonTckTest" property="jsr303.marked.NonTckTest" init="0"/>
- <countfilter match="@NotSupported" property="jsr303.marked.NotSupported" init="0"/>
- <countfilter match="@TestNotCompatible" property="jsr303.marked.TestNotCompatible" init="0"/>
- </filterchain>
- </scan>
+ <scan>
+ <fileset dir="test/org/hibernate/jsr303/tck/tests" id="id"/>
+ <filterchain>
+ <countfilter match="@Failing" property="jsr303.marked.Failing" init="0"/>
+ <countfilter match="@NonTckTest" property="jsr303.marked.NonTckTest" init="0"/>
+ <countfilter match="@NotSupported" property="jsr303.marked.NotSupported" init="0"/>
+ <countfilter match="@TestNotCompatible" property="jsr303.marked.TestNotCompatible"
+ init="0"/>
+ </filterchain>
+ </scan>
- <!-- force to zero if not set above -->
- <property name="jsr303.marked.Failing" value="0"/>
- <property name="jsr303.marked.NonTckTest" value="0"/>
- <property name="jsr303.marked.NotSupported" value="0"/>
- <property name="jsr303.marked.TestNotCompatible" value="0"/>
+ <!-- force to zero if not set above -->
+ <property name="jsr303.marked.Failing" value="0"/>
+ <property name="jsr303.marked.NonTckTest" value="0"/>
+ <property name="jsr303.marked.NotSupported" value="0"/>
+ <property name="jsr303.marked.TestNotCompatible" value="0"/>
- <echo message="Marked Failing = ${jsr303.marked.Failing}" />
- <echo message="Marked NonTckTest = ${jsr303.marked.NonTckTest}" />
- <echo message="Marked NotSupported = ${jsr303.marked.NotSupported}" />
- <echo message="Marked TestNotCompatible = ${jsr303.marked.TestNotCompatible}" />
+ <echo message="Marked Failing = ${jsr303.marked.Failing}"/>
+ <echo message="Marked NonTckTest = ${jsr303.marked.NonTckTest}"/>
+ <echo message="Marked NotSupported = ${jsr303.marked.NotSupported}"/>
+ <echo message="Marked TestNotCompatible = ${jsr303.marked.TestNotCompatible}"/>
- <junitreport todir="${junit.out}/tck-report">
- <fileset dir="${junit.out}/tck-dev-htmlunit">
- <include name="reports/TEST-*.xml" />
- </fileset>
- <report format="noframes" todir="${junit.out}/tck-report" styledir="style/html">
- <param name="markedFailing" expression="${jsr303.marked.Failing}" />
- <param name="markedNonTckTest" expression="${jsr303.marked.NonTckTest}" />
- <param name="markedNotSupported" expression="${jsr303.marked.NotSupported}" />
- <param name="markedTestNotCompatible" expression="${jsr303.marked.TestNotCompatible}" />
- </report>
- <report format="noframes" todir="${junit.out}/tck-report/text" styledir="style/text">
- <param name="markedFailing" expression="${jsr303.marked.Failing}" />
- <param name="markedNonTckTest" expression="${jsr303.marked.NonTckTest}" />
- <param name="markedNotSupported" expression="${jsr303.marked.NotSupported}" />
- <param name="markedTestNotCompatible" expression="${jsr303.marked.TestNotCompatible}" />
- </report>
- </junitreport>
+ <junitreport todir="${junit.out}/tck-report">
+ <fileset dir="${junit.out}/tck-dev-htmlunit">
+ <include name="reports/TEST-*.xml"/>
+ </fileset>
+ <report format="noframes" todir="${junit.out}/tck-report" styledir="style/html">
+ <param name="markedFailing" expression="${jsr303.marked.Failing}"/>
+ <param name="markedNonTckTest" expression="${jsr303.marked.NonTckTest}"/>
+ <param name="markedNotSupported" expression="${jsr303.marked.NotSupported}"/>
+ <param name="markedTestNotCompatible" expression="${jsr303.marked.TestNotCompatible}"/>
+ </report>
+ <report format="noframes" todir="${junit.out}/tck-report/text" styledir="style/text">
+ <param name="markedFailing" expression="${jsr303.marked.Failing}"/>
+ <param name="markedNonTckTest" expression="${jsr303.marked.NonTckTest}"/>
+ <param name="markedNotSupported" expression="${jsr303.marked.NotSupported}"/>
+ <param name="markedTestNotCompatible" expression="${jsr303.marked.TestNotCompatible}"/>
+ </report>
+ </junitreport>
- <concat taskname="JSR 303 TCK Result">
- <filelist>
- <file name="${junit.out}/tck-report/text/junit-noframes.html" />
- </filelist>
- </concat>
+ <concat taskname="JSR 303 TCK Result">
+ <filelist>
+ <file name="${junit.out}/tck-report/text/junit-noframes.html"/>
+ </filelist>
+ </concat>
- </target>
+ </target>
- <target name="tck.dev.htmlunit"
- depends="compile, compile.tests"
- description="Run dev-mode tests with HtmlUnit."
- unless="test.dev.htmlunit.disable">
- <fileset id="tck.dev.htmlunit.tests" dir="${javac.junit.out}"
- includes="${gwt.tck.testcase.dev.includes}"
- excludes="${gwt.tck.testcase.dev.excludes}" />
- <gwt.junit test.name="test.dev.htmlunit"
- test.args="${test.args} -standardsMode "
- test.jvmargs="-ea -Dcom.google.gwt.sample.validationtck.util.Failing.include=true"
- test.out="${junit.out}/tck-dev-htmlunit"
- test.cases="tck.dev.htmlunit.tests"
- haltonfailure="false"
- >
- <extraclasspaths>
- <path refid="test.extraclasspath" />
- </extraclasspaths>
- </gwt.junit>
- </target>
+ <target name="tck.dev.htmlunit"
+ depends="compile, compile.tests"
+ description="Run dev-mode tests with HtmlUnit."
+ unless="test.dev.htmlunit.disable">
+ <fileset id="tck.dev.htmlunit.tests" dir="${javac.junit.out}"
+ includes="${gwt.tck.testcase.dev.includes}"
+ excludes="${gwt.tck.testcase.dev.excludes}"/>
+ <gwt.junit test.name="test.dev.htmlunit"
+ test.args="${test.args} -standardsMode "
+ test.jvmargs="-ea -Dcom.google.gwt.sample.validationtck.util.Failing.include=true"
+ test.out="${junit.out}/tck-dev-htmlunit"
+ test.cases="tck.dev.htmlunit.tests"
+ haltonfailure="false"
+ >
+ <extraclasspaths>
+ <path refid="test.extraclasspath"/>
+ </extraclasspaths>
+ </gwt.junit>
+ </target>
<!--
Merges coverage data for the entire project
-->
<target name="emma.merge">
- <delete dir="${emma.merged.out}" />
- <mkdir dir="${emma.merged.out}" />
+ <delete dir="${emma.merged.out}"/>
+ <mkdir dir="${emma.merged.out}"/>
<emma>
- <merge outfile="${emma.merged.out}/merged.emma" >
- <fileset dir="${junit.out}" >
- <include name="**/*.emma" />
- <exclude name="${emma.merged.out}/merged.emma" />
+ <merge outfile="${emma.merged.out}/merged.emma">
+ <fileset dir="${junit.out}">
+ <include name="**/*.emma"/>
+ <exclude name="${emma.merged.out}/merged.emma"/>
</fileset>
</merge>
</emma>
<emma>
<report sourcepath="${project.classpath.src}">
- <fileset file="${javac.emma.out}/metadata.emma" />
- <fileset file="${emma.merged.out}/merged.emma" />
- <txt outfile="${emma.merged.out}/coverage.txt" />
- <html outfile="${emma.merged.out}/coverage.html" />
- <xml outfile="${emma.merged.out}/coverage.xml" />
+ <fileset file="${javac.emma.out}/metadata.emma"/>
+ <fileset file="${emma.merged.out}/merged.emma"/>
+ <txt outfile="${emma.merged.out}/coverage.txt"/>
+ <html outfile="${emma.merged.out}/coverage.html"/>
+ <xml outfile="${emma.merged.out}/coverage.xml"/>
</report>
</emma>
</target>
<target name="clean"
- description="Cleans this project's intermediate and output files">
- <delete dir="${project.build}" />
- <delete file="${project.lib}" />
+ description="Cleans this project's intermediate and output files">
+ <delete dir="${project.build}"/>
+ <delete file="${project.lib}"/>
</target>
<target name="presubmit" depends="test, checkstyle"
- description="runs the gwt api checker, user checkstyle, and user tests">
+ description="runs the gwt api checker, user checkstyle, and user tests">
<gwt.ant dir=".." target="apicheck-nobuild"/>
</target>
</project>
diff --git a/user/javadoc/com/google/gwt/examples/DateTimeFormatExample.java b/user/javadoc/com/google/gwt/examples/DateTimeFormatExample.java
index f0fd365..d117798 100644
--- a/user/javadoc/com/google/gwt/examples/DateTimeFormatExample.java
+++ b/user/javadoc/com/google/gwt/examples/DateTimeFormatExample.java
@@ -1,10 +1,11 @@
package com.google.gwt.examples;
-import java.util.Date;
import com.google.gwt.core.client.EntryPoint;
import com.google.gwt.core.client.GWT;
import com.google.gwt.i18n.client.DateTimeFormat;
+import java.util.Date;
+
public class DateTimeFormatExample implements EntryPoint {
public void onModuleLoad() {
@@ -27,7 +28,7 @@
// prints Dec 18, 2007 12:01:26 PM in the default locale
GWT.log(DateTimeFormat.getMediumDateTimeFormat().format(today));
-
+
// A custom date format
DateTimeFormat fmt = DateTimeFormat.getFormat("EEEE, MMMM dd, yyyy");
// prints Monday, December 17, 2007 in the default locale
diff --git a/user/javadoc/com/google/gwt/examples/FormPanelExample.java b/user/javadoc/com/google/gwt/examples/FormPanelExample.java
index 4001aa4..7501606 100644
--- a/user/javadoc/com/google/gwt/examples/FormPanelExample.java
+++ b/user/javadoc/com/google/gwt/examples/FormPanelExample.java
@@ -1,12 +1,12 @@
/*
* Copyright 2007 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -22,12 +22,12 @@
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.FileUpload;
import com.google.gwt.user.client.ui.FormPanel;
+import com.google.gwt.user.client.ui.FormPanel.SubmitCompleteEvent;
+import com.google.gwt.user.client.ui.FormPanel.SubmitEvent;
import com.google.gwt.user.client.ui.ListBox;
import com.google.gwt.user.client.ui.RootPanel;
import com.google.gwt.user.client.ui.TextBox;
import com.google.gwt.user.client.ui.VerticalPanel;
-import com.google.gwt.user.client.ui.FormPanel.SubmitCompleteEvent;
-import com.google.gwt.user.client.ui.FormPanel.SubmitEvent;
public class FormPanelExample implements EntryPoint {
diff --git a/user/src/com/google/gwt/cell/client/AbstractEditableCell.java b/user/src/com/google/gwt/cell/client/AbstractEditableCell.java
index 66a4bcb..7eb69a6 100644
--- a/user/src/com/google/gwt/cell/client/AbstractEditableCell.java
+++ b/user/src/com/google/gwt/cell/client/AbstractEditableCell.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.cell.client;
-import com.google.gwt.cell.client.Cell.Context;
import com.google.gwt.dom.client.Element;
import java.util.HashMap;
@@ -88,7 +87,7 @@
* given element and key. While a cell is editing, widgets containing the cell
* may choose to pass keystrokes directly to the cell rather than using them
* for navigation purposes.
- *
+ *
* @param context the {@link Context} of the cell
* @param parent the parent Element
* @param value the value associated with the cell
diff --git a/user/src/com/google/gwt/core/client/impl/LoadingStrategyBase.java b/user/src/com/google/gwt/core/client/impl/LoadingStrategyBase.java
index d03f813..29e82d1 100644
--- a/user/src/com/google/gwt/core/client/impl/LoadingStrategyBase.java
+++ b/user/src/com/google/gwt/core/client/impl/LoadingStrategyBase.java
@@ -1,12 +1,12 @@
/*
* Copyright 2011 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -16,19 +16,19 @@
package com.google.gwt.core.client.impl;
import com.google.gwt.core.client.JavaScriptObject;
+import com.google.gwt.core.client.impl.AsyncFragmentLoader.HttpInstallFailure;
import com.google.gwt.core.client.impl.AsyncFragmentLoader.LoadTerminatedHandler;
import com.google.gwt.core.client.impl.AsyncFragmentLoader.LoadingStrategy;
-import com.google.gwt.core.client.impl.AsyncFragmentLoader.HttpInstallFailure;
/**
* Base for a standard loading strategy used in a web browser. Subclasses
* provide an implementation of DownloadStrategy, thereby controlling how
* the download of the code will be done, while the base class controls how
* to interact with the linker, handle download failures, etc.
- *
- * The linker it is used with should provide JavaScript-level functions to
+ *
+ * The linker it is used with should provide JavaScript-level functions to
* indicate how to handle downloading and installing code.
- *
+ *
* Linkers should always provide a function
* <code>__gwtStartLoadingFragment</code>. This function is called by
* this class with two arguments: an integer fragment number that needs
@@ -36,13 +36,13 @@
* fails, that function should be called with a descriptive exception as the
* argument. If the load succeeds, that function may also be called, so long as
* it isn't called until the downloaded code has been installed.
- *
+ *
* If the mechanism for loading the contents of fragments is provided by the
* linker, the <code>__gwtStartLoadingFragment</code> function should return
* <code>null</code> or <code>undefined</code>, and the linker should handle
* installing the code as well. Note that in this case, all the code in this
* class is pretty much moot.
- *
+ *
* Alternatively, the function can return a URL designating from where the code
* for the requested fragment can be downloaded. In that case, the linker should
* also provide a function <code>__gwtInstallCode</code> for actually installing
@@ -60,7 +60,7 @@
protected interface DownloadStrategy {
void tryDownload(final RequestData request);
}
-
+
/**
* A trivial JavaScript map from ints to ints. Used to keep a global count of
* how many times a user has manually retried fetching a fragment.
@@ -71,17 +71,17 @@
}
protected FragmentReloadTracker() { }
-
+
public native int get(int x) /*-{
return this[x] ? this[x] : 0;
}-*/;
-
+
public native void put(int x, int y) /*-{
this[x] = y;
}-*/;
}
-
- /**
+
+ /**
* Since LoadingStrategy must support concurrent requests, we keep most of the
* relevant info in the RequestData, and pass it around. Once created, a
* RequestData interacts primarily with it's DownloadStrategy, which will
@@ -163,7 +163,7 @@
* fails, we do not retry, since there's no reason to expect a different result.
*/
public static int MAX_AUTO_RETRY_COUNT = 3;
-
+
/**
* Call the linker-supplied <code>__gwtInstallCode</code> method. This method
* will attempt to install the code, and throw a runtime exception if it fails,
@@ -187,7 +187,7 @@
}
return __gwtStartLoadingFragment(fragment, $entry(loadFailed));
}-*/;
-
+
private DownloadStrategy downloadStrategy;
private final FragmentReloadTracker manualRetryNumbers = FragmentReloadTracker.create();
@@ -216,9 +216,9 @@
int manualRetry = getManualRetryNum(fragment);
if (manualRetry > 0) {
char connector = url.contains("?") ? '&' : '?';
- url += connector + "manualRetry=" + manualRetry;
+ url += connector + "manualRetry=" + manualRetry;
}
- RequestData request = new RequestData(url, loadErrorHandler,
+ RequestData request = new RequestData(url, loadErrorHandler,
fragment, downloadStrategy, getMaxAutoRetryCount());
request.tryDownload();
}
diff --git a/user/src/com/google/gwt/editor/rebind/model/EditorAccess.java b/user/src/com/google/gwt/editor/rebind/model/EditorAccess.java
index 9260db2..6c58648 100644
--- a/user/src/com/google/gwt/editor/rebind/model/EditorAccess.java
+++ b/user/src/com/google/gwt/editor/rebind/model/EditorAccess.java
@@ -1,12 +1,12 @@
/*
* Copyright 2010 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -21,8 +21,8 @@
import com.google.gwt.core.ext.typeinfo.JType;
import com.google.gwt.core.ext.typeinfo.TypeOracle;
import com.google.gwt.editor.client.Editor;
-import com.google.gwt.editor.client.IsEditor;
import com.google.gwt.editor.client.Editor.Path;
+import com.google.gwt.editor.client.IsEditor;
/**
* Encapsulates the various ways an Editor might be accessed.
diff --git a/user/src/com/google/gwt/editor/rebind/model/ModelUtils.java b/user/src/com/google/gwt/editor/rebind/model/ModelUtils.java
index 241a1c5..ae3c397 100644
--- a/user/src/com/google/gwt/editor/rebind/model/ModelUtils.java
+++ b/user/src/com/google/gwt/editor/rebind/model/ModelUtils.java
@@ -1,12 +1,12 @@
/*
* Copyright 2010 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,12 +15,12 @@
*/
package com.google.gwt.editor.rebind.model;
-import com.google.web.bindery.autobean.shared.ValueCodex;
import com.google.gwt.core.ext.typeinfo.JArrayType;
import com.google.gwt.core.ext.typeinfo.JClassType;
import com.google.gwt.core.ext.typeinfo.JParameterizedType;
import com.google.gwt.core.ext.typeinfo.JType;
import com.google.gwt.core.ext.typeinfo.TypeOracle;
+import com.google.web.bindery.autobean.shared.ValueCodex;
import java.util.Collections;
import java.util.HashSet;
diff --git a/user/src/com/google/gwt/i18n/rebind/AbstractLocalizableImplCreator.java b/user/src/com/google/gwt/i18n/rebind/AbstractLocalizableImplCreator.java
index ffe3af4..3890ffe 100644
--- a/user/src/com/google/gwt/i18n/rebind/AbstractLocalizableImplCreator.java
+++ b/user/src/com/google/gwt/i18n/rebind/AbstractLocalizableImplCreator.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -34,10 +34,10 @@
import com.google.gwt.i18n.rebind.format.MessageCatalogFormat;
import com.google.gwt.i18n.server.KeyGenerator;
import com.google.gwt.i18n.server.MessageCatalogFactory;
-import com.google.gwt.i18n.server.MessageInterface;
-import com.google.gwt.i18n.server.MessageProcessingException;
import com.google.gwt.i18n.server.MessageCatalogFactory.Context;
import com.google.gwt.i18n.server.MessageCatalogFactory.Writer;
+import com.google.gwt.i18n.server.MessageInterface;
+import com.google.gwt.i18n.server.MessageProcessingException;
import com.google.gwt.i18n.shared.GwtLocale;
import com.google.gwt.i18n.shared.GwtLocaleFactory;
import com.google.gwt.user.rebind.AbstractGeneratorClassCreator;
@@ -345,7 +345,7 @@
* @return true if an error occurred (already logged)
* @throws UnableToCompleteException
*/
-
+
private static boolean generateToLegacyMsgCatFormat(TreeLogger logger,
GeneratorContext context, GwtLocale locale, JClassType targetClass,
boolean seenError, ResourceList resourceList, String className,
@@ -384,7 +384,7 @@
*
* @param logger
* @param context
- * @param locale
+ * @param locale
* @param targetClass
* @param seenError
* @param resourceList
@@ -448,7 +448,7 @@
/**
* Constructor for <code>AbstractLocalizableImplCreator</code>.
- *
+ *
* @param writer writer
* @param targetClass current target
* @param resourceList backing resource
@@ -468,7 +468,7 @@
/**
* Gets the resource associated with this class.
- *
+ *
* @return the resource
*/
public ResourceList getResourceBundle() {
@@ -483,7 +483,7 @@
/**
* Find the creator associated with the given method, and delegate the
* creation of the method body to it.
- *
+ *
* @param logger TreeLogger instance for logging
* @param method method to be generated
* @param locale locale to generate
@@ -503,7 +503,7 @@
/**
* Returns a resource key given a method name.
- *
+ *
* @param logger TreeLogger instance for logging
* @param method method to get key for
* @return the key to use for resource lookups or null if unable to get or
diff --git a/user/src/com/google/gwt/i18n/rebind/ConstantsMapMethodCreator.java b/user/src/com/google/gwt/i18n/rebind/ConstantsMapMethodCreator.java
index cac1bff..70a7ea3 100644
--- a/user/src/com/google/gwt/i18n/rebind/ConstantsMapMethodCreator.java
+++ b/user/src/com/google/gwt/i18n/rebind/ConstantsMapMethodCreator.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,8 +25,8 @@
import java.util.LinkedHashMap;
import java.util.Map;
-import java.util.Set;
import java.util.Map.Entry;
+import java.util.Set;
/**
* Creator for methods of the form Map getX() .
@@ -37,7 +37,7 @@
/**
* Constructor for localizable returnType method creator.
- *
+ *
* @param classCreator
*/
public ConstantsMapMethodCreator(AbstractGeneratorClassCreator classCreator) {
@@ -46,7 +46,7 @@
/**
* Generates Map of key/value pairs for a list of keys.
- *
+ *
* @param logger TreeLogger instance for logging
* @param method method body to create
* @param mapName name to create map from
diff --git a/user/src/com/google/gwt/i18n/rebind/KeyGenMessage.java b/user/src/com/google/gwt/i18n/rebind/KeyGenMessage.java
index 0da23d3..7fc5068 100644
--- a/user/src/com/google/gwt/i18n/rebind/KeyGenMessage.java
+++ b/user/src/com/google/gwt/i18n/rebind/KeyGenMessage.java
@@ -1,12 +1,12 @@
/*
* Copyright 2011 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -21,6 +21,7 @@
import com.google.gwt.i18n.client.LocalizableResource.Meaning;
import com.google.gwt.i18n.client.Messages.DefaultMessage;
import com.google.gwt.i18n.server.Message;
+import com.google.gwt.i18n.server.MessageFormatUtils.MessageStyle;
import com.google.gwt.i18n.server.MessageInterface;
import com.google.gwt.i18n.server.MessageProcessingException;
import com.google.gwt.i18n.server.MessageTranslation;
@@ -28,7 +29,6 @@
import com.google.gwt.i18n.server.MessageVisitor;
import com.google.gwt.i18n.server.Parameter;
import com.google.gwt.i18n.server.Type;
-import com.google.gwt.i18n.server.MessageFormatUtils.MessageStyle;
import com.google.gwt.i18n.shared.GwtLocale;
import java.lang.annotation.Annotation;
diff --git a/user/src/com/google/gwt/i18n/rebind/LocalizedPropertiesResource.java b/user/src/com/google/gwt/i18n/rebind/LocalizedPropertiesResource.java
index 3a0f9e8..0059a71 100644
--- a/user/src/com/google/gwt/i18n/rebind/LocalizedPropertiesResource.java
+++ b/user/src/com/google/gwt/i18n/rebind/LocalizedPropertiesResource.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,8 +24,8 @@
import java.io.InputStream;
import java.util.HashMap;
import java.util.Map;
-import java.util.Set;
import java.util.Map.Entry;
+import java.util.Set;
/**
* Resource wrapper for localized properties.
diff --git a/user/src/com/google/gwt/i18n/rebind/format/PropertiesFormat.java b/user/src/com/google/gwt/i18n/rebind/format/PropertiesFormat.java
index e99b30d..1fb4e64 100644
--- a/user/src/com/google/gwt/i18n/rebind/format/PropertiesFormat.java
+++ b/user/src/com/google/gwt/i18n/rebind/format/PropertiesFormat.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -18,8 +18,8 @@
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.typeinfo.JClassType;
import com.google.gwt.i18n.client.PluralRule.PluralForm;
-import com.google.gwt.i18n.rebind.AnnotationsResource;
import com.google.gwt.i18n.rebind.AbstractResource.ResourceList;
+import com.google.gwt.i18n.rebind.AnnotationsResource;
import com.google.gwt.i18n.rebind.AnnotationsResource.ArgumentInfo;
import java.io.PrintWriter;
@@ -42,7 +42,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see com.google.gwt.i18n.rebind.format.MessageCatalogFormat#write(com.google.gwt.i18n.rebind.util.AbstractResource,
* java.io.File, com.google.gwt.core.ext.typeinfo.JClassType)
*/
@@ -65,7 +65,7 @@
// Write comments from the annotations.
writeAnnotComments(out, annotResource, key);
}
-
+
// Collect plural forms for this locale.
PluralForm[] pluralForms = resourceList.getPluralForms(key);
if (pluralForms != null) {
@@ -98,9 +98,9 @@
/**
* Quote keys for use in a properties file.
- *
+ *
* In addition to the usual quoting, all spaces are backslash-quoted.
- *
+ *
* @param str key to quote
* @return quoted key
*/
@@ -109,22 +109,22 @@
str = str.replace(" ", "\\ ");
return quoteSpecial(str);
}
-
+
/**
* Quote strings for use in a properties file.
- *
+ *
* @param str string to quote
* @return quoted string
*/
private String quoteSpecial(String str) {
return str.replaceAll("([\f\t\n\r$!=:#])", "\\\\$1");
}
-
+
/**
* Quote values for use in a properties file.
- *
+ *
* In addition to the usual quoting, leading spaces are backslash-quoted.
- *
+ *
* @param str value to quote
* @return quoted value
*/
@@ -142,10 +142,10 @@
}
return quoteSpecial(str);
}
-
+
/**
* Write a key-value pair to a properties file with proper quoting.
- *
+ *
* @param out PrintWriter to output to
* @param key property key
* @param value property value
@@ -155,11 +155,11 @@
out.print('=');
out.println(quoteValue(value));
}
-
+
/**
* Write comments before a line, pulled from the annotations on a
* given method.
- *
+ *
* @param out PrintWriter stream to write to
* @param annotResource AnnotationsResource to get annotation data from
* @param key key of method for lookup in annotResource
@@ -227,7 +227,7 @@
/**
* Write a comment to a properties file.
- *
+ *
* @param out PrintWriter to output to
* @param comment comment to write
*/
diff --git a/user/src/com/google/gwt/i18n/server/AbstractParameter.java b/user/src/com/google/gwt/i18n/server/AbstractParameter.java
index 5636702..1bcdebc 100644
--- a/user/src/com/google/gwt/i18n/server/AbstractParameter.java
+++ b/user/src/com/google/gwt/i18n/server/AbstractParameter.java
@@ -16,10 +16,10 @@
package com.google.gwt.i18n.server;
import com.google.gwt.i18n.client.Localizable;
-import com.google.gwt.i18n.client.PluralRule;
import com.google.gwt.i18n.client.LocalizableResource.DefaultLocale;
import com.google.gwt.i18n.client.Messages.PluralCount;
import com.google.gwt.i18n.client.Messages.Select;
+import com.google.gwt.i18n.client.PluralRule;
import com.google.gwt.i18n.client.impl.plurals.DefaultRule;
import com.google.gwt.i18n.shared.AlternateMessageSelector;
import com.google.gwt.i18n.shared.GwtLocale;
@@ -34,7 +34,7 @@
/**
* Instantiate a plural rule class.
- *
+ *
* @param pluralClass base plural rule class
* @param locale
* @return {@link PluralRule} instance for the specified locale
@@ -42,7 +42,7 @@
public static PluralRule getLocalizedPluralRule(
Class<? extends PluralRule> pluralClass, GwtLocale locale) {
// TODO(jat): is this the right place for this method?
-
+
// Handle annotation default value
if (PluralRule.class == pluralClass) {
pluralClass = DefaultRule.class;
diff --git a/user/src/com/google/gwt/i18n/server/Message.java b/user/src/com/google/gwt/i18n/server/Message.java
index b9e4c45..441a467 100644
--- a/user/src/com/google/gwt/i18n/server/Message.java
+++ b/user/src/com/google/gwt/i18n/server/Message.java
@@ -16,8 +16,8 @@
package com.google.gwt.i18n.server;
import com.google.gwt.i18n.server.MessageFormatUtils.MessageStyle;
-import com.google.gwt.i18n.shared.GwtLocale;
import com.google.gwt.i18n.shared.AlternateMessageSelector.AlternateForm;
+import com.google.gwt.i18n.shared.GwtLocale;
import java.lang.annotation.Annotation;
import java.util.List;
@@ -28,13 +28,13 @@
public interface Message extends Comparable<Message>, MessageTranslation {
/**
- * Mapping for a group of particular alternate forms to the message to use.
+ * Mapping for a group of particular alternate forms to the message to use.
*/
public static class AlternateFormMapping
implements Comparable<AlternateFormMapping> {
private final List<AlternateForm> forms;
private final String message;
-
+
public AlternateFormMapping(List<AlternateForm> forms, String message) {
this.forms = forms;
this.message = message;
@@ -95,7 +95,7 @@
/**
* Messages are ordered by their keys.
- *
+ *
* @return -1 if this message is before {@code o}, 0 if they are equal, or
* 1 if this is message is after {code o}
*/
@@ -105,7 +105,7 @@
* Get the list of all possible messages. If there are not alternate
* message selectors, there will be a single entry with an empty list and
* the default value.
- *
+ *
* @return a list of all message forms, lexicographically sorted by the
* alternate forms for each message
*/
@@ -114,7 +114,7 @@
/**
* Return the requested annotation present on this message, including parents
* if the annotation is inherited.
- *
+ *
* @param annotClass
* @return an annotation instance or null if not found
*/
@@ -122,42 +122,42 @@
/**
* Return the default form of this message.
- *
+ *
* @return default message or null if not provided
*/
String getDefaultMessage();
/**
* Return the description of this message.
- *
+ *
* @return description or null if not provided
*/
String getDescription();
/**
* Return the key associated with this message.
- *
+ *
* @return key to use for message lookups
*/
String getKey();
/**
* Return the meaning of this message.
- *
+ *
* @return meaning or null if not provided
*/
String getMeaning();
/**
* Return the {@link MessageInterface} this message is associated with.
- *
+ *
* @return a {@link MessageInterface} instance
*/
MessageInterface getMessageInterface();
/**
* Return the message style (ie, quoting and argument rules) of this message.
- *
+ *
* @return MessageStyle instance for this message
*/
MessageStyle getMessageStyle();
@@ -165,14 +165,14 @@
/**
* Return the name of the method for this message - this should generally only
* be used in providing error messages.
- *
+ *
* @return default message or null if not provided
*/
String getMethodName();
/**
* Get the parameters defined for this message.
- *
+ *
* @return a possibly empty list of parameters
*/
List<Parameter> getParameters();
@@ -186,7 +186,7 @@
/**
* Get the list of parameters controlling alternate message selection.
- *
+ *
* @return possibly empty array of indices into the list returned by
* {@link #getParameters()}
*/
@@ -194,7 +194,7 @@
/**
* Get an appropriate translation for this message for a given locale.
- *
+ *
* @param locale a locale to get a translation for, or null to retrieve the
* message in the source
* @return a non-null {@link MessageTranslation} instance - if locale is null,
@@ -205,7 +205,7 @@
/**
* Check if a specified annotation is present on this message (including
* via inheritance if the annotation is inherited).
- *
+ *
* @param annotClass
* @return true if the annotation is present
*/
diff --git a/user/src/com/google/gwt/i18n/server/StringMapMessageTranslation.java b/user/src/com/google/gwt/i18n/server/StringMapMessageTranslation.java
index 12451ea..9614fb1 100644
--- a/user/src/com/google/gwt/i18n/server/StringMapMessageTranslation.java
+++ b/user/src/com/google/gwt/i18n/server/StringMapMessageTranslation.java
@@ -16,8 +16,8 @@
package com.google.gwt.i18n.server;
import com.google.gwt.i18n.server.Message.AlternateFormMapping;
-import com.google.gwt.i18n.shared.GwtLocale;
import com.google.gwt.i18n.shared.AlternateMessageSelector.AlternateForm;
+import com.google.gwt.i18n.shared.GwtLocale;
import java.util.Arrays;
import java.util.Iterator;
diff --git a/user/src/com/google/gwt/i18n/server/testing/Parent.java b/user/src/com/google/gwt/i18n/server/testing/Parent.java
index b2d60ee..279f219 100644
--- a/user/src/com/google/gwt/i18n/server/testing/Parent.java
+++ b/user/src/com/google/gwt/i18n/server/testing/Parent.java
@@ -16,8 +16,8 @@
package com.google.gwt.i18n.server.testing;
import com.google.gwt.i18n.client.Constants;
-import com.google.gwt.i18n.client.Messages;
import com.google.gwt.i18n.client.LocalizableResource.DefaultLocale;
+import com.google.gwt.i18n.client.Messages;
import java.util.Map;
diff --git a/user/src/com/google/gwt/junit/PreCompileStrategy.java b/user/src/com/google/gwt/junit/PreCompileStrategy.java
index dd2d942..4bf507c 100644
--- a/user/src/com/google/gwt/junit/PreCompileStrategy.java
+++ b/user/src/com/google/gwt/junit/PreCompileStrategy.java
@@ -22,8 +22,8 @@
import com.google.gwt.junit.client.GWTTestCase;
import com.google.gwt.junit.client.GWTTestCase.TestModuleInfo;
-import java.util.Map;
import java.util.HashMap;
+import java.util.Map;
/**
* Strategy that compiles all modules before returning results. Optimizes test
diff --git a/user/src/com/google/gwt/logging/impl/DevModeLoggingFixes.java b/user/src/com/google/gwt/logging/impl/DevModeLoggingFixes.java
index 28c921f..b102d30 100644
--- a/user/src/com/google/gwt/logging/impl/DevModeLoggingFixes.java
+++ b/user/src/com/google/gwt/logging/impl/DevModeLoggingFixes.java
@@ -1,12 +1,12 @@
/*
* Copyright 2010 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -18,30 +18,29 @@
import com.google.gwt.core.client.GWT;
-import java.util.logging.LogManager;
-import java.util.logging.LogRecord;
-import java.util.logging.Logger;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
import java.util.List;
+import java.util.logging.LogManager;
+import java.util.logging.LogRecord;
+import java.util.logging.Logger;
/**
* This class is used by the byte code rewriting which happens in DevMode only.
- * We rewrite all calls that create and access loggers by name to include a
+ * We rewrite all calls that create and access loggers by name to include a
* magic, thread specific prefix, which creates a separate tree of loggers for
- * each thread in DevMode. This works around the issue where DevMode root
+ * each thread in DevMode. This works around the issue where DevMode root
* loggers are shared between threads and between client/server. These functions
* will never be used in Production compiles.
- *
+ *
* TODO(unnurg): Move this class into gwt-dev
- *
+ *
* @see UseMirroredClasses
*/
public class DevModeLoggingFixes {
private static Logger root = null;
-
+
/**
* Replaces all logRecord.getLoggerName() calls, removing a thread specific
* prefix which is appended to all logger names in dev mode in order to
@@ -53,7 +52,7 @@
}
return null;
}
-
+
/**
* Replaces all logger.getName() calls, removing a thread specific prefix
* which is appended to all logger names in dev mode in order to maintain
@@ -65,7 +64,7 @@
}
return null;
}
-
+
/**
* Replaces all Logger.getLogger(name) calls, adding a thread specific prefix
* which is appended to all logger names in dev mode in order to maintain
@@ -82,7 +81,7 @@
}
return Logger.getLogger(addLoggerPrefix(name));
}
-
+
/**
* Replaces all LogManager.getLogger(name) calls, adding a thread specific
* prefix which is appended to all logger names in dev mode in order to
@@ -110,19 +109,19 @@
}
return Collections.enumeration(newList);
}
-
+
private static String addLoggerPrefix(String name) {
return getLoggerPrefix() + name;
}
-
+
private static String getLoggerPrefix() {
return getPrefixName() + ".";
}
-
+
private static String getPrefixName() {
return GWT.getUniqueThreadId();
}
-
+
private static String removeLoggerPrefix(String name) {
return name.replaceFirst("^" + getLoggerPrefix(), "");
}
diff --git a/user/src/com/google/gwt/media/client/MediaBase.java b/user/src/com/google/gwt/media/client/MediaBase.java
index 8271630..a21fe18 100644
--- a/user/src/com/google/gwt/media/client/MediaBase.java
+++ b/user/src/com/google/gwt/media/client/MediaBase.java
@@ -23,10 +23,10 @@
import com.google.gwt.event.dom.client.EndedEvent;
import com.google.gwt.event.dom.client.EndedHandler;
import com.google.gwt.event.dom.client.HasAllMediaHandlers;
-import com.google.gwt.event.dom.client.ProgressEvent;
-import com.google.gwt.event.dom.client.ProgressHandler;
import com.google.gwt.event.dom.client.LoadedMetadataEvent;
import com.google.gwt.event.dom.client.LoadedMetadataHandler;
+import com.google.gwt.event.dom.client.ProgressEvent;
+import com.google.gwt.event.dom.client.ProgressHandler;
import com.google.gwt.event.shared.HandlerRegistration;
import com.google.gwt.media.dom.client.MediaError;
import com.google.gwt.media.dom.client.TimeRanges;
@@ -75,7 +75,7 @@
/**
* Add a source element to this media. The browser will request source files
* from the server until it finds one it can play.
- *
+ *
* <p>
* Only use this method if you do not know the type of the source file, as the
* browser cannot determine the format from the filename and must download
@@ -83,7 +83,7 @@
* the type for the media using {@link #addSource(String, String)} so the
* browser can choose a source file without downloading the file.
* </p>
- *
+ *
* @param url a String URL
* @see #addSource(String, String)
*/
@@ -97,7 +97,7 @@
/**
* Add a source element to this media, specifying the type (format) of the
* media. The browser will choose a supported source file and download it.
- *
+ *
* <p>
* The type is the format or encoding of the media represented by the source
* element. For example, the type of an
@@ -106,13 +106,13 @@
* {@link com.google.gwt.dom.client.AudioElement#TYPE_MP3}, or
* {@link com.google.gwt.dom.client.AudioElement#TYPE_WAV}.
* </p>
- *
+ *
* <p>
* You can also add the codec information to the type, giving the browser even
* more information about whether or not it can play the file (Example: "
* <code>audio/ogg; codec=vorbis</code>");
* </p>
- *
+ *
* @param url a String URL
* @param type the type (format) of the media
* @see #getSrc()
@@ -122,7 +122,7 @@
elem.setType(type);
return elem;
}
-
+
/**
* Returns {@code true} if the native player is capable of playing content of
* the given MIME type.
@@ -449,7 +449,7 @@
/**
* Remove the specified {@link SourceElement} from this media. If the source
* element is not a child of this widget, it will not be removed.
- *
+ *
* @param source the source element to remove
* @see #addSource(String, String)
*/
@@ -553,16 +553,16 @@
/**
* Sets the source URL for the media.
- *
+ *
* <p>
* Support for different media types varies between browsers. Instead of using
* this method, you should encode your media in multiple formats and add all
* of them using {@link #addSource(String, String)} so the browser can choose
* a source that it supports.
* </p>
- *
+ *
* @param url a String URL
- *
+ *
* @see #getSrc()
* @see #addSource(String, String)
*/
diff --git a/user/src/com/google/gwt/precompress/linker/PrecompressLinker.java b/user/src/com/google/gwt/precompress/linker/PrecompressLinker.java
index c08a8f9..e1d77d1 100644
--- a/user/src/com/google/gwt/precompress/linker/PrecompressLinker.java
+++ b/user/src/com/google/gwt/precompress/linker/PrecompressLinker.java
@@ -1,12 +1,12 @@
/*
* Copyright 2010 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,8 +24,8 @@
import com.google.gwt.core.ext.linker.EmittedArtifact;
import com.google.gwt.core.ext.linker.EmittedArtifact.Visibility;
import com.google.gwt.core.ext.linker.LinkerOrder;
-import com.google.gwt.core.ext.linker.Shardable;
import com.google.gwt.core.ext.linker.LinkerOrder.Order;
+import com.google.gwt.core.ext.linker.Shardable;
import com.google.gwt.dev.util.collect.HashSet;
import com.google.gwt.util.regexfilter.RegexFilter;
@@ -42,14 +42,14 @@
* A linker that precompresses the public artifacts that it sees. That way, a
* web server that uses gzip transfer encoding can use the precompressed files
* instead of having to compress them on the fly.
- *
+ *
* <p>
* To use this linker, add the following to your module definition:
- *
+ *
* <pre>
* <inherits name="com.google.gwt.precompress.Precompress"/>
* </pre>
- *
+ *
* <p>
* The files to precompress are specified by the configuration property
* <code>precompress.path.regexes</code>. By default, the uncompressed artifacts
diff --git a/user/src/com/google/gwt/resources/css/RtlVisitor.java b/user/src/com/google/gwt/resources/css/RtlVisitor.java
index cd1aec6..ca13839 100644
--- a/user/src/com/google/gwt/resources/css/RtlVisitor.java
+++ b/user/src/com/google/gwt/resources/css/RtlVisitor.java
@@ -1,12 +1,12 @@
/*
* Copyright 2009 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -21,10 +21,10 @@
import com.google.gwt.resources.css.ast.CssModVisitor;
import com.google.gwt.resources.css.ast.CssNoFlip;
import com.google.gwt.resources.css.ast.CssProperty;
-import com.google.gwt.resources.css.ast.CssRule;
import com.google.gwt.resources.css.ast.CssProperty.IdentValue;
import com.google.gwt.resources.css.ast.CssProperty.NumberValue;
import com.google.gwt.resources.css.ast.CssProperty.Value;
+import com.google.gwt.resources.css.ast.CssRule;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
diff --git a/user/src/com/google/gwt/resources/css/Spriter.java b/user/src/com/google/gwt/resources/css/Spriter.java
index d821fa1..c2f9616 100644
--- a/user/src/com/google/gwt/resources/css/Spriter.java
+++ b/user/src/com/google/gwt/resources/css/Spriter.java
@@ -1,12 +1,12 @@
/*
* Copyright 2009 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,11 +26,11 @@
import com.google.gwt.resources.css.ast.CssCompilerException;
import com.google.gwt.resources.css.ast.CssModVisitor;
import com.google.gwt.resources.css.ast.CssProperty;
-import com.google.gwt.resources.css.ast.CssRule;
-import com.google.gwt.resources.css.ast.CssSprite;
import com.google.gwt.resources.css.ast.CssProperty.DotPathValue;
import com.google.gwt.resources.css.ast.CssProperty.ExpressionValue;
import com.google.gwt.resources.css.ast.CssProperty.IdentValue;
+import com.google.gwt.resources.css.ast.CssRule;
+import com.google.gwt.resources.css.ast.CssSprite;
import com.google.gwt.resources.ext.ResourceContext;
import com.google.gwt.resources.ext.ResourceGeneratorUtil;
diff --git a/user/src/com/google/gwt/rpc/linker/ClientOracleLinker.java b/user/src/com/google/gwt/rpc/linker/ClientOracleLinker.java
index 7d26c7d..4d1d1a2 100644
--- a/user/src/com/google/gwt/rpc/linker/ClientOracleLinker.java
+++ b/user/src/com/google/gwt/rpc/linker/ClientOracleLinker.java
@@ -22,10 +22,10 @@
import com.google.gwt.core.ext.linker.ArtifactSet;
import com.google.gwt.core.ext.linker.CompilationResult;
import com.google.gwt.core.ext.linker.LinkerOrder;
+import com.google.gwt.core.ext.linker.LinkerOrder.Order;
import com.google.gwt.core.ext.linker.Shardable;
import com.google.gwt.core.ext.linker.SymbolData;
import com.google.gwt.core.ext.linker.SyntheticArtifact;
-import com.google.gwt.core.ext.linker.LinkerOrder.Order;
import com.google.gwt.rpc.server.WebModeClientOracle.Builder;
import java.io.ByteArrayOutputStream;
diff --git a/user/src/com/google/gwt/rpc/rebind/RpcProxyCreator.java b/user/src/com/google/gwt/rpc/rebind/RpcProxyCreator.java
index 167a216..fe45275 100644
--- a/user/src/com/google/gwt/rpc/rebind/RpcProxyCreator.java
+++ b/user/src/com/google/gwt/rpc/rebind/RpcProxyCreator.java
@@ -1,12 +1,12 @@
/*
* Copyright 2009 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -17,8 +17,8 @@
import com.google.gwt.core.client.GWT;
import com.google.gwt.core.client.impl.ArtificialRescue;
-import com.google.gwt.core.client.impl.Impl;
import com.google.gwt.core.client.impl.ArtificialRescue.Rescue;
+import com.google.gwt.core.client.impl.Impl;
import com.google.gwt.core.ext.GeneratorContext;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
diff --git a/user/src/com/google/gwt/rpc/server/CommandSerializationUtil.java b/user/src/com/google/gwt/rpc/server/CommandSerializationUtil.java
index 5a88036..e395272 100644
--- a/user/src/com/google/gwt/rpc/server/CommandSerializationUtil.java
+++ b/user/src/com/google/gwt/rpc/server/CommandSerializationUtil.java
@@ -1,12 +1,12 @@
/*
* Copyright 2009 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/user/src/com/google/gwt/storage/client/StorageMap.java b/user/src/com/google/gwt/storage/client/StorageMap.java
index 0bea93c..3c3ccac 100644
--- a/user/src/com/google/gwt/storage/client/StorageMap.java
+++ b/user/src/com/google/gwt/storage/client/StorageMap.java
@@ -20,7 +20,6 @@
import java.util.AbstractSet;
import java.util.Iterator;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.NoSuchElementException;
import java.util.Set;
diff --git a/user/src/com/google/gwt/typedarrays/client/NoSupportImpl.java b/user/src/com/google/gwt/typedarrays/client/NoSupportImpl.java
index d626456..abf12b5 100644
--- a/user/src/com/google/gwt/typedarrays/client/NoSupportImpl.java
+++ b/user/src/com/google/gwt/typedarrays/client/NoSupportImpl.java
@@ -1,12 +1,12 @@
/*
* Copyright 2012 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -22,11 +22,11 @@
import com.google.gwt.typedarrays.shared.Int16Array;
import com.google.gwt.typedarrays.shared.Int32Array;
import com.google.gwt.typedarrays.shared.Int8Array;
+import com.google.gwt.typedarrays.shared.TypedArrays.Impl;
import com.google.gwt.typedarrays.shared.Uint16Array;
import com.google.gwt.typedarrays.shared.Uint32Array;
import com.google.gwt.typedarrays.shared.Uint8Array;
import com.google.gwt.typedarrays.shared.Uint8ClampedArray;
-import com.google.gwt.typedarrays.shared.TypedArrays.Impl;
/**
* The implementation class for browsers known to have no
diff --git a/user/src/com/google/gwt/uibinder/elementparsers/WidgetInterpreter.java b/user/src/com/google/gwt/uibinder/elementparsers/WidgetInterpreter.java
index a482ec1..2da2ccc 100644
--- a/user/src/com/google/gwt/uibinder/elementparsers/WidgetInterpreter.java
+++ b/user/src/com/google/gwt/uibinder/elementparsers/WidgetInterpreter.java
@@ -16,9 +16,9 @@
package com.google.gwt.uibinder.elementparsers;
import com.google.gwt.core.ext.UnableToCompleteException;
+import com.google.gwt.uibinder.client.LazyDomElement;
import com.google.gwt.uibinder.rebind.FieldManager;
import com.google.gwt.uibinder.rebind.FieldWriter;
-import com.google.gwt.uibinder.client.LazyDomElement;
import com.google.gwt.uibinder.rebind.UiBinderWriter;
import com.google.gwt.uibinder.rebind.XMLElement;
diff --git a/user/src/com/google/gwt/uibinder/elementparsers/WidgetPlaceholderInterpreter.java b/user/src/com/google/gwt/uibinder/elementparsers/WidgetPlaceholderInterpreter.java
index 28cd666..cfdff20 100644
--- a/user/src/com/google/gwt/uibinder/elementparsers/WidgetPlaceholderInterpreter.java
+++ b/user/src/com/google/gwt/uibinder/elementparsers/WidgetPlaceholderInterpreter.java
@@ -18,9 +18,9 @@
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.core.ext.typeinfo.JClassType;
import com.google.gwt.core.ext.typeinfo.TypeOracle;
+import com.google.gwt.uibinder.client.LazyDomElement;
import com.google.gwt.uibinder.rebind.FieldManager;
import com.google.gwt.uibinder.rebind.FieldWriter;
-import com.google.gwt.uibinder.client.LazyDomElement;
import com.google.gwt.uibinder.rebind.UiBinderWriter;
import com.google.gwt.uibinder.rebind.XMLElement;
import com.google.gwt.uibinder.rebind.messages.MessageWriter;
diff --git a/user/src/com/google/gwt/uibinder/rebind/BundleWriter.java b/user/src/com/google/gwt/uibinder/rebind/BundleWriter.java
index 0a12daa..02c09c2 100644
--- a/user/src/com/google/gwt/uibinder/rebind/BundleWriter.java
+++ b/user/src/com/google/gwt/uibinder/rebind/BundleWriter.java
@@ -1,12 +1,12 @@
/*
* Copyright 2009 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -19,9 +19,9 @@
import com.google.gwt.core.ext.typeinfo.JClassType;
import com.google.gwt.core.ext.typeinfo.TypeOracle;
import com.google.gwt.resources.client.ClientBundle;
+import com.google.gwt.resources.client.CssResource.Import;
import com.google.gwt.resources.client.DataResource;
import com.google.gwt.resources.client.ImageResource;
-import com.google.gwt.resources.client.CssResource.Import;
import com.google.gwt.resources.client.ImageResource.ImageOptions;
import com.google.gwt.resources.client.ImageResource.RepeatStyle;
import com.google.gwt.uibinder.rebind.model.ImplicitClientBundle;
diff --git a/user/src/com/google/gwt/uibinder/rebind/messages/PlaceholderInterpreter.java b/user/src/com/google/gwt/uibinder/rebind/messages/PlaceholderInterpreter.java
index ef0328d..f4c007f 100644
--- a/user/src/com/google/gwt/uibinder/rebind/messages/PlaceholderInterpreter.java
+++ b/user/src/com/google/gwt/uibinder/rebind/messages/PlaceholderInterpreter.java
@@ -17,9 +17,9 @@
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.uibinder.rebind.Tokenator;
+import com.google.gwt.uibinder.rebind.Tokenator.Resolver;
import com.google.gwt.uibinder.rebind.UiBinderWriter;
import com.google.gwt.uibinder.rebind.XMLElement;
-import com.google.gwt.uibinder.rebind.Tokenator.Resolver;
import com.google.gwt.uibinder.rebind.XMLElement.PostProcessingInterpreter;
/**
diff --git a/user/src/com/google/gwt/user/cellview/client/CellTree.java b/user/src/com/google/gwt/user/cellview/client/CellTree.java
index 69c871a..1094903 100644
--- a/user/src/com/google/gwt/user/cellview/client/CellTree.java
+++ b/user/src/com/google/gwt/user/cellview/client/CellTree.java
@@ -16,6 +16,7 @@
package com.google.gwt.user.cellview.client;
import com.google.gwt.animation.client.Animation;
+import com.google.gwt.aria.client.Roles;
import com.google.gwt.core.client.GWT;
import com.google.gwt.core.client.Scheduler;
import com.google.gwt.dom.client.BrowserEvents;
@@ -45,7 +46,6 @@
import com.google.gwt.user.client.ui.HasAnimation;
import com.google.gwt.user.client.ui.SimplePanel;
import com.google.gwt.view.client.TreeViewModel;
-import com.google.gwt.aria.client.Roles;
import java.util.ArrayList;
import java.util.HashSet;
@@ -134,7 +134,7 @@
/**
* Set the duration of the animation in milliseconds.
- *
+ *
* @param duration the duration in milliseconds
* @see #getDuration()
*/
@@ -775,7 +775,7 @@
* <p>
* Setting the key to (int) 0 will disable the access key.
* </p>
- *
+ *
* @see #getAccessKey()
*/
public void setAccessKey(char key) {
@@ -987,7 +987,7 @@
/**
* Get the HTML representation of an image.
- *
+ *
* @param res the {@link ImageResource} to render as HTML
* @param isTop true if the image is for a top level element.
* @return the rendered HTML
diff --git a/user/src/com/google/gwt/user/cellview/client/CellTreeNodeView.java b/user/src/com/google/gwt/user/cellview/client/CellTreeNodeView.java
index 5593599..8c26a8b 100644
--- a/user/src/com/google/gwt/user/cellview/client/CellTreeNodeView.java
+++ b/user/src/com/google/gwt/user/cellview/client/CellTreeNodeView.java
@@ -1,12 +1,12 @@
/*
* Copyright 2010 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,6 +15,7 @@
*/
package com.google.gwt.user.cellview.client;
+import com.google.gwt.aria.client.ExpandedValue;
import com.google.gwt.aria.client.Roles;
import com.google.gwt.cell.client.Cell;
import com.google.gwt.cell.client.Cell.Context;
@@ -56,7 +57,6 @@
import com.google.gwt.view.client.SelectionModel;
import com.google.gwt.view.client.TreeViewModel;
import com.google.gwt.view.client.TreeViewModel.NodeInfo;
-import com.google.gwt.aria.client.ExpandedValue;
import java.util.ArrayList;
import java.util.HashMap;
@@ -67,7 +67,7 @@
/**
* A view of a tree node.
- *
+ *
* @param <T> the type that this view contains
*/
// TODO(jlabanca): Convert this to be the type of the child and create lazily.
@@ -88,7 +88,7 @@
* class is intentionally static because we might move it to a new
* {@link CellTreeNodeView}, and we don't want non-static references to the
* old {@link CellTreeNodeView}.
- *
+ *
* @param <C> the child item type
*/
static class NodeCellList<C> implements HasData<C> {
@@ -276,7 +276,7 @@
/**
* Reload the open children after rendering new items in this node.
- *
+ *
* @param values the values being replaced
* @param start the start index
* @param savedViews the open nodes
@@ -369,7 +369,7 @@
* Save the state of the open child nodes within the range of the
* specified values. Use {@link #loadChildState(List, int, Map)} to
* re-attach the open nodes after they have been replaced.
- *
+ *
* @param values the values being replaced
* @param start the start index
* @return the map of open nodes
@@ -656,7 +656,7 @@
/**
* Check the child bounds.
- *
+ *
* @param index the index of the child
* @throws IndexOutOfBoundsException if the child is not in range
*/
@@ -677,7 +677,7 @@
/**
* Get the parent node without checking if this node is destroyed.
- *
+ *
* @return the parent node, or null if the node has no parent
*/
private TreeNodeImpl getParentImpl() {
@@ -700,7 +700,7 @@
/**
* Returns the element that parents the cell contents of the node.
- *
+ *
* @param nodeElem the element that represents the node
* @return the cell parent within the node
*/
@@ -710,7 +710,7 @@
/**
* Returns the element that selection is applied to.
- *
+ *
* @param nodeElem the element that represents the node
* @return the cell parent within the node
*/
@@ -720,7 +720,7 @@
/**
* Returns the element that selection is applied to.
- *
+ *
* @param nodeElem the element that represents the node
* @return the cell parent within the node
*/
@@ -740,7 +740,7 @@
/**
* Show or hide an element.
- *
+ *
* @param element the element to show or hide
* @param show true to show, false to hide
*/
@@ -889,7 +889,7 @@
/**
* Check whether or not this node is open.
- *
+ *
* @return true if open, false if closed
*/
public boolean isOpen() {
@@ -898,7 +898,7 @@
/**
* Sets whether this item's children are displayed.
- *
+ *
* @param open whether the item is open
* @param fireEvents true to fire events if the state changes
* @return true if successfully opened, false otherwise.
@@ -989,7 +989,7 @@
/**
* Unregister the list handler and destroy all child nodes.
- *
+ *
* @param destroy true to destroy this node
*/
protected void cleanup(boolean destroy) {
@@ -1030,7 +1030,7 @@
/**
* Returns an instance of TreeNodeView of the same subclass as the calling
* object.
- *
+ *
* @param <C> the data type of the node's children
* @param nodeInfo a NodeInfo object describing the child nodes
* @param childElem the DOM element used to parent the new TreeNodeView
@@ -1045,7 +1045,7 @@
/**
* Fire an event to the {@link com.google.gwt.cell.client.AbstractCell}.
- *
+ *
* @param event the native event
*/
@SuppressWarnings("unchecked")
@@ -1099,7 +1099,7 @@
/**
* Returns the element corresponding to the open/close image.
- *
+ *
* @return the open/close image element
*/
protected Element getImageElement() {
@@ -1110,7 +1110,7 @@
* Returns the element that selection styles are applied to. The element
* includes the open/close image and the rendered value and spans the width of
* the tree.
- *
+ *
* @return the selection element
*/
protected Element getSelectionElement() {
@@ -1127,7 +1127,7 @@
/**
* Set up the node when it is opened.
- *
+ *
* @param nodeInfo the {@link NodeInfo} that provides information about the
* child values
* @param <C> the child data type of the node
@@ -1141,7 +1141,7 @@
/**
* Ensure that the animation frame exists and return it.
- *
+ *
* @return the animation frame
*/
Element ensureAnimationFrame() {
@@ -1156,7 +1156,7 @@
/**
* Ensure that the child container exists and return it.
- *
+ *
* @return the child container
*/
Element ensureChildContainer() {
@@ -1169,7 +1169,7 @@
/**
* Ensure that the content container exists and return it.
- *
+ *
* @return the content container
*/
Element ensureContentContainer() {
@@ -1213,7 +1213,7 @@
/**
* Get a {@link TreeNode} with a public API for this node view.
- *
+ *
* @return the {@link TreeNode}
*/
TreeNode getTreeNode() {
@@ -1233,7 +1233,7 @@
/**
* Check if this node is a root node.
- *
+ *
* @return true if a root node
*/
boolean isRootNode() {
@@ -1242,7 +1242,7 @@
/**
* Check if the value of this node is selected.
- *
+ *
* @return true if selected, false if not
*/
boolean isSelected() {
@@ -1257,7 +1257,7 @@
/**
* Reset focus on this node.
- *
+ *
* @return true of the cell takes focus, false if not
*/
boolean resetFocusOnCell() {
@@ -1271,7 +1271,7 @@
/**
* Select or deselect this node with the keyboard.
- *
+ *
* @param selected true if selected, false if not
* @param stealFocus true to steal focus
*/
@@ -1313,7 +1313,7 @@
/**
* Add or remove the keyboard selected style.
- *
+ *
* @param selected true if selected, false if not
*/
void setKeyboardSelectedStyle(boolean selected) {
@@ -1327,7 +1327,7 @@
/**
* Select or deselect this node.
- *
+ *
* @param selected true to select, false to deselect
*/
void setSelected(boolean selected) {
@@ -1374,7 +1374,7 @@
/**
* Update the image based on the current state.
- *
+ *
* @param isLoading true if still loading data
*/
private void updateImage(boolean isLoading) {
diff --git a/user/src/com/google/gwt/user/client/BaseListenerWrapper.java b/user/src/com/google/gwt/user/client/BaseListenerWrapper.java
index a7032cf..9e7dbc3 100644
--- a/user/src/com/google/gwt/user/client/BaseListenerWrapper.java
+++ b/user/src/com/google/gwt/user/client/BaseListenerWrapper.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -21,18 +21,18 @@
import com.google.gwt.event.logical.shared.ResizeEvent;
import com.google.gwt.event.logical.shared.ResizeHandler;
import com.google.gwt.event.shared.EventHandler;
-import com.google.gwt.event.shared.HandlerManager;
import com.google.gwt.event.shared.GwtEvent.Type;
+import com.google.gwt.event.shared.HandlerManager;
/**
* Legacy listener support hierarchy root.
- *
+ *
* Note, this class and its subtypes all assume that the handlers are stored in
* handler managers.
- *
+ *
* This class, and its children are used to gather the bulk of the legacy glue
* code in one place, for easy deletion when Listener methods are deleted.
- *
+ *
* @param <T> listener type to be wrapped
* @deprecated will be removed in GWT 2.7 with the handler listeners themselves
*/
@@ -114,7 +114,7 @@
/**
* Helper method to remove all wrapped listeners from the given event types.
- *
+ *
* @param manager the manager to remove the listener from
* @param listener the listener
* @param types the event types to remove the listener from
@@ -147,7 +147,7 @@
/**
* Creates a new listener wrapper.
- *
+ *
* @param listener the listener to wrap
*/
protected BaseListenerWrapper(T listener) {
@@ -156,7 +156,7 @@
/**
* Gets the listener being wrapped.
- *
+ *
* @return the wrapped listener
*/
protected T getListener() {
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 2ca3a3d..1796514 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
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -20,8 +20,8 @@
import com.google.gwt.user.client.rpc.SerializationStreamWriter;
import java.util.Map;
-import java.util.Set;
import java.util.Map.Entry;
+import java.util.Set;
/**
* Custom field serializer for {@link java.util.HashMap}.
diff --git a/user/src/com/google/gwt/user/client/rpc/impl/SerializerBase.java b/user/src/com/google/gwt/user/client/rpc/impl/SerializerBase.java
index 20e67b6..e6d894a 100644
--- a/user/src/com/google/gwt/user/client/rpc/impl/SerializerBase.java
+++ b/user/src/com/google/gwt/user/client/rpc/impl/SerializerBase.java
@@ -1,12 +1,12 @@
/*
* Copyright 2009 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,10 +15,10 @@
*/
package com.google.gwt.user.client.rpc.impl;
-import com.google.gwt.core.shared.GWT;
import com.google.gwt.core.client.JavaScriptObject;
import com.google.gwt.core.client.JsArray;
import com.google.gwt.core.client.JsArrayString;
+import com.google.gwt.core.shared.GWT;
import com.google.gwt.user.client.rpc.SerializationException;
import com.google.gwt.user.client.rpc.SerializationStreamReader;
import com.google.gwt.user.client.rpc.SerializationStreamWriter;
@@ -66,9 +66,9 @@
}
private final Map<String, TypeHandler> handlerCache;
-
+
private final Map<String, String> methodMapJava;
-
+
private final MethodMap methodMapNative;
private final Map<String, String> signatureMapJava;
@@ -154,7 +154,7 @@
}
TypeHandler typeHandler = handlerCache.get(typeHandlerClass);
-
+
if (typeHandler == null) {
try {
Class<?> klass = ReflectionHelper.loadClass(typeHandlerClass);
diff --git a/user/src/com/google/gwt/user/client/ui/DockPanel.java b/user/src/com/google/gwt/user/client/ui/DockPanel.java
index 68aec4d..9b9c093 100644
--- a/user/src/com/google/gwt/user/client/ui/DockPanel.java
+++ b/user/src/com/google/gwt/user/client/ui/DockPanel.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -16,8 +16,8 @@
package com.google.gwt.user.client.ui;
import com.google.gwt.dom.client.Element;
-import com.google.gwt.user.client.DOM;
import com.google.gwt.i18n.client.LocaleInfo;
+import com.google.gwt.user.client.DOM;
import java.util.HashMap;
import java.util.Iterator;
@@ -26,25 +26,25 @@
/**
* A panel that lays its child widgets out "docked" at its outer edges, and
* allows its last widget to take up the remaining space in its center.
- *
+ *
* <p>
* This widget has limitations in standards mode that did not exist in quirks
* mode. The child Widgets contained within a DockPanel cannot be sized using
* percentages. Setting a child widget's height to <code>100%</code> will
* <em>NOT</em> cause the child to fill the available height.
* </p>
- *
+ *
* <p>
* If you need to work around these limitations, use {@link DockLayoutPanel}
* instead, but understand that it is not a drop in replacement for this class.
* It requires standards mode, and is most easily used under a
* {@link RootLayoutPanel} (as opposed to a {@link RootPanel}).
* </p>
- *
+ *
* <p>
* <img class='gallery' src='doc-files/DockPanel.png'/>
* </p>
- *
+ *
* @see DockLayoutPanel
*/
public class DockPanel extends CellPanel implements HasAlignment {
@@ -119,7 +119,7 @@
/**
* Generate a debug ID for the {@link Widget} given the direction and number
* of occurrences of the direction.
- *
+ *
* @param direction the direction of the widget
* @param count the number of widgets in that direction
*/
@@ -133,14 +133,14 @@
} else if (direction == EAST) {
return "east" + count;
} else if (direction == LINE_START) {
- return "linestart" + count;
+ return "linestart" + count;
} else if (direction == LINE_END) {
- return "lineend" + count;
- } else {
+ return "lineend" + count;
+ } else {
return "center";
}
}
-
+
private HorizontalAlignmentConstant horzAlign = ALIGN_DEFAULT;
private VerticalAlignmentConstant vertAlign = ALIGN_TOP;
private Widget center;
@@ -157,10 +157,10 @@
* Adds a widget to the specified edge of the dock. If the widget is already a
* child of this panel, this method behaves as though {@link #remove(Widget)}
* had already been called.
- *
+ *
* @param widget the widget to be added
* @param direction the widget's direction in the dock
- *
+ *
* @throws IllegalArgumentException when adding to the {@link #CENTER} and
* there is already a different widget there
*/
@@ -196,16 +196,16 @@
// Adopt.
adopt(widget);
}
-
+
/**
* Overloaded version for IsWidget.
- *
+ *
* @see #add(Widget,DockLayoutConstant)
*/
public void add(IsWidget widget, DockLayoutConstant direction) {
this.add(widget.asWidget(), direction);
}
-
+
public HorizontalAlignmentConstant getHorizontalAlignment() {
return horzAlign;
}
@@ -216,7 +216,7 @@
/**
* Gets the layout direction of the given child widget.
- *
+ *
* @param w the widget to be queried
* @return the widget's layout direction, or <code>null</code> if it is not
* a child of this panel
@@ -281,7 +281,7 @@
/**
* Sets the default horizontal alignment to be used for widgets added to this
* panel. It only applies to widgets added after this property is set.
- *
+ *
* @see HasHorizontalAlignment#setHorizontalAlignment(HasHorizontalAlignment.HorizontalAlignmentConstant)
*/
public void setHorizontalAlignment(HorizontalAlignmentConstant align) {
@@ -291,7 +291,7 @@
/**
* Sets the default vertical alignment to be used for widgets added to this
* panel. It only applies to widgets added after this property is set.
- *
+ *
* @see HasVerticalAlignment#setVerticalAlignment(HasVerticalAlignment.VerticalAlignmentConstant)
*/
public void setVerticalAlignment(VerticalAlignmentConstant align) {
@@ -303,11 +303,11 @@
* integer will be appended to the end of the debug id. For example, the first
* north cell is labeled "north1", the second is "north2", and the third is
* "north3".
- *
+ *
* This widget recreates its structure every time a {@link Widget} is added,
* so you must call this method after adding a new {@link Widget} or all debug
* IDs will be lost.
- *
+ *
* <p>
* <b>Affected Elements:</b>
* <ul>
@@ -318,7 +318,7 @@
* <li>-west# = the western cell.</li>
* </ul>
* </p>
- *
+ *
* @see UIObject#onEnsureDebugId(String)
*/
@Override
@@ -398,7 +398,7 @@
} else if (layout.direction == CENTER) {
// Defer adding the center widget, so that it can be added after all
// the others are complete.
- centerTd = td;
+ centerTd = td;
} else if (shouldAddToLogicalLeftOfTable(layout.direction)) {
TmpRow row = rows[northRow];
DOM.insertChild(row.tr, td, row.center++);
@@ -411,7 +411,7 @@
DOM.appendChild(td, child.getElement());
td.setPropertyInt("rowSpan", southRow - northRow + 1);
--logicalRightCol;
- }
+ }
}
// If there is a center widget, add it at the end (centerTd is guaranteed
@@ -423,29 +423,29 @@
DOM.appendChild(centerTd, center.getElement());
}
}
-
+
private boolean shouldAddToLogicalLeftOfTable(DockLayoutConstant widgetDirection) {
-
- assert (widgetDirection == LINE_START || widgetDirection == LINE_END ||
+
+ assert (widgetDirection == LINE_START || widgetDirection == LINE_END ||
widgetDirection == EAST || widgetDirection == WEST);
-
+
// In a bidi-sensitive environment, adding a widget to the logical left
// column (think DOM order) means that it will be displayed at the start
// of the line direction for the current layout. This is because HTML
- // tables are bidi-sensitive; the column order switches depending on
+ // tables are bidi-sensitive; the column order switches depending on
// the line direction.
- if (widgetDirection == LINE_START) {
+ if (widgetDirection == LINE_START) {
return true;
}
-
+
if (LocaleInfo.getCurrentLocale().isRTL()) {
- // In an RTL layout, the logical left columns will be displayed on the right hand
- // side. When the direction for the widget is EAST, adding the widget to the logical
- // left columns will have the desired effect of displaying the widget on the 'eastern'
+ // In an RTL layout, the logical left columns will be displayed on the right hand
+ // side. When the direction for the widget is EAST, adding the widget to the logical
+ // left columns will have the desired effect of displaying the widget on the 'eastern'
// side of the screen.
- return (widgetDirection == EAST);
+ return (widgetDirection == EAST);
}
-
+
// In an LTR layout, the logical left columns are displayed on the left hand
// side. When the direction for the widget is WEST, adding the widget to the
// logical left columns will have the desired effect of displaying the widget on the
@@ -454,9 +454,9 @@
}
private boolean shouldAddToLogicalRightOfTable(DockLayoutConstant widgetDirection) {
-
+
// See comments for shouldAddToLogicalLeftOfTable for clarification
-
+
assert (widgetDirection == LINE_START || widgetDirection == LINE_END ||
widgetDirection == EAST || widgetDirection == WEST);
@@ -464,10 +464,10 @@
return true;
}
- if (LocaleInfo.getCurrentLocale().isRTL()) {
+ if (LocaleInfo.getCurrentLocale().isRTL()) {
return (widgetDirection == WEST);
}
-
+
return (widgetDirection == EAST);
}
}
diff --git a/user/src/com/google/gwt/user/client/ui/FocusPanel.java b/user/src/com/google/gwt/user/client/ui/FocusPanel.java
index f53317f..cf0b947 100644
--- a/user/src/com/google/gwt/user/client/ui/FocusPanel.java
+++ b/user/src/com/google/gwt/user/client/ui/FocusPanel.java
@@ -1,12 +1,12 @@
/*
* Copyright 2007 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,9 +26,9 @@
import com.google.gwt.event.dom.client.DragEnterEvent;
import com.google.gwt.event.dom.client.DragEnterHandler;
import com.google.gwt.event.dom.client.DragEvent;
+import com.google.gwt.event.dom.client.DragHandler;
import com.google.gwt.event.dom.client.DragLeaveEvent;
import com.google.gwt.event.dom.client.DragLeaveHandler;
-import com.google.gwt.event.dom.client.DragHandler;
import com.google.gwt.event.dom.client.DragOverEvent;
import com.google.gwt.event.dom.client.DragOverHandler;
import com.google.gwt.event.dom.client.DragStartEvent;
@@ -258,7 +258,7 @@
}
/**
- * @deprecated Use the {@link HandlerRegistration#removeHandler} method on
+ * @deprecated Use the {@link HandlerRegistration#removeHandler} method on
* the object returned by {@link #addClickHandler} instead
*/
@Deprecated
@@ -267,7 +267,7 @@
}
/**
- * @deprecated Use the {@link HandlerRegistration#removeHandler} method on
+ * @deprecated Use the {@link HandlerRegistration#removeHandler} method on
* the object returned by {@link #addFocusHandler} instead
*/
@Deprecated
diff --git a/user/src/com/google/gwt/user/client/ui/FocusWidget.java b/user/src/com/google/gwt/user/client/ui/FocusWidget.java
index 2e5e36c..3e9032e 100644
--- a/user/src/com/google/gwt/user/client/ui/FocusWidget.java
+++ b/user/src/com/google/gwt/user/client/ui/FocusWidget.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,9 +27,9 @@
import com.google.gwt.event.dom.client.DragEnterEvent;
import com.google.gwt.event.dom.client.DragEnterHandler;
import com.google.gwt.event.dom.client.DragEvent;
+import com.google.gwt.event.dom.client.DragHandler;
import com.google.gwt.event.dom.client.DragLeaveEvent;
import com.google.gwt.event.dom.client.DragLeaveHandler;
-import com.google.gwt.event.dom.client.DragHandler;
import com.google.gwt.event.dom.client.DragOverEvent;
import com.google.gwt.event.dom.client.DragOverHandler;
import com.google.gwt.event.dom.client.DragStartEvent;
@@ -95,7 +95,7 @@
/**
* Gets the FocusImpl instance.
- *
+ *
* @return impl
*/
protected static FocusImpl getFocusImpl() {
@@ -111,7 +111,7 @@
/**
* Creates a new focus widget that wraps the specified browser element.
- *
+ *
* @param elem the element to be wrapped
*/
protected FocusWidget(Element elem) {
@@ -271,7 +271,7 @@
/**
* Gets the tab index.
- *
+ *
* @return the tab index
*/
public int getTabIndex() {
@@ -280,7 +280,7 @@
/**
* Gets whether this widget is enabled.
- *
+ *
* @return <code>true</code> if the widget is enabled
*/
public boolean isEnabled() {
@@ -288,7 +288,7 @@
}
/**
- * @deprecated Use the {@link HandlerRegistration#removeHandler} method on
+ * @deprecated Use the {@link HandlerRegistration#removeHandler} method on
* the object returned by {@link #addClickHandler} instead
*/
@Deprecated
@@ -297,7 +297,7 @@
}
/**
- * @deprecated Use the {@link HandlerRegistration#removeHandler} method on
+ * @deprecated Use the {@link HandlerRegistration#removeHandler} method on
* the object returned by {@link #addFocusHandler} instead
*/
@Deprecated
@@ -338,7 +338,7 @@
/**
* Sets whether this widget is enabled.
- *
+ *
* @param enabled <code>true</code> to enable the widget, <code>false</code>
* to disable it
*/
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 a744994..ce10ab4 100644
--- a/user/src/com/google/gwt/user/client/ui/InlineHTML.java
+++ b/user/src/com/google/gwt/user/client/ui/InlineHTML.java
@@ -17,7 +17,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;
@@ -138,7 +137,7 @@
this();
setHTML(html, dir);
}
-
+
/**
* This constructor may be used by subclasses to explicitly use an existing
* element. This element must be either a <div> <span> element.
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 a6b9efc..d841236 100644
--- a/user/src/com/google/gwt/user/client/ui/InlineLabel.java
+++ b/user/src/com/google/gwt/user/client/ui/InlineLabel.java
@@ -17,7 +17,6 @@
import com.google.gwt.dom.client.Document;
import com.google.gwt.dom.client.Element;
-
import com.google.gwt.i18n.shared.DirectionEstimator;
/**
@@ -107,7 +106,7 @@
setDirectionEstimator(directionEstimator);
setText(text);
}
-
+
/**
* This constructor may be used by subclasses to explicitly use an existing
* element. This element must be either a <div> <span> element.
diff --git a/user/src/com/google/gwt/user/client/ui/Label.java b/user/src/com/google/gwt/user/client/ui/Label.java
index d0afd6d..56f29b3 100644
--- a/user/src/com/google/gwt/user/client/ui/Label.java
+++ b/user/src/com/google/gwt/user/client/ui/Label.java
@@ -29,9 +29,9 @@
import com.google.gwt.event.dom.client.DragEnterEvent;
import com.google.gwt.event.dom.client.DragEnterHandler;
import com.google.gwt.event.dom.client.DragEvent;
+import com.google.gwt.event.dom.client.DragHandler;
import com.google.gwt.event.dom.client.DragLeaveEvent;
import com.google.gwt.event.dom.client.DragLeaveHandler;
-import com.google.gwt.event.dom.client.DragHandler;
import com.google.gwt.event.dom.client.DragOverEvent;
import com.google.gwt.event.dom.client.DragOverHandler;
import com.google.gwt.event.dom.client.DragStartEvent;
@@ -154,7 +154,7 @@
/**
* Creates a label with the specified text and direction.
- *
+ *
* @param text the new label's text
* @param dir the text's direction. Note that {@code DEFAULT} means direction
* should be inherited from the widget's parent element.
@@ -166,7 +166,7 @@
/**
* Creates a label with the specified text and a default direction estimator.
- *
+ *
* @param text the new label's text
* @param directionEstimator A DirectionEstimator object used for automatic
* direction adjustment. For convenience,
@@ -312,7 +312,7 @@
public HandlerRegistration addTouchStartHandler(TouchStartHandler handler) {
return addDomHandler(handler, TouchStartEvent.getType());
}
-
+
public LeafValueEditor<String> asEditor() {
if (editor == null) {
editor = HasTextEditor.of(this);
@@ -382,7 +382,7 @@
* directionEstimator} is null. Otherwise, the widget's direction is set using
* the estimator, and its alignment may therefore change as described in
* {@link #setText(String, com.google.gwt.i18n.client.HasDirection.Direction) setText(String, Direction)}.
- *
+ *
* @param text the widget's new text
*/
public void setText(String text) {
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 732b1d7..ca48579 100644
--- a/user/src/com/google/gwt/user/client/ui/ListenerWrapper.java
+++ b/user/src/com/google/gwt/user/client/ui/ListenerWrapper.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -78,8 +78,8 @@
import com.google.gwt.event.logical.shared.ValueChangeHandler;
import com.google.gwt.event.shared.EventHandler;
import com.google.gwt.event.shared.GwtEvent;
-import com.google.gwt.event.shared.HandlerManager;
import com.google.gwt.event.shared.GwtEvent.Type;
+import com.google.gwt.event.shared.HandlerManager;
import com.google.gwt.user.client.BaseListenerWrapper;
import com.google.gwt.user.client.Event;
@@ -89,8 +89,8 @@
* Legacy listener support hierarchy for
* <code>com.google.gwt.user.client.ui</code>. Gathers the bulk of the legacy
* glue code in one place, for easy deletion when Listener methods are deleted.
- *
- *
+ *
+ *
* @param <T> listener type
* @deprecated will be removed in GWT 2.7 with the handler listeners themselves
*/
@@ -105,13 +105,13 @@
/**
* Adds the wrapped listener.
- *
+ *
* @param <S> the source of the events
- *
+ *
* @param source the event source
* @param listener the listener
* @return the wrapped listener
- *
+ *
* @deprecated will be removed in GWT 2.0 along with the listener classes
*/
@Deprecated
@@ -125,7 +125,7 @@
/**
* Removes the wrapped listener.
- *
+ *
* @param eventSource the event source from which to remove the wrapped
* listener
* @param listener the listener to remove
@@ -151,7 +151,7 @@
}
/**
* Wrapper for a {@link ChangeListener}.
- *
+ *
* @deprecated will be removed in GWT 2.0 along with the listeners being
* wrapped
*/
@@ -161,11 +161,11 @@
/**
* Adds the wrapped listener.
- *
+ *
* @param source the event source
* @param listener the listener
* @return the wrapped listener
- *
+ *
* @deprecated will be removed in GWT 2.0 along with the listener classes
*/
@Deprecated
@@ -178,7 +178,7 @@
/**
* Removes the wrapped listener.
- *
+ *
* @param eventSource the event source from which to remove the wrapped
* listener
* @param listener the listener to remove
@@ -200,7 +200,7 @@
/**
* Wrapper for a {@link ClickListener}.
- *
+ *
* @deprecated will be removed in GWT 2.0 along with the listeners being
* wrapped
*/
@@ -210,11 +210,11 @@
/**
* Adds the wrapped listener.
- *
+ *
* @param source the event source
* @param listener the listener
* @return the wrapped listener
- *
+ *
* @deprecated will be removed in GWT 2.0 along with the listener classes
*/
@Deprecated
@@ -227,7 +227,7 @@
/**
* Removes the wrapped listener.
- *
+ *
* @param eventSource the event source from which to remove the wrapped
* listener
* @param listener the listener to remove
@@ -254,12 +254,12 @@
/**
* Adds the wrapped listener.
- *
+ *
* @param eventSource the event source
* @param listener the listener
- *
+ *
* @return the wrapped listener
- *
+ *
* @deprecated will be removed in GWT 2.0 along with the listener classes
*/
@Deprecated
@@ -272,7 +272,7 @@
/**
* Removes the wrapped listener.
- *
+ *
* @param eventSource the event source from which to remove the wrapped
* listener
* @param listener the listener to remove
@@ -306,11 +306,11 @@
/**
* Adds the wrapped listener.
- *
+ *
* @param source the event source
* @param listener the listener
* @return the wrapped listener
- *
+ *
* @deprecated will be removed in GWT 2.0 along with the listener classes
*/
@Deprecated
@@ -323,7 +323,7 @@
/**
* Removes the wrapped listener.
- *
+ *
* @param eventSource the event source from which to remove the wrapped
* listener
* @param listener the listener to remove
@@ -365,9 +365,9 @@
/**
* Wrapper for a {@link ChangeListener} being converted to a logical
* {@link ValueChangeHandler}.
- *
+ *
* @param <V> the type of the value changed
- *
+ *
* @deprecated will be removed in GWT 2.0 along with the listeners being
* wrapped
*/
@@ -377,13 +377,13 @@
/**
* Adds the wrapped listener.
- *
+ *
* @param <V> the type of value changed
- *
+ *
* @param source the event source
* @param listener the listener
* @return the wrapped listener
- *
+ *
* @deprecated will be removed in GWT 2.0 along with the listener classes
*/
@Deprecated
@@ -397,7 +397,7 @@
/**
* Removes the wrapped listener.
- *
+ *
* @param eventSource the event source from which to remove the wrapped
* listener
* @param listener the listener to remove
@@ -424,7 +424,7 @@
MouseUpHandler, MouseOutHandler, MouseOverHandler, MouseMoveHandler {
/**
* Adds the wrapped listener.
- *
+ *
* @param source the event source
* @param listener the listener
* @return the wrapped listener
@@ -445,7 +445,7 @@
/**
* Removes the wrapped listener.
- *
+ *
* @param eventSource the event source from which to remove the wrapped
* listener
* @param listener the listener to remove
@@ -492,11 +492,11 @@
ListenerWrapper<MouseWheelListener> implements MouseWheelHandler {
/**
* Adds the wrapped listener.
- *
+ *
* @param source the event source
* @param listener the listener
* @return the wrapped listener
- *
+ *
* @deprecated will be removed in GWT 2.0 along with the listener classes
*/
@Deprecated
@@ -509,7 +509,7 @@
/**
* Removes the wrapped listener.
- *
+ *
* @param eventSource the event source from which to remove the wrapped
* listener
* @param listener the listener to remove
@@ -537,11 +537,11 @@
/**
* Adds the wrapped listener.
- *
+ *
* @param source the event source
* @param listener the listener
* @return the wrapped listener
- *
+ *
* @deprecated will be removed in GWT 2.0 along with the listener classes
*/
@Deprecated
@@ -554,7 +554,7 @@
/**
* Removes the wrapped listener.
- *
+ *
* @param eventSource the event source from which to remove the wrapped
* listener
* @param listener the listener to remove
@@ -795,7 +795,7 @@
/**
* Convenience method to remove wrapped handlers from a widget.
- *
+ *
* @param <H> event handler type
* @param eventSource the event source
* @param listener the listener to remove
diff --git a/user/src/com/google/gwt/user/client/ui/PopupPanel.java b/user/src/com/google/gwt/user/client/ui/PopupPanel.java
index 30f5288..10c7cbc 100644
--- a/user/src/com/google/gwt/user/client/ui/PopupPanel.java
+++ b/user/src/com/google/gwt/user/client/ui/PopupPanel.java
@@ -36,12 +36,12 @@
import com.google.gwt.i18n.client.LocaleInfo;
import com.google.gwt.user.client.DOM;
import com.google.gwt.user.client.Event;
+import com.google.gwt.user.client.Event.NativePreviewEvent;
+import com.google.gwt.user.client.Event.NativePreviewHandler;
import com.google.gwt.user.client.EventPreview;
import com.google.gwt.user.client.History;
import com.google.gwt.user.client.Timer;
import com.google.gwt.user.client.Window;
-import com.google.gwt.user.client.Event.NativePreviewEvent;
-import com.google.gwt.user.client.Event.NativePreviewHandler;
import com.google.gwt.user.client.ui.impl.PopupImpl;
import java.util.ArrayList;
diff --git a/user/src/com/google/gwt/user/client/ui/SimplePanel.java b/user/src/com/google/gwt/user/client/ui/SimplePanel.java
index 66a2414..c9af2ca 100644
--- a/user/src/com/google/gwt/user/client/ui/SimplePanel.java
+++ b/user/src/com/google/gwt/user/client/ui/SimplePanel.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,8 +15,8 @@
*/
package com.google.gwt.user.client.ui;
-import com.google.gwt.user.client.DOM;
import com.google.gwt.dom.client.Element;
+import com.google.gwt.user.client.DOM;
import java.util.Iterator;
import java.util.NoSuchElementException;
@@ -37,7 +37,7 @@
/**
* Create a panel with the specified child widget.
- *
+ *
* @param child the child to add to the panel
*/
public SimplePanel(Widget child) {
@@ -48,16 +48,16 @@
/**
* Creates an empty panel that uses the specified browser element for its
* contents.
- *
+ *
* @param elem the browser element to use
*/
protected SimplePanel(Element elem) {
setElement(elem);
}
-
+
/**
* Adds a widget to this panel.
- *
+ *
* @param w the child widget to be added
*/
@Override
@@ -71,7 +71,7 @@
/**
* Gets the panel's child widget.
- *
+ *
* @return the child widget, or <code>null</code> if none is present
*/
public Widget getWidget() {
@@ -118,20 +118,20 @@
} finally {
// Physical detach.
getContainerElement().removeChild(w.getElement());
-
+
// Logical detach.
widget = null;
}
return true;
}
-
+
public void setWidget(IsWidget w) {
setWidget(asWidgetOrNull(w));
}
/**
* Sets this panel's widget. Any existing child widget will be removed.
- *
+ *
* @param w the panel's new widget, or <code>null</code> to clear the panel
*/
public void setWidget(Widget w) {
@@ -165,11 +165,11 @@
* Override this method to specify that an element other than the root element
* be the container for the panel's child widget. This can be useful when you
* want to create a simple panel that decorates its contents.
- *
+ *
* Note that this method continues to return the
* {@link com.google.gwt.user.client.Element} class defined in the
* <code>User</code> module to maintain backwards compatibility.
- *
+ *
* @return the element to be used as the panel's container
*/
protected com.google.gwt.user.client.Element getContainerElement() {
diff --git a/user/src/com/google/gwt/user/linker/rpc/RpcLogLinker.java b/user/src/com/google/gwt/user/linker/rpc/RpcLogLinker.java
index cd0a3aa..3eb02a6 100644
--- a/user/src/com/google/gwt/user/linker/rpc/RpcLogLinker.java
+++ b/user/src/com/google/gwt/user/linker/rpc/RpcLogLinker.java
@@ -1,12 +1,12 @@
/*
* Copyright 2009 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,8 +24,8 @@
import com.google.gwt.core.ext.linker.EmittedArtifact;
import com.google.gwt.core.ext.linker.EmittedArtifact.Visibility;
import com.google.gwt.core.ext.linker.LinkerOrder;
-import com.google.gwt.core.ext.linker.Shardable;
import com.google.gwt.core.ext.linker.LinkerOrder.Order;
+import com.google.gwt.core.ext.linker.Shardable;
/**
* This linker emits {@link RpcLogArtifact}s as output files.
diff --git a/user/src/com/google/gwt/user/linker/rpc/RpcPolicyManifestLinker.java b/user/src/com/google/gwt/user/linker/rpc/RpcPolicyManifestLinker.java
index 8c84dd3..5d0b37e 100644
--- a/user/src/com/google/gwt/user/linker/rpc/RpcPolicyManifestLinker.java
+++ b/user/src/com/google/gwt/user/linker/rpc/RpcPolicyManifestLinker.java
@@ -1,12 +1,12 @@
/*
* Copyright 2009 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -23,9 +23,9 @@
import com.google.gwt.core.ext.linker.EmittedArtifact;
import com.google.gwt.core.ext.linker.EmittedArtifact.Visibility;
import com.google.gwt.core.ext.linker.LinkerOrder;
+import com.google.gwt.core.ext.linker.LinkerOrder.Order;
import com.google.gwt.core.ext.linker.Shardable;
import com.google.gwt.core.ext.linker.SyntheticArtifact;
-import com.google.gwt.core.ext.linker.LinkerOrder.Order;
import com.google.gwt.dev.jjs.InternalCompilerException;
import com.google.gwt.dev.util.Util;
import com.google.gwt.user.rebind.rpc.ProxyCreator;
diff --git a/user/src/com/google/gwt/user/rebind/rpc/ProxyCreator.java b/user/src/com/google/gwt/user/rebind/rpc/ProxyCreator.java
index 088401e..f29b62f 100644
--- a/user/src/com/google/gwt/user/rebind/rpc/ProxyCreator.java
+++ b/user/src/com/google/gwt/user/rebind/rpc/ProxyCreator.java
@@ -18,8 +18,8 @@
import com.google.gwt.core.client.GWT;
import com.google.gwt.core.client.impl.Impl;
import com.google.gwt.core.ext.BadPropertyValueException;
-import com.google.gwt.core.ext.CachedPropertyInformation;
import com.google.gwt.core.ext.CachedGeneratorResult;
+import com.google.gwt.core.ext.CachedPropertyInformation;
import com.google.gwt.core.ext.ConfigurationProperty;
import com.google.gwt.core.ext.GeneratorContext;
import com.google.gwt.core.ext.PropertyOracle;
@@ -311,13 +311,13 @@
writer.write("====================================\n\n");
writer.flush();
typesSentFromBrowser = typesSentFromBrowserBuilder.build(logger);
-
+
writer.write("===================================\n");
writer.write("Types potentially sent from server:\n");
writer.write("===================================\n\n");
writer.flush();
typesSentToBrowser = typesSentToBrowserBuilder.build(logger);
-
+
writer.close();
rpcLog = stringWriter.toString();
} else {
diff --git a/user/src/com/google/gwt/user/rebind/rpc/SerializableTypeOracleBuilder.java b/user/src/com/google/gwt/user/rebind/rpc/SerializableTypeOracleBuilder.java
index 29bfa07..6676ad2 100644
--- a/user/src/com/google/gwt/user/rebind/rpc/SerializableTypeOracleBuilder.java
+++ b/user/src/com/google/gwt/user/rebind/rpc/SerializableTypeOracleBuilder.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -53,19 +53,19 @@
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import java.util.TreeSet;
-import java.util.Map.Entry;
/**
* Builds a {@link SerializableTypeOracle} for a given set of root types.
- *
+ *
* <p>
* There are two goals for this builder. First, discover the set of serializable
* types that can be serialized if you serialize one of the root types. Second,
* to make sure that all root types can actually be serialized by GWT.
* </p>
- *
+ *
* <p>
* To find the serializable types, it includes the root types, and then it
* iteratively traverses the type hierarchy and the fields of any type already
@@ -74,7 +74,7 @@
* parameterized type, these exposure values are used to determine how to treat
* the arguments.
* </p>
- *
+ *
* <p>
* A type qualifies for serialization if it or one of its subtypes is
* automatically or manually serializable. Automatic serialization is selected
@@ -85,19 +85,19 @@
* qualifies for both manual and automatic serialization, manual serialization
* is preferred.
* </p>
- *
+ *
* <p>
* Some types may be marked as "enhanced," either automatically by the presence
* of a JDO <code>@PersistenceCapable</code> or JPA <code>@Entity</code> tag on
* the class definition, or manually by extending the 'rpc.enhancedClasses'
* configuration property in the GWT module XML file. For example, to manually
* mark the class com.google.myapp.MyPersistentClass as enhanced, use:
- *
+ *
* <pre>
* <extend-configuration-property name='rpc.enhancedClasses'
* value='com.google.myapp.MyPersistentClass'/>
* </pre>
- *
+ *
* <p>
* Enhanced classes are checked for the presence of additional serializable
* fields on the server that were not defined in client code as seen by the GWT
@@ -353,7 +353,7 @@
/**
* Finds the custom field serializer for a given type.
- *
+ *
* @param typeOracle
* @param type
* @return the custom field serializer for a type or <code>null</code> if
@@ -371,7 +371,7 @@
/**
* Finds the custom field serializer for a given qualified source name.
- *
+ *
* @param typeOracle
* @param customFieldSerializerName
* @return the custom field serializer for a type of <code>null</code> if
@@ -392,7 +392,7 @@
/**
* Returns the name for a custom field serializer, given a source name.
- *
+ *
* @param sourceName
* @return the custom field serializer type name for a given source name.
*/
@@ -739,11 +739,11 @@
/**
* Constructs a builder.
- *
+ *
* @param logger
* @param propertyOracle
* @param context
- *
+ *
* @throws UnableToCompleteException if we fail to find one of our special
* types
*/
@@ -786,11 +786,11 @@
/**
* Builds a {@link SerializableTypeOracle} for a given set of root types.
- *
+ *
* @param logger
* @return a {@link SerializableTypeOracle} for the specified set of root
* types
- *
+ *
* @throws UnableToCompleteException if there was not at least one
* instantiable type assignable to each of the specified root types
*/
@@ -898,14 +898,14 @@
* This method determines information about serializing a type with GWT. To do
* so, it must traverse all subtypes as well as all field types of those
* types, transitively.
- *
+ *
* It returns a {@link TypeInfoComputed} with the information found.
- *
+ *
* As a side effect, all types needed--plus some--to serialize this type are
* accumulated in {@link #typeToTypeInfoComputed}. In particular, there will
* be an entry for any type that has been validated by this method, as a
* shortcircuit to avoid recomputation.
- *
+ *
* The method is exposed using default access to enable testing.
*/
TypeInfoComputed computeTypeInstantiability(TreeLogger logger, JType type, TypePath path,
@@ -1017,7 +1017,7 @@
/**
* Returns <code>true</code> if the fields of the type should be considered
* for serialization.
- *
+ *
* Default access to allow for testing.
*/
boolean shouldConsiderFieldsForSerialization(JClassType type, ProblemReport problems) {
@@ -1297,7 +1297,7 @@
* @param paramIndex - The index of the parameter in the generic type
* @param typeArg - An upper bound on the actual argument being applied to the
* generic type
- *
+ *
* @return Whether the a parameterized type can be serializable if
* <code>baseType</code> is the base type and the
* <code>paramIndex</code>th type argument is a subtype of
@@ -1641,7 +1641,7 @@
/**
* Remove serializable types that were visited due to speculative paths but
* are not really needed for serialization.
- *
+ *
* NOTE: This is currently much more limited than it should be. For example, a
* path sensitive prune could remove instantiable types also.
*/
diff --git a/user/src/com/google/gwt/user/rebind/rpc/TypeParameterExposureComputer.java b/user/src/com/google/gwt/user/rebind/rpc/TypeParameterExposureComputer.java
index 219aaef..3531c30 100644
--- a/user/src/com/google/gwt/user/rebind/rpc/TypeParameterExposureComputer.java
+++ b/user/src/com/google/gwt/user/rebind/rpc/TypeParameterExposureComputer.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -30,8 +30,8 @@
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.Map;
-import java.util.Set;
import java.util.Map.Entry;
+import java.util.Set;
/**
* This class is used to compute type parameter exposure using a flow algorithm.
@@ -369,7 +369,7 @@
/**
* Computes flow information for the specified type parameter. If it has
* already been computed just return the value of the previous computation.
- *
+ *
* @param type the generic type whose type parameter flow we are interested in
* @param index the index of the type parameter whose flow we want to compute
*/
diff --git a/user/src/com/google/gwt/user/tools/QuerySourceMap.java b/user/src/com/google/gwt/user/tools/QuerySourceMap.java
index 8d7b3a8..c93b1ac 100644
--- a/user/src/com/google/gwt/user/tools/QuerySourceMap.java
+++ b/user/src/com/google/gwt/user/tools/QuerySourceMap.java
@@ -15,9 +15,9 @@
*/
package com.google.gwt.user.tools;
+import com.google.gwt.dev.util.Util;
import com.google.gwt.thirdparty.debugging.sourcemap.SourceMapConsumerFactory;
import com.google.gwt.thirdparty.debugging.sourcemap.SourceMapping;
-import com.google.gwt.dev.util.Util;
import java.io.File;
diff --git a/user/src/com/google/gwt/validation/client/impl/ConstraintFinderImpl.java b/user/src/com/google/gwt/validation/client/impl/ConstraintFinderImpl.java
index 9964487..cf2af44 100644
--- a/user/src/com/google/gwt/validation/client/impl/ConstraintFinderImpl.java
+++ b/user/src/com/google/gwt/validation/client/impl/ConstraintFinderImpl.java
@@ -29,8 +29,8 @@
import javax.validation.groups.Default;
import javax.validation.metadata.ConstraintDescriptor;
-import javax.validation.metadata.Scope;
import javax.validation.metadata.ElementDescriptor.ConstraintFinder;
+import javax.validation.metadata.Scope;
/**
* Finds constraints declared on an element using specified criteria.
@@ -44,7 +44,7 @@
private BeanMetadata beanMetadata;
public ConstraintFinderImpl(BeanMetadata beanMetadata,
- ValidationGroupsMetadata validationGroupsMetadata,
+ ValidationGroupsMetadata validationGroupsMetadata,
Set<ConstraintDescriptorImpl<?>> constraintDescriptors) {
this.validationGroupsMetadata = validationGroupsMetadata;
this.constraintDescriptors = constraintDescriptors;
diff --git a/user/src/com/google/gwt/validation/client/impl/metadata/ValidationGroupsMetadata.java b/user/src/com/google/gwt/validation/client/impl/metadata/ValidationGroupsMetadata.java
index f22a1ed..e022ccf 100644
--- a/user/src/com/google/gwt/validation/client/impl/metadata/ValidationGroupsMetadata.java
+++ b/user/src/com/google/gwt/validation/client/impl/metadata/ValidationGroupsMetadata.java
@@ -18,10 +18,10 @@
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.HashMap;
import java.util.Set;
import java.util.Stack;
@@ -66,7 +66,7 @@
sequenceMap.put(groupSequence, Arrays.asList(sequenceGroups));
return this;
}
-
+
public ValidationGroupsMetadata build() {
return new ValidationGroupsMetadata(inheritanceinheritanceMap, sequenceMap);
}
@@ -110,7 +110,7 @@
/**
* Finds all of the validation groups extended by an intial set of groups.
- * @param baseGroups The initial set of groups to find parents of. These groups must have been
+ * @param baseGroups The initial set of groups to find parents of. These groups must have been
* added to the inheritance map already.
* @return A unified set of groups and their parents.
* @throws IllegalArgumentException If an initial group has not been added to the map before
@@ -168,7 +168,7 @@
/**
* If the group has been added to the map then its parent groups (of one level above) are
* retrieved. Otherwise null is returned.
- *
+ *
* @see #containsGroup(Class)
* @see #findAllExtendedGroups(Collection)
*/
diff --git a/user/src/com/google/web/bindery/autobean/gwt/client/impl/ClientPropertyContext.java b/user/src/com/google/web/bindery/autobean/gwt/client/impl/ClientPropertyContext.java
index 08c753c..2208ada 100644
--- a/user/src/com/google/web/bindery/autobean/gwt/client/impl/ClientPropertyContext.java
+++ b/user/src/com/google/web/bindery/autobean/gwt/client/impl/ClientPropertyContext.java
@@ -1,12 +1,12 @@
/*
* Copyright 2011 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,12 +15,12 @@
*/
package com.google.web.bindery.autobean.gwt.client.impl;
+import com.google.gwt.core.client.JavaScriptObject;
import com.google.web.bindery.autobean.shared.AutoBeanVisitor.CollectionPropertyContext;
import com.google.web.bindery.autobean.shared.AutoBeanVisitor.MapPropertyContext;
import com.google.web.bindery.autobean.shared.AutoBeanVisitor.ParameterizationVisitor;
import com.google.web.bindery.autobean.shared.AutoBeanVisitor.PropertyContext;
import com.google.web.bindery.autobean.shared.impl.AbstractAutoBean;
-import com.google.gwt.core.client.JavaScriptObject;
import java.util.List;
import java.util.Map;
diff --git a/user/src/com/google/web/bindery/autobean/gwt/client/impl/JsniCreatorMap.java b/user/src/com/google/web/bindery/autobean/gwt/client/impl/JsniCreatorMap.java
index d6e4468..0a664e6 100644
--- a/user/src/com/google/web/bindery/autobean/gwt/client/impl/JsniCreatorMap.java
+++ b/user/src/com/google/web/bindery/autobean/gwt/client/impl/JsniCreatorMap.java
@@ -1,12 +1,12 @@
/*
* Copyright 2011 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,9 +15,9 @@
*/
package com.google.web.bindery.autobean.gwt.client.impl;
-import com.google.web.bindery.autobean.shared.AutoBean;
import com.google.gwt.core.client.JavaScriptObject;
import com.google.gwt.core.client.JsArray;
+import com.google.web.bindery.autobean.shared.AutoBean;
/**
* Used in prod-mode code to create instances of generated AutoBean subtypes via
diff --git a/user/src/com/google/web/bindery/autobean/gwt/client/impl/JsoSplittable.java b/user/src/com/google/web/bindery/autobean/gwt/client/impl/JsoSplittable.java
index 33eba24..36a2677 100644
--- a/user/src/com/google/web/bindery/autobean/gwt/client/impl/JsoSplittable.java
+++ b/user/src/com/google/web/bindery/autobean/gwt/client/impl/JsoSplittable.java
@@ -1,12 +1,12 @@
/*
* Copyright 2010 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,12 +15,12 @@
*/
package com.google.web.bindery.autobean.gwt.client.impl;
-import com.google.web.bindery.autobean.shared.Splittable;
-import com.google.web.bindery.autobean.shared.impl.HasSplittable;
-import com.google.web.bindery.autobean.shared.impl.StringQuoter;
import com.google.gwt.core.client.GwtScriptOnly;
import com.google.gwt.core.client.JavaScriptObject;
import com.google.gwt.core.client.JsonUtils;
+import com.google.web.bindery.autobean.shared.Splittable;
+import com.google.web.bindery.autobean.shared.impl.HasSplittable;
+import com.google.web.bindery.autobean.shared.impl.StringQuoter;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/user/src/com/google/web/bindery/autobean/gwt/rebind/AutoBeanFactoryGenerator.java b/user/src/com/google/web/bindery/autobean/gwt/rebind/AutoBeanFactoryGenerator.java
index 02554ab..9fef5da 100644
--- a/user/src/com/google/web/bindery/autobean/gwt/rebind/AutoBeanFactoryGenerator.java
+++ b/user/src/com/google/web/bindery/autobean/gwt/rebind/AutoBeanFactoryGenerator.java
@@ -1,12 +1,12 @@
/*
* Copyright 2010 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,21 +15,6 @@
*/
package com.google.web.bindery.autobean.gwt.rebind;
-import com.google.web.bindery.autobean.gwt.client.impl.AbstractAutoBeanFactory;
-import com.google.web.bindery.autobean.gwt.client.impl.ClientPropertyContext;
-import com.google.web.bindery.autobean.gwt.client.impl.JsniCreatorMap;
-import com.google.web.bindery.autobean.gwt.rebind.model.AutoBeanFactoryMethod;
-import com.google.web.bindery.autobean.gwt.rebind.model.AutoBeanFactoryModel;
-import com.google.web.bindery.autobean.gwt.rebind.model.AutoBeanMethod;
-import com.google.web.bindery.autobean.gwt.rebind.model.AutoBeanType;
-import com.google.web.bindery.autobean.gwt.rebind.model.JBeanMethod;
-import com.google.web.bindery.autobean.shared.AutoBean;
-import com.google.web.bindery.autobean.shared.AutoBeanFactory;
-import com.google.web.bindery.autobean.shared.AutoBeanUtils;
-import com.google.web.bindery.autobean.shared.AutoBeanVisitor;
-import com.google.web.bindery.autobean.shared.Splittable;
-import com.google.web.bindery.autobean.shared.impl.AbstractAutoBean;
-import com.google.web.bindery.autobean.shared.impl.AbstractAutoBean.OneShotContext;
import com.google.gwt.core.client.JavaScriptObject;
import com.google.gwt.core.client.JsArray;
import com.google.gwt.core.client.impl.WeakMapping;
@@ -48,6 +33,21 @@
import com.google.gwt.editor.rebind.model.ModelUtils;
import com.google.gwt.user.rebind.ClassSourceFileComposerFactory;
import com.google.gwt.user.rebind.SourceWriter;
+import com.google.web.bindery.autobean.gwt.client.impl.AbstractAutoBeanFactory;
+import com.google.web.bindery.autobean.gwt.client.impl.ClientPropertyContext;
+import com.google.web.bindery.autobean.gwt.client.impl.JsniCreatorMap;
+import com.google.web.bindery.autobean.gwt.rebind.model.AutoBeanFactoryMethod;
+import com.google.web.bindery.autobean.gwt.rebind.model.AutoBeanFactoryModel;
+import com.google.web.bindery.autobean.gwt.rebind.model.AutoBeanMethod;
+import com.google.web.bindery.autobean.gwt.rebind.model.AutoBeanType;
+import com.google.web.bindery.autobean.gwt.rebind.model.JBeanMethod;
+import com.google.web.bindery.autobean.shared.AutoBean;
+import com.google.web.bindery.autobean.shared.AutoBeanFactory;
+import com.google.web.bindery.autobean.shared.AutoBeanUtils;
+import com.google.web.bindery.autobean.shared.AutoBeanVisitor;
+import com.google.web.bindery.autobean.shared.Splittable;
+import com.google.web.bindery.autobean.shared.impl.AbstractAutoBean;
+import com.google.web.bindery.autobean.shared.impl.AbstractAutoBean.OneShotContext;
import java.io.PrintWriter;
import java.util.ArrayList;
diff --git a/user/src/com/google/web/bindery/autobean/gwt/rebind/model/AutoBeanFactoryModel.java b/user/src/com/google/web/bindery/autobean/gwt/rebind/model/AutoBeanFactoryModel.java
index 6122dfc..5981c2f 100644
--- a/user/src/com/google/web/bindery/autobean/gwt/rebind/model/AutoBeanFactoryModel.java
+++ b/user/src/com/google/web/bindery/autobean/gwt/rebind/model/AutoBeanFactoryModel.java
@@ -1,12 +1,12 @@
/*
* Copyright 2010 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,11 +15,6 @@
*/
package com.google.web.bindery.autobean.gwt.rebind.model;
-import com.google.web.bindery.autobean.shared.AutoBean;
-import com.google.web.bindery.autobean.shared.AutoBeanFactory;
-import com.google.web.bindery.autobean.shared.AutoBeanFactory.Category;
-import com.google.web.bindery.autobean.shared.AutoBeanFactory.NoWrap;
-import com.google.web.bindery.autobean.shared.impl.EnumMap.ExtraEnums;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.core.ext.typeinfo.JClassType;
@@ -32,6 +27,11 @@
import com.google.gwt.core.ext.typeinfo.JType;
import com.google.gwt.core.ext.typeinfo.TypeOracle;
import com.google.gwt.editor.rebind.model.ModelUtils;
+import com.google.web.bindery.autobean.shared.AutoBean;
+import com.google.web.bindery.autobean.shared.AutoBeanFactory;
+import com.google.web.bindery.autobean.shared.AutoBeanFactory.Category;
+import com.google.web.bindery.autobean.shared.AutoBeanFactory.NoWrap;
+import com.google.web.bindery.autobean.shared.impl.EnumMap.ExtraEnums;
import java.util.ArrayList;
import java.util.Arrays;
@@ -44,7 +44,7 @@
import java.util.Set;
/**
- *
+ *
*/
public class AutoBeanFactoryModel {
private static final JType[] EMPTY_JTYPE = new JType[0];
@@ -321,14 +321,14 @@
/**
* Search the category types for a static implementation of an interface
* method. Given the interface method declaration:
- *
+ *
* <pre>
* Foo bar(Baz baz);
* </pre>
- *
+ *
* this will search the types in {@link #categoryTypes} for the following
* method:
- *
+ *
* <pre>
* public static Foo bar(AutoBean<Intf> bean, Baz baz) {}
* </pre>
diff --git a/user/src/com/google/web/bindery/autobean/gwt/rebind/model/AutoBeanMethod.java b/user/src/com/google/web/bindery/autobean/gwt/rebind/model/AutoBeanMethod.java
index 43763df..a93e42b 100644
--- a/user/src/com/google/web/bindery/autobean/gwt/rebind/model/AutoBeanMethod.java
+++ b/user/src/com/google/web/bindery/autobean/gwt/rebind/model/AutoBeanMethod.java
@@ -1,12 +1,12 @@
/*
* Copyright 2010 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,7 +15,6 @@
*/
package com.google.web.bindery.autobean.gwt.rebind.model;
-import com.google.web.bindery.autobean.shared.AutoBean.PropertyName;
import com.google.gwt.core.ext.typeinfo.JClassType;
import com.google.gwt.core.ext.typeinfo.JEnumConstant;
import com.google.gwt.core.ext.typeinfo.JEnumType;
@@ -23,6 +22,7 @@
import com.google.gwt.core.ext.typeinfo.JType;
import com.google.gwt.core.ext.typeinfo.TypeOracle;
import com.google.gwt.editor.rebind.model.ModelUtils;
+import com.google.web.bindery.autobean.shared.AutoBean.PropertyName;
import java.util.Collection;
import java.util.LinkedHashMap;
diff --git a/user/src/com/google/web/bindery/requestfactory/gwt/client/impl/PathCollector.java b/user/src/com/google/web/bindery/requestfactory/gwt/client/impl/PathCollector.java
index ab4f8aa..09f3ac7 100644
--- a/user/src/com/google/web/bindery/requestfactory/gwt/client/impl/PathCollector.java
+++ b/user/src/com/google/web/bindery/requestfactory/gwt/client/impl/PathCollector.java
@@ -1,12 +1,12 @@
/*
* Copyright 2011 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,9 +15,9 @@
*/
package com.google.web.bindery.requestfactory.gwt.client.impl;
-import com.google.web.bindery.autobean.shared.ValueCodex;
import com.google.gwt.editor.client.EditorContext;
import com.google.gwt.editor.client.EditorVisitor;
+import com.google.web.bindery.autobean.shared.ValueCodex;
import java.util.ArrayList;
import java.util.LinkedHashSet;
diff --git a/user/src/com/google/web/bindery/requestfactory/shared/impl/ProxySerializerImpl.java b/user/src/com/google/web/bindery/requestfactory/shared/impl/ProxySerializerImpl.java
index 1e3af5a..b244642 100644
--- a/user/src/com/google/web/bindery/requestfactory/shared/impl/ProxySerializerImpl.java
+++ b/user/src/com/google/web/bindery/requestfactory/shared/impl/ProxySerializerImpl.java
@@ -27,8 +27,8 @@
import com.google.web.bindery.requestfactory.shared.ProxySerializer;
import com.google.web.bindery.requestfactory.shared.ProxyStore;
import com.google.web.bindery.requestfactory.shared.messages.IdMessage;
-import com.google.web.bindery.requestfactory.shared.messages.OperationMessage;
import com.google.web.bindery.requestfactory.shared.messages.IdMessage.Strength;
+import com.google.web.bindery.requestfactory.shared.messages.OperationMessage;
import java.util.Collection;
import java.util.HashMap;
diff --git a/user/src/com/google/web/bindery/requestfactory/shared/messages/OperationMessage.java b/user/src/com/google/web/bindery/requestfactory/shared/messages/OperationMessage.java
index 9ed7e67..7606f61 100644
--- a/user/src/com/google/web/bindery/requestfactory/shared/messages/OperationMessage.java
+++ b/user/src/com/google/web/bindery/requestfactory/shared/messages/OperationMessage.java
@@ -1,12 +1,12 @@
/*
* Copyright 2010 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,8 +15,8 @@
*/
package com.google.web.bindery.requestfactory.shared.messages;
-import com.google.web.bindery.autobean.shared.Splittable;
import com.google.web.bindery.autobean.shared.AutoBean.PropertyName;
+import com.google.web.bindery.autobean.shared.Splittable;
import com.google.web.bindery.requestfactory.shared.WriteOperation;
import java.util.Map;
diff --git a/user/super/com/google/gwt/core/translatable/com/google/gwt/core/shared/impl/StringCase.java b/user/super/com/google/gwt/core/translatable/com/google/gwt/core/shared/impl/StringCase.java
index 921df75..97326a5 100644
--- a/user/super/com/google/gwt/core/translatable/com/google/gwt/core/shared/impl/StringCase.java
+++ b/user/super/com/google/gwt/core/translatable/com/google/gwt/core/shared/impl/StringCase.java
@@ -17,8 +17,6 @@
import com.google.gwt.core.client.GwtScriptOnly;
-import java.util.Locale;
-
/**
* Provides {@link Locale} independent {@link String#toLowerCase()} and {@link String#toLowerCase()}
* functions.
diff --git a/user/super/com/google/gwt/safecss/super/com/google/gwt/safecss/shared/SafeStylesHostedModeUtils.java b/user/super/com/google/gwt/safecss/super/com/google/gwt/safecss/shared/SafeStylesHostedModeUtils.java
index cc56540..cf2dcad 100644
--- a/user/super/com/google/gwt/safecss/super/com/google/gwt/safecss/shared/SafeStylesHostedModeUtils.java
+++ b/user/super/com/google/gwt/safecss/super/com/google/gwt/safecss/shared/SafeStylesHostedModeUtils.java
@@ -17,7 +17,9 @@
import com.google.gwt.core.client.GwtScriptOnly;
-// This is the super-source peer of this class.
+/**
+ * Supersource (webmode only) version of SafeStyleHosedModeUtils.
+ */
@GwtScriptOnly
public class SafeStylesHostedModeUtils {
diff --git a/user/super/com/google/gwt/safehtml/super/com/google/gwt/safehtml/shared/SafeHtmlHostedModeUtils.java b/user/super/com/google/gwt/safehtml/super/com/google/gwt/safehtml/shared/SafeHtmlHostedModeUtils.java
index 85c7f42..2d330f0 100644
--- a/user/super/com/google/gwt/safehtml/super/com/google/gwt/safehtml/shared/SafeHtmlHostedModeUtils.java
+++ b/user/super/com/google/gwt/safehtml/super/com/google/gwt/safehtml/shared/SafeHtmlHostedModeUtils.java
@@ -17,17 +17,19 @@
import com.google.gwt.core.client.GwtScriptOnly;
-// This is the super-source peer of this class.
+/**
+ * Supersource (webonly) version of SafeHtmlHostedModeUtils.
+ */
@GwtScriptOnly
public class SafeHtmlHostedModeUtils {
// Unused in super-source; only defined to avoid compiler warnings
public static final String FORCE_CHECK_COMPLETE_HTML = null;
-
+
public static void maybeCheckCompleteHtml(String html) {
// This check is a noop in web mode.
}
-
+
// Unused in super-source; only defined to avoid compiler warnings
public static void setForceCheckCompleteHtml(boolean check) { }
static void setForceCheckCompleteHtmlFromProperty() { }
diff --git a/user/super/com/google/gwt/safehtml/super/com/google/gwt/safehtml/shared/SafeUriHostedModeUtils.java b/user/super/com/google/gwt/safehtml/super/com/google/gwt/safehtml/shared/SafeUriHostedModeUtils.java
index 2112624..bb252b5 100644
--- a/user/super/com/google/gwt/safehtml/super/com/google/gwt/safehtml/shared/SafeUriHostedModeUtils.java
+++ b/user/super/com/google/gwt/safehtml/super/com/google/gwt/safehtml/shared/SafeUriHostedModeUtils.java
@@ -17,18 +17,20 @@
import com.google.gwt.core.client.GwtScriptOnly;
-// This is the super-source peer of this class.
+/**
+ * Supersource (webonly) version of SafeUrilHostedModeUtils.
+ */
@GwtScriptOnly
public class SafeUriHostedModeUtils {
// Unused in super-source; only defined to avoid compiler warnings
public static final String FORCE_CHECK_VALID_URI = null;
static final String HREF_DISCRETE_UCSCHAR = null;
-
+
public static void maybeCheckValidUri(String uri) {
// This check is a noop in web mode.
}
-
+
// Unused in super-source; only defined to avoid compiler warnings
public static boolean isValidUriCharset(String uri) { return true; }
public static void setForceCheckValidUri(boolean check) { }
diff --git a/user/super/com/google/gwt/user/translatable/com/google/gwt/user/client/rpc/core/java/util/EnumMap_CustomFieldSerializer.java b/user/super/com/google/gwt/user/translatable/com/google/gwt/user/client/rpc/core/java/util/EnumMap_CustomFieldSerializer.java
index 9324037..b2d55c9 100644
--- a/user/super/com/google/gwt/user/translatable/com/google/gwt/user/client/rpc/core/java/util/EnumMap_CustomFieldSerializer.java
+++ b/user/super/com/google/gwt/user/translatable/com/google/gwt/user/client/rpc/core/java/util/EnumMap_CustomFieldSerializer.java
@@ -1,11 +1,11 @@
/*
* Copyright 2012 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -20,7 +20,6 @@
import com.google.gwt.user.client.rpc.SerializationStreamWriter;
import java.util.EnumMap;
-import java.util.EnumSet;
/**
* Custom field serializer for {@link java.util.EnumMap}.
@@ -47,7 +46,7 @@
Class clazz = exemplar.getClass();
return new EnumMap(clazz);
}
-
+
public static native <E> E[] getKeyUniverse(EnumMap<?, ?> map) /*-{
return map.@java.util.EnumMap::keySet.@java.util.EnumSet$EnumSetImpl::all;
}-*/;
@@ -62,7 +61,7 @@
throws SerializationException {
Object exemplar;
Object [] keyUniverse = getKeyUniverse(instance);
- exemplar = keyUniverse[0];
+ exemplar = keyUniverse[0];
streamWriter.writeObject(exemplar);
Map_CustomFieldSerializerBase.serialize(streamWriter, instance);
}
@@ -89,4 +88,4 @@
throws SerializationException {
serialize(streamWriter, instance);
}
-}
\ No newline at end of file
+}
diff --git a/user/super/com/google/web/bindery/autobean/super/com/google/web/bindery/autobean/shared/impl/StringQuoter.java b/user/super/com/google/web/bindery/autobean/super/com/google/web/bindery/autobean/shared/impl/StringQuoter.java
index d92b3bf..da8e7a9 100644
--- a/user/super/com/google/web/bindery/autobean/super/com/google/web/bindery/autobean/shared/impl/StringQuoter.java
+++ b/user/super/com/google/web/bindery/autobean/super/com/google/web/bindery/autobean/shared/impl/StringQuoter.java
@@ -1,12 +1,12 @@
/*
* Copyright 2010 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,14 +15,12 @@
*/
package com.google.web.bindery.autobean.shared.impl;
-import com.google.web.bindery.autobean.gwt.client.impl.JsoSplittable;
-import com.google.web.bindery.autobean.shared.Splittable;
-import com.google.gwt.core.client.GWT;
import com.google.gwt.core.client.GwtScriptOnly;
import com.google.gwt.core.client.JavaScriptException;
import com.google.gwt.core.client.JsDate;
import com.google.gwt.core.client.JsonUtils;
-import com.google.gwt.user.server.rpc.impl.ServerSerializationStreamWriter;
+import com.google.web.bindery.autobean.gwt.client.impl.JsoSplittable;
+import com.google.web.bindery.autobean.shared.Splittable;
import java.util.Date;
diff --git a/user/test-super/com/google/gwt/junit/translatable/com/google/gwt/junit/client/DevModeOnCompiledScriptTest.java b/user/test-super/com/google/gwt/junit/translatable/com/google/gwt/junit/client/DevModeOnCompiledScriptTest.java
index ffdda16..72397f8 100644
--- a/user/test-super/com/google/gwt/junit/translatable/com/google/gwt/junit/client/DevModeOnCompiledScriptTest.java
+++ b/user/test-super/com/google/gwt/junit/translatable/com/google/gwt/junit/client/DevModeOnCompiledScriptTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2010 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -18,8 +18,6 @@
import com.google.gwt.junit.DoNotRunWith;
import com.google.gwt.junit.Platform;
-import junit.framework.TestCase;
-
/**
* Translatable trivial implementation.
*/
diff --git a/user/test/com/google/gwt/core/ext/test/SourceMapTest.java b/user/test/com/google/gwt/core/ext/test/SourceMapTest.java
index 07676b1..efa624e 100644
--- a/user/test/com/google/gwt/core/ext/test/SourceMapTest.java
+++ b/user/test/com/google/gwt/core/ext/test/SourceMapTest.java
@@ -453,8 +453,8 @@
} else if (kind.equals("method")) {
String[] fullName = ref.split("::");
checkInFragments(size,
- clsMap.get(fullName[0]).
- getMethod(unSynthMethodSignature(fullName[1])).getFragments());
+ clsMap.get(fullName[0])
+ .getMethod(unSynthMethodSignature(fullName[1])).getFragments());
} else if (kind.equals("field")) {
String[] fullName = ref.split("::");
checkInFragments(size,
@@ -500,8 +500,9 @@
super.startElement(uri, localName, qName, attributes);
try {
if (localName.equals("splipoint")) {
- JSONArray runAsyncs = fragmentById.get(Integer.parseInt(attributes.getValue("id"))).
- getJSONArray(EntityRecorder.FRAGMENT_POINTS);
+ JSONArray runAsyncs = fragmentById
+ .get(Integer.parseInt(attributes.getValue("id")))
+ .getJSONArray(EntityRecorder.FRAGMENT_POINTS);
boolean present = false;
String runAsync = attributes.getValue("location");
for (int i = 0; i < runAsyncs.length(); i++) {
diff --git a/user/test/com/google/gwt/dev/jjs/test/EnhancedForLoopTest.java b/user/test/com/google/gwt/dev/jjs/test/EnhancedForLoopTest.java
index 09bb89e..0e72233 100644
--- a/user/test/com/google/gwt/dev/jjs/test/EnhancedForLoopTest.java
+++ b/user/test/com/google/gwt/dev/jjs/test/EnhancedForLoopTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -17,9 +17,9 @@
import com.google.gwt.junit.client.GWTTestCase;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import java.util.ArrayList;
/**
* Tests the new JDK 1.5 enhanced for loop.
diff --git a/user/test/com/google/gwt/dev/jjs/test/EnumsWithNameObfuscationTest.java b/user/test/com/google/gwt/dev/jjs/test/EnumsWithNameObfuscationTest.java
index 1f23822..03d3400 100644
--- a/user/test/com/google/gwt/dev/jjs/test/EnumsWithNameObfuscationTest.java
+++ b/user/test/com/google/gwt/dev/jjs/test/EnumsWithNameObfuscationTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2010 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -16,13 +16,12 @@
package com.google.gwt.dev.jjs.test;
import com.google.gwt.core.client.JavaScriptException;
-import com.google.gwt.dev.jjs.test.EnumsTest.BasicWithOverloadedValueOf;
import com.google.gwt.junit.DoNotRunWith;
import com.google.gwt.junit.Platform;
/**
* Tests enum with names obfuscated functionality.
- *
+ *
* Note: If running in an environment with WARN logging enabled, check to see
* that calls to name(), toString(), and valueOf() below, are logged in the
* precompile phase.
@@ -49,31 +48,31 @@
assertEquals(0, Fruit.APPLE.ordinal());
assertEquals(1, Fruit.BERRY.ordinal());
assertEquals(2, Fruit.CHERRY.ordinal());
-
+
assertFalse(Fruit.CHERRY.toString().equals("CHERRY"));
assertFalse(Fruit.CHERRY.name().equals("CHERRY"));
-
+
assertTrue(Fruit.CHERRY.toString().equals("" + Fruit.CHERRY.ordinal()));
assertTrue(Fruit.CHERRY.name().equals("" + Fruit.CHERRY.ordinal()));
-
+
try {
Fruit.valueOf("CHERRIESONTOP");
fail("Enum.valueOf(), expected IllegalArgumentException");
} catch (IllegalArgumentException expected) {
}
-
+
try {
Fruit.valueOf("CHERRY");
fail("Enum.valueOf(), expected IllegalArgumentException");
} catch (IllegalArgumentException expected) {
}
-
+
try {
Enum.valueOf(Fruit.class,"CHERRIESONTOP");
fail("Enum.valueOf(), expected IllegalArgumentException");
} catch (IllegalArgumentException expected) {
}
-
+
try {
Enum.valueOf(Fruit.class,"CHERRY");
fail("Enum.valueOf(), expected IllegalArgumentException");
@@ -83,13 +82,13 @@
@Override
public void testCompareTo() {
-
+
try {
assertTrue(Basic.A.compareTo(Basic.valueOf("A")) == 0);
fail("Basic.valueOf(), expected IllegalArgumentException");
} catch (IllegalArgumentException expected) {
}
-
+
assertTrue(Basic.B.compareTo(Basic.A) > 0);
assertTrue(Basic.A.compareTo(Basic.B) < 0);
@@ -98,7 +97,7 @@
fail("Complex.valueOf(), expected IllegalArgumentException");
} catch (IllegalArgumentException expected) {
}
-
+
assertTrue(Complex.B.compareTo(Complex.A) > 0);
assertTrue(Complex.A.compareTo(Complex.B) < 0);
@@ -107,7 +106,7 @@
fail("Subclassing.valueOf(), expected IllegalArgumentException");
} catch (IllegalArgumentException expected) {
}
-
+
assertTrue(Subclassing.B.compareTo(Subclassing.A) > 0);
assertTrue(Subclassing.A.compareTo(Subclassing.B) < 0);
}
@@ -126,17 +125,17 @@
assertFalse("B".equals(Subclassing.B.name()));
assertFalse("C".equals(Subclassing.C.name()));
}
-
+
@Override
@SuppressWarnings("unchecked")
public void testValueOf() {
-
+
try {
Basic.valueOf("D");
fail("Basic.valueOf(\"D\") -- expected IllegalArgumentException");
} catch (IllegalArgumentException expected) {
}
-
+
try {
Complex.valueOf("D");
fail("Complex.valueOf(\"D\") -- expected IllegalArgumentException");
@@ -148,26 +147,26 @@
fail("Subclassing.valueOf(\"D\") -- expected IllegalArgumentException");
} catch (IllegalArgumentException expected) {
}
-
+
enumValuesTest(Basic.class);
enumValuesTest(Complex.class);
enumValuesTest(Subclassing.class);
-
+
try {
Enum.valueOf(Basic.class, "foo");
fail("Passed an invalid enum constant name to Enum.valueOf; expected "
+ "IllegalArgumentException");
} catch (IllegalArgumentException expected) {
}
-
+
try {
Class fakeEnumClass = String.class;
Enum.valueOf(fakeEnumClass, "foo");
- fail("Passed a non enum class to Enum.valueOf; expected "
+ fail("Passed a non enum class to Enum.valueOf; expected "
+ "IllegalArgumentException");
- } catch (IllegalArgumentException expected) {
+ } catch (IllegalArgumentException expected) {
}
-
+
try {
Class<Basic> nullEnumClass = null;
Enum.valueOf(nullEnumClass, "foo");
@@ -176,7 +175,7 @@
} catch (JavaScriptException expected) {
} catch (NullPointerException expected) {
}
-
+
try {
Enum.valueOf(Basic.class, null);
fail("Passed a null enum constant to Enum.valueOf; expected "
@@ -184,7 +183,7 @@
} catch (NullPointerException expected) {
}
}
-
+
@Override
public void testValueOfOverload() {
BasicWithOverloadedValueOf valById1 = BasicWithOverloadedValueOf.valueOf(1);
@@ -192,7 +191,7 @@
assertEquals(valById1.ordinal(),0);
assertEquals(valById2.ordinal(),1);
}
-
+
private <T extends Enum<T>> void enumValuesTest(Class<T> enumClass) {
T[] constants = enumClass.getEnumConstants();
for (T constant : constants) {
diff --git a/user/test/com/google/gwt/dev/jjs/test/GwtIncompatibleTest.java b/user/test/com/google/gwt/dev/jjs/test/GwtIncompatibleTest.java
index 7e871c3..1f028a3 100644
--- a/user/test/com/google/gwt/dev/jjs/test/GwtIncompatibleTest.java
+++ b/user/test/com/google/gwt/dev/jjs/test/GwtIncompatibleTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2013 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,9 +15,9 @@
*/
package com.google.gwt.dev.jjs.test;
-import com.google.gwt.dev.jjs.test.gwtincompatible.GwtIncompatible;
import static com.google.gwt.dev.jjs.test.gwtincompatible.ClassWithGwtIncompatibleMethod.gwtIncompatibleMethod;
+import com.google.gwt.dev.jjs.test.gwtincompatible.GwtIncompatible;
import com.google.gwt.dev.jjs.test.gwtincompatible.GwtIncompatibleClass;
import com.google.gwt.junit.client.GWTTestCase;
diff --git a/user/test/com/google/gwt/dev/jjs/test/JsniConstructorTest.java b/user/test/com/google/gwt/dev/jjs/test/JsniConstructorTest.java
index 1d8a337..d1b48b1 100644
--- a/user/test/com/google/gwt/dev/jjs/test/JsniConstructorTest.java
+++ b/user/test/com/google/gwt/dev/jjs/test/JsniConstructorTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -16,11 +16,11 @@
package com.google.gwt.dev.jjs.test;
import com.google.gwt.dev.jjs.test.StaticObject.InstanceObject;
+import com.google.gwt.dev.jjs.test.StaticObject.InstanceObject.NestedInstanceObject;
import com.google.gwt.dev.jjs.test.StaticObject.NoArgObject;
import com.google.gwt.dev.jjs.test.StaticObject.NoInitObject;
import com.google.gwt.dev.jjs.test.StaticObject.StaticInnerObject;
import com.google.gwt.dev.jjs.test.StaticObject.StaticObjectException;
-import com.google.gwt.dev.jjs.test.StaticObject.InstanceObject.NestedInstanceObject;
import com.google.gwt.junit.client.GWTTestCase;
/**
diff --git a/user/test/com/google/gwt/dev/jjs/test/unusedimports/package-info.java b/user/test/com/google/gwt/dev/jjs/test/unusedimports/package-info.java
index 6b48756..ae9482e 100644
--- a/user/test/com/google/gwt/dev/jjs/test/unusedimports/package-info.java
+++ b/user/test/com/google/gwt/dev/jjs/test/unusedimports/package-info.java
@@ -1,12 +1,12 @@
/*
* Copyright 2013 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -18,4 +18,3 @@
package com.google.gwt.dev.jjs.test.unusedimports;
-import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/user/test/com/google/gwt/dom/client/FrameTests.java b/user/test/com/google/gwt/dom/client/FrameTests.java
index 973d763..b4fea4a 100644
--- a/user/test/com/google/gwt/dom/client/FrameTests.java
+++ b/user/test/com/google/gwt/dom/client/FrameTests.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,14 +15,13 @@
*/
package com.google.gwt.dom.client;
+import com.google.gwt.event.dom.client.LoadEvent;
+import com.google.gwt.event.dom.client.LoadHandler;
import com.google.gwt.junit.client.GWTTestCase;
import com.google.gwt.user.client.Event;
import com.google.gwt.user.client.ui.Frame;
import com.google.gwt.user.client.ui.RootPanel;
-import com.google.gwt.event.dom.client.LoadEvent;
-import com.google.gwt.event.dom.client.LoadHandler;
-
/**
* Tests for the FrameElement and IFrameElement classes.
*/
diff --git a/user/test/com/google/gwt/emultest/java/util/EnumMapTest.java b/user/test/com/google/gwt/emultest/java/util/EnumMapTest.java
index 76a1c87..13d855a 100644
--- a/user/test/com/google/gwt/emultest/java/util/EnumMapTest.java
+++ b/user/test/com/google/gwt/emultest/java/util/EnumMapTest.java
@@ -17,13 +17,13 @@
import com.google.gwt.junit.client.GWTTestCase;
-import java.util.Collection;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
+import java.util.EnumMap;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import java.util.EnumMap;
/**
* Tests EnumMap.
@@ -132,7 +132,7 @@
Map.Entry<E, Integer> entryCopy = new Map.Entry<E, Integer>() {
E key = entry.getKey();
Integer value = entry.getValue();
-
+
@Override
public E getKey() {
return key;
diff --git a/user/test/com/google/gwt/emultest/java/util/EnumSetTest.java b/user/test/com/google/gwt/emultest/java/util/EnumSetTest.java
index b619786..bbac293 100644
--- a/user/test/com/google/gwt/emultest/java/util/EnumSetTest.java
+++ b/user/test/com/google/gwt/emultest/java/util/EnumSetTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -17,11 +17,11 @@
import com.google.gwt.junit.client.GWTTestCase;
-import java.util.HashSet;
-import java.util.Arrays;
-import java.util.List;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.EnumSet;
+import java.util.HashSet;
+import java.util.List;
import java.util.Set;
/**
@@ -39,15 +39,15 @@
enum ClinitRace {
Zero, One, Two, Three;
-
+
public static final Set<ClinitRace> set = EnumSet.allOf(ClinitRace.class);
}
-
+
@Override
public String getModuleName() {
return "com.google.gwt.emultest.EmulSuite";
}
-
+
/**
* Tests that an EnumSet can be statically initialized in an enum.
*/
@@ -58,7 +58,7 @@
assertTrue(ClinitRace.set.contains(ClinitRace.Two));
assertTrue(ClinitRace.set.contains(ClinitRace.Three));
}
-
+
/**
* Test failure mode from issue 3605. Previously resulted in an incorrect size.
*/
@@ -68,7 +68,7 @@
assertTrue(set.contains(Numbers.One));
assertTrue(set.contains(Numbers.Two));
}
-
+
/**
* Test failure mode from issue 3605. Previously resulted in a NoSuchElementException.
*/
diff --git a/user/test/com/google/gwt/i18n/client/I18NTest.java b/user/test/com/google/gwt/i18n/client/I18NTest.java
index d7cc5b1..62f3f3d 100644
--- a/user/test/com/google/gwt/i18n/client/I18NTest.java
+++ b/user/test/com/google/gwt/i18n/client/I18NTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2007 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -23,14 +23,14 @@
import com.google.gwt.i18n.client.resolutiontest.Inners;
import com.google.gwt.i18n.client.resolutiontest.Inners.ExtendsInnerInner;
import com.google.gwt.i18n.client.resolutiontest.Inners.HasInner;
-import com.google.gwt.i18n.client.resolutiontest.Inners.InnerClass;
-import com.google.gwt.i18n.client.resolutiontest.Inners.LocalizableSimpleInner;
-import com.google.gwt.i18n.client.resolutiontest.Inners.OuterLoc;
-import com.google.gwt.i18n.client.resolutiontest.Inners.SimpleInner;
import com.google.gwt.i18n.client.resolutiontest.Inners.HasInner.IsInner;
+import com.google.gwt.i18n.client.resolutiontest.Inners.InnerClass;
import com.google.gwt.i18n.client.resolutiontest.Inners.InnerClass.InnerInner;
import com.google.gwt.i18n.client.resolutiontest.Inners.InnerClass.InnerInnerMessages;
import com.google.gwt.i18n.client.resolutiontest.Inners.InnerClass.LocalizableInnerInner;
+import com.google.gwt.i18n.client.resolutiontest.Inners.LocalizableSimpleInner;
+import com.google.gwt.i18n.client.resolutiontest.Inners.OuterLoc;
+import com.google.gwt.i18n.client.resolutiontest.Inners.SimpleInner;
import com.google.gwt.junit.client.GWTTestCase;
import com.google.gwt.safehtml.shared.SimpleHtmlSanitizer;
@@ -146,7 +146,7 @@
assertEquals("Too many widgets to count (150) in pig-latin",
m.pluralWidgetsOther(150));
assertEquals("PL: A widget", m.pluralWidgetsOther(1));
-
+
assertEquals("PL: A thingy", m.twoParamPlural("thingy", 1));
assertEquals("PL: 42 thingies", m.twoParamPlural("thingies", 42));
assertEquals("PL: Tons (249) of thingies", m.twoParamPlural("thingies", 249));
diff --git a/user/test/com/google/gwt/i18n/server/MessageInterfaceTestBase.java b/user/test/com/google/gwt/i18n/server/MessageInterfaceTestBase.java
index a866aba..056e758 100644
--- a/user/test/com/google/gwt/i18n/server/MessageInterfaceTestBase.java
+++ b/user/test/com/google/gwt/i18n/server/MessageInterfaceTestBase.java
@@ -25,8 +25,8 @@
import com.google.gwt.i18n.server.keygen.MD5KeyGenerator;
import com.google.gwt.i18n.server.testing.Child;
import com.google.gwt.i18n.shared.AlternateMessageSelector;
-import com.google.gwt.i18n.shared.GwtLocale;
import com.google.gwt.i18n.shared.AlternateMessageSelector.AlternateForm;
+import com.google.gwt.i18n.shared.GwtLocale;
import junit.framework.TestCase;
diff --git a/user/test/com/google/gwt/i18n/shared/BidiFormatterBaseTest.java b/user/test/com/google/gwt/i18n/shared/BidiFormatterBaseTest.java
index 1936ed0..4eaaf96 100644
--- a/user/test/com/google/gwt/i18n/shared/BidiFormatterBaseTest.java
+++ b/user/test/com/google/gwt/i18n/shared/BidiFormatterBaseTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2010 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,7 +15,15 @@
*/
package com.google.gwt.i18n.shared;
-import static com.google.gwt.i18n.shared.BidiFormatterBase.Format.*;
+import static com.google.gwt.i18n.shared.BidiFormatterBase.Format.LEFT;
+import static com.google.gwt.i18n.shared.BidiFormatterBase.Format.LRE;
+import static com.google.gwt.i18n.shared.BidiFormatterBase.Format.LRM;
+import static com.google.gwt.i18n.shared.BidiFormatterBase.Format.LRM_STRING;
+import static com.google.gwt.i18n.shared.BidiFormatterBase.Format.PDF;
+import static com.google.gwt.i18n.shared.BidiFormatterBase.Format.RIGHT;
+import static com.google.gwt.i18n.shared.BidiFormatterBase.Format.RLE;
+import static com.google.gwt.i18n.shared.BidiFormatterBase.Format.RLM;
+import static com.google.gwt.i18n.shared.BidiFormatterBase.Format.RLM_STRING;
import com.google.gwt.i18n.client.HasDirection.Direction;
diff --git a/user/test/com/google/gwt/i18n/shared/BidiFormatterTest.java b/user/test/com/google/gwt/i18n/shared/BidiFormatterTest.java
index 7afda50..fd779e9 100644
--- a/user/test/com/google/gwt/i18n/shared/BidiFormatterTest.java
+++ b/user/test/com/google/gwt/i18n/shared/BidiFormatterTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2010 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,7 +15,12 @@
*/
package com.google.gwt.i18n.shared;
-import static com.google.gwt.i18n.shared.BidiFormatterBase.Format.*;
+import static com.google.gwt.i18n.shared.BidiFormatterBase.Format.LEFT;
+import static com.google.gwt.i18n.shared.BidiFormatterBase.Format.LRM;
+import static com.google.gwt.i18n.shared.BidiFormatterBase.Format.LRM_STRING;
+import static com.google.gwt.i18n.shared.BidiFormatterBase.Format.PDF;
+import static com.google.gwt.i18n.shared.BidiFormatterBase.Format.RIGHT;
+import static com.google.gwt.i18n.shared.BidiFormatterBase.Format.RLE;
import com.google.gwt.i18n.client.HasDirection.Direction;
diff --git a/user/test/com/google/gwt/i18n/shared/SafeHtmlBidiFormatterTest.java b/user/test/com/google/gwt/i18n/shared/SafeHtmlBidiFormatterTest.java
index 916bebf..903f5a8 100644
--- a/user/test/com/google/gwt/i18n/shared/SafeHtmlBidiFormatterTest.java
+++ b/user/test/com/google/gwt/i18n/shared/SafeHtmlBidiFormatterTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2010 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,7 +15,12 @@
*/
package com.google.gwt.i18n.shared;
-import static com.google.gwt.i18n.shared.BidiFormatterBase.Format.*;
+import static com.google.gwt.i18n.shared.BidiFormatterBase.Format.LEFT;
+import static com.google.gwt.i18n.shared.BidiFormatterBase.Format.LRM;
+import static com.google.gwt.i18n.shared.BidiFormatterBase.Format.LRM_STRING;
+import static com.google.gwt.i18n.shared.BidiFormatterBase.Format.PDF;
+import static com.google.gwt.i18n.shared.BidiFormatterBase.Format.RIGHT;
+import static com.google.gwt.i18n.shared.BidiFormatterBase.Format.RLE;
import com.google.gwt.i18n.client.HasDirection.Direction;
import com.google.gwt.safehtml.shared.SafeHtml;
diff --git a/user/test/com/google/gwt/junit/GWTMockUtilitiesTest.java b/user/test/com/google/gwt/junit/GWTMockUtilitiesTest.java
index 6c52099..72e2413 100644
--- a/user/test/com/google/gwt/junit/GWTMockUtilitiesTest.java
+++ b/user/test/com/google/gwt/junit/GWTMockUtilitiesTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2011 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -17,8 +17,6 @@
import com.google.gwt.core.client.GWT;
import com.google.gwt.i18n.client.Messages;
-import com.google.gwt.i18n.client.LocalizableResource.Description;
-import com.google.gwt.i18n.client.Messages.DefaultMessage;
import junit.framework.TestCase;
@@ -40,13 +38,13 @@
// expected this exception
}
}
-
+
public void testDisarm() {
GWTMockUtilities.disarm();
assertNull(GWT.create(MyMessages.class));
GWTMockUtilities.restore();
}
-
+
public void testReturnMockMessages() {
GWTMockUtilities.disarm();
GWTMockUtilities.returnMockMessages();
diff --git a/user/test/com/google/gwt/junit/JUnitMessageQueueTest.java b/user/test/com/google/gwt/junit/JUnitMessageQueueTest.java
index 7c78976..a84d47d 100644
--- a/user/test/com/google/gwt/junit/JUnitMessageQueueTest.java
+++ b/user/test/com/google/gwt/junit/JUnitMessageQueueTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2009 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -18,9 +18,9 @@
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.junit.JUnitMessageQueue.ClientInfoExt;
import com.google.gwt.junit.JUnitMessageQueue.ClientStatus;
-import com.google.gwt.junit.client.impl.JUnitResult;
import com.google.gwt.junit.client.impl.JUnitHost.TestBlock;
import com.google.gwt.junit.client.impl.JUnitHost.TestInfo;
+import com.google.gwt.junit.client.impl.JUnitResult;
import junit.framework.TestCase;
@@ -465,7 +465,7 @@
/**
* Assert that two arrays are the same size and contain the same elements.
* Ordering does not matter.
- *
+ *
* @param expected the expected array
* @param actual the actual array
*/
@@ -480,7 +480,7 @@
/**
* Create a {@link JUnitMessageQueue} with the specified number of blocks.
- *
+ *
* @param numClients the number of remote clients
* @param numBlocks the number of test blocks to add
* @param testsPerBlock the number of tests per block
@@ -495,7 +495,7 @@
/**
* Create a list of test blocks.
- *
+ *
* @param numBlocks the number of test blocks to add
* @param testsPerBlock the number of tests per block
* @return the test blocks
@@ -515,7 +515,7 @@
/**
* Create some fake test results.
- *
+ *
* @param numTests the number of results to generate
* @return the test results
*/
diff --git a/user/test/com/google/gwt/media/MediaSuite.java b/user/test/com/google/gwt/media/MediaSuite.java
index de3542f..3277d45 100644
--- a/user/test/com/google/gwt/media/MediaSuite.java
+++ b/user/test/com/google/gwt/media/MediaSuite.java
@@ -17,9 +17,9 @@
package com.google.gwt.media;
import com.google.gwt.junit.tools.GWTTestSuite;
-import com.google.gwt.user.client.MediaEventsSinkTest;
import com.google.gwt.media.client.AudioTest;
import com.google.gwt.media.client.VideoTest;
+import com.google.gwt.user.client.MediaEventsSinkTest;
import junit.framework.Test;
@@ -29,7 +29,7 @@
public class MediaSuite {
public static Test suite() {
GWTTestSuite suite = new GWTTestSuite("Test suite for Media GWTTestCases");
-
+
suite.addTestSuite(MediaEventsSinkTest.class);
suite.addTestSuite(AudioTest.class);
suite.addTestSuite(VideoTest.class);
diff --git a/user/test/com/google/gwt/module/rebind/ConfigurationPropertiesGenerator.java b/user/test/com/google/gwt/module/rebind/ConfigurationPropertiesGenerator.java
index d34d42b..d4d6fc0 100644
--- a/user/test/com/google/gwt/module/rebind/ConfigurationPropertiesGenerator.java
+++ b/user/test/com/google/gwt/module/rebind/ConfigurationPropertiesGenerator.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -42,8 +42,8 @@
if (out != null) {
String propertyValue;
try {
- ConfigurationProperty prop = context.getPropertyOracle().
- getConfigurationProperty("testProperty");
+ ConfigurationProperty prop = context.getPropertyOracle()
+ .getConfigurationProperty("testProperty");
propertyValue = prop.getValues().get(0);
} catch (BadPropertyValueException e) {
logger.log(TreeLogger.ERROR, "testProperty not set", e);
@@ -51,8 +51,8 @@
}
try {
- ConfigurationProperty prop = context.getPropertyOracle().
- getConfigurationProperty("bad_property");
+ ConfigurationProperty prop = context.getPropertyOracle()
+ .getConfigurationProperty("bad_property");
logger.log(TreeLogger.ERROR,
"Did not get an exception trying to access fake property");
throw new UnableToCompleteException();
diff --git a/user/test/com/google/gwt/place/shared/PlaceHistoryHandlerTest.java b/user/test/com/google/gwt/place/shared/PlaceHistoryHandlerTest.java
index 10b7678..4b433bc 100644
--- a/user/test/com/google/gwt/place/shared/PlaceHistoryHandlerTest.java
+++ b/user/test/com/google/gwt/place/shared/PlaceHistoryHandlerTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2010 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -20,7 +20,6 @@
import com.google.gwt.event.shared.EventBus;
import com.google.gwt.event.shared.HandlerRegistration;
import com.google.gwt.event.shared.SimpleEventBus;
-import com.google.gwt.place.shared.PlaceHistoryHandler.Historian;
import com.google.gwt.place.testplaces.Place1;
import com.google.gwt.place.testplaces.Place2;
@@ -62,7 +61,7 @@
});
}
}
-
+
private static class MockPlaceHistoryMapper implements PlaceHistoryMapper {
@Override
diff --git a/user/test/com/google/gwt/storage/client/MapInterfaceTest.java b/user/test/com/google/gwt/storage/client/MapInterfaceTest.java
index a5cab5b..33fd79f 100644
--- a/user/test/com/google/gwt/storage/client/MapInterfaceTest.java
+++ b/user/test/com/google/gwt/storage/client/MapInterfaceTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2011 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -16,30 +16,30 @@
package com.google.gwt.storage.client;
+import static java.util.Collections.singleton;
+
import com.google.gwt.core.client.JavaScriptException;
import com.google.gwt.junit.client.GWTTestCase;
-import static java.util.Collections.singleton;
-
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
-import java.util.Set;
import java.util.Map.Entry;
+import java.util.Set;
/**
* Tests representing the contract of {@link Map}. Concrete subclasses of this
* base class test conformance of concrete {@link Map} subclasses to that
* contract.
- *
- * TODO: Descriptive assertion messages, with hints as to probable fixes.
- * TODO: Add another constructor parameter indicating whether the class under
+ *
+ * TODO: Descriptive assertion messages, with hints as to probable fixes.
+ * TODO: Add another constructor parameter indicating whether the class under
* test is ordered, and check the order if so.
* TODO: Refactor to share code with SetTestBuilder.
- *
+ *
* @param <K> the type of keys used by the maps under test
* @param <V> the type of mapped values used the maps under test
*/
@@ -54,7 +54,7 @@
/**
* Creates a new, empty instance of the class under test.
- *
+ *
* @return a new, empty map instance.
* @throws UnsupportedOperationException if it's not possible to make an empty
* instance of the class under test.
@@ -64,7 +64,7 @@
/**
* Creates a new, non-empty instance of the class under test.
- *
+ *
* @return a new, non-empty map instance.
* @throws UnsupportedOperationException if it's not possible to make a
* non-empty instance of the class under test.
@@ -75,7 +75,7 @@
/**
* Creates a new key that is not expected to be found in
* {@link #makePopulatedMap()}.
- *
+ *
* @return a key.
* @throws UnsupportedOperationException if it's not possible to make a key
* that will not be found in the map.
@@ -86,7 +86,7 @@
/**
* Creates a new value that is not expected to be found in
* {@link #makePopulatedMap()}.
- *
+ *
* @return a value.
* @throws UnsupportedOperationException if it's not possible to make a value
* that will not be found in the map.
@@ -121,7 +121,7 @@
/**
* Used by tests that require a map, but don't care whether it's populated or
* not.
- *
+ *
* @return a new map instance.
*/
protected Map<K, V> makeEitherMap() {
@@ -152,7 +152,7 @@
* Checks all the properties that should always hold of a map. Also calls
* {@link #assertMoreInvariants} to check invariants that are peculiar to
* specific implementations.
- *
+ *
* @see #assertMoreInvariants
* @param map the map to check.
*/
@@ -245,7 +245,7 @@
* Override this to check invariants which should hold true for a particular
* implementation, but which are not generally applicable to every instance of
* Map.
- *
+ *
* @param map the map whose additional invariants to check.
*/
protected void assertMoreInvariants(Map<K, V> map) {
@@ -723,7 +723,7 @@
try {
map = makeEitherMap();
} catch (UnsupportedOperationException e) {
- return;
+ return;
}
Set<Entry<K, V>> entrySet = map.entrySet();
@@ -815,7 +815,7 @@
}
/*
- * equals does not apply to Storage because there's only one instance so two
+ * equals does not apply to Storage because there's only one instance so two
* maps will always be equal.
*/
public void disabled_testEqualsForLargerMap() {
@@ -837,7 +837,7 @@
}
/*
- * equals does not apply to Storage because there's only one instance so two
+ * equals does not apply to Storage because there's only one instance so two
* maps will always be equal.
*/
public void disabled_testEqualsForSmallerMap() {
@@ -854,7 +854,7 @@
} catch (UnsupportedOperationException e) {
return;
}
-
+
assertFalse(map.equals(smallerMap));
}
@@ -912,9 +912,9 @@
try {
map = makeEitherMap();
} catch (UnsupportedOperationException e) {
- return;
+ return;
}
-
+
if (allowsNullKeys) {
if (allowsNullValues) {
// TODO: decide what to test here.
@@ -956,9 +956,9 @@
try {
map = makeEitherMap();
} catch (UnsupportedOperationException e) {
- return;
+ return;
}
-
+
final K keyToPut;
final V valueToPut;
try {
@@ -1023,7 +1023,7 @@
try {
map = makeEitherMap();
} catch (UnsupportedOperationException e) {
- return;
+ return;
}
final V valueToPut;
try {
@@ -1057,7 +1057,7 @@
try {
map = makeEitherMap();
} catch (UnsupportedOperationException e) {
- return;
+ return;
}
final K keyToPut;
try {
@@ -1122,7 +1122,7 @@
try {
map = makeEitherMap();
} catch (UnsupportedOperationException e) {
- return;
+ return;
}
final K keyToPut;
final V valueToPut;
@@ -1237,7 +1237,7 @@
try {
map = makeEitherMap();
} catch (UnsupportedOperationException e) {
- return;
+ return;
}
assertInvariants(map);
}
diff --git a/user/test/com/google/gwt/text/client/DateTimeFormatRendererTest.java b/user/test/com/google/gwt/text/client/DateTimeFormatRendererTest.java
index 2cdb2fe..c0caab7 100644
--- a/user/test/com/google/gwt/text/client/DateTimeFormatRendererTest.java
+++ b/user/test/com/google/gwt/text/client/DateTimeFormatRendererTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2010 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,9 +15,9 @@
*/
package com.google.gwt.text.client;
+import com.google.gwt.i18n.client.TimeZone;
import com.google.gwt.i18n.shared.DateTimeFormat;
import com.google.gwt.i18n.shared.DateTimeFormat.PredefinedFormat;
-import com.google.gwt.i18n.client.TimeZone;
import com.google.gwt.junit.client.GWTTestCase;
import java.util.Date;
diff --git a/user/test/com/google/gwt/typedarrays/client/GwtUint8ClampedArrayTest.java b/user/test/com/google/gwt/typedarrays/client/GwtUint8ClampedArrayTest.java
index 4c19e3a..e36f1aa 100644
--- a/user/test/com/google/gwt/typedarrays/client/GwtUint8ClampedArrayTest.java
+++ b/user/test/com/google/gwt/typedarrays/client/GwtUint8ClampedArrayTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2012 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -17,9 +17,9 @@
import com.google.gwt.core.client.JsArrayInteger;
import com.google.gwt.typedarrays.shared.ArrayBuffer;
+import com.google.gwt.typedarrays.shared.TypedArrays;
import com.google.gwt.typedarrays.shared.Uint8ClampedArray;
import com.google.gwt.typedarrays.shared.Uint8ClampedArrayTest;
-import com.google.gwt.typedarrays.shared.TypedArrays;
/**
* Test client {@link Uint8ClampedArray} implementations.
diff --git a/user/test/com/google/gwt/uibinder/rebind/FieldWriterOfExistingTypeTest.java b/user/test/com/google/gwt/uibinder/rebind/FieldWriterOfExistingTypeTest.java
index 31d9b59..63c0b0c 100644
--- a/user/test/com/google/gwt/uibinder/rebind/FieldWriterOfExistingTypeTest.java
+++ b/user/test/com/google/gwt/uibinder/rebind/FieldWriterOfExistingTypeTest.java
@@ -15,12 +15,12 @@
*/
package com.google.gwt.uibinder.rebind;
+import static org.easymock.EasyMock.expect;
+
import com.google.gwt.core.ext.typeinfo.JClassType;
import junit.framework.TestCase;
-import static org.easymock.EasyMock.expect;
-
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
diff --git a/user/test/com/google/gwt/uibinder/rebind/FieldWriterOfLazyDomElementTest.java b/user/test/com/google/gwt/uibinder/rebind/FieldWriterOfLazyDomElementTest.java
index 64ac528..bdedb05 100644
--- a/user/test/com/google/gwt/uibinder/rebind/FieldWriterOfLazyDomElementTest.java
+++ b/user/test/com/google/gwt/uibinder/rebind/FieldWriterOfLazyDomElementTest.java
@@ -15,6 +15,8 @@
*/
package com.google.gwt.uibinder.rebind;
+import static org.easymock.EasyMock.expect;
+
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.core.ext.typeinfo.JClassType;
import com.google.gwt.core.ext.typeinfo.JParameterizedType;
@@ -22,8 +24,6 @@
import junit.framework.TestCase;
-import static org.easymock.EasyMock.expect;
-
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
@@ -67,7 +67,7 @@
control.replay();
try {
- FieldWriter field = new FieldWriterOfLazyDomElement(null,
+ FieldWriter field = new FieldWriterOfLazyDomElement(null,
templateFieldType, ownerField, MortalLogger.NULL);
fail("Expected exception not thrown.");
} catch (UnableToCompleteException utce) {
diff --git a/user/test/com/google/gwt/uibinder/rebind/JClassTypeAdapter.java b/user/test/com/google/gwt/uibinder/rebind/JClassTypeAdapter.java
index df8df8a..c170dbb 100644
--- a/user/test/com/google/gwt/uibinder/rebind/JClassTypeAdapter.java
+++ b/user/test/com/google/gwt/uibinder/rebind/JClassTypeAdapter.java
@@ -15,6 +15,9 @@
*/
package com.google.gwt.uibinder.rebind;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.isA;
+
import com.google.gwt.core.ext.typeinfo.HasAnnotations;
import com.google.gwt.core.ext.typeinfo.HasTypeParameters;
import com.google.gwt.core.ext.typeinfo.JAbstractMethod;
@@ -26,11 +29,8 @@
import com.google.gwt.core.ext.typeinfo.JPrimitiveType;
import com.google.gwt.core.ext.typeinfo.JType;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.isA;
-
-import org.easymock.IAnswer;
import org.easymock.EasyMock;
+import org.easymock.IAnswer;
import java.lang.annotation.Annotation;
import java.lang.reflect.AnnotatedElement;
diff --git a/user/test/com/google/gwt/uibinder/rebind/TypeOracleUtilsTest.java b/user/test/com/google/gwt/uibinder/rebind/TypeOracleUtilsTest.java
index 0db2037..79aca7f 100644
--- a/user/test/com/google/gwt/uibinder/rebind/TypeOracleUtilsTest.java
+++ b/user/test/com/google/gwt/uibinder/rebind/TypeOracleUtilsTest.java
@@ -15,7 +15,8 @@
*/
package com.google.gwt.uibinder.rebind;
-import static com.google.gwt.uibinder.rebind.TypeOracleUtils.*;
+import static com.google.gwt.uibinder.rebind.TypeOracleUtils.hasCompatibleConstructor;
+import static com.google.gwt.uibinder.rebind.TypeOracleUtils.typeIsCompatible;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.typeinfo.JArrayType;
diff --git a/user/test/com/google/gwt/uibinder/rebind/UiRendererValidationTest.java b/user/test/com/google/gwt/uibinder/rebind/UiRendererValidationTest.java
index 97f821d..68ef590 100644
--- a/user/test/com/google/gwt/uibinder/rebind/UiRendererValidationTest.java
+++ b/user/test/com/google/gwt/uibinder/rebind/UiRendererValidationTest.java
@@ -1,11 +1,11 @@
/*
* Copyright 2011 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -16,7 +16,6 @@
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.dev.javac.testing.impl.MockJavaResource;
-
import org.xml.sax.SAXParseException;
diff --git a/user/test/com/google/gwt/uibinder/test/client/HandlerDemo.java b/user/test/com/google/gwt/uibinder/test/client/HandlerDemo.java
index 4416a5a..e86dd24 100644
--- a/user/test/com/google/gwt/uibinder/test/client/HandlerDemo.java
+++ b/user/test/com/google/gwt/uibinder/test/client/HandlerDemo.java
@@ -30,9 +30,9 @@
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.FormPanel;
+import com.google.gwt.user.client.ui.FormPanel.SubmitEvent;
import com.google.gwt.user.client.ui.TextBox;
import com.google.gwt.user.client.ui.TreeItem;
-import com.google.gwt.user.client.ui.FormPanel.SubmitEvent;
import com.google.gwt.user.client.ui.Widget;
/**
diff --git a/user/test/com/google/gwt/uibinder/test/client/MyMessages.java b/user/test/com/google/gwt/uibinder/test/client/MyMessages.java
index e5ef785..a06cb00 100644
--- a/user/test/com/google/gwt/uibinder/test/client/MyMessages.java
+++ b/user/test/com/google/gwt/uibinder/test/client/MyMessages.java
@@ -15,8 +15,8 @@
*/
package com.google.gwt.uibinder.test.client;
-import com.google.gwt.i18n.client.Messages;
import com.google.gwt.i18n.client.LocalizableResource.DefaultLocale;
+import com.google.gwt.i18n.client.Messages;
/**
* Base messages to prove we can override the default.
diff --git a/user/test/com/google/gwt/user/LoggingRPCSuite.java b/user/test/com/google/gwt/user/LoggingRPCSuite.java
index 0e29062..ecf6f1a 100644
--- a/user/test/com/google/gwt/user/LoggingRPCSuite.java
+++ b/user/test/com/google/gwt/user/LoggingRPCSuite.java
@@ -19,7 +19,6 @@
import com.google.gwt.junit.tools.GWTTestSuite;
import com.google.gwt.user.client.rpc.LoggingRPCTest;
-
import junit.framework.Test;
/**
diff --git a/user/test/com/google/gwt/user/RpcJreSuite.java b/user/test/com/google/gwt/user/RpcJreSuite.java
index e21c423..f30e630 100644
--- a/user/test/com/google/gwt/user/RpcJreSuite.java
+++ b/user/test/com/google/gwt/user/RpcJreSuite.java
@@ -18,8 +18,8 @@
import com.google.gwt.dev.BootStrapPlatform;
import com.google.gwt.user.client.rpc.impl.ClientSerializationStreamReaderTest;
import com.google.gwt.user.rebind.rpc.BlacklistTypeFilterTest;
-import com.google.gwt.user.rebind.rpc.SerializationUtilsTest;
import com.google.gwt.user.rebind.rpc.SerializableTypeOracleBuilderTest;
+import com.google.gwt.user.rebind.rpc.SerializationUtilsTest;
import com.google.gwt.user.rebind.rpc.TypeHierarchyUtilsTest;
import com.google.gwt.user.server.Base64Test;
import com.google.gwt.user.server.UtilTest;
diff --git a/user/test/com/google/gwt/user/cellview/client/AbstractCellTreeTestBase.java b/user/test/com/google/gwt/user/cellview/client/AbstractCellTreeTestBase.java
index 53e606a..32aaae5 100644
--- a/user/test/com/google/gwt/user/cellview/client/AbstractCellTreeTestBase.java
+++ b/user/test/com/google/gwt/user/cellview/client/AbstractCellTreeTestBase.java
@@ -1,12 +1,12 @@
/*
* Copyright 2010 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,7 +15,6 @@
*/
package com.google.gwt.user.cellview.client;
-import com.google.gwt.user.cellview.client.AbstractHasDataTestBase.IndexCell;
import com.google.gwt.cell.client.Cell;
import com.google.gwt.cell.client.TextCell;
import com.google.gwt.core.client.Scheduler;
@@ -25,6 +24,7 @@
import com.google.gwt.event.logical.shared.OpenHandler;
import com.google.gwt.junit.client.GWTTestCase;
import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
+import com.google.gwt.user.cellview.client.AbstractHasDataTestBase.IndexCell;
import com.google.gwt.user.client.ui.RootPanel;
import com.google.gwt.view.client.ListDataProvider;
import com.google.gwt.view.client.MultiSelectionModel;
@@ -112,7 +112,7 @@
/**
* Get the {@link MultiSelectionModel} for the nodes at the specified depth.
- *
+ *
* @param depth the depth of the node
* @return the {@link MultiSelectionModel} at that depth
*/
@@ -122,7 +122,7 @@
/**
* Create a data provider that extends the prefix by one letter.
- *
+ *
* @param prefix the prefix string
* @return a data provider
*/
@@ -194,7 +194,7 @@
/**
* Construct a new {@link AbstractCellTreeTestBase}.
- *
+ *
* @param singlePathOnly true if the tree only supports a single open path
*/
public AbstractCellTreeTestBase(boolean singlePathOnly) {
@@ -621,7 +621,7 @@
/**
* Create an {@link AbstractCellTree} to test.
- *
+ *
* @param <T> the data type of the root value
* @param model the {@link TreeViewModel} that backs the tree
* @param rootValue the root value
@@ -644,7 +644,7 @@
/**
* Test the state of a {@link TreeNode}.
- *
+ *
* @param node the node to test
* @param parent the expected parent
* @param index the expected index within the parent
diff --git a/user/test/com/google/gwt/user/cellview/client/ColumnTest.java b/user/test/com/google/gwt/user/cellview/client/ColumnTest.java
index e92eebe..6ee1999 100644
--- a/user/test/com/google/gwt/user/cellview/client/ColumnTest.java
+++ b/user/test/com/google/gwt/user/cellview/client/ColumnTest.java
@@ -16,10 +16,10 @@
package com.google.gwt.user.cellview.client;
import com.google.gwt.cell.client.AbstractEditableCell;
+import com.google.gwt.cell.client.Cell.Context;
import com.google.gwt.cell.client.FieldUpdater;
import com.google.gwt.cell.client.TextCell;
import com.google.gwt.cell.client.ValueUpdater;
-import com.google.gwt.cell.client.Cell.Context;
import com.google.gwt.dom.client.Document;
import com.google.gwt.dom.client.Element;
import com.google.gwt.dom.client.NativeEvent;
diff --git a/user/test/com/google/gwt/user/client/DragAndDropEventsSinkTest.java b/user/test/com/google/gwt/user/client/DragAndDropEventsSinkTest.java
index 6c69cdb..d1224fc 100644
--- a/user/test/com/google/gwt/user/client/DragAndDropEventsSinkTest.java
+++ b/user/test/com/google/gwt/user/client/DragAndDropEventsSinkTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2011 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -21,9 +21,9 @@
import com.google.gwt.event.dom.client.DragEnterEvent;
import com.google.gwt.event.dom.client.DragEnterHandler;
import com.google.gwt.event.dom.client.DragEvent;
+import com.google.gwt.event.dom.client.DragHandler;
import com.google.gwt.event.dom.client.DragLeaveEvent;
import com.google.gwt.event.dom.client.DragLeaveHandler;
-import com.google.gwt.event.dom.client.DragHandler;
import com.google.gwt.event.dom.client.DragOverEvent;
import com.google.gwt.event.dom.client.DragOverHandler;
import com.google.gwt.event.dom.client.DragStartEvent;
@@ -109,13 +109,13 @@
/**
* Interface to create a widget.
- *
+ *
* @param <W> the widget type
*/
private interface WidgetCreator<W extends Widget & HasAllDragAndDropHandlers> {
/**
* Create a widget to test.
- *
+ *
* @return the new widget
*/
W createWidget();
diff --git a/user/test/com/google/gwt/user/client/GestureEventSinkTest.java b/user/test/com/google/gwt/user/client/GestureEventSinkTest.java
index 2354dc5..a3089e4 100644
--- a/user/test/com/google/gwt/user/client/GestureEventSinkTest.java
+++ b/user/test/com/google/gwt/user/client/GestureEventSinkTest.java
@@ -16,13 +16,13 @@
package com.google.gwt.user.client;
-import com.google.gwt.event.dom.client.HasAllGestureHandlers;
import com.google.gwt.event.dom.client.GestureChangeEvent;
import com.google.gwt.event.dom.client.GestureChangeHandler;
import com.google.gwt.event.dom.client.GestureEndEvent;
import com.google.gwt.event.dom.client.GestureEndHandler;
import com.google.gwt.event.dom.client.GestureStartEvent;
import com.google.gwt.event.dom.client.GestureStartHandler;
+import com.google.gwt.event.dom.client.HasAllGestureHandlers;
import com.google.gwt.junit.client.GWTTestCase;
import com.google.gwt.user.client.ui.Anchor;
import com.google.gwt.user.client.ui.Button;
diff --git a/user/test/com/google/gwt/user/client/rpc/CollectionsTest.java b/user/test/com/google/gwt/user/client/rpc/CollectionsTest.java
index 7c10799..92aa9d2 100644
--- a/user/test/com/google/gwt/user/client/rpc/CollectionsTest.java
+++ b/user/test/com/google/gwt/user/client/rpc/CollectionsTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2011 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,8 +25,8 @@
import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeEnum;
import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeEnumMapValue;
import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeHashMapKey;
-import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeHashSet;
import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeHashMapValue;
+import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeHashSet;
import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeIdentityHashMapKey;
import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeIdentityHashMapValue;
import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeLinkedHashMapKey;
@@ -44,8 +44,8 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.EnumMap;
-import java.util.HashSet;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.IdentityHashMap;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
@@ -106,7 +106,7 @@
}
});
}
-
+
public void testArrayListVoid() {
CollectionsTestServiceAsync service = getServiceAsync();
delayTestFinishForRpc();
@@ -161,11 +161,11 @@
public void onSuccess(Boolean[] result) {
assertNotNull(result);
assertTrue(TestSetValidator.equals(expected, result));
-
+
// ensure result preserves meta-data for array store type checking
assertTrue(TestSetValidator.checkObjectArrayElementAssignment(
result, 0, new Boolean(false)));
-
+
finishTest();
}
});
@@ -185,11 +185,11 @@
public void onSuccess(Byte[] result) {
assertNotNull(result);
assertTrue(TestSetValidator.equals(expected, result));
-
+
// ensure result preserves meta-data for array store type checking
assertTrue(TestSetValidator.checkObjectArrayElementAssignment(
result, 0, new Byte((byte) 0)));
-
+
finishTest();
}
});
@@ -209,16 +209,16 @@
public void onSuccess(Character[] result) {
assertNotNull(result);
assertTrue(TestSetValidator.equals(expected, result));
-
+
// ensure result preserves meta-data for array store type checking
assertTrue(TestSetValidator.checkObjectArrayElementAssignment(
result, 0, new Character('0')));
-
+
finishTest();
}
});
}
-
+
public void testDateArray() {
CollectionsTestServiceAsync service = getServiceAsync();
final Date[] expected = TestSetFactory.createDateArray();
@@ -233,16 +233,16 @@
public void onSuccess(Date[] result) {
assertNotNull(result);
assertTrue(TestSetValidator.equals(expected, result));
-
+
// ensure result preserves meta-data for array store type checking
assertTrue(TestSetValidator.checkObjectArrayElementAssignment(
result, 0, new Date()));
-
+
finishTest();
}
});
}
-
+
public void testDoubleArray() {
CollectionsTestServiceAsync service = getServiceAsync();
final Double[] expected = TestSetFactory.createDoubleArray();
@@ -257,11 +257,11 @@
public void onSuccess(Double[] result) {
assertNotNull(result);
assertTrue(TestSetValidator.equals(expected, result));
-
+
// ensure result preserves meta-data for array store type checking
assertTrue(TestSetValidator.checkObjectArrayElementAssignment(
result, 0, new Double(0.0)));
-
+
finishTest();
}
});
@@ -287,7 +287,7 @@
}
});
}
-
+
public void testEmptyList() {
CollectionsTestServiceAsync service = getServiceAsync();
delayTestFinishForRpc();
@@ -359,11 +359,11 @@
public void onSuccess(Enum<?>[] result) {
assertNotNull(result);
assertTrue(TestSetValidator.equals(expected, result));
-
+
// ensure result preserves meta-data for array store type checking
assertTrue(TestSetValidator.checkObjectArrayElementAssignment(
result, 0, TestSetFactory.MarkerTypeEnum.C));
-
+
finishTest();
}
});
@@ -425,11 +425,11 @@
public void onSuccess(Float[] result) {
assertNotNull(result);
assertTrue(TestSetValidator.equals(expected, result));
-
+
// ensure result preserves meta-data for array store type checking
assertTrue(TestSetValidator.checkObjectArrayElementAssignment(
result, 0, new Float(0.0)));
-
+
finishTest();
}
});
@@ -533,11 +533,11 @@
public void onSuccess(Integer[] result) {
assertNotNull(result);
assertTrue(TestSetValidator.equals(expected, result));
-
+
// ensure result preserves meta-data for array store type checking
assertTrue(TestSetValidator.checkObjectArrayElementAssignment(
result, 0, new Integer(0)));
-
+
finishTest();
}
});
@@ -651,11 +651,11 @@
public void onSuccess(Long[] result) {
assertNotNull(result);
assertTrue(TestSetValidator.equals(expected, result));
-
+
// ensure result preserves meta-data for array store type checking
assertTrue(TestSetValidator.checkObjectArrayElementAssignment(
result, 0, new Long(0L)));
-
+
finishTest();
}
});
@@ -825,11 +825,11 @@
public void onSuccess(Short[] result) {
assertNotNull(result);
assertTrue(TestSetValidator.equals(expected, result));
-
+
// ensure result preserves meta-data for array store type checking
assertTrue(TestSetValidator.checkObjectArrayElementAssignment(
result, 0, new Short((short) 0)));
-
+
finishTest();
}
});
@@ -868,11 +868,11 @@
public void onSuccess(java.sql.Date[] result) {
assertNotNull(result);
assertTrue(TestSetValidator.equals(expected, result));
-
+
// ensure result preserves meta-data for array store type checking
assertTrue(TestSetValidator.checkObjectArrayElementAssignment(
result, 0, new java.sql.Date(0L)));
-
+
finishTest();
}
});
@@ -892,11 +892,11 @@
public void onSuccess(Time[] result) {
assertNotNull(result);
assertTrue(TestSetValidator.equals(expected, result));
-
+
// ensure result preserves meta-data for array store type checking
assertTrue(TestSetValidator.checkObjectArrayElementAssignment(
result, 0, new Time(0L)));
-
+
finishTest();
}
});
@@ -916,11 +916,11 @@
public void onSuccess(Timestamp[] result) {
assertNotNull(result);
assertTrue(TestSetValidator.equals(expected, result));
-
+
// ensure result preserves meta-data for array store type checking
assertTrue(TestSetValidator.checkObjectArrayElementAssignment(
result, 0, new Timestamp(0L)));
-
+
finishTest();
}
});
@@ -940,11 +940,11 @@
public void onSuccess(String[] result) {
assertNotNull(result);
assertTrue(TestSetValidator.equals(expected, result));
-
+
// ensure result preserves meta-data for array store type checking
assertTrue(TestSetValidator.checkObjectArrayElementAssignment(
result, 0, new String("")));
-
+
finishTest();
}
});
@@ -964,11 +964,11 @@
@Override
public void onSuccess(String[][] result) {
assertNotNull(result);
-
+
// ensure result preserves meta-data for array store type checking
assertTrue(TestSetValidator.checkObjectArrayElementAssignment(
result, 0, new String[4]));
-
+
finishTest();
}
});
diff --git a/user/test/com/google/gwt/user/client/rpc/CollectionsTestService.java b/user/test/com/google/gwt/user/client/rpc/CollectionsTestService.java
index 6e70c33..167d446 100644
--- a/user/test/com/google/gwt/user/client/rpc/CollectionsTestService.java
+++ b/user/test/com/google/gwt/user/client/rpc/CollectionsTestService.java
@@ -1,12 +1,12 @@
/*
* Copyright 2011 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,8 +24,8 @@
import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeEnum;
import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeEnumMapValue;
import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeHashMapKey;
-import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeHashSet;
import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeHashMapValue;
+import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeHashSet;
import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeIdentityHashMapKey;
import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeIdentityHashMapValue;
import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeLinkedHashMapKey;
@@ -42,8 +42,8 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.EnumMap;
-import java.util.HashSet;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.IdentityHashMap;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
@@ -115,7 +115,7 @@
EnumMap<MarkerTypeEnum, MarkerTypeEnumMapValue> echo(
EnumMap<MarkerTypeEnum, MarkerTypeEnumMapValue> value)
throws CollectionsTestServiceException;
-
+
HashMap<MarkerTypeHashMapKey, MarkerTypeHashMapValue> echo(
HashMap<MarkerTypeHashMapKey, MarkerTypeHashMapValue> value)
throws CollectionsTestServiceException;
@@ -177,7 +177,7 @@
List<MarkerTypeArraysAsList> echoArraysAsList(
List<MarkerTypeArraysAsList> value)
throws CollectionsTestServiceException;
-
+
EnumMap<MarkerTypeEnum, MarkerTypeEnumMapValue> echoEmptyEnumMap(
EnumMap<MarkerTypeEnum, MarkerTypeEnumMapValue> value)
throws CollectionsTestServiceException;
@@ -185,7 +185,7 @@
EnumMap<MarkerTypeEnum, MarkerTypeEnumMapValue> echoEnumKey(
EnumMap<MarkerTypeEnum, MarkerTypeEnumMapValue> value)
throws CollectionsTestServiceException;
-
+
IdentityHashMap<MarkerTypeEnum, MarkerTypeIdentityHashMapValue> echoEnumKey(
IdentityHashMap<MarkerTypeEnum, MarkerTypeIdentityHashMapValue> value)
throws CollectionsTestServiceException;
diff --git a/user/test/com/google/gwt/user/client/rpc/CollectionsTestServiceAsync.java b/user/test/com/google/gwt/user/client/rpc/CollectionsTestServiceAsync.java
index 599c8d0..50c867d 100644
--- a/user/test/com/google/gwt/user/client/rpc/CollectionsTestServiceAsync.java
+++ b/user/test/com/google/gwt/user/client/rpc/CollectionsTestServiceAsync.java
@@ -1,12 +1,12 @@
/*
* Copyright 2011 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -21,9 +21,9 @@
import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeEmptyList;
import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeEmptySet;
import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeEmptyValue;
-import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeHashMapKey;
import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeEnum;
import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeEnumMapValue;
+import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeHashMapKey;
import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeHashMapValue;
import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeHashSet;
import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeIdentityHashMapKey;
@@ -158,7 +158,7 @@
void echoEmptyEnumMap(EnumMap<MarkerTypeEnum, MarkerTypeEnumMapValue> expected,
AsyncCallback<EnumMap<MarkerTypeEnum, MarkerTypeEnumMapValue>> asyncCallback);
-
+
void echoEnumKey(EnumMap<MarkerTypeEnum, MarkerTypeEnumMapValue> value,
AsyncCallback<EnumMap<MarkerTypeEnum, MarkerTypeEnumMapValue>> callback);
diff --git a/user/test/com/google/gwt/user/client/rpc/TestSetValidator.java b/user/test/com/google/gwt/user/client/rpc/TestSetValidator.java
index 631491b..f55566c 100644
--- a/user/test/com/google/gwt/user/client/rpc/TestSetValidator.java
+++ b/user/test/com/google/gwt/user/client/rpc/TestSetValidator.java
@@ -15,6 +15,11 @@
*/
package com.google.gwt.user.client.rpc;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.assertSame;
+
import com.google.gwt.event.shared.UmbrellaException;
import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeEmptyKey;
import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeEmptyList;
@@ -32,11 +37,6 @@
import com.google.gwt.user.client.rpc.TestSetFactory.SerializablePrivateNoArg;
import com.google.gwt.user.client.rpc.TestSetFactory.SerializableWithTwoArrays;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertSame;
-
import java.util.ArrayList;
import java.util.EnumMap;
import java.util.HashMap;
diff --git a/user/test/com/google/gwt/user/client/ui/LabelTest.java b/user/test/com/google/gwt/user/client/ui/LabelTest.java
index 7b09c0b..13ace2b 100644
--- a/user/test/com/google/gwt/user/client/ui/LabelTest.java
+++ b/user/test/com/google/gwt/user/client/ui/LabelTest.java
@@ -22,7 +22,6 @@
import com.google.gwt.i18n.client.BidiUtils;
import com.google.gwt.i18n.client.HasDirection.Direction;
import com.google.gwt.junit.client.GWTTestCase;
-
import com.google.gwt.user.client.ui.HasHorizontalAlignment.AutoHorizontalAlignmentConstant;
import com.google.gwt.user.client.ui.HasHorizontalAlignment.HorizontalAlignmentConstant;
diff --git a/user/test/com/google/gwt/user/server/rpc/CollectionsTestServiceImpl.java b/user/test/com/google/gwt/user/server/rpc/CollectionsTestServiceImpl.java
index f7e8e93..916c98a 100644
--- a/user/test/com/google/gwt/user/server/rpc/CollectionsTestServiceImpl.java
+++ b/user/test/com/google/gwt/user/server/rpc/CollectionsTestServiceImpl.java
@@ -1,12 +1,12 @@
/*
* Copyright 2011 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -17,17 +17,17 @@
import com.google.gwt.user.client.rpc.CollectionsTestService;
import com.google.gwt.user.client.rpc.TestSetFactory;
+import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeArrayList;
+import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeArraysAsList;
import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeEmptyKey;
import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeEmptyList;
import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeEmptySet;
import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeEmptyValue;
-import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeArrayList;
-import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeArraysAsList;
import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeEnum;
import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeEnumMapValue;
import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeHashMapKey;
-import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeHashSet;
import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeHashMapValue;
+import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeHashSet;
import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeIdentityHashMapKey;
import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeIdentityHashMapValue;
import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeLinkedHashMapKey;
@@ -529,7 +529,7 @@
return actual;
}
-
+
@Override
public IdentityHashMap<MarkerTypeEnum, MarkerTypeIdentityHashMapValue> echoEnumKey(
IdentityHashMap<MarkerTypeEnum, MarkerTypeIdentityHashMapValue> actual)
diff --git a/user/test/com/google/gwt/user/server/rpc/CustomFieldSerializerTestServiceImpl.java b/user/test/com/google/gwt/user/server/rpc/CustomFieldSerializerTestServiceImpl.java
index c32464b..4ddc56d 100644
--- a/user/test/com/google/gwt/user/server/rpc/CustomFieldSerializerTestServiceImpl.java
+++ b/user/test/com/google/gwt/user/server/rpc/CustomFieldSerializerTestServiceImpl.java
@@ -1,12 +1,12 @@
/*
* Copyright 2007 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -16,11 +16,11 @@
package com.google.gwt.user.server.rpc;
import com.google.gwt.user.client.rpc.CustomFieldSerializerTestService;
+import com.google.gwt.user.client.rpc.CustomFieldSerializerTestSetFactory.SerializableSubclass;
import com.google.gwt.user.client.rpc.CustomFieldSerializerTestSetValidator;
import com.google.gwt.user.client.rpc.IncompatibleRemoteServiceException;
import com.google.gwt.user.client.rpc.ManuallySerializedClass;
import com.google.gwt.user.client.rpc.ManuallySerializedImmutableClass;
-import com.google.gwt.user.client.rpc.CustomFieldSerializerTestSetFactory.SerializableSubclass;
import javax.servlet.ServletContext;
diff --git a/user/test/com/google/gwt/user/server/rpc/InheritanceTestServiceImpl.java b/user/test/com/google/gwt/user/server/rpc/InheritanceTestServiceImpl.java
index dc7b2c5..41579cf 100644
--- a/user/test/com/google/gwt/user/server/rpc/InheritanceTestServiceImpl.java
+++ b/user/test/com/google/gwt/user/server/rpc/InheritanceTestServiceImpl.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -18,8 +18,6 @@
import com.google.gwt.user.client.rpc.IncompatibleRemoteServiceException;
import com.google.gwt.user.client.rpc.InheritanceTestServiceSubtype;
import com.google.gwt.user.client.rpc.InheritanceTestSetFactory;
-import com.google.gwt.user.client.rpc.InheritanceTestSetValidator;
-import com.google.gwt.user.client.rpc.SerializationException;
import com.google.gwt.user.client.rpc.InheritanceTestSetFactory.AbstractClass;
import com.google.gwt.user.client.rpc.InheritanceTestSetFactory.AnonymousClassInterface;
import com.google.gwt.user.client.rpc.InheritanceTestSetFactory.Circle;
@@ -27,6 +25,8 @@
import com.google.gwt.user.client.rpc.InheritanceTestSetFactory.MySerializableInterface;
import com.google.gwt.user.client.rpc.InheritanceTestSetFactory.SerializableClass;
import com.google.gwt.user.client.rpc.InheritanceTestSetFactory.SerializableClassWithTransientField;
+import com.google.gwt.user.client.rpc.InheritanceTestSetValidator;
+import com.google.gwt.user.client.rpc.SerializationException;
import javax.servlet.ServletContext;
diff --git a/user/test/com/google/gwt/user/server/rpc/ObjectGraphTestServiceImpl.java b/user/test/com/google/gwt/user/server/rpc/ObjectGraphTestServiceImpl.java
index ffaf265..f0875de 100644
--- a/user/test/com/google/gwt/user/server/rpc/ObjectGraphTestServiceImpl.java
+++ b/user/test/com/google/gwt/user/server/rpc/ObjectGraphTestServiceImpl.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -16,11 +16,11 @@
package com.google.gwt.user.server.rpc;
import com.google.gwt.user.client.rpc.ObjectGraphTestService;
-import com.google.gwt.user.client.rpc.TestSetValidator;
import com.google.gwt.user.client.rpc.TestSetFactory.SerializableDoublyLinkedNode;
import com.google.gwt.user.client.rpc.TestSetFactory.SerializableGraphWithCFS;
import com.google.gwt.user.client.rpc.TestSetFactory.SerializablePrivateNoArg;
import com.google.gwt.user.client.rpc.TestSetFactory.SerializableWithTwoArrays;
+import com.google.gwt.user.client.rpc.TestSetValidator;
/**
* TODO: document me.
diff --git a/user/test/com/google/gwt/user/server/runasync/RunAsyncFailureServlet.java b/user/test/com/google/gwt/user/server/runasync/RunAsyncFailureServlet.java
index 5ecb49e..5f45443 100644
--- a/user/test/com/google/gwt/user/server/runasync/RunAsyncFailureServlet.java
+++ b/user/test/com/google/gwt/user/server/runasync/RunAsyncFailureServlet.java
@@ -1,12 +1,12 @@
/*
* Copyright 2009 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -18,8 +18,8 @@
import com.google.gwt.dev.util.Util;
import java.io.IOException;
-import java.io.OutputStream;
import java.io.InputStream;
+import java.io.OutputStream;
import java.net.URL;
import java.util.HashMap;
@@ -65,7 +65,7 @@
String realContents = getRealContents(req, uri);
String fragment = uri.substring(uri.lastIndexOf('/') + 1);
if (!realContents.contains("DOWNLOAD_FAILURE_TEST")
- || response == HttpServletResponse.SC_OK) {
+ || response == HttpServletResponse.SC_OK) {
int bytes = 0;
if (!realContents.contains("INSTALL_FAILURE_TEST")) {
OutputStream os = resp.getOutputStream();
@@ -73,7 +73,7 @@
bytes = realContents.getBytes().length;
os.close();
}
-
+
resp.setContentType("text/javascript");
resp.setHeader("Cache-Control", "no-cache");
resp.setContentLength(bytes);
@@ -100,7 +100,7 @@
if (realContentsCache.containsKey(uri)) {
return realContentsCache.get(uri);
}
-
+
// Delegate the actual data fetch to the main servlet
String host = req.getLocalName();
int port = req.getLocalPort();
diff --git a/user/test/com/google/gwt/validation/client/SimpleSampleTest.java b/user/test/com/google/gwt/validation/client/SimpleSampleTest.java
index 72c6860..e1ab536 100644
--- a/user/test/com/google/gwt/validation/client/SimpleSampleTest.java
+++ b/user/test/com/google/gwt/validation/client/SimpleSampleTest.java
@@ -34,9 +34,9 @@
public void testConstraintViolation_compiles() throws Exception {
// Only tests that Violation Compiles which will also compile Path, Node
// and ConstraintDescriptor
- ConstraintViolation<NotNull> violation = ConstraintViolationImpl.<NotNull> builder().
- setLeafBean(sample).
- build();
+ ConstraintViolation<NotNull> violation = ConstraintViolationImpl.<NotNull> builder()
+ .setLeafBean(sample)
+ .build();
assertEquals(sample, violation.getLeafBean());
}
diff --git a/user/test/com/google/gwt/validation/client/impl/GwtValidatorContextTest.java b/user/test/com/google/gwt/validation/client/impl/GwtValidatorContextTest.java
index 248f272..b868d78 100644
--- a/user/test/com/google/gwt/validation/client/impl/GwtValidatorContextTest.java
+++ b/user/test/com/google/gwt/validation/client/impl/GwtValidatorContextTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2010 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -16,9 +16,9 @@
package com.google.gwt.validation.client.impl;
import com.google.gwt.validation.client.AbstractGwtValidatorFactory;
+import com.google.gwt.validation.client.DefaultTraversableResolver;
import com.google.gwt.validation.client.GwtConstraintValidatorFactory;
import com.google.gwt.validation.client.GwtMessageInterpolator;
-import com.google.gwt.validation.client.DefaultTraversableResolver;
import com.google.gwt.validation.client.ValidationClientGwtTestCase;
import java.util.Set;
diff --git a/user/test/com/google/gwt/validation/client/impl/metadata/ValidationGroupsMetadataTest.java b/user/test/com/google/gwt/validation/client/impl/metadata/ValidationGroupsMetadataTest.java
index cfa944d..d47f431 100644
--- a/user/test/com/google/gwt/validation/client/impl/metadata/ValidationGroupsMetadataTest.java
+++ b/user/test/com/google/gwt/validation/client/impl/metadata/ValidationGroupsMetadataTest.java
@@ -17,8 +17,8 @@
import junit.framework.TestCase;
-import java.util.Set;
import java.util.HashSet;
+import java.util.Set;
import javax.validation.groups.Default;
@@ -40,7 +40,7 @@
public void testDefaultGroupExists() {
assertTrue(ValidationGroupsMetadata.builder().build().containsGroup(Default.class));
}
-
+
public void testFindAllExtendedGroups() {
// should get all of the groups and all of their parents recursively
ValidationGroupsMetadata groupsMetadata = createWithTestGroups();
@@ -84,16 +84,16 @@
private interface Part1 extends MiniPart {
}
-
+
private interface MiniPart extends SuperSmall {
}
-
+
private interface SuperSmall {
}
-
+
private interface Part2 {
}
-
+
private interface Big extends Part1, Part2 {
}
}
diff --git a/user/test/com/google/gwt/validation/example/client/ExampleValidatorFactory.java b/user/test/com/google/gwt/validation/example/client/ExampleValidatorFactory.java
index 0b926a5..26c60cf 100644
--- a/user/test/com/google/gwt/validation/example/client/ExampleValidatorFactory.java
+++ b/user/test/com/google/gwt/validation/example/client/ExampleValidatorFactory.java
@@ -16,8 +16,8 @@
package com.google.gwt.validation.example.client;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.validation.client.GwtValidation;
import com.google.gwt.validation.client.AbstractGwtValidatorFactory;
+import com.google.gwt.validation.client.GwtValidation;
import com.google.gwt.validation.client.impl.AbstractGwtValidator;
import javax.validation.Validator;
diff --git a/user/test/com/google/gwt/view/client/MockHasData.java b/user/test/com/google/gwt/view/client/MockHasData.java
index 207d886..b6727a9 100644
--- a/user/test/com/google/gwt/view/client/MockHasData.java
+++ b/user/test/com/google/gwt/view/client/MockHasData.java
@@ -16,9 +16,9 @@
package com.google.gwt.view.client;
import com.google.gwt.event.shared.GwtEvent;
+import com.google.gwt.event.shared.GwtEvent.Type;
import com.google.gwt.event.shared.HandlerManager;
import com.google.gwt.event.shared.HandlerRegistration;
-import com.google.gwt.event.shared.GwtEvent.Type;
import com.google.gwt.view.client.CellPreviewEvent.Handler;
import java.util.ArrayList;
diff --git a/user/test/com/google/web/bindery/autobean/AutoBeanSuite.java b/user/test/com/google/web/bindery/autobean/AutoBeanSuite.java
index 387dc9d..ad47943 100644
--- a/user/test/com/google/web/bindery/autobean/AutoBeanSuite.java
+++ b/user/test/com/google/web/bindery/autobean/AutoBeanSuite.java
@@ -1,12 +1,12 @@
/*
* Copyright 2010 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,13 +15,13 @@
*/
package com.google.web.bindery.autobean;
+import com.google.gwt.junit.tools.GWTTestSuite;
import com.google.web.bindery.autobean.gwt.client.AutoBeanTest;
import com.google.web.bindery.autobean.shared.AutoBeanCodexTest;
import com.google.web.bindery.autobean.shared.SplittableTest;
import com.google.web.bindery.autobean.vm.AutoBeanCodexJreTest;
import com.google.web.bindery.autobean.vm.AutoBeanJreTest;
import com.google.web.bindery.autobean.vm.SplittableJreTest;
-import com.google.gwt.junit.tools.GWTTestSuite;
import junit.framework.Test;
diff --git a/user/test/com/google/web/bindery/autobean/shared/SplittableTest.java b/user/test/com/google/web/bindery/autobean/shared/SplittableTest.java
index fcd8ea4..5592e50 100644
--- a/user/test/com/google/web/bindery/autobean/shared/SplittableTest.java
+++ b/user/test/com/google/web/bindery/autobean/shared/SplittableTest.java
@@ -15,6 +15,8 @@
*/
package com.google.web.bindery.autobean.shared;
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.junit.client.GWTTestCase;
import com.google.web.bindery.autobean.gwt.client.impl.JsoSplittable;
import com.google.web.bindery.autobean.shared.impl.AutoBeanCodexImpl;
import com.google.web.bindery.autobean.shared.impl.AutoBeanCodexImpl.Coder;
@@ -22,8 +24,6 @@
import com.google.web.bindery.autobean.shared.impl.SplittableList;
import com.google.web.bindery.autobean.shared.impl.SplittableSimpleMap;
import com.google.web.bindery.autobean.shared.impl.StringQuoter;
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.junit.client.GWTTestCase;
import java.util.Arrays;
import java.util.HashSet;
diff --git a/user/test/org/hibernate/jsr303/tck/tests/constraints/builtinconstraints/BuiltinConstraintsGwtTest.java b/user/test/org/hibernate/jsr303/tck/tests/constraints/builtinconstraints/BuiltinConstraintsGwtTest.java
index da3b5de..cd8ffd2 100644
--- a/user/test/org/hibernate/jsr303/tck/tests/constraints/builtinconstraints/BuiltinConstraintsGwtTest.java
+++ b/user/test/org/hibernate/jsr303/tck/tests/constraints/builtinconstraints/BuiltinConstraintsGwtTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2010 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,11 +15,11 @@
*/
package org.hibernate.jsr303.tck.tests.constraints.builtinconstraints;
-import com.google.gwt.junit.client.GWTTestCase;
-
import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectNumberOfViolations;
import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectPropertyPaths;
+import com.google.gwt.junit.client.GWTTestCase;
+
import org.hibernate.jsr303.tck.util.TestUtil;
import java.util.Date;
@@ -32,7 +32,7 @@
/**
* Test wrapper for {@link BuiltinConstraintsTest}.
- *
+ *
* <p>
* NOTE: Test the Future and Past constraints here by hand because Hibernate
* does not use the super source version when creating the beanDescriptor for
diff --git a/user/test/org/hibernate/jsr303/tck/util/client/Failing.java b/user/test/org/hibernate/jsr303/tck/util/client/Failing.java
index f742a30..a866863 100644
--- a/user/test/org/hibernate/jsr303/tck/util/client/Failing.java
+++ b/user/test/org/hibernate/jsr303/tck/util/client/Failing.java
@@ -15,11 +15,11 @@
*/
package org.hibernate.jsr303.tck.util.client;
-import org.hibernate.jsr303.tck.util.TckTestSuiteWrapper;
-
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import org.hibernate.jsr303.tck.util.TckTestSuiteWrapper;
+
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/user/test/org/hibernate/jsr303/tck/util/client/NonTckTest.java b/user/test/org/hibernate/jsr303/tck/util/client/NonTckTest.java
index 5756a69..74facae 100644
--- a/user/test/org/hibernate/jsr303/tck/util/client/NonTckTest.java
+++ b/user/test/org/hibernate/jsr303/tck/util/client/NonTckTest.java
@@ -15,11 +15,11 @@
*/
package org.hibernate.jsr303.tck.util.client;
-import org.hibernate.jsr303.tck.util.TckTestSuiteWrapper;
-
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import org.hibernate.jsr303.tck.util.TckTestSuiteWrapper;
+
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/user/test/org/hibernate/jsr303/tck/util/client/NotSupported.java b/user/test/org/hibernate/jsr303/tck/util/client/NotSupported.java
index f32ef0d..69c58be 100644
--- a/user/test/org/hibernate/jsr303/tck/util/client/NotSupported.java
+++ b/user/test/org/hibernate/jsr303/tck/util/client/NotSupported.java
@@ -15,11 +15,11 @@
*/
package org.hibernate.jsr303.tck.util.client;
-import org.hibernate.jsr303.tck.util.TckTestSuiteWrapper;
-
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import org.hibernate.jsr303.tck.util.TckTestSuiteWrapper;
+
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/user/test/org/hibernate/jsr303/tck/util/client/TestNotCompatible.java b/user/test/org/hibernate/jsr303/tck/util/client/TestNotCompatible.java
index aaeb06c..c981472 100644
--- a/user/test/org/hibernate/jsr303/tck/util/client/TestNotCompatible.java
+++ b/user/test/org/hibernate/jsr303/tck/util/client/TestNotCompatible.java
@@ -15,11 +15,11 @@
*/
package org.hibernate.jsr303.tck.util.client;
-import org.hibernate.jsr303.tck.util.TckTestSuiteWrapper;
-
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import org.hibernate.jsr303.tck.util.TckTestSuiteWrapper;
+
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
