diff --git a/.github/workflows/quick-check.yml b/.github/workflows/quick-check.yml
index 1d94bd765b3..9689bd80a6b 100644
--- a/.github/workflows/quick-check.yml
+++ b/.github/workflows/quick-check.yml
@@ -43,9 +43,9 @@ jobs:
TZ=America/Los_Angeles \
ANT_OPTS=-Dfile.encoding=UTF8 \
ANT_OPTS=-Xmx2g
- ant clean compile.tests dist doc checkstyle apicheck
+ ant clean compile.tests dist doc checkstyle apicheck | tee log.txt
- - name: Create pull request comments/annotations for checkstyle from the java 21 build, even on failure
+ - name: Create pull request comments/annotations for Checkstyle and ErrorProne from the java 21 build, even on failure
if: ${{ always() && github.event_name == 'pull_request' && matrix.java-version == '21' }}
env:
REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -56,8 +56,9 @@ jobs:
cd gwt
for f in build/out/**/checkstyle*.xml ; do
echo $f
- reviewdog -f=checkstyle -filter-mode=diff_context -reporter=github-pr-annotations -level=info < $f
+ reviewdog -f=checkstyle -filter-mode=diff_context -reporter=github-pr-annotations -level=info < $f || true
done
+ reviewdog -efm=" [javac] %f:%l: warning: %m" -filter-mode=diff_context -reporter=github-pr-annotations -level=info < log.txt || true
- name: Upload checkstyle xml for manual review
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a #v7.0.1
if: ${{ matrix.java-version == '21' }}
diff --git a/common.ant.xml b/common.ant.xml
index d2f2d06f981..aa4fd4f08ba 100755
--- a/common.ant.xml
+++ b/common.ant.xml
@@ -55,7 +55,7 @@
-
+
@@ -161,7 +161,7 @@
-
+
@@ -184,6 +184,8 @@
+
+
diff --git a/dev/core/src/com/google/gwt/dev/javac/CompilationUnitImpl.java b/dev/core/src/com/google/gwt/dev/javac/CompilationUnitImpl.java
index 8e06778cfb9..9623bd3a3a9 100644
--- a/dev/core/src/com/google/gwt/dev/javac/CompilationUnitImpl.java
+++ b/dev/core/src/com/google/gwt/dev/javac/CompilationUnitImpl.java
@@ -63,7 +63,8 @@ public CompilationUnitImpl(List compiledClasses,
}
this.hasErrors = hasAnyErrors;
this.hasJsInteropRootType = Iterables.any(types, new Predicate() {
- @Override public boolean apply(JDeclaredType type) {
+ @Override
+ public boolean apply(JDeclaredType type) {
return type.hasJsInteropEntryPoints();
}
});
diff --git a/dev/core/src/com/google/gwt/dev/jjs/ast/JTransformer.java b/dev/core/src/com/google/gwt/dev/jjs/ast/JTransformer.java
index dfefd1da4c8..112418fc7ab 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/ast/JTransformer.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/ast/JTransformer.java
@@ -359,208 +359,276 @@ public T transformYieldStatement(JYieldStatement x) {
private class JRewriterVisitor extends JVisitor {
T result = null;
+ @Override
public boolean didChange() {
throw new UnsupportedOperationException();
}
+ @Override
public final void endVisit(JAbstractMethodBody x, Context ctx) {
}
+ @Override
public final void endVisit(JArrayLength x, Context ctx) {
}
+ @Override
public final void endVisit(JArrayRef x, Context ctx) {
}
+ @Override
public final void endVisit(JArrayType x, Context ctx) {
}
+ @Override
public final void endVisit(JAssertStatement x, Context ctx) {
}
+ @Override
public final void endVisit(JBinaryOperation x, Context ctx) {
}
+ @Override
public final void endVisit(JBlock x, Context ctx) {
}
+ @Override
public final void endVisit(JBooleanLiteral x, Context ctx) {
}
+ @Override
public final void endVisit(JBreakStatement x, Context ctx) {
}
+ @Override
public final void endVisit(JCaseStatement x, Context ctx) {
}
+ @Override
public final void endVisit(JCastMap x, Context ctx) {
}
+ @Override
public final void endVisit(JCastOperation x, Context ctx) {
}
+ @Override
public final void endVisit(JCharLiteral x, Context ctx) {
}
+ @Override
public final void endVisit(JClassLiteral x, Context ctx) {
}
+ @Override
public final void endVisit(JClassType x, Context ctx) {
}
+ @Override
public final void endVisit(JConditional x, Context ctx) {
}
+ @Override
public final void endVisit(JConstructor x, Context ctx) {
}
+ @Override
public final void endVisit(JContinueStatement x, Context ctx) {
}
+ @Override
public final void endVisit(JDebuggerStatement x, Context ctx) {
}
+ @Override
public final void endVisit(JDeclarationStatement x, Context ctx) {
}
+ @Override
public final void endVisit(JDeclaredType x, Context ctx) {
}
+ @Override
public final void endVisit(JDoStatement x, Context ctx) {
}
+ @Override
public final void endVisit(JDoubleLiteral x, Context ctx) {
}
+ @Override
public final void endVisit(JExpression x, Context ctx) {
}
+ @Override
public final void endVisit(JExpressionStatement x, Context ctx) {
}
+ @Override
public final void endVisit(JField x, Context ctx) {
}
+ @Override
public final void endVisit(JFieldRef x, Context ctx) {
}
+ @Override
public final void endVisit(JFloatLiteral x, Context ctx) {
}
+ @Override
public final void endVisit(JForStatement x, Context ctx) {
}
+ @Override
public final void endVisit(JIfStatement x, Context ctx) {
}
+ @Override
public final void endVisit(JInstanceOf x, Context ctx) {
}
+ @Override
public final void endVisit(JInterfaceType x, Context ctx) {
}
+ @Override
public final void endVisit(JIntLiteral x, Context ctx) {
}
+ @Override
public final void endVisit(JLabel x, Context ctx) {
}
+ @Override
public final void endVisit(JLabeledStatement x, Context ctx) {
}
+ @Override
public final void endVisit(JLiteral x, Context ctx) {
}
+ @Override
public final void endVisit(JLocal x, Context ctx) {
}
+ @Override
public final void endVisit(JLocalRef x, Context ctx) {
}
+ @Override
public final void endVisit(JLongLiteral x, Context ctx) {
}
+ @Override
public final void endVisit(JMethod x, Context ctx) {
}
+ @Override
public final void endVisit(JMethodBody x, Context ctx) {
}
+ @Override
public final void endVisit(JMethodCall x, Context ctx) {
}
+ @Override
public final void endVisit(JMultiExpression x, Context ctx) {
}
+ @Override
public final void endVisit(JNameOf x, Context ctx) {
}
+ @Override
public final void endVisit(JNewArray x, Context ctx) {
}
+ @Override
public final void endVisit(JNewInstance x, Context ctx) {
}
+ @Override
public final void endVisit(JNode x, Context ctx) {
}
+ @Override
public final void endVisit(JNullLiteral x, Context ctx) {
}
+ @Override
public final void endVisit(JNumericEntry x, Context ctx) {
}
+ @Override
public final void endVisit(JParameter x, Context ctx) {
}
+ @Override
public final void endVisit(JParameterRef x, Context ctx) {
}
+ @Override
public final void endVisit(JPermutationDependentValue x, Context ctx) {
}
+ @Override
public final void endVisit(JPostfixOperation x, Context ctx) {
}
+ @Override
public final void endVisit(JPrefixOperation x, Context ctx) {
}
+ @Override
public final void endVisit(JPrimitiveType x, Context ctx) {
}
+ @Override
public final void endVisit(JProgram x, Context ctx) {
}
+ @Override
public final void endVisit(JReferenceType x, Context ctx) {
}
+ @Override
public final void endVisit(JReturnStatement x, Context ctx) {
}
+ @Override
public final void endVisit(JRunAsync x, Context ctx) {
}
+ @Override
public final void endVisit(JRuntimeTypeReference x, Context ctx) {
}
+ @Override
public final void endVisit(JsniClassLiteral x, Context ctx) {
}
+ @Override
public final void endVisit(JsniFieldRef x, Context ctx) {
}
+ @Override
public final void endVisit(JsniMethodBody x, Context ctx) {
}
+ @Override
public final void endVisit(JsniMethodRef x, Context ctx) {
}
+ @Override
public final void endVisit(JsonArray x, Context ctx) {
}
+ @Override
public final void endVisit(JStatement x, Context ctx) {
}
+ @Override
public final void endVisit(JStringLiteral x, Context ctx) {
}
@@ -568,21 +636,27 @@ public final void endVisit(JStringLiteral x, Context ctx) {
public void endVisit(JSwitchExpression x, Context ctx) {
}
+ @Override
public final void endVisit(JSwitchStatement x, Context ctx) {
}
+ @Override
public final void endVisit(JThisRef x, Context ctx) {
}
+ @Override
public final void endVisit(JThrowStatement x, Context ctx) {
}
+ @Override
public final void endVisit(JTryStatement x, Context ctx) {
}
+ @Override
public final void endVisit(JType x, Context ctx) {
}
+ @Override
public final void endVisit(JUnaryOperation x, Context ctx) {
}
@@ -590,15 +664,19 @@ public final void endVisit(JUnaryOperation x, Context ctx) {
public void endVisit(JUnsafeTypeCoercion x, Context ctx) {
}
+ @Override
public final void endVisit(JValueLiteral x, Context ctx) {
}
+ @Override
public final void endVisit(JVariable x, Context ctx) {
}
+ @Override
public final void endVisit(JVariableRef x, Context ctx) {
}
+ @Override
public final void endVisit(JWhileStatement x, Context ctx) {
}
@@ -606,156 +684,182 @@ public final void endVisit(JWhileStatement x, Context ctx) {
public void endVisit(JYieldStatement x, Context ctx) {
}
+ @Override
public final boolean visit(JAbstractMethodBody x, Context ctx) {
assert result == null;
result = transformAbstractMethodBody(x);
return false;
}
+ @Override
public final boolean visit(JArrayLength x, Context ctx) {
assert result == null;
result = transformArrayLength(x);
return false;
}
+ @Override
public final boolean visit(JArrayRef x, Context ctx) {
assert result == null;
result = transformArrayRef(x);
return false;
}
+ @Override
public final boolean visit(JArrayType x, Context ctx) {
assert result == null;
result = transformArrayType(x);
return false;
}
+ @Override
public final boolean visit(JAssertStatement x, Context ctx) {
assert result == null;
result = transformAssertStatement(x);
return false;
}
+ @Override
public final boolean visit(JBinaryOperation x, Context ctx) {
assert result == null;
result = transformBinaryOperation(x);
return false;
}
+ @Override
public final boolean visit(JBlock x, Context ctx) {
assert result == null;
result = transformBlock(x);
return false;
}
+ @Override
public final boolean visit(JBooleanLiteral x, Context ctx) {
assert result == null;
result = transformBooleanLiteral(x);
return false;
}
+ @Override
public final boolean visit(JBreakStatement x, Context ctx) {
assert result == null;
result = transformBreakStatement(x);
return false;
}
+ @Override
public final boolean visit(JCaseStatement x, Context ctx) {
assert result == null;
result = transformCaseStatement(x);
return false;
}
+ @Override
public final boolean visit(JCastMap x, Context ctx) {
assert result == null;
result = transformCastMap(x);
return false;
}
+ @Override
public final boolean visit(JCastOperation x, Context ctx) {
assert result == null;
result = transformCastOperation(x);
return false;
}
+ @Override
public final boolean visit(JCharLiteral x, Context ctx) {
assert result == null;
result = transformCharLiteral(x);
return false;
}
+ @Override
public final boolean visit(JClassLiteral x, Context ctx) {
assert result == null;
result = transformClassLiteral(x);
return false;
}
+ @Override
public final boolean visit(JClassType x, Context ctx) {
assert result == null;
result = transformClassType(x);
return false;
}
+ @Override
public final boolean visit(JConditional x, Context ctx) {
assert result == null;
result = transformConditional(x);
return false;
}
+ @Override
public final boolean visit(JConstructor x, Context ctx) {
assert result == null;
result = transformConstructor(x);
return false;
}
+ @Override
public final boolean visit(JContinueStatement x, Context ctx) {
assert result == null;
result = transformContinueStatement(x);
return false;
}
+ @Override
public final boolean visit(JDebuggerStatement x, Context ctx) {
assert result == null;
result = transformDebuggerStatement(x);
return false;
}
+ @Override
public final boolean visit(JDeclarationStatement x, Context ctx) {
assert result == null;
result = transformDeclarationStatement(x);
return false;
}
+ @Override
public final boolean visit(JDeclaredType x, Context ctx) {
assert result == null;
result = transformDeclaredType(x);
return false;
}
+ @Override
public final boolean visit(JDoStatement x, Context ctx) {
assert result == null;
result = transformDoStatement(x);
return false;
}
+ @Override
public final boolean visit(JDoubleLiteral x, Context ctx) {
assert result == null;
result = transformDoubleLiteral(x);
return false;
}
+ @Override
public final boolean visit(JExpression x, Context ctx) {
assert result == null;
result = transformExpression(x);
return false;
}
+ @Override
public final boolean visit(JExpressionStatement x, Context ctx) {
assert result == null;
result = transformExpressionStatement(x);
return false;
}
+ @Override
public final boolean visit(JField x, Context ctx) {
assert result == null;
result = transformField(x);
@@ -765,215 +869,251 @@ public final boolean visit(JField x, Context ctx) {
/**
* NOTE: not called from JsniFieldRef.
*/
+ @Override
public final boolean visit(JFieldRef x, Context ctx) {
assert result == null;
result = transformFieldRef(x);
return false;
}
+ @Override
public final boolean visit(JFloatLiteral x, Context ctx) {
assert result == null;
result = transformFloatLiteral(x);
return false;
}
+ @Override
public final boolean visit(JForStatement x, Context ctx) {
assert result == null;
result = transformForStatement(x);
return false;
}
+ @Override
public final boolean visit(JIfStatement x, Context ctx) {
assert result == null;
result = transformIfStatement(x);
return false;
}
+ @Override
public final boolean visit(JInstanceOf x, Context ctx) {
assert result == null;
result = transformInstanceOf(x);
return false;
}
+ @Override
public final boolean visit(JInterfaceType x, Context ctx) {
assert result == null;
result = transformInterfaceType(x);
return false;
}
+ @Override
public final boolean visit(JIntLiteral x, Context ctx) {
assert result == null;
result = transformIntLiteral(x);
return false;
}
+ @Override
public final boolean visit(JLabel x, Context ctx) {
assert result == null;
result = transformLabel(x);
return false;
}
+ @Override
public final boolean visit(JLabeledStatement x, Context ctx) {
assert result == null;
result = transformLabeledStatement(x);
return false;
}
+ @Override
public final boolean visit(JLiteral x, Context ctx) {
assert result == null;
result = transformLiteral(x);
return false;
}
+ @Override
public final boolean visit(JLocal x, Context ctx) {
assert result == null;
result = transformLocal(x);
return false;
}
+ @Override
public final boolean visit(JLocalRef x, Context ctx) {
assert result == null;
result = transformLocalRef(x);
return false;
}
+ @Override
public final boolean visit(JLongLiteral x, Context ctx) {
assert result == null;
result = transformLongLiteral(x);
return false;
}
+ @Override
public final boolean visit(JMethod x, Context ctx) {
assert result == null;
result = transformMethod(x);
return false;
}
+ @Override
public final boolean visit(JMethodBody x, Context ctx) {
assert result == null;
result = transformMethodBody(x);
return false;
}
+ @Override
public final boolean visit(JMethodCall x, Context ctx) {
assert result == null;
result = transformMethodCall(x);
return false;
}
+ @Override
public final boolean visit(JMultiExpression x, Context ctx) {
assert result == null;
result = transformMultiExpression(x);
return false;
}
+ @Override
public final boolean visit(JNameOf x, Context ctx) {
assert result == null;
result = transformNameOf(x);
return false;
}
+ @Override
public final boolean visit(JNewArray x, Context ctx) {
assert result == null;
result = transformNewArray(x);
return false;
}
+ @Override
public final boolean visit(JNewInstance x, Context ctx) {
assert result == null;
result = transformNewInstance(x);
return false;
}
+ @Override
public final boolean visit(JNode x, Context ctx) {
missing(x);
return false;
}
+ @Override
public final boolean visit(JNullLiteral x, Context ctx) {
assert result == null;
result = transformNullLiteral(x);
return false;
}
+ @Override
public final boolean visit(JNumericEntry x, Context ctx) {
assert result == null;
result = transformNumericEntry(x);
return false;
}
+ @Override
public final boolean visit(JParameter x, Context ctx) {
assert result == null;
result = transformParameter(x);
return false;
}
+ @Override
public final boolean visit(JParameterRef x, Context ctx) {
assert result == null;
result = transformParameterRef(x);
return false;
}
+ @Override
public final boolean visit(JPermutationDependentValue x, Context ctx) {
assert result == null;
result = transformPermutationDependentValue(x);
return false;
}
+ @Override
public final boolean visit(JPostfixOperation x, Context ctx) {
assert result == null;
result = transformPostfixOperation(x);
return false;
}
+ @Override
public final boolean visit(JPrefixOperation x, Context ctx) {
assert result == null;
result = transformPrefixOperation(x);
return false;
}
+ @Override
public final boolean visit(JPrimitiveType x, Context ctx) {
assert result == null;
result = transformPrimitiveType(x);
return false;
}
+ @Override
public final boolean visit(JProgram x, Context ctx) {
assert result == null;
result = transformProgram(x);
return false;
}
+ @Override
public final boolean visit(JReferenceType x, Context ctx) {
assert result == null;
result = transformReferenceType(x);
return false;
}
+ @Override
public final boolean visit(JReturnStatement x, Context ctx) {
assert result == null;
result = transformReturnStatement(x);
return false;
}
+ @Override
public final boolean visit(JRunAsync x, Context ctx) {
assert result == null;
result = transformRunAsync(x);
return false;
}
+ @Override
public final boolean visit(JRuntimeTypeReference x, Context ctx) {
assert result == null;
result = transformRuntimeTypeReference(x);
return false;
}
+ @Override
public final boolean visit(JsniClassLiteral x, Context ctx) {
assert result == null;
result = transformJsniClassLiteral(x);
return false;
}
+ @Override
public final boolean visit(JsniFieldRef x, Context ctx) {
/* NOTE: Skip JFieldRef */
assert result == null;
@@ -981,12 +1121,14 @@ public final boolean visit(JsniFieldRef x, Context ctx) {
return false;
}
+ @Override
public final boolean visit(JsniMethodBody x, Context ctx) {
assert result == null;
result = transformJsniMethodBody(x);
return false;
}
+ @Override
public final boolean visit(JsniMethodRef x, Context ctx) {
/* NOTE: Skip JMethodCall */
assert result == null;
@@ -994,90 +1136,105 @@ public final boolean visit(JsniMethodRef x, Context ctx) {
return false;
}
+ @Override
public final boolean visit(JsonArray x, Context ctx) {
assert result == null;
result = transformJsonArray(x);
return false;
}
+ @Override
public final boolean visit(JStatement x, Context ctx) {
assert result == null;
result = transformStatement(x);
return false;
}
+ @Override
public final boolean visit(JStringLiteral x, Context ctx) {
assert result == null;
result = transformStringLiteral(x);
return false;
}
+ @Override
public final boolean visit(JSwitchExpression x, Context ctx) {
assert result == null;
result = transformSwitchExpression(x);
return false;
}
+ @Override
public final boolean visit(JSwitchStatement x, Context ctx) {
assert result == null;
result = transformSwitchStatement(x);
return false;
}
+ @Override
public final boolean visit(JThisRef x, Context ctx) {
assert result == null;
result = transformThisRef(x);
return false;
}
+ @Override
public final boolean visit(JThrowStatement x, Context ctx) {
assert result == null;
result = transformThrowStatement(x);
return false;
}
+ @Override
public final boolean visit(JTryStatement x, Context ctx) {
assert result == null;
result = transformTryStatement(x);
return false;
}
+ @Override
public final boolean visit(JType x, Context ctx) {
assert result == null;
result = transformType(x);
return false;
}
+ @Override
public final boolean visit(JUnaryOperation x, Context ctx) {
assert result == null;
result = transformUnaryOperation(x);
return false;
}
+ @Override
public final boolean visit(JUnsafeTypeCoercion x, Context ctx) {
assert result == null;
result = transformUnsafeTypeCoercion(x);
return false;
}
+ @Override
public final boolean visit(JValueLiteral x, Context ctx) {
assert result == null;
result = transformValueLiteral(x);
return false;
}
+ @Override
public final boolean visit(JVariable x, Context ctx) {
assert result == null;
result = transformVariable(x);
return false;
}
+ @Override
public final boolean visit(JVariableRef x, Context ctx) {
assert result == null;
result = transformVariableRef(x);
return false;
}
+ @Override
public final boolean visit(JWhileStatement x, Context ctx) {
assert result == null;
result = transformWhileStatement(x);
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/ComputePotentiallyObservableUninitializedValues.java b/dev/core/src/com/google/gwt/dev/jjs/impl/ComputePotentiallyObservableUninitializedValues.java
index 461fe68931f..5c9eaae2714 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/ComputePotentiallyObservableUninitializedValues.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/ComputePotentiallyObservableUninitializedValues.java
@@ -141,6 +141,7 @@ public void endVisit(JThisRef x, Context ctx) {
classesThatCanPotentiallyObserveUninitializedSubclassFields.add(currentClass);
}
+ @Override
public void endVisit(JParameterRef x, Context ctx) {
if (x.getParameter() == devirtualizedThis) {
// Seen a reference to devirtualized "this" that can potentially escape or be used as
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/ImplementJsVarargs.java b/dev/core/src/com/google/gwt/dev/jjs/impl/ImplementJsVarargs.java
index 14794e867bb..9444beee63f 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/ImplementJsVarargs.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/ImplementJsVarargs.java
@@ -261,6 +261,7 @@ public JExpression replace(JParameterRef expression) {
return expression;
}
+ @Override
JExpression replace(JArrayRef expression) {
SourceInfo sourceInfo = expression.getSourceInfo();
return new JArrayRef(expression.getSourceInfo(),
@@ -269,6 +270,7 @@ JExpression replace(JArrayRef expression) {
expression.getIndexExpr(), new JIntLiteral(sourceInfo, varargsIndex)));
}
+ @Override
JExpression replace(JArrayLength expression) {
SourceInfo sourceInfo = expression.getSourceInfo();
return new JBinaryOperation(sourceInfo, JPrimitiveType.INT, JBinaryOperator.SUB,
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/JavaAstVerifier.java b/dev/core/src/com/google/gwt/dev/jjs/impl/JavaAstVerifier.java
index 9b66dd2183c..edcff16cbc7 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/JavaAstVerifier.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/JavaAstVerifier.java
@@ -156,6 +156,7 @@ public void endVisit(JMethodCall x, Context ctx) {
assertCalledMethodIsInAst(x);
}
+ @Override
public void endVisit(JThisRef x, Context ctx) {
assert !currentMethod.isStatic() || currentMethod.isConstructor()
: "JThisRef found in static method " + currentMethod;
diff --git a/dev/core/src/com/google/gwt/dev/js/BaselineCoverageGatherer.java b/dev/core/src/com/google/gwt/dev/js/BaselineCoverageGatherer.java
index a24b1d2815a..ca86c228846 100644
--- a/dev/core/src/com/google/gwt/dev/js/BaselineCoverageGatherer.java
+++ b/dev/core/src/com/google/gwt/dev/js/BaselineCoverageGatherer.java
@@ -87,7 +87,8 @@ private Multimap execImpl() {
* otherwise e.g. class declarations will be visited.
*/
new JVisitor() {
- @Override public void endVisit(JMethodCall x, Context ctx) {
+ @Override
+ public void endVisit(JMethodCall x, Context ctx) {
// this is a bit of a hack. The compiler inserts no-arg super calls, but
// there isn't really a way to detect that they're synthetic, and the
// strategy below of comparing source info with that of the enclosing type
@@ -100,27 +101,32 @@ private Multimap execImpl() {
endVisit((JExpression) x, ctx);
}
- @Override public void endVisit(JThisRef x, Context ctx) {
+ @Override
+ public void endVisit(JThisRef x, Context ctx) {
if (x.getSourceInfo().equals(x.getClassType().getSourceInfo())) {
return;
}
endVisit((JExpression) x, ctx);
}
- @Override public void endVisit(JClassLiteral x, Context ctx) {
+ @Override
+ public void endVisit(JClassLiteral x, Context ctx) {
if (x.getSourceInfo().equals(x.getRefType().getSourceInfo())) {
return;
}
endVisit((JExpression) x, ctx);
}
- @Override public void endVisit(JExpression x, Context ctx) {
+ @Override
+ public void endVisit(JExpression x, Context ctx) {
cover(x.getSourceInfo());
}
- @Override public void endVisit(JsniMethodBody x, Context ctx) {
+ @Override
+ public void endVisit(JsniMethodBody x, Context ctx) {
new CoverageVisitor(instrumentedFiles) {
- @Override public void endVisit(JsExpression x, JsContext ctx) {
+ @Override
+ public void endVisit(JsExpression x, JsContext ctx) {
cover(x.getSourceInfo());
}
}.accept(x.getFunc());
@@ -129,14 +135,16 @@ private Multimap execImpl() {
// don't instrument fields whose initializers are literals, because (1) CoverageVisitor
// doesn't visit literals because it can introduce syntax errors in some cases, and (2) it's
// consistent with other coverage tools, e.g. Emma.
- @Override public boolean visit(JDeclarationStatement x, Context ctx) {
+ @Override
+ public boolean visit(JDeclarationStatement x, Context ctx) {
return !(x.getInitializer() instanceof JValueLiteral &&
x.getVariableRef().getTarget() instanceof JField);
}
// don't instrument method call arguments; we can get weird coverage results when a call is
// spread over several lines
- @Override public boolean visit(JMethodCall x, Context ctx) {
+ @Override
+ public boolean visit(JMethodCall x, Context ctx) {
return false;
}
}.accept(jProgram);
diff --git a/dev/core/src/com/google/gwt/dev/js/CoverageVisitor.java b/dev/core/src/com/google/gwt/dev/js/CoverageVisitor.java
index a8f739f7813..b198c00f3fd 100644
--- a/dev/core/src/com/google/gwt/dev/js/CoverageVisitor.java
+++ b/dev/core/src/com/google/gwt/dev/js/CoverageVisitor.java
@@ -55,32 +55,39 @@ public CoverageVisitor(Set instrumentedFiles) {
this.instrumentedFiles = instrumentedFiles;
}
- @Override public void endVisit(JsArrayAccess x, JsContext ctx) {
+ @Override
+ public void endVisit(JsArrayAccess x, JsContext ctx) {
visitExpression(x, ctx);
}
- @Override public void endVisit(JsBinaryOperation x, JsContext ctx) {
+ @Override
+ public void endVisit(JsBinaryOperation x, JsContext ctx) {
visitExpression(x, ctx);
}
- @Override public void endVisit(JsInvocation x, JsContext ctx) {
+ @Override
+ public void endVisit(JsInvocation x, JsContext ctx) {
nodesInRefContext.remove(x.getQualifier());
visitExpression(x, ctx);
}
- @Override public void endVisit(JsNameRef x, JsContext ctx) {
+ @Override
+ public void endVisit(JsNameRef x, JsContext ctx) {
visitExpression(x, ctx);
}
- @Override public void endVisit(JsNew x, JsContext ctx) {
+ @Override
+ public void endVisit(JsNew x, JsContext ctx) {
visitExpression(x, ctx);
}
- @Override public void endVisit(JsPostfixOperation x, JsContext ctx) {
+ @Override
+ public void endVisit(JsPostfixOperation x, JsContext ctx) {
visitExpression(x, ctx);
}
- @Override public void endVisit(JsPrefixOperation x, JsContext ctx) {
+ @Override
+ public void endVisit(JsPrefixOperation x, JsContext ctx) {
visitExpression(x, ctx);
nodesInRefContext.remove(x.getArg());
}
@@ -91,7 +98,8 @@ public CoverageVisitor(Set instrumentedFiles) {
* lastLine before the condition and increment expressions in the for loop
* so that location data will be recorded correctly.
*/
- @Override public boolean visit(JsFor x, JsContext ctx) {
+ @Override
+ public boolean visit(JsFor x, JsContext ctx) {
if (x.getInitExpr() != null) {
x.setInitExpr(accept(x.getInitExpr()));
} else if (x.getInitVars() != null) {
@@ -111,18 +119,21 @@ public CoverageVisitor(Set instrumentedFiles) {
return false;
}
- @Override public boolean visit(JsInvocation x, JsContext ctx) {
+ @Override
+ public boolean visit(JsInvocation x, JsContext ctx) {
nodesInRefContext.add(x.getQualifier());
return true;
}
- @Override public boolean visit(JsPropertyInitializer x, JsContext ctx) {
+ @Override
+ public boolean visit(JsPropertyInitializer x, JsContext ctx) {
// Do not instrument labels.
x.setValueExpr(accept(x.getValueExpr()));
return false;
}
- @Override public boolean visit(JsPrefixOperation x, JsContext ctx) {
+ @Override
+ public boolean visit(JsPrefixOperation x, JsContext ctx) {
if (x.getOperator() == JsUnaryOperator.DELETE
|| x.getOperator() == JsUnaryOperator.TYPEOF) {
nodesInRefContext.add(x.getArg());
@@ -134,7 +145,8 @@ public CoverageVisitor(Set instrumentedFiles) {
* Similar to JsFor, this resets the current location information before
* evaluating the condition.
*/
- @Override public boolean visit(JsWhile x, JsContext ctx) {
+ @Override
+ public boolean visit(JsWhile x, JsContext ctx) {
resetPosition();
x.setCondition(accept(x.getCondition()));
accept(x.getBody());
diff --git a/dev/core/src/com/google/gwt/dev/shell/BrowserListener.java b/dev/core/src/com/google/gwt/dev/shell/BrowserListener.java
index e727c5cede4..345b3a41d20 100644
--- a/dev/core/src/com/google/gwt/dev/shell/BrowserListener.java
+++ b/dev/core/src/com/google/gwt/dev/shell/BrowserListener.java
@@ -200,6 +200,7 @@ public synchronized void writeCompilerOutput(StandardLinkerContext linkerStack,
*
* @param ignoreRemoteDeath
*/
+ @Override
public void setIgnoreRemoteDeath(boolean ignoreRemoteDeath) {
this.ignoreRemoteDeath = ignoreRemoteDeath;
}
diff --git a/dev/core/src/com/google/gwt/dev/shell/jetty/JettyLauncher.java b/dev/core/src/com/google/gwt/dev/shell/jetty/JettyLauncher.java
index ee2388a66ff..b5bde47613e 100644
--- a/dev/core/src/com/google/gwt/dev/shell/jetty/JettyLauncher.java
+++ b/dev/core/src/com/google/gwt/dev/shell/jetty/JettyLauncher.java
@@ -115,6 +115,7 @@ public JettyRequestLogger(TreeLogger logger, TreeLogger.Type normalLogLevel) {
/**
* Log an HTTP request/response to TreeLogger.
*/
+ @Override
public void log(Request request, Response response) {
int status = response.getStatus();
if (status < 0) {
diff --git a/dev/core/src/com/google/gwt/dev/shell/jetty/JettyTreeLogger.java b/dev/core/src/com/google/gwt/dev/shell/jetty/JettyTreeLogger.java
index c31ca4b5eef..8b2710d4776 100644
--- a/dev/core/src/com/google/gwt/dev/shell/jetty/JettyTreeLogger.java
+++ b/dev/core/src/com/google/gwt/dev/shell/jetty/JettyTreeLogger.java
@@ -37,68 +37,83 @@ public JettyTreeLogger(TreeLogger logger) {
this.logger = logger;
}
+ @Override
public void debug(String msg, long arg) {
logger.log(TreeLogger.SPAM, format(msg, arg));
}
+ @Override
public void debug(String msg, Object... args) {
if (logger.isLoggable(TreeLogger.SPAM)) {
logger.log(TreeLogger.SPAM, format(msg, args));
}
}
+ @Override
public void debug(String msg, Throwable th) {
logger.log(TreeLogger.SPAM, msg, th);
}
+ @Override
public void debug(Throwable th) {
logger.log(TreeLogger.SPAM, "", th);
}
+ @Override
public Logger getLogger(String name) {
return this;
}
+ @Override
public String getName() {
return "";
}
+ @Override
public void info(String msg, Object... args) {
if (logger.isLoggable(TreeLogger.TRACE)) {
logger.log(TreeLogger.TRACE, format(msg, args));
}
}
+ @Override
public void info(String msg, Throwable th) {
logger.log(TreeLogger.TRACE, msg, th);
}
+ @Override
public void info(Throwable th) {
logger.log(TreeLogger.TRACE, "", th);
}
+ @Override
public boolean isDebugEnabled() {
return logger.isLoggable(TreeLogger.SPAM);
}
+ @Override
public void setDebugEnabled(boolean enabled) {
// ignored
}
+ @Override
public void warn(String msg, Object... args) {
if (logger.isLoggable(TreeLogger.WARN)) {
logger.log(TreeLogger.WARN, format(msg, args));
}
}
+ @Override
public void warn(String msg, Throwable th) {
logger.log(TreeLogger.WARN, msg, th);
}
+ @Override
public void warn(Throwable th) {
logger.log(TreeLogger.WARN, "", th);
}
+ @Override
public void ignore(Throwable th) {
logger.log(TreeLogger.SPAM, "IGNORE", th);
}
diff --git a/dev/core/src/com/google/gwt/dev/shell/log/SwingLoggerPanel.java b/dev/core/src/com/google/gwt/dev/shell/log/SwingLoggerPanel.java
index e6f5e8ca69e..882a9440317 100644
--- a/dev/core/src/com/google/gwt/dev/shell/log/SwingLoggerPanel.java
+++ b/dev/core/src/com/google/gwt/dev/shell/log/SwingLoggerPanel.java
@@ -386,14 +386,18 @@ public void onCloseRequest() {
root = new DefaultMutableTreeNode();
treeModel = new DefaultTreeModel(root);
treeModel.addTreeModelListener(new TreeModelListener() {
- @Override public void treeNodesInserted(TreeModelEvent e) {
+ @Override
+ public void treeNodesInserted(TreeModelEvent e) {
for (Object treeNode : e.getChildren()) {
onTreeNodeAdded((DefaultMutableTreeNode) treeNode);
}
}
- @Override public void treeStructureChanged(TreeModelEvent e) { }
- @Override public void treeNodesRemoved(TreeModelEvent e) { }
- @Override public void treeNodesChanged(TreeModelEvent e) { }
+ @Override
+ public void treeStructureChanged(TreeModelEvent e) { }
+ @Override
+ public void treeNodesRemoved(TreeModelEvent e) { }
+ @Override
+ public void treeNodesChanged(TreeModelEvent e) { }
});
tree = new JTree(treeModel);
tree.setRootVisible(false);
diff --git a/dev/core/src/com/google/gwt/dev/shell/remoteui/RemoteMessageProto.java b/dev/core/src/com/google/gwt/dev/shell/remoteui/RemoteMessageProto.java
index 70882045e9d..5be9de84f56 100644
--- a/dev/core/src/com/google/gwt/dev/shell/remoteui/RemoteMessageProto.java
+++ b/dev/core/src/com/google/gwt/dev/shell/remoteui/RemoteMessageProto.java
@@ -3,6 +3,9 @@
package com.google.gwt.dev.shell.remoteui;
+import javax.annotation.processing.Generated;
+
+@Generated("remotemessage.proto")
public final class RemoteMessageProto {
private RemoteMessageProto() {}
public static void registerAllExtensions(
diff --git a/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerMethodNameDisplayMode.java b/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerMethodNameDisplayMode.java
index b2489171815..d8f2cfd4583 100644
--- a/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerMethodNameDisplayMode.java
+++ b/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerMethodNameDisplayMode.java
@@ -45,6 +45,7 @@ public boolean isExperimental() {
return true;
}
+ @Override
public void setValue(Mode value) {
if (option.getMethodNameDisplayMode() != value) {
option.setMethodNameDisplayMode(value);
diff --git a/dev/core/src/com/google/gwt/dev/util/collect/HashMap.java b/dev/core/src/com/google/gwt/dev/util/collect/HashMap.java
index ce682ad3c70..0478f498a26 100644
--- a/dev/core/src/com/google/gwt/dev/util/collect/HashMap.java
+++ b/dev/core/src/com/google/gwt/dev/util/collect/HashMap.java
@@ -593,7 +593,8 @@ protected void doWriteObject(ObjectOutputStream out) throws IOException {
}
Arrays.sort(idx, new Comparator() {
@SuppressWarnings({"rawtypes", "unchecked"})
- @Override public int compare(final Integer o1, final Integer o2) {
+ @Override
+ public int compare(final Integer o1, final Integer o2) {
Comparable c1 = (Comparable)(keys[o1]);
Comparable c2 = (Comparable)(keys[o2]);
if (c1 == null) {
diff --git a/dev/core/src/com/google/gwt/dev/util/log/AbstractTreeLogger.java b/dev/core/src/com/google/gwt/dev/util/log/AbstractTreeLogger.java
index a6f0fc08940..90f939de3ce 100644
--- a/dev/core/src/com/google/gwt/dev/util/log/AbstractTreeLogger.java
+++ b/dev/core/src/com/google/gwt/dev/util/log/AbstractTreeLogger.java
@@ -322,6 +322,7 @@ protected abstract void doCommitBranch(
protected abstract void doLog(int indexOfLogEntryWithinParentLogger,
TreeLogger.Type type, String msg, Throwable caught, HelpInfo helpInfo);
+ @Override
public void setAmount(MetricName name, long amount) {
metricMap.setAmount(name, amount);
}
diff --git a/dev/core/src/com/google/gwt/dev/util/log/MetricMap.java b/dev/core/src/com/google/gwt/dev/util/log/MetricMap.java
index a5c4118dd54..516c5698ca2 100644
--- a/dev/core/src/com/google/gwt/dev/util/log/MetricMap.java
+++ b/dev/core/src/com/google/gwt/dev/util/log/MetricMap.java
@@ -33,6 +33,7 @@ public class MetricMap implements CanUpdateMetrics {
MetricMap() {
}
+ @Override
public synchronized void setAmount(MetricName name, long amount) {
map.put(name.key, amount);
}
diff --git a/dev/core/src/com/google/gwt/dev/util/msg/Message0.java b/dev/core/src/com/google/gwt/dev/util/msg/Message0.java
index 5a9c6f30f10..cb8cc079e78 100644
--- a/dev/core/src/com/google/gwt/dev/util/msg/Message0.java
+++ b/dev/core/src/com/google/gwt/dev/util/msg/Message0.java
@@ -27,10 +27,12 @@ public Message0(Type type, String fmt) {
super(type, fmt, 0);
}
+ @Override
public TreeLogger branch(TreeLogger logger, Throwable caught) {
return super.branch(logger, caught);
}
+ @Override
public void log(TreeLogger logger, Throwable caught) {
super.log(logger, caught);
}
diff --git a/dev/core/test/com/google/gwt/dev/javac/BinaryTypeReferenceRestrictionsCheckerTest.java b/dev/core/test/com/google/gwt/dev/javac/BinaryTypeReferenceRestrictionsCheckerTest.java
index f6e7bc1b4b3..affef2714a3 100644
--- a/dev/core/test/com/google/gwt/dev/javac/BinaryTypeReferenceRestrictionsCheckerTest.java
+++ b/dev/core/test/com/google/gwt/dev/javac/BinaryTypeReferenceRestrictionsCheckerTest.java
@@ -69,7 +69,8 @@ public IBinaryAnnotation[] getAnnotations() {
return null;
}
- @Override public IBinaryTypeAnnotation[] getTypeAnnotations() {
+ @Override
+ public IBinaryTypeAnnotation[] getTypeAnnotations() {
return new IBinaryTypeAnnotation[0];
}
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/FullCompileTestBase.java b/dev/core/test/com/google/gwt/dev/jjs/impl/FullCompileTestBase.java
index 886c470201f..927644b1609 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/FullCompileTestBase.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/FullCompileTestBase.java
@@ -113,6 +113,7 @@ public CharSequence getContent() {
abstract protected void optimizeJava();
+ @Override
protected CompilerContext provideCompilerContext() {
CompilerContext compilerContext = new CompilerContext.Builder().build();
compilerContext.getOptions().setSourceLevel(sourceLevel);
diff --git a/dev/core/test/com/google/gwt/dev/js/CoverageInstrumentorTest.java b/dev/core/test/com/google/gwt/dev/js/CoverageInstrumentorTest.java
index b4525fdca94..18354f41137 100644
--- a/dev/core/test/com/google/gwt/dev/js/CoverageInstrumentorTest.java
+++ b/dev/core/test/com/google/gwt/dev/js/CoverageInstrumentorTest.java
@@ -76,7 +76,8 @@ private Multimap parse(String code) throws Exception {
final SourceInfo info = program.createSourceInfo(++i, "Test.java");
statement.setSourceInfo(info);
new CoverageVisitor(instrumentableLines.keySet()) {
- @Override public void endVisit(JsExpression x, JsContext ctx) {
+ @Override
+ public void endVisit(JsExpression x, JsContext ctx) {
x.setSourceInfo(info);
}
}.accept(statement);
diff --git a/dev/core/test/com/google/gwt/dev/util/UnitTestTreeLogger.java b/dev/core/test/com/google/gwt/dev/util/UnitTestTreeLogger.java
index 01b1c0afeb7..8b3f549f74f 100644
--- a/dev/core/test/com/google/gwt/dev/util/UnitTestTreeLogger.java
+++ b/dev/core/test/com/google/gwt/dev/util/UnitTestTreeLogger.java
@@ -150,6 +150,7 @@ public Type getType() {
return type;
}
+ @Override
public boolean equals(Object other) {
if (!(other instanceof LogEntry)) {
return false;
@@ -161,6 +162,7 @@ public String getMessageOrPattern() {
return this.msg == null ? this.msgPattern.toString() : this.msg;
}
+ @Override
public int hashCode() {
return toString().hashCode();
}
diff --git a/tools/api-checker/src/com/google/gwt/tools/apichecker/ApiAbstractMethod.java b/tools/api-checker/src/com/google/gwt/tools/apichecker/ApiAbstractMethod.java
index 6bd042b88bf..528071785ef 100644
--- a/tools/api-checker/src/com/google/gwt/tools/apichecker/ApiAbstractMethod.java
+++ b/tools/api-checker/src/com/google/gwt/tools/apichecker/ApiAbstractMethod.java
@@ -73,6 +73,7 @@ public ApiAbstractMethod(JAbstractMethod method, ApiClass apiClass) {
this.apiClass = apiClass;
}
+ @Override
public int compareTo(ApiAbstractMethod other) {
return getRelativeSignature().compareTo(other.getRelativeSignature());
}
@@ -97,6 +98,7 @@ public JAbstractMethod getMethod() {
return method;
}
+ @Override
public String getRelativeSignature() {
if (relativeSignature == null) {
relativeSignature = computeRelativeSignature();
diff --git a/tools/api-checker/src/com/google/gwt/tools/apichecker/ApiChange.java b/tools/api-checker/src/com/google/gwt/tools/apichecker/ApiChange.java
index 1aae13c0621..2af36d15152 100644
--- a/tools/api-checker/src/com/google/gwt/tools/apichecker/ApiChange.java
+++ b/tools/api-checker/src/com/google/gwt/tools/apichecker/ApiChange.java
@@ -97,6 +97,7 @@ public ApiChange(ApiElement element, Status status, String message) {
this.message = message;
}
+ @Override
public int compareTo(ApiChange arg0) {
return this.toString().compareTo(arg0.toString());
}
diff --git a/tools/api-checker/src/com/google/gwt/tools/apichecker/ApiClass.java b/tools/api-checker/src/com/google/gwt/tools/apichecker/ApiClass.java
index ef714cec915..d3fa0c196db 100644
--- a/tools/api-checker/src/com/google/gwt/tools/apichecker/ApiClass.java
+++ b/tools/api-checker/src/com/google/gwt/tools/apichecker/ApiClass.java
@@ -81,6 +81,7 @@ public static enum MethodType {
isInstantiableApiClass = apiContainer.isInstantiableApiClass(classType);
}
+ @Override
public int compareTo(ApiClass other) {
return getName().compareTo(other.getName());
}
@@ -93,6 +94,7 @@ public boolean equals(Object o) {
return this.getName().equals(((ApiClass) o).getName());
}
+ @Override
public String getRelativeSignature() {
return classType.getQualifiedSourceName();
}
diff --git a/tools/api-checker/src/com/google/gwt/tools/apichecker/ApiClassDiffGenerator.java b/tools/api-checker/src/com/google/gwt/tools/apichecker/ApiClassDiffGenerator.java
index f9460a83954..fe4359c52ab 100644
--- a/tools/api-checker/src/com/google/gwt/tools/apichecker/ApiClassDiffGenerator.java
+++ b/tools/api-checker/src/com/google/gwt/tools/apichecker/ApiClassDiffGenerator.java
@@ -86,11 +86,7 @@ static String printSetWithHashCode(Set set, String identifier) {
}
}
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Comparable#compareTo(java.lang.Object)
- */
+ @Override
public int compareTo(ApiClassDiffGenerator other) {
return getName().compareTo(other.getName());
}
diff --git a/tools/api-checker/src/com/google/gwt/tools/apichecker/ApiField.java b/tools/api-checker/src/com/google/gwt/tools/apichecker/ApiField.java
index 73a8ea45194..d60a1e2b098 100644
--- a/tools/api-checker/src/com/google/gwt/tools/apichecker/ApiField.java
+++ b/tools/api-checker/src/com/google/gwt/tools/apichecker/ApiField.java
@@ -43,6 +43,7 @@ static String computeApiSignature(JField tempField) {
this.apiClass = apiClass;
}
+ @Override
public int compareTo(ApiField other) {
return getRelativeSignature().compareTo(other.getRelativeSignature());
}
@@ -63,6 +64,7 @@ public ApiClass getApiClass() {
return apiClass;
}
+ @Override
public String getRelativeSignature() {
if (relativeSignature == null) {
relativeSignature = computeRelativeSignature();
diff --git a/tools/api-checker/src/com/google/gwt/tools/apichecker/ApiPackage.java b/tools/api-checker/src/com/google/gwt/tools/apichecker/ApiPackage.java
index 34aa1b741b6..1d69f513b7e 100644
--- a/tools/api-checker/src/com/google/gwt/tools/apichecker/ApiPackage.java
+++ b/tools/api-checker/src/com/google/gwt/tools/apichecker/ApiPackage.java
@@ -48,6 +48,7 @@ final class ApiPackage implements Comparable, ApiElement {
initialize();
}
+ @Override
public int compareTo(ApiPackage other) {
return this.getName().compareTo(other.getName());
}
@@ -60,6 +61,7 @@ public boolean equals(Object o) {
return this.getName().equals(((ApiPackage) o).getName());
}
+ @Override
public String getRelativeSignature() {
return name;
}
diff --git a/tools/api-checker/src/com/google/gwt/tools/apichecker/ApiPackageDiffGenerator.java b/tools/api-checker/src/com/google/gwt/tools/apichecker/ApiPackageDiffGenerator.java
index e52b2981963..bf0b7405098 100644
--- a/tools/api-checker/src/com/google/gwt/tools/apichecker/ApiPackageDiffGenerator.java
+++ b/tools/api-checker/src/com/google/gwt/tools/apichecker/ApiPackageDiffGenerator.java
@@ -50,6 +50,7 @@ final class ApiPackageDiffGenerator implements Comparable
-
+
diff --git a/user/src/com/google/gwt/activity/shared/AbstractActivity.java b/user/src/com/google/gwt/activity/shared/AbstractActivity.java
index 51f3abd3035..9007de8a3bb 100644
--- a/user/src/com/google/gwt/activity/shared/AbstractActivity.java
+++ b/user/src/com/google/gwt/activity/shared/AbstractActivity.java
@@ -21,13 +21,16 @@
*/
public abstract class AbstractActivity implements Activity {
+ @Override
public String mayStop() {
return null;
}
+ @Override
public void onCancel() {
}
+ @Override
public void onStop() {
}
}
diff --git a/user/src/com/google/gwt/activity/shared/ActivityManager.java b/user/src/com/google/gwt/activity/shared/ActivityManager.java
index cc56355cea9..e6d00274516 100644
--- a/user/src/com/google/gwt/activity/shared/ActivityManager.java
+++ b/user/src/com/google/gwt/activity/shared/ActivityManager.java
@@ -45,6 +45,7 @@ private class ProtectedDisplay implements AcceptsOneWidget {
this.activity = activity;
}
+ @Override
public void setWidget(IsWidget view) {
if (this.activity == ActivityManager.this.currentActivity) {
startingNext = false;
@@ -54,6 +55,7 @@ public void setWidget(IsWidget view) {
}
private static final Activity NULL_ACTIVITY = new AbstractActivity() {
+ @Override
public void start(AcceptsOneWidget panel, com.google.gwt.event.shared.EventBus eventBus) {
}
};
@@ -112,6 +114,7 @@ public EventBus getActiveEventBus() {
* this by providing a widget immediately, with some kind of "loading"
* treatment.
*/
+ @Override
public void onPlaceChange(PlaceChangeEvent event) {
Activity nextActivity = getNextActivity(event);
@@ -174,6 +177,7 @@ public void onPlaceChange(PlaceChangeEvent event) {
*
* @see com.google.gwt.place.shared.PlaceChangeRequestEvent.Handler#onPlaceChangeRequest(PlaceChangeRequestEvent)
*/
+ @Override
public void onPlaceChangeRequest(PlaceChangeRequestEvent event) {
event.setWarning(currentActivity.mayStop());
}
@@ -257,6 +261,7 @@ private void updateHandlers(boolean activate) {
eventBus.addHandler(PlaceChangeRequestEvent.TYPE, this);
this.handlerRegistration = new HandlerRegistration() {
+ @Override
public void removeHandler() {
placeReg.removeHandler();
placeRequestReg.removeHandler();
diff --git a/user/src/com/google/gwt/activity/shared/CachingActivityMapper.java b/user/src/com/google/gwt/activity/shared/CachingActivityMapper.java
index 8f0a5705f61..5f6f3f8513c 100644
--- a/user/src/com/google/gwt/activity/shared/CachingActivityMapper.java
+++ b/user/src/com/google/gwt/activity/shared/CachingActivityMapper.java
@@ -37,6 +37,7 @@ public CachingActivityMapper(ActivityMapper wrapped) {
this.wrapped = wrapped;
}
+ @Override
public Activity getActivity(Place place) {
if (!place.equals(lastPlace)) {
lastPlace = place;
diff --git a/user/src/com/google/gwt/activity/shared/FilteredActivityMapper.java b/user/src/com/google/gwt/activity/shared/FilteredActivityMapper.java
index 5833263f2f6..0546deced66 100644
--- a/user/src/com/google/gwt/activity/shared/FilteredActivityMapper.java
+++ b/user/src/com/google/gwt/activity/shared/FilteredActivityMapper.java
@@ -50,6 +50,7 @@ public FilteredActivityMapper(Filter filter, ActivityMapper wrapped) {
this.wrapped = wrapped;
}
+ @Override
public Activity getActivity(Place place) {
return wrapped.getActivity(filter.filter(place));
}
diff --git a/user/src/com/google/gwt/animation/client/AnimationSchedulerImplStandard.java b/user/src/com/google/gwt/animation/client/AnimationSchedulerImplStandard.java
index 42d3d4f32e7..ea97216f0d9 100644
--- a/user/src/com/google/gwt/animation/client/AnimationSchedulerImplStandard.java
+++ b/user/src/com/google/gwt/animation/client/AnimationSchedulerImplStandard.java
@@ -27,7 +27,8 @@ class AnimationSchedulerImplStandard extends AnimationScheduler {
public AnimationHandle requestAnimationFrame(AnimationCallback callback, Element element) {
final JavaScriptObject handle = requestImpl(callback, element);
return new AnimationHandle() {
- @Override public void cancel() {
+ @Override
+ public void cancel() {
cancelImpl(handle);
}
};
diff --git a/user/src/com/google/gwt/cell/client/AbstractCell.java b/user/src/com/google/gwt/cell/client/AbstractCell.java
index 68899f92363..1081b179c44 100644
--- a/user/src/com/google/gwt/cell/client/AbstractCell.java
+++ b/user/src/com/google/gwt/cell/client/AbstractCell.java
@@ -80,14 +80,17 @@ public AbstractCell(Set consumedEvents) {
init(consumedEvents);
}
+ @Override
public boolean dependsOnSelection() {
return false;
}
+ @Override
public Set getConsumedEvents() {
return consumedEvents;
}
+ @Override
public boolean handlesSelection() {
return false;
}
@@ -96,6 +99,7 @@ public boolean handlesSelection() {
* Returns false. Subclasses that support editing should override this method
* to return the current editing status.
*/
+ @Override
public boolean isEditing(Context context, Element parent, C value) {
return false;
}
@@ -108,6 +112,7 @@ public boolean isEditing(Context context, Element parent, C value) {
* event types that the cell expects into the constructor.
*
*/
+ @Override
public void onBrowserEvent(Context context, Element parent, C value,
NativeEvent event, ValueUpdater valueUpdater) {
String eventType = event.getType();
@@ -117,6 +122,7 @@ public void onBrowserEvent(Context context, Element parent, C value,
}
}
+ @Override
public abstract void render(Context context, C value, SafeHtmlBuilder sb);
/**
@@ -128,10 +134,12 @@ public void onBrowserEvent(Context context, Element parent, C value,
* containing widget is refreshed.
*
*/
+ @Override
public boolean resetFocus(Context context, Element parent, C value) {
return false;
}
+ @Override
public void setValue(Context context, Element parent, C value) {
SafeHtmlBuilder sb = new SafeHtmlBuilder();
render(context, value, sb);
diff --git a/user/src/com/google/gwt/cell/client/DatePickerCell.java b/user/src/com/google/gwt/cell/client/DatePickerCell.java
index 00ef9da581a..38820c693ae 100644
--- a/user/src/com/google/gwt/cell/client/DatePickerCell.java
+++ b/user/src/com/google/gwt/cell/client/DatePickerCell.java
@@ -133,6 +133,7 @@ protected void onPreviewNativeEvent(NativePreviewEvent event) {
}
};
panel.addCloseHandler(new CloseHandler() {
+ @Override
public void onClose(CloseEvent event) {
lastKey = null;
lastValue = null;
@@ -150,6 +151,7 @@ public void onClose(CloseEvent event) {
// Hide the panel and call valueUpdater.update when a date is selected
datePicker.addValueChangeHandler(new ValueChangeHandler() {
+ @Override
public void onValueChange(ValueChangeEvent event) {
// Remember the values before hiding the popup.
Element cellParent = lastParent;
@@ -227,6 +229,7 @@ protected void onEnterKeyDown(Context context, Element parent, Date value,
datePicker.setCurrentMonth(date);
datePicker.setValue(date);
panel.setPopupPositionAndShow(new PositionCallback() {
+ @Override
public void setPosition(int offsetWidth, int offsetHeight) {
panel.setPopupPosition(lastParent.getAbsoluteLeft() + offsetX,
lastParent.getAbsoluteTop() + offsetY);
diff --git a/user/src/com/google/gwt/cell/client/IconCellDecorator.java b/user/src/com/google/gwt/cell/client/IconCellDecorator.java
index 365bee0b052..cbc4ea60710 100644
--- a/user/src/com/google/gwt/cell/client/IconCellDecorator.java
+++ b/user/src/com/google/gwt/cell/client/IconCellDecorator.java
@@ -115,28 +115,34 @@ public IconCellDecorator(ImageResource icon, Cell cell, VerticalAlignmentCons
SafeStylesUtils.fromTrustedString("padding-" + direction + ": " + imageWidth + "px;");
}
+ @Override
public boolean dependsOnSelection() {
return cell.dependsOnSelection();
}
+ @Override
public Set getConsumedEvents() {
return cell.getConsumedEvents();
}
+ @Override
public boolean handlesSelection() {
return cell.handlesSelection();
}
+ @Override
public boolean isEditing(Context context, Element parent, C value) {
return cell.isEditing(context, getCellParent(parent), value);
}
+ @Override
public void onBrowserEvent(Context context, Element parent, C value,
NativeEvent event, ValueUpdater valueUpdater) {
cell.onBrowserEvent(context, getCellParent(parent), value, event,
valueUpdater);
}
+ @Override
public void render(Context context, C value, SafeHtmlBuilder sb) {
SafeHtmlBuilder cellBuilder = new SafeHtmlBuilder();
cell.render(context, value, cellBuilder);
@@ -144,10 +150,12 @@ public void render(Context context, C value, SafeHtmlBuilder sb) {
: placeHolderHtml, cellBuilder.toSafeHtml()));
}
+ @Override
public boolean resetFocus(Context context, Element parent, C value) {
return cell.resetFocus(context, getCellParent(parent), value);
}
+ @Override
public void setValue(Context context, Element parent, C value) {
cell.setValue(context, getCellParent(parent), value);
}
diff --git a/user/src/com/google/gwt/cell/client/ImageLoadingCell.java b/user/src/com/google/gwt/cell/client/ImageLoadingCell.java
index 236980b1832..a067b7db613 100644
--- a/user/src/com/google/gwt/cell/client/ImageLoadingCell.java
+++ b/user/src/com/google/gwt/cell/client/ImageLoadingCell.java
@@ -91,6 +91,7 @@ public static class DefaultRenderers implements Renderers {
public DefaultRenderers() {
if (IMAGE_RENDERER == null) {
IMAGE_RENDERER = new AbstractSafeHtmlRenderer() {
+ @Override
public SafeHtml render(String object) {
return template.img(object);
}
@@ -101,6 +102,7 @@ public SafeHtml render(String object) {
ImageResource res = resources.loading();
final SafeHtml loadingHtml = AbstractImagePrototype.create(res).getSafeHtml();
LOADING_RENDERER = new AbstractSafeHtmlRenderer() {
+ @Override
public SafeHtml render(String object) {
return loadingHtml;
}
@@ -113,6 +115,7 @@ public SafeHtml render(String object) {
*
* @return a {@link SafeHtmlRenderer SafeHtmlRenderer} instance
*/
+ @Override
public SafeHtmlRenderer getErrorRenderer() {
// Show the broken image on error.
return getImageRenderer();
@@ -123,6 +126,7 @@ public SafeHtmlRenderer getErrorRenderer() {
*
* @return a {@link SafeHtmlRenderer SafeHtmlRenderer} instance
*/
+ @Override
public SafeHtmlRenderer getImageRenderer() {
return IMAGE_RENDERER;
}
@@ -132,6 +136,7 @@ public SafeHtmlRenderer getImageRenderer() {
*
* @return a {@link SafeHtmlRenderer SafeHtmlRenderer} instance
*/
+ @Override
public SafeHtmlRenderer getLoadingRenderer() {
return LOADING_RENDERER;
}
diff --git a/user/src/com/google/gwt/codegen/rebind/GwtCodeGenContext.java b/user/src/com/google/gwt/codegen/rebind/GwtCodeGenContext.java
index 7c04f43aec2..371bc7ac5d9 100644
--- a/user/src/com/google/gwt/codegen/rebind/GwtCodeGenContext.java
+++ b/user/src/com/google/gwt/codegen/rebind/GwtCodeGenContext.java
@@ -43,10 +43,12 @@ public GwtCodeGenContext(TreeLogger logger, GeneratorContext ctx) {
this.ctx = ctx;
}
+ @Override
public JavaSourceWriterBuilder addClass(String pkgName, String className) {
return addClass(null, pkgName, className);
}
+ @Override
public JavaSourceWriterBuilder addClass(String superPath, String pkgName, String className) {
String superPkg = superPath == null ? pkgName : superPath + "." + pkgName;
final PrintWriter pw = ctx.tryCreate(logger, superPkg, className);
@@ -63,26 +65,32 @@ protected void onClose(boolean aborted) {
}, pkgName, className);
}
+ @Override
public void error(String msg) {
logger.log(TreeLogger.ERROR, msg);
}
+ @Override
public void error(String msg, Throwable cause) {
logger.log(TreeLogger.ERROR, msg, cause);
}
+ @Override
public void error(Throwable cause) {
logger.log(TreeLogger.ERROR, cause.getMessage(), cause);
}
+ @Override
public void warn(String msg) {
logger.log(TreeLogger.WARN, msg);
}
+ @Override
public void warn(String msg, Throwable cause) {
logger.log(TreeLogger.WARN, msg, cause);
}
+ @Override
public void warn(Throwable cause) {
logger.log(TreeLogger.WARN, cause.getMessage(), cause);
}
diff --git a/user/src/com/google/gwt/codegen/server/LoggingCodeGenContext.java b/user/src/com/google/gwt/codegen/server/LoggingCodeGenContext.java
index 59801951b8a..ac33988c8c3 100644
--- a/user/src/com/google/gwt/codegen/server/LoggingCodeGenContext.java
+++ b/user/src/com/google/gwt/codegen/server/LoggingCodeGenContext.java
@@ -40,33 +40,41 @@ protected LoggingCodeGenContext(Logger logger) {
this.logger = logger;
}
+ @Override
public JavaSourceWriterBuilder addClass(String pkgName, String className) {
return addClass(null, pkgName, className);
}
+ @Override
public abstract JavaSourceWriterBuilder addClass(String superPkg, String pkgName,
String className);
+ @Override
public void error(String msg) {
logger.log(Level.SEVERE, msg);
}
+ @Override
public void error(String msg, Throwable cause) {
logger.log(Level.SEVERE, msg, cause);
}
+ @Override
public void error(Throwable cause) {
logger.log(Level.SEVERE, cause.getMessage(), cause);
}
+ @Override
public void warn(String msg) {
logger.log(Level.WARNING, msg);
}
+ @Override
public void warn(String msg, Throwable cause) {
logger.log(Level.WARNING, msg);
}
+ @Override
public void warn(Throwable cause) {
logger.log(Level.WARNING, cause.getMessage(), cause);
}
diff --git a/user/src/com/google/gwt/codegen/server/SourceWriterBase.java b/user/src/com/google/gwt/codegen/server/SourceWriterBase.java
index d5c9def8c10..002b662e9ce 100644
--- a/user/src/com/google/gwt/codegen/server/SourceWriterBase.java
+++ b/user/src/com/google/gwt/codegen/server/SourceWriterBase.java
@@ -32,43 +32,52 @@ public abstract class SourceWriterBase implements SourceWriter {
private int indent;
+ @Override
public abstract void abort();
+ @Override
public void beginJavaDocComment() {
println("\n/**");
inComment = true;
}
+ @Override
public void close() {
outdent();
println("}");
}
+ @Override
public void endJavaDocComment() {
inComment = false;
println("\n */");
}
+ @Override
public void indent() {
indent++;
}
+ @Override
public void indentln(String string) {
indent();
println(string);
outdent();
}
+ @Override
public void indentln(String format, Object... args) {
indentln(String.format(format, args));
}
+ @Override
public void outdent() {
if (indent > 0) {
--indent;
}
}
+ @Override
public void print(String s) {
// If we just printed a newline, print an indent.
//
@@ -98,20 +107,24 @@ public void print(String s) {
}
}
+ @Override
public void print(String format, Object... args) {
print(String.format(format, args));
}
+ @Override
public void println() {
print("\n");
atStart = true;
}
+ @Override
public void println(String string) {
print(string);
println();
}
+ @Override
public void println(String format, Object... args) {
println(String.format(format, args));
}
diff --git a/user/src/com/google/gwt/core/client/GWT.java b/user/src/com/google/gwt/core/client/GWT.java
index bdcd1ca1355..7ba9aa62229 100644
--- a/user/src/com/google/gwt/core/client/GWT.java
+++ b/user/src/com/google/gwt/core/client/GWT.java
@@ -278,7 +278,8 @@ public static void runAsync(final RunAsyncCallback callback) {
private static void runAsyncImpl(final RunAsyncCallback callback) {
Scheduler.get().scheduleDeferred(new ScheduledCommand() {
- @Override public void execute() {
+ @Override
+ public void execute() {
callback.onSuccess();
}
});
diff --git a/user/src/com/google/gwt/core/client/impl/CrossSiteLoadingStrategy.java b/user/src/com/google/gwt/core/client/impl/CrossSiteLoadingStrategy.java
index 4413e99a897..f8c53e3f51b 100644
--- a/user/src/com/google/gwt/core/client/impl/CrossSiteLoadingStrategy.java
+++ b/user/src/com/google/gwt/core/client/impl/CrossSiteLoadingStrategy.java
@@ -136,6 +136,7 @@ private static native void setOnSuccess(int fragment, JavaScriptObject callback)
private final IntToIntMap serialNumbers = IntToIntMap.create();
+ @Override
public void startLoadingFragment(int fragment,
LoadTerminatedHandler loadFinishedHandler) {
JavaScriptObject tag = createScriptTag(getUrl(fragment));
diff --git a/user/src/com/google/gwt/core/client/impl/SchedulerImpl.java b/user/src/com/google/gwt/core/client/impl/SchedulerImpl.java
index 3df5cdad636..b0d41958561 100644
--- a/user/src/com/google/gwt/core/client/impl/SchedulerImpl.java
+++ b/user/src/com/google/gwt/core/client/impl/SchedulerImpl.java
@@ -73,6 +73,7 @@ public native boolean isRepeating() /*-{
* Calls {@link SchedulerImpl#flushPostEventPumpCommands()}.
*/
private final class Flusher implements RepeatingCommand {
+ @Override
public boolean execute() {
flushRunning = true;
flushPostEventPumpCommands();
@@ -90,6 +91,7 @@ public boolean execute() {
* Keeps {@link Flusher} running.
*/
private final class Rescuer implements RepeatingCommand {
+ @Override
public boolean execute() {
if (flushRunning) {
/*
diff --git a/user/src/com/google/gwt/core/server/StackTraceDeobfuscator.java b/user/src/com/google/gwt/core/server/StackTraceDeobfuscator.java
index 25d851c7c0c..9413906b7d5 100644
--- a/user/src/com/google/gwt/core/server/StackTraceDeobfuscator.java
+++ b/user/src/com/google/gwt/core/server/StackTraceDeobfuscator.java
@@ -57,6 +57,7 @@ public static StackTraceDeobfuscator fromResource(String symbolMapsPath) {
final String basePath = symbolMapsPath.endsWith("/") ? symbolMapsPath : symbolMapsPath + "/";
final ClassLoader classLoader = StackTraceDeobfuscator.class.getClassLoader();
return new StackTraceDeobfuscator() {
+ @Override
protected InputStream openInputStream(String fileName) throws IOException {
String filePath = basePath + fileName;
InputStream inputStream = classLoader.getResourceAsStream(filePath);
@@ -73,6 +74,7 @@ protected InputStream openInputStream(String fileName) throws IOException {
*/
public static StackTraceDeobfuscator fromFileSystem(final String symbolMapsDirectory) {
return new StackTraceDeobfuscator() {
+ @Override
protected InputStream openInputStream(String fileName) throws IOException {
return new FileInputStream(new File(symbolMapsDirectory, fileName));
}
@@ -84,6 +86,7 @@ protected InputStream openInputStream(String fileName) throws IOException {
*/
public static StackTraceDeobfuscator fromUrl(final URL urlPath) {
return new StackTraceDeobfuscator() {
+ @Override
protected InputStream openInputStream(String fileName) throws IOException {
return new URL(urlPath, fileName).openStream();
}
diff --git a/user/src/com/google/gwt/dom/client/StyleInjector.java b/user/src/com/google/gwt/dom/client/StyleInjector.java
index bfef84296d9..718bad41b73 100644
--- a/user/src/com/google/gwt/dom/client/StyleInjector.java
+++ b/user/src/com/google/gwt/dom/client/StyleInjector.java
@@ -95,6 +95,7 @@ private HeadElement getHead() {
private static final JsArrayString toInjectAtStart = JavaScriptObject.createArray().cast();
private static ScheduledCommand flusher = new ScheduledCommand() {
+ @Override
public void execute() {
if (needsInjection) {
flush(null);
diff --git a/user/src/com/google/gwt/editor/client/SimpleBeanEditorDriver.java b/user/src/com/google/gwt/editor/client/SimpleBeanEditorDriver.java
index 6dffc9e980e..b8431cf043d 100644
--- a/user/src/com/google/gwt/editor/client/SimpleBeanEditorDriver.java
+++ b/user/src/com/google/gwt/editor/client/SimpleBeanEditorDriver.java
@@ -57,6 +57,7 @@ public interface SimpleBeanEditorDriver> extends
* @return the object passed into {@link #edit(Object)}
* @throws IllegalStateException if {@link #edit(Object)} has not been called
*/
+ @Override
T flush();
/**
diff --git a/user/src/com/google/gwt/editor/client/adapters/ListEditor.java b/user/src/com/google/gwt/editor/client/adapters/ListEditor.java
index cdb099ea2cc..88b33deffa1 100644
--- a/user/src/com/google/gwt/editor/client/adapters/ListEditor.java
+++ b/user/src/com/google/gwt/editor/client/adapters/ListEditor.java
@@ -65,10 +65,12 @@ protected ListEditor(EditorSource source) {
*
* @return an {@link Editor} of type E
*/
+ @Override
public E createEditorForTraversal() {
return editorSource.createEditorForTraversal();
}
+ @Override
public void flush() {
if (list != null) {
list.flush();
@@ -118,16 +120,20 @@ public List getList() {
return list;
}
+ @Override
public String getPathElement(E subEditor) {
return "[" + list.getEditors().indexOf(subEditor) + "]";
}
+ @Override
public void onPropertyChange(String... paths) {
}
+ @Override
public void setDelegate(EditorDelegate> delegate) {
}
+ @Override
public void setEditorChain(CompositeEditor.EditorChain chain) {
this.chain = chain;
}
@@ -140,6 +146,7 @@ public void setEditorChain(CompositeEditor.EditorChain chain) {
*
* @param value a List of data objects of type T
*/
+ @Override
public void setValue(List value) {
if (list == null && value == null) {
// fast exit
diff --git a/user/src/com/google/gwt/editor/client/adapters/OptionalFieldEditor.java b/user/src/com/google/gwt/editor/client/adapters/OptionalFieldEditor.java
index 1791848c83d..ff8a1f32a65 100644
--- a/user/src/com/google/gwt/editor/client/adapters/OptionalFieldEditor.java
+++ b/user/src/com/google/gwt/editor/client/adapters/OptionalFieldEditor.java
@@ -75,10 +75,12 @@ protected OptionalFieldEditor(E subEditor) {
*
* @return an {@link Editor} of type E
*/
+ @Override
public E createEditorForTraversal() {
return subEditor;
}
+ @Override
public void flush() {
currentValue = chain.getValue(subEditor);
}
@@ -86,24 +88,30 @@ public void flush() {
/**
* Returns an empty string because there is only ever one sub-editor used.
*/
+ @Override
public String getPathElement(E subEditor) {
return "";
}
+ @Override
public T getValue() {
return currentValue;
}
+ @Override
public void onPropertyChange(String... paths) {
}
+ @Override
public void setDelegate(EditorDelegate delegate) {
}
+ @Override
public void setEditorChain(EditorChain chain) {
this.chain = chain;
}
+ @Override
public void setValue(T value) {
if (currentValue != null && value == null) {
chain.detach(subEditor);
diff --git a/user/src/com/google/gwt/editor/client/adapters/SimpleEditor.java b/user/src/com/google/gwt/editor/client/adapters/SimpleEditor.java
index d1e88334c48..c702925079d 100644
--- a/user/src/com/google/gwt/editor/client/adapters/SimpleEditor.java
+++ b/user/src/com/google/gwt/editor/client/adapters/SimpleEditor.java
@@ -54,10 +54,12 @@ protected SimpleEditor(T value) {
this.value = value;
}
+ @Override
public T getValue() {
return value;
}
+ @Override
public void setValue(T value) {
this.value = value;
}
diff --git a/user/src/com/google/gwt/editor/client/adapters/TakesValueEditor.java b/user/src/com/google/gwt/editor/client/adapters/TakesValueEditor.java
index 6e455311d8b..176cb4d6744 100644
--- a/user/src/com/google/gwt/editor/client/adapters/TakesValueEditor.java
+++ b/user/src/com/google/gwt/editor/client/adapters/TakesValueEditor.java
@@ -47,10 +47,12 @@ protected TakesValueEditor(TakesValue peer) {
this.peer = peer;
}
+ @Override
public T getValue() {
return peer.getValue();
}
+ @Override
public void setValue(T value) {
peer.setValue(value);
}
diff --git a/user/src/com/google/gwt/editor/client/impl/AbstractEditorContext.java b/user/src/com/google/gwt/editor/client/impl/AbstractEditorContext.java
index 01235524cbb..e5cf26b1b58 100644
--- a/user/src/com/google/gwt/editor/client/impl/AbstractEditorContext.java
+++ b/user/src/com/google/gwt/editor/client/impl/AbstractEditorContext.java
@@ -60,29 +60,36 @@ public AbstractEditorContext(Editor editor, String path) {
? (ValueAwareEditor) editor : null;
}
+ @Override
@SuppressWarnings("unchecked")
public CompositeEditor asCompositeEditor() {
return (CompositeEditor) compositeEditor;
}
+ @Override
public HasEditorDelegate asHasEditorDelegate() {
return hasEditorDelegate;
}
+ @Override
public HasEditorErrors asHasEditorErrors() {
return hasEditorErrors;
}
+ @Override
public LeafValueEditor asLeafValueEditor() {
return leafValueEditor;
}
+ @Override
public ValueAwareEditor asValueAwareEditor() {
return valueAwareEditor;
}
+ @Override
public abstract boolean canSetInModel();
+ @Override
public abstract T checkAssignment(Object value);
@SuppressWarnings(value = {"rawtypes", "unchecked"})
@@ -93,21 +100,26 @@ public void doTraverseSyntheticCompositeEditor(EditorVisitor visitor) {
delegate.getEditorChain().traverse(visitor, subDelegate);
}
+ @Override
public String getAbsolutePath() {
// Not delegate.getPath() since delegate might be null for a leaf editor
return path;
}
+ @Override
public abstract Class getEditedType();
+ @Override
public Editor getEditor() {
return editor;
}
+ @Override
public EditorDelegate getEditorDelegate() {
return delegate;
}
+ @Override
public abstract T getFromModel();
public void halt() {
@@ -122,6 +134,7 @@ public void setEditorDelegate(AbstractEditorDelegate delegate) {
this.delegate = delegate;
}
+ @Override
public abstract void setInModel(T data);
public void traverse(EditorVisitor visitor, AbstractEditorDelegate next) {
@@ -131,6 +144,7 @@ public void traverse(EditorVisitor visitor, AbstractEditorDelegate next) {
visitor.endVisit(this);
}
+ @Override
public void traverseSyntheticCompositeEditor(EditorVisitor visitor) {
if (asCompositeEditor() == null) {
throw new IllegalStateException();
diff --git a/user/src/com/google/gwt/editor/client/impl/AbstractEditorDelegate.java b/user/src/com/google/gwt/editor/client/impl/AbstractEditorDelegate.java
index 583711e6ed5..f8727c30acf 100644
--- a/user/src/com/google/gwt/editor/client/impl/AbstractEditorDelegate.java
+++ b/user/src/com/google/gwt/editor/client/impl/AbstractEditorDelegate.java
@@ -65,6 +65,7 @@ public void accept(EditorVisitor visitor) {
}
}
+ @Override
public void attach(R object, S subEditor) {
AbstractEditorDelegate subDelegate = map.get(subEditor);
@@ -83,10 +84,12 @@ public void attach(R object, S subEditor) {
traverse(createInitializerVisitor(), subDelegate);
}
+ @Override
public void detach(S subEditor) {
map.remove(subEditor);
}
+ @Override
public R getValue(S subEditor) {
AbstractEditorDelegate subDelegate = map.get(subEditor);
if (subDelegate == null) {
@@ -119,6 +122,7 @@ protected static String appendPath(String prefix, String path) {
public abstract T getObject();
+ @Override
public String getPath() {
return path;
}
@@ -130,6 +134,7 @@ public boolean isDirty() {
return dirty;
}
+ @Override
public void recordError(String message, Object value, Object userData) {
EditorError error = new SimpleError(this, message, value, userData);
errors.add(error);
@@ -142,10 +147,12 @@ public void recordError(String message, Object value, Object userData,
errors.add(error);
}
+ @Override
public void setDirty(boolean dirty) {
this.dirty = dirty;
}
+ @Override
public abstract HandlerRegistration subscribe();
/**
diff --git a/user/src/com/google/gwt/editor/client/impl/AbstractSimpleBeanEditorDriver.java b/user/src/com/google/gwt/editor/client/impl/AbstractSimpleBeanEditorDriver.java
index 728190f45b2..f788a252313 100644
--- a/user/src/com/google/gwt/editor/client/impl/AbstractSimpleBeanEditorDriver.java
+++ b/user/src/com/google/gwt/editor/client/impl/AbstractSimpleBeanEditorDriver.java
@@ -28,15 +28,18 @@
public abstract class AbstractSimpleBeanEditorDriver>
extends BaseEditorDriver implements SimpleBeanEditorDriver {
+ @Override
public void edit(T object) {
doEdit(object);
}
+ @Override
public T flush() {
doFlush();
return getObject();
}
+ @Override
public void initialize(E editor) {
doInitialize(editor);
}
diff --git a/user/src/com/google/gwt/editor/client/impl/DelegateMap.java b/user/src/com/google/gwt/editor/client/impl/DelegateMap.java
index b5e22bd3af8..b912e9aa23d 100644
--- a/user/src/com/google/gwt/editor/client/impl/DelegateMap.java
+++ b/user/src/com/google/gwt/editor/client/impl/DelegateMap.java
@@ -49,10 +49,12 @@ public MapIterator(DelegateMap map) {
next();
}
+ @Override
public boolean hasNext() {
return next != null;
}
+ @Override
public AbstractEditorDelegate next() {
AbstractEditorDelegate toReturn = next;
@@ -74,12 +76,14 @@ public boolean hasNext() {
return toReturn;
}
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
}
public static final KeyMethod IDENTITY = new KeyMethod() {
+ @Override
public Object key(Object object) {
return object;
}
@@ -137,6 +141,7 @@ public List> getEditorByPath(String path) {
return map.get(key);
}
+ @Override
public Iterator> iterator() {
return new MapIterator(this);
}
diff --git a/user/src/com/google/gwt/editor/client/impl/SimpleError.java b/user/src/com/google/gwt/editor/client/impl/SimpleError.java
index 83ea7dacdc9..002d1a177b2 100644
--- a/user/src/com/google/gwt/editor/client/impl/SimpleError.java
+++ b/user/src/com/google/gwt/editor/client/impl/SimpleError.java
@@ -52,34 +52,42 @@ class SimpleError implements EditorError {
this.userData = userData;
}
+ @Override
public String getAbsolutePath() {
return absolutePath;
}
+ @Override
public Editor getEditor() {
return editor;
}
+ @Override
public String getMessage() {
return message;
}
+ @Override
public String getPath() {
return absolutePath.substring(pathPrefixLength);
}
+ @Override
public Object getUserData() {
return userData;
}
+ @Override
public Object getValue() {
return value;
}
+ @Override
public boolean isConsumed() {
return consumed;
}
+ @Override
public void setConsumed(boolean consumed) {
this.consumed = consumed;
}
diff --git a/user/src/com/google/gwt/editor/client/impl/SimpleViolation.java b/user/src/com/google/gwt/editor/client/impl/SimpleViolation.java
index 803980fb7c7..c359924e880 100644
--- a/user/src/com/google/gwt/editor/client/impl/SimpleViolation.java
+++ b/user/src/com/google/gwt/editor/client/impl/SimpleViolation.java
@@ -44,18 +44,22 @@ public ConstraintViolationIterable(
this.violations = violations;
}
+ @Override
public Iterator iterator() {
// Use a fresh source iterator each time
final Iterator> source = violations.iterator();
return new Iterator() {
+ @Override
public boolean hasNext() {
return source.hasNext();
}
+ @Override
public SimpleViolation next() {
return new SimpleViolationAdapter(source.next());
}
+ @Override
public void remove() {
source.remove();
}
diff --git a/user/src/com/google/gwt/editor/client/testing/FakeEditorContext.java b/user/src/com/google/gwt/editor/client/testing/FakeEditorContext.java
index c7b1ef67ab6..25ddbbd8c4d 100644
--- a/user/src/com/google/gwt/editor/client/testing/FakeEditorContext.java
+++ b/user/src/com/google/gwt/editor/client/testing/FakeEditorContext.java
@@ -35,6 +35,7 @@ public class FakeEditorContext implements EditorContext {
/**
* Returns {@code null}.
*/
+ @Override
public CompositeEditor asCompositeEditor() {
return null;
}
@@ -42,6 +43,7 @@ public class FakeEditorContext implements EditorContext {
/**
* Returns {@code null}.
*/
+ @Override
public HasEditorDelegate asHasEditorDelegate() {
return null;
}
@@ -49,6 +51,7 @@ public HasEditorDelegate asHasEditorDelegate() {
/**
* Returns {@code null}.
*/
+ @Override
public HasEditorErrors asHasEditorErrors() {
return null;
}
@@ -56,6 +59,7 @@ public HasEditorErrors asHasEditorErrors() {
/**
* Returns {@code null}.
*/
+ @Override
public LeafValueEditor asLeafValueEditor() {
return null;
}
@@ -63,6 +67,7 @@ public LeafValueEditor asLeafValueEditor() {
/**
* Returns {@code null}.
*/
+ @Override
public ValueAwareEditor asValueAwareEditor() {
return null;
}
@@ -70,6 +75,7 @@ public ValueAwareEditor asValueAwareEditor() {
/**
* Returns {@code false}.
*/
+ @Override
public boolean canSetInModel() {
return false;
}
@@ -77,6 +83,7 @@ public boolean canSetInModel() {
/**
* Returns {@code value} via an unchecked generic cast.
*/
+ @Override
@SuppressWarnings("unchecked")
public T checkAssignment(Object value) {
return (T) value;
@@ -85,6 +92,7 @@ public T checkAssignment(Object value) {
/**
* Returns {@link EditorContext#ROOT_PATH}.
*/
+ @Override
public String getAbsolutePath() {
return ROOT_PATH;
}
@@ -92,6 +100,7 @@ public String getAbsolutePath() {
/**
* Returns {@code null}.
*/
+ @Override
public Class getEditedType() {
return null;
}
@@ -99,6 +108,7 @@ public Class getEditedType() {
/**
* Returns {@code null}.
*/
+ @Override
public Editor getEditor() {
return null;
}
@@ -106,6 +116,7 @@ public Editor getEditor() {
/**
* Returns {@code null}.
*/
+ @Override
public EditorDelegate getEditorDelegate() {
return null;
}
@@ -113,6 +124,7 @@ public EditorDelegate getEditorDelegate() {
/**
* Returns {@code null}.
*/
+ @Override
public T getFromModel() {
return null;
}
@@ -120,12 +132,14 @@ public T getFromModel() {
/**
* A no-op.
*/
+ @Override
public void setInModel(T data) {
}
/**
* No-op.
*/
+ @Override
public void traverseSyntheticCompositeEditor(EditorVisitor visitor) {
}
}
diff --git a/user/src/com/google/gwt/editor/client/testing/FakeLeafValueEditor.java b/user/src/com/google/gwt/editor/client/testing/FakeLeafValueEditor.java
index 6a08eff6f76..4f426645d69 100644
--- a/user/src/com/google/gwt/editor/client/testing/FakeLeafValueEditor.java
+++ b/user/src/com/google/gwt/editor/client/testing/FakeLeafValueEditor.java
@@ -25,10 +25,12 @@
public class FakeLeafValueEditor implements LeafValueEditor {
private T value;
+ @Override
public T getValue() {
return value;
}
+ @Override
public void setValue(T value) {
this.value = value;
}
diff --git a/user/src/com/google/gwt/editor/client/testing/MockEditorChain.java b/user/src/com/google/gwt/editor/client/testing/MockEditorChain.java
index c4d1b395704..8ec98bdecd5 100644
--- a/user/src/com/google/gwt/editor/client/testing/MockEditorChain.java
+++ b/user/src/com/google/gwt/editor/client/testing/MockEditorChain.java
@@ -31,16 +31,19 @@ public class MockEditorChain implements
CompositeEditor.EditorChain> {
private Map, Boolean> attached = new HashMap, Boolean>();
+ @Override
public void attach(C object, FakeLeafValueEditor subEditor) {
subEditor.setValue(object);
attached.put(subEditor, true);
}
+ @Override
public void detach(FakeLeafValueEditor subEditor) {
subEditor.setValue(null);
attached.put(subEditor, false);
}
+ @Override
public C getValue(FakeLeafValueEditor subEditor) {
return subEditor.getValue();
}
diff --git a/user/src/com/google/gwt/editor/client/testing/MockEditorDelegate.java b/user/src/com/google/gwt/editor/client/testing/MockEditorDelegate.java
index ba90c7e5e30..7057d1fb47e 100644
--- a/user/src/com/google/gwt/editor/client/testing/MockEditorDelegate.java
+++ b/user/src/com/google/gwt/editor/client/testing/MockEditorDelegate.java
@@ -25,6 +25,7 @@
*/
public class MockEditorDelegate implements EditorDelegate {
private static final HandlerRegistration FAKE_REGISTRATION = new HandlerRegistration() {
+ @Override
public void removeHandler() {
}
};
@@ -35,6 +36,7 @@ public void removeHandler() {
/**
* Returns a zero-length string or the last value passed to {@link #setPath}.
*/
+ @Override
public String getPath() {
return path;
}
@@ -50,6 +52,7 @@ public boolean isDirty() {
/**
* No-op.
*/
+ @Override
public void recordError(String message, Object value, Object userData) {
}
@@ -57,6 +60,7 @@ public void recordError(String message, Object value, Object userData) {
* Records the value of {@code dirty} which can be retrieved from
* {@link #isDirty()}.
*/
+ @Override
public void setDirty(boolean dirty) {
this.dirty = dirty;
}
@@ -71,6 +75,7 @@ public void setPath(String path) {
/**
* Returns a no-op HandlerRegistration instance.
*/
+ @Override
public HandlerRegistration subscribe() {
return FAKE_REGISTRATION;
}
diff --git a/user/src/com/google/gwt/editor/client/testing/MockEditorError.java b/user/src/com/google/gwt/editor/client/testing/MockEditorError.java
index 8c2568c21ef..bf3a95bfd23 100644
--- a/user/src/com/google/gwt/editor/client/testing/MockEditorError.java
+++ b/user/src/com/google/gwt/editor/client/testing/MockEditorError.java
@@ -24,26 +24,32 @@
*/
public class MockEditorError implements EditorError {
+ @Override
public String getAbsolutePath() {
return null;
}
+ @Override
public Editor getEditor() {
return null;
}
+ @Override
public String getMessage() {
return null;
}
+ @Override
public String getPath() {
return null;
}
+ @Override
public Object getUserData() {
return null;
}
+ @Override
public Object getValue() {
return null;
}
@@ -51,6 +57,7 @@ public Object getValue() {
/**
* Always returns false.
*/
+ @Override
public boolean isConsumed() {
return false;
}
@@ -58,6 +65,7 @@ public boolean isConsumed() {
/**
* No-op.
*/
+ @Override
public void setConsumed(boolean consumed) {
}
}
diff --git a/user/src/com/google/gwt/editor/client/testing/MockSimpleBeanEditorDriver.java b/user/src/com/google/gwt/editor/client/testing/MockSimpleBeanEditorDriver.java
index 6e2556c9041..4e559648f15 100644
--- a/user/src/com/google/gwt/editor/client/testing/MockSimpleBeanEditorDriver.java
+++ b/user/src/com/google/gwt/editor/client/testing/MockSimpleBeanEditorDriver.java
@@ -41,12 +41,14 @@ public class MockSimpleBeanEditorDriver> implements
/**
* A no-op method.
*/
+ @Override
public void accept(EditorVisitor visitor) {
}
/**
* Records object.
*/
+ @Override
public void edit(T object) {
this.object = object;
}
@@ -54,6 +56,7 @@ public void edit(T object) {
/**
* Returns null or the last value provided to {@link #edit}.
*/
+ @Override
public T flush() {
return object;
}
@@ -69,6 +72,7 @@ public E getEditor() {
/**
* Returns an empty list.
*/
+ @Override
public List getErrors() {
return Collections.emptyList();
}
@@ -83,6 +87,7 @@ public T getObject() {
/**
* Returns false.
*/
+ @Override
public boolean hasErrors() {
return false;
}
@@ -90,6 +95,7 @@ public boolean hasErrors() {
/**
* Records editor.
*/
+ @Override
public void initialize(E editor) {
this.editor = editor;
}
@@ -97,6 +103,7 @@ public void initialize(E editor) {
/**
* Returns {@code false}.
*/
+ @Override
public boolean isDirty() {
return false;
}
@@ -104,6 +111,7 @@ public boolean isDirty() {
/**
* A no-op method that always returns false.
*/
+ @Override
public boolean setConstraintViolations(
Iterable> violations) {
return false;
diff --git a/user/src/com/google/gwt/editor/ui/client/ValueBoxEditorDecorator.java b/user/src/com/google/gwt/editor/ui/client/ValueBoxEditorDecorator.java
index 226d9120845..3044243e2d2 100644
--- a/user/src/com/google/gwt/editor/ui/client/ValueBoxEditorDecorator.java
+++ b/user/src/com/google/gwt/editor/ui/client/ValueBoxEditorDecorator.java
@@ -98,6 +98,7 @@ public ValueBoxEditorDecorator(ValueBoxBase widget,
* @return a {@link ValueBoxEditor} instance
* @see #setEditor(ValueBoxEditor)
*/
+ @Override
public ValueBoxEditor asEditor() {
return editor;
}
@@ -131,6 +132,7 @@ public void setValueBox(ValueBoxBase widget) {
*
* @param errors a List of {@link EditorError} instances
*/
+ @Override
public void showErrors(List errors) {
StringBuilder sb = new StringBuilder();
for (EditorError error : errors) {
diff --git a/user/src/com/google/gwt/editor/ui/client/adapters/HasTextEditor.java b/user/src/com/google/gwt/editor/ui/client/adapters/HasTextEditor.java
index a34d724749b..7dbe32375c2 100644
--- a/user/src/com/google/gwt/editor/ui/client/adapters/HasTextEditor.java
+++ b/user/src/com/google/gwt/editor/ui/client/adapters/HasTextEditor.java
@@ -45,10 +45,12 @@ protected HasTextEditor(HasText peer) {
this.peer = peer;
}
+ @Override
public String getValue() {
return peer.getText();
}
+ @Override
public void setValue(String value) {
peer.setText(value);
}
diff --git a/user/src/com/google/gwt/editor/ui/client/adapters/ValueBoxEditor.java b/user/src/com/google/gwt/editor/ui/client/adapters/ValueBoxEditor.java
index ad18aea6fae..95d1102d9e6 100644
--- a/user/src/com/google/gwt/editor/ui/client/adapters/ValueBoxEditor.java
+++ b/user/src/com/google/gwt/editor/ui/client/adapters/ValueBoxEditor.java
@@ -97,6 +97,7 @@ public T getValue() {
* @param delegate an {@link EditorDelegate}, or {@code null}
* @see #getDelegate()
*/
+ @Override
public void setDelegate(EditorDelegate delegate) {
this.delegate = delegate;
}
diff --git a/user/src/com/google/gwt/event/dom/client/DomEvent.java b/user/src/com/google/gwt/event/dom/client/DomEvent.java
index d911fd4bdfa..bb1d6e77961 100644
--- a/user/src/com/google/gwt/event/dom/client/DomEvent.java
+++ b/user/src/com/google/gwt/event/dom/client/DomEvent.java
@@ -142,6 +142,7 @@ static void init() {
@Override
public abstract DomEvent.Type getAssociatedType();
+ @Override
public final NativeEvent getNativeEvent() {
assertLive();
return nativeEvent;
diff --git a/user/src/com/google/gwt/event/shared/EventBus.java b/user/src/com/google/gwt/event/shared/EventBus.java
index 5633270de11..29fef9e6c6f 100644
--- a/user/src/com/google/gwt/event/shared/EventBus.java
+++ b/user/src/com/google/gwt/event/shared/EventBus.java
@@ -51,6 +51,7 @@ public void fireEvent(Event event) {
+ "Use that directly, or try com.google.gwt.event.shared.SimpleEventBus");
}
+ @Override
public abstract void fireEvent(GwtEvent event);
@Override
diff --git a/user/src/com/google/gwt/event/shared/GwtEvent.java b/user/src/com/google/gwt/event/shared/GwtEvent.java
index a4a846559f8..86fcbd819a6 100644
--- a/user/src/com/google/gwt/event/shared/GwtEvent.java
+++ b/user/src/com/google/gwt/event/shared/GwtEvent.java
@@ -73,6 +73,7 @@ protected void assertLive() {
*
* @param handler handler
*/
+ @Override
protected abstract void dispatch(H handler);
/**
diff --git a/user/src/com/google/gwt/event/shared/HandlerManager.java b/user/src/com/google/gwt/event/shared/HandlerManager.java
index 9f4d350abd4..2ac1b533aeb 100644
--- a/user/src/com/google/gwt/event/shared/HandlerManager.java
+++ b/user/src/com/google/gwt/event/shared/HandlerManager.java
@@ -114,6 +114,7 @@ public HandlerRegistration addHandler(GwtEvent.Type
*
* @param event the event
*/
+ @Override
public void fireEvent(GwtEvent event) {
// If it not live we should revive it.
if (!event.isLive()) {
diff --git a/user/src/com/google/gwt/event/shared/LegacyHandlerWrapper.java b/user/src/com/google/gwt/event/shared/LegacyHandlerWrapper.java
index 92e72771b1d..dfb4f474d23 100644
--- a/user/src/com/google/gwt/event/shared/LegacyHandlerWrapper.java
+++ b/user/src/com/google/gwt/event/shared/LegacyHandlerWrapper.java
@@ -26,6 +26,7 @@ public LegacyHandlerWrapper(com.google.web.bindery.event.shared.HandlerRegistrat
this.real = real;
}
+ @Override
public void removeHandler() {
real.removeHandler();
}
diff --git a/user/src/com/google/gwt/event/shared/ResettableEventBus.java b/user/src/com/google/gwt/event/shared/ResettableEventBus.java
index 96760cf39c9..111f2650036 100644
--- a/user/src/com/google/gwt/event/shared/ResettableEventBus.java
+++ b/user/src/com/google/gwt/event/shared/ResettableEventBus.java
@@ -41,6 +41,7 @@ public ResettableEventBus(com.google.web.bindery.event.shared.EventBus wrappedBu
real = new TestableResettableEventBus(wrappedBus);
}
+ @Override
public com.google.gwt.event.shared.HandlerRegistration addHandler(
GwtEvent.Type type, H handler) {
return wrap(addHandler((Event.Type) type, handler));
@@ -51,6 +52,7 @@ public HandlerRegistration addHandler(Type type, H handler) {
return real.addHandler(type, handler);
}
+ @Override
public com.google.gwt.event.shared.HandlerRegistration addHandlerToSource(
GwtEvent.Type type, Object source, H handler) {
return wrap(addHandlerToSource((Event.Type) type, source, handler));
diff --git a/user/src/com/google/gwt/event/shared/SimpleEventBus.java b/user/src/com/google/gwt/event/shared/SimpleEventBus.java
index 40b042d5a2e..e7b2ab379c6 100644
--- a/user/src/com/google/gwt/event/shared/SimpleEventBus.java
+++ b/user/src/com/google/gwt/event/shared/SimpleEventBus.java
@@ -27,6 +27,7 @@ public class SimpleEventBus extends EventBus {
private final com.google.web.bindery.event.shared.SimpleEventBus real =
new com.google.web.bindery.event.shared.SimpleEventBus();
+ @Override
public com.google.gwt.event.shared.HandlerRegistration addHandler(
GwtEvent.Type type, H handler) {
return wrap(addHandler((Event.Type) type, handler));
@@ -37,6 +38,7 @@ public HandlerRegistration addHandler(Type type, H handler) {
return real.addHandler(type, handler);
}
+ @Override
public com.google.gwt.event.shared.HandlerRegistration addHandlerToSource(
GwtEvent.Type type, Object source, H handler) {
return wrap(addHandlerToSource((Event.Type) type, source, handler));
diff --git a/user/src/com/google/gwt/event/shared/testing/CountingEventBus.java b/user/src/com/google/gwt/event/shared/testing/CountingEventBus.java
index f25887dd6f2..ac405fbf6cf 100644
--- a/user/src/com/google/gwt/event/shared/testing/CountingEventBus.java
+++ b/user/src/com/google/gwt/event/shared/testing/CountingEventBus.java
@@ -36,6 +36,7 @@ public CountingEventBus(com.google.gwt.event.shared.EventBus wrapped) {
real = new com.google.web.bindery.event.shared.testing.CountingEventBus(wrapped);
}
+ @Override
public com.google.gwt.event.shared.HandlerRegistration addHandler(
GwtEvent.Type type, H handler) {
return wrap(addHandler((Event.Type) type, handler));
@@ -46,6 +47,7 @@ public HandlerRegistration addHandler(Type type, H handler) {
return real.addHandler(type, handler);
}
+ @Override
public com.google.gwt.event.shared.HandlerRegistration addHandlerToSource(
GwtEvent.Type type, Object source, H handler) {
return wrap(addHandlerToSource((Event.Type) type, source, handler));
diff --git a/user/src/com/google/gwt/http/client/RequestBuilder.java b/user/src/com/google/gwt/http/client/RequestBuilder.java
index 3168a8d1a69..ac77a9dbe48 100644
--- a/user/src/com/google/gwt/http/client/RequestBuilder.java
+++ b/user/src/com/google/gwt/http/client/RequestBuilder.java
@@ -406,6 +406,7 @@ private Request doSend(String requestData, final RequestCallback callback)
// Must set the onreadystatechange handler before calling send().
xmlHttpRequest.setOnReadyStateChange(new ReadyStateChangeHandler() {
+ @Override
public void onReadyStateChange(XMLHttpRequest xhr) {
if (xhr.getReadyState() == XMLHttpRequest.DONE) {
xhr.clearOnReadyStateChange();
diff --git a/user/src/com/google/gwt/i18n/client/AutoDirectionHandler.java b/user/src/com/google/gwt/i18n/client/AutoDirectionHandler.java
index 667e50c3142..185e357e3e4 100644
--- a/user/src/com/google/gwt/i18n/client/AutoDirectionHandler.java
+++ b/user/src/com/google/gwt/i18n/client/AutoDirectionHandler.java
@@ -138,6 +138,7 @@ private AutoDirectionHandler(Target target, DirectionEstimator
/**
* Returns the DirectionEstimator object.
*/
+ @Override
public DirectionEstimator getDirectionEstimator() {
return directionEstimator;
}
@@ -146,6 +147,7 @@ public DirectionEstimator getDirectionEstimator() {
* Automatically adjusts hasDirection's direction on KeyUpEvent events.
* Implementation of KeyUpHandler interface method.
*/
+ @Override
public void onKeyUp(KeyUpEvent event) {
refreshDirection();
}
@@ -166,6 +168,7 @@ public void refreshDirection() {
/**
* Toggles direction estimation on (using a default estimator) and off.
*/
+ @Override
public void setDirectionEstimator(boolean enabled) {
setDirectionEstimator(enabled ? WordCountDirectionEstimator.get() : null);
}
@@ -173,6 +176,7 @@ public void setDirectionEstimator(boolean enabled) {
/**
* Sets the DirectionEstimator object.
*/
+ @Override
public void setDirectionEstimator(DirectionEstimator directionEstimator) {
this.directionEstimator = directionEstimator;
if ((directionEstimator == null) != (handlerRegistration == null)) {
diff --git a/user/src/com/google/gwt/i18n/client/DateTimeConstantsAdapter.java b/user/src/com/google/gwt/i18n/client/DateTimeConstantsAdapter.java
index e850237ebbd..a15d016609c 100644
--- a/user/src/com/google/gwt/i18n/client/DateTimeConstantsAdapter.java
+++ b/user/src/com/google/gwt/i18n/client/DateTimeConstantsAdapter.java
@@ -31,10 +31,12 @@ public DateTimeConstantsAdapter(DateTimeFormatInfo dtfi) {
this.dtfi = dtfi;
}
+ @Override
public String[] ampms() {
return dtfi.ampms();
}
+ @Override
public String[] dateFormats() {
return new String[] {
dtfi.dateFormatFull(), dtfi.dateFormatLong(), dtfi.dateFormatMedium(),
@@ -42,70 +44,87 @@ public String[] dateFormats() {
};
}
+ @Override
public String[] eraNames() {
return dtfi.erasFull();
}
+ @Override
public String[] eras() {
return dtfi.erasShort();
}
+ @Override
public String firstDayOfTheWeek() {
return String.valueOf(dtfi.firstDayOfTheWeek() + 1);
}
+ @Override
public String[] months() {
return dtfi.monthsFull();
}
+ @Override
public String[] narrowMonths() {
return dtfi.monthsNarrow();
}
+ @Override
public String[] narrowWeekdays() {
return dtfi.weekdaysNarrow();
}
+ @Override
public String[] quarters() {
return dtfi.quartersFull();
}
+ @Override
public String[] shortMonths() {
return dtfi.monthsShort();
}
+ @Override
public String[] shortQuarters() {
return dtfi.quartersShort();
}
+ @Override
public String[] shortWeekdays() {
return dtfi.weekdaysShort();
}
+ @Override
public String[] standaloneMonths() {
return dtfi.monthsFullStandalone();
}
+ @Override
public String[] standaloneNarrowMonths() {
return dtfi.monthsNarrowStandalone();
}
+ @Override
public String[] standaloneNarrowWeekdays() {
return dtfi.weekdaysNarrowStandalone();
}
+ @Override
public String[] standaloneShortMonths() {
return dtfi.monthsShortStandalone();
}
+ @Override
public String[] standaloneShortWeekdays() {
return dtfi.weekdaysShortStandalone();
}
+ @Override
public String[] standaloneWeekdays() {
return dtfi.weekdaysFullStandalone();
}
+ @Override
public String[] timeFormats() {
return new String[] {
dtfi.timeFormatFull(), dtfi.timeFormatLong(), dtfi.timeFormatMedium(),
@@ -113,10 +132,12 @@ public String[] timeFormats() {
};
}
+ @Override
public String[] weekdays() {
return dtfi.weekdaysFull();
}
+ @Override
public String[] weekendRange() {
return new String[] {
String.valueOf(dtfi.weekendStart() + 1),
diff --git a/user/src/com/google/gwt/i18n/client/DefaultLocalizedNamesBase.java b/user/src/com/google/gwt/i18n/client/DefaultLocalizedNamesBase.java
index 6e175724f96..8ad0010f1af 100644
--- a/user/src/com/google/gwt/i18n/client/DefaultLocalizedNamesBase.java
+++ b/user/src/com/google/gwt/i18n/client/DefaultLocalizedNamesBase.java
@@ -30,12 +30,14 @@ public abstract class DefaultLocalizedNamesBase implements LocalizedNames {
protected Map namesMap = null;
+ @Override
public final String[] getLikelyRegionCodes() {
if (likelyRegionCodes == null) {
likelyRegionCodes = loadLikelyRegionCodes();
}
return likelyRegionCodes;
}
+ @Override
public final String getRegionName(String regionCode) {
if (needsNameMap()) {
loadNameMap();
@@ -43,6 +45,7 @@ public final String getRegionName(String regionCode) {
return getRegionNameImpl(regionCode);
}
+ @Override
public final String[] getSortedRegionCodes() {
if (sortedRegionCodes == null) {
sortedRegionCodes = loadSortedRegionCodes();
diff --git a/user/src/com/google/gwt/i18n/client/TimeZone.java b/user/src/com/google/gwt/i18n/client/TimeZone.java
index 680b4bec90c..264d3677bdc 100644
--- a/user/src/com/google/gwt/i18n/client/TimeZone.java
+++ b/user/src/com/google/gwt/i18n/client/TimeZone.java
@@ -178,6 +178,7 @@ private TimeZone() {
/* (non-Javadoc)
* @see com.google.gwt.i18n.client.TimeZoneIntf#getDaylightAdjustment(java.util.Date)
*/
+ @Override
public int getDaylightAdjustment(Date date) {
if (transitionPoints == null) {
return 0;
@@ -194,6 +195,7 @@ public int getDaylightAdjustment(Date date) {
/* (non-Javadoc)
* @see com.google.gwt.i18n.client.TimeZoneIntf#getGMTString(java.util.Date)
*/
+ @Override
public String getGMTString(Date date) {
return composeGMTString(getOffset(date));
}
@@ -201,6 +203,7 @@ public String getGMTString(Date date) {
/* (non-Javadoc)
* @see com.google.gwt.i18n.client.TimeZoneIntf#getID()
*/
+ @Override
public String getID() {
return timezoneID;
}
@@ -208,6 +211,7 @@ public String getID() {
/* (non-Javadoc)
* @see com.google.gwt.i18n.client.TimeZoneIntf#getISOTimeZoneString(java.util.Date)
*/
+ @Override
public String getISOTimeZoneString(Date date) {
int offset = -getOffset(date);
char data[] = {'+', '0', '0', ':', '0', '0'};
@@ -225,6 +229,7 @@ public String getISOTimeZoneString(Date date) {
/* (non-Javadoc)
* @see com.google.gwt.i18n.client.TimeZoneIntf#getLongName(java.util.Date)
*/
+ @Override
public String getLongName(Date date) {
return tzNames[isDaylightTime(date) ? DLT_LONG_NAME : STD_LONG_NAME];
}
@@ -232,6 +237,7 @@ public String getLongName(Date date) {
/* (non-Javadoc)
* @see com.google.gwt.i18n.client.TimeZoneIntf#getOffset(java.util.Date)
*/
+ @Override
public int getOffset(Date date) {
return standardOffset - getDaylightAdjustment(date);
}
@@ -239,6 +245,7 @@ public int getOffset(Date date) {
/* (non-Javadoc)
* @see com.google.gwt.i18n.client.TimeZoneIntf#getRFCTimeZoneString(java.util.Date)
*/
+ @Override
public String getRFCTimeZoneString(Date date) {
int offset = -getOffset(date);
char data[] = {'+', '0', '0', '0', '0'};
@@ -256,6 +263,7 @@ public String getRFCTimeZoneString(Date date) {
/* (non-Javadoc)
* @see com.google.gwt.i18n.client.TimeZoneIntf#getShortName(java.util.Date)
*/
+ @Override
public String getShortName(Date date) {
return tzNames[isDaylightTime(date) ? DLT_SHORT_NAME : STD_SHORT_NAME];
}
@@ -263,6 +271,7 @@ public String getShortName(Date date) {
/* (non-Javadoc)
* @see com.google.gwt.i18n.client.TimeZoneIntf#getStandardOffset()
*/
+ @Override
public int getStandardOffset() {
return standardOffset;
}
@@ -270,6 +279,7 @@ public int getStandardOffset() {
/* (non-Javadoc)
* @see com.google.gwt.i18n.client.TimeZoneIntf#isDaylightTime(java.util.Date)
*/
+ @Override
public boolean isDaylightTime(Date date) {
return getDaylightAdjustment(date) > 0;
}
diff --git a/user/src/com/google/gwt/i18n/client/constants/DateTimeConstantsImpl.java b/user/src/com/google/gwt/i18n/client/constants/DateTimeConstantsImpl.java
index f95e4ea5cfd..8c321e33815 100644
--- a/user/src/com/google/gwt/i18n/client/constants/DateTimeConstantsImpl.java
+++ b/user/src/com/google/gwt/i18n/client/constants/DateTimeConstantsImpl.java
@@ -25,45 +25,66 @@
* perform late binding to the property file that specific to user's locale.
*/
public interface DateTimeConstantsImpl extends Constants, DateTimeConstants {
+ @Override
String[] ampms();
+ @Override
String[] dateFormats();
+ @Override
String[] eraNames();
+ @Override
String[] eras();
+ @Override
String firstDayOfTheWeek();
+ @Override
String[] months();
+ @Override
String[] narrowMonths();
+ @Override
String[] narrowWeekdays();
+ @Override
String[] quarters();
+ @Override
String[] shortMonths();
+ @Override
String[] shortQuarters();
+ @Override
String[] shortWeekdays();
+ @Override
String[] standaloneMonths();
+ @Override
String[] standaloneNarrowMonths();
+ @Override
String[] standaloneNarrowWeekdays();
+ @Override
String[] standaloneShortMonths();
+ @Override
String[] standaloneShortWeekdays();
+ @Override
String[] standaloneWeekdays();
+ @Override
String[] timeFormats();
+ @Override
String[] weekdays();
+ @Override
String[] weekendRange();
}
diff --git a/user/src/com/google/gwt/i18n/client/impl/plurals/DefaultRule.java b/user/src/com/google/gwt/i18n/client/impl/plurals/DefaultRule.java
index ac5be51ed7f..5142dfb79e2 100644
--- a/user/src/com/google/gwt/i18n/client/impl/plurals/DefaultRule.java
+++ b/user/src/com/google/gwt/i18n/client/impl/plurals/DefaultRule.java
@@ -44,12 +44,14 @@
*/
public class DefaultRule implements Localizable, PluralRule {
+ @Override
public PluralForm[] pluralForms() {
return new PluralForm[] {
new PluralForm("other", "Default plural form"),
};
}
+ @Override
public int select(int n) {
return 0;
}
diff --git a/user/src/com/google/gwt/i18n/linker/LocalePropertyProviderGenerator.java b/user/src/com/google/gwt/i18n/linker/LocalePropertyProviderGenerator.java
index cea76a1b55f..c1ec2e7911f 100644
--- a/user/src/com/google/gwt/i18n/linker/LocalePropertyProviderGenerator.java
+++ b/user/src/com/google/gwt/i18n/linker/LocalePropertyProviderGenerator.java
@@ -56,6 +56,7 @@ protected static boolean isTrue(String value) {
|| "on".equalsIgnoreCase(value));
}
+ @Override
public String generate(TreeLogger logger, SortedSet possibleValues,
String fallback, SortedSet configProperties)
throws UnableToCompleteException {
diff --git a/user/src/com/google/gwt/i18n/rebind/AbstractLocalizableImplCreator.java b/user/src/com/google/gwt/i18n/rebind/AbstractLocalizableImplCreator.java
index cd324f6b340..a5400633449 100644
--- a/user/src/com/google/gwt/i18n/rebind/AbstractLocalizableImplCreator.java
+++ b/user/src/com/google/gwt/i18n/rebind/AbstractLocalizableImplCreator.java
@@ -73,6 +73,7 @@ public MessageCatalogContextImpl(GeneratorContext context,
this.logger = logger;
}
+ @Override
public OutputStream createBinaryFile(String catalogName) {
try {
final OutputStream ostr = context.tryCreateResource(logger, catalogName);
@@ -107,6 +108,7 @@ public void write(int b) throws IOException {
return null;
}
+ @Override
public PrintWriter createTextFile(String catalogName, String charSet) {
OutputStream outStr = createBinaryFile(catalogName);
if (outStr != null) {
@@ -120,22 +122,27 @@ public PrintWriter createTextFile(String catalogName, String charSet) {
return null;
}
+ @Override
public void error(String msg) {
logger.log(TreeLogger.ERROR, msg);
}
+ @Override
public void error(String msg, Throwable cause) {
logger.log(TreeLogger.ERROR, msg, cause);
}
+ @Override
public GwtLocaleFactory getLocaleFactory() {
return LocaleUtils.getLocaleFactory();
}
+ @Override
public void warning(String msg) {
logger.log(TreeLogger.WARN, msg);
}
+ @Override
public void warning(String msg, Throwable cause) {
logger.log(TreeLogger.WARN, msg, cause);
}
diff --git a/user/src/com/google/gwt/i18n/rebind/AbstractResource.java b/user/src/com/google/gwt/i18n/rebind/AbstractResource.java
index fac46e1d889..add8f44783a 100644
--- a/user/src/com/google/gwt/i18n/rebind/AbstractResource.java
+++ b/user/src/com/google/gwt/i18n/rebind/AbstractResource.java
@@ -395,14 +395,17 @@ public void addForm(String form, String value) {
}
}
+ @Override
public String getForm(String form) {
return values.get(form);
}
+ @Override
public Collection getForms() {
return forms;
}
+ @Override
public String getKey() {
return key;
}
@@ -433,14 +436,17 @@ public boolean equals(Object obj) {
return key.equals(other.key) && value.equals(other.value);
}
+ @Override
public String getForm(String form) {
return form != null ? null : value;
}
+ @Override
public Collection getForms() {
return Collections.emptyList();
}
+ @Override
public String getKey() {
return key;
}
diff --git a/user/src/com/google/gwt/i18n/rebind/AnnotationsResource.java b/user/src/com/google/gwt/i18n/rebind/AnnotationsResource.java
index 90ee6330c14..1b11918570d 100644
--- a/user/src/com/google/gwt/i18n/rebind/AnnotationsResource.java
+++ b/user/src/com/google/gwt/i18n/rebind/AnnotationsResource.java
@@ -104,14 +104,17 @@ public EntryWrapper(String key, MethodEntry entry) {
this.entry = entry;
}
+ @Override
public String getForm(String form) {
return form == null ? entry.text : entry.altText.get(form);
}
+ @Override
public Collection getForms() {
return entry.altText.keySet();
}
+ @Override
public String getKey() {
return key;
}
diff --git a/user/src/com/google/gwt/i18n/rebind/KeyGenMessage.java b/user/src/com/google/gwt/i18n/rebind/KeyGenMessage.java
index 7fc5068a3c8..92fb14187d0 100644
--- a/user/src/com/google/gwt/i18n/rebind/KeyGenMessage.java
+++ b/user/src/com/google/gwt/i18n/rebind/KeyGenMessage.java
@@ -50,23 +50,28 @@ public KeyGenMessage(JMethod method) {
this.method = method;
}
+ @Override
public void accept(MessageVisitor v) throws MessageProcessingException {
throw new MessageProcessingException("unsupported");
}
+ @Override
public void accept(MessageVisitor v, GwtLocale locale)
throws MessageProcessingException {
throw new MessageProcessingException("unsupported");
}
+ @Override
public int compareTo(Message o) {
return 0;
}
+ @Override
public Iterable getAllMessageForms() {
return null;
}
+ @Override
public A getAnnotation(Class annotClass) {
A annot = method.getAnnotation(annotClass);
if (annot != null) {
@@ -75,6 +80,7 @@ public A getAnnotation(Class annotClass) {
return method.getEnclosingType().findAnnotationInTypeHierarchy(annotClass);
}
+ @Override
public String getDefaultMessage() {
if (isAnnotationPresent(DefaultMessage.class)) {
DefaultMessage annot = getAnnotation(DefaultMessage.class);
@@ -98,57 +104,70 @@ public String getDefaultMessage() {
}
}
+ @Override
public String getDescription() {
Description annot = getAnnotation(Description.class);
return annot != null ? annot.value() : null;
}
+ @Override
public String getKey() {
return null;
}
+ @Override
public GwtLocale getMatchedLocale() {
return null;
}
+ @Override
public String getMeaning() {
Meaning meaningAnnot = getAnnotation(Meaning.class);
return meaningAnnot != null ? meaningAnnot.value() : null;
}
+ @Override
public MessageInterface getMessageInterface() {
return new KeyGenMessageInterface(method.getEnclosingType());
}
+ @Override
public MessageStyle getMessageStyle() {
return isAnnotationPresent(DefaultMessage.class) ?
MessageStyle.MESSAGE_FORMAT : MessageStyle.PLAIN;
}
+ @Override
public String getMethodName() {
return method.getName();
}
+ @Override
public List getParameters() {
return null;
}
+ @Override
public Type getReturnType() {
return null;
}
+ @Override
public int[] getSelectorParameterIndices() {
return null;
}
+ @Override
public MessageTranslation getTranslation(GwtLocale locale) {
return null;
}
+ @Override
public boolean isAnnotationPresent(Class annotClass) {
return getAnnotation(annotClass) != null;
}
+ @Override
public boolean isVarArgs() {
return false;
}
diff --git a/user/src/com/google/gwt/i18n/rebind/KeyGenMessageInterface.java b/user/src/com/google/gwt/i18n/rebind/KeyGenMessageInterface.java
index 70a2e694d6b..21c5c40def5 100644
--- a/user/src/com/google/gwt/i18n/rebind/KeyGenMessageInterface.java
+++ b/user/src/com/google/gwt/i18n/rebind/KeyGenMessageInterface.java
@@ -38,32 +38,39 @@ public KeyGenMessageInterface(JClassType type) {
this.type = type;
}
+ @Override
public void accept(MessageInterfaceVisitor cv)
throws MessageProcessingException {
throw new MessageProcessingException("unsupported");
}
+ @Override
public void accept(MessageInterfaceVisitor cv, GwtLocale locale)
throws MessageProcessingException {
throw new MessageProcessingException("unsupported");
}
+ @Override
public A getAnnotation(Class annotClass) {
return type.findAnnotationInTypeHierarchy(annotClass);
}
+ @Override
public String getClassName() {
return type.getName();
}
+ @Override
public String getPackageName() {
return type.getPackage().getName();
}
+ @Override
public String getQualifiedName() {
return type.getQualifiedSourceName();
}
+ @Override
public boolean isAnnotationPresent(Class annotClass) {
return type.findAnnotationInTypeHierarchy(annotClass) != null;
}
diff --git a/user/src/com/google/gwt/i18n/rebind/LocalizableGenerator.java b/user/src/com/google/gwt/i18n/rebind/LocalizableGenerator.java
index 0cc7aec6f2f..70d3a2f4a25 100644
--- a/user/src/com/google/gwt/i18n/rebind/LocalizableGenerator.java
+++ b/user/src/com/google/gwt/i18n/rebind/LocalizableGenerator.java
@@ -61,6 +61,7 @@ public class LocalizableGenerator extends Generator {
*/
public class JMethodComparator implements Comparator {
+ @Override
public int compare(JMethod a, JMethod b) {
if (a.isPublic() != b.isPublic()) {
return a.isPublic() ? -1 : 1;
diff --git a/user/src/com/google/gwt/i18n/rebind/MessageFormatParser.java b/user/src/com/google/gwt/i18n/rebind/MessageFormatParser.java
index ff905a5f279..8f11ed8113c 100644
--- a/user/src/com/google/gwt/i18n/rebind/MessageFormatParser.java
+++ b/user/src/com/google/gwt/i18n/rebind/MessageFormatParser.java
@@ -156,13 +156,16 @@ private void appendArgs(
public static class DefaultTemplateChunkVisitor
implements TemplateChunkVisitor {
+ @Override
public void visit(ArgumentChunk argChunk) throws UnableToCompleteException {
}
+ @Override
public void visit(StaticArgChunk staticArgChunk)
throws UnableToCompleteException {
}
+ @Override
public void visit(StringChunk stringChunk)
throws UnableToCompleteException {
}
diff --git a/user/src/com/google/gwt/i18n/rebind/MessagesMethodCreator.java b/user/src/com/google/gwt/i18n/rebind/MessagesMethodCreator.java
index 0a39e3e6fcb..b019194ceed 100644
--- a/user/src/com/google/gwt/i18n/rebind/MessagesMethodCreator.java
+++ b/user/src/com/google/gwt/i18n/rebind/MessagesMethodCreator.java
@@ -116,6 +116,7 @@ public abstract void issueWarnings(TreeLogger logger, JMethod m,
* Implements {x,date...} references in MessageFormat.
*/
private static class DateFormatter implements ValueFormatter {
+ @Override
public boolean format(TreeLogger logger, GwtLocale locale,
StringGenerator out, Map formatArgs, String subformat,
String argName, JType argType, Parameters params) {
@@ -183,6 +184,7 @@ private static int compareOne(String a, String b) {
}
}
+ @Override
public int compare(String a, String b) {
String[] aSplit = a.split("\\|");
String[] bSplit = b.split("\\|");
@@ -379,10 +381,12 @@ public ListAccessorArray(int listArgNum) {
this.listArgNum = listArgNum;
}
+ @Override
public String getElement(String element) {
return "arg" + listArgNum + "[" + element + "]";
}
+ @Override
public String getSize() {
return "arg" + listArgNum + ".length";
}
@@ -399,10 +403,12 @@ public ListAccessorList(int listArgNum) {
this.listArgNum = listArgNum;
}
+ @Override
public String getElement(String element) {
return "arg" + listArgNum + ".get(" + element + ")";
}
+ @Override
public String getSize() {
return "arg" + listArgNum + ".size()";
}
@@ -414,6 +420,7 @@ public String getSize() {
private static class LocalDateTimeFormatter implements ValueFormatter {
private static final String PREDEF = "predef:";
+ @Override
public boolean format(TreeLogger logger,
GwtLocale locale,
StringGenerator out,
@@ -488,6 +495,7 @@ public boolean format(TreeLogger logger,
*/
private static class NumberFormatter implements ValueFormatter {
+ @Override
public boolean format(TreeLogger logger,
GwtLocale locale,
StringGenerator out,
@@ -645,14 +653,17 @@ public ParametersImpl(JParameter[] params, boolean[] seenFlag) {
}
}
+ @Override
public void enablePluralOffsets() {
enablePluralOffsets = true;
}
+ @Override
public int getCount() {
return params.length;
}
+ @Override
public JParameter getParameter(int i) {
if (i < 0 || i >= params.length) {
return null;
@@ -661,10 +672,12 @@ public JParameter getParameter(int i) {
return params[i];
}
+ @Override
public JParameter getParameter(String name) {
return getParameter(getParameterIndex(name));
}
+ @Override
public String getParameterExpression(int i) {
if (i < 0 || i >= params.length) {
return null;
@@ -683,6 +696,7 @@ public String getParameterExpression(int i) {
return argName;
}
+ @Override
public int getParameterIndex(String name) {
for (int i = 0; i < params.length; ++i) {
if (params[i].getName().equals(name)) {
@@ -887,6 +901,7 @@ public void issueWarnings(TreeLogger logger, JMethod m, GwtLocale locale) {
*/
private static class TimeFormatter implements ValueFormatter {
+ @Override
public boolean format(TreeLogger logger,
GwtLocale locale,
StringGenerator out,
diff --git a/user/src/com/google/gwt/i18n/rebind/TypeOracleMessage.java b/user/src/com/google/gwt/i18n/rebind/TypeOracleMessage.java
index 4add4b1b647..5e8a0a4efcd 100644
--- a/user/src/com/google/gwt/i18n/rebind/TypeOracleMessage.java
+++ b/user/src/com/google/gwt/i18n/rebind/TypeOracleMessage.java
@@ -93,6 +93,7 @@ public ResourceMessageTranslation(ResourceEntry resourceEntry,
this.matchedLocale = matchedLocale;
}
+ @Override
public Iterable getAllMessageForms() {
List mapping = new ArrayList();
// add the default form
@@ -113,10 +114,12 @@ public Iterable getAllMessageForms() {
return mapping;
}
+ @Override
public String getDefaultMessage() {
return resourceEntry.getForm(null);
}
+ @Override
public GwtLocale getMatchedLocale() {
return matchedLocale;
}
@@ -199,6 +202,7 @@ public boolean isAnnotationPresent(Class annotClass) {
return method.isAnnotationPresent(annotClass);
}
+ @Override
public boolean isVarArgs() {
return method.isVarArgs();
}
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 1fb4e64916c..f4b4750db84 100644
--- a/user/src/com/google/gwt/i18n/rebind/format/PropertiesFormat.java
+++ b/user/src/com/google/gwt/i18n/rebind/format/PropertiesFormat.java
@@ -36,6 +36,7 @@
*/
public class PropertiesFormat implements MessageCatalogFormat {
+ @Override
public String getExtension() {
return ".properties";
}
@@ -46,6 +47,7 @@ public String getExtension() {
* @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)
*/
+ @Override
public void write(TreeLogger logger, String locale,
ResourceList resourceList, PrintWriter out, JClassType messageInterface) {
writeComment(out, "Generated from "
diff --git a/user/src/com/google/gwt/i18n/rebind/keygen/FullyQualifiedMethodNameKeyGenerator.java b/user/src/com/google/gwt/i18n/rebind/keygen/FullyQualifiedMethodNameKeyGenerator.java
index a75eff54f6e..f9dc93ed7b0 100644
--- a/user/src/com/google/gwt/i18n/rebind/keygen/FullyQualifiedMethodNameKeyGenerator.java
+++ b/user/src/com/google/gwt/i18n/rebind/keygen/FullyQualifiedMethodNameKeyGenerator.java
@@ -25,6 +25,7 @@
@Deprecated
public class FullyQualifiedMethodNameKeyGenerator implements KeyGenerator {
+ @Override
public String generateKey(String className, String methodName, String text,
String meaning) {
return className + "." + methodName;
diff --git a/user/src/com/google/gwt/i18n/rebind/keygen/MD5KeyGenerator.java b/user/src/com/google/gwt/i18n/rebind/keygen/MD5KeyGenerator.java
index 71cc6946bd1..daf433dd7e3 100644
--- a/user/src/com/google/gwt/i18n/rebind/keygen/MD5KeyGenerator.java
+++ b/user/src/com/google/gwt/i18n/rebind/keygen/MD5KeyGenerator.java
@@ -29,6 +29,7 @@
@Deprecated
public class MD5KeyGenerator implements KeyGenerator {
+ @Override
public String generateKey(String className, String methodName, String text,
String meaning) {
/*
diff --git a/user/src/com/google/gwt/i18n/rebind/keygen/MethodNameKeyGenerator.java b/user/src/com/google/gwt/i18n/rebind/keygen/MethodNameKeyGenerator.java
index c55cd724230..88cca7ed263 100644
--- a/user/src/com/google/gwt/i18n/rebind/keygen/MethodNameKeyGenerator.java
+++ b/user/src/com/google/gwt/i18n/rebind/keygen/MethodNameKeyGenerator.java
@@ -26,6 +26,7 @@
@Deprecated
public class MethodNameKeyGenerator implements KeyGenerator {
+ @Override
public String generateKey(String className, String methodName, String text,
String meaning) {
return methodName;
diff --git a/user/src/com/google/gwt/i18n/server/AbstractMessage.java b/user/src/com/google/gwt/i18n/server/AbstractMessage.java
index 92b41e01f47..f29b8361846 100644
--- a/user/src/com/google/gwt/i18n/server/AbstractMessage.java
+++ b/user/src/com/google/gwt/i18n/server/AbstractMessage.java
@@ -74,10 +74,12 @@ public AbstractMessage(GwtLocaleFactory localeFactory,
this.msgIntf = msgIntf;
}
+ @Override
public void accept(MessageVisitor mv) throws MessageProcessingException {
accept(mv, null);
}
+ @Override
public void accept(MessageVisitor mv, GwtLocale locale)
throws MessageProcessingException {
@@ -116,10 +118,12 @@ public void accept(MessageVisitor mv, GwtLocale locale)
mv.endMessage(this, trans);
}
+ @Override
public int compareTo(Message o) {
return getKey().compareTo(o.getKey());
}
+ @Override
public Iterable getAllMessageForms() {
if (overrideDefault != null) {
return overrideDefault.getAllMessageForms();
@@ -159,8 +163,10 @@ public Iterable getAllMessageForms() {
return mapping;
}
+ @Override
public abstract A getAnnotation(Class annotClass);
+ @Override
public String getDefaultMessage() {
if (overrideDefault != null) {
return overrideDefault.getDefaultMessage();
@@ -168,6 +174,7 @@ public String getDefaultMessage() {
return defaultMessage;
}
+ @Override
public String getDescription() {
Description descAnnot = getAnnotation(Description.class);
if (descAnnot != null) {
@@ -176,6 +183,7 @@ public String getDescription() {
return null;
}
+ @Override
public String getKey() {
KeyGeneratorException keyGenException = null;
if (key == null) {
@@ -207,6 +215,7 @@ public String getKey() {
return key;
}
+ @Override
public GwtLocale getMatchedLocale() {
if (overrideDefault != null) {
return overrideDefault.getMatchedLocale();
@@ -214,24 +223,31 @@ public GwtLocale getMatchedLocale() {
return matchedLocale;
}
+ @Override
public String getMeaning() {
return meaning;
}
+ @Override
public MessageInterface getMessageInterface() {
return msgIntf;
}
+ @Override
public MessageStyle getMessageStyle() {
return messageStyle;
}
+ @Override
public abstract String getMethodName();
+ @Override
public abstract List getParameters();
+ @Override
public abstract Type getReturnType();
+ @Override
public int[] getSelectorParameterIndices() {
if (selectorParams == null) {
ensureSelectorParams();
@@ -239,8 +255,10 @@ public int[] getSelectorParameterIndices() {
return selectorParams;
}
+ @Override
public abstract MessageTranslation getTranslation(GwtLocale locale);
+ @Override
public abstract boolean isAnnotationPresent(
Class annotClass);
@@ -348,6 +366,7 @@ protected void init() {
if (selIdx < 0) {
// string map
selectors[i] = new AlternateMessageSelector() {
+ @Override
public boolean isFormAcceptable(String form) {
return true;
}
diff --git a/user/src/com/google/gwt/i18n/server/AbstractMessageInterface.java b/user/src/com/google/gwt/i18n/server/AbstractMessageInterface.java
index ead16f812ba..a3d4dc09347 100644
--- a/user/src/com/google/gwt/i18n/server/AbstractMessageInterface.java
+++ b/user/src/com/google/gwt/i18n/server/AbstractMessageInterface.java
@@ -32,11 +32,13 @@ public AbstractMessageInterface(GwtLocaleFactory factory) {
this.factory = factory;
}
+ @Override
public void accept(MessageInterfaceVisitor cv)
throws MessageProcessingException {
accept(cv, factory.getDefault());
}
+ @Override
public void accept(MessageInterfaceVisitor cv, GwtLocale locale)
throws MessageProcessingException {
String defaultLocale = DefaultLocale.DEFAULT_LOCALE;
@@ -62,8 +64,10 @@ public void accept(MessageInterfaceVisitor cv, GwtLocale locale)
cv.endMessageInterface(this);
}
+ @Override
public abstract A getAnnotation(Class annotClass);
+ @Override
public abstract String getClassName();
/**
@@ -76,10 +80,13 @@ public void accept(MessageInterfaceVisitor cv, GwtLocale locale)
public abstract Iterable getMessages()
throws MessageProcessingException;
+ @Override
public abstract String getPackageName();
+ @Override
public abstract String getQualifiedName();
+ @Override
public abstract boolean isAnnotationPresent(
Class annotClass);
diff --git a/user/src/com/google/gwt/i18n/server/AbstractParameter.java b/user/src/com/google/gwt/i18n/server/AbstractParameter.java
index 1bcdebc5cd3..59e697f6677 100644
--- a/user/src/com/google/gwt/i18n/server/AbstractParameter.java
+++ b/user/src/com/google/gwt/i18n/server/AbstractParameter.java
@@ -96,6 +96,7 @@ public AbstractParameter(GwtLocaleFactory localeFactory, int index,
this.type = type;
}
+ @Override
public synchronized AlternateMessageSelector getAlternateMessageSelector() {
if (altMsgSelector == null) {
altMsgSelector = computeAlternateMessageSelector();
@@ -103,18 +104,23 @@ public synchronized AlternateMessageSelector getAlternateMessageSelector() {
return altMsgSelector;
}
+ @Override
public abstract A getAnnotation(Class annotClass);
+ @Override
public int getIndex() {
return index;
}
+ @Override
public abstract String getName();
+ @Override
public Type getType() {
return type;
}
+ @Override
public boolean isAnnotationPresent(Class annotClass) {
return getAnnotation(annotClass) != null;
}
@@ -140,6 +146,7 @@ private AlternateMessageSelector computeAlternateMessageSelector() {
if (selectAnnot != null) {
final String[] validValues = type.getEnumValues();
return new AlternateMessageSelector() {
+ @Override
public boolean isFormAcceptable(String form) {
if (validValues == null || AlternateMessageSelector.OTHER_FORM_NAME.equals(form)) {
return true;
diff --git a/user/src/com/google/gwt/i18n/server/DefaultVisitor.java b/user/src/com/google/gwt/i18n/server/DefaultVisitor.java
index 0e1c177f8bc..f88de06503e 100644
--- a/user/src/com/google/gwt/i18n/server/DefaultVisitor.java
+++ b/user/src/com/google/gwt/i18n/server/DefaultVisitor.java
@@ -25,26 +25,31 @@
*/
public class DefaultVisitor implements MessageInterfaceVisitor, MessageVisitor {
+ @Override
public void endMessage(Message msg, MessageTranslation trans)
throws MessageProcessingException {
// do nothing by default
}
+ @Override
public void endMessageInterface(MessageInterface msgIntf)
throws MessageProcessingException {
// do nothing by default
}
+ @Override
public MessageVisitor visitMessage(Message msg, MessageTranslation trans)
throws MessageProcessingException {
return this;
}
+ @Override
public void visitMessageInterface(MessageInterface msgIntf,
GwtLocale sourceLocale) throws MessageProcessingException {
// do nothing by default
}
+ @Override
public void visitTranslation(String[] formNames, boolean isDefault,
MessageStyle style, String msg) throws MessageProcessingException {
// do nothing by default
diff --git a/user/src/com/google/gwt/i18n/server/GwtLocaleFactoryImpl.java b/user/src/com/google/gwt/i18n/server/GwtLocaleFactoryImpl.java
index 621e01f58fc..3af2f5a6d25 100644
--- a/user/src/com/google/gwt/i18n/server/GwtLocaleFactoryImpl.java
+++ b/user/src/com/google/gwt/i18n/server/GwtLocaleFactoryImpl.java
@@ -90,6 +90,7 @@ public void clear() {
}
}
+ @Override
public GwtLocale fromComponents(String language, String script,
String region, String variant) {
if (language != null && language.length() == 0) {
@@ -131,6 +132,7 @@ public GwtLocale fromComponents(String language, String script,
* @throws IllegalArgumentException if the supplied locale does not match
* BCP47 structural requirements.
*/
+ @Override
public GwtLocale fromString(String localeName) {
String language = null;
String script = null;
@@ -202,6 +204,7 @@ && isAlpha(localeParts.get(partIdx), 4, 4)) {
return fromComponents(language, script, region, variant);
}
+ @Override
public GwtLocale getDefault() {
return fromComponents(null, null, null, null);
}
diff --git a/user/src/com/google/gwt/i18n/server/GwtLocaleImpl.java b/user/src/com/google/gwt/i18n/server/GwtLocaleImpl.java
index 0d1676998ea..9822ccfc5f2 100644
--- a/user/src/com/google/gwt/i18n/server/GwtLocaleImpl.java
+++ b/user/src/com/google/gwt/i18n/server/GwtLocaleImpl.java
@@ -245,6 +245,7 @@ private static int stringCompare(String a, String b) {
this.variant = variant;
}
+ @Override
public int compareTo(GwtLocale o) {
int c = stringCompare(language, o.getLanguage());
if (c == 0) {
@@ -274,6 +275,7 @@ && equalsNullCheck(script, other.getScript())
&& equalsNullCheck(variant, other.getVariant());
}
+ @Override
public List getAliases() {
// TODO(jat): more locale aliases? better way to encode them?
synchronized (cacheLock) {
@@ -318,6 +320,7 @@ public List getAliases() {
}
}
+ @Override
public String getAsString() {
StringBuilder buf = new StringBuilder();
if (language != null) {
@@ -346,6 +349,7 @@ public String getAsString() {
*
* @return GwtLocale instance
*/
+ @Override
public GwtLocale getCanonicalForm() {
String canonLanguage = language;
String canonScript = script;
@@ -408,6 +412,7 @@ public GwtLocale getCanonicalForm() {
canonVariant);
}
+ @Override
public List getCompleteSearchList() {
// TODO(jat): base order on distance from the initial locale, such as the
// draft proposal at:
@@ -477,6 +482,7 @@ public List getCompleteSearchList() {
*
* @return inheritance list
*/
+ @Override
public List getInheritanceChain() {
List inherits = new ArrayList();
inherits.add(this);
@@ -501,34 +507,42 @@ public List getInheritanceChain() {
return inherits;
}
+ @Override
public String getLanguage() {
return language;
}
+ @Override
public String getLanguageNotNull() {
return language == null ? "" : language;
}
+ @Override
public String getRegion() {
return region;
}
+ @Override
public String getRegionNotNull() {
return region == null ? "" : region;
}
+ @Override
public String getScript() {
return script;
}
+ @Override
public String getScriptNotNull() {
return script == null ? "" : script;
}
+ @Override
public String getVariant() {
return variant;
}
+ @Override
public String getVariantNotNull() {
return variant == null ? "" : variant;
}
@@ -550,6 +564,7 @@ public int hashCode() {
* @param parent locale to test against
* @return true if parent is an ancestor of this locale
*/
+ @Override
public boolean inheritsFrom(GwtLocale parent) {
if (equals(parent)) {
return false;
@@ -557,6 +572,7 @@ public boolean inheritsFrom(GwtLocale parent) {
return getInheritanceChain().contains(parent);
}
+ @Override
public boolean isDefault() {
return language == null;
}
@@ -576,6 +592,7 @@ public String toString() {
* @param other
* @return true if the scripts are the same
*/
+ @Override
public boolean usesSameScript(GwtLocale other) {
String myScript = script != null ? script : DefaultLanguageScripts.getDefaultScript(language,
region);
diff --git a/user/src/com/google/gwt/i18n/server/KeyGeneratorAdapter.java b/user/src/com/google/gwt/i18n/server/KeyGeneratorAdapter.java
index 6b04a6c0f19..c0d1193b4ae 100644
--- a/user/src/com/google/gwt/i18n/server/KeyGeneratorAdapter.java
+++ b/user/src/com/google/gwt/i18n/server/KeyGeneratorAdapter.java
@@ -30,6 +30,7 @@ public KeyGeneratorAdapter(com.google.gwt.i18n.rebind.keygen.KeyGenerator keygen
this.keygen = keygen;
}
+ @Override
public String generateKey(Message msg) {
String className = msg.getMessageInterface().getQualifiedName();
String methodName = msg.getMethodName();
diff --git a/user/src/com/google/gwt/i18n/server/Message.java b/user/src/com/google/gwt/i18n/server/Message.java
index 441a467e123..3ae720faf5a 100644
--- a/user/src/com/google/gwt/i18n/server/Message.java
+++ b/user/src/com/google/gwt/i18n/server/Message.java
@@ -40,6 +40,7 @@ public AlternateFormMapping(List forms, String message) {
this.message = message;
}
+ @Override
public int compareTo(AlternateFormMapping o) {
for (int i = 0; i < forms.size(); ++i) {
if (i >= o.forms.size()) {
@@ -99,6 +100,7 @@ void accept(MessageVisitor v, GwtLocale locale)
* @return -1 if this message is before {@code o}, 0 if they are equal, or
* 1 if this is message is after {code o}
*/
+ @Override
int compareTo(Message o);
/**
@@ -109,6 +111,7 @@ void accept(MessageVisitor v, GwtLocale locale)
* @return a list of all message forms, lexicographically sorted by the
* alternate forms for each message
*/
+ @Override
Iterable getAllMessageForms();
/**
@@ -125,6 +128,7 @@ void accept(MessageVisitor v, GwtLocale locale)
*
* @return default message or null if not provided
*/
+ @Override
String getDefaultMessage();
/**
diff --git a/user/src/com/google/gwt/i18n/server/MessageCatalogFactory.java b/user/src/com/google/gwt/i18n/server/MessageCatalogFactory.java
index d35c6b0f4d0..7c8bf846694 100644
--- a/user/src/com/google/gwt/i18n/server/MessageCatalogFactory.java
+++ b/user/src/com/google/gwt/i18n/server/MessageCatalogFactory.java
@@ -66,6 +66,7 @@ public interface Writer extends Closeable {
*
* @throws IOException
*/
+ @Override
void close() throws IOException;
/**
diff --git a/user/src/com/google/gwt/i18n/server/MessageFormatUtils.java b/user/src/com/google/gwt/i18n/server/MessageFormatUtils.java
index 9f340b8aa46..5722e2fd910 100644
--- a/user/src/com/google/gwt/i18n/server/MessageFormatUtils.java
+++ b/user/src/com/google/gwt/i18n/server/MessageFormatUtils.java
@@ -155,12 +155,14 @@ public static class DefaultTemplateChunkVisitor
/**
* @throws VisitorAbortException
*/
+ @Override
public void visit(ArgumentChunk argChunk) throws VisitorAbortException {
}
/**
* @throws VisitorAbortException
*/
+ @Override
public void visit(StaticArgChunk staticArgChunk)
throws VisitorAbortException {
}
@@ -168,6 +170,7 @@ public void visit(StaticArgChunk staticArgChunk)
/**
* @throws VisitorAbortException
*/
+ @Override
public void visit(StringChunk stringChunk)
throws VisitorAbortException {
}
diff --git a/user/src/com/google/gwt/i18n/server/PluralRuleAdapter.java b/user/src/com/google/gwt/i18n/server/PluralRuleAdapter.java
index dd3bffb548c..b4c5758e376 100644
--- a/user/src/com/google/gwt/i18n/server/PluralRuleAdapter.java
+++ b/user/src/com/google/gwt/i18n/server/PluralRuleAdapter.java
@@ -33,6 +33,7 @@ public PluralRuleAdapter(PluralRule pluralRule) {
pluralForms = pluralRule.pluralForms();
}
+ @Override
public boolean isFormAcceptable(String form) {
if (form.startsWith("=")) {
return true;
diff --git a/user/src/com/google/gwt/i18n/server/PropertyCatalogFactory.java b/user/src/com/google/gwt/i18n/server/PropertyCatalogFactory.java
index 073f0500a82..0058d997937 100644
--- a/user/src/com/google/gwt/i18n/server/PropertyCatalogFactory.java
+++ b/user/src/com/google/gwt/i18n/server/PropertyCatalogFactory.java
@@ -66,6 +66,7 @@ public PropertiesWriter(PrintWriter writer) {
this.writer = writer;
}
+ @Override
public void close() throws IOException {
writer.close();
}
@@ -75,6 +76,7 @@ public void endMessage(Message msg, MessageTranslation trans) {
baseKey = null;
}
+ @Override
public MessageInterfaceVisitor visitClass() {
return this;
}
@@ -200,10 +202,12 @@ private String quoteValue(String str) {
}
}
+ @Override
public String getExtension() {
return ".properties";
}
+ @Override
public Writer getWriter(Context context,
String fileName) {
PrintWriter pw = context.createTextFile(fileName, "UTF-8");
diff --git a/user/src/com/google/gwt/i18n/server/StringMapMessageTranslation.java b/user/src/com/google/gwt/i18n/server/StringMapMessageTranslation.java
index 9614fb14026..bfeed29bd6b 100644
--- a/user/src/com/google/gwt/i18n/server/StringMapMessageTranslation.java
+++ b/user/src/com/google/gwt/i18n/server/StringMapMessageTranslation.java
@@ -44,22 +44,27 @@ public StringMapMessageTranslation(String defaultMessage,
this.locale = locale;
}
+ @Override
public Iterable getAllMessageForms() {
return new Iterable() {
protected final Iterator iter = forms.iterator();
+ @Override
public Iterator iterator() {
return new Iterator() {
+ @Override
public boolean hasNext() {
return iter.hasNext();
}
+ @Override
public AlternateFormMapping next() {
String form = iter.next();
return new AlternateFormMapping(Arrays.asList(new AlternateForm(
form, form)), map.get(form));
}
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
@@ -68,10 +73,12 @@ public void remove() {
};
}
+ @Override
public String getDefaultMessage() {
return defaultMessage;
}
+ @Override
public GwtLocale getMatchedLocale() {
return locale;
}
diff --git a/user/src/com/google/gwt/i18n/server/impl/ReflectionMessage.java b/user/src/com/google/gwt/i18n/server/impl/ReflectionMessage.java
index b14e4b9276f..54a9e07e59e 100644
--- a/user/src/com/google/gwt/i18n/server/impl/ReflectionMessage.java
+++ b/user/src/com/google/gwt/i18n/server/impl/ReflectionMessage.java
@@ -150,6 +150,7 @@ public boolean isAnnotationPresent(Class annotClass) {
annotClass, true) != null;
}
+ @Override
public boolean isVarArgs() {
return method.isVarArgs();
}
diff --git a/user/src/com/google/gwt/i18n/server/keygen/FullyQualifiedMethodNameKeyGenerator.java b/user/src/com/google/gwt/i18n/server/keygen/FullyQualifiedMethodNameKeyGenerator.java
index 8926e173faa..46e68640035 100644
--- a/user/src/com/google/gwt/i18n/server/keygen/FullyQualifiedMethodNameKeyGenerator.java
+++ b/user/src/com/google/gwt/i18n/server/keygen/FullyQualifiedMethodNameKeyGenerator.java
@@ -23,6 +23,7 @@
*/
public class FullyQualifiedMethodNameKeyGenerator implements KeyGenerator {
+ @Override
public String generateKey(Message msg) {
return msg.getMessageInterface().getQualifiedName() + "."
+ msg.getMethodName();
diff --git a/user/src/com/google/gwt/i18n/server/keygen/MD5KeyGenerator.java b/user/src/com/google/gwt/i18n/server/keygen/MD5KeyGenerator.java
index 24c6e096551..45f1a96f1bf 100644
--- a/user/src/com/google/gwt/i18n/server/keygen/MD5KeyGenerator.java
+++ b/user/src/com/google/gwt/i18n/server/keygen/MD5KeyGenerator.java
@@ -28,6 +28,7 @@
*/
public class MD5KeyGenerator implements KeyGenerator {
+ @Override
public String generateKey(Message msg) {
String text = msg.getDefaultMessage();
String meaning = msg.getMeaning();
diff --git a/user/src/com/google/gwt/i18n/server/keygen/MethodNameKeyGenerator.java b/user/src/com/google/gwt/i18n/server/keygen/MethodNameKeyGenerator.java
index 6ddc35fb48d..1dd04611b72 100644
--- a/user/src/com/google/gwt/i18n/server/keygen/MethodNameKeyGenerator.java
+++ b/user/src/com/google/gwt/i18n/server/keygen/MethodNameKeyGenerator.java
@@ -25,6 +25,7 @@
*/
public class MethodNameKeyGenerator implements KeyGenerator {
+ @Override
public String generateKey(Message msg) {
return msg.getMethodName();
}
diff --git a/user/src/com/google/gwt/i18n/server/testing/MockMessageCatalogContext.java b/user/src/com/google/gwt/i18n/server/testing/MockMessageCatalogContext.java
index 079875c2a6d..1fda0819f77 100644
--- a/user/src/com/google/gwt/i18n/server/testing/MockMessageCatalogContext.java
+++ b/user/src/com/google/gwt/i18n/server/testing/MockMessageCatalogContext.java
@@ -39,10 +39,12 @@ public MockMessageCatalogContext(ByteArrayOutputStream baos) {
this.baos = baos;
}
+ @Override
public OutputStream createBinaryFile(String catalogName) {
return baos;
}
+ @Override
public PrintWriter createTextFile(String catalogName, String charSet) {
try {
return new PrintWriter(new BufferedWriter(
@@ -52,22 +54,27 @@ public PrintWriter createTextFile(String catalogName, String charSet) {
}
}
+ @Override
public void error(String msg) {
throw new RuntimeException("warning: " + msg);
}
+ @Override
public void error(String msg, Throwable cause) {
throw new RuntimeException("warning: " + msg, cause);
}
+ @Override
public GwtLocaleFactory getLocaleFactory() {
return factory;
}
+ @Override
public void warning(String msg) {
throw new RuntimeException("warning: " + msg);
}
+ @Override
public void warning(String msg, Throwable cause) {
throw new RuntimeException("warning: " + msg, cause);
}
diff --git a/user/src/com/google/gwt/i18n/shared/AlternateMessageSelector.java b/user/src/com/google/gwt/i18n/shared/AlternateMessageSelector.java
index d68729822ac..7d5be7f6092 100644
--- a/user/src/com/google/gwt/i18n/shared/AlternateMessageSelector.java
+++ b/user/src/com/google/gwt/i18n/shared/AlternateMessageSelector.java
@@ -61,6 +61,7 @@ public AlternateForm(String name, String description,
this.warnIfMissing = warnIfMissing;
}
+ @Override
public int compareTo(AlternateForm o) {
return name.compareTo(o.name);
}
diff --git a/user/src/com/google/gwt/i18n/shared/GwtLocale.java b/user/src/com/google/gwt/i18n/shared/GwtLocale.java
index 9a065abfff0..28342b99df7 100644
--- a/user/src/com/google/gwt/i18n/shared/GwtLocale.java
+++ b/user/src/com/google/gwt/i18n/shared/GwtLocale.java
@@ -29,6 +29,7 @@ public interface GwtLocale extends Comparable {
/**
* The default comparison is a lexical ordering.
*/
+ @Override
int compareTo(GwtLocale o);
/**
@@ -147,6 +148,7 @@ public interface GwtLocale extends Comparable {
/**
* Returns a human readable string -- "default" or the same as getAsString().
*/
+ @Override
String toString();
/**
diff --git a/user/src/com/google/gwt/jsonp/client/JsonpRequest.java b/user/src/com/google/gwt/jsonp/client/JsonpRequest.java
index 4b410d4f416..998eeb3ea19 100644
--- a/user/src/com/google/gwt/jsonp/client/JsonpRequest.java
+++ b/user/src/com/google/gwt/jsonp/client/JsonpRequest.java
@@ -323,6 +323,7 @@ private void unload() {
* statement after the callback execution.
*/
Scheduler.get().scheduleDeferred(new ScheduledCommand() {
+ @Override
public void execute() {
if (!canHaveMultipleRequestsForSameId) {
// If there can me multiple requests for a particular ID, then we
diff --git a/user/src/com/google/gwt/junit/FakeCssMaker.java b/user/src/com/google/gwt/junit/FakeCssMaker.java
index bac5c67d52e..12573d25840 100644
--- a/user/src/com/google/gwt/junit/FakeCssMaker.java
+++ b/user/src/com/google/gwt/junit/FakeCssMaker.java
@@ -46,6 +46,7 @@ public static T create(Class cssClass) {
new FakeCssMaker()));
}
+ @Override
public Object invoke(Object proxy, Method method, Object[] args)
throws Throwable {
if (method.getName().equals("ensureInjected")
diff --git a/user/src/com/google/gwt/junit/FakeMessagesMaker.java b/user/src/com/google/gwt/junit/FakeMessagesMaker.java
index 9576a6c2e58..780c0a4c26f 100644
--- a/user/src/com/google/gwt/junit/FakeMessagesMaker.java
+++ b/user/src/com/google/gwt/junit/FakeMessagesMaker.java
@@ -55,6 +55,7 @@ public static T create(Class messagesClass) {
new FakeMessagesMaker()));
}
+ @Override
public Object invoke(Object proxy, Method method, Object[] args)
throws Throwable {
String name = method.getName();
diff --git a/user/src/com/google/gwt/junit/FakeSafeHtmlTemplatesMaker.java b/user/src/com/google/gwt/junit/FakeSafeHtmlTemplatesMaker.java
index 1e97ff17e16..b899bfcc2b0 100644
--- a/user/src/com/google/gwt/junit/FakeSafeHtmlTemplatesMaker.java
+++ b/user/src/com/google/gwt/junit/FakeSafeHtmlTemplatesMaker.java
@@ -54,6 +54,7 @@ public static T create(Class templatesClass) {
new FakeSafeHtmlTemplatesMaker()));
}
+ @Override
public Object invoke(Object proxy, Method method, Object[] args)
throws Throwable {
String name = method.getName();
diff --git a/user/src/com/google/gwt/junit/PropertyDefiningStrategy.java b/user/src/com/google/gwt/junit/PropertyDefiningStrategy.java
index 46907a6c1f0..1e6c1fec50d 100644
--- a/user/src/com/google/gwt/junit/PropertyDefiningStrategy.java
+++ b/user/src/com/google/gwt/junit/PropertyDefiningStrategy.java
@@ -95,6 +95,7 @@ private void computePropertiesMap() {
if (properties == null) {
Set props = new TreeSet(
new Comparator() {
+ @Override
public int compare(Property p1, Property p2) {
int r = p1.name().compareTo(p2.name());
if (r == 0) {
diff --git a/user/src/com/google/gwt/junit/RunStyleHtmlUnit.java b/user/src/com/google/gwt/junit/RunStyleHtmlUnit.java
index 73815427f5b..43618942dde 100644
--- a/user/src/com/google/gwt/junit/RunStyleHtmlUnit.java
+++ b/user/src/com/google/gwt/junit/RunStyleHtmlUnit.java
@@ -79,10 +79,12 @@ public HtmlUnitThread(BrowserVersion browser, String url,
this.developmentMode = developmentMode;
}
+ @Override
public void handleAlert(Page page, String message) {
treeLogger.log(TreeLogger.ERROR, "Alert: " + message);
}
+ @Override
public boolean handleEvent(Page page, String returnValue) {
synchronized (waitForUnload) {
waitForUnload.notifyAll();
@@ -90,6 +92,7 @@ public boolean handleEvent(Page page, String returnValue) {
return true;
}
+ @Override
public void notify(String message, Object origin) {
if ("Obsolete content type encountered: 'text/javascript'.".equals(message) ||
"Obsolete content type encountered: 'application/x-javascript'.".equals(message)) {
diff --git a/user/src/com/google/gwt/junit/RunStyleSelenium.java b/user/src/com/google/gwt/junit/RunStyleSelenium.java
index ce35a6e7e87..70e9c9419d7 100644
--- a/user/src/com/google/gwt/junit/RunStyleSelenium.java
+++ b/user/src/com/google/gwt/junit/RunStyleSelenium.java
@@ -76,14 +76,17 @@ public RCSelenium(String specifier) {
parseSpecifier();
}
+ @Override
public void createSelenium(String domain) {
this.selenium = new DefaultSelenium(host, port, browser, domain);
}
+ @Override
public Selenium getSelenium() {
return selenium;
}
+ @Override
public String getSpecifier() {
return specifier;
}
diff --git a/user/src/com/google/gwt/junit/client/impl/GWTRunner.java b/user/src/com/google/gwt/junit/client/impl/GWTRunner.java
index 33c701bef8c..96f6842f423 100644
--- a/user/src/com/google/gwt/junit/client/impl/GWTRunner.java
+++ b/user/src/com/google/gwt/junit/client/impl/GWTRunner.java
@@ -30,6 +30,7 @@
*/
public class GWTRunner implements EntryPoint {
+ @Override
public void onModuleLoad() {
}
diff --git a/user/src/com/google/gwt/junit/server/JUnitHostImpl.java b/user/src/com/google/gwt/junit/server/JUnitHostImpl.java
index 05acad702ce..6ee5837291f 100644
--- a/user/src/com/google/gwt/junit/server/JUnitHostImpl.java
+++ b/user/src/com/google/gwt/junit/server/JUnitHostImpl.java
@@ -80,6 +80,7 @@ private static synchronized JUnitMessageQueue getHost() {
private StackTraceDeobfuscator deobfuscator;
+ @Override
public InitialResponse getTestBlock(int blockIndex, ClientInfo clientInfo)
throws TimeoutException {
ClientInfoExt clientInfoExt;
@@ -95,6 +96,7 @@ public InitialResponse getTestBlock(int blockIndex, ClientInfo clientInfo)
return new InitialResponse(clientInfoExt.getSessionId(), initialTestBlock);
}
+ @Override
public TestBlock reportResultsAndGetTestBlock(
HashMap results, int testBlock,
ClientInfo clientInfo) throws TimeoutException {
diff --git a/user/src/com/google/gwt/logging/client/DefaultLevel.java b/user/src/com/google/gwt/logging/client/DefaultLevel.java
index 0d16e50f2ef..2cbcde5e150 100644
--- a/user/src/com/google/gwt/logging/client/DefaultLevel.java
+++ b/user/src/com/google/gwt/logging/client/DefaultLevel.java
@@ -28,6 +28,7 @@ public interface DefaultLevel {
* Returns Level.ALL as the default level.
*/
public class All implements DefaultLevel {
+ @Override
public Level getLevel() {
return Level.ALL;
}
@@ -37,6 +38,7 @@ public Level getLevel() {
* Returns Level.CONFIG as the default level.
*/
public class Config implements DefaultLevel {
+ @Override
public Level getLevel() {
return Level.CONFIG;
}
@@ -46,6 +48,7 @@ public Level getLevel() {
* Returns Level.FINE as the default level.
*/
public class Fine implements DefaultLevel {
+ @Override
public Level getLevel() {
return Level.FINE;
}
@@ -55,6 +58,7 @@ public Level getLevel() {
* Returns Level.FINER as the default level.
*/
public class Finer implements DefaultLevel {
+ @Override
public Level getLevel() {
return Level.FINER;
}
@@ -64,6 +68,7 @@ public Level getLevel() {
* Returns Level.FINEST as the default level.
*/
public class Finest implements DefaultLevel {
+ @Override
public Level getLevel() {
return Level.FINEST;
}
@@ -73,6 +78,7 @@ public Level getLevel() {
* Returns Level.INFO as the default level.
*/
public class Info implements DefaultLevel {
+ @Override
public Level getLevel() {
return Level.INFO;
}
@@ -82,6 +88,7 @@ public Level getLevel() {
* Returns Level.SEVERE as the default level.
*/
public class Severe implements DefaultLevel {
+ @Override
public Level getLevel() {
return Level.SEVERE;
}
@@ -91,6 +98,7 @@ public Level getLevel() {
* Returns Level.WARNING as the default level.
*/
public class Warning implements DefaultLevel {
+ @Override
public Level getLevel() {
return Level.WARNING;
}
diff --git a/user/src/com/google/gwt/logging/client/LogConfiguration.java b/user/src/com/google/gwt/logging/client/LogConfiguration.java
index 87df689848a..395413b78fb 100644
--- a/user/src/com/google/gwt/logging/client/LogConfiguration.java
+++ b/user/src/com/google/gwt/logging/client/LogConfiguration.java
@@ -40,12 +40,15 @@ private interface LogConfigurationImpl {
* Implementation which does nothing and compiles out if logging is disabled.
*/
private static class LogConfigurationImplNull implements LogConfigurationImpl {
+ @Override
public void configureClientSideLogging() { }
+ @Override
public boolean loggingIsEnabled() {
return false;
}
+ @Override
public boolean loggingIsEnabled(Level level) {
return false;
}
@@ -61,6 +64,7 @@ private static class LogConfigurationImplRegular implements LogConfigurationImpl
// weak references to the loggers that are created.
private Logger root;
+ @Override
public void configureClientSideLogging() {
assert GWT.isClient();
@@ -73,6 +77,7 @@ public void configureClientSideLogging() {
setDefaultHandlers(root);
}
+ @Override
public boolean loggingIsEnabled() {
return true;
}
@@ -80,6 +85,7 @@ public boolean loggingIsEnabled() {
/**
* Returns whether logging enabled for the passed in level.
*/
+ @Override
public boolean loggingIsEnabled(Level level) {
return true;
}
@@ -158,6 +164,7 @@ public static boolean loggingIsEnabled(Level level) {
return impl.loggingIsEnabled(level);
}
+ @Override
public void onModuleLoad() {
impl.configureClientSideLogging();
@@ -165,6 +172,7 @@ public void onModuleLoad() {
if (GWT.getUncaughtExceptionHandler() == null) {
final Logger log = Logger.getLogger(LogConfiguration.class.getName());
GWT.setUncaughtExceptionHandler(new UncaughtExceptionHandler() {
+ @Override
public void onUncaughtException(Throwable e) {
log.log(Level.SEVERE, e.getMessage(), e);
}
diff --git a/user/src/com/google/gwt/logging/client/LoggingPopup.java b/user/src/com/google/gwt/logging/client/LoggingPopup.java
index 7db59642f33..df84685e777 100644
--- a/user/src/com/google/gwt/logging/client/LoggingPopup.java
+++ b/user/src/com/google/gwt/logging/client/LoggingPopup.java
@@ -63,6 +63,7 @@ public MouseDragHandler(Widget dragHandle) {
public abstract void handleDrag(int absX, int absY);
+ @Override
public void onMouseDown(MouseDownEvent event) {
dragging = true;
DOM.setCapture(dragHandle.getElement());
@@ -71,6 +72,7 @@ public void onMouseDown(MouseDownEvent event) {
DOM.eventGetCurrentEvent().preventDefault();
}
+ @Override
public void onMouseMove(MouseMoveEvent event) {
if (dragging) {
handleDrag(event.getClientX() - dragStartX,
@@ -80,6 +82,7 @@ public void onMouseMove(MouseMoveEvent event) {
}
}
+ @Override
public void onMouseUp(MouseUpEvent event) {
dragging = false;
DOM.releaseCapture(dragHandle.getElement());
@@ -158,6 +161,7 @@ public LoggingPopup() {
final Button maxmin = new Button("Minimize");
bottomBar.add(maxmin);
maxmin.addClickHandler(new ClickHandler() {
+ @Override
public void onClick(ClickEvent event) {
if (maxmin.getText().equals("Minimize")) {
maxmin.setText("Maximize");
diff --git a/user/src/com/google/gwt/logging/client/SimpleRemoteLogHandler.java b/user/src/com/google/gwt/logging/client/SimpleRemoteLogHandler.java
index 83150a34908..89805fc1dce 100644
--- a/user/src/com/google/gwt/logging/client/SimpleRemoteLogHandler.java
+++ b/user/src/com/google/gwt/logging/client/SimpleRemoteLogHandler.java
@@ -31,9 +31,11 @@
*/
public final class SimpleRemoteLogHandler extends RemoteLogHandlerBase {
class DefaultCallback implements AsyncCallback {
+ @Override
public void onFailure(Throwable caught) {
wireLogger.log(Level.SEVERE, "Remote logging failed: ", caught);
}
+ @Override
public void onSuccess(String result) {
if (result != null) {
wireLogger.severe("Remote logging failed: " + result);
diff --git a/user/src/com/google/gwt/logging/server/RemoteLoggingServiceImpl.java b/user/src/com/google/gwt/logging/server/RemoteLoggingServiceImpl.java
index f2e37139e22..d72beb11ccb 100644
--- a/user/src/com/google/gwt/logging/server/RemoteLoggingServiceImpl.java
+++ b/user/src/com/google/gwt/logging/server/RemoteLoggingServiceImpl.java
@@ -40,6 +40,7 @@ public class RemoteLoggingServiceImpl extends RemoteServiceServlet implements Re
* Logs a Log Record which has been serialized using GWT RPC on the server.
* @return either an error message, or null if logging is successful.
*/
+ @Override
public final String logOnServer(LogRecord lr) {
String strongName = getPermutationStrongName();
try {
diff --git a/user/src/com/google/gwt/logging/server/StackTraceDeobfuscator.java b/user/src/com/google/gwt/logging/server/StackTraceDeobfuscator.java
index 1493a696ddc..35947039eab 100644
--- a/user/src/com/google/gwt/logging/server/StackTraceDeobfuscator.java
+++ b/user/src/com/google/gwt/logging/server/StackTraceDeobfuscator.java
@@ -95,6 +95,7 @@ public void setSymbolMapsDirectory(String symbolMapsDirectory) {
this.symbolMapsDirectory = new File(symbolMapsDirectory);
}
+ @Override
protected InputStream openInputStream(String fileName) throws IOException {
return new FileInputStream(new File(symbolMapsDirectory, fileName));
}
diff --git a/user/src/com/google/gwt/place/impl/AbstractPlaceHistoryMapper.java b/user/src/com/google/gwt/place/impl/AbstractPlaceHistoryMapper.java
index c8399db014d..9a46fb2fc85 100644
--- a/user/src/com/google/gwt/place/impl/AbstractPlaceHistoryMapper.java
+++ b/user/src/com/google/gwt/place/impl/AbstractPlaceHistoryMapper.java
@@ -49,6 +49,7 @@ public String toString() {
protected F factory;
+ @Override
public Place getPlace(String token) {
int colonAt = token.indexOf(':');
String initial;
@@ -67,6 +68,7 @@ public Place getPlace(String token) {
return null;
}
+ @Override
public String getToken(Place place) {
PrefixAndToken token = getPrefixAndToken(place);
if (token != null) {
@@ -75,6 +77,7 @@ public String getToken(Place place) {
return null;
}
+ @Override
public void setFactory(F factory) {
this.factory = factory;
}
diff --git a/user/src/com/google/gwt/place/rebind/MostToLeastDerivedPlaceTypeComparator.java b/user/src/com/google/gwt/place/rebind/MostToLeastDerivedPlaceTypeComparator.java
index f51165e298d..62e3bd59f76 100644
--- a/user/src/com/google/gwt/place/rebind/MostToLeastDerivedPlaceTypeComparator.java
+++ b/user/src/com/google/gwt/place/rebind/MostToLeastDerivedPlaceTypeComparator.java
@@ -25,6 +25,7 @@
* sorting.
*/
class MostToLeastDerivedPlaceTypeComparator implements Comparator {
+ @Override
public int compare(JClassType o1, JClassType o2) {
if (o1.equals(o2)) {
return 0;
diff --git a/user/src/com/google/gwt/place/shared/PlaceController.java b/user/src/com/google/gwt/place/shared/PlaceController.java
index a34d8178f84..12a7723f795 100644
--- a/user/src/com/google/gwt/place/shared/PlaceController.java
+++ b/user/src/com/google/gwt/place/shared/PlaceController.java
@@ -32,10 +32,12 @@ public class PlaceController {
* Default implementation of {@link Delegate}, based on {@link Window}.
*/
public static class DefaultDelegate implements Delegate {
+ @Override
public HandlerRegistration addWindowClosingHandler(ClosingHandler handler) {
return Window.addWindowClosingHandler(handler);
}
+ @Override
public boolean confirm(String message) {
return Window.confirm(message);
}
@@ -113,6 +115,7 @@ public PlaceController(EventBus eventBus, Delegate delegate) {
this.eventBus = eventBus;
this.delegate = delegate;
delegate.addWindowClosingHandler(new ClosingHandler() {
+ @Override
public void onWindowClosing(ClosingEvent event) {
String warning = maybeGoTo(Place.NOWHERE);
if (warning != null) {
diff --git a/user/src/com/google/gwt/place/shared/PlaceHistoryHandler.java b/user/src/com/google/gwt/place/shared/PlaceHistoryHandler.java
index e0b37bd9209..b653cde48ca 100644
--- a/user/src/com/google/gwt/place/shared/PlaceHistoryHandler.java
+++ b/user/src/com/google/gwt/place/shared/PlaceHistoryHandler.java
@@ -36,15 +36,18 @@ public class PlaceHistoryHandler {
* Default implementation of {@link Historian}, based on {@link History}.
*/
public static class DefaultHistorian implements Historian {
+ @Override
public com.google.gwt.event.shared.HandlerRegistration addValueChangeHandler(
ValueChangeHandler valueChangeHandler) {
return History.addValueChangeHandler(valueChangeHandler);
}
+ @Override
public String getToken() {
return History.getToken();
}
+ @Override
public void newItem(String token, boolean issueEvent) {
History.newItem(token, issueEvent);
}
@@ -141,6 +144,7 @@ public HandlerRegistration register(PlaceController placeController, EventBus ev
final HandlerRegistration placeReg =
eventBus.addHandler(PlaceChangeEvent.TYPE, new PlaceChangeEvent.Handler() {
+ @Override
public void onPlaceChange(PlaceChangeEvent event) {
Place newPlace = event.getNewPlace();
historian.newItem(tokenForPlace(newPlace), false);
@@ -149,6 +153,7 @@ public void onPlaceChange(PlaceChangeEvent event) {
final HandlerRegistration historyReg =
historian.addValueChangeHandler(new ValueChangeHandler() {
+ @Override
public void onValueChange(ValueChangeEvent event) {
String token = event.getValue();
handleHistoryToken(token);
@@ -156,6 +161,7 @@ public void onValueChange(ValueChangeEvent event) {
});
return new HandlerRegistration() {
+ @Override
public void removeHandler() {
PlaceHistoryHandler.this.defaultPlace = Place.NOWHERE;
PlaceHistoryHandler.this.placeController = null;
diff --git a/user/src/com/google/gwt/resources/client/impl/DataResourcePrototype.java b/user/src/com/google/gwt/resources/client/impl/DataResourcePrototype.java
index f75c9004bde..268abe92f1c 100644
--- a/user/src/com/google/gwt/resources/client/impl/DataResourcePrototype.java
+++ b/user/src/com/google/gwt/resources/client/impl/DataResourcePrototype.java
@@ -33,10 +33,12 @@ public DataResourcePrototype(String name, SafeUri uri) {
this.uri = uri;
}
+ @Override
public String getName() {
return name;
}
+ @Override
public SafeUri getSafeUri() {
return uri;
}
diff --git a/user/src/com/google/gwt/resources/client/impl/ExternalTextResourcePrototype.java b/user/src/com/google/gwt/resources/client/impl/ExternalTextResourcePrototype.java
index 5248b036afa..0526f2b85a1 100644
--- a/user/src/com/google/gwt/resources/client/impl/ExternalTextResourcePrototype.java
+++ b/user/src/com/google/gwt/resources/client/impl/ExternalTextResourcePrototype.java
@@ -46,11 +46,13 @@ public ETRCallback(ResourceCallback callback) {
}
// For RequestCallback
+ @Override
public void onError(Request request, Throwable exception) {
onFailure(exception);
}
// For AsyncCallback
+ @Override
public void onFailure(Throwable exception) {
callback.onError(new ResourceException(
ExternalTextResourcePrototype.this,
@@ -58,6 +60,7 @@ public void onFailure(Throwable exception) {
}
// For RequestCallback
+ @Override
public void onResponseReceived(Request request, final Response response) {
String responseText = response.getText();
// Call eval() on the object.
@@ -66,6 +69,7 @@ public void onResponseReceived(Request request, final Response response) {
}
// For AsyncCallback
+ @Override
public void onSuccess(JavaScriptObject jso) {
if (jso == null) {
callback.onError(new ResourceException(
@@ -77,10 +81,12 @@ public void onSuccess(JavaScriptObject jso) {
final String resourceText = extractString(jso, index);
cache[index] = new TextResource() {
+ @Override
public String getName() {
return name;
}
+ @Override
public String getText() {
return resourceText;
}
@@ -151,6 +157,7 @@ public ExternalTextResourcePrototype(String name, SafeUri url,
this.md5Hash = md5Hash;
}
+ @Override
public String getName() {
return name;
}
@@ -158,6 +165,7 @@ public String getName() {
/**
* Possibly fire off an HTTPRequest for the text resource.
*/
+ @Override
@SuppressIsTrustedResourceUriCastCheck
public void getText(ResourceCallback callback) throws ResourceException {
diff --git a/user/src/com/google/gwt/resources/client/impl/ImageResourcePrototype.java b/user/src/com/google/gwt/resources/client/impl/ImageResourcePrototype.java
index 5d93cae23a1..9ce270f67bd 100644
--- a/user/src/com/google/gwt/resources/client/impl/ImageResourcePrototype.java
+++ b/user/src/com/google/gwt/resources/client/impl/ImageResourcePrototype.java
@@ -61,6 +61,7 @@ public ImageResourcePrototype(String name, SafeUri url, int left, int top, int w
/**
* Exists for testing purposes, not part of the ImageResource interface.
*/
+ @Override
public int getHeight() {
return height;
}
@@ -68,18 +69,22 @@ public int getHeight() {
/**
* Exists for testing purposes, not part of the ImageResource interface.
*/
+ @Override
public int getLeft() {
return left;
}
+ @Override
public String getName() {
return name;
}
+ @Override
public SafeUri getSafeUri() {
return url;
}
+ @Override
public int getTop() {
return top;
}
@@ -91,10 +96,12 @@ public String getURL() {
/**
* Exists for testing purposes, not part of the ImageResource interface.
*/
+ @Override
public int getWidth() {
return width;
}
+ @Override
public boolean isAnimated() {
return animated;
}
diff --git a/user/src/com/google/gwt/resources/css/GenerateCssAst.java b/user/src/com/google/gwt/resources/css/GenerateCssAst.java
index 4175fcc9434..9398f507816 100644
--- a/user/src/com/google/gwt/resources/css/GenerateCssAst.java
+++ b/user/src/com/google/gwt/resources/css/GenerateCssAst.java
@@ -128,11 +128,13 @@ public TreeLogger branch(TreeLogger.Type type, String message, Throwable t) {
return logOrBranch(type, message, t, true);
}
+ @Override
public void error(CSSParseException exception) throws CSSException {
// TODO Since this indicates a loss of data, should this be a fatal error?
log(TreeLogger.WARN, exception);
}
+ @Override
public void fatalError(CSSParseException exception) throws CSSException {
log(TreeLogger.ERROR, exception);
}
@@ -145,6 +147,7 @@ public void log(TreeLogger.Type type, String message, Throwable t) {
logOrBranch(type, message, t, false);
}
+ @Override
public void warning(CSSParseException exception) throws CSSException {
log(TreeLogger.DEBUG, exception);
}
@@ -218,30 +221,37 @@ public GenerationHandler(Errors errors) {
currentParent.push(css);
}
+ @Override
public void comment(String text) throws CSSException {
// Ignore comments
// TODO Should comments be retained but not generally printed?
}
+ @Override
public void endDocument(InputSource source) throws CSSException {
}
+ @Override
public void endFontFace() throws CSSException {
}
+ @Override
public void endMedia(SACMediaList media) throws CSSException {
currentParent.pop();
}
+ @Override
public void endPage(String name, String pseudoPage) throws CSSException {
}
+ @Override
public void endSelector(SelectorList selectors) throws CSSException {
}
/**
* Reflectively invoke a method named parseRule on this instance.
*/
+ @Override
public void ignorableAtRule(String atRule) throws CSSException {
int idx = atRule.indexOf(" ");
if (idx == -1) {
@@ -280,14 +290,17 @@ public void ignorableAtRule(String atRule) throws CSSException {
}
}
+ @Override
public void importStyle(String uri, SACMediaList media,
String defaultNamespaceURI) throws CSSException {
}
+ @Override
public void namespaceDeclaration(String prefix, String uri)
throws CSSException {
}
+ @Override
public void property(String name, LexicalUnit value, boolean important)
throws CSSException {
List values = new ArrayList();
@@ -298,6 +311,7 @@ public void property(String name, LexicalUnit value, boolean important)
new CssProperty(escapeIdent(name), new ListValue(values), important));
}
+ @Override
public void startDocument(InputSource source) throws CSSException {
// Unfortunately flute doesn't call parseCharset() method when it reaches a charset
// declaration. The only place to get the charset is in this method. Flute use ASCII by
@@ -310,12 +324,14 @@ public void startDocument(InputSource source) throws CSSException {
}
}
+ @Override
public void startFontFace() throws CSSException {
CssFontFace rule = new CssFontFace();
addNode(rule);
currentRule = rule;
}
+ @Override
public void startMedia(SACMediaList media) throws CSSException {
CssMediaRule r = new CssMediaRule();
for (int i = 0; i < media.getLength(); i++) {
@@ -325,6 +341,7 @@ public void startMedia(SACMediaList media) throws CSSException {
pushParent(r);
}
+ @Override
public void startPage(String name, String pseudoPage) throws CSSException {
CssPageRule r = new CssPageRule();
// name appears to be unused in CSS2
@@ -333,6 +350,7 @@ public void startPage(String name, String pseudoPage) throws CSSException {
currentRule = r;
}
+ @Override
public void startSelector(SelectorList selectors) throws CSSException {
CssRule r;
@@ -625,52 +643,67 @@ private PropertyExtractor(List values) {
this.values = values;
}
+ @Override
public void comment(String text) throws CSSException {
}
+ @Override
public void endDocument(InputSource source) throws CSSException {
}
+ @Override
public void endFontFace() throws CSSException {
}
+ @Override
public void endMedia(SACMediaList media) throws CSSException {
}
+ @Override
public void endPage(String name, String pseudoPage) throws CSSException {
}
+ @Override
public void endSelector(SelectorList selectors) throws CSSException {
}
+ @Override
public void ignorableAtRule(String atRule) throws CSSException {
}
+ @Override
public void importStyle(String uri, SACMediaList media,
String defaultNamespaceURI) throws CSSException {
}
+ @Override
public void namespaceDeclaration(String prefix, String uri)
throws CSSException {
}
+ @Override
public void property(String name, LexicalUnit value, boolean important)
throws CSSException {
extractValueOf(values, value);
}
+ @Override
public void startDocument(InputSource source) throws CSSException {
}
+ @Override
public void startFontFace() throws CSSException {
}
+ @Override
public void startMedia(SACMediaList media) throws CSSException {
}
+ @Override
public void startPage(String name, String pseudoPage) throws CSSException {
}
+ @Override
public void startSelector(SelectorList selectors) throws CSSException {
}
}
diff --git a/user/src/com/google/gwt/resources/css/InterfaceGenerator.java b/user/src/com/google/gwt/resources/css/InterfaceGenerator.java
index 9e1fa9f11fd..30d30ce8060 100644
--- a/user/src/com/google/gwt/resources/css/InterfaceGenerator.java
+++ b/user/src/com/google/gwt/resources/css/InterfaceGenerator.java
@@ -59,6 +59,7 @@
public class InterfaceGenerator extends ToolBase {
private static final Comparator NAME_COMPARATOR = new Comparator() {
+ @Override
public int compare(String o1, String o2) {
return o1.compareToIgnoreCase(o2);
}
diff --git a/user/src/com/google/gwt/resources/css/ast/CollapsedNode.java b/user/src/com/google/gwt/resources/css/ast/CollapsedNode.java
index aeecebb662e..9b1b597c58a 100644
--- a/user/src/com/google/gwt/resources/css/ast/CollapsedNode.java
+++ b/user/src/com/google/gwt/resources/css/ast/CollapsedNode.java
@@ -34,6 +34,7 @@ public CollapsedNode(List nodes) {
this.nodes = nodes;
}
+ @Override
public List getNodes() {
return nodes;
}
@@ -43,6 +44,7 @@ public boolean isStatic() {
return true;
}
+ @Override
public void traverse(CssVisitor visitor, Context context) {
visitor.acceptWithInsertRemove(getNodes());
}
diff --git a/user/src/com/google/gwt/resources/css/ast/CssDef.java b/user/src/com/google/gwt/resources/css/ast/CssDef.java
index 0938412c8dd..fb786aab818 100644
--- a/user/src/com/google/gwt/resources/css/ast/CssDef.java
+++ b/user/src/com/google/gwt/resources/css/ast/CssDef.java
@@ -44,6 +44,7 @@ public boolean isStatic() {
return true;
}
+ @Override
public void traverse(CssVisitor visitor, Context context) {
visitor.visit(this, context);
visitor.endVisit(this, context);
diff --git a/user/src/com/google/gwt/resources/css/ast/CssFontFace.java b/user/src/com/google/gwt/resources/css/ast/CssFontFace.java
index 065f40dd122..e3840d2babf 100644
--- a/user/src/com/google/gwt/resources/css/ast/CssFontFace.java
+++ b/user/src/com/google/gwt/resources/css/ast/CssFontFace.java
@@ -25,6 +25,7 @@
public class CssFontFace extends CssNode implements HasProperties {
private final List properties = new ArrayList();
+ @Override
public List getProperties() {
return properties;
}
@@ -34,6 +35,7 @@ public boolean isStatic() {
return true;
}
+ @Override
public void traverse(CssVisitor visitor, Context context) {
if (visitor.visit(this, context)) {
visitor.acceptWithInsertRemove(properties);
diff --git a/user/src/com/google/gwt/resources/css/ast/CssIf.java b/user/src/com/google/gwt/resources/css/ast/CssIf.java
index a7e03984ca6..13361df6f61 100644
--- a/user/src/com/google/gwt/resources/css/ast/CssIf.java
+++ b/user/src/com/google/gwt/resources/css/ast/CssIf.java
@@ -38,6 +38,7 @@ public String getExpression() {
return expression;
}
+ @Override
public List getNodes() {
return nodes;
}
@@ -78,6 +79,7 @@ public void setPropertyValues(String[] propertyValues) {
this.propertyValues = propertyValues;
}
+ @Override
public void traverse(CssVisitor visitor, Context context) {
if (visitor.visit(this, context)) {
visitor.acceptWithInsertRemove(nodes);
diff --git a/user/src/com/google/gwt/resources/css/ast/CssMediaRule.java b/user/src/com/google/gwt/resources/css/ast/CssMediaRule.java
index 1d2d767b13f..5fcb8f372a0 100644
--- a/user/src/com/google/gwt/resources/css/ast/CssMediaRule.java
+++ b/user/src/com/google/gwt/resources/css/ast/CssMediaRule.java
@@ -29,6 +29,7 @@ public List getMedias() {
return selectors;
}
+ @Override
public List getNodes() {
return nodes;
}
@@ -38,6 +39,7 @@ public boolean isStatic() {
return true;
}
+ @Override
public void traverse(CssVisitor visitor, Context context) {
if (visitor.visit(this, context)) {
visitor.acceptWithInsertRemove(nodes);
diff --git a/user/src/com/google/gwt/resources/css/ast/CssModVisitor.java b/user/src/com/google/gwt/resources/css/ast/CssModVisitor.java
index e0244fcc2fd..31599c2d1c9 100644
--- a/user/src/com/google/gwt/resources/css/ast/CssModVisitor.java
+++ b/user/src/com/google/gwt/resources/css/ast/CssModVisitor.java
@@ -28,32 +28,38 @@ private class ListContext implements Context {
private boolean removed;
private boolean replaced;
+ @Override
public boolean canInsert() {
return true;
}
+ @Override
public boolean canRemove() {
return true;
}
+ @Override
public void insertAfter(CssNode node) {
checkRemoved();
list.add(index + 1, node);
didChange = true;
}
+ @Override
public void insertBefore(CssNode node) {
checkRemoved();
list.add(index++, node);
didChange = true;
}
+ @Override
public void removeMe() {
checkState();
list.remove(index--);
didChange = removed = true;
}
+ @Override
public void replaceMe(CssNode node) {
checkState();
checkReplacement((CssNode) list.get(index), node);
diff --git a/user/src/com/google/gwt/resources/css/ast/CssNoFlip.java b/user/src/com/google/gwt/resources/css/ast/CssNoFlip.java
index efcb14ba8f5..4d71e9d9465 100644
--- a/user/src/com/google/gwt/resources/css/ast/CssNoFlip.java
+++ b/user/src/com/google/gwt/resources/css/ast/CssNoFlip.java
@@ -25,6 +25,7 @@
public class CssNoFlip extends CssNode implements HasNodes {
private List nodes = new ArrayList();
+ @Override
public List getNodes() {
return nodes;
}
@@ -34,6 +35,7 @@ public boolean isStatic() {
return true;
}
+ @Override
public void traverse(CssVisitor visitor, Context context) {
if (visitor.visit(this, context)) {
visitor.acceptWithInsertRemove(nodes);
diff --git a/user/src/com/google/gwt/resources/css/ast/CssNodeCloner.java b/user/src/com/google/gwt/resources/css/ast/CssNodeCloner.java
index 38101e28269..fafb463ffb1 100644
--- a/user/src/com/google/gwt/resources/css/ast/CssNodeCloner.java
+++ b/user/src/com/google/gwt/resources/css/ast/CssNodeCloner.java
@@ -38,11 +38,13 @@ public static List clone(Class clazz, List nodes) {
CssNodeCloner cloner = new CssNodeCloner();
cloner.curentNodes.push(topContext);
cloner.currentHasProperties = new HasProperties() {
+ @Override
public List getProperties() {
return topProperties;
}
};
cloner.currentHasSelectors = new HasSelectors() {
+ @Override
public List getSelectors() {
return topSelectors;
}
diff --git a/user/src/com/google/gwt/resources/css/ast/CssPageRule.java b/user/src/com/google/gwt/resources/css/ast/CssPageRule.java
index 5fda49fcb34..2c30488047d 100644
--- a/user/src/com/google/gwt/resources/css/ast/CssPageRule.java
+++ b/user/src/com/google/gwt/resources/css/ast/CssPageRule.java
@@ -25,6 +25,7 @@ public class CssPageRule extends CssNode implements HasProperties {
private final List nodes = new ArrayList();
private String pseudoPage;
+ @Override
public List getProperties() {
return nodes;
}
@@ -42,6 +43,7 @@ public void setPseudoPage(String pseudoPage) {
this.pseudoPage = pseudoPage;
}
+ @Override
public void traverse(CssVisitor visitor, Context context) {
if (visitor.visit(this, context)) {
visitor.acceptWithInsertRemove(nodes);
diff --git a/user/src/com/google/gwt/resources/css/ast/CssProperty.java b/user/src/com/google/gwt/resources/css/ast/CssProperty.java
index e95e566d57c..a98ff9bd355 100644
--- a/user/src/com/google/gwt/resources/css/ast/CssProperty.java
+++ b/user/src/com/google/gwt/resources/css/ast/CssProperty.java
@@ -531,6 +531,7 @@ public void setValue(Value value) {
}
}
+ @Override
public void traverse(CssVisitor visitor, Context context) {
visitor.visit(this, context);
visitor.endVisit(this, context);
diff --git a/user/src/com/google/gwt/resources/css/ast/CssRule.java b/user/src/com/google/gwt/resources/css/ast/CssRule.java
index de016acf01f..ffc5f9e1750 100644
--- a/user/src/com/google/gwt/resources/css/ast/CssRule.java
+++ b/user/src/com/google/gwt/resources/css/ast/CssRule.java
@@ -25,10 +25,12 @@ public class CssRule extends CssNode implements HasProperties, HasSelectors {
protected final List properties = new ArrayList();
protected final List selectors = new ArrayList();
+ @Override
public List getProperties() {
return properties;
}
+ @Override
public List getSelectors() {
return selectors;
}
@@ -38,6 +40,7 @@ public boolean isStatic() {
return true;
}
+ @Override
public void traverse(CssVisitor visitor, Context context) {
if (visitor.visit(this, context)) {
visitor.acceptWithInsertRemove(selectors);
diff --git a/user/src/com/google/gwt/resources/css/ast/CssSelector.java b/user/src/com/google/gwt/resources/css/ast/CssSelector.java
index 20b52cb5c53..0cc2ed1a265 100644
--- a/user/src/com/google/gwt/resources/css/ast/CssSelector.java
+++ b/user/src/com/google/gwt/resources/css/ast/CssSelector.java
@@ -46,6 +46,7 @@ public void setSelector(String selector) {
this.selector = selector;
}
+ @Override
public void traverse(CssVisitor visitor, Context context) {
visitor.visit(this, context);
visitor.endVisit(this, context);
diff --git a/user/src/com/google/gwt/resources/css/ast/CssSprite.java b/user/src/com/google/gwt/resources/css/ast/CssSprite.java
index 05df76200d6..a25910b9cbe 100644
--- a/user/src/com/google/gwt/resources/css/ast/CssSprite.java
+++ b/user/src/com/google/gwt/resources/css/ast/CssSprite.java
@@ -46,6 +46,7 @@ public SpritePropertyList(List source) {
this.source = source;
}
+ @Override
public boolean add(CssProperty o) {
if (!processProperty(o)) {
return source.add(o);
@@ -54,28 +55,34 @@ public boolean add(CssProperty o) {
}
}
+ @Override
public void add(int index, CssProperty element) {
if (!processProperty(element)) {
source.add(index, element);
}
}
+ @Override
public boolean addAll(Collection c) {
return source.addAll(c);
}
+ @Override
public boolean addAll(int index, Collection c) {
return source.addAll(index, c);
}
+ @Override
public void clear() {
source.clear();
}
+ @Override
public boolean contains(Object o) {
return source.contains(o);
}
+ @Override
public boolean containsAll(Collection c) {
return source.containsAll(c);
}
@@ -85,6 +92,7 @@ public boolean equals(Object o) {
return source.equals(o);
}
+ @Override
public CssProperty get(int index) {
return source.get(index);
}
@@ -94,46 +102,57 @@ public int hashCode() {
return source.hashCode();
}
+ @Override
public int indexOf(Object o) {
return source.indexOf(o);
}
+ @Override
public boolean isEmpty() {
return source.isEmpty();
}
+ @Override
public Iterator iterator() {
return source.iterator();
}
+ @Override
public int lastIndexOf(Object o) {
return source.lastIndexOf(o);
}
+ @Override
public ListIterator listIterator() {
return source.listIterator();
}
+ @Override
public ListIterator listIterator(int index) {
return source.listIterator(index);
}
+ @Override
public CssProperty remove(int index) {
return source.remove(index);
}
+ @Override
public boolean remove(Object o) {
return source.remove(o);
}
+ @Override
public boolean removeAll(Collection c) {
return source.removeAll(c);
}
+ @Override
public boolean retainAll(Collection c) {
return source.retainAll(c);
}
+ @Override
public CssProperty set(int index, CssProperty element) {
if (!processProperty(element)) {
return source.set(index, element);
@@ -142,18 +161,22 @@ public CssProperty set(int index, CssProperty element) {
}
}
+ @Override
public int size() {
return source.size();
}
+ @Override
public List subList(int fromIndex, int toIndex) {
return source.subList(fromIndex, toIndex);
}
+ @Override
public Object[] toArray() {
return source.toArray();
}
+ @Override
public T[] toArray(T[] a) {
return source.toArray(a);
}
diff --git a/user/src/com/google/gwt/resources/css/ast/CssStylesheet.java b/user/src/com/google/gwt/resources/css/ast/CssStylesheet.java
index c02c0e84311..d593e6226cd 100644
--- a/user/src/com/google/gwt/resources/css/ast/CssStylesheet.java
+++ b/user/src/com/google/gwt/resources/css/ast/CssStylesheet.java
@@ -43,6 +43,7 @@ public void append(CssStylesheet other) {
rules.addAll(CssNodeCloner.clone(CssNode.class, other.rules));
}
+ @Override
public List getNodes() {
return rules;
}
@@ -52,6 +53,7 @@ public boolean isStatic() {
return true;
}
+ @Override
public void traverse(CssVisitor visitor, Context context) {
if (visitor.visit(this, context)) {
visitor.acceptWithInsertRemove(rules);
diff --git a/user/src/com/google/gwt/resources/css/ast/CssUnknownAtRule.java b/user/src/com/google/gwt/resources/css/ast/CssUnknownAtRule.java
index a3e7c45d778..aea2f0445c7 100644
--- a/user/src/com/google/gwt/resources/css/ast/CssUnknownAtRule.java
+++ b/user/src/com/google/gwt/resources/css/ast/CssUnknownAtRule.java
@@ -38,6 +38,7 @@ public boolean isStatic() {
return true;
}
+ @Override
public void traverse(CssVisitor visitor, Context context) {
if (visitor.visit(this, context)) {
// Do nothing
diff --git a/user/src/com/google/gwt/resources/css/ast/CssVisitor.java b/user/src/com/google/gwt/resources/css/ast/CssVisitor.java
index fbebe977799..14868887d2e 100644
--- a/user/src/com/google/gwt/resources/css/ast/CssVisitor.java
+++ b/user/src/com/google/gwt/resources/css/ast/CssVisitor.java
@@ -26,26 +26,32 @@
public class CssVisitor {
protected static final Context UNMODIFIABLE_CONTEXT = new Context() {
+ @Override
public boolean canInsert() {
return false;
}
+ @Override
public boolean canRemove() {
return false;
}
+ @Override
public void insertAfter(CssNode node) {
throw new UnsupportedOperationException();
}
+ @Override
public void insertBefore(CssNode node) {
throw new UnsupportedOperationException();
}
+ @Override
public void removeMe() {
throw new UnsupportedOperationException();
}
+ @Override
public void replaceMe(CssNode node) {
throw new UnsupportedOperationException();
}
diff --git a/user/src/com/google/gwt/resources/ext/AbstractResourceGenerator.java b/user/src/com/google/gwt/resources/ext/AbstractResourceGenerator.java
index d5d69e715dc..e6fa539153c 100644
--- a/user/src/com/google/gwt/resources/ext/AbstractResourceGenerator.java
+++ b/user/src/com/google/gwt/resources/ext/AbstractResourceGenerator.java
@@ -27,12 +27,14 @@
public abstract class AbstractResourceGenerator implements ResourceGenerator {
protected static final boolean STRIP_COMMENTS = System.getProperty("gwt.resourceBundle.stripComments") != null;
+ @Override
public abstract String createAssignment(TreeLogger logger,
ResourceContext context, JMethod method) throws UnableToCompleteException;
/**
* A no-op implementation.
*/
+ @Override
public void createFields(TreeLogger logger, ResourceContext context,
ClientBundleFields fields) throws UnableToCompleteException {
}
@@ -40,6 +42,7 @@ public void createFields(TreeLogger logger, ResourceContext context,
/**
* A no-op implementation.
*/
+ @Override
public void finish(TreeLogger logger, ResourceContext context)
throws UnableToCompleteException {
}
@@ -47,6 +50,7 @@ public void finish(TreeLogger logger, ResourceContext context)
/**
* A no-op implementation.
*/
+ @Override
public void init(TreeLogger logger, ResourceContext context)
throws UnableToCompleteException {
}
@@ -54,6 +58,7 @@ public void init(TreeLogger logger, ResourceContext context)
/**
* A no-op implementation.
*/
+ @Override
public void prepare(TreeLogger logger, ResourceContext context,
ClientBundleRequirements requirements, JMethod method)
throws UnableToCompleteException {
diff --git a/user/src/com/google/gwt/resources/gss/PermutationsCollector.java b/user/src/com/google/gwt/resources/gss/PermutationsCollector.java
index 5caed9948c3..0c24f051282 100644
--- a/user/src/com/google/gwt/resources/gss/PermutationsCollector.java
+++ b/user/src/com/google/gwt/resources/gss/PermutationsCollector.java
@@ -44,6 +44,7 @@ public PermutationsCollector(MutatingVisitController delegate) {
permutationAxesSet = new HashSet();
}
+ @Override
public void enterBooleanExpression(CssBooleanExpressionNode booleanExpressionNode) {
if (booleanExpressionNode.getType() == Type.CONSTANT &&
booleanExpressionNode.getValue() != null) {
diff --git a/user/src/com/google/gwt/resources/rebind/context/AbstractResourceContext.java b/user/src/com/google/gwt/resources/rebind/context/AbstractResourceContext.java
index 056c2277004..4cdc45f7b27 100644
--- a/user/src/com/google/gwt/resources/rebind/context/AbstractResourceContext.java
+++ b/user/src/com/google/gwt/resources/rebind/context/AbstractResourceContext.java
@@ -68,6 +68,7 @@ public String deploy(URL resource, boolean forceExternal)
return deploy(resource, null, forceExternal);
}
+ @Override
public String deploy(URL resource, String mimeType, boolean forceExternal)
throws UnableToCompleteException {
String fileName = ResourceGeneratorUtil.baseName(resource);
@@ -86,18 +87,22 @@ public String deploy(URL resource, String mimeType, boolean forceExternal)
}
}
+ @Override
public T getCachedData(String key, Class clazz) {
return clazz.cast(clientBundleCtx.getCachedData(currentResourceGeneratorType + ":" + key));
}
+ @Override
public JClassType getClientBundleType() {
return resourceBundleType;
}
+ @Override
public GeneratorContext getGeneratorContext() {
return context;
}
+ @Override
public String getImplementationSimpleSourceName() {
if (simpleSourceName == null) {
throw new IllegalStateException(
@@ -106,10 +111,12 @@ public String getImplementationSimpleSourceName() {
return simpleSourceName;
}
+ @Override
public ClientBundleRequirements getRequirements() {
return requirements;
}
+ @Override
public boolean putCachedData(String key, T value) {
key = currentResourceGeneratorType + ":" + key;
return value != clientBundleCtx.putCachedData(key, value);
diff --git a/user/src/com/google/gwt/resources/rebind/context/StaticResourceContext.java b/user/src/com/google/gwt/resources/rebind/context/StaticResourceContext.java
index 5054a45c1c5..c19c4893d6a 100644
--- a/user/src/com/google/gwt/resources/rebind/context/StaticResourceContext.java
+++ b/user/src/com/google/gwt/resources/rebind/context/StaticResourceContext.java
@@ -40,6 +40,7 @@ class StaticResourceContext extends AbstractResourceContext {
super(logger, context, resourceBundleType, clientBundleCtx);
}
+ @Override
public String deploy(String suggestedFileName, String mimeType, byte[] data,
boolean forceExternal) throws UnableToCompleteException {
TreeLogger logger = getLogger();
@@ -106,6 +107,7 @@ public String deploy(String suggestedFileName, String mimeType, byte[] data,
return "GWT.getModuleBaseForStaticFiles() + \"" + outputName + "\"";
}
+ @Override
public boolean supportsDataUrls() {
return false;
}
diff --git a/user/src/com/google/gwt/resources/rg/ImageBundleBuilder.java b/user/src/com/google/gwt/resources/rg/ImageBundleBuilder.java
index 28497ec2c77..03e03910731 100644
--- a/user/src/com/google/gwt/resources/rg/ImageBundleBuilder.java
+++ b/user/src/com/google/gwt/resources/rg/ImageBundleBuilder.java
@@ -78,6 +78,7 @@ interface Arranger {
*/
static class BestFitArranger implements Arranger {
private static final Comparator decreasingHeightComparator = new Comparator() {
+ @Override
public int compare(ImageRect a, ImageRect b) {
final int c = b.getHeight() - a.getHeight();
// If we encounter equal heights, use the name to keep things
@@ -87,6 +88,7 @@ public int compare(ImageRect a, ImageRect b) {
};
private static final Comparator decreasingWidthComparator = new Comparator() {
+ @Override
public int compare(ImageRect a, ImageRect b) {
final int c = b.getWidth() - a.getWidth();
// If we encounter equal heights, use the name to keep things
@@ -95,6 +97,7 @@ public int compare(ImageRect a, ImageRect b) {
}
};
+ @Override
public Size arrangeImages(Collection rects) {
if (rects.size() == 0) {
return new Size(0, 0);
@@ -223,6 +226,7 @@ private void arrangeColumn(List rectsInColumn,
* tiled vertically to fill to fill the full height of the image.
*/
static class HorizontalArranger implements Arranger {
+ @Override
public Size arrangeImages(Collection rects) {
int height = 1;
int width = 0;
@@ -254,6 +258,7 @@ public Size arrangeImages(Collection rects) {
* canvas needed to hold the images in their current positions.
*/
static class IdentityArranger implements Arranger {
+ @Override
public Size arrangeImages(Collection rects) {
int height = 0;
int width = 0;
@@ -438,6 +443,7 @@ static class Size {
* horizontally to fill the full width of the image.
*/
static class VerticalArranger implements Arranger {
+ @Override
public Size arrangeImages(Collection rects) {
int height = 0;
int width = 1;
diff --git a/user/src/com/google/gwt/safecss/shared/SafeStyles.java b/user/src/com/google/gwt/safecss/shared/SafeStyles.java
index 62bd30bafc4..80c704aa481 100644
--- a/user/src/com/google/gwt/safecss/shared/SafeStyles.java
+++ b/user/src/com/google/gwt/safecss/shared/SafeStyles.java
@@ -130,11 +130,13 @@ public interface SafeStyles extends Serializable {
*
* @param anObject the object to compare to
*/
+ @Override
boolean equals(Object anObject);
/**
* Returns a hash code for this string. Must be equal to
* asString().hashCode().
*/
+ @Override
int hashCode();
}
diff --git a/user/src/com/google/gwt/safecss/shared/SafeStylesString.java b/user/src/com/google/gwt/safecss/shared/SafeStylesString.java
index fba7b5d8856..e6d6904822f 100644
--- a/user/src/com/google/gwt/safecss/shared/SafeStylesString.java
+++ b/user/src/com/google/gwt/safecss/shared/SafeStylesString.java
@@ -53,6 +53,7 @@ private SafeStylesString() {
/**
* {@inheritDoc}
*/
+ @Override
public String asString() {
return css;
}
diff --git a/user/src/com/google/gwt/safehtml/rebind/ParsedHtmlTemplate.java b/user/src/com/google/gwt/safehtml/rebind/ParsedHtmlTemplate.java
index c65574bb5c5..13a5d84c06a 100644
--- a/user/src/com/google/gwt/safehtml/rebind/ParsedHtmlTemplate.java
+++ b/user/src/com/google/gwt/safehtml/rebind/ParsedHtmlTemplate.java
@@ -153,6 +153,7 @@ public LiteralChunk(String literal) {
chunk = new StringBuilder(literal);
}
+ @Override
public Kind getKind() {
return Kind.LITERAL;
}
@@ -198,6 +199,7 @@ public HtmlContext getContext() {
return context;
}
+ @Override
public Kind getKind() {
return Kind.PARAMETER;
}
diff --git a/user/src/com/google/gwt/safehtml/shared/OnlyToBeUsedInGeneratedCodeStringBlessedAsSafeHtml.java b/user/src/com/google/gwt/safehtml/shared/OnlyToBeUsedInGeneratedCodeStringBlessedAsSafeHtml.java
index c21f78dbff5..a0903ebcce7 100644
--- a/user/src/com/google/gwt/safehtml/shared/OnlyToBeUsedInGeneratedCodeStringBlessedAsSafeHtml.java
+++ b/user/src/com/google/gwt/safehtml/shared/OnlyToBeUsedInGeneratedCodeStringBlessedAsSafeHtml.java
@@ -45,6 +45,7 @@ public OnlyToBeUsedInGeneratedCodeStringBlessedAsSafeHtml(String html) {
/**
* {@inheritDoc}
*/
+ @Override
@IsSafeHtml
@SuppressIsSafeHtmlCastCheck
public String asString() {
diff --git a/user/src/com/google/gwt/safehtml/shared/SafeHtml.java b/user/src/com/google/gwt/safehtml/shared/SafeHtml.java
index 441fa132061..c6f0172a2ff 100644
--- a/user/src/com/google/gwt/safehtml/shared/SafeHtml.java
+++ b/user/src/com/google/gwt/safehtml/shared/SafeHtml.java
@@ -98,11 +98,13 @@ public interface SafeHtml extends Serializable {
*
* @param anObject the object to compare to
*/
+ @Override
boolean equals(Object anObject);
/**
* Returns a hash code for this string.
* Must be equal to asString().hashCode().
*/
+ @Override
int hashCode();
}
diff --git a/user/src/com/google/gwt/safehtml/shared/SafeHtmlString.java b/user/src/com/google/gwt/safehtml/shared/SafeHtmlString.java
index c960f39d421..dd91aca7ad3 100644
--- a/user/src/com/google/gwt/safehtml/shared/SafeHtmlString.java
+++ b/user/src/com/google/gwt/safehtml/shared/SafeHtmlString.java
@@ -57,6 +57,7 @@ private SafeHtmlString() {
/**
* {@inheritDoc}
*/
+ @Override
@IsSafeHtml
@SuppressIsSafeHtmlCastCheck
public String asString() {
diff --git a/user/src/com/google/gwt/safehtml/shared/SafeUri.java b/user/src/com/google/gwt/safehtml/shared/SafeUri.java
index 4ded3d7525d..3fc2a1e8b2b 100644
--- a/user/src/com/google/gwt/safehtml/shared/SafeUri.java
+++ b/user/src/com/google/gwt/safehtml/shared/SafeUri.java
@@ -75,11 +75,13 @@ public interface SafeUri {
*
* @param anObject the object to compare to
*/
+ @Override
boolean equals(Object anObject);
/**
* Returns a hash code for this string. Must be equal to
* asString().hashCode().
*/
+ @Override
int hashCode();
}
diff --git a/user/src/com/google/gwt/safehtml/shared/SafeUriString.java b/user/src/com/google/gwt/safehtml/shared/SafeUriString.java
index cadbaced490..fc16389b6f6 100644
--- a/user/src/com/google/gwt/safehtml/shared/SafeUriString.java
+++ b/user/src/com/google/gwt/safehtml/shared/SafeUriString.java
@@ -55,6 +55,7 @@ private SafeUriString() {
/**
* {@inheritDoc}
*/
+ @Override
@IsSafeUri
public String asString() {
return uri;
diff --git a/user/src/com/google/gwt/text/client/DateTimeFormatRenderer.java b/user/src/com/google/gwt/text/client/DateTimeFormatRenderer.java
index dcb7c13644b..e7e4a1d3bf3 100644
--- a/user/src/com/google/gwt/text/client/DateTimeFormatRenderer.java
+++ b/user/src/com/google/gwt/text/client/DateTimeFormatRenderer.java
@@ -52,6 +52,7 @@ public DateTimeFormatRenderer(DateTimeFormat format, TimeZone timeZone) {
this.timeZone = timeZone;
}
+ @Override
public String render(Date object) {
if (object == null) {
return "";
diff --git a/user/src/com/google/gwt/text/client/DoubleParser.java b/user/src/com/google/gwt/text/client/DoubleParser.java
index dca4195e8da..e8775b7f750 100644
--- a/user/src/com/google/gwt/text/client/DoubleParser.java
+++ b/user/src/com/google/gwt/text/client/DoubleParser.java
@@ -40,6 +40,7 @@ public static Parser instance() {
protected DoubleParser() {
}
+ @Override
public Double parse(CharSequence object) throws ParseException {
if ("".equals(object.toString())) {
return null;
diff --git a/user/src/com/google/gwt/text/client/DoubleRenderer.java b/user/src/com/google/gwt/text/client/DoubleRenderer.java
index 0a526bf91ce..2a4bbf0b15e 100644
--- a/user/src/com/google/gwt/text/client/DoubleRenderer.java
+++ b/user/src/com/google/gwt/text/client/DoubleRenderer.java
@@ -38,6 +38,7 @@ public static Renderer instance() {
protected DoubleRenderer() {
}
+ @Override
public String render(Double object) {
if (object == null) {
return "";
diff --git a/user/src/com/google/gwt/text/client/IntegerParser.java b/user/src/com/google/gwt/text/client/IntegerParser.java
index 9638347886c..2862907bc00 100644
--- a/user/src/com/google/gwt/text/client/IntegerParser.java
+++ b/user/src/com/google/gwt/text/client/IntegerParser.java
@@ -40,6 +40,7 @@ public static Parser instance() {
protected IntegerParser() {
}
+ @Override
public Integer parse(CharSequence object) throws ParseException {
if ("".equals(object.toString())) {
return null;
diff --git a/user/src/com/google/gwt/text/client/IntegerRenderer.java b/user/src/com/google/gwt/text/client/IntegerRenderer.java
index 4a6f5a6ed18..ffc5b2e714f 100644
--- a/user/src/com/google/gwt/text/client/IntegerRenderer.java
+++ b/user/src/com/google/gwt/text/client/IntegerRenderer.java
@@ -38,6 +38,7 @@ public static Renderer instance() {
protected IntegerRenderer() {
}
+ @Override
public String render(Integer object) {
if (null == object) {
return "";
diff --git a/user/src/com/google/gwt/text/client/LongParser.java b/user/src/com/google/gwt/text/client/LongParser.java
index 5115cf38514..be3ae4b3468 100644
--- a/user/src/com/google/gwt/text/client/LongParser.java
+++ b/user/src/com/google/gwt/text/client/LongParser.java
@@ -40,6 +40,7 @@ public static Parser instance() {
protected LongParser() {
}
+ @Override
public Long parse(CharSequence object) throws ParseException {
if ("".equals(object.toString())) {
return null;
diff --git a/user/src/com/google/gwt/text/client/LongRenderer.java b/user/src/com/google/gwt/text/client/LongRenderer.java
index 1edf2182c4f..8ba7e816977 100644
--- a/user/src/com/google/gwt/text/client/LongRenderer.java
+++ b/user/src/com/google/gwt/text/client/LongRenderer.java
@@ -38,6 +38,7 @@ public static Renderer instance() {
protected LongRenderer() {
}
+ @Override
public String render(Long object) {
if (object == null) {
return "";
diff --git a/user/src/com/google/gwt/text/client/NumberFormatRenderer.java b/user/src/com/google/gwt/text/client/NumberFormatRenderer.java
index b6e1e88e1f2..f5a03863241 100644
--- a/user/src/com/google/gwt/text/client/NumberFormatRenderer.java
+++ b/user/src/com/google/gwt/text/client/NumberFormatRenderer.java
@@ -38,6 +38,7 @@ public NumberFormatRenderer(NumberFormat format) {
this.format = format;
}
+ @Override
public String render(Number object) {
if (object == null) {
return "";
diff --git a/user/src/com/google/gwt/text/shared/AbstractRenderer.java b/user/src/com/google/gwt/text/shared/AbstractRenderer.java
index 946cfa717bc..605c84d303d 100644
--- a/user/src/com/google/gwt/text/shared/AbstractRenderer.java
+++ b/user/src/com/google/gwt/text/shared/AbstractRenderer.java
@@ -24,6 +24,7 @@
* @param the type to render
*/
public abstract class AbstractRenderer implements Renderer {
+ @Override
public void render(T object, Appendable appendable) throws IOException {
appendable.append(render(object));
}
diff --git a/user/src/com/google/gwt/text/shared/AbstractSafeHtmlRenderer.java b/user/src/com/google/gwt/text/shared/AbstractSafeHtmlRenderer.java
index 7a33b6904ad..124e45699a2 100644
--- a/user/src/com/google/gwt/text/shared/AbstractSafeHtmlRenderer.java
+++ b/user/src/com/google/gwt/text/shared/AbstractSafeHtmlRenderer.java
@@ -30,6 +30,7 @@ public abstract class AbstractSafeHtmlRenderer