diff --git a/.github/workflows/quick-check.yml b/.github/workflows/quick-check.yml index e87cc11e973..ca99310be36 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@v7 if: ${{ matrix.java-version == '21' }} diff --git a/common.ant.xml b/common.ant.xml index d5e03123423..7b92d4232c1 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/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/user/build.xml b/user/build.xml index c8aa603c0ec..76d5bf50b83 100755 --- a/user/build.xml +++ b/user/build.xml @@ -228,6 +228,7 @@ release="8" srcdir="${project.build}/jakarta-src" destdir="${javac.out}-jakarta" + errorprone.args="-XepDisableAllWarnings" excludes="**/EmulatedCharset.java,**/HashCodes.java,**/ConsoleLogger.java,**/NativeRegExp.java,**/SuperDevModeLogger.java,**/junit/**"> 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 implements private static final SafeHtml EMPTY_STRING = SafeHtmlUtils.fromSafeConstant(""); + @Override public void render(T object, SafeHtmlBuilder appendable) { appendable.append(render(object)); } diff --git a/user/src/com/google/gwt/text/shared/SimpleSafeHtmlRenderer.java b/user/src/com/google/gwt/text/shared/SimpleSafeHtmlRenderer.java index a763925429e..a3e26e86751 100644 --- a/user/src/com/google/gwt/text/shared/SimpleSafeHtmlRenderer.java +++ b/user/src/com/google/gwt/text/shared/SimpleSafeHtmlRenderer.java @@ -37,10 +37,12 @@ public static SimpleSafeHtmlRenderer getInstance() { private SimpleSafeHtmlRenderer() { } + @Override public SafeHtml render(String object) { return (object == null) ? SafeHtmlUtils.EMPTY_SAFE_HTML : SafeHtmlUtils.fromString(object); } + @Override public void render(String object, SafeHtmlBuilder appendable) { appendable.append(SafeHtmlUtils.fromString(object)); } diff --git a/user/src/com/google/gwt/text/shared/testing/PassthroughParser.java b/user/src/com/google/gwt/text/shared/testing/PassthroughParser.java index 927bf724562..5c2f74a782f 100644 --- a/user/src/com/google/gwt/text/shared/testing/PassthroughParser.java +++ b/user/src/com/google/gwt/text/shared/testing/PassthroughParser.java @@ -37,6 +37,7 @@ public static Parser instance() { protected PassthroughParser() { } + @Override public String parse(CharSequence object) { return object.toString(); } diff --git a/user/src/com/google/gwt/text/shared/testing/PassthroughRenderer.java b/user/src/com/google/gwt/text/shared/testing/PassthroughRenderer.java index 26f4816e8f4..2ff4b72ad2c 100644 --- a/user/src/com/google/gwt/text/shared/testing/PassthroughRenderer.java +++ b/user/src/com/google/gwt/text/shared/testing/PassthroughRenderer.java @@ -39,6 +39,7 @@ public static Renderer instance() { protected PassthroughRenderer() { } + @Override public String render(String object) { return object; } diff --git a/user/src/com/google/gwt/touch/client/DefaultMomentum.java b/user/src/com/google/gwt/touch/client/DefaultMomentum.java index 7681cdc6c4a..a548a097f82 100644 --- a/user/src/com/google/gwt/touch/client/DefaultMomentum.java +++ b/user/src/com/google/gwt/touch/client/DefaultMomentum.java @@ -36,10 +36,12 @@ public class DefaultMomentum implements Momentum { */ private static final double MIN_DECELERATION = 0.0005; + @Override public State createState(Point initialPosition, Point initialVelocity) { return new State(initialPosition, initialVelocity); } + @Override public boolean updateState(State state) { // Calculate the new velocity. int ellapsedMillis = state.getElapsedMillis(); diff --git a/user/src/com/google/gwt/touch/client/TouchScroller.java b/user/src/com/google/gwt/touch/client/TouchScroller.java index fb6f8f17e93..d7bcea2f8c4 100644 --- a/user/src/com/google/gwt/touch/client/TouchScroller.java +++ b/user/src/com/google/gwt/touch/client/TouchScroller.java @@ -121,6 +121,7 @@ public MomentumCommand(Point endVelocity) { * current scrolling position. */ windowResizeHandler = Window.addResizeHandler(new ResizeHandler() { + @Override public void onResize(ResizeEvent event) { finish(); } diff --git a/user/src/com/google/gwt/uibinder/attributeparsers/FieldReferenceConverter.java b/user/src/com/google/gwt/uibinder/attributeparsers/FieldReferenceConverter.java index 98d13ccb17e..2c2c73c2ed9 100644 --- a/user/src/com/google/gwt/uibinder/attributeparsers/FieldReferenceConverter.java +++ b/user/src/com/google/gwt/uibinder/attributeparsers/FieldReferenceConverter.java @@ -101,14 +101,17 @@ public int getComputedCount() { return computedCount; } + @Override public JType[] getTypes() { return new JType[0]; } + @Override public String handleFragment(String fragment) { return fragment; } + @Override public String handleReference(String reference) { computedCount++; return reference; diff --git a/user/src/com/google/gwt/uibinder/attributeparsers/IntPairAttributeParser.java b/user/src/com/google/gwt/uibinder/attributeparsers/IntPairAttributeParser.java index 6381b767bee..93d6ac845e7 100644 --- a/user/src/com/google/gwt/uibinder/attributeparsers/IntPairAttributeParser.java +++ b/user/src/com/google/gwt/uibinder/attributeparsers/IntPairAttributeParser.java @@ -32,6 +32,7 @@ class IntPairAttributeParser implements AttributeParser { this.logger = logger; } + @Override public String parse(XMLElement source, String value) throws UnableToCompleteException { String[] values = value.split(","); if (values.length != 2) { diff --git a/user/src/com/google/gwt/uibinder/attributeparsers/LengthAttributeParser.java b/user/src/com/google/gwt/uibinder/attributeparsers/LengthAttributeParser.java index ad765576bfc..ca75ec66fe6 100644 --- a/user/src/com/google/gwt/uibinder/attributeparsers/LengthAttributeParser.java +++ b/user/src/com/google/gwt/uibinder/attributeparsers/LengthAttributeParser.java @@ -48,6 +48,7 @@ public class LengthAttributeParser implements AttributeParser { this.logger = logger; } + @Override public String parse(XMLElement source, String lengthStr) throws UnableToCompleteException { Matcher matcher = pattern.matcher(lengthStr); if (!matcher.matches()) { diff --git a/user/src/com/google/gwt/uibinder/attributeparsers/StrictAttributeParser.java b/user/src/com/google/gwt/uibinder/attributeparsers/StrictAttributeParser.java index 731befc979a..bb138ba9e98 100644 --- a/user/src/com/google/gwt/uibinder/attributeparsers/StrictAttributeParser.java +++ b/user/src/com/google/gwt/uibinder/attributeparsers/StrictAttributeParser.java @@ -39,10 +39,12 @@ static class FieldReferenceDelegate implements Delegate { this.types = types; } + @Override public JType[] getTypes() { return types; } + @Override public String handleFragment(String fragment) throws IllegalFieldReferenceException { if (fragment.length() > 0) { @@ -51,6 +53,7 @@ public String handleFragment(String fragment) return fragment; } + @Override public String handleReference(String reference) throws IllegalFieldReferenceException { assertOnly(); @@ -83,6 +86,7 @@ private void assertOnly() { * In any other case (e.g. more than one field reference), an * UnableToCompleteException is thrown. */ + @Override public String parse(XMLElement source, String value) throws UnableToCompleteException { if ("".equals(value.trim())) { logger.die(source, "Cannot use empty value as type %s", FieldReference.renderTypesList(types)); diff --git a/user/src/com/google/gwt/uibinder/attributeparsers/StringAttributeParser.java b/user/src/com/google/gwt/uibinder/attributeparsers/StringAttributeParser.java index 92f9ca2abc8..5c853e3261b 100644 --- a/user/src/com/google/gwt/uibinder/attributeparsers/StringAttributeParser.java +++ b/user/src/com/google/gwt/uibinder/attributeparsers/StringAttributeParser.java @@ -32,15 +32,18 @@ static class FieldReferenceDelegate implements this.types = new JType[] { type }; } + @Override public JType[] getTypes() { return types; } + @Override public String handleFragment(String literal) { return "\"" + UiBinderWriter.escapeTextForJavaStringLiteral(literal) + "\""; } + @Override public String handleReference(String reference) { return String.format(" + %s + ", reference); } @@ -55,6 +58,7 @@ public String handleReference(String reference) { this.stringType = stringType; } + @Override public String parse(XMLElement source, String value) { return converter.convert(source, value, new FieldReferenceDelegate(stringType)); } diff --git a/user/src/com/google/gwt/uibinder/elementparsers/AbsolutePanelParser.java b/user/src/com/google/gwt/uibinder/elementparsers/AbsolutePanelParser.java index 47b06488858..2b6f6a8d8c3 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/AbsolutePanelParser.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/AbsolutePanelParser.java @@ -29,6 +29,7 @@ public class AbsolutePanelParser implements ElementParser { private static final String AT = "at"; + @Override public void parse(XMLElement elem, String fieldName, JClassType type, UiBinderWriter writer) throws UnableToCompleteException { diff --git a/user/src/com/google/gwt/uibinder/elementparsers/AttributeMessageInterpreter.java b/user/src/com/google/gwt/uibinder/elementparsers/AttributeMessageInterpreter.java index a2e205c9757..fe28c126096 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/AttributeMessageInterpreter.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/AttributeMessageInterpreter.java @@ -42,6 +42,7 @@ public AttributeMessageInterpreter(UiBinderWriter writer) { this.writer = writer; } + @Override public String interpretElement(XMLElement elem) throws UnableToCompleteException { MessagesWriter messages = writer.getMessages(); diff --git a/user/src/com/google/gwt/uibinder/elementparsers/AttributeMessageParser.java b/user/src/com/google/gwt/uibinder/elementparsers/AttributeMessageParser.java index 7a70e7384bd..bb1c4496fc9 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/AttributeMessageParser.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/AttributeMessageParser.java @@ -29,6 +29,7 @@ */ public class AttributeMessageParser implements ElementParser { + @Override public void parse(XMLElement elem, String fieldName, JClassType type, UiBinderWriter writer) throws UnableToCompleteException { writer.getMessages().consumeAndStoreMessageAttributesFor(elem); diff --git a/user/src/com/google/gwt/uibinder/elementparsers/BeanParser.java b/user/src/com/google/gwt/uibinder/elementparsers/BeanParser.java index 47e4f357a75..2db1f3694ac 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/BeanParser.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/BeanParser.java @@ -66,6 +66,7 @@ public BeanParser(UiBinderContext context) { * * @throws UnableToCompleteException */ + @Override public void parse(XMLElement elem, String fieldName, JClassType type, UiBinderWriter writer) throws UnableToCompleteException { diff --git a/user/src/com/google/gwt/uibinder/elementparsers/CellPanelParser.java b/user/src/com/google/gwt/uibinder/elementparsers/CellPanelParser.java index 14cbdaf8fb3..39c0d4767e0 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/CellPanelParser.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/CellPanelParser.java @@ -79,6 +79,7 @@ protected static void parseCellAttributes(XMLElement cellElem, String fieldName, } } + @Override public void parse(XMLElement elem, String fieldName, JClassType type, UiBinderWriter writer) throws UnableToCompleteException { for (XMLElement child : elem.consumeChildElements()) { diff --git a/user/src/com/google/gwt/uibinder/elementparsers/ComputedAttributeInterpreter.java b/user/src/com/google/gwt/uibinder/elementparsers/ComputedAttributeInterpreter.java index 9ccbc17e61a..4228d2558d1 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/ComputedAttributeInterpreter.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/ComputedAttributeInterpreter.java @@ -36,6 +36,7 @@ String getAttributeToken(XMLAttribute attribute) } class DefaultDelegate implements Delegate { + @Override public String getAttributeToken(XMLAttribute attribute) throws UnableToCompleteException { return writer.tokenForStringExpression(attribute.getElement(), attribute.consumeStringValue()); @@ -55,6 +56,7 @@ public ComputedAttributeInterpreter(UiBinderWriter writer, Delegate delegate) { this.writer = writer; } + @Override public String interpretElement(XMLElement elem) throws UnableToCompleteException { Map attNameToToken = new HashMap(); diff --git a/user/src/com/google/gwt/uibinder/elementparsers/CustomButtonParser.java b/user/src/com/google/gwt/uibinder/elementparsers/CustomButtonParser.java index febbe313240..5856edc545a 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/CustomButtonParser.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/CustomButtonParser.java @@ -43,6 +43,7 @@ public class CustomButtonParser implements ElementParser { faceNames.add("downDisabledFace"); } + @Override public void parse(final XMLElement elem, final String fieldName, JClassType type, final UiBinderWriter writer) throws UnableToCompleteException { @@ -52,6 +53,7 @@ public void parse(final XMLElement elem, final String fieldName, * HasHTMLParser to find. */ elem.consumeChildElements(new Interpreter() { + @Override public Boolean interpretElement(XMLElement child) throws UnableToCompleteException { // CustomButton can only contain Face elements. diff --git a/user/src/com/google/gwt/uibinder/elementparsers/DateLabelParser.java b/user/src/com/google/gwt/uibinder/elementparsers/DateLabelParser.java index 9959d78b60a..0c3e1bba1b7 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/DateLabelParser.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/DateLabelParser.java @@ -36,6 +36,7 @@ public class DateLabelParser implements ElementParser { static final String AT_MOST_ONE_SPECIFIED_TIME_ZONE = "May have at most one of timezone and timezoneOffset."; static final String NO_TIMEZONE_WITHOUT_SPECIFIED_FORMAT = "May not specify a time zone if no format is given."; + @Override public void parse(XMLElement elem, String fieldName, JClassType type, UiBinderWriter writer) throws UnableToCompleteException { boolean supportsTimeZone = hasDateTimeFormatAndTimeZoneConstructor( diff --git a/user/src/com/google/gwt/uibinder/elementparsers/DialogBoxParser.java b/user/src/com/google/gwt/uibinder/elementparsers/DialogBoxParser.java index fc4859dbe9b..49fd18fbf81 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/DialogBoxParser.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/DialogBoxParser.java @@ -32,6 +32,7 @@ public class DialogBoxParser implements ElementParser { private static final String CAPTION = "caption"; private static final String CUSTOM_CAPTION = "customCaption"; + @Override public void parse(XMLElement elem, String fieldName, JClassType type, UiBinderWriter writer) throws UnableToCompleteException { diff --git a/user/src/com/google/gwt/uibinder/elementparsers/DisclosurePanelParser.java b/user/src/com/google/gwt/uibinder/elementparsers/DisclosurePanelParser.java index f8b32e59381..29f64a83a89 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/DisclosurePanelParser.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/DisclosurePanelParser.java @@ -37,6 +37,7 @@ private static class Children { private static final String OPEN_IMAGE = "openImage"; private static final String CLOSED_IMAGE = "closedImage"; + @Override public void parse(final XMLElement panelElem, String panelField, JClassType type, final UiBinderWriter writer) throws UnableToCompleteException { @@ -91,6 +92,7 @@ private Children findChildren(final XMLElement elem, final Children children = new Children(); elem.consumeChildElements(new XMLElement.Interpreter() { + @Override public Boolean interpretElement(XMLElement child) throws UnableToCompleteException { diff --git a/user/src/com/google/gwt/uibinder/elementparsers/DockLayoutPanelParser.java b/user/src/com/google/gwt/uibinder/elementparsers/DockLayoutPanelParser.java index 207d3322c23..5f99787a648 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/DockLayoutPanelParser.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/DockLayoutPanelParser.java @@ -61,6 +61,7 @@ public CenterChild(XMLElement child, String widgetName) { DOCK_NAMES.put("center", "add"); } + @Override public void parse(XMLElement elem, String fieldName, JClassType type, UiBinderWriter writer) throws UnableToCompleteException { // Generate instantiation (requires a 'unit' ctor param). diff --git a/user/src/com/google/gwt/uibinder/elementparsers/DockPanelParser.java b/user/src/com/google/gwt/uibinder/elementparsers/DockPanelParser.java index 9db4cfafab4..188ddf84f10 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/DockPanelParser.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/DockPanelParser.java @@ -42,6 +42,7 @@ public class DockPanelParser implements ElementParser { values.put("LINE_END", "com.google.gwt.user.client.ui.DockPanel.LINE_END"); } + @Override public void parse(XMLElement elem, String fieldName, JClassType type, UiBinderWriter writer) throws UnableToCompleteException { // Parse children. diff --git a/user/src/com/google/gwt/uibinder/elementparsers/DomElementParser.java b/user/src/com/google/gwt/uibinder/elementparsers/DomElementParser.java index 3428485bc4b..252a30a5031 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/DomElementParser.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/DomElementParser.java @@ -28,6 +28,7 @@ */ public class DomElementParser implements ElementParser { + @Override public void parse(XMLElement elem, String fieldName, JClassType type, UiBinderWriter writer) throws UnableToCompleteException { HtmlInterpreter interpreter = new HtmlInterpreter(writer, fieldName, diff --git a/user/src/com/google/gwt/uibinder/elementparsers/FieldInterpreter.java b/user/src/com/google/gwt/uibinder/elementparsers/FieldInterpreter.java index 93d8d807b5d..7de6d4b8378 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/FieldInterpreter.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/FieldInterpreter.java @@ -33,6 +33,7 @@ public FieldInterpreter(UiBinderWriter writer, String ancestorExpression) { this.element = ancestorExpression; } + @Override public String interpretElement(XMLElement elem) throws UnableToCompleteException { String fieldName = writer.declareFieldIfNeeded(elem); diff --git a/user/src/com/google/gwt/uibinder/elementparsers/FlowPanelParser.java b/user/src/com/google/gwt/uibinder/elementparsers/FlowPanelParser.java index 19d5af4c77a..11c6334a9ee 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/FlowPanelParser.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/FlowPanelParser.java @@ -26,6 +26,7 @@ */ public class FlowPanelParser implements ElementParser { + @Override public void parse(XMLElement elem, String fieldName, JClassType type, final UiBinderWriter writer) throws UnableToCompleteException { String customTag = elem.consumeStringAttribute("tag", null); diff --git a/user/src/com/google/gwt/uibinder/elementparsers/GridParser.java b/user/src/com/google/gwt/uibinder/elementparsers/GridParser.java index 2f4fd5fdefa..f3a94230a09 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/GridParser.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/GridParser.java @@ -100,6 +100,7 @@ public int getRows() { private static final String STYLE_NAME_ATTRIBUTE = "styleName"; + @Override public void parse(XMLElement elem, String fieldName, JClassType type, UiBinderWriter writer) throws UnableToCompleteException { diff --git a/user/src/com/google/gwt/uibinder/elementparsers/HTMLPanelParser.java b/user/src/com/google/gwt/uibinder/elementparsers/HTMLPanelParser.java index f5e8754ec86..73efde51029 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/HTMLPanelParser.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/HTMLPanelParser.java @@ -29,6 +29,7 @@ */ public class HTMLPanelParser implements ElementParser { + @Override public void parse(XMLElement elem, String fieldName, JClassType type, final UiBinderWriter writer) throws UnableToCompleteException { @@ -86,6 +87,7 @@ private HtmlInterpreter makeHtmlInterpreter(final String fieldName, PlaceholderInterpreterProvider placeholderInterpreterProvider = new PlaceholderInterpreterProvider() { + @Override public PlaceholderInterpreter get(MessageWriter message) { return new WidgetPlaceholderInterpreter(fieldName, uiWriter, message, ancestorExpression); diff --git a/user/src/com/google/gwt/uibinder/elementparsers/HasAlignmentParser.java b/user/src/com/google/gwt/uibinder/elementparsers/HasAlignmentParser.java index c490ec8575f..3d28cf58a20 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/HasAlignmentParser.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/HasAlignmentParser.java @@ -34,6 +34,7 @@ */ public class HasAlignmentParser implements ElementParser { + @Override public void parse(XMLElement elem, String fieldName, JClassType type, UiBinderWriter writer) throws UnableToCompleteException { diff --git a/user/src/com/google/gwt/uibinder/elementparsers/HasHTMLParser.java b/user/src/com/google/gwt/uibinder/elementparsers/HasHTMLParser.java index cfdf40f48bc..88bda23590e 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/HasHTMLParser.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/HasHTMLParser.java @@ -25,6 +25,7 @@ */ public class HasHTMLParser implements ElementParser { + @Override public void parse(XMLElement elem, String fieldName, JClassType type, UiBinderWriter writer) throws UnableToCompleteException { diff --git a/user/src/com/google/gwt/uibinder/elementparsers/HasTextParser.java b/user/src/com/google/gwt/uibinder/elementparsers/HasTextParser.java index e4642b35144..37b7b867a0a 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/HasTextParser.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/HasTextParser.java @@ -25,6 +25,7 @@ */ public class HasTextParser implements ElementParser { + @Override public void parse(XMLElement elem, String fieldName, JClassType type, UiBinderWriter writer) throws UnableToCompleteException { // Widgets that implement HasText will use their elements' inner text. diff --git a/user/src/com/google/gwt/uibinder/elementparsers/HasTreeItemsParser.java b/user/src/com/google/gwt/uibinder/elementparsers/HasTreeItemsParser.java index 22d6eae913a..80682111db7 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/HasTreeItemsParser.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/HasTreeItemsParser.java @@ -31,6 +31,7 @@ public class HasTreeItemsParser implements ElementParser { static final String BAD_CHILD = "Only TreeItem or Widget subclasses are valid children"; + @Override public void parse(XMLElement elem, String fieldName, JClassType type, UiBinderWriter writer) throws UnableToCompleteException { // Prepare base types. diff --git a/user/src/com/google/gwt/uibinder/elementparsers/HasWidgetsParser.java b/user/src/com/google/gwt/uibinder/elementparsers/HasWidgetsParser.java index 419158de904..cf380794741 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/HasWidgetsParser.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/HasWidgetsParser.java @@ -29,6 +29,7 @@ */ public class HasWidgetsParser implements ElementParser { + @Override public void parse(XMLElement elem, String fieldName, JClassType type, UiBinderWriter writer) throws UnableToCompleteException { // Parse children. diff --git a/user/src/com/google/gwt/uibinder/elementparsers/HtmlInterpreter.java b/user/src/com/google/gwt/uibinder/elementparsers/HtmlInterpreter.java index 83ed4842e2f..8a1cbc2e3bd 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/HtmlInterpreter.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/HtmlInterpreter.java @@ -123,6 +123,7 @@ public HtmlInterpreter(UiBinderWriter writer, String ancestorExpression, pipe.add(messageInterpreter); } + @Override public String interpretElement(XMLElement elem) throws UnableToCompleteException { if (writer.useLazyWidgetBuilders() && writer.isElementAssignableTo(elem, SafeHtml.class)) { FieldWriter childField = writer.parseElementToField(elem); diff --git a/user/src/com/google/gwt/uibinder/elementparsers/HtmlMessageInterpreter.java b/user/src/com/google/gwt/uibinder/elementparsers/HtmlMessageInterpreter.java index 9a085c7f309..0c5a6f5ba4e 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/HtmlMessageInterpreter.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/HtmlMessageInterpreter.java @@ -58,12 +58,14 @@ public HtmlMessageInterpreter(UiBinderWriter uiWriter, public HtmlMessageInterpreter(final UiBinderWriter uiWriter, final String ancestorExpression) { this(uiWriter, new PlaceholderInterpreterProvider() { + @Override public PlaceholderInterpreter get(MessageWriter message) { return new HtmlPlaceholderInterpreter(uiWriter, message, ancestorExpression); } }); } + @Override public String interpretElement(XMLElement elem) throws UnableToCompleteException { MessagesWriter messages = uiWriter.getMessages(); diff --git a/user/src/com/google/gwt/uibinder/elementparsers/ImageParser.java b/user/src/com/google/gwt/uibinder/elementparsers/ImageParser.java index 9698da97b4a..3cb614a8f2f 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/ImageParser.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/ImageParser.java @@ -30,6 +30,7 @@ */ public class ImageParser implements ElementParser { + @Override public void parse(XMLElement elem, String fieldName, JClassType type, UiBinderWriter writer) throws UnableToCompleteException { if (hasImageResourceConstructor(writer.getOracle(), type)) { diff --git a/user/src/com/google/gwt/uibinder/elementparsers/InterpreterPipe.java b/user/src/com/google/gwt/uibinder/elementparsers/InterpreterPipe.java index 7501f60febd..d0c257f1c52 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/InterpreterPipe.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/InterpreterPipe.java @@ -52,6 +52,7 @@ public void add(Interpreter i) { * @return The T or null returned by the last pipelined interpreter to run * @throws UnableToCompleteException on error */ + @Override public T interpretElement(XMLElement elem) throws UnableToCompleteException { T rtn = null; for (XMLElement.Interpreter i : pipe) { @@ -69,6 +70,7 @@ public T interpretElement(XMLElement elem) throws UnableToCompleteException { * text to be post processed to each pipe member that is instanceof * {@link PostProcessingInterpreter}. */ + @Override public String postProcess(String consumedText) throws UnableToCompleteException { for (XMLElement.Interpreter i : pipe) { if (i instanceof PostProcessingInterpreter) { diff --git a/user/src/com/google/gwt/uibinder/elementparsers/IsEmptyParser.java b/user/src/com/google/gwt/uibinder/elementparsers/IsEmptyParser.java index 83aacfbb5ac..7df0f0dc2a5 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/IsEmptyParser.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/IsEmptyParser.java @@ -26,6 +26,7 @@ */ public class IsEmptyParser implements ElementParser { + @Override public void parse(XMLElement elem, String fieldName, JClassType type, UiBinderWriter writer) throws UnableToCompleteException { elem.assertNoAttributes(); diff --git a/user/src/com/google/gwt/uibinder/elementparsers/IsRenderableInterpreter.java b/user/src/com/google/gwt/uibinder/elementparsers/IsRenderableInterpreter.java index 1583ce9ea65..3b57cd397ce 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/IsRenderableInterpreter.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/IsRenderableInterpreter.java @@ -38,6 +38,7 @@ public IsRenderableInterpreter(String fieldName, UiBinderWriter writer) { assert writer.useLazyWidgetBuilders(); } + @Override public String interpretElement(XMLElement elem) throws UnableToCompleteException { if (!uiWriter.isRenderableElement(elem)) { diff --git a/user/src/com/google/gwt/uibinder/elementparsers/LayoutPanelParser.java b/user/src/com/google/gwt/uibinder/elementparsers/LayoutPanelParser.java index 5fcc2d2c1de..601c1984762 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/LayoutPanelParser.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/LayoutPanelParser.java @@ -32,6 +32,7 @@ public class LayoutPanelParser implements ElementParser { private static final String ERR_NEGATIVE_HEIGHT = "Attribute 'height' can not be negative."; private static final String LAYER = "layer"; + @Override public void parse(XMLElement elem, String fieldName, JClassType type, UiBinderWriter writer) throws UnableToCompleteException { diff --git a/user/src/com/google/gwt/uibinder/elementparsers/LazyPanelParser.java b/user/src/com/google/gwt/uibinder/elementparsers/LazyPanelParser.java index 4d24cbfc5d1..1650ea4a9bf 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/LazyPanelParser.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/LazyPanelParser.java @@ -34,6 +34,7 @@ public class LazyPanelParser implements ElementParser { + " }\n" + "}"; + @Override public void parse(XMLElement elem, String fieldName, JClassType type, UiBinderWriter writer) throws UnableToCompleteException { diff --git a/user/src/com/google/gwt/uibinder/elementparsers/ListBoxParser.java b/user/src/com/google/gwt/uibinder/elementparsers/ListBoxParser.java index c8221e6937c..f5c0ae70fae 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/ListBoxParser.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/ListBoxParser.java @@ -27,6 +27,7 @@ public class ListBoxParser implements ElementParser { private static final String ITEM_TAG = "item"; + @Override public void parse(XMLElement elem, String fieldName, JClassType type, UiBinderWriter writer) throws UnableToCompleteException { // Parse children. diff --git a/user/src/com/google/gwt/uibinder/elementparsers/MenuBarParser.java b/user/src/com/google/gwt/uibinder/elementparsers/MenuBarParser.java index db9a223c0cd..6786bce3166 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/MenuBarParser.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/MenuBarParser.java @@ -31,6 +31,7 @@ public class MenuBarParser implements ElementParser { static final String BAD_CHILD = "Only MenuItem or MenuItemSeparator subclasses are valid children"; + @Override public void parse(XMLElement elem, String fieldName, JClassType type, UiBinderWriter writer) throws UnableToCompleteException { // Generate instantiation (Vertical MenuBars require a ctor param). diff --git a/user/src/com/google/gwt/uibinder/elementparsers/MenuItemParser.java b/user/src/com/google/gwt/uibinder/elementparsers/MenuItemParser.java index 8e848fb141e..d5e3f658f92 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/MenuItemParser.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/MenuItemParser.java @@ -29,6 +29,7 @@ */ public class MenuItemParser implements ElementParser { + @Override public void parse(final XMLElement elem, String fieldName, JClassType type, final UiBinderWriter writer) throws UnableToCompleteException { @@ -45,6 +46,7 @@ public void parse(final XMLElement elem, String fieldName, JClassType type, class MenuBarInterpreter implements Interpreter { FieldWriter menuBarField = null; + @Override public Boolean interpretElement(XMLElement child) throws UnableToCompleteException { diff --git a/user/src/com/google/gwt/uibinder/elementparsers/NumberLabelParser.java b/user/src/com/google/gwt/uibinder/elementparsers/NumberLabelParser.java index 6b02d863502..e2f44dacfc4 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/NumberLabelParser.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/NumberLabelParser.java @@ -52,6 +52,7 @@ public class NumberLabelParser implements ElementParser { predefinedFormats = Collections.unmodifiableMap(formats); } + @Override public void parse(XMLElement elem, String fieldName, JClassType type, UiBinderWriter writer) throws UnableToCompleteException { if (hasNumberFormatConstructor(writer.getOracle(), type)) { diff --git a/user/src/com/google/gwt/uibinder/elementparsers/RenderablePanelParser.java b/user/src/com/google/gwt/uibinder/elementparsers/RenderablePanelParser.java index 47c8bfcac4a..f7184fcf031 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/RenderablePanelParser.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/RenderablePanelParser.java @@ -29,6 +29,7 @@ */ public class RenderablePanelParser implements ElementParser { + @Override public void parse(XMLElement elem, String fieldName, JClassType type, final UiBinderWriter writer) throws UnableToCompleteException { @@ -99,6 +100,7 @@ private HtmlInterpreter makeHtmlInterpreter(final String fieldName, PlaceholderInterpreterProvider placeholderInterpreterProvider = new PlaceholderInterpreterProvider() { + @Override public PlaceholderInterpreter get(MessageWriter message) { return new WidgetPlaceholderInterpreter(fieldName, uiWriter, message, ancestorExpression); diff --git a/user/src/com/google/gwt/uibinder/elementparsers/SimpleInterpeter.java b/user/src/com/google/gwt/uibinder/elementparsers/SimpleInterpeter.java index cbedb5cb997..32f7545ec53 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/SimpleInterpeter.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/SimpleInterpeter.java @@ -31,6 +31,7 @@ public SimpleInterpeter(T rtn) { this.rtn = rtn; } + @Override public T interpretElement(XMLElement elem) { return rtn; } diff --git a/user/src/com/google/gwt/uibinder/elementparsers/StackLayoutPanelParser.java b/user/src/com/google/gwt/uibinder/elementparsers/StackLayoutPanelParser.java index 1fd938142af..9513bd8cc32 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/StackLayoutPanelParser.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/StackLayoutPanelParser.java @@ -37,6 +37,7 @@ private static class Children { private static final String HEADER = "header"; private static final String STACK = "stack"; + @Override public void parse(XMLElement panelElem, String fieldName, JClassType type, UiBinderWriter writer) throws UnableToCompleteException { @@ -99,6 +100,7 @@ private Children findChildren(final XMLElement elem, final Children children = new Children(); elem.consumeChildElements(new XMLElement.Interpreter() { + @Override public Boolean interpretElement(XMLElement child) throws UnableToCompleteException { diff --git a/user/src/com/google/gwt/uibinder/elementparsers/StackPanelParser.java b/user/src/com/google/gwt/uibinder/elementparsers/StackPanelParser.java index 09722f877e2..7d193d15ac7 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/StackPanelParser.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/StackPanelParser.java @@ -28,6 +28,7 @@ public class StackPanelParser implements ElementParser { private static final String ATTRIBUTE_TEXT = "StackPanel-text"; + @Override public void parse(XMLElement elem, String fieldName, JClassType type, UiBinderWriter writer) throws UnableToCompleteException { // Parse children. diff --git a/user/src/com/google/gwt/uibinder/elementparsers/TabLayoutPanelParser.java b/user/src/com/google/gwt/uibinder/elementparsers/TabLayoutPanelParser.java index 31abf60c1be..031c3216d5f 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/TabLayoutPanelParser.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/TabLayoutPanelParser.java @@ -38,6 +38,7 @@ private static class Children { private static final String HEADER = "header"; private static final String TAB = "tab"; + @Override public void parse(XMLElement panelElem, String fieldName, JClassType type, UiBinderWriter writer) throws UnableToCompleteException { // TabLayoutPanel requires tabBar size and unit ctor args. @@ -103,6 +104,7 @@ private Children findChildren(final XMLElement elem, final Children children = new Children(); elem.consumeChildElements(new XMLElement.Interpreter() { + @Override public Boolean interpretElement(XMLElement child) throws UnableToCompleteException { diff --git a/user/src/com/google/gwt/uibinder/elementparsers/TabPanelParser.java b/user/src/com/google/gwt/uibinder/elementparsers/TabPanelParser.java index 6585d237b3e..e3eecf53614 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/TabPanelParser.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/TabPanelParser.java @@ -29,6 +29,7 @@ public class TabPanelParser implements ElementParser { private static final String TAG_TAB = "Tab"; private static final String TAG_TABHTML = "TabHTML"; + @Override public void parse(XMLElement panelElem, String fieldName, JClassType type, UiBinderWriter writer) throws UnableToCompleteException { // Parse children. diff --git a/user/src/com/google/gwt/uibinder/elementparsers/TextInterpreter.java b/user/src/com/google/gwt/uibinder/elementparsers/TextInterpreter.java index d480f81ef0f..e38274e9416 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/TextInterpreter.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/TextInterpreter.java @@ -38,6 +38,7 @@ public TextInterpreter(UiBinderWriter writer) { this.writer = writer; } + @Override public String interpretElement(XMLElement elem) throws UnableToCompleteException { MessagesWriter messages = writer.getMessages(); diff --git a/user/src/com/google/gwt/uibinder/elementparsers/TextPlaceholderInterpreter.java b/user/src/com/google/gwt/uibinder/elementparsers/TextPlaceholderInterpreter.java index 14c7b0ca822..db50be6600d 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/TextPlaceholderInterpreter.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/TextPlaceholderInterpreter.java @@ -33,7 +33,8 @@ public TextPlaceholderInterpreter(UiBinderWriter writer, super(writer, message); } - @Override protected String consumePlaceholderInnards(XMLElement elem) + @Override + protected String consumePlaceholderInnards(XMLElement elem) throws UnableToCompleteException { return elem.consumeInnerTextEscapedAsHtmlStringLiteral(new NullInterpreter()); } diff --git a/user/src/com/google/gwt/uibinder/elementparsers/UIObjectParser.java b/user/src/com/google/gwt/uibinder/elementparsers/UIObjectParser.java index a5af927c819..7fed41dc2a2 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/UIObjectParser.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/UIObjectParser.java @@ -27,6 +27,7 @@ */ public class UIObjectParser implements ElementParser { + @Override public void parse(XMLElement elem, String fieldName, JClassType type, UiBinderWriter writer) throws UnableToCompleteException { String debugId = elem.consumeStringAttribute("debugId", null); diff --git a/user/src/com/google/gwt/uibinder/elementparsers/UiChildParser.java b/user/src/com/google/gwt/uibinder/elementparsers/UiChildParser.java index aef42aa4fba..c526639a16f 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/UiChildParser.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/UiChildParser.java @@ -54,6 +54,7 @@ public UiChildParser(UiBinderContext uiBinderCtx) { this.uiBinderCtx = uiBinderCtx; } + @Override public void parse(final XMLElement elem, String fieldName, JClassType type, UiBinderWriter writer) throws UnableToCompleteException { this.fieldName = fieldName; @@ -66,6 +67,7 @@ public void parse(final XMLElement elem, String fieldName, JClassType type, // Parse children. elem.consumeChildElements(new Interpreter() { + @Override public Boolean interpretElement(XMLElement child) throws UnableToCompleteException { if (isValidChildElement(elem, child)) { diff --git a/user/src/com/google/gwt/uibinder/elementparsers/UiSafeHtmlInterpreter.java b/user/src/com/google/gwt/uibinder/elementparsers/UiSafeHtmlInterpreter.java index 1c41fd43ea1..25c12f773be 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/UiSafeHtmlInterpreter.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/UiSafeHtmlInterpreter.java @@ -28,6 +28,7 @@ public class UiSafeHtmlInterpreter extends UiTextInterpreter { * Used in {@link #interpretElement} to invoke the {@link ComputedAttributeInterpreter}. */ private class Delegate extends UiTextInterpreter.Delegate { + @Override public String getAttributeToken(XMLAttribute attribute) throws UnableToCompleteException { return writer.tokenForSafeHtmlExpression(attribute.getElement(), attribute.consumeSafeHtmlValue()); @@ -38,6 +39,7 @@ public UiSafeHtmlInterpreter(UiBinderWriter writer) { super(writer); } + @Override protected ComputedAttributeInterpreter createComputedAttributeInterpreter() { return new ComputedAttributeInterpreter(writer, new Delegate()); } diff --git a/user/src/com/google/gwt/uibinder/elementparsers/UiTextInterpreter.java b/user/src/com/google/gwt/uibinder/elementparsers/UiTextInterpreter.java index 91abcf6a8c0..3172005e01d 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/UiTextInterpreter.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/UiTextInterpreter.java @@ -31,6 +31,7 @@ public class UiTextInterpreter implements XMLElement.Interpreter { * Used in {@link #interpretElement} to invoke the {@link ComputedAttributeInterpreter}. */ protected class Delegate implements ComputedAttributeInterpreter.Delegate { + @Override public String getAttributeToken(XMLAttribute attribute) throws UnableToCompleteException { return writer.tokenForStringExpression(attribute.getElement(), attribute.consumeStringValue()); } @@ -46,6 +47,7 @@ public UiTextInterpreter(UiBinderWriter writer) { this.computedAttributeInterpreter = createComputedAttributeInterpreter(); } + @Override public String interpretElement(XMLElement elem) throws UnableToCompleteException { // Must be in the format: diff --git a/user/src/com/google/gwt/uibinder/elementparsers/WidgetInterpreter.java b/user/src/com/google/gwt/uibinder/elementparsers/WidgetInterpreter.java index 2da2ccc8513..4fffefc094d 100644 --- a/user/src/com/google/gwt/uibinder/elementparsers/WidgetInterpreter.java +++ b/user/src/com/google/gwt/uibinder/elementparsers/WidgetInterpreter.java @@ -69,6 +69,7 @@ public WidgetInterpreter(String fieldName, UiBinderWriter writer) { this.uiWriter = writer; } + @Override public String interpretElement(XMLElement elem) throws UnableToCompleteException { if (!uiWriter.isWidgetElement(elem)) { diff --git a/user/src/com/google/gwt/uibinder/rebind/AbstractFieldWriter.java b/user/src/com/google/gwt/uibinder/rebind/AbstractFieldWriter.java index 6d22169b200..4f5a24fdbc2 100644 --- a/user/src/com/google/gwt/uibinder/rebind/AbstractFieldWriter.java +++ b/user/src/com/google/gwt/uibinder/rebind/AbstractFieldWriter.java @@ -95,10 +95,12 @@ public FieldWriterType getFieldType() { return fieldType; } + @Override public String getHtml() { return html + ".asString()"; } + @Override public String getInitializer() { return initializer; } @@ -113,6 +115,7 @@ public String getNextReference() { return manager.convertFieldToGetter(name); } + @Override public JType getReturnType(String[] path, MonitoredLogger logger) { if (!name.equals(path[0])) { throw new RuntimeException(this @@ -123,10 +126,12 @@ public JType getReturnType(String[] path, MonitoredLogger logger) { return getReturnType(getAssignableType(), pathList, logger); } + @Override public String getSafeHtml() { return html; } + @Override public void needs(FieldWriter f) { needs.add(f); } @@ -136,10 +141,12 @@ public void setBuildPrecedence(int precedence) { this.buildPrecedence = precedence; } + @Override public void setHtml(String html) { this.html = html; } + @Override public void setInitializer(String initializer) { this.initializer = initializer; } @@ -150,6 +157,7 @@ public String toString() { initializer); } + @Override public void write(IndentedWriter w) throws UnableToCompleteException { if (written) { return; diff --git a/user/src/com/google/gwt/uibinder/rebind/DesignTimeUtilsImpl.java b/user/src/com/google/gwt/uibinder/rebind/DesignTimeUtilsImpl.java index 85f1db6465c..04368f94c3c 100644 --- a/user/src/com/google/gwt/uibinder/rebind/DesignTimeUtilsImpl.java +++ b/user/src/com/google/gwt/uibinder/rebind/DesignTimeUtilsImpl.java @@ -45,6 +45,7 @@ public static boolean isDesignTime(String fqInterfaceName) { private final Map elementPaths = new HashMap(); private final Map attributes = new HashMap(); + @Override public void addDeclarations(IndentedWriter w) { // handler w.write("public static interface DTObjectHandler {"); @@ -80,14 +81,17 @@ public void addDeclarations(IndentedWriter w) { w.write("}"); } + @Override public String getImplName(String implName) { return implName + "_designTime" + System.currentTimeMillis(); } + @Override public String getPath(Element element) { return elementPaths.get(element); } + @Override public String getProvidedFactory(String typeName, String methodName, String args) { return String.format( @@ -95,16 +99,19 @@ public String getProvidedFactory(String typeName, String methodName, typeName, methodName, args); } + @Override public String getProvidedField(String typeName, String fieldName) { return String.format( "(%1$s) dtObjectHandler.provideField(%1s.class, \"%2$s\")", typeName, fieldName); } + @Override public String getTemplateContent(String path) { return System.getProperty("gwt.UiBinder.designTime " + path); } + @Override public void handleUIObject(Statements writer, XMLElement elem, String fieldName) { writer.addStatement( @@ -112,16 +119,19 @@ public void handleUIObject(Statements writer, XMLElement elem, elem.getDesignTimePath(), fieldName); } + @Override public boolean isDesignTime() { return true; } + @Override public void putAttribute(XMLElement elem, String name, String value) { String path = elem.getDesignTimePath(); String key = path + " " + name; attributes.put(key, value); } + @Override public void putAttribute(XMLElement elem, String name, String[] values) { if (values.length == 0) { return; @@ -138,10 +148,12 @@ public void putAttribute(XMLElement elem, String name, String[] values) { putAttribute(elem, name, sb.toString()); } + @Override public void rememberPathForElements(Document doc) { rememberPathForElements(doc.getDocumentElement(), "0"); } + @Override public void writeAttributes(Statements writer) { for (Map.Entry entry : attributes.entrySet()) { String key = entry.getKey(); diff --git a/user/src/com/google/gwt/uibinder/rebind/DesignTimeUtilsStub.java b/user/src/com/google/gwt/uibinder/rebind/DesignTimeUtilsStub.java index 072ccea918b..7bcec4c5f07 100644 --- a/user/src/com/google/gwt/uibinder/rebind/DesignTimeUtilsStub.java +++ b/user/src/com/google/gwt/uibinder/rebind/DesignTimeUtilsStub.java @@ -24,47 +24,59 @@ public class DesignTimeUtilsStub implements DesignTimeUtils { public static final DesignTimeUtils EMPTY = new DesignTimeUtilsStub(); + @Override public void addDeclarations(IndentedWriter w) { } + @Override public String getImplName(String implName) { return implName; } + @Override public String getPath(Element element) { return null; } + @Override public String getProvidedFactory(String typeName, String methodName, String args) { return null; } + @Override public String getProvidedField(String typeName, String fieldName) { return null; } + @Override public String getTemplateContent(String path) { return null; } + @Override public void handleUIObject(Statements writer, XMLElement elem, String fieldName) { } + @Override public boolean isDesignTime() { return false; } + @Override public void putAttribute(XMLElement elem, String name, String value) { } + @Override public void putAttribute(XMLElement elem, String name, String[] values) { } + @Override public void rememberPathForElements(Document doc) { } + @Override public void writeAttributes(Statements writer) { } } \ No newline at end of file diff --git a/user/src/com/google/gwt/uibinder/rebind/FieldManager.java b/user/src/com/google/gwt/uibinder/rebind/FieldManager.java index 10456e535f9..95ab17f7f2a 100644 --- a/user/src/com/google/gwt/uibinder/rebind/FieldManager.java +++ b/user/src/com/google/gwt/uibinder/rebind/FieldManager.java @@ -57,6 +57,7 @@ public FieldAndSource(FieldWriter field, XMLElement element) { private static final Comparator BUILD_DEFINITION_SORT = new Comparator() { + @Override public int compare(FieldWriter field1, FieldWriter field2) { // First get type precedence, if ties the field precedence is used. int precedence = field2.getFieldType().getBuildPrecedence() diff --git a/user/src/com/google/gwt/uibinder/rebind/FieldWriterOfExistingType.java b/user/src/com/google/gwt/uibinder/rebind/FieldWriterOfExistingType.java index 46e5b733f39..a25aec65034 100644 --- a/user/src/com/google/gwt/uibinder/rebind/FieldWriterOfExistingType.java +++ b/user/src/com/google/gwt/uibinder/rebind/FieldWriterOfExistingType.java @@ -35,14 +35,17 @@ class FieldWriterOfExistingType extends AbstractFieldWriter { this.type = type; } + @Override public JClassType getAssignableType() { return type; } + @Override public JClassType getInstantiableType() { return type; } + @Override public String getQualifiedSourceName() { return type.getQualifiedSourceName(); } diff --git a/user/src/com/google/gwt/uibinder/rebind/FieldWriterOfGeneratedCssResource.java b/user/src/com/google/gwt/uibinder/rebind/FieldWriterOfGeneratedCssResource.java index 480a1df0b01..24b38ee7bc2 100644 --- a/user/src/com/google/gwt/uibinder/rebind/FieldWriterOfGeneratedCssResource.java +++ b/user/src/com/google/gwt/uibinder/rebind/FieldWriterOfGeneratedCssResource.java @@ -40,14 +40,17 @@ public FieldWriterOfGeneratedCssResource(FieldManager manager, JType stringType, this.css = css; } + @Override public JClassType getAssignableType() { return css.getExtendedInterface(); } + @Override public JClassType getInstantiableType() { return null; } + @Override public String getQualifiedSourceName() { return css.getQualifiedSourceName(); } diff --git a/user/src/com/google/gwt/uibinder/rebind/FieldWriterOfGeneratedType.java b/user/src/com/google/gwt/uibinder/rebind/FieldWriterOfGeneratedType.java index 2139b3173d0..a19f93fd46e 100644 --- a/user/src/com/google/gwt/uibinder/rebind/FieldWriterOfGeneratedType.java +++ b/user/src/com/google/gwt/uibinder/rebind/FieldWriterOfGeneratedType.java @@ -45,14 +45,17 @@ public FieldWriterOfGeneratedType(FieldManager manager, JClassType assignableTyp this.typePackage = typePackage; } + @Override public JClassType getAssignableType() { return assignableType; } + @Override public JClassType getInstantiableType() { return null; } + @Override public String getQualifiedSourceName() { if (typePackage.length() == 0) { return typeName; diff --git a/user/src/com/google/gwt/uibinder/rebind/FieldWriterOfLazyDomElement.java b/user/src/com/google/gwt/uibinder/rebind/FieldWriterOfLazyDomElement.java index 519c6ef17db..e82dba295bd 100644 --- a/user/src/com/google/gwt/uibinder/rebind/FieldWriterOfLazyDomElement.java +++ b/user/src/com/google/gwt/uibinder/rebind/FieldWriterOfLazyDomElement.java @@ -57,14 +57,17 @@ public FieldWriterOfLazyDomElement(FieldManager manager, JClassType templateFiel } } + @Override public JClassType getAssignableType() { return ownerFieldType; } + @Override public JClassType getInstantiableType() { return ownerFieldType; } + @Override public String getQualifiedSourceName() { return ownerFieldType.getQualifiedSourceName() + "<" + parameterType.getQualifiedSourceName() + ">"; diff --git a/user/src/com/google/gwt/uibinder/rebind/GetInnerTextVisitor.java b/user/src/com/google/gwt/uibinder/rebind/GetInnerTextVisitor.java index 06d3202e3b4..b1223b4a88b 100644 --- a/user/src/com/google/gwt/uibinder/rebind/GetInnerTextVisitor.java +++ b/user/src/com/google/gwt/uibinder/rebind/GetInnerTextVisitor.java @@ -68,10 +68,12 @@ protected GetInnerTextVisitor(StringBuffer buffer, this.escapeHtmlEntities = escapeHtmlEntities; } + @Override public void visitCData(CDATASection d) { // TODO(jgw): write this back just as it came in. } + @Override public void visitElement(Element e) throws UnableToCompleteException { String replacement = interpreter.interpretElement(elementProvider.get(e)); @@ -80,6 +82,7 @@ public void visitElement(Element e) throws UnableToCompleteException { } } + @Override public void visitText(Text t) { String escaped; if (escapeHtmlEntities) { diff --git a/user/src/com/google/gwt/uibinder/rebind/NullInterpreter.java b/user/src/com/google/gwt/uibinder/rebind/NullInterpreter.java index fa5e7b97856..121472dde5c 100644 --- a/user/src/com/google/gwt/uibinder/rebind/NullInterpreter.java +++ b/user/src/com/google/gwt/uibinder/rebind/NullInterpreter.java @@ -20,6 +20,7 @@ * @param The type of null to return */ public final class NullInterpreter implements XMLElement.Interpreter { + @Override public T interpretElement(XMLElement elem) { return null; } diff --git a/user/src/com/google/gwt/uibinder/rebind/Statements.java b/user/src/com/google/gwt/uibinder/rebind/Statements.java index eac6a9a3d03..f68c0dae637 100644 --- a/user/src/com/google/gwt/uibinder/rebind/Statements.java +++ b/user/src/com/google/gwt/uibinder/rebind/Statements.java @@ -30,12 +30,15 @@ public interface Statements { */ class Empty implements Statements { + @Override public void addDetachStatement(String format, Object... args) { } + @Override public void addInitStatement(String format, Object... params) { } + @Override public void addStatement(String format, Object... args) { } }; diff --git a/user/src/com/google/gwt/uibinder/rebind/Tokenator.java b/user/src/com/google/gwt/uibinder/rebind/Tokenator.java index 728f4885688..b584f9ea715 100644 --- a/user/src/com/google/gwt/uibinder/rebind/Tokenator.java +++ b/user/src/com/google/gwt/uibinder/rebind/Tokenator.java @@ -90,6 +90,7 @@ private static String nextToken() { */ public String detokenate(String betokened) { return detokenate(betokened, new Resolver() { + @Override public String resolveToken(String token) { return tokenToResolved.get(token); } @@ -102,6 +103,7 @@ public String resolveToken(String token) { */ public List getOrderedValues(String betokened) { return getOrderedValues(betokened, new Resolver() { + @Override public String resolveToken(String token) { return tokenToResolved.get(token); } diff --git a/user/src/com/google/gwt/uibinder/rebind/UiBinderWriter.java b/user/src/com/google/gwt/uibinder/rebind/UiBinderWriter.java index d986e642908..93e67e5b0f9 100644 --- a/user/src/com/google/gwt/uibinder/rebind/UiBinderWriter.java +++ b/user/src/com/google/gwt/uibinder/rebind/UiBinderWriter.java @@ -457,6 +457,7 @@ public UiBinderWriter(JClassType baseClass, String implClassName, String templat * @param args * @see #beginAttachedSection(String) */ + @Override public void addDetachStatement(String format, Object... args) { detachStatementsStack.getFirst().add(String.format(format, args)); } @@ -465,6 +466,7 @@ public void addDetachStatement(String format, Object... args) { * Add a statement to be run after everything has been instantiated, in the * style of {@link String#format}. */ + @Override public void addInitStatement(String format, Object... params) { initStatements.add(formatCode(format, params)); } @@ -473,6 +475,7 @@ public void addInitStatement(String format, Object... params) { * Adds a statement to the block run after fields are declared, in the style * of {@link String#format}. */ + @Override public void addStatement(String format, Object... args) { String code = formatCode(format, args); diff --git a/user/src/com/google/gwt/uibinder/rebind/XMLElement.java b/user/src/com/google/gwt/uibinder/rebind/XMLElement.java index 07bee2c1495..73961571807 100644 --- a/user/src/com/google/gwt/uibinder/rebind/XMLElement.java +++ b/user/src/com/google/gwt/uibinder/rebind/XMLElement.java @@ -192,6 +192,7 @@ public void assertNoAttributes() throws UnableToCompleteException { */ public void assertNoBody() throws UnableToCompleteException { consumeChildElements(new Interpreter() { + @Override public Boolean interpretElement(XMLElement elem) throws UnableToCompleteException { logger.die(elem, "Found unexpected child element"); return false; // unreachable diff --git a/user/src/com/google/gwt/uibinder/rebind/XMLElementProviderImpl.java b/user/src/com/google/gwt/uibinder/rebind/XMLElementProviderImpl.java index 6b978c3e98a..5fe06864070 100644 --- a/user/src/com/google/gwt/uibinder/rebind/XMLElementProviderImpl.java +++ b/user/src/com/google/gwt/uibinder/rebind/XMLElementProviderImpl.java @@ -40,6 +40,7 @@ public XMLElementProviderImpl(AttributeParsers attributeParsers, this.designTime = designTime; } + @Override public XMLElement get(Element e) { return new XMLElement(e, attributeParsers, oracle, logger, designTime, this); diff --git a/user/src/com/google/gwt/uibinder/rebind/messages/MessagesWriter.java b/user/src/com/google/gwt/uibinder/rebind/messages/MessagesWriter.java index 53230f7b518..39c3eb65c5a 100644 --- a/user/src/com/google/gwt/uibinder/rebind/messages/MessagesWriter.java +++ b/user/src/com/google/gwt/uibinder/rebind/messages/MessagesWriter.java @@ -366,6 +366,7 @@ private void genInterfaceAnnotations(IndentedWriter pw) { private Collection getAttributeMessageChildren( final XMLElement elem) throws UnableToCompleteException { return elem.consumeChildElements(new XMLElement.Interpreter() { + @Override public Boolean interpretElement(XMLElement child) throws UnableToCompleteException { if (isAttributeMessage(child)) { diff --git a/user/src/com/google/gwt/uibinder/rebind/messages/PlaceholderInterpreter.java b/user/src/com/google/gwt/uibinder/rebind/messages/PlaceholderInterpreter.java index eb1663dfe1a..021b9a67d87 100644 --- a/user/src/com/google/gwt/uibinder/rebind/messages/PlaceholderInterpreter.java +++ b/user/src/com/google/gwt/uibinder/rebind/messages/PlaceholderInterpreter.java @@ -38,6 +38,7 @@ public PlaceholderInterpreter(UiBinderWriter writer, MessageWriter message) { this.message = message; } + @Override public String interpretElement(XMLElement elem) throws UnableToCompleteException { if (isPlaceholderElement(elem)) { @@ -97,6 +98,7 @@ public String interpretElement(XMLElement elem) * Performs escaping on the consumed text to make it safe for use as a * Messages {@literal @}Default value */ + @Override @SuppressWarnings("unused") public String postProcess(String consumed) throws UnableToCompleteException { return tokenator.detokenate(MessageWriter.escapeMessageFormat(consumed)); @@ -132,6 +134,7 @@ protected String nextPlaceholder(String name, String example, String value) { protected String stripTokens(String value) { String rtn = Tokenator.detokenate(value, new Resolver() { + @Override public String resolveToken(String token) { return ""; } diff --git a/user/src/com/google/gwt/uibinder/rebind/model/HtmlTemplateMethodWriter.java b/user/src/com/google/gwt/uibinder/rebind/model/HtmlTemplateMethodWriter.java index 0a6dea02834..ccee364cae0 100644 --- a/user/src/com/google/gwt/uibinder/rebind/model/HtmlTemplateMethodWriter.java +++ b/user/src/com/google/gwt/uibinder/rebind/model/HtmlTemplateMethodWriter.java @@ -177,6 +177,7 @@ private String addTemplatePlaceholders(String html) { String rtn = Tokenator.detokenate(html, new Resolver() { int tokenId = 0; + @Override public String resolveToken(String token) { return "{" + tokenId++ + "}"; } diff --git a/user/src/com/google/gwt/user/cellview/client/AbstractCellTree.java b/user/src/com/google/gwt/user/cellview/client/AbstractCellTree.java index 0d5ede03761..12817871850 100644 --- a/user/src/com/google/gwt/user/cellview/client/AbstractCellTree.java +++ b/user/src/com/google/gwt/user/cellview/client/AbstractCellTree.java @@ -51,14 +51,17 @@ public AbstractCellTree(TreeViewModel viewModel) { this.viewModel = viewModel; } + @Override public HandlerRegistration addCloseHandler(CloseHandler handler) { return addHandler(handler, CloseEvent.getType()); } + @Override public HandlerRegistration addOpenHandler(OpenHandler handler) { return addHandler(handler, OpenEvent.getType()); } + @Override public KeyboardSelectionPolicy getKeyboardSelectionPolicy() { return keyboardSelectionPolicy; } @@ -79,6 +82,7 @@ public TreeViewModel getTreeViewModel() { return viewModel; } + @Override public void setKeyboardSelectionPolicy(KeyboardSelectionPolicy policy) { if (policy == null) { throw new NullPointerException("KeyboardSelectionPolicy cannot be null"); diff --git a/user/src/com/google/gwt/user/cellview/client/AbstractHasData.java b/user/src/com/google/gwt/user/cellview/client/AbstractHasData.java index 118acaba998..742c9e965b8 100644 --- a/user/src/com/google/gwt/user/cellview/client/AbstractHasData.java +++ b/user/src/com/google/gwt/user/cellview/client/AbstractHasData.java @@ -233,11 +233,13 @@ public interface Handler extends EventHandler { void onRedraw(); } - @Override public Type getAssociatedType() { + @Override + public Type getAssociatedType() { return TYPE; } - @Override protected void dispatch(RedrawEvent.Handler handler) { + @Override + protected void dispatch(RedrawEvent.Handler handler) { handler.onRedraw(); } } diff --git a/user/src/com/google/gwt/user/cellview/client/CellTree.java b/user/src/com/google/gwt/user/cellview/client/CellTree.java index 94b61de117c..23c3c756da5 100644 --- a/user/src/com/google/gwt/user/cellview/client/CellTree.java +++ b/user/src/com/google/gwt/user/cellview/client/CellTree.java @@ -76,19 +76,23 @@ public class CellTree extends AbstractCellTree implements HasAnimation, */ public interface BasicResources extends Resources { + @Override @ImageOptions(flipRtl = true) ImageResource cellTreeClosedItem(); + @Override @ImageOptions(flipRtl = true) @Source("cellTreeLoadingBasic.gif") ImageResource cellTreeLoading(); + @Override @ImageOptions(flipRtl = true) ImageResource cellTreeOpenItem(); /** * The styles used in this widget. */ + @Override @Source(BasicStyle.DEFAULT_CSS) BasicStyle cellTreeStyle(); } @@ -684,10 +688,12 @@ public TreeNode getRootTreeNode() { return rootNode.getTreeNode(); } + @Override public int getTabIndex() { return tabIndex; } + @Override public boolean isAnimationEnabled() { return isAnimationEnabled; } @@ -780,6 +786,7 @@ public void onBrowserEvent(Event event) { * * @see #getAccessKey() */ + @Override public void setAccessKey(char key) { this.accessKey = key; keyboardSelectedNode.setKeyboardSelected(true, false); @@ -798,6 +805,7 @@ public void setAnimation(NodeAnimation animation) { this.animation = animation; } + @Override public void setAnimationEnabled(boolean enable) { this.isAnimationEnabled = enable; if (!enable && animation != null) { @@ -818,6 +826,7 @@ public void setDefaultNodeSize(int defaultNodeSize) { this.defaultNodeSize = defaultNodeSize; } + @Override public void setFocus(boolean focused) { keyboardSelectedNode.setKeyboardSelected(true, true); } @@ -838,6 +847,7 @@ public void setKeyboardSelectedTreeNode(TreeNode parentNode, int childIndex, boo keyboardSelect(nodeView.getChildNode(childIndex), stealFocus); } + @Override public void setTabIndex(int index) { this.tabIndex = index; keyboardSelectedNode.setKeyboardSelected(true, false); @@ -967,6 +977,7 @@ void maybeAnimateTreeNode(CellTreeNodeView node) { */ void resetFocus() { CellBasedWidgetImpl.get().resetFocus(new Scheduler.ScheduledCommand() { + @Override public void execute() { if (isFocused && !keyboardSelectedNode.isDestroyed() && !keyboardSelectedNode.resetFocusOnCell()) { diff --git a/user/src/com/google/gwt/user/cellview/client/ColumnSortEvent.java b/user/src/com/google/gwt/user/cellview/client/ColumnSortEvent.java index 34e41070a06..819a37ab5a1 100644 --- a/user/src/com/google/gwt/user/cellview/client/ColumnSortEvent.java +++ b/user/src/com/google/gwt/user/cellview/client/ColumnSortEvent.java @@ -59,6 +59,7 @@ public AsyncHandler(HasData hasData) { this.hasData = hasData; } + @Override public void onColumnSort(ColumnSortEvent event) { hasData.setVisibleRangeAndClearData(hasData.getVisibleRange(), true); } @@ -100,6 +101,7 @@ public List getList() { return list; } + @Override public void onColumnSort(ColumnSortEvent event) { // Get the sorted column. Column column = event.getColumn(); @@ -118,6 +120,7 @@ public void onColumnSort(ColumnSortEvent event) { Collections.sort(list, comparator); } else { Collections.sort(list, new Comparator() { + @Override public int compare(T o1, T o2) { return -comparator.compare(o1, o2); } diff --git a/user/src/com/google/gwt/user/cellview/client/PageSizePager.java b/user/src/com/google/gwt/user/cellview/client/PageSizePager.java index c58ce1dab0f..d04a3559892 100644 --- a/user/src/com/google/gwt/user/cellview/client/PageSizePager.java +++ b/user/src/com/google/gwt/user/cellview/client/PageSizePager.java @@ -56,6 +56,7 @@ public PageSizePager(final int increment) { // Show more button. showMoreButton.addClickHandler(new ClickHandler() { + @Override public void onClick(ClickEvent event) { // Display should be non-null, but we check defensively. HasRows display = getDisplay(); @@ -69,6 +70,7 @@ public void onClick(ClickEvent event) { } }); showLessButton.addClickHandler(new ClickHandler() { + @Override public void onClick(ClickEvent event) { // Display should be non-null, but we check defensively. HasRows display = getDisplay(); diff --git a/user/src/com/google/gwt/user/client/BaseListenerWrapper.java b/user/src/com/google/gwt/user/client/BaseListenerWrapper.java index 9e7dbc363fd..6988b3ccc07 100644 --- a/user/src/com/google/gwt/user/client/BaseListenerWrapper.java +++ b/user/src/com/google/gwt/user/client/BaseListenerWrapper.java @@ -58,10 +58,12 @@ private WrapWindowClose(WindowCloseListener listener) { super(listener); } + @Override public void onClose(CloseEvent event) { listener.onWindowClosed(); } + @Override public void onWindowClosing(Window.ClosingEvent event) { String message = listener.onWindowClosing(); if (event.getMessage() == null) { @@ -86,6 +88,7 @@ private WrapWindowResize(WindowResizeListener listener) { super(listener); } + @Override public void onResize(ResizeEvent event) { listener.onWindowResized(event.getWidth(), event.getHeight()); } @@ -107,6 +110,7 @@ private WrapWindowScroll(WindowScrollListener listener) { super(listener); } + @Override public void onWindowScroll(Window.ScrollEvent event) { listener.onWindowScrolled(event.getScrollLeft(), event.getScrollTop()); } diff --git a/user/src/com/google/gwt/user/client/Command.java b/user/src/com/google/gwt/user/client/Command.java index e664e312c8d..496bfc457c9 100644 --- a/user/src/com/google/gwt/user/client/Command.java +++ b/user/src/com/google/gwt/user/client/Command.java @@ -51,5 +51,6 @@ public interface Command extends Scheduler.ScheduledCommand { /** * Causes the Command to perform its encapsulated behavior. */ + @Override void execute(); } diff --git a/user/src/com/google/gwt/user/client/CommandExecutor.java b/user/src/com/google/gwt/user/client/CommandExecutor.java index a787730e629..d5a75f6a276 100644 --- a/user/src/com/google/gwt/user/client/CommandExecutor.java +++ b/user/src/com/google/gwt/user/client/CommandExecutor.java @@ -70,6 +70,7 @@ private class CircularIterator implements Iterator { * * @return true if there are more commands in the queue. */ + @Override public boolean hasNext() { return next < end; } @@ -80,6 +81,7 @@ public boolean hasNext() { * * @return next command from the queue. */ + @Override public Object next() { last = next; Object command = commands.get(next++); @@ -94,6 +96,7 @@ public Object next() { * Removes the command which was previously returned by {@link #next()}. * */ + @Override public void remove() { assert (last >= 0); diff --git a/user/src/com/google/gwt/user/client/DOM.java b/user/src/com/google/gwt/user/client/DOM.java index cf19b122e99..e11ad5bb69f 100644 --- a/user/src/com/google/gwt/user/client/DOM.java +++ b/user/src/com/google/gwt/user/client/DOM.java @@ -49,6 +49,7 @@ private NativePreview(EventPreview listener) { super(listener); } + @Override public void onPreviewNativeEvent(NativePreviewEvent event) { // The legacy EventHandler should only fire if it is on the top of the // stack (ie. the last one added). diff --git a/user/src/com/google/gwt/user/client/Event.java b/user/src/com/google/gwt/user/client/Event.java index ad8d8e3c518..e3c5f05df4f 100644 --- a/user/src/com/google/gwt/user/client/Event.java +++ b/user/src/com/google/gwt/user/client/Event.java @@ -145,6 +145,7 @@ public final Type getAssociatedType() { return TYPE; } + @Override public NativeEvent getNativeEvent() { return nativeEvent; } diff --git a/user/src/com/google/gwt/user/client/IncrementalCommand.java b/user/src/com/google/gwt/user/client/IncrementalCommand.java index dd53bd3e3d3..9b9a7b31fa3 100644 --- a/user/src/com/google/gwt/user/client/IncrementalCommand.java +++ b/user/src/com/google/gwt/user/client/IncrementalCommand.java @@ -38,5 +38,6 @@ public interface IncrementalCommand extends RepeatingCommand { * @return true if the command has more work to do, * false otherwise */ + @Override boolean execute(); } diff --git a/user/src/com/google/gwt/user/client/Window.java b/user/src/com/google/gwt/user/client/Window.java index 1ec68214daa..c3acfd55078 100644 --- a/user/src/com/google/gwt/user/client/Window.java +++ b/user/src/com/google/gwt/user/client/Window.java @@ -490,10 +490,12 @@ public WindowHandlers() { super(null); } + @Override public HandlerRegistration addCloseHandler(CloseHandler handler) { return addHandler(CloseEvent.getType(), handler); } + @Override public HandlerRegistration addResizeHandler(ResizeHandler handler) { return addHandler(ResizeEvent.getType(), handler); } diff --git a/user/src/com/google/gwt/user/client/rpc/SerializationStreamWriter.java b/user/src/com/google/gwt/user/client/rpc/SerializationStreamWriter.java index 951fde33985..d24b1f1ddc6 100644 --- a/user/src/com/google/gwt/user/client/rpc/SerializationStreamWriter.java +++ b/user/src/com/google/gwt/user/client/rpc/SerializationStreamWriter.java @@ -24,6 +24,7 @@ public interface SerializationStreamWriter { * * @return a string that is the serialization of the contents of this stream */ + @Override String toString(); void writeBoolean(boolean value) throws SerializationException; diff --git a/user/src/com/google/gwt/user/client/rpc/impl/AbstractSerializationStreamReader.java b/user/src/com/google/gwt/user/client/rpc/impl/AbstractSerializationStreamReader.java index 98a32f9a870..f517dd225cd 100644 --- a/user/src/com/google/gwt/user/client/rpc/impl/AbstractSerializationStreamReader.java +++ b/user/src/com/google/gwt/user/client/rpc/impl/AbstractSerializationStreamReader.java @@ -100,6 +100,7 @@ public void prepareToRead(String encoded) throws SerializationException { setFlags(readInt()); } + @Override public final Object readObject() throws SerializationException { int token = readInt(); diff --git a/user/src/com/google/gwt/user/client/rpc/impl/AbstractSerializationStreamWriter.java b/user/src/com/google/gwt/user/client/rpc/impl/AbstractSerializationStreamWriter.java index 3b9fe2b4a5f..c03450f8d1b 100644 --- a/user/src/com/google/gwt/user/client/rpc/impl/AbstractSerializationStreamWriter.java +++ b/user/src/com/google/gwt/user/client/rpc/impl/AbstractSerializationStreamWriter.java @@ -75,33 +75,41 @@ public void prepareToWrite() { @Override public abstract String toString(); + @Override public void writeBoolean(boolean fieldValue) { append(fieldValue ? "1" : "0"); } + @Override public void writeByte(byte fieldValue) { append(String.valueOf(fieldValue)); } + @Override public void writeChar(char ch) { // just use an int, it's more foolproof append(String.valueOf((int) ch)); } + @Override public void writeDouble(double fieldValue) { append(String.valueOf(fieldValue)); } + @Override public void writeFloat(float fieldValue) { writeDouble(fieldValue); } + @Override public void writeInt(int fieldValue) { append(String.valueOf(fieldValue)); } + @Override public abstract void writeLong(long value); + @Override public void writeObject(Object instance) throws SerializationException { if (instance == null) { // write a null string @@ -130,10 +138,12 @@ public void writeObject(Object instance) throws SerializationException { serialize(instance, typeSignature); } + @Override public void writeShort(short value) { append(String.valueOf(value)); } + @Override public void writeString(String value) { writeInt(addString(value)); } diff --git a/user/src/com/google/gwt/user/client/rpc/impl/ClientSerializationStreamReader.java b/user/src/com/google/gwt/user/client/rpc/impl/ClientSerializationStreamReader.java index a614a998063..dc26d7f039d 100644 --- a/user/src/com/google/gwt/user/client/rpc/impl/ClientSerializationStreamReader.java +++ b/user/src/com/google/gwt/user/client/rpc/impl/ClientSerializationStreamReader.java @@ -230,7 +230,8 @@ public boolean visit(JsInvocation invoke, JsContext ctx) { */ private static class StringConcatEvaler extends JsModVisitor { - @Override public boolean visit(JsBinaryOperation x, JsContext ctx) { + @Override + public boolean visit(JsBinaryOperation x, JsContext ctx) { if (x.getOperator() != JsBinaryOperator.ADD) { return super.visit(x, ctx); } diff --git a/user/src/com/google/gwt/user/client/rpc/impl/RemoteServiceProxy.java b/user/src/com/google/gwt/user/client/rpc/impl/RemoteServiceProxy.java index d2efbfc37e5..9f2d5d6b740 100644 --- a/user/src/com/google/gwt/user/client/rpc/impl/RemoteServiceProxy.java +++ b/user/src/com/google/gwt/user/client/rpc/impl/RemoteServiceProxy.java @@ -252,6 +252,7 @@ protected RemoteServiceProxy(String moduleBaseURL, * SerializationStreamReader} that is ready for reading * @throws SerializationException */ + @Override public SerializationStreamReader createStreamReader(String encoded) throws SerializationException { ClientSerializationStreamReader clientSerializationStreamReader = new ClientSerializationStreamReader( @@ -273,6 +274,7 @@ public SerializationStreamReader createStreamReader(String encoded) * it and it has already had had the name of the remote service * interface written as well */ + @Override public SerializationStreamWriter createStreamWriter() { ClientSerializationStreamWriter clientSerializationStreamWriter = new ClientSerializationStreamWriter( serializer, moduleBaseURL, serializationPolicyName); @@ -283,6 +285,7 @@ public SerializationStreamWriter createStreamWriter() { /** * @see HasRpcToken#getRpcToken() */ + @Override public RpcToken getRpcToken() { return rpcToken; } @@ -290,10 +293,12 @@ public RpcToken getRpcToken() { /** * @see HasRpcToken#getRpcTokenExceptionHandler() */ + @Override public RpcTokenExceptionHandler getRpcTokenExceptionHandler() { return rpcTokenExceptionHandler; } + @Override public String getSerializationPolicyName() { return serializationPolicyName; } @@ -301,10 +306,12 @@ public String getSerializationPolicyName() { /** * @see ServiceDefTarget#getServiceEntryPoint() */ + @Override public String getServiceEntryPoint() { return remoteServiceURL; } + @Override public void setRpcRequestBuilder(RpcRequestBuilder builder) { this.rpcRequestBuilder = builder; } @@ -312,6 +319,7 @@ public void setRpcRequestBuilder(RpcRequestBuilder builder) { /** * @see HasRpcToken#setRpcToken(RpcToken) */ + @Override public void setRpcToken(RpcToken token) { checkRpcTokenType(token); this.rpcToken = token; @@ -320,6 +328,7 @@ public void setRpcToken(RpcToken token) { /** * @see HasRpcToken#setRpcTokenExceptionHandler(RpcTokenExceptionHandler) */ + @Override public void setRpcTokenExceptionHandler(RpcTokenExceptionHandler handler) { this.rpcTokenExceptionHandler = handler; } @@ -327,6 +336,7 @@ public void setRpcTokenExceptionHandler(RpcTokenExceptionHandler handler) { /** * @see ServiceDefTarget#setServiceEntryPoint(String) */ + @Override public void setServiceEntryPoint(String url) { this.remoteServiceURL = url; } diff --git a/user/src/com/google/gwt/user/client/rpc/impl/RequestCallbackAdapter.java b/user/src/com/google/gwt/user/client/rpc/impl/RequestCallbackAdapter.java index 55143e3a34d..4dadb0b454c 100644 --- a/user/src/com/google/gwt/user/client/rpc/impl/RequestCallbackAdapter.java +++ b/user/src/com/google/gwt/user/client/rpc/impl/RequestCallbackAdapter.java @@ -190,10 +190,12 @@ public RequestCallbackAdapter(SerializationStreamFactory streamFactory, this.tokenExceptionHandler = tokenExceptionHandler; } + @Override public void onError(Request request, Throwable exception) { callback.onFailure(exception); } + @Override @SuppressWarnings(value = {"unchecked", "unused"}) public void onResponseReceived(Request request, Response response) { T result = null; diff --git a/user/src/com/google/gwt/user/client/rpc/impl/SerializerBase.java b/user/src/com/google/gwt/user/client/rpc/impl/SerializerBase.java index 93830c34cd6..0cfafc4b35e 100644 --- a/user/src/com/google/gwt/user/client/rpc/impl/SerializerBase.java +++ b/user/src/com/google/gwt/user/client/rpc/impl/SerializerBase.java @@ -85,6 +85,7 @@ public SerializerBase(Map methodMapJava, this.signatureMapNative = signatureMapNative; } + @Override public final void deserialize(SerializationStreamReader stream, Object instance, String typeSignature) throws SerializationException { if (GWT.isScript()) { @@ -96,6 +97,7 @@ public final void deserialize(SerializationStreamReader stream, } } + @Override public final String getSerializationSignature(Class clazz) { assert clazz != null : "clazz"; if (GWT.isScript()) { @@ -105,6 +107,7 @@ public final String getSerializationSignature(Class clazz) { } } + @Override public final Object instantiate(SerializationStreamReader stream, String typeSignature) throws SerializationException { if (GWT.isScript()) { @@ -116,6 +119,7 @@ public final Object instantiate(SerializationStreamReader stream, } } + @Override public final void serialize(SerializationStreamWriter stream, Object instance, String typeSignature) throws SerializationException { if (GWT.isScript()) { diff --git a/user/src/com/google/gwt/user/client/ui/AbsolutePanel.java b/user/src/com/google/gwt/user/client/ui/AbsolutePanel.java index 6091a50584b..293cfacc606 100644 --- a/user/src/com/google/gwt/user/client/ui/AbsolutePanel.java +++ b/user/src/com/google/gwt/user/client/ui/AbsolutePanel.java @@ -155,6 +155,7 @@ public int getWidgetTop(Widget w) { - getElement().getAbsoluteTop(); } + @Override public void insert(Widget w, int beforeIndex) { insert(w, getElement(), beforeIndex, true); } @@ -162,6 +163,7 @@ public void insert(Widget w, int beforeIndex) { /** * Convenience overload to allow {@link IsWidget} to be used directly. */ + @Override public void insert(IsWidget w, int beforeIndex) { insert(asWidgetOrNull(w), beforeIndex); } diff --git a/user/src/com/google/gwt/user/client/ui/AbstractNativeScrollbar.java b/user/src/com/google/gwt/user/client/ui/AbstractNativeScrollbar.java index e09de7f970f..216819083f0 100644 --- a/user/src/com/google/gwt/user/client/ui/AbstractNativeScrollbar.java +++ b/user/src/com/google/gwt/user/client/ui/AbstractNativeScrollbar.java @@ -109,6 +109,7 @@ private static void maybeRecalculateNativeScrollbarSize() { scrollable.removeFromParent(); } + @Override public HandlerRegistration addScrollHandler(ScrollHandler handler) { // Sink the event on the scrollable element, not the root element. Event.sinkEvents(getScrollableElement(), Event.ONSCROLL); diff --git a/user/src/com/google/gwt/user/client/ui/AttachDetachException.java b/user/src/com/google/gwt/user/client/ui/AttachDetachException.java index a00a71e4fcd..ae195a8cc95 100644 --- a/user/src/com/google/gwt/user/client/ui/AttachDetachException.java +++ b/user/src/com/google/gwt/user/client/ui/AttachDetachException.java @@ -30,6 +30,7 @@ public class AttachDetachException extends UmbrellaException { * The singleton command used to attach widgets. */ static final AttachDetachException.Command attachCommand = new AttachDetachException.Command() { + @Override public void execute(Widget w) { w.onAttach(); } @@ -39,6 +40,7 @@ public void execute(Widget w) { * The singleton command used to detach widgets. */ static final AttachDetachException.Command detachCommand = new AttachDetachException.Command() { + @Override public void execute(Widget w) { w.onDetach(); } diff --git a/user/src/com/google/gwt/user/client/ui/ButtonBase.java b/user/src/com/google/gwt/user/client/ui/ButtonBase.java index c884b120218..b43ee15062a 100644 --- a/user/src/com/google/gwt/user/client/ui/ButtonBase.java +++ b/user/src/com/google/gwt/user/client/ui/ButtonBase.java @@ -37,22 +37,27 @@ protected ButtonBase(Element elem) { super(elem); } + @Override public String getHTML() { return getElement().getInnerHTML(); } + @Override public String getText() { return getElement().getInnerText(); } + @Override public void setHTML(@IsSafeHtml String html) { getElement().setInnerHTML(html); } + @Override public void setHTML(SafeHtml html) { setHTML(html.asString()); } + @Override public void setText(String text) { getElement().setInnerText(text); } diff --git a/user/src/com/google/gwt/user/client/ui/CaptionPanel.java b/user/src/com/google/gwt/user/client/ui/CaptionPanel.java index 4f72ebc8285..f0cc060f979 100644 --- a/user/src/com/google/gwt/user/client/ui/CaptionPanel.java +++ b/user/src/com/google/gwt/user/client/ui/CaptionPanel.java @@ -108,6 +108,7 @@ public void setCaption( fieldset.getStyle().setProperty("visibility", "hidden"); super.setCaption(fieldset, legend, caption, asHTML); Scheduler.get().scheduleDeferred(new ScheduledCommand() { + @Override public void execute() { fieldset.getStyle().setProperty("visibility", ""); } @@ -171,6 +172,7 @@ public CaptionPanel(@IsSafeHtml String caption, boolean asHTML) { } } + @Override public void add(Widget w) { ((SimplePanel) getWidget()).add(w); } @@ -180,6 +182,7 @@ public void add(Widget w) { * * @see #add(Widget) */ + @Override public void add(IsWidget w) { this.add(asWidgetOrNull(w)); } @@ -187,6 +190,7 @@ public void add(IsWidget w) { /** * Removes the content widget. */ + @Override public void clear() { ((SimplePanel) getWidget()).clear(); } @@ -224,6 +228,7 @@ public Widget getContentWidget() { /** * Iterates over the singular content widget, if present. */ + @Override public Iterator iterator() { return ((SimplePanel) getWidget()).iterator(); } @@ -235,6 +240,7 @@ public Iterator iterator() { * @param w the widget to remove; note that anything other than the Widget * returned by {@link #getContentWidget()} will have no effect */ + @Override public boolean remove(Widget w) { return ((SimplePanel) getWidget()).remove(w); } @@ -244,6 +250,7 @@ public boolean remove(Widget w) { * * @see #remove(Widget) */ + @Override public boolean remove(IsWidget w) { return this.remove(asWidgetOrNull(w)); } diff --git a/user/src/com/google/gwt/user/client/ui/ComplexPanel.java b/user/src/com/google/gwt/user/client/ui/ComplexPanel.java index 6989c8e8913..89836b2274c 100644 --- a/user/src/com/google/gwt/user/client/ui/ComplexPanel.java +++ b/user/src/com/google/gwt/user/client/ui/ComplexPanel.java @@ -32,26 +32,32 @@ public abstract class ComplexPanel extends Panel implements IndexedPanel.ForIsWi */ private AttachDetachException.Command orphanCommand; + @Override public Widget getWidget(int index) { return getChildren().get(index); } + @Override public int getWidgetCount() { return getChildren().size(); } + @Override public int getWidgetIndex(Widget child) { return getChildren().indexOf(child); } + @Override public int getWidgetIndex(IsWidget child) { return getWidgetIndex(asWidgetOrNull(child)); } + @Override public Iterator iterator() { return getChildren().iterator(); } + @Override public boolean remove(int index) { return remove(getWidget(index)); } @@ -216,6 +222,7 @@ void doLogicalClear() { // Only use one orphan command per panel to avoid object creation. if (orphanCommand == null) { orphanCommand = new AttachDetachException.Command() { + @Override public void execute(Widget w) { orphan(w); } diff --git a/user/src/com/google/gwt/user/client/ui/DeckPanel.java b/user/src/com/google/gwt/user/client/ui/DeckPanel.java index f9968e38601..71727254f18 100644 --- a/user/src/com/google/gwt/user/client/ui/DeckPanel.java +++ b/user/src/com/google/gwt/user/client/ui/DeckPanel.java @@ -272,10 +272,12 @@ public int getVisibleWidget() { return getWidgetIndex(visibleWidget); } + @Override public void insert(IsWidget w, int beforeIndex) { insert(asWidgetOrNull(w), beforeIndex); } + @Override public void insert(Widget w, int beforeIndex) { Element container = createWidgetContainer(); DOM.insertChild(getElement(), container, beforeIndex); @@ -285,6 +287,7 @@ public void insert(Widget w, int beforeIndex) { finishWidgetInitialization(container, w); } + @Override public boolean isAnimationEnabled() { return isAnimationEnabled; } @@ -304,6 +307,7 @@ public boolean remove(Widget w) { return removed; } + @Override public void setAnimationEnabled(boolean enable) { isAnimationEnabled = enable; } diff --git a/user/src/com/google/gwt/user/client/ui/DialogBox.java b/user/src/com/google/gwt/user/client/ui/DialogBox.java index 9ac75477674..457bb7d4238 100644 --- a/user/src/com/google/gwt/user/client/ui/DialogBox.java +++ b/user/src/com/google/gwt/user/client/ui/DialogBox.java @@ -156,22 +156,27 @@ public CaptionImpl() { private class MouseHandler implements MouseDownHandler, MouseUpHandler, MouseOutHandler, MouseOverHandler, MouseMoveHandler { + @Override public void onMouseDown(MouseDownEvent event) { beginDragging(event); } + @Override public void onMouseMove(MouseMoveEvent event) { continueDragging(event); } + @Override public void onMouseOut(MouseOutEvent event) { DialogBox.this.onMouseLeave(caption.asWidget()); } + @Override public void onMouseOver(MouseOverEvent event) { DialogBox.this.onMouseEnter(caption.asWidget()); } + @Override public void onMouseUp(MouseUpEvent event) { endDragging(event); } @@ -285,10 +290,12 @@ public Caption getCaption() { return caption; } + @Override public String getHTML() { return caption.getHTML(); } + @Override public String getText() { return caption.getText(); } @@ -391,6 +398,7 @@ public void onMouseUp(Widget sender, int x, int y) { * * @param html the object's new HTML */ + @Override public void setHTML(SafeHtml html) { caption.setHTML(html); } @@ -405,6 +413,7 @@ public void setHTML(SafeHtml html) { * * @param html the object's new HTML */ + @Override public void setHTML(@IsSafeHtml String html) { caption.setHTML(SafeHtmlUtils.fromTrustedString(html)); } @@ -418,6 +427,7 @@ public void setHTML(@IsSafeHtml String html) { * * @param text the object's new text */ + @Override public void setText(String text) { caption.setText(text); } @@ -426,6 +436,7 @@ public void setText(String text) { public void show() { if (resizeHandlerRegistration == null) { resizeHandlerRegistration = Window.addResizeHandler(new ResizeHandler() { + @Override public void onResize(ResizeEvent event) { windowWidth = event.getWidth(); } diff --git a/user/src/com/google/gwt/user/client/ui/DirectionalTextHelper.java b/user/src/com/google/gwt/user/client/ui/DirectionalTextHelper.java index e2a51a74c9c..09887c45890 100644 --- a/user/src/com/google/gwt/user/client/ui/DirectionalTextHelper.java +++ b/user/src/com/google/gwt/user/client/ui/DirectionalTextHelper.java @@ -107,6 +107,7 @@ public DirectionalTextHelper(Element element, boolean isElementInline) { isDirectionExplicitlySet = true; } + @Override public DirectionEstimator getDirectionEstimator() { return directionEstimator; } @@ -172,6 +173,7 @@ public void setDirection(Direction direction) { * See note at * {@link #setDirectionEstimator(com.google.gwt.i18n.shared.DirectionEstimator)}. */ + @Override public void setDirectionEstimator(boolean enabled) { setDirectionEstimator(enabled ? DEFAULT_DIRECTION_ESTIMATOR : null); } @@ -182,6 +184,7 @@ public void setDirectionEstimator(boolean enabled) { * flicker, and thus should be avoided; DirectionEstimator should be set * before the element has any content. */ + @Override @SuppressIsSafeHtmlCastCheck public void setDirectionEstimator(DirectionEstimator directionEstimator) { this.directionEstimator = directionEstimator; diff --git a/user/src/com/google/gwt/user/client/ui/DisclosurePanel.java b/user/src/com/google/gwt/user/client/ui/DisclosurePanel.java index 61ab3c60ee0..28329d3fab6 100644 --- a/user/src/com/google/gwt/user/client/ui/DisclosurePanel.java +++ b/user/src/com/google/gwt/user/client/ui/DisclosurePanel.java @@ -211,10 +211,12 @@ private class DefaultHeader extends Widget implements HasText, private DefaultHeader(final DisclosurePanelImages images, String text) { this(new Imager() { + @Override public Image makeImage() { return images.disclosurePanelClosed().createImage(); } + @Override public void updateImage(boolean open, Image image) { if (open) { images.disclosurePanelOpen().applyTo(image); @@ -263,10 +265,12 @@ private DefaultHeader(Imager imager, String text) { private DefaultHeader(final ImageResource openImage, final ImageResource closedImage, String text) { this(new Imager() { + @Override public Image makeImage() { return new Image(closedImage); } + @Override public void updateImage(boolean open, Image image) { if (open) { image.setResource(openImage); @@ -277,18 +281,22 @@ public void updateImage(boolean open, Image image) { }, text); } + @Override public final String getText() { return labelTD.getInnerText(); } + @Override public final void onClose(CloseEvent event) { setStyle(); } + @Override public final void onOpen(OpenEvent event) { setStyle(); } + @Override public final void setText(String text) { labelTD.setInnerText(text); } @@ -450,6 +458,7 @@ public DisclosurePanel(Widget header, boolean isOpen) { setOpen(isOpen); } + @Override public void add(Widget w) { if (this.getContent() == null) { setContent(w); @@ -464,10 +473,12 @@ public void add(Widget w) { * * @see #add(Widget) */ + @Override public void add(IsWidget w) { this.add(asWidgetOrNull(w)); } + @Override public HandlerRegistration addCloseHandler( CloseHandler handler) { return addHandler(handler, CloseEvent.getType()); @@ -486,10 +497,12 @@ public void addEventHandler(final DisclosureHandler handler) { ListenerWrapper.WrappedOldDisclosureHandler.add(this, handler); } + @Override public HandlerRegistration addOpenHandler(OpenHandler handler) { return addHandler(handler, OpenEvent.getType()); } + @Override public void clear() { setContent(null); } @@ -524,6 +537,7 @@ public HasText getHeaderTextAccessor() { return (widget instanceof HasText) ? (HasText) widget : null; } + @Override public boolean isAnimationEnabled() { return isAnimationEnabled; } @@ -537,11 +551,13 @@ public boolean isOpen() { return isOpen; } + @Override public Iterator iterator() { return WidgetIterators.createWidgetIterator(this, new Widget[] {getContent()}); } + @Override public boolean remove(Widget w) { if (w == getContent()) { setContent(null); @@ -555,6 +571,7 @@ public boolean remove(Widget w) { * * @see #remove(Widget) */ + @Override public boolean remove(IsWidget w) { return this.remove(asWidgetOrNull(w)); } @@ -571,6 +588,7 @@ public void removeEventHandler(DisclosureHandler handler) { ListenerWrapper.WrappedOldDisclosureHandler.remove(this, handler); } + @Override public void setAnimationEnabled(boolean enable) { isAnimationEnabled = enable; } diff --git a/user/src/com/google/gwt/user/client/ui/DisclosurePanelImagesRTL.java b/user/src/com/google/gwt/user/client/ui/DisclosurePanelImagesRTL.java index e1ee3f1b415..b7adfb900da 100644 --- a/user/src/com/google/gwt/user/client/ui/DisclosurePanelImagesRTL.java +++ b/user/src/com/google/gwt/user/client/ui/DisclosurePanelImagesRTL.java @@ -27,6 +27,7 @@ public interface DisclosurePanelImagesRTL extends DisclosurePanelImages { * * @return a prototype of this image */ + @Override @Resource("disclosurePanelClosed_rtl.png") AbstractImagePrototype disclosurePanelClosed(); } diff --git a/user/src/com/google/gwt/user/client/ui/DockPanel.java b/user/src/com/google/gwt/user/client/ui/DockPanel.java index 9b9c093a62a..30c97eaa631 100644 --- a/user/src/com/google/gwt/user/client/ui/DockPanel.java +++ b/user/src/com/google/gwt/user/client/ui/DockPanel.java @@ -206,10 +206,12 @@ public void add(IsWidget widget, DockLayoutConstant direction) { this.add(widget.asWidget(), direction); } + @Override public HorizontalAlignmentConstant getHorizontalAlignment() { return horzAlign; } + @Override public VerticalAlignmentConstant getVerticalAlignment() { return vertAlign; } @@ -284,6 +286,7 @@ public void setCellWidth(Widget w, String width) { * * @see HasHorizontalAlignment#setHorizontalAlignment(HasHorizontalAlignment.HorizontalAlignmentConstant) */ + @Override public void setHorizontalAlignment(HorizontalAlignmentConstant align) { horzAlign = align; } @@ -294,6 +297,7 @@ public void setHorizontalAlignment(HorizontalAlignmentConstant align) { * * @see HasVerticalAlignment#setVerticalAlignment(HasVerticalAlignment.VerticalAlignmentConstant) */ + @Override public void setVerticalAlignment(VerticalAlignmentConstant align) { vertAlign = align; } diff --git a/user/src/com/google/gwt/user/client/ui/FileUpload.java b/user/src/com/google/gwt/user/client/ui/FileUpload.java index 53b205e620d..312fd7e79d1 100644 --- a/user/src/com/google/gwt/user/client/ui/FileUpload.java +++ b/user/src/com/google/gwt/user/client/ui/FileUpload.java @@ -91,6 +91,7 @@ protected FileUpload(Element element) { setElement(element); } + @Override public HandlerRegistration addChangeHandler(ChangeHandler handler) { return addDomHandler(handler, ChangeEvent.getType()); } @@ -105,6 +106,7 @@ public String getFilename() { return getInputElement().getValue(); } + @Override public String getName() { return getInputElement().getName(); } @@ -114,6 +116,7 @@ public String getName() { * * @return true if the widget is enabled */ + @Override public boolean isEnabled() { return !getElement().getPropertyBoolean("disabled"); } @@ -124,10 +127,12 @@ public boolean isEnabled() { * @param enabled true to enable the widget, false * to disable it */ + @Override public void setEnabled(boolean enabled) { getElement().setPropertyBoolean("disabled", !enabled); } + @Override public void setName(String name) { getInputElement().setName(name); } diff --git a/user/src/com/google/gwt/user/client/ui/FiniteWidgetIterator.java b/user/src/com/google/gwt/user/client/ui/FiniteWidgetIterator.java index 5253fd568b9..9f3e51f01ca 100644 --- a/user/src/com/google/gwt/user/client/ui/FiniteWidgetIterator.java +++ b/user/src/com/google/gwt/user/client/ui/FiniteWidgetIterator.java @@ -57,6 +57,7 @@ public FiniteWidgetIterator(WidgetProvider provider, int widgetCount) { this.widgetCount = widgetCount; } + @Override public boolean hasNext() { // Iterate over the remaining widgets until we find one. for (int i = index + 1; i < widgetCount; i++) { @@ -68,6 +69,7 @@ public boolean hasNext() { return false; } + @Override public Widget next() { // Iterate over the remaining widgets until we find one. for (int i = index + 1; i < widgetCount; i++) { @@ -80,6 +82,7 @@ public Widget next() { throw new NoSuchElementException(); } + @Override public void remove() { if (index < 0 || index >= widgetCount) { throw new IllegalStateException(); diff --git a/user/src/com/google/gwt/user/client/ui/FocusPanel.java b/user/src/com/google/gwt/user/client/ui/FocusPanel.java index cf0b94735df..3df8dff94c0 100644 --- a/user/src/com/google/gwt/user/client/ui/FocusPanel.java +++ b/user/src/com/google/gwt/user/client/ui/FocusPanel.java @@ -102,10 +102,12 @@ public FocusPanel(Widget child) { setWidget(child); } + @Override public HandlerRegistration addBlurHandler(BlurHandler handler) { return addDomHandler(handler, BlurEvent.getType()); } + @Override public HandlerRegistration addClickHandler(ClickHandler handler) { return addDomHandler(handler, ClickEvent.getType()); } @@ -118,38 +120,47 @@ public void addClickListener(ClickListener listener) { ListenerWrapper.WrappedClickListener.add(this, listener); } + @Override public HandlerRegistration addDoubleClickHandler(DoubleClickHandler handler) { return addDomHandler(handler, DoubleClickEvent.getType()); } + @Override public HandlerRegistration addDragEndHandler(DragEndHandler handler) { return addBitlessDomHandler(handler, DragEndEvent.getType()); } + @Override public HandlerRegistration addDragEnterHandler(DragEnterHandler handler) { return addBitlessDomHandler(handler, DragEnterEvent.getType()); } + @Override public HandlerRegistration addDragHandler(DragHandler handler) { return addBitlessDomHandler(handler, DragEvent.getType()); } + @Override public HandlerRegistration addDragLeaveHandler(DragLeaveHandler handler) { return addBitlessDomHandler(handler, DragLeaveEvent.getType()); } + @Override public HandlerRegistration addDragOverHandler(DragOverHandler handler) { return addBitlessDomHandler(handler, DragOverEvent.getType()); } + @Override public HandlerRegistration addDragStartHandler(DragStartHandler handler) { return addBitlessDomHandler(handler, DragStartEvent.getType()); } + @Override public HandlerRegistration addDropHandler(DropHandler handler) { return addBitlessDomHandler(handler, DropEvent.getType()); } + @Override public HandlerRegistration addFocusHandler(FocusHandler handler) { return addDomHandler(handler, FocusEvent.getType()); } @@ -162,14 +173,17 @@ public void addFocusListener(FocusListener listener) { ListenerWrapper.WrappedFocusListener.add(this, listener); } + @Override public HandlerRegistration addGestureChangeHandler(GestureChangeHandler handler) { return addDomHandler(handler, GestureChangeEvent.getType()); } + @Override public HandlerRegistration addGestureEndHandler(GestureEndHandler handler) { return addDomHandler(handler, GestureEndEvent.getType()); } + @Override public HandlerRegistration addGestureStartHandler(GestureStartHandler handler) { return addDomHandler(handler, GestureStartEvent.getType()); } @@ -183,18 +197,22 @@ public void addKeyboardListener(KeyboardListener listener) { ListenerWrapper.WrappedKeyboardListener.add(this, listener); } + @Override public HandlerRegistration addKeyDownHandler(KeyDownHandler handler) { return addDomHandler(handler, KeyDownEvent.getType()); } + @Override public HandlerRegistration addKeyPressHandler(KeyPressHandler handler) { return addDomHandler(handler, KeyPressEvent.getType()); } + @Override public HandlerRegistration addKeyUpHandler(KeyUpHandler handler) { return addDomHandler(handler, KeyUpEvent.getType()); } + @Override public HandlerRegistration addMouseDownHandler(MouseDownHandler handler) { return addDomHandler(handler, MouseDownEvent.getType()); } @@ -209,22 +227,27 @@ public void addMouseListener(MouseListener listener) { ListenerWrapper.WrappedMouseListener.add(this, listener); } + @Override public HandlerRegistration addMouseMoveHandler(MouseMoveHandler handler) { return addDomHandler(handler, MouseMoveEvent.getType()); } + @Override public HandlerRegistration addMouseOutHandler(MouseOutHandler handler) { return addDomHandler(handler, MouseOutEvent.getType()); } + @Override public HandlerRegistration addMouseOverHandler(MouseOverHandler handler) { return addDomHandler(handler, MouseOverEvent.getType()); } + @Override public HandlerRegistration addMouseUpHandler(MouseUpHandler handler) { return addDomHandler(handler, MouseUpEvent.getType()); } + @Override public HandlerRegistration addMouseWheelHandler(MouseWheelHandler handler) { return addDomHandler(handler, MouseWheelEvent.getType()); } @@ -237,22 +260,27 @@ public void addMouseWheelListener(MouseWheelListener listener) { ListenerWrapper.WrappedMouseWheelListener.add(this, listener); } + @Override public HandlerRegistration addTouchCancelHandler(TouchCancelHandler handler) { return addDomHandler(handler, TouchCancelEvent.getType()); } + @Override public HandlerRegistration addTouchEndHandler(TouchEndHandler handler) { return addDomHandler(handler, TouchEndEvent.getType()); } + @Override public HandlerRegistration addTouchMoveHandler(TouchMoveHandler handler) { return addDomHandler(handler, TouchMoveEvent.getType()); } + @Override public HandlerRegistration addTouchStartHandler(TouchStartHandler handler) { return addDomHandler(handler, TouchStartEvent.getType()); } + @Override public int getTabIndex() { return impl.getTabIndex(getElement()); } @@ -302,10 +330,12 @@ public void removeMouseWheelListener(MouseWheelListener listener) { ListenerWrapper.WrappedMouseWheelListener.remove(this, listener); } + @Override public void setAccessKey(char key) { impl.setAccessKey(getElement(), key); } + @Override public void setFocus(boolean focused) { if (focused) { impl.focus(getElement()); @@ -314,6 +344,7 @@ public void setFocus(boolean focused) { } } + @Override public void setTabIndex(int index) { impl.setTabIndex(getElement(), index); } diff --git a/user/src/com/google/gwt/user/client/ui/FocusWidget.java b/user/src/com/google/gwt/user/client/ui/FocusWidget.java index 3e9032ee988..9f68122ea4f 100644 --- a/user/src/com/google/gwt/user/client/ui/FocusWidget.java +++ b/user/src/com/google/gwt/user/client/ui/FocusWidget.java @@ -118,10 +118,12 @@ protected FocusWidget(Element elem) { setElement(elem); } + @Override public HandlerRegistration addBlurHandler(BlurHandler handler) { return addDomHandler(handler, BlurEvent.getType()); } + @Override public HandlerRegistration addClickHandler(ClickHandler handler) { return addDomHandler(handler, ClickEvent.getType()); } @@ -134,38 +136,47 @@ public void addClickListener(ClickListener listener) { ListenerWrapper.WrappedClickListener.add(this, listener); } + @Override public HandlerRegistration addDoubleClickHandler(DoubleClickHandler handler) { return addDomHandler(handler, DoubleClickEvent.getType()); } + @Override public HandlerRegistration addDragEndHandler(DragEndHandler handler) { return addBitlessDomHandler(handler, DragEndEvent.getType()); } + @Override public HandlerRegistration addDragEnterHandler(DragEnterHandler handler) { return addBitlessDomHandler(handler, DragEnterEvent.getType()); } + @Override public HandlerRegistration addDragHandler(DragHandler handler) { return addBitlessDomHandler(handler, DragEvent.getType()); } + @Override public HandlerRegistration addDragLeaveHandler(DragLeaveHandler handler) { return addBitlessDomHandler(handler, DragLeaveEvent.getType()); } + @Override public HandlerRegistration addDragOverHandler(DragOverHandler handler) { return addBitlessDomHandler(handler, DragOverEvent.getType()); } + @Override public HandlerRegistration addDragStartHandler(DragStartHandler handler) { return addBitlessDomHandler(handler, DragStartEvent.getType()); } + @Override public HandlerRegistration addDropHandler(DropHandler handler) { return addBitlessDomHandler(handler, DropEvent.getType()); } + @Override public HandlerRegistration addFocusHandler(FocusHandler handler) { return addDomHandler(handler, FocusEvent.getType()); } @@ -178,14 +189,17 @@ public void addFocusListener(FocusListener listener) { ListenerWrapper.WrappedFocusListener.add(this, listener); } + @Override public HandlerRegistration addGestureChangeHandler(GestureChangeHandler handler) { return addDomHandler(handler, GestureChangeEvent.getType()); } + @Override public HandlerRegistration addGestureEndHandler(GestureEndHandler handler) { return addDomHandler(handler, GestureEndEvent.getType()); } + @Override public HandlerRegistration addGestureStartHandler(GestureStartHandler handler) { return addDomHandler(handler, GestureStartEvent.getType()); } @@ -199,18 +213,22 @@ public void addKeyboardListener(KeyboardListener listener) { ListenerWrapper.WrappedKeyboardListener.add(this, listener); } + @Override public HandlerRegistration addKeyDownHandler(KeyDownHandler handler) { return addDomHandler(handler, KeyDownEvent.getType()); } + @Override public HandlerRegistration addKeyPressHandler(KeyPressHandler handler) { return addDomHandler(handler, KeyPressEvent.getType()); } + @Override public HandlerRegistration addKeyUpHandler(KeyUpHandler handler) { return addDomHandler(handler, KeyUpEvent.getType()); } + @Override public HandlerRegistration addMouseDownHandler(MouseDownHandler handler) { return addDomHandler(handler, MouseDownEvent.getType()); } @@ -225,22 +243,27 @@ public void addMouseListener(MouseListener listener) { ListenerWrapper.WrappedMouseListener.add(this, listener); } + @Override public HandlerRegistration addMouseMoveHandler(MouseMoveHandler handler) { return addDomHandler(handler, MouseMoveEvent.getType()); } + @Override public HandlerRegistration addMouseOutHandler(MouseOutHandler handler) { return addDomHandler(handler, MouseOutEvent.getType()); } + @Override public HandlerRegistration addMouseOverHandler(MouseOverHandler handler) { return addDomHandler(handler, MouseOverEvent.getType()); } + @Override public HandlerRegistration addMouseUpHandler(MouseUpHandler handler) { return addDomHandler(handler, MouseUpEvent.getType()); } + @Override public HandlerRegistration addMouseWheelHandler(MouseWheelHandler handler) { return addDomHandler(handler, MouseWheelEvent.getType()); } @@ -253,18 +276,22 @@ public void addMouseWheelListener(MouseWheelListener listener) { ListenerWrapper.WrappedMouseWheelListener.add(this, listener); } + @Override public HandlerRegistration addTouchCancelHandler(TouchCancelHandler handler) { return addDomHandler(handler, TouchCancelEvent.getType()); } + @Override public HandlerRegistration addTouchEndHandler(TouchEndHandler handler) { return addDomHandler(handler, TouchEndEvent.getType()); } + @Override public HandlerRegistration addTouchMoveHandler(TouchMoveHandler handler) { return addDomHandler(handler, TouchMoveEvent.getType()); } + @Override public HandlerRegistration addTouchStartHandler(TouchStartHandler handler) { return addDomHandler(handler, TouchStartEvent.getType()); } @@ -274,6 +301,7 @@ public HandlerRegistration addTouchStartHandler(TouchStartHandler handler) { * * @return the tab index */ + @Override public int getTabIndex() { return impl.getTabIndex(getElement()); } @@ -283,6 +311,7 @@ public int getTabIndex() { * * @return true if the widget is enabled */ + @Override public boolean isEnabled() { return !getElement().getPropertyBoolean("disabled"); } @@ -332,6 +361,7 @@ public void removeMouseWheelListener(MouseWheelListener listener) { ListenerWrapper.WrappedMouseWheelListener.remove(this, listener); } + @Override public void setAccessKey(char key) { getElement().setPropertyString("accessKey", "" + key); } @@ -342,10 +372,12 @@ public void setAccessKey(char key) { * @param enabled true to enable the widget, false * to disable it */ + @Override public void setEnabled(boolean enabled) { getElement().setPropertyBoolean("disabled", !enabled); } + @Override public void setFocus(boolean focused) { if (focused) { impl.focus(getElement()); @@ -354,6 +386,7 @@ public void setFocus(boolean focused) { } } + @Override public void setTabIndex(int index) { impl.setTabIndex(getElement(), index); } diff --git a/user/src/com/google/gwt/user/client/ui/FormPanel.java b/user/src/com/google/gwt/user/client/ui/FormPanel.java index a64f85e3315..b80183e7b76 100644 --- a/user/src/com/google/gwt/user/client/ui/FormPanel.java +++ b/user/src/com/google/gwt/user/client/ui/FormPanel.java @@ -488,10 +488,12 @@ public String getTarget() { * * @return true if the form is submitted, false if canceled */ + @Override public boolean onFormSubmit() { return onFormSubmitImpl(); } + @Override public void onFrameLoad() { onFrameLoadImpl(); } @@ -646,6 +648,7 @@ private void onFrameLoadImpl() { // complete can cause some browsers (i.e. Mozilla) to go into an // 'infinite loading' state. See issue 916. Scheduler.get().scheduleDeferred(new ScheduledCommand() { + @Override public void execute() { fireEvent(new SubmitCompleteEvent(impl.getContents(synthesizedFrame))); } diff --git a/user/src/com/google/gwt/user/client/ui/Frame.java b/user/src/com/google/gwt/user/client/ui/Frame.java index 4cdf92eb9a8..d0560d02538 100644 --- a/user/src/com/google/gwt/user/client/ui/Frame.java +++ b/user/src/com/google/gwt/user/client/ui/Frame.java @@ -105,6 +105,7 @@ protected Frame(Element element) { * @param handler the load handler * @return {@link HandlerRegistration} that can be used to remove this handler */ + @Override public HandlerRegistration addLoadHandler(LoadHandler handler) { return addDomHandler(handler, LoadEvent.getType()); } diff --git a/user/src/com/google/gwt/user/client/ui/HTML.java b/user/src/com/google/gwt/user/client/ui/HTML.java index b6704a35201..2a102ed6f4b 100644 --- a/user/src/com/google/gwt/user/client/ui/HTML.java +++ b/user/src/com/google/gwt/user/client/ui/HTML.java @@ -169,6 +169,7 @@ protected HTML(Element element) { super(element); } + @Override public String getHTML() { return directionalTextHelper.getHtml(); } @@ -180,6 +181,7 @@ public String getHTML() { * * @param html the new widget's HTML content */ + @Override public void setHTML(@IsSafeHtml String html) { directionalTextHelper.setHtml(html); updateHorizontalAlignment(); @@ -195,6 +197,7 @@ public void setHTML(@IsSafeHtml String html) { * @param dir the content's direction. Note: {@code Direction.DEFAULT} means * direction should be inherited from the widget's parent element. */ + @Override public void setHTML(@IsSafeHtml String html, Direction dir) { directionalTextHelper.setHtml(html, dir); updateHorizontalAlignment(); @@ -206,10 +209,12 @@ public void setHTML(@IsSafeHtml String html, Direction dir) { * @see com.google.gwt.safehtml.client.HasSafeHtml#setHTML(SafeHtml) * @param html the html to set. */ + @Override public void setHTML(SafeHtml html) { setHTML(html.asString()); } + @Override public void setHTML(SafeHtml html, Direction dir) { setHTML(html.asString(), dir); } diff --git a/user/src/com/google/gwt/user/client/ui/HTMLTable.java b/user/src/com/google/gwt/user/client/ui/HTMLTable.java index 924d4721708..0482a472aff 100644 --- a/user/src/com/google/gwt/user/client/ui/HTMLTable.java +++ b/user/src/com/google/gwt/user/client/ui/HTMLTable.java @@ -793,38 +793,47 @@ public HTMLTable() { setElement(tableElem); } + @Override public HandlerRegistration addClickHandler(ClickHandler handler) { return addDomHandler(handler, ClickEvent.getType()); } + @Override public HandlerRegistration addDoubleClickHandler(DoubleClickHandler handler) { return addDomHandler(handler, DoubleClickEvent.getType()); } + @Override public HandlerRegistration addDragEndHandler(DragEndHandler handler) { return addBitlessDomHandler(handler, DragEndEvent.getType()); } + @Override public HandlerRegistration addDragEnterHandler(DragEnterHandler handler) { return addBitlessDomHandler(handler, DragEnterEvent.getType()); } + @Override public HandlerRegistration addDragHandler(DragHandler handler) { return addBitlessDomHandler(handler, DragEvent.getType()); } + @Override public HandlerRegistration addDragLeaveHandler(DragLeaveHandler handler) { return addBitlessDomHandler(handler, DragLeaveEvent.getType()); } + @Override public HandlerRegistration addDragOverHandler(DragOverHandler handler) { return addBitlessDomHandler(handler, DragOverEvent.getType()); } + @Override public HandlerRegistration addDragStartHandler(DragStartHandler handler) { return addBitlessDomHandler(handler, DragStartEvent.getType()); } + @Override public HandlerRegistration addDropHandler(DropHandler handler) { return addBitlessDomHandler(handler, DropEvent.getType()); } @@ -1023,6 +1032,7 @@ public boolean isCellPresent(int row, int column) { * * @return the iterator */ + @Override public Iterator iterator() { return new Iterator() { final ArrayList widgetList = widgetMap.getObjectList(); @@ -1032,10 +1042,12 @@ public Iterator iterator() { findNext(); } + @Override public boolean hasNext() { return nextIndex < widgetList.size(); } + @Override public Widget next() { if (!hasNext()) { throw new NoSuchElementException(); @@ -1046,6 +1058,7 @@ public Widget next() { return result; } + @Override public void remove() { if (lastIndex < 0) { throw new IllegalStateException(); diff --git a/user/src/com/google/gwt/user/client/ui/HasValue.java b/user/src/com/google/gwt/user/client/ui/HasValue.java index ab24a9dcbd0..197ebae7310 100644 --- a/user/src/com/google/gwt/user/client/ui/HasValue.java +++ b/user/src/com/google/gwt/user/client/ui/HasValue.java @@ -37,6 +37,7 @@ public interface HasValue extends TakesValue, HasValueChangeHandlers { * * @return the object's value */ + @Override T getValue(); /** @@ -53,6 +54,7 @@ public interface HasValue extends TakesValue, HasValueChangeHandlers { * * @param value the object's new value */ + @Override void setValue(T value); /** diff --git a/user/src/com/google/gwt/user/client/ui/HasWidgets.java b/user/src/com/google/gwt/user/client/ui/HasWidgets.java index a67f313fef7..894eaeb766d 100644 --- a/user/src/com/google/gwt/user/client/ui/HasWidgets.java +++ b/user/src/com/google/gwt/user/client/ui/HasWidgets.java @@ -50,6 +50,7 @@ interface ForIsWidget extends HasWidgets { * Gets an iterator for the contained widgets. This iterator is required to * implement {@link Iterator#remove()}. */ + @Override Iterator iterator(); /** diff --git a/user/src/com/google/gwt/user/client/ui/HeaderPanel.java b/user/src/com/google/gwt/user/client/ui/HeaderPanel.java index e64bd4791dd..ca1c4d7a6a3 100644 --- a/user/src/com/google/gwt/user/client/ui/HeaderPanel.java +++ b/user/src/com/google/gwt/user/client/ui/HeaderPanel.java @@ -48,6 +48,7 @@ public class HeaderPanel extends Panel implements RequiresResize { */ private class WidgetProviderImpl implements WidgetProvider { + @Override public Widget get(int index) { switch (index) { case 0: @@ -70,6 +71,7 @@ public Widget get(int index) { private final Element headerContainer; private final ResizeLayoutPanel.Impl headerImpl = GWT.create(ResizeLayoutPanel.Impl.class); private final ScheduledCommand layoutCmd = new ScheduledCommand() { + @Override public void execute() { layoutScheduled = false; forceLayout(); @@ -86,6 +88,7 @@ public HeaderPanel() { // Create a delegate to handle resize from the header and footer. ResizeLayoutPanel.Impl.Delegate resizeDelegate = new ResizeLayoutPanel.Impl.Delegate() { + @Override public void onResize() { scheduledLayout(); } @@ -158,6 +161,7 @@ public Widget getHeaderWidget() { return header; } + @Override public Iterator iterator() { return new FiniteWidgetIterator(new WidgetProviderImpl(), 3); } @@ -177,6 +181,7 @@ public void onDetach() { footerImpl.onDetach(); } + @Override public void onResize() { // Handle the outer element resizing. scheduledLayout(); diff --git a/user/src/com/google/gwt/user/client/ui/Hidden.java b/user/src/com/google/gwt/user/client/ui/Hidden.java index e8807f49d77..fd8b5d3f8c6 100644 --- a/user/src/com/google/gwt/user/client/ui/Hidden.java +++ b/user/src/com/google/gwt/user/client/ui/Hidden.java @@ -93,6 +93,7 @@ protected Hidden(Element element) { setElement(element); } + @Override public LeafValueEditor asEditor() { if (editor == null) { editor = TakesValueEditor.of(this); @@ -124,6 +125,7 @@ public String getID() { * @return the name */ + @Override public String getName() { return getInputElement().getName(); } @@ -133,6 +135,7 @@ public String getName() { * * @return the value */ + @Override public String getValue() { return getInputElement().getValue(); } @@ -160,6 +163,7 @@ public void setID(String id) { * * @param name name of the field */ + @Override public void setName(String name) { if (name == null) { throw new NullPointerException("Name cannot be null"); @@ -175,6 +179,7 @@ public void setName(String name) { * * @param value value to set */ + @Override public void setValue(String value) { getInputElement().setValue(value); } diff --git a/user/src/com/google/gwt/user/client/ui/HorizontalPanel.java b/user/src/com/google/gwt/user/client/ui/HorizontalPanel.java index c91bb29d9e1..bfaf1f0a63a 100644 --- a/user/src/com/google/gwt/user/client/ui/HorizontalPanel.java +++ b/user/src/com/google/gwt/user/client/ui/HorizontalPanel.java @@ -49,18 +49,22 @@ public void add(Widget w) { add(w, td); } + @Override public HorizontalAlignmentConstant getHorizontalAlignment() { return horzAlign; } + @Override public VerticalAlignmentConstant getVerticalAlignment() { return vertAlign; } + @Override public void insert(IsWidget w, int beforeIndex) { insert(asWidgetOrNull(w), beforeIndex); } + @Override public void insert(Widget w, int beforeIndex) { checkIndexBoundsForInsertion(beforeIndex); @@ -95,6 +99,7 @@ public boolean remove(Widget w) { * * @see HasHorizontalAlignment#setHorizontalAlignment(HasHorizontalAlignment.HorizontalAlignmentConstant) */ + @Override public void setHorizontalAlignment(HorizontalAlignmentConstant align) { horzAlign = align; } @@ -105,6 +110,7 @@ public void setHorizontalAlignment(HorizontalAlignmentConstant align) { * * @see HasVerticalAlignment#setVerticalAlignment(HasVerticalAlignment.VerticalAlignmentConstant) */ + @Override public void setVerticalAlignment(VerticalAlignmentConstant align) { vertAlign = align; } diff --git a/user/src/com/google/gwt/user/client/ui/HorizontalSplitPanel.java b/user/src/com/google/gwt/user/client/ui/HorizontalSplitPanel.java index c98cad8e2f9..04d78ddb376 100644 --- a/user/src/com/google/gwt/user/client/ui/HorizontalSplitPanel.java +++ b/user/src/com/google/gwt/user/client/ui/HorizontalSplitPanel.java @@ -422,6 +422,7 @@ protected void onLoad() { */ setSplitPosition(lastSplitPosition); Scheduler.get().scheduleDeferred(new ScheduledCommand() { + @Override public void execute() { setSplitPosition(lastSplitPosition); } diff --git a/user/src/com/google/gwt/user/client/ui/Hyperlink.java b/user/src/com/google/gwt/user/client/ui/Hyperlink.java index 472966276b1..7b32c29b34f 100644 --- a/user/src/com/google/gwt/user/client/ui/Hyperlink.java +++ b/user/src/com/google/gwt/user/client/ui/Hyperlink.java @@ -245,6 +245,7 @@ private Hyperlink( * History.newItem from the handler if you need to process the * click before the history token is set. */ + @Override @Deprecated public HandlerRegistration addClickHandler(ClickHandler handler) { return addHandler(handler, ClickEvent.getType()); @@ -260,10 +261,12 @@ public void addClickListener(ClickListener listener) { ListenerWrapper.WrappedClickListener.add(this, listener); } + @Override public DirectionEstimator getDirectionEstimator() { return directionalTextHelper.getDirectionEstimator(); } + @Override public String getHTML() { return directionalTextHelper.getHtml(); } @@ -278,10 +281,12 @@ public String getTargetHistoryToken() { return targetHistoryToken; } + @Override public String getText() { return directionalTextHelper.getText(); } + @Override public Direction getTextDirection() { return directionalTextHelper.getTextDirection(); } @@ -309,6 +314,7 @@ public void removeClickListener(ClickListener listener) { *

* See note at {@link #setDirectionEstimator(DirectionEstimator)}. */ + @Override public void setDirectionEstimator(boolean enabled) { directionalTextHelper.setDirectionEstimator(enabled); } @@ -322,18 +328,22 @@ public void setDirectionEstimator(boolean enabled) { * according to the new estimator's result. This may cause flicker, and thus * should be avoided. */ + @Override public void setDirectionEstimator(DirectionEstimator directionEstimator) { directionalTextHelper.setDirectionEstimator(directionEstimator); } + @Override public void setHTML(SafeHtml html) { setHTML(html.asString()); } + @Override public void setHTML(@IsSafeHtml String html) { directionalTextHelper.setHtml(html); } + @Override public void setHTML(SafeHtml html, Direction dir) { directionalTextHelper.setHtml(html, dir); } @@ -355,10 +365,12 @@ public void setTargetHistoryToken(String targetHistoryToken) { anchorElem.setPropertyString("href", "#" + hash); } + @Override public void setText(String text) { directionalTextHelper.setText(text); } + @Override public void setText(String text, Direction dir) { directionalTextHelper.setText(text, dir); } diff --git a/user/src/com/google/gwt/user/client/ui/Image.java b/user/src/com/google/gwt/user/client/ui/Image.java index c00cfecda02..1250f0ffb7f 100644 --- a/user/src/com/google/gwt/user/client/ui/Image.java +++ b/user/src/com/google/gwt/user/client/ui/Image.java @@ -323,6 +323,7 @@ protected void fireSyntheticLoadEvent(final Image image) { * handler. */ syntheticEventCommand = new ScheduledCommand() { + @Override public void execute() { /* * The state has been replaced, or another load event is already @@ -605,6 +606,7 @@ protected Image(Element element) { changeState(new UnclippedState(element)); } + @Override public HandlerRegistration addClickHandler(ClickHandler handler) { return addHandler(handler, ClickEvent.getType()); } @@ -617,54 +619,67 @@ public void addClickListener(ClickListener listener) { ListenerWrapper.WrappedClickListener.add(this, listener); } + @Override public HandlerRegistration addDoubleClickHandler(DoubleClickHandler handler) { return addHandler(handler, DoubleClickEvent.getType()); } + @Override public HandlerRegistration addDragEndHandler(DragEndHandler handler) { return addBitlessDomHandler(handler, DragEndEvent.getType()); } + @Override public HandlerRegistration addDragEnterHandler(DragEnterHandler handler) { return addBitlessDomHandler(handler, DragEnterEvent.getType()); } + @Override public HandlerRegistration addDragHandler(DragHandler handler) { return addBitlessDomHandler(handler, DragEvent.getType()); } + @Override public HandlerRegistration addDragLeaveHandler(DragLeaveHandler handler) { return addBitlessDomHandler(handler, DragLeaveEvent.getType()); } + @Override public HandlerRegistration addDragOverHandler(DragOverHandler handler) { return addBitlessDomHandler(handler, DragOverEvent.getType()); } + @Override public HandlerRegistration addDragStartHandler(DragStartHandler handler) { return addBitlessDomHandler(handler, DragStartEvent.getType()); } + @Override public HandlerRegistration addDropHandler(DropHandler handler) { return addBitlessDomHandler(handler, DropEvent.getType()); } + @Override public HandlerRegistration addErrorHandler(ErrorHandler handler) { return addHandler(handler, ErrorEvent.getType()); } + @Override public HandlerRegistration addGestureChangeHandler(GestureChangeHandler handler) { return addDomHandler(handler, GestureChangeEvent.getType()); } + @Override public HandlerRegistration addGestureEndHandler(GestureEndHandler handler) { return addDomHandler(handler, GestureEndEvent.getType()); } + @Override public HandlerRegistration addGestureStartHandler(GestureStartHandler handler) { return addDomHandler(handler, GestureStartEvent.getType()); } + @Override public HandlerRegistration addLoadHandler(LoadHandler handler) { return addHandler(handler, LoadEvent.getType()); } @@ -678,6 +693,7 @@ public void addLoadListener(LoadListener listener) { ListenerWrapper.WrappedLoadListener.add(this, listener); } + @Override public HandlerRegistration addMouseDownHandler(MouseDownHandler handler) { return addDomHandler(handler, MouseDownEvent.getType()); } @@ -692,22 +708,27 @@ public void addMouseListener(MouseListener listener) { ListenerWrapper.WrappedMouseListener.add(this, listener); } + @Override public HandlerRegistration addMouseMoveHandler(MouseMoveHandler handler) { return addDomHandler(handler, MouseMoveEvent.getType()); } + @Override public HandlerRegistration addMouseOutHandler(MouseOutHandler handler) { return addDomHandler(handler, MouseOutEvent.getType()); } + @Override public HandlerRegistration addMouseOverHandler(MouseOverHandler handler) { return addDomHandler(handler, MouseOverEvent.getType()); } + @Override public HandlerRegistration addMouseUpHandler(MouseUpHandler handler) { return addDomHandler(handler, MouseUpEvent.getType()); } + @Override public HandlerRegistration addMouseWheelHandler(MouseWheelHandler handler) { return addDomHandler(handler, MouseWheelEvent.getType()); } @@ -720,18 +741,22 @@ public void addMouseWheelListener(MouseWheelListener listener) { ListenerWrapper.WrappedMouseWheelListener.add(this, listener); } + @Override public HandlerRegistration addTouchCancelHandler(TouchCancelHandler handler) { return addDomHandler(handler, TouchCancelEvent.getType()); } + @Override public HandlerRegistration addTouchEndHandler(TouchEndHandler handler) { return addDomHandler(handler, TouchEndEvent.getType()); } + @Override public HandlerRegistration addTouchMoveHandler(TouchMoveHandler handler) { return addDomHandler(handler, TouchMoveEvent.getType()); } + @Override public HandlerRegistration addTouchStartHandler(TouchStartHandler handler) { return addDomHandler(handler, TouchStartEvent.getType()); } diff --git a/user/src/com/google/gwt/user/client/ui/Label.java b/user/src/com/google/gwt/user/client/ui/Label.java index 3759a39382c..708145bad8d 100644 --- a/user/src/com/google/gwt/user/client/ui/Label.java +++ b/user/src/com/google/gwt/user/client/ui/Label.java @@ -199,6 +199,7 @@ protected Label(Element element) { super(element); } + @Override public HandlerRegistration addClickHandler(ClickHandler handler) { return addDomHandler(handler, ClickEvent.getType()); } @@ -211,50 +212,62 @@ public void addClickListener(ClickListener listener) { ListenerWrapper.WrappedClickListener.add(this, listener); } + @Override public HandlerRegistration addDoubleClickHandler(DoubleClickHandler handler) { return addDomHandler(handler, DoubleClickEvent.getType()); } + @Override public HandlerRegistration addDragEndHandler(DragEndHandler handler) { return addBitlessDomHandler(handler, DragEndEvent.getType()); } + @Override public HandlerRegistration addDragEnterHandler(DragEnterHandler handler) { return addBitlessDomHandler(handler, DragEnterEvent.getType()); } + @Override public HandlerRegistration addDragHandler(DragHandler handler) { return addBitlessDomHandler(handler, DragEvent.getType()); } + @Override public HandlerRegistration addDragLeaveHandler(DragLeaveHandler handler) { return addBitlessDomHandler(handler, DragLeaveEvent.getType()); } + @Override public HandlerRegistration addDragOverHandler(DragOverHandler handler) { return addBitlessDomHandler(handler, DragOverEvent.getType()); } + @Override public HandlerRegistration addDragStartHandler(DragStartHandler handler) { return addBitlessDomHandler(handler, DragStartEvent.getType()); } + @Override public HandlerRegistration addDropHandler(DropHandler handler) { return addBitlessDomHandler(handler, DropEvent.getType()); } + @Override public HandlerRegistration addGestureChangeHandler(GestureChangeHandler handler) { return addDomHandler(handler, GestureChangeEvent.getType()); } + @Override public HandlerRegistration addGestureEndHandler(GestureEndHandler handler) { return addDomHandler(handler, GestureEndEvent.getType()); } + @Override public HandlerRegistration addGestureStartHandler(GestureStartHandler handler) { return addDomHandler(handler, GestureStartEvent.getType()); } + @Override public HandlerRegistration addMouseDownHandler(MouseDownHandler handler) { return addDomHandler(handler, MouseDownEvent.getType()); } @@ -269,22 +282,27 @@ public void addMouseListener(MouseListener listener) { ListenerWrapper.WrappedMouseListener.add(this, listener); } + @Override public HandlerRegistration addMouseMoveHandler(MouseMoveHandler handler) { return addDomHandler(handler, MouseMoveEvent.getType()); } + @Override public HandlerRegistration addMouseOutHandler(MouseOutHandler handler) { return addDomHandler(handler, MouseOutEvent.getType()); } + @Override public HandlerRegistration addMouseOverHandler(MouseOverHandler handler) { return addDomHandler(handler, MouseOverEvent.getType()); } + @Override public HandlerRegistration addMouseUpHandler(MouseUpHandler handler) { return addDomHandler(handler, MouseUpEvent.getType()); } + @Override public HandlerRegistration addMouseWheelHandler(MouseWheelHandler handler) { return addDomHandler(handler, MouseWheelEvent.getType()); } @@ -297,22 +315,27 @@ public void addMouseWheelListener(MouseWheelListener listener) { ListenerWrapper.WrappedMouseWheelListener.add(this, listener); } + @Override public HandlerRegistration addTouchCancelHandler(TouchCancelHandler handler) { return addDomHandler(handler, TouchCancelEvent.getType()); } + @Override public HandlerRegistration addTouchEndHandler(TouchEndHandler handler) { return addDomHandler(handler, TouchEndEvent.getType()); } + @Override public HandlerRegistration addTouchMoveHandler(TouchMoveHandler handler) { return addDomHandler(handler, TouchMoveEvent.getType()); } + @Override public HandlerRegistration addTouchStartHandler(TouchStartHandler handler) { return addDomHandler(handler, TouchStartEvent.getType()); } + @Override public LeafValueEditor asEditor() { if (editor == null) { editor = HasTextEditor.of(this); @@ -324,15 +347,18 @@ public LeafValueEditor asEditor() { * Gets the widget element's direction. * @deprecated Use {@link #getTextDirection} instead */ + @Override @Deprecated public Direction getDirection() { return BidiUtils.getDirectionOnElement(getElement()); } + @Override public String getText() { return directionalTextHelper.getText(); } + @Override public Direction getTextDirection() { return directionalTextHelper.getTextDirection(); } @@ -369,6 +395,7 @@ public void removeMouseWheelListener(MouseWheelListener listener) { * @deprecated Use {@link #setDirectionEstimator} and / or pass explicit * direction to {@link #setText} instead */ + @Override @Deprecated public void setDirection(Direction direction) { directionalTextHelper.setDirection(direction); @@ -385,6 +412,7 @@ public void setDirection(Direction direction) { * * @param text the widget's new text */ + @Override public void setText(String text) { directionalTextHelper.setText(text); updateHorizontalAlignment(); @@ -410,6 +438,7 @@ public void setText(String text) { * @param dir the text's direction. Note: {@code Direction.DEFAULT} means * direction should be inherited from the widget's parent element. */ + @Override public void setText(String text, Direction dir) { directionalTextHelper.setText(text, dir); updateHorizontalAlignment(); diff --git a/user/src/com/google/gwt/user/client/ui/LabelBase.java b/user/src/com/google/gwt/user/client/ui/LabelBase.java index 6d7d3a7bac8..2fd73487bdb 100644 --- a/user/src/com/google/gwt/user/client/ui/LabelBase.java +++ b/user/src/com/google/gwt/user/client/ui/LabelBase.java @@ -64,22 +64,27 @@ private LabelBase(Element element, boolean isElementInline) { isElementInline); } + @Override public AutoHorizontalAlignmentConstant getAutoHorizontalAlignment() { return autoHorizontalAlignment; } + @Override public DirectionEstimator getDirectionEstimator() { return directionalTextHelper.getDirectionEstimator(); } + @Override public HorizontalAlignmentConstant getHorizontalAlignment() { return horzAlign; } + @Override public boolean getWordWrap() { return !WhiteSpace.NOWRAP.getCssName().equals(getElement().getStyle().getWhiteSpace()); } + @Override public void setAutoHorizontalAlignment( AutoHorizontalAlignmentConstant autoAlignment) { autoHorizontalAlignment = autoAlignment; @@ -91,6 +96,7 @@ public void setAutoHorizontalAlignment( *

* See note at {@link #setDirectionEstimator(DirectionEstimator)}. */ + @Override public void setDirectionEstimator(boolean enabled) { directionalTextHelper.setDirectionEstimator(enabled); updateHorizontalAlignment(); @@ -105,6 +111,7 @@ public void setDirectionEstimator(boolean enabled) { * according to the new estimator's result. This may cause flicker, and thus * should be avoided. */ + @Override public void setDirectionEstimator(DirectionEstimator directionEstimator) { directionalTextHelper.setDirectionEstimator(directionEstimator); updateHorizontalAlignment(); @@ -123,10 +130,12 @@ public void setDirectionEstimator(DirectionEstimator directionEstimator) { * * @see #setAutoHorizontalAlignment */ + @Override public void setHorizontalAlignment(HorizontalAlignmentConstant align) { setAutoHorizontalAlignment(align); } + @Override public void setWordWrap(boolean wrap) { getElement().getStyle().setWhiteSpace(wrap ? WhiteSpace.NORMAL : WhiteSpace.NOWRAP); } diff --git a/user/src/com/google/gwt/user/client/ui/LayoutCommand.java b/user/src/com/google/gwt/user/client/ui/LayoutCommand.java index fa1b7f28252..98377f73688 100644 --- a/user/src/com/google/gwt/user/client/ui/LayoutCommand.java +++ b/user/src/com/google/gwt/user/client/ui/LayoutCommand.java @@ -55,6 +55,7 @@ public void cancel() { canceled = true; } + @Override public final void execute() { scheduled = false; if (canceled) { @@ -64,6 +65,7 @@ public final void execute() { doBeforeLayout(); layout.layout(duration, new Layout.AnimationCallback() { + @Override public void onAnimationComplete() { // Chain to the passed callback. if (callback != null) { @@ -71,6 +73,7 @@ public void onAnimationComplete() { } } + @Override public void onLayout(Layer layer, double progress) { // Inform the child associated with this layer that its size may // have changed. diff --git a/user/src/com/google/gwt/user/client/ui/ListBox.java b/user/src/com/google/gwt/user/client/ui/ListBox.java index 78cfd105f2a..244ef56eefd 100644 --- a/user/src/com/google/gwt/user/client/ui/ListBox.java +++ b/user/src/com/google/gwt/user/client/ui/ListBox.java @@ -150,6 +150,7 @@ protected ListBox(Element element) { SelectElement.as(element); } + @Override public HandlerRegistration addChangeHandler(ChangeHandler handler) { return addDomHandler(handler, ChangeEvent.getType()); } @@ -221,6 +222,7 @@ public void clear() { getSelectElement().clear(); } + @Override public DirectionEstimator getDirectionEstimator() { return estimator; } @@ -257,6 +259,7 @@ public String getSelectedItemText() { return index == -1 ? null : getItemText(index); } + @Override public String getName() { return getSelectElement().getName(); } @@ -430,6 +433,7 @@ public void removeItem(int index) { * See note at * {@link #setDirectionEstimator(com.google.gwt.i18n.shared.DirectionEstimator)}. */ + @Override public void setDirectionEstimator(boolean enabled) { setDirectionEstimator(enabled ? DEFAULT_DIRECTION_ESTIMATOR : null); } @@ -438,6 +442,7 @@ public void setDirectionEstimator(boolean enabled) { * {@inheritDoc} * Note: this does not affect the direction of already-existing content. */ + @Override public void setDirectionEstimator(DirectionEstimator directionEstimator) { estimator = directionEstimator; } @@ -496,6 +501,7 @@ public void setMultipleSelect(boolean multiple) { getSelectElement().setMultiple(multiple); } + @Override public void setName(String name) { getSelectElement().setName(name); } diff --git a/user/src/com/google/gwt/user/client/ui/ListenerWrapper.java b/user/src/com/google/gwt/user/client/ui/ListenerWrapper.java index ca485792b42..f869db865da 100644 --- a/user/src/com/google/gwt/user/client/ui/ListenerWrapper.java +++ b/user/src/com/google/gwt/user/client/ui/ListenerWrapper.java @@ -141,10 +141,12 @@ private WrappedLoadListener(LoadListener listener) { super(listener); } + @Override public void onError(ErrorEvent event) { getListener().onError(getSource(event)); } + @Override public void onLoad(LoadEvent event) { getListener().onLoad(getSource(event)); } @@ -193,6 +195,7 @@ public static void remove(Widget eventSource, ChangeListener listener) { super(listener); } + @Override public void onChange(ChangeEvent event) { getListener().onChange(getSource(event)); } @@ -242,6 +245,7 @@ private WrappedClickListener(ClickListener listener) { super(listener); } + @Override public void onClick(ClickEvent event) { getListener().onClick(getSource(event)); } @@ -288,10 +292,12 @@ private WrappedFocusListener(FocusListener listener) { super(listener); } + @Override public void onBlur(BlurEvent event) { getListener().onLostFocus(getSource(event)); } + @Override public void onFocus(FocusEvent event) { getListener().onFocus(getSource(event)); } @@ -339,6 +345,7 @@ private WrappedKeyboardListener(KeyboardListener listener) { super(listener); } + @Override public void onKeyDown(KeyDownEvent event) { getListener().onKeyDown( getSource(event), @@ -346,6 +353,7 @@ public void onKeyDown(KeyDownEvent event) { KeyboardListenerCollection.getKeyboardModifiers(Event.as(event.getNativeEvent()))); } + @Override public void onKeyPress(KeyPressEvent event) { getListener().onKeyPress( getSource(event), @@ -353,6 +361,7 @@ public void onKeyPress(KeyPressEvent event) { KeyboardListenerCollection.getKeyboardModifiers(Event.as(event.getNativeEvent()))); } + @Override public void onKeyUp(KeyUpEvent event) { getSource(event); getListener().onKeyUp( @@ -412,6 +421,7 @@ private WrappedLogicalChangeListener(ChangeListener listener) { super(listener); } + @Override public void onValueChange(ValueChangeEvent event) { getListener().onChange(getSource(event)); } @@ -462,24 +472,29 @@ private WrappedMouseListener(MouseListener listener) { super(listener); } + @Override public void onMouseDown(MouseDownEvent event) { Widget source = getSource(event); getListener().onMouseDown(source, event.getX(), event.getY()); } + @Override public void onMouseMove(MouseMoveEvent event) { Widget source = getSource(event); getListener().onMouseMove(source, event.getX(), event.getY()); } + @Override public void onMouseOut(MouseOutEvent event) { getListener().onMouseLeave(getSource(event)); } + @Override public void onMouseOver(MouseOverEvent event) { getListener().onMouseEnter(getSource(event)); } + @Override public void onMouseUp(MouseUpEvent event) { Widget source = getSource(event); getListener().onMouseUp(source, event.getX(), event.getY()); @@ -524,6 +539,7 @@ private WrappedMouseWheelListener(MouseWheelListener listener) { super(listener); } + @Override public void onMouseWheel(MouseWheelEvent event) { getListener().onMouseWheel(getSource(event), new MouseWheelVelocity(Event.as(event.getNativeEvent()))); @@ -570,6 +586,7 @@ private WrappedScrollListener(ScrollListener listener) { super(listener); } + @Override public void onScroll(ScrollEvent event) { Widget source = getSource(event); Element elem = source.getElement(); @@ -597,11 +614,13 @@ private WrappedOldDisclosureHandler(DisclosureHandler listener) { super(listener); } + @Override public void onClose(CloseEvent event) { getListener().onClose( new DisclosureEvent((DisclosurePanel) event.getSource())); } + @Override public void onOpen(OpenEvent event) { getListener().onOpen( new DisclosureEvent((DisclosurePanel) event.getSource())); @@ -626,6 +645,7 @@ private WrappedOldFormHandler(FormHandler listener) { super(listener); } + @Override public void onSubmit(FormPanel.SubmitEvent event) { FormSubmitEvent fse = new FormSubmitEvent((FormPanel) event.getSource()); getListener().onSubmit(fse); @@ -634,6 +654,7 @@ public void onSubmit(FormPanel.SubmitEvent event) { } } + @Override public void onSubmitComplete(FormPanel.SubmitCompleteEvent event) { getListener().onSubmitComplete( new FormSubmitCompleteEvent((FormPanel) event.getSource(), @@ -660,6 +681,7 @@ private WrappedOldSuggestionHandler(SuggestionHandler listener) { super(listener); } + @Override public void onSelection(SelectionEvent event) { getListener().onSuggestionSelected( new SuggestionEvent((SuggestBox) event.getSource(), @@ -683,6 +705,7 @@ private WrappedPopupListener(PopupListener listener) { super(listener); } + @Override public void onClose(CloseEvent event) { getListener().onPopupClosed((PopupPanel) event.getSource(), event.isAutoClosed()); @@ -707,6 +730,7 @@ private WrappedTableListener(TableListener listener) { super(listener); } + @Override public void onClick(ClickEvent event) { HTMLTable table = (HTMLTable) event.getSource(); HTMLTable.Cell cell = table.getCellForEvent(event); @@ -744,6 +768,7 @@ private WrappedTabListener(TabListener listener) { super(listener); } + @Override public void onBeforeSelection(BeforeSelectionEvent event) { if (!getListener().onBeforeTabSelected( (SourcesTabEvents) event.getSource(), event.getItem().intValue())) { @@ -751,6 +776,7 @@ public void onBeforeSelection(BeforeSelectionEvent event) { } } + @Override public void onSelection(SelectionEvent event) { getListener().onTabSelected((SourcesTabEvents) event.getSource(), event.getSelectedItem().intValue()); @@ -780,14 +806,17 @@ private WrappedTreeListener(TreeListener listener) { super(listener); } + @Override public void onClose(CloseEvent event) { getListener().onTreeItemStateChanged(event.getTarget()); } + @Override public void onOpen(OpenEvent event) { getListener().onTreeItemStateChanged(event.getTarget()); } + @Override public void onSelection(SelectionEvent event) { getListener().onTreeItemSelected(event.getSelectedItem()); } diff --git a/user/src/com/google/gwt/user/client/ui/MultiWordSuggestOracle.java b/user/src/com/google/gwt/user/client/ui/MultiWordSuggestOracle.java index 1645225c03e..74224a30989 100644 --- a/user/src/com/google/gwt/user/client/ui/MultiWordSuggestOracle.java +++ b/user/src/com/google/gwt/user/client/ui/MultiWordSuggestOracle.java @@ -93,11 +93,13 @@ public MultiWordSuggestion(String replacementString, @IsSafeHtml String displayS this.displayString = displayString; } + @Override @IsSafeHtml public String getDisplayString() { return displayString; } + @Override public String getReplacementString() { return replacementString; } @@ -119,6 +121,7 @@ public WordBounds(int startIndex, int length) { this.endIndex = startIndex + length; } + @Override public int compareTo(WordBounds that) { int comparison = this.startIndex - that.startIndex; if (comparison == 0) { diff --git a/user/src/com/google/gwt/user/client/ui/NativeHorizontalScrollbar.java b/user/src/com/google/gwt/user/client/ui/NativeHorizontalScrollbar.java index deaadaa5091..a5d33353310 100644 --- a/user/src/com/google/gwt/user/client/ui/NativeHorizontalScrollbar.java +++ b/user/src/com/google/gwt/user/client/ui/NativeHorizontalScrollbar.java @@ -52,6 +52,7 @@ public interface ResourcesTransparant extends Resources { /** * The styles used in this widget. */ + @Override @Source(StyleTransparant.DEFAULT_CSS) Style nativeHorizontalScrollbarStyle(); } @@ -135,14 +136,17 @@ public NativeHorizontalScrollbar(Resources resources) { ScrollImpl.get().initialize(scrollable, contentDiv); } + @Override public int getHorizontalScrollPosition() { return getScrollableElement().getScrollLeft(); } + @Override public int getMaximumHorizontalScrollPosition() { return ScrollImpl.get().getMaximumHorizontalScrollPosition(getScrollableElement()); } + @Override public int getMinimumHorizontalScrollPosition() { return ScrollImpl.get().getMinimumHorizontalScrollPosition(getScrollableElement()); } @@ -158,10 +162,12 @@ public int getMinimumHorizontalScrollPosition() { * @return the scroll width * @see #setScrollWidth(int) */ + @Override public int getScrollWidth() { return contentDiv.getOffsetWidth(); } + @Override public void setHorizontalScrollPosition(int position) { getScrollableElement().setScrollLeft(position); } @@ -176,6 +182,7 @@ public void setHorizontalScrollPosition(int position) { * * @param width the size width pixels */ + @Override public void setScrollWidth(int width) { contentDiv.getStyle().setWidth(width, Unit.PX); } diff --git a/user/src/com/google/gwt/user/client/ui/NativeVerticalScrollbar.java b/user/src/com/google/gwt/user/client/ui/NativeVerticalScrollbar.java index 722eeba7fb5..109b581d6db 100644 --- a/user/src/com/google/gwt/user/client/ui/NativeVerticalScrollbar.java +++ b/user/src/com/google/gwt/user/client/ui/NativeVerticalScrollbar.java @@ -52,6 +52,7 @@ public interface ResourcesTransparant extends Resources { /** * The styles used in this widget. */ + @Override @Source(StyleTransparant.DEFAULT_CSS) Style nativeVerticalScrollbarStyle(); } @@ -156,10 +157,12 @@ public NativeVerticalScrollbar(Resources resources) { ScrollImpl.get().initialize(scrollable, contentDiv); } + @Override public int getMaximumVerticalScrollPosition() { return getScrollableElement().getScrollHeight() - getElement().getClientHeight(); } + @Override public int getMinimumVerticalScrollPosition() { return 0; } @@ -175,10 +178,12 @@ public int getMinimumVerticalScrollPosition() { * @return the scroll height * @see #setScrollHeight(int) */ + @Override public int getScrollHeight() { return contentDiv.getOffsetHeight(); } + @Override public int getVerticalScrollPosition() { return getScrollableElement().getScrollTop(); } @@ -193,10 +198,12 @@ public int getVerticalScrollPosition() { * * @param height the size height pixels */ + @Override public void setScrollHeight(int height) { contentDiv.getStyle().setHeight(height, Unit.PX); } + @Override public void setVerticalScrollPosition(int position) { getScrollableElement().setScrollTop(position); } diff --git a/user/src/com/google/gwt/user/client/ui/Panel.java b/user/src/com/google/gwt/user/client/ui/Panel.java index 8caa88ca4e3..b1073ca6d3b 100644 --- a/user/src/com/google/gwt/user/client/ui/Panel.java +++ b/user/src/com/google/gwt/user/client/ui/Panel.java @@ -59,15 +59,18 @@ public abstract class Panel extends Widget implements HasWidgets.ForIsWidget { * often this means that a specific overload must be called) * @see HasWidgets#add(Widget) */ + @Override public void add(Widget child) { throw new UnsupportedOperationException( "This panel does not support no-arg add()"); } + @Override public void add(IsWidget child) { this.add(asWidgetOrNull(child)); } + @Override public void clear() { Iterator it = iterator(); while (it.hasNext()) { @@ -103,8 +106,10 @@ public void clear() { * @param child the widget to be removed * @return true if the child was present */ + @Override public abstract boolean remove(Widget child); + @Override public boolean remove(IsWidget child) { return remove(asWidgetOrNull(child)); } diff --git a/user/src/com/google/gwt/user/client/ui/PopupPanel.java b/user/src/com/google/gwt/user/client/ui/PopupPanel.java index f08eee2a263..5660c7683de 100644 --- a/user/src/com/google/gwt/user/client/ui/PopupPanel.java +++ b/user/src/com/google/gwt/user/client/ui/PopupPanel.java @@ -363,6 +363,7 @@ private void onInstantaneousRun() { * Window resize handler used to keep the glass the proper size. */ private ResizeHandler glassResizer = new ResizeHandler() { + @Override public void onResize(ResizeEvent event) { Style style = glass.getStyle(); @@ -486,6 +487,7 @@ public void addAutoHidePartner(Element partner) { autoHidePartners.add(partner); } + @Override public HandlerRegistration addCloseHandler(CloseHandler handler) { return addHandler(handler, CloseEvent.getType()); } @@ -618,6 +620,7 @@ public void hide(boolean autoClosed) { CloseEvent.fire(this, this, autoClosed); } + @Override public boolean isAnimationEnabled() { return isAnimationEnabled; } @@ -772,6 +775,7 @@ public void removePopupListener(PopupListener listener) { ListenerWrapper.WrappedPopupListener.remove(this, listener); } + @Override public void setAnimationEnabled(boolean enable) { isAnimationEnabled = enable; } @@ -1017,6 +1021,7 @@ public void show() { public final void showRelativeTo(final UIObject target) { // Set the position of the popup right before it is shown. setPopupPositionAndShow(new PositionCallback() { + @Override public void setPosition(int offsetWidth, int offsetHeight) { position(target, offsetWidth, offsetHeight); } @@ -1428,11 +1433,13 @@ private void updateHandlers() { // Create handlers if showing. if (showing) { nativePreviewHandlerRegistration = Event.addNativePreviewHandler(new NativePreviewHandler() { + @Override public void onPreviewNativeEvent(NativePreviewEvent event) { previewNativeEvent(event); } }); historyHandlerRegistration = History.addValueChangeHandler(new ValueChangeHandler() { + @Override public void onValueChange(ValueChangeEvent event) { if (autoHideOnHistoryEvents) { hide(); diff --git a/user/src/com/google/gwt/user/client/ui/PrefixTree.java b/user/src/com/google/gwt/user/client/ui/PrefixTree.java index 55d97f12aed..9cc667a252b 100644 --- a/user/src/com/google/gwt/user/client/ui/PrefixTree.java +++ b/user/src/com/google/gwt/user/client/ui/PrefixTree.java @@ -54,6 +54,7 @@ public PrefixTreeIterator(PrefixTree tree) { addTree(tree, ""); } + @Override public boolean hasNext() { // Have nextImpl peek at the next value that would be returned. return nextImpl(true) != null; @@ -62,6 +63,7 @@ public boolean hasNext() { /** * {@inheritDoc} Wraps the native implementation with some sanity checking. */ + @Override public String next() { final String toReturn = nextImpl(false); @@ -79,6 +81,7 @@ public String next() { return toReturn; } + @Override public void remove() { throw new UnsupportedOperationException("PrefixTree does not support " + "removal. Use clear()"); diff --git a/user/src/com/google/gwt/user/client/ui/ResizeComposite.java b/user/src/com/google/gwt/user/client/ui/ResizeComposite.java index 10542490688..99ad859416e 100644 --- a/user/src/com/google/gwt/user/client/ui/ResizeComposite.java +++ b/user/src/com/google/gwt/user/client/ui/ResizeComposite.java @@ -30,6 +30,7 @@ protected void initWidget(Widget widget) { super.initWidget(widget); } + @Override public void onResize() { ((RequiresResize) getWidget()).onResize(); } diff --git a/user/src/com/google/gwt/user/client/ui/ResizeLayoutPanel.java b/user/src/com/google/gwt/user/client/ui/ResizeLayoutPanel.java index dfaf374cf87..b2d3ee0f10a 100644 --- a/user/src/com/google/gwt/user/client/ui/ResizeLayoutPanel.java +++ b/user/src/com/google/gwt/user/client/ui/ResizeLayoutPanel.java @@ -181,12 +181,14 @@ public void onAttach() { * the offsetHeight/Width correctly. */ Scheduler.get().scheduleDeferred(new ScheduledCommand() { + @Override public void execute() { resetScrollables(); } }); } + @Override public void onBrowserEvent(Event event) { if (!resettingScrollables && Event.ONSCROLL == event.getTypeInt()) { EventTarget eventTarget = event.getEventTarget(); @@ -310,6 +312,7 @@ private native void setResizeEventListener(Element elem, Impl listener) /*-{ private Layer layer; private final Layout layout; private final ScheduledCommand resizeCmd = new ScheduledCommand() { + @Override public void execute() { resizeCmdScheduled = false; handleResize(); @@ -320,12 +323,14 @@ public void execute() { public ResizeLayoutPanel() { layout = new Layout(getElement()); impl.init(getElement(), new Delegate() { + @Override public void onResize() { scheduleResize(); } }); } + @Override public HandlerRegistration addResizeHandler(ResizeHandler handler) { return addHandler(handler, ResizeEvent.getType()); } diff --git a/user/src/com/google/gwt/user/client/ui/RichTextArea.java b/user/src/com/google/gwt/user/client/ui/RichTextArea.java index f08f1f58030..cbd69695f4a 100644 --- a/user/src/com/google/gwt/user/client/ui/RichTextArea.java +++ b/user/src/com/google/gwt/user/client/ui/RichTextArea.java @@ -347,6 +347,7 @@ public interface Formatter extends ExtendedFormatter { * * @param url the URL to be linked to */ + @Override void createLink(String url); /** @@ -354,6 +355,7 @@ public interface Formatter extends ExtendedFormatter { * * @return the background color */ + @Override String getBackColor(); /** @@ -361,11 +363,13 @@ public interface Formatter extends ExtendedFormatter { * * @return the foreground color */ + @Override String getForeColor(); /** * Inserts a horizontal rule. */ + @Override void insertHorizontalRule(); /** @@ -380,16 +384,19 @@ public interface Formatter extends ExtendedFormatter { * * @param url the url of the image to be inserted */ + @Override void insertImage(String url); /** * Starts an numbered list. Indentation will create nested items. */ + @Override void insertOrderedList(); /** * Starts an bulleted list. Indentation will create nested items. */ + @Override void insertUnorderedList(); /** @@ -397,6 +404,7 @@ public interface Formatter extends ExtendedFormatter { * * @return true if the current region is bold */ + @Override boolean isBold(); /** @@ -404,6 +412,7 @@ public interface Formatter extends ExtendedFormatter { * * @return true if the current region is italic */ + @Override boolean isItalic(); /** @@ -411,6 +420,7 @@ public interface Formatter extends ExtendedFormatter { * * @return true if the current region is strikethrough */ + @Override boolean isStrikethrough(); /** @@ -418,6 +428,7 @@ public interface Formatter extends ExtendedFormatter { * * @return true if the current region is subscript */ + @Override boolean isSubscript(); /** @@ -425,6 +436,7 @@ public interface Formatter extends ExtendedFormatter { * * @return true if the current region is superscript */ + @Override boolean isSuperscript(); /** @@ -432,11 +444,13 @@ public interface Formatter extends ExtendedFormatter { * * @return true if the current region is underlined */ + @Override boolean isUnderlined(); /** * Left indent. */ + @Override void leftIndent(); /** @@ -447,21 +461,25 @@ public interface Formatter extends ExtendedFormatter { /** * Removes all formatting on the selected text. */ + @Override void removeFormat(); /** * Removes any link from the selected text. */ + @Override void removeLink(); /** * Right indent. */ + @Override void rightIndent(); /** * Selects all the text. */ + @Override void selectAll(); /** @@ -469,6 +487,7 @@ public interface Formatter extends ExtendedFormatter { * * @param color the new background color */ + @Override void setBackColor(String color); /** @@ -476,6 +495,7 @@ public interface Formatter extends ExtendedFormatter { * * @param name the new font name */ + @Override void setFontName(String name); /** @@ -483,6 +503,7 @@ public interface Formatter extends ExtendedFormatter { * * @param fontSize the new font size */ + @Override void setFontSize(FontSize fontSize); /** @@ -490,6 +511,7 @@ public interface Formatter extends ExtendedFormatter { * * @param color the new foreground color */ + @Override void setForeColor(String color); /** @@ -497,36 +519,43 @@ public interface Formatter extends ExtendedFormatter { * * @param justification the new justification */ + @Override void setJustification(Justification justification); /** * Toggles bold. */ + @Override void toggleBold(); /** * Toggles italic. */ + @Override void toggleItalic(); /** * Toggles strikethrough. */ + @Override void toggleStrikethrough(); /** * Toggles subscript. */ + @Override void toggleSubscript(); /** * Toggles superscript. */ + @Override void toggleSuperscript(); /** * Toggles underline. */ + @Override void toggleUnderline(); /** @@ -584,6 +613,7 @@ public RichTextArea() { impl.setOwner(this); } + @Override public HandlerRegistration addInitializeHandler(InitializeHandler handler) { return addHandler(handler, InitializeEvent.getType()); } @@ -628,10 +658,12 @@ public Formatter getFormatter() { return null; } + @Override public String getHTML() { return impl.getHTML(); } + @Override public String getText() { return impl.getText(); } @@ -655,14 +687,17 @@ public void setFocus(boolean focused) { } } + @Override public void setHTML(@IsSafeHtml String html) { impl.setHTML(html); } + @Override public void setHTML(SafeHtml html) { setHTML(html.asString()); } + @Override public void setText(String text) { impl.setText(text); } diff --git a/user/src/com/google/gwt/user/client/ui/RootLayoutPanel.java b/user/src/com/google/gwt/user/client/ui/RootLayoutPanel.java index e54be6f1592..867c20992b0 100644 --- a/user/src/com/google/gwt/user/client/ui/RootLayoutPanel.java +++ b/user/src/com/google/gwt/user/client/ui/RootLayoutPanel.java @@ -64,6 +64,7 @@ public static RootLayoutPanel get() { private RootLayoutPanel() { Window.addResizeHandler(new ResizeHandler() { + @Override public void onResize(ResizeEvent event) { RootLayoutPanel.this.onResize(); } diff --git a/user/src/com/google/gwt/user/client/ui/RootPanel.java b/user/src/com/google/gwt/user/client/ui/RootPanel.java index 7397544b394..49832e397b8 100644 --- a/user/src/com/google/gwt/user/client/ui/RootPanel.java +++ b/user/src/com/google/gwt/user/client/ui/RootPanel.java @@ -64,6 +64,7 @@ protected void setWidgetPositionImpl(Widget w, int left, int top) { * The singleton command used to detach widgets. */ private static final AttachDetachException.Command maybeDetachCommand = new AttachDetachException.Command() { + @Override public void execute(Widget w) { if (w.isAttached()) { w.onDetach(); diff --git a/user/src/com/google/gwt/user/client/ui/ScrollPanel.java b/user/src/com/google/gwt/user/client/ui/ScrollPanel.java index bf7d72c74ea..1705d02ef03 100644 --- a/user/src/com/google/gwt/user/client/ui/ScrollPanel.java +++ b/user/src/com/google/gwt/user/client/ui/ScrollPanel.java @@ -77,6 +77,7 @@ protected ScrollPanel(Element root, Element scrollable, Element container) { initialize(); } + @Override public HandlerRegistration addScrollHandler(ScrollHandler handler) { /* * Sink the event on the scrollable element, which may not be the root @@ -111,22 +112,27 @@ public void ensureVisible(UIObject item) { * * @return the horizontal scroll position, in pixels */ + @Override public int getHorizontalScrollPosition() { return getScrollableElement().getScrollLeft(); } + @Override public int getMaximumHorizontalScrollPosition() { return ScrollImpl.get().getMaximumHorizontalScrollPosition(getScrollableElement()); } + @Override public int getMaximumVerticalScrollPosition() { return getScrollableElement().getScrollHeight() - getScrollableElement().getClientHeight(); } + @Override public int getMinimumHorizontalScrollPosition() { return ScrollImpl.get().getMinimumHorizontalScrollPosition(getScrollableElement()); } + @Override public int getMinimumVerticalScrollPosition() { return 0; } @@ -142,6 +148,7 @@ public int getScrollPosition() { return getScrollableElement().getScrollTop(); } + @Override public int getVerticalScrollPosition() { return getScrollPosition(); } @@ -156,6 +163,7 @@ public boolean isTouchScrollingDisabled() { return touchScroller == null; } + @Override public void onResize() { Widget child = getWidget(); if ((child != null) && (child instanceof RequiresResize)) { @@ -227,6 +235,7 @@ public void setHeight(String height) { * * @param position the new horizontal scroll position, in pixels */ + @Override public void setHorizontalScrollPosition(int position) { getScrollableElement().setScrollLeft(position); } @@ -281,6 +290,7 @@ public boolean setTouchScrollingDisabled(boolean isDisabled) { return isTouchScrollingDisabled(); } + @Override public void setVerticalScrollPosition(int position) { setScrollPosition(position); } diff --git a/user/src/com/google/gwt/user/client/ui/SimpleCheckBox.java b/user/src/com/google/gwt/user/client/ui/SimpleCheckBox.java index 0e71670717a..2732ae02b5f 100644 --- a/user/src/com/google/gwt/user/client/ui/SimpleCheckBox.java +++ b/user/src/com/google/gwt/user/client/ui/SimpleCheckBox.java @@ -102,6 +102,7 @@ public HandlerRegistration addValueChangeHandler( return addHandler(handler, ValueChangeEvent.getType()); } + @Override public LeafValueEditor asEditor() { if (editor == null) { editor = TakesValueEditor.of(this); @@ -122,6 +123,7 @@ public String getFormValue() { return getInputElement().getValue(); } + @Override public String getName() { return getInputElement().getName(); } @@ -136,6 +138,7 @@ public String getName() { * @return true if the check box is checked, false otherwise. * Will not return null */ + @Override public Boolean getValue() { String propName = isAttached() ? "checked" : "defaultChecked"; return getInputElement().getPropertyBoolean(propName); @@ -189,6 +192,7 @@ public void setFormValue(String value) { getInputElement().setAttribute("value", value); } + @Override public void setName(String name) { getInputElement().setName(name); } @@ -202,6 +206,7 @@ public void setName(String name) { * * @param value true to check, false to uncheck; null value implies false */ + @Override public void setValue(Boolean value) { setValue(value, false); } diff --git a/user/src/com/google/gwt/user/client/ui/SimplePanel.java b/user/src/com/google/gwt/user/client/ui/SimplePanel.java index c9af2ca9e9e..552fc4a7d5a 100644 --- a/user/src/com/google/gwt/user/client/ui/SimplePanel.java +++ b/user/src/com/google/gwt/user/client/ui/SimplePanel.java @@ -74,10 +74,12 @@ public void add(Widget w) { * * @return the child widget, or null if none is present */ + @Override public Widget getWidget() { return widget; } + @Override public Iterator iterator() { // Return a simple iterator that enumerates the 0 or 1 elements in this // panel. @@ -85,10 +87,12 @@ public Iterator iterator() { boolean hasElement = widget != null; Widget returned = null; + @Override public boolean hasNext() { return hasElement; } + @Override public Widget next() { if (!hasElement || (widget == null)) { throw new NoSuchElementException(); @@ -97,6 +101,7 @@ public Widget next() { return (returned = widget); } + @Override public void remove() { if (returned != null) { SimplePanel.this.remove(returned); @@ -125,6 +130,7 @@ public boolean remove(Widget w) { return true; } + @Override public void setWidget(IsWidget w) { setWidget(asWidgetOrNull(w)); } @@ -134,6 +140,7 @@ public void setWidget(IsWidget w) { * * @param w the panel's new widget, or null to clear the panel */ + @Override public void setWidget(Widget w) { // Validate if (w == widget) { diff --git a/user/src/com/google/gwt/user/client/ui/SplitPanel.java b/user/src/com/google/gwt/user/client/ui/SplitPanel.java index 94136239cff..4862f3a5423 100644 --- a/user/src/com/google/gwt/user/client/ui/SplitPanel.java +++ b/user/src/com/google/gwt/user/client/ui/SplitPanel.java @@ -273,6 +273,7 @@ public boolean isResizing() { return isResizing; } + @Override public Iterator iterator() { return WidgetIterators.createWidgetIterator(this, widgets); } diff --git a/user/src/com/google/gwt/user/client/ui/StackLayoutPanel.java b/user/src/com/google/gwt/user/client/ui/StackLayoutPanel.java index 6caf7cdc338..e28aa64ece9 100644 --- a/user/src/com/google/gwt/user/client/ui/StackLayoutPanel.java +++ b/user/src/com/google/gwt/user/client/ui/StackLayoutPanel.java @@ -106,6 +106,7 @@ public Header(Widget child) { initWidget(child); } + @Override public HandlerRegistration addClickHandler(ClickHandler handler) { return this.addDomHandler(handler, ClickEvent.getType()); } @@ -155,6 +156,7 @@ public StackLayoutPanel(Unit unit) { setStyleName(WIDGET_STYLE); } + @Override public void add(Widget w) { assert false : "Single-argument add() is not supported for this widget"; } @@ -228,20 +230,24 @@ public void add(final IsWidget widget, IsWidget header, double headerSize) { this.add(widget.asWidget(), header.asWidget(), headerSize); } + @Override public HandlerRegistration addBeforeSelectionHandler( BeforeSelectionHandler handler) { return addHandler(handler, BeforeSelectionEvent.getType()); } + @Override public HandlerRegistration addSelectionHandler( SelectionHandler handler) { return addHandler(handler, SelectionEvent.getType()); } + @Override public void animate(int duration) { animate(duration, null); } + @Override public void animate(int duration, AnimationCallback callback) { // Don't try to animate zero widgets. if (layoutData.size() == 0) { @@ -281,12 +287,14 @@ public void animate(int duration, AnimationCallback callback) { layoutPanel.animate(duration, callback); } + @Override public void clear() { layoutPanel.clear(); layoutData.clear(); selectedIndex = -1; } + @Override public void forceLayout() { layoutPanel.forceLayout(); } @@ -343,18 +351,22 @@ public Widget getVisibleWidget() { return getWidget(selectedIndex); } + @Override public Widget getWidget(int index) { return layoutPanel.getWidget(index * 2 + 1); } + @Override public int getWidgetCount() { return layoutPanel.getWidgetCount() / 2; } + @Override public int getWidgetIndex(IsWidget child) { return getWidgetIndex(asWidgetOrNull(child)); } + @Override public int getWidgetIndex(Widget child) { int index = layoutPanel.getWidgetIndex(child); if (index == -1) { @@ -426,14 +438,17 @@ public void insert(Widget child, Widget header, double headerSize, insert(child, new Header(header), headerSize, beforeIndex); } + @Override public Iterator iterator() { return new Iterator() { int i = 0, last = -1; + @Override public boolean hasNext() { return i < layoutData.size(); } + @Override public Widget next() { if (!hasNext()) { throw new NoSuchElementException(); @@ -441,6 +456,7 @@ public Widget next() { return layoutData.get(last = i++).widget; } + @Override public void remove() { if (last < 0) { throw new IllegalStateException(); @@ -458,10 +474,12 @@ public void onResize() { layoutPanel.onResize(); } + @Override public boolean remove(int index) { return remove(getWidget(index)); } + @Override public boolean remove(Widget child) { if (child.getParent() != layoutPanel) { return false; @@ -632,18 +650,21 @@ private void insert(final Widget child, final Header header, double headerSize, child.addStyleName(CONTENT_STYLE); header.addClickHandler(new ClickHandler() { + @Override public void onClick(ClickEvent event) { showWidget(child); } }); header.addMouseOutHandler(new MouseOutHandler() { + @Override public void onMouseOut(MouseOutEvent event) { header.removeStyleName(HEADER_STYLE_HOVERING); } }); header.addMouseOverHandler(new MouseOverHandler() { + @Override public void onMouseOver(MouseOverEvent event) { header.addStyleName(HEADER_STYLE_HOVERING); } diff --git a/user/src/com/google/gwt/user/client/ui/StackPanel.java b/user/src/com/google/gwt/user/client/ui/StackPanel.java index 29a032c1b33..e4e7cb38357 100644 --- a/user/src/com/google/gwt/user/client/ui/StackPanel.java +++ b/user/src/com/google/gwt/user/client/ui/StackPanel.java @@ -126,10 +126,12 @@ public int getSelectedIndex() { return visibleStack; } + @Override public void insert(IsWidget w, int beforeIndex) { insert(asWidgetOrNull(w), beforeIndex); } + @Override public void insert(Widget w, int beforeIndex) { // header Element trh = DOM.createTR(); diff --git a/user/src/com/google/gwt/user/client/ui/SuggestBox.java b/user/src/com/google/gwt/user/client/ui/SuggestBox.java index 55fa3383290..850b16888ca 100644 --- a/user/src/com/google/gwt/user/client/ui/SuggestBox.java +++ b/user/src/com/google/gwt/user/client/ui/SuggestBox.java @@ -321,6 +321,7 @@ public void hideSuggestions() { suggestionPopup.hide(); } + @Override public boolean isAnimationEnabled() { return suggestionPopup.isAnimationEnabled(); } @@ -340,6 +341,7 @@ public boolean isSuggestionListShowing() { return suggestionPopup.isShowing(); } + @Override public void setAnimationEnabled(boolean enable) { suggestionPopup.setAnimationEnabled(enable); } @@ -496,6 +498,7 @@ protected void showSuggestions(final SuggestBox suggestBox, final SuggestionMenuItem menuItem = new SuggestionMenuItem( curSuggestion, isDisplayStringHTML); menuItem.setScheduledCommand(new ScheduledCommand() { + @Override public void execute() { callback.onSuggestionSelected(curSuggestion); } @@ -662,6 +665,7 @@ public static SuggestBox wrap(SuggestOracle oracle, Element element) { private final SuggestionDisplay display; private final ValueBoxBase box; private final Callback callback = new Callback() { + @Override public void onSuggestionsReady(Request request, Response response) { // If disabled while request was in-flight, drop it if (!isEnabled()) { @@ -675,6 +679,7 @@ public void onSuggestionsReady(Request request, Response response) { } }; private final SuggestionCallback suggestionCallback = new SuggestionCallback() { + @Override public void onSuggestionSelected(Suggestion suggestion) { box.setFocus(true); setNewSelection(suggestion); @@ -795,23 +800,28 @@ public void addKeyboardListener(KeyboardListener listener) { ListenerWrapper.WrappedKeyboardListener.add(this, listener); } + @Override public HandlerRegistration addKeyDownHandler(KeyDownHandler handler) { return addDomHandler(handler, KeyDownEvent.getType()); } + @Override public HandlerRegistration addKeyPressHandler(KeyPressHandler handler) { return addDomHandler(handler, KeyPressEvent.getType()); } + @Override public HandlerRegistration addKeyUpHandler(KeyUpHandler handler) { return addDomHandler(handler, KeyUpEvent.getType()); } + @Override public HandlerRegistration addSelectionHandler( SelectionHandler handler) { return addHandler(handler, SelectionEvent.getType()); } + @Override public HandlerRegistration addValueChangeHandler( ValueChangeHandler handler) { return addHandler(handler, ValueChangeEvent.getType()); @@ -820,6 +830,7 @@ public HandlerRegistration addValueChangeHandler( /** * Returns a {@link TakesValueEditor} backed by the SuggestBox. */ + @Override public LeafValueEditor asEditor() { if (editor == null) { editor = TakesValueEditor.of(this); @@ -856,10 +867,12 @@ public SuggestOracle getSuggestOracle() { return oracle; } + @Override public int getTabIndex() { return box.getTabIndex(); } + @Override public String getText() { return box.getText(); } @@ -877,6 +890,7 @@ public TextBoxBase getTextBox() { return (TextBoxBase) box; } + @Override public String getValue() { return box.getValue(); } @@ -909,6 +923,7 @@ public void hideSuggestionList() { * @deprecated use {@link DefaultSuggestionDisplay#isAnimationEnabled()} * instead */ + @Override @Deprecated public boolean isAnimationEnabled() { return display.isAnimationEnabledImpl(); @@ -929,6 +944,7 @@ public boolean isAutoSelectEnabled() { * * @return true if the widget is enabled */ + @Override public boolean isEnabled() { return box.isEnabled(); } @@ -999,6 +1015,7 @@ public void removeKeyboardListener(KeyboardListener listener) { ListenerWrapper.WrappedKeyboardListener.remove(this, listener); } + @Override public void setAccessKey(char key) { box.setAccessKey(key); } @@ -1012,6 +1029,7 @@ public void setAccessKey(char key) { * {@link DefaultSuggestionDisplay#setAnimationEnabled(boolean)} * instead */ + @Override @Deprecated public void setAnimationEnabled(boolean enable) { display.setAnimationEnabledImpl(enable); @@ -1034,6 +1052,7 @@ public void setAutoSelectEnabled(boolean selectsFirstItem) { * @param enabled true to enable the widget, false * to disable it */ + @Override public void setEnabled(boolean enabled) { box.setEnabled(enabled); if (!enabled) { @@ -1041,6 +1060,7 @@ public void setEnabled(boolean enabled) { } } + @Override public void setFocus(boolean focused) { box.setFocus(focused); } @@ -1070,18 +1090,22 @@ public void setPopupStyleName(String style) { getSuggestionDisplay().setPopupStyleNameImpl(style); } + @Override public void setTabIndex(int index) { box.setTabIndex(index); } + @Override public void setText(String text) { box.setText(text); } + @Override public void setValue(String newValue) { box.setValue(newValue); } + @Override public void setValue(String value, boolean fireEvents) { box.setValue(value, fireEvents); } @@ -1113,6 +1137,7 @@ void showSuggestions(String query) { private void addEventsToTextBox() { class TextBoxEvents implements KeyDownHandler, KeyUpHandler, ValueChangeHandler { + @Override public void onKeyDown(KeyDownEvent event) { switch (event.getNativeKeyCode()) { case KeyCodes.KEY_DOWN: @@ -1139,11 +1164,13 @@ public void onKeyDown(KeyDownEvent event) { } } + @Override public void onKeyUp(KeyUpEvent event) { // After every user key input, refresh the popup's suggestions. refreshSuggestions(); } + @Override public void onValueChange(ValueChangeEvent event) { delegateEvent(SuggestBox.this, event); } diff --git a/user/src/com/google/gwt/user/client/ui/TabLayoutPanel.java b/user/src/com/google/gwt/user/client/ui/TabLayoutPanel.java index aaf9f867bfb..d5d5ce296be 100644 --- a/user/src/com/google/gwt/user/client/ui/TabLayoutPanel.java +++ b/user/src/com/google/gwt/user/client/ui/TabLayoutPanel.java @@ -281,6 +281,7 @@ public void add(IsWidget w, @IsSafeHtml String text, boolean asHtml) { add(asWidgetOrNull(w), text, asHtml); } + @Override public void add(Widget w) { insert(w, getWidgetCount()); } @@ -330,24 +331,29 @@ public void add(Widget child, Widget tab) { insert(child, tab, getWidgetCount()); } + @Override public HandlerRegistration addBeforeSelectionHandler( BeforeSelectionHandler handler) { return addHandler(handler, BeforeSelectionEvent.getType()); } + @Override public HandlerRegistration addSelectionHandler( SelectionHandler handler) { return addHandler(handler, SelectionEvent.getType()); } + @Override public void animate(int duration) { animate(duration, null); } + @Override public void animate(int duration, AnimationCallback callback) { deckPanel.animate(duration, callback); } + @Override public void clear() { Iterator it = iterator(); while (it.hasNext()) { @@ -356,6 +362,7 @@ public void clear() { } } + @Override public void forceLayout() { deckPanel.forceLayout(); } @@ -410,6 +417,7 @@ public Widget getTabWidget(Widget child) { /** * Returns the widget at the given index. */ + @Override public Widget getWidget(int index) { return deckPanel.getWidget(index); } @@ -417,6 +425,7 @@ public Widget getWidget(int index) { /** * Returns the number of tabs and widgets. */ + @Override public int getWidgetCount() { return deckPanel.getWidgetCount(); } @@ -424,6 +433,7 @@ public int getWidgetCount() { /** * Convenience overload to allow {@link IsWidget} to be used directly. */ + @Override public int getWidgetIndex(IsWidget child) { return getWidgetIndex(asWidgetOrNull(child)); } @@ -431,6 +441,7 @@ public int getWidgetIndex(IsWidget child) { /** * Returns the index of the given child, or -1 if it is not a child. */ + @Override public int getWidgetIndex(Widget child) { return deckPanel.getWidgetIndex(child); } @@ -540,10 +551,12 @@ public boolean isAnimationVertical() { return deckPanel.isAnimationVertical(); } + @Override public Iterator iterator() { return deckPanel.iterator(); } + @Override public boolean remove(int index) { if ((index < 0) || (index >= getWidgetCount())) { return false; @@ -572,6 +585,7 @@ public boolean remove(int index) { return true; } + @Override public boolean remove(Widget w) { int index = getWidgetIndex(w); if (index == -1) { @@ -741,6 +755,7 @@ private void insert(final Widget child, Tab tab, int beforeIndex) { tabBar.insert(tab, beforeIndex); tab.addClickHandler(new ClickHandler() { + @Override public void onClick(ClickEvent event) { selectTab(child); } diff --git a/user/src/com/google/gwt/user/client/ui/ToggleButton.java b/user/src/com/google/gwt/user/client/ui/ToggleButton.java index 407edd076a8..813330bd0bd 100644 --- a/user/src/com/google/gwt/user/client/ui/ToggleButton.java +++ b/user/src/com/google/gwt/user/client/ui/ToggleButton.java @@ -182,11 +182,13 @@ public ToggleButton(String upText, String downText, ClickHandler handler) { super(upText, downText, handler); } + @Override public HandlerRegistration addValueChangeHandler( ValueChangeHandler handler) { return addHandler(handler, ValueChangeEvent.getType()); } + @Override public LeafValueEditor asEditor() { if (editor == null) { editor = TakesValueEditor.of(this); @@ -200,6 +202,7 @@ public LeafValueEditor asEditor() { * @return true if the button is pressed, false otherwise. Will * not return null */ + @Override public Boolean getValue() { return isDown(); } @@ -226,6 +229,7 @@ public void setDown(boolean down) { * @param value true to press the button, false otherwise; null value implies * false */ + @Override public void setValue(Boolean value) { setValue(value, false); } @@ -239,6 +243,7 @@ public void setValue(Boolean value) { * @param fireEvents If true, and value has changed, fire a * {@link ValueChangeEvent} */ + @Override public void setValue(Boolean value, boolean fireEvents) { if (value == null) { value = Boolean.FALSE; diff --git a/user/src/com/google/gwt/user/client/ui/ValueBoxBase.java b/user/src/com/google/gwt/user/client/ui/ValueBoxBase.java index df67ae5780b..00e7bd74fa5 100644 --- a/user/src/com/google/gwt/user/client/ui/ValueBoxBase.java +++ b/user/src/com/google/gwt/user/client/ui/ValueBoxBase.java @@ -105,15 +105,18 @@ protected ValueBoxBase(Element elem, Renderer renderer, Parser parser) { this.parser = parser; } + @Override public HandlerRegistration addChangeHandler(ChangeHandler handler) { return addDomHandler(handler, ChangeEvent.getType()); } + @Override public HandlerRegistration addValueChangeHandler(ValueChangeHandler handler) { // Initialization code if (!valueChangeHandlerInitialized) { valueChangeHandlerInitialized = true; addChangeHandler(new ChangeHandler() { + @Override public void onChange(ChangeEvent event) { ValueChangeEvent.fire(ValueBoxBase.this, getValue()); } @@ -128,6 +131,7 @@ public void onChange(ChangeEvent event) { * may override this method to provide custom error-handling when using the * Editor framework. */ + @Override public ValueBoxEditor asEditor() { if (editor == null) { editor = ValueBoxEditor.of(this); @@ -156,6 +160,7 @@ public int getCursorPos() { return impl.getCursorPos(getElement()); } + @Override public Direction getDirection() { return BidiUtils.getDirectionOnElement(getElement()); } @@ -163,10 +168,12 @@ public Direction getDirection() { /** * Gets the direction estimation model of the auto-dir handler. */ + @Override public DirectionEstimator getDirectionEstimator() { return autoDirHandler.getDirectionEstimator(); } + @Override public String getName() { return getElement().getPropertyString("name"); } @@ -194,6 +201,7 @@ public int getSelectionLength() { return impl.getSelectionLength(getElement()); } + @Override public String getText() { return getElement().getPropertyString("value"); } @@ -201,6 +209,7 @@ public String getText() { /** * Return the parsed value, or null if the field is empty or parsing fails. */ + @Override public T getValue() { try { return getValueOrThrow(); @@ -291,6 +300,7 @@ public void setCursorPos(int pos) { setSelectionRange(pos, 0); } + @Override public void setDirection(Direction direction) { BidiUtils.setDirectionOnElement(getElement(), direction); } @@ -298,6 +308,7 @@ public void setDirection(Direction direction) { /** * Toggles on / off direction estimation. */ + @Override public void setDirectionEstimator(boolean enabled) { autoDirHandler.setDirectionEstimator(enabled); } @@ -305,6 +316,7 @@ public void setDirectionEstimator(boolean enabled) { /** * Sets the direction estimation model of the auto-dir handler. */ + @Override public void setDirectionEstimator(DirectionEstimator directionEstimator) { autoDirHandler.setDirectionEstimator(directionEstimator); } @@ -325,6 +337,7 @@ public void setKey(char key) { } } + @Override public void setName(String name) { getElement().setPropertyString("name", name); } @@ -380,15 +393,18 @@ public void setSelectionRange(int pos, int length) { * * @param text the object's new text */ + @Override public void setText(String text) { getElement().setPropertyString("value", text != null ? text : ""); autoDirHandler.refreshDirection(); } + @Override public void setValue(T value) { setValue(value, false); } + @Override public void setValue(T value, boolean fireEvents) { T oldValue = fireEvents ? getValue() : null; setText(renderer.render(value)); diff --git a/user/src/com/google/gwt/user/client/ui/ValueLabel.java b/user/src/com/google/gwt/user/client/ui/ValueLabel.java index d5f4fe56f08..a121ab8913f 100644 --- a/user/src/com/google/gwt/user/client/ui/ValueLabel.java +++ b/user/src/com/google/gwt/user/client/ui/ValueLabel.java @@ -124,6 +124,7 @@ protected ValueLabel(Element element, Renderer renderer) { this.renderer = renderer; } + @Override public LeafValueEditor asEditor() { if (editor == null) { editor = TakesValueEditor.of(this); @@ -131,10 +132,12 @@ public LeafValueEditor asEditor() { return editor; } + @Override public T getValue() { return value; } + @Override public void setValue(T value) { this.value = value; directionalTextHelper.setText(renderer.render(value)); diff --git a/user/src/com/google/gwt/user/client/ui/ValueListBox.java b/user/src/com/google/gwt/user/client/ui/ValueListBox.java index 457c530e1f6..220ecf32524 100644 --- a/user/src/com/google/gwt/user/client/ui/ValueListBox.java +++ b/user/src/com/google/gwt/user/client/ui/ValueListBox.java @@ -68,6 +68,7 @@ public ValueListBox(Renderer renderer, ProvidesKey keyProvider) { initWidget(new ListBox()); getListBox().addChangeHandler(new ChangeHandler() { + @Override public void onChange(ChangeEvent event) { int selectedIndex = getListBox().getSelectedIndex(); @@ -80,6 +81,7 @@ public void onChange(ChangeEvent event) { }); } + @Override public HandlerRegistration addValueChangeHandler(ValueChangeHandler handler) { return addHandler(handler, ValueChangeEvent.getType()); } @@ -87,6 +89,7 @@ public HandlerRegistration addValueChangeHandler(ValueChangeHandler handler) /** * Returns a {@link TakesValueEditor} backed by the ValueListBox. */ + @Override public TakesValueEditor asEditor() { if (editor == null) { editor = TakesValueEditor.of(this); @@ -99,6 +102,7 @@ public int getTabIndex() { return getListBox().getTabIndex(); } + @Override public T getValue() { return value; } @@ -108,6 +112,7 @@ public boolean isEnabled() { return getListBox().isEnabled(); } + @Override public void setAcceptableValues(Collection newValues) { values.clear(); valueKeyToIndex.clear(); @@ -145,10 +150,12 @@ public void setTabIndex (int index) { * Set the value and display it in the select element. Add the value to the * acceptable set if it is not already there. */ + @Override public void setValue(T value) { setValue(value, false); } + @Override public void setValue(T value, boolean fireEvents) { if (value == this.value || (this.value != null && this.value.equals(value))) { return; diff --git a/user/src/com/google/gwt/user/client/ui/ValuePicker.java b/user/src/com/google/gwt/user/client/ui/ValuePicker.java index 90e52ff88b6..896b0938e76 100644 --- a/user/src/com/google/gwt/user/client/ui/ValuePicker.java +++ b/user/src/com/google/gwt/user/client/ui/ValuePicker.java @@ -64,6 +64,7 @@ public ValuePicker(CellList cellList) { initWidget(cellList); cellList.setSelectionModel(smodel); smodel.addSelectionChangeHandler(new SelectionChangeEvent.Handler() { + @Override public void onSelectionChange(SelectionChangeEvent event) { setValue(smodel.getSelectedObject(), true); } @@ -78,6 +79,7 @@ public ValuePicker() { this(ToStringRenderer.instance()); } + @Override public HandlerRegistration addValueChangeHandler(ValueChangeHandler handler) { return addHandler(handler, ValueChangeEvent.getType()); } @@ -85,6 +87,7 @@ public HandlerRegistration addValueChangeHandler(ValueChangeHandler handler) /** * Returns a {@link TakesValueEditor} backed by the ValuePicker. */ + @Override public LeafValueEditor asEditor() { if (editor == null) { editor = TakesValueEditor.of(this); @@ -104,10 +107,12 @@ public int getPageSize() { return cellList.getPageSize(); } + @Override public T getValue() { return value; } + @Override public void setAcceptableValues(Collection values) { cellList.setRowData(new ArrayList(values)); } @@ -116,10 +121,12 @@ public void setPageSize(int size) { cellList.setPageSize(size); } + @Override public void setValue(T value) { setValue(value, false); } + @Override public void setValue(T value, boolean fireEvents) { T current = getValue(); if ((current == value) || (current != null && current.equals(value))) { diff --git a/user/src/com/google/gwt/user/client/ui/VerticalPanel.java b/user/src/com/google/gwt/user/client/ui/VerticalPanel.java index 1b7e9cf8437..d8e46c1713b 100644 --- a/user/src/com/google/gwt/user/client/ui/VerticalPanel.java +++ b/user/src/com/google/gwt/user/client/ui/VerticalPanel.java @@ -48,18 +48,22 @@ public void add(Widget w) { add(w, td); } + @Override public HorizontalAlignmentConstant getHorizontalAlignment() { return horzAlign; } + @Override public VerticalAlignmentConstant getVerticalAlignment() { return vertAlign; } + @Override public void insert(IsWidget w, int beforeIndex) { insert(asWidgetOrNull(w), beforeIndex); } + @Override public void insert(Widget w, int beforeIndex) { checkIndexBoundsForInsertion(beforeIndex); @@ -99,6 +103,7 @@ public boolean remove(Widget w) { * * @see HasHorizontalAlignment#setHorizontalAlignment(HasHorizontalAlignment.HorizontalAlignmentConstant) */ + @Override public void setHorizontalAlignment(HorizontalAlignmentConstant align) { horzAlign = align; } @@ -109,6 +114,7 @@ public void setHorizontalAlignment(HorizontalAlignmentConstant align) { * * @see HasVerticalAlignment#setVerticalAlignment(HasVerticalAlignment.VerticalAlignmentConstant) */ + @Override public void setVerticalAlignment(VerticalAlignmentConstant align) { vertAlign = align; } diff --git a/user/src/com/google/gwt/user/client/ui/VerticalSplitPanel.java b/user/src/com/google/gwt/user/client/ui/VerticalSplitPanel.java index 4f72bb7aeeb..1ab83fec4c0 100644 --- a/user/src/com/google/gwt/user/client/ui/VerticalSplitPanel.java +++ b/user/src/com/google/gwt/user/client/ui/VerticalSplitPanel.java @@ -283,6 +283,7 @@ protected void onLoad() { */ setSplitPosition(lastSplitPosition); Scheduler.get().scheduleDeferred(new ScheduledCommand() { + @Override public void execute() { setSplitPosition(lastSplitPosition); } diff --git a/user/src/com/google/gwt/user/client/ui/Widget.java b/user/src/com/google/gwt/user/client/ui/Widget.java index d127991c5df..d42e8952b12 100644 --- a/user/src/com/google/gwt/user/client/ui/Widget.java +++ b/user/src/com/google/gwt/user/client/ui/Widget.java @@ -58,6 +58,7 @@ public static Widget asWidgetOrNull(IsWidget w) { private Object layoutData; private Widget parent; + @Override public HandlerRegistration addAttachHandler(Handler handler) { return addHandler(handler, AttachEvent.getType()); } @@ -120,10 +121,12 @@ public final HandlerRegistration addHandler( return ensureHandlers().addHandler(type, handler); } + @Override public Widget asWidget() { return this; } + @Override public void fireEvent(GwtEvent event) { if (handlerManager != null) { handlerManager.fireEvent(event); @@ -156,10 +159,12 @@ public Widget getParent() { * * @return true if the widget is attached */ + @Override public boolean isAttached() { return attached; } + @Override public void onBrowserEvent(Event event) { switch (DOM.eventGetType(event)) { case Event.ONMOUSEOVER: diff --git a/user/src/com/google/gwt/user/client/ui/WidgetCollection.java b/user/src/com/google/gwt/user/client/ui/WidgetCollection.java index 7b499999ec0..d5d60e99ca7 100644 --- a/user/src/com/google/gwt/user/client/ui/WidgetCollection.java +++ b/user/src/com/google/gwt/user/client/ui/WidgetCollection.java @@ -170,6 +170,7 @@ public void insert(Widget w, int beforeIndex) { * * @return an iterator */ + @Override public Iterator iterator() { return new WidgetIterator(); } diff --git a/user/src/com/google/gwt/user/client/ui/WidgetIterators.java b/user/src/com/google/gwt/user/client/ui/WidgetIterators.java index 8188f37966b..d1b96aa8dea 100644 --- a/user/src/com/google/gwt/user/client/ui/WidgetIterators.java +++ b/user/src/com/google/gwt/user/client/ui/WidgetIterators.java @@ -63,10 +63,12 @@ private void gotoNextIndex() { } } + @Override public boolean hasNext() { return (index < contained.length); } + @Override public Widget next() { if (!hasNext()) { throw new NoSuchElementException(); @@ -77,6 +79,7 @@ public Widget next() { return w; } + @Override public void remove() { if (last < 0) { throw new IllegalStateException(); diff --git a/user/src/com/google/gwt/user/client/ui/impl/PopupImplMozilla.java b/user/src/com/google/gwt/user/client/ui/impl/PopupImplMozilla.java index ea15bfcb59c..4ae09a961b9 100644 --- a/user/src/com/google/gwt/user/client/ui/impl/PopupImplMozilla.java +++ b/user/src/com/google/gwt/user/client/ui/impl/PopupImplMozilla.java @@ -100,6 +100,7 @@ public Element createElement() { // rendered, // the PopupPanel becomes the highest element in the stacking order. Scheduler.get().scheduleDeferred(new ScheduledCommand() { + @Override public void execute() { outerElem.getStyle().setOverflow(Overflow.AUTO); } diff --git a/user/src/com/google/gwt/user/client/ui/impl/RichTextAreaImplStandard.java b/user/src/com/google/gwt/user/client/ui/impl/RichTextAreaImplStandard.java index 9a74e711aa5..6584d679eeb 100644 --- a/user/src/com/google/gwt/user/client/ui/impl/RichTextAreaImplStandard.java +++ b/user/src/com/google/gwt/user/client/ui/impl/RichTextAreaImplStandard.java @@ -71,14 +71,17 @@ public native Element createElement() /*-{ return $doc.createElement('iframe'); }-*/; + @Override public void createLink(String url) { execCommand("CreateLink", url); } + @Override public String getBackColor() { return queryCommandValue("BackColor"); } + @Override public String getForeColor() { return queryCommandValue("ForeColor"); } @@ -114,26 +117,32 @@ public native void initElement() /*-{ }), 1); }-*/; + @Override public void insertHorizontalRule() { execCommand("InsertHorizontalRule", null); } + @Override public void insertHTML(@IsSafeHtml String html) { execCommand("InsertHTML", html); } + @Override public void insertImage(String url) { execCommand("InsertImage", url); } + @Override public void insertOrderedList() { execCommand("InsertOrderedList", null); } + @Override public void insertUnorderedList() { execCommand("InsertUnorderedList", null); } + @Override public boolean isBold() { return queryCommandState("Bold"); } @@ -144,50 +153,62 @@ public boolean isEnabled() { : !beforeInitPlaceholder.getPropertyBoolean("disabled"); } + @Override public boolean isItalic() { return queryCommandState("Italic"); } + @Override public boolean isStrikethrough() { return queryCommandState("Strikethrough"); } + @Override public boolean isSubscript() { return queryCommandState("Subscript"); } + @Override public boolean isSuperscript() { return queryCommandState("Superscript"); } + @Override public boolean isUnderlined() { return queryCommandState("Underline"); } + @Override public void leftIndent() { execCommand("Outdent", null); } + @Override public void redo() { execCommand("Redo", "false"); } + @Override public void removeFormat() { execCommand("RemoveFormat", null); } + @Override public void removeLink() { execCommand("Unlink", "false"); } + @Override public void rightIndent() { execCommand("Indent", null); } + @Override public void selectAll() { execCommand("SelectAll", null); } + @Override public void setBackColor(String color) { execCommand("BackColor", color); } @@ -212,14 +233,17 @@ public void setFocus(boolean focused) { } } + @Override public void setFontName(String name) { execCommand("FontName", name); } + @Override public void setFontSize(FontSize fontSize) { execCommand("FontSize", Integer.toString(fontSize.getNumber())); } + @Override public void setForeColor(String color) { execCommand("ForeColor", color); } @@ -233,6 +257,7 @@ public final void setHTML(@IsSafeHtml String html) { } } + @Override public void setJustification(Justification justification) { if (justification == Justification.CENTER) { execCommand("JustifyCenter", null); @@ -254,30 +279,37 @@ public final void setText(String text) { } } + @Override public void toggleBold() { execCommand("Bold", "false"); } + @Override public void toggleItalic() { execCommand("Italic", "false"); } + @Override public void toggleStrikethrough() { execCommand("Strikethrough", "false"); } + @Override public void toggleSubscript() { execCommand("Subscript", "false"); } + @Override public void toggleSuperscript() { execCommand("Superscript", "false"); } + @Override public void toggleUnderline() { execCommand("Underline", "False"); } + @Override public void undo() { execCommand("Undo", "false"); } @@ -362,7 +394,8 @@ protected native boolean isEnabledImpl() /*-{ return elem.contentWindow.document.designMode.toUpperCase() == 'ON'; }-*/; - @Override @SuppressIsSafeHtmlCastCheck + @Override + @SuppressIsSafeHtmlCastCheck protected void onElementInitialized() { // Issue 1897: This method is called after a timeout, during which time the // element might by detached. diff --git a/user/src/com/google/gwt/user/datepicker/client/DateBox.java b/user/src/com/google/gwt/user/datepicker/client/DateBox.java index 2ea6851a29f..0a86f3fbdb1 100644 --- a/user/src/com/google/gwt/user/datepicker/client/DateBox.java +++ b/user/src/com/google/gwt/user/datepicker/client/DateBox.java @@ -107,6 +107,7 @@ public DefaultFormat(DateTimeFormat dateTimeFormat) { this.dateTimeFormat = dateTimeFormat; } + @Override public String format(DateBox box, Date date) { if (date == null) { return ""; @@ -124,6 +125,7 @@ public DateTimeFormat getDateTimeFormat() { return dateTimeFormat; } + @Override @SuppressWarnings("deprecation") public Date parse(DateBox dateBox, String dateText, boolean reportError) { Date date = null; @@ -146,6 +148,7 @@ public Date parse(DateBox dateBox, String dateText, boolean reportError) { return date; } + @Override public void reset(DateBox dateBox, boolean abandon) { dateBox.removeStyleName(DATE_BOX_FORMAT_ERROR); } @@ -192,16 +195,19 @@ private class DateBoxHandler implements ValueChangeHandler, FocusHandler, BlurHandler, ClickHandler, KeyDownHandler, CloseHandler { + @Override public void onBlur(BlurEvent event) { if (isDatePickerShowing() == false) { updateDateFromTextBox(); } } + @Override public void onClick(ClickEvent event) { showDatePicker(); } + @Override public void onClose(CloseEvent event) { // If we are not closing because we have picked a new value, make sure the // current value is updated. @@ -210,12 +216,14 @@ public void onClose(CloseEvent event) { } } + @Override public void onFocus(FocusEvent event) { if (allowDPShow && isDatePickerShowing() == false) { showDatePicker(); } } + @Override public void onKeyDown(KeyDownEvent event) { switch (event.getNativeKeyCode()) { case KeyCodes.KEY_ENTER: @@ -232,6 +240,7 @@ public void onKeyDown(KeyDownEvent event) { } } + @Override public void onValueChange(ValueChangeEvent event) { setValue(parseDate(false), normalize(event.getValue()), true, true); hideDatePicker(); @@ -303,6 +312,7 @@ public DateBox(DatePicker picker, Date date, Format format) { setValue(date); } + @Override public HandlerRegistration addValueChangeHandler( ValueChangeHandler handler) { return addHandler(handler, ValueChangeEvent.getType()); @@ -311,6 +321,7 @@ public HandlerRegistration addValueChangeHandler( /** * Returns a {@link TakesValueEditor} backed by the DateBox. */ + @Override public LeafValueEditor asEditor() { if (editor == null) { editor = TakesValueEditor.of(this); @@ -379,6 +390,7 @@ public TextBox getTextBox() { * * @return the current date value */ + @Override public Date getValue() { return parseDate(true); } @@ -400,6 +412,7 @@ public boolean isDatePickerShowing() { /** * Returns true if the date box is enabled, false if not. */ + @Override public boolean isEnabled() { return box.isEnabled(); } @@ -419,6 +432,7 @@ public void setAccessKey(char key) { * * @param enabled is the box enabled */ + @Override public void setEnabled(boolean enabled) { box.setEnabled(enabled); } @@ -479,10 +493,12 @@ public void setTabIndex(int index) { /** * Set the date. */ + @Override public void setValue(Date date) { setValue(date, false); } + @Override public void setValue(Date date, boolean fireEvents) { setValue(picker.getValue(), date, fireEvents, true); } @@ -510,6 +526,7 @@ private Date parseDate(boolean reportError) { private void preventDatePickerPopup() { allowDPShow = false; Scheduler.get().scheduleDeferred(new ScheduledCommand() { + @Override public void execute() { allowDPShow = true; } diff --git a/user/src/com/google/gwt/user/datepicker/client/DatePicker.java b/user/src/com/google/gwt/user/datepicker/client/DatePicker.java index 7fe34a2f4ab..9522a3f8d3c 100644 --- a/user/src/com/google/gwt/user/datepicker/client/DatePicker.java +++ b/user/src/com/google/gwt/user/datepicker/client/DatePicker.java @@ -311,10 +311,12 @@ protected DatePicker(MonthSelector monthAndYearSelector, CalendarView view, addStyleToDates(css().dayIsToday(), new Date()); } + @Override public HandlerRegistration addHighlightHandler(HighlightHandler handler) { return addHandler(handler, HighlightEvent.getType()); } + @Override public HandlerRegistration addShowRangeHandler(ShowRangeHandler handler) { return addHandler(handler, ShowRangeEvent.getType()); } @@ -396,6 +398,7 @@ public final void addTransientStyleToDates(String styleName, } } + @Override public HandlerRegistration addValueChangeHandler( ValueChangeHandler handler) { return addHandler(handler, ValueChangeEvent.getType()); @@ -404,6 +407,7 @@ public HandlerRegistration addValueChangeHandler( /** * Returns a {@link TakesValueEditor} backed by the DatePicker. */ + @Override public LeafValueEditor asEditor() { if (editor == null) { editor = TakesValueEditor.of(this); @@ -478,6 +482,7 @@ public String getStyleOfDate(Date date) { * * @return the selected date, or null */ + @Override public final Date getValue() { return CalendarUtil.copyDate(value); } @@ -652,6 +657,7 @@ public final void setTransientEnabledOnDates(boolean enabled, * * @param newValue the new value */ + @Override public final void setValue(Date newValue) { setValue(newValue, false); } @@ -662,6 +668,7 @@ public final void setValue(Date newValue) { * @param newValue the new value for this date picker * @param fireEvents should events be fired. */ + @Override public final void setValue(Date newValue, boolean fireEvents) { Date oldValue = value; diff --git a/user/src/com/google/gwt/user/datepicker/client/DefaultMonthSelector.java b/user/src/com/google/gwt/user/datepicker/client/DefaultMonthSelector.java index a00fe934b0e..8089abb3016 100644 --- a/user/src/com/google/gwt/user/datepicker/client/DefaultMonthSelector.java +++ b/user/src/com/google/gwt/user/datepicker/client/DefaultMonthSelector.java @@ -124,6 +124,7 @@ private PushButton createNavigationButton( PushButton button = new PushButton(); button.addClickHandler(new ClickHandler() { + @Override public void onClick(ClickEvent event) { addMonths(noOfMonths); } diff --git a/user/src/com/google/gwt/user/rebind/ClassSourceFileComposer.java b/user/src/com/google/gwt/user/rebind/ClassSourceFileComposer.java index 95ac3a6744e..1ec80cb7de4 100644 --- a/user/src/com/google/gwt/user/rebind/ClassSourceFileComposer.java +++ b/user/src/com/google/gwt/user/rebind/ClassSourceFileComposer.java @@ -92,12 +92,14 @@ class ClassSourceFileComposer implements SourceWriter { /** * Begin emitting a JavaDoc comment. */ + @Override public void beginJavaDocComment() { println("\n/**"); inComment = true; commentIndicator = STAR_COMMENT_LINE; } + @Override public void commit(TreeLogger logger) { outdent(); println("}"); @@ -111,29 +113,35 @@ public void commit(TreeLogger logger) { /** * End emitting a JavaDoc comment. */ + @Override public void endJavaDocComment() { inComment = false; println("\n */"); } + @Override public void indent() { ++indent; } + @Override public void indentln(String s) { indent(); println(s); outdent(); } + @Override public void indentln(String s, Object... args) { indentln(String.format(s, args)); } + @Override public void outdent() { --indent; } + @Override public void print(String s) { int pos = 0; for (;;) { @@ -166,20 +174,24 @@ public void print(String s) { } } + @Override public void print(String s, Object... args) { print(String.format(s, args)); } + @Override public void println() { print("\n"); atStart = true; } + @Override public void println(String s) { print(s + "\n"); atStart = true; } + @Override public void println(String s, Object... args) { println(String.format(s, args)); } diff --git a/user/src/com/google/gwt/user/rebind/StringSourceWriter.java b/user/src/com/google/gwt/user/rebind/StringSourceWriter.java index 83aae3060a1..427e9004cc8 100644 --- a/user/src/com/google/gwt/user/rebind/StringSourceWriter.java +++ b/user/src/com/google/gwt/user/rebind/StringSourceWriter.java @@ -32,6 +32,7 @@ public class StringSourceWriter implements SourceWriter { private boolean needsIndent; private final PrintWriter out = new PrintWriter(buffer); + @Override public void beginJavaDocComment() { println("/**"); indent(); @@ -41,43 +42,52 @@ public void beginJavaDocComment() { /** * This is a no-op. */ + @Override public void commit(TreeLogger logger) { out.flush(); } + @Override public void endJavaDocComment() { out.println("*/"); outdent(); indentPrefix = ""; } + @Override public void indent() { indentLevel++; } + @Override public void indentln(String s) { indent(); println(s); outdent(); } + @Override public void indentln(String s, Object... args) { indentln(String.format(s, args)); } + @Override public void outdent() { indentLevel = Math.max(indentLevel - 1, 0); } + @Override public void print(String s) { maybeIndent(); out.print(s); } + @Override public void print(String s, Object... args) { print(String.format(s, args)); } + @Override public void println() { maybeIndent(); // Unix-style line endings for consistent behavior across platforms. @@ -85,11 +95,13 @@ public void println() { needsIndent = true; } + @Override public void println(String s) { print(s); println(); } + @Override public void println(String s, Object... args) { println(String.format(s, args)); } diff --git a/user/src/com/google/gwt/user/rebind/rpc/BlacklistTypeFilter.java b/user/src/com/google/gwt/user/rebind/rpc/BlacklistTypeFilter.java index b05141aef40..3f240727382 100644 --- a/user/src/com/google/gwt/user/rebind/rpc/BlacklistTypeFilter.java +++ b/user/src/com/google/gwt/user/rebind/rpc/BlacklistTypeFilter.java @@ -66,10 +66,12 @@ public BlacklistTypeFilter(TreeLogger logger, PropertyOracle propertyOracle) blacklist = new RpcBlacklist(logger, prop.getValues()); } + @Override public String getName() { return "BlacklistTypeFilter"; } + @Override public boolean isAllowed(JClassType type) { String name = getBaseTypeName(type); // For types not handled by getBaseTypeName just return true. diff --git a/user/src/com/google/gwt/user/rebind/rpc/ProblemReport.java b/user/src/com/google/gwt/user/rebind/rpc/ProblemReport.java index f5bc66695c3..bd54fd46ff6 100644 --- a/user/src/com/google/gwt/user/rebind/rpc/ProblemReport.java +++ b/user/src/com/google/gwt/user/rebind/rpc/ProblemReport.java @@ -90,6 +90,7 @@ public boolean hasSubMessages() { */ public ProblemReport() { Comparator comparator = new Comparator() { + @Override public int compare(JClassType o1, JClassType o2) { assert o1 != null; assert o2 != null; diff --git a/user/src/com/google/gwt/user/rebind/rpc/SerializableTypeOracleImpl.java b/user/src/com/google/gwt/user/rebind/rpc/SerializableTypeOracleImpl.java index 5baa7f9df6a..97bd174001f 100644 --- a/user/src/com/google/gwt/user/rebind/rpc/SerializableTypeOracleImpl.java +++ b/user/src/com/google/gwt/user/rebind/rpc/SerializableTypeOracleImpl.java @@ -32,6 +32,7 @@ public SerializableTypeOracleImpl(Set serializableTypes, this.possiblyInstantiatedTypes = possiblyInstantiatedTypes; } + @Override public JType[] getSerializableTypes() { return serializableTypesSet.toArray(new JType[serializableTypesSet.size()]); } @@ -39,6 +40,7 @@ public JType[] getSerializableTypes() { /** * Returns true if the type's fields can be serializede. */ + @Override public boolean isSerializable(JType type) { return serializableTypesSet.contains(type); } @@ -47,6 +49,7 @@ public boolean isSerializable(JType type) { * Returns true if the type can be serialized and then * instantiated on the other side. */ + @Override public boolean maybeInstantiated(JType type) { return possiblyInstantiatedTypes.contains(type); } diff --git a/user/src/com/google/gwt/user/rebind/rpc/SerializationUtils.java b/user/src/com/google/gwt/user/rebind/rpc/SerializationUtils.java index b3ba7294ba9..b034ce7c03f 100644 --- a/user/src/com/google/gwt/user/rebind/rpc/SerializationUtils.java +++ b/user/src/com/google/gwt/user/rebind/rpc/SerializationUtils.java @@ -42,6 +42,7 @@ */ public class SerializationUtils { static final Comparator FIELD_COMPARATOR = new Comparator() { + @Override public int compare(JField f1, JField f2) { return f1.getName().compareTo(f2.getName()); } diff --git a/user/src/com/google/gwt/user/rebind/rpc/TypePaths.java b/user/src/com/google/gwt/user/rebind/rpc/TypePaths.java index 643e929830f..ab882869ec0 100644 --- a/user/src/com/google/gwt/user/rebind/rpc/TypePaths.java +++ b/user/src/com/google/gwt/user/rebind/rpc/TypePaths.java @@ -39,6 +39,7 @@ interface TypePath { */ TypePath getParent(); + @Override String toString(); } @@ -47,6 +48,7 @@ static TypePaths.TypePath createArrayComponentPath(final JArrayType arrayType, assert (arrayType != null); return new TypePaths.TypePath() { + @Override public TypePaths.TypePath getParent() { return parent; } @@ -62,6 +64,7 @@ public String toString() { static TypePaths.TypePath createFieldPath(final TypePaths.TypePath parent, final JField field) { return new TypePaths.TypePath() { + @Override public TypePaths.TypePath getParent() { return parent; } @@ -81,6 +84,7 @@ static TypePaths.TypePath createRootPath(final JType type) { assert (type != null); return new TypePaths.TypePath() { + @Override public TypePaths.TypePath getParent() { return null; } @@ -98,6 +102,7 @@ static TypePaths.TypePath createSubtypePath(final TypePaths.TypePath parent, fin assert (supertype != null); return new TypePaths.TypePath() { + @Override public TypePaths.TypePath getParent() { return parent; } @@ -116,6 +121,7 @@ static TypePaths.TypePath createSupertypePath(final TypePaths.TypePath parent, f assert (subtype != null); return new TypePaths.TypePath() { + @Override public TypePaths.TypePath getParent() { return parent; } @@ -134,6 +140,7 @@ static TypePaths.TypePath createTypeArgumentPath(final TypePaths.TypePath parent assert (typeArg != null); return new TypePaths.TypePath() { + @Override public TypePaths.TypePath getParent() { return parent; } @@ -152,6 +159,7 @@ static TypePaths.TypePath createTypeParameterInRootPath(final TypePaths.TypePath assert (typeParameter != null); return new TypePaths.TypePath() { + @Override public TypePaths.TypePath getParent() { return parent; } diff --git a/user/src/com/google/gwt/user/rebind/ui/ImageBundleBuilder.java b/user/src/com/google/gwt/user/rebind/ui/ImageBundleBuilder.java index 75ff3b0e3fd..8485597faf5 100644 --- a/user/src/com/google/gwt/user/rebind/ui/ImageBundleBuilder.java +++ b/user/src/com/google/gwt/user/rebind/ui/ImageBundleBuilder.java @@ -63,30 +63,37 @@ public ImageRect(String name, BufferedImage image) { this.height = image.getHeight(); } + @Override public int getHeight() { return height; } + @Override public int getLeft() { return left; } + @Override public String getName() { return name; } + @Override public int getTop() { return top; } + @Override public int getWidth() { return width; } + @Override public boolean hasBeenPositioned() { return hasBeenPositioned; } + @Override public void setPosition(int left, int top) { hasBeenPositioned = true; this.left = left; @@ -128,6 +135,7 @@ private static class Size { } private static final Comparator decreasingHeightComparator = new Comparator() { + @Override public int compare(HasRect a, HasRect b) { final int c = b.getHeight() - a.getHeight(); // If we encounter equal heights, use the name to keep things @@ -137,6 +145,7 @@ public int compare(HasRect a, HasRect b) { }; private static final Comparator decreasingWidthComparator = new Comparator() { + @Override public int compare(HasRect a, HasRect b) { final int c = b.getWidth() - a.getWidth(); // If we encounter equal heights, use the name to keep things diff --git a/user/src/com/google/gwt/user/server/rpc/XsrfTokenServiceServlet.java b/user/src/com/google/gwt/user/server/rpc/XsrfTokenServiceServlet.java index 265b96fa07f..1cbae226af0 100644 --- a/user/src/com/google/gwt/user/server/rpc/XsrfTokenServiceServlet.java +++ b/user/src/com/google/gwt/user/server/rpc/XsrfTokenServiceServlet.java @@ -160,6 +160,7 @@ public XsrfTokenServiceServlet(String sessionCookieName) { /** * Generates and returns new XSRF token. */ + @Override public XsrfToken getNewXsrfToken() { return new XsrfToken(generateTokenValue()); } diff --git a/user/src/com/google/gwt/user/server/rpc/impl/LegacySerializationPolicy.java b/user/src/com/google/gwt/user/server/rpc/impl/LegacySerializationPolicy.java index c11c4a7b9de..cc1eb6c7f0f 100644 --- a/user/src/com/google/gwt/user/server/rpc/impl/LegacySerializationPolicy.java +++ b/user/src/com/google/gwt/user/server/rpc/impl/LegacySerializationPolicy.java @@ -98,6 +98,7 @@ private LegacySerializationPolicy() { /** * Implemented to fail with a useful error message. */ + @Override public final String getClassNameForTypeId(String id) throws SerializationException { throw new SerializationException(ELISION_ERROR); @@ -106,6 +107,7 @@ public final String getClassNameForTypeId(String id) /** * Implemented to fail with a useful error message. */ + @Override public final String getTypeIdForClass(Class clazz) throws SerializationException { throw new SerializationException(ELISION_ERROR); diff --git a/user/src/com/google/gwt/user/server/rpc/impl/StandardSerializationPolicy.java b/user/src/com/google/gwt/user/server/rpc/impl/StandardSerializationPolicy.java index aadd64517b2..3cd5f3840f5 100644 --- a/user/src/com/google/gwt/user/server/rpc/impl/StandardSerializationPolicy.java +++ b/user/src/com/google/gwt/user/server/rpc/impl/StandardSerializationPolicy.java @@ -112,6 +112,7 @@ public StandardSerializationPolicy( } } + @Override public final String getClassNameForTypeId(String id) throws SerializationException { Class clazz = typeIdsToClasses.get(id); @@ -136,6 +137,7 @@ public boolean hasClientFields() { return clientFields != null && !clientFields.isEmpty(); } + @Override public final String getTypeIdForClass(Class clazz) throws SerializationException { return typeIds.get(clazz); diff --git a/user/src/com/google/gwt/view/client/AbstractDataProvider.java b/user/src/com/google/gwt/view/client/AbstractDataProvider.java index 635317cd8b9..c042bc89eb3 100644 --- a/user/src/com/google/gwt/view/client/AbstractDataProvider.java +++ b/user/src/com/google/gwt/view/client/AbstractDataProvider.java @@ -90,6 +90,7 @@ public void addDataDisplay(final HasData display) { // Add a handler to the display. HandlerRegistration handler = display.addRangeChangeHandler( new RangeChangeEvent.Handler() { + @Override public void onRangeChange(RangeChangeEvent event) { AbstractDataProvider.this.onRangeChanged(display); } @@ -121,6 +122,7 @@ public Set> getDataDisplays() { * @param item the list item * @return the key that represents the item */ + @Override public Object getKey(T item) { return keyProvider == null ? item : keyProvider.getKey(item); } diff --git a/user/src/com/google/gwt/view/client/DefaultSelectionEventManager.java b/user/src/com/google/gwt/view/client/DefaultSelectionEventManager.java index 8a126c3ea0c..35ca0569670 100644 --- a/user/src/com/google/gwt/view/client/DefaultSelectionEventManager.java +++ b/user/src/com/google/gwt/view/client/DefaultSelectionEventManager.java @@ -71,6 +71,7 @@ public void clearBlacklist() { blacklist.clear(); } + @Override public boolean clearCurrentSelection(CellPreviewEvent event) { return false; } @@ -99,6 +100,7 @@ public void setColumnBlacklisted(int index, boolean isBlacklisted) { } } + @Override public SelectAction translateSelectionEvent(CellPreviewEvent event) { return isColumnBlacklisted(event.getColumn()) ? SelectAction.IGNORE : SelectAction.DEFAULT; @@ -136,10 +138,12 @@ public CheckboxEventTranslator(int column) { this.column = column; } + @Override public boolean clearCurrentSelection(CellPreviewEvent event) { return false; } + @Override public SelectAction translateSelectionEvent(CellPreviewEvent event) { // Handle the event. NativeEvent nativeEvent = event.getNativeEvent(); @@ -221,6 +225,7 @@ public WhitelistEventTranslator(int... whitelistedColumns) { } } + @Override public boolean clearCurrentSelection(CellPreviewEvent event) { return false; } @@ -256,6 +261,7 @@ public void setColumnWhitelisted(int index, boolean isWhitelisted) { } } + @Override public SelectAction translateSelectionEvent(CellPreviewEvent event) { return isColumnWhitelisted(event.getColumn()) ? SelectAction.DEFAULT : SelectAction.IGNORE; @@ -457,6 +463,7 @@ public void doMultiSelection(MultiSelectionModel selectionModel, } } + @Override public void onCellPreview(CellPreviewEvent event) { // Early exit if selection is already handled or we are editing. if (event.isCellEditing() || event.isSelectionHandled()) { diff --git a/user/src/com/google/gwt/view/client/SelectionModel.java b/user/src/com/google/gwt/view/client/SelectionModel.java index 026165a0866..ab67cd2a7c3 100644 --- a/user/src/com/google/gwt/view/client/SelectionModel.java +++ b/user/src/com/google/gwt/view/client/SelectionModel.java @@ -125,6 +125,7 @@ protected void scheduleSelectionChangeEvent() { if (!isEventScheduled()) { setEventScheduled(true); Scheduler.get().scheduleFinally(new ScheduledCommand() { + @Override public void execute() { setEventScheduled(false); if (isEventCancelled()) { diff --git a/user/src/com/google/gwt/view/client/SimpleKeyProvider.java b/user/src/com/google/gwt/view/client/SimpleKeyProvider.java index a0cb6fd6f79..68f26e886a0 100644 --- a/user/src/com/google/gwt/view/client/SimpleKeyProvider.java +++ b/user/src/com/google/gwt/view/client/SimpleKeyProvider.java @@ -25,6 +25,7 @@ public class SimpleKeyProvider implements ProvidesKey { /** * Return the passed-in item. */ + @Override public Object getKey(T item) { return item; } diff --git a/user/src/com/google/gwt/view/client/TreeViewModel.java b/user/src/com/google/gwt/view/client/TreeViewModel.java index 5e480471b76..82a529cd43e 100644 --- a/user/src/com/google/gwt/view/client/TreeViewModel.java +++ b/user/src/com/google/gwt/view/client/TreeViewModel.java @@ -88,22 +88,27 @@ public DefaultNodeInfo(AbstractDataProvider dataProvider, this.selectionEventManager = selectionEventManager; } + @Override public Cell getCell() { return cell; } + @Override public ProvidesKey getProvidesKey() { return dataProvider; } + @Override public SelectionModel getSelectionModel() { return selectionModel; } + @Override public ValueUpdater getValueUpdater() { return valueUpdater; } + @Override public void setDataDisplay(HasData display) { this.display = display; if (selectionEventManager != null) { @@ -112,6 +117,7 @@ public void setDataDisplay(HasData display) { dataProvider.addDataDisplay(display); } + @Override public void unsetDataDisplay() { if (display != null) { dataProvider.removeDataDisplay(display); diff --git a/user/src/com/google/gwt/xml/client/impl/AttrImpl.java b/user/src/com/google/gwt/xml/client/impl/AttrImpl.java index 75254f1b9c5..08ddabb95a6 100644 --- a/user/src/com/google/gwt/xml/client/impl/AttrImpl.java +++ b/user/src/com/google/gwt/xml/client/impl/AttrImpl.java @@ -30,6 +30,7 @@ protected AttrImpl(JavaScriptObject o) { * This function delegates to the native method getName in * XMLParserImpl. */ + @Override public String getName() { return XMLParserImpl.getName(this.getJsObject()); } @@ -38,6 +39,7 @@ public String getName() { * This function delegates to the native method getSpecified in * XMLParserImpl. */ + @Override public boolean getSpecified() { return XMLParserImpl.getSpecified(this.getJsObject()); } @@ -46,6 +48,7 @@ public boolean getSpecified() { * This function delegates to the native method getValue in * XMLParserImpl. */ + @Override public String getValue() { return XMLParserImpl.getValue(this.getJsObject()); } diff --git a/user/src/com/google/gwt/xml/client/impl/CharacterDataImpl.java b/user/src/com/google/gwt/xml/client/impl/CharacterDataImpl.java index 4d0a564c4d4..41d49d9bd60 100644 --- a/user/src/com/google/gwt/xml/client/impl/CharacterDataImpl.java +++ b/user/src/com/google/gwt/xml/client/impl/CharacterDataImpl.java @@ -34,6 +34,7 @@ protected CharacterDataImpl(JavaScriptObject o) { * This function delegates to the native method appendData in * XMLParserImpl. */ + @Override public void appendData(String arg) { try { XMLParserImpl.appendData(this.getJsObject(), arg); @@ -46,6 +47,7 @@ public void appendData(String arg) { * This function delegates to the native method deleteData in * XMLParserImpl. */ + @Override public void deleteData(int offset, int count) { try { XMLParserImpl.deleteData(this.getJsObject(), offset, count); @@ -58,6 +60,7 @@ public void deleteData(int offset, int count) { * This function delegates to the native method getData in * XMLParserImpl. */ + @Override public String getData() { return XMLParserImpl.getData(this.getJsObject()); } @@ -66,6 +69,7 @@ public String getData() { * This function delegates to the native method getLength in * XMLParserImpl. */ + @Override public int getLength() { return XMLParserImpl.getLength(this.getJsObject()); } @@ -74,6 +78,7 @@ public int getLength() { * This function delegates to the native method insertData in * XMLParserImpl. */ + @Override public void insertData(int offset, String arg) { try { XMLParserImpl.insertData(this.getJsObject(), offset, arg); @@ -86,6 +91,7 @@ public void insertData(int offset, String arg) { * This function delegates to the native method replaceData in * XMLParserImpl. */ + @Override public void replaceData(int offset, int count, String arg) { try { XMLParserImpl.replaceData(this.getJsObject(), offset, count, arg); @@ -98,6 +104,7 @@ public void replaceData(int offset, int count, String arg) { * This function delegates to the native method setData in * XMLParserImpl. */ + @Override public void setData(String data) { try { XMLParserImpl.setData(this.getJsObject(), data); @@ -110,6 +117,7 @@ public void setData(String data) { * This function delegates to the native method substringData * in XMLParserImpl. */ + @Override public String substringData(final int offset, final int count) { try { return XMLParserImpl.substringData(this.getJsObject(), offset, count); diff --git a/user/src/com/google/gwt/xml/client/impl/DocumentImpl.java b/user/src/com/google/gwt/xml/client/impl/DocumentImpl.java index ecfa9bb4872..c0fb3a34db0 100644 --- a/user/src/com/google/gwt/xml/client/impl/DocumentImpl.java +++ b/user/src/com/google/gwt/xml/client/impl/DocumentImpl.java @@ -41,6 +41,7 @@ protected DocumentImpl(JavaScriptObject o) { * This function delegates to the native method * createCDATASection in XMLParserImpl. */ + @Override public CDATASection createCDATASection(String data) { try { return (CDATASection) NodeImpl.build(XMLParserImpl.createCDATASection( @@ -54,6 +55,7 @@ public CDATASection createCDATASection(String data) { * This function delegates to the native method createComment * in XMLParserImpl. */ + @Override public Comment createComment(String data) { try { return (Comment) NodeImpl.build(XMLParserImpl.createComment( @@ -67,6 +69,7 @@ public Comment createComment(String data) { * This function delegates to the native method * createDocumentFragment in XMLParserImpl. */ + @Override public DocumentFragment createDocumentFragment() { try { return (DocumentFragment) NodeImpl.build(XMLParserImpl.createDocumentFragment(this.getJsObject())); @@ -79,6 +82,7 @@ public DocumentFragment createDocumentFragment() { * This function delegates to the native method createElement * in XMLParserImpl. */ + @Override public Element createElement(String tagName) { try { return (Element) NodeImpl.build(XMLParserImpl.createElement( @@ -92,6 +96,7 @@ public Element createElement(String tagName) { * This function delegates to the native method * createProcessingInstruction in XMLParserImpl. */ + @Override public ProcessingInstruction createProcessingInstruction(String target, String data) { try { @@ -106,6 +111,7 @@ public ProcessingInstruction createProcessingInstruction(String target, * This function delegates to the native method createTextNode * in XMLParserImpl. */ + @Override public Text createTextNode(String data) { try { return (Text) NodeImpl.build(XMLParserImpl.createTextNode( @@ -119,6 +125,7 @@ public Text createTextNode(String data) { * This function delegates to the native method * getDocumentElement in XMLParserImpl. */ + @Override public Element getDocumentElement() { return (Element) NodeImpl.build(XMLParserImpl.getDocumentElement(this.getJsObject())); } @@ -127,6 +134,7 @@ public Element getDocumentElement() { * This function delegates to the native method getElementById * in XMLParserImpl. */ + @Override public Element getElementById(String elementId) { return (Element) NodeImpl.build(XMLParserImpl.getElementById( this.getJsObject(), elementId)); @@ -136,6 +144,7 @@ public Element getElementById(String elementId) { * This function delegates to the native method * getElementsByTagName in XMLParserImpl. */ + @Override public NodeList getElementsByTagName(String tagName) { return new NodeListImpl(XMLParserImpl.getElementsByTagName( this.getJsObject(), tagName)); @@ -145,6 +154,7 @@ public NodeList getElementsByTagName(String tagName) { * This function delegates to the native method importNode in * XMLParserImpl. */ + @Override public Node importNode(Node importedNode, boolean deep) { try { return NodeImpl.build(XMLParserImpl.importNode(this.getJsObject(), diff --git a/user/src/com/google/gwt/xml/client/impl/ElementImpl.java b/user/src/com/google/gwt/xml/client/impl/ElementImpl.java index 895c874ff1b..d7aea60d9e6 100644 --- a/user/src/com/google/gwt/xml/client/impl/ElementImpl.java +++ b/user/src/com/google/gwt/xml/client/impl/ElementImpl.java @@ -35,6 +35,7 @@ protected ElementImpl(JavaScriptObject o) { * This function delegates to the native method getAttribute in * XMLParserImpl. */ + @Override public String getAttribute(String tagName) { return XMLParserImpl.getAttribute(this.getJsObject(), tagName); } @@ -43,6 +44,7 @@ public String getAttribute(String tagName) { * This function delegates to the native method getAttributeNode * in XMLParserImpl. */ + @Override public Attr getAttributeNode(String tagName) { return (Attr) NodeImpl.build(XMLParserImpl.getAttributeNode( this.getJsObject(), tagName)); @@ -52,6 +54,7 @@ public Attr getAttributeNode(String tagName) { * This function delegates to the native method * getElementsByTagName in XMLParserImpl. */ + @Override public NodeList getElementsByTagName(String tagName) { return new NodeListImpl(XMLParserImpl.getElementsByTagName( this.getJsObject(), tagName)); @@ -61,6 +64,7 @@ public NodeList getElementsByTagName(String tagName) { * This function delegates to the native method getTagName in * XMLParserImpl. */ + @Override public String getTagName() { return XMLParserImpl.getTagName(this.getJsObject()); } @@ -69,6 +73,7 @@ public String getTagName() { * This function delegates to the native method hasAttribute in * XMLParserImpl. */ + @Override public boolean hasAttribute(String tagName) { return getAttribute(tagName) != null; } @@ -77,6 +82,7 @@ public boolean hasAttribute(String tagName) { * This function delegates to the native method removeAttribute * in XMLParserImpl. */ + @Override public void removeAttribute(String name) throws DOMNodeException { try { XMLParserImpl.removeAttribute(this.getJsObject(), name); @@ -89,6 +95,7 @@ public void removeAttribute(String name) throws DOMNodeException { * This function delegates to the native method setAttribute in * XMLParserImpl. */ + @Override public void setAttribute(String name, String value) throws DOMNodeException { try { XMLParserImpl.setAttribute(this.getJsObject(), name, value); diff --git a/user/src/com/google/gwt/xml/client/impl/NamedNodeMapImpl.java b/user/src/com/google/gwt/xml/client/impl/NamedNodeMapImpl.java index d3cf6c60f2a..7692dc6d9ff 100644 --- a/user/src/com/google/gwt/xml/client/impl/NamedNodeMapImpl.java +++ b/user/src/com/google/gwt/xml/client/impl/NamedNodeMapImpl.java @@ -47,6 +47,7 @@ public int getLength() { * @param name - the name of the item * @return the item retrieved from the name */ + @Override public Node getNamedItem(String name) { return NodeImpl.build(XMLParserImpl.getNamedItem(this.getJsObject(), name)); } diff --git a/user/src/com/google/gwt/xml/client/impl/NodeImpl.java b/user/src/com/google/gwt/xml/client/impl/NodeImpl.java index 2e69e203ca8..b103b0e4faa 100644 --- a/user/src/com/google/gwt/xml/client/impl/NodeImpl.java +++ b/user/src/com/google/gwt/xml/client/impl/NodeImpl.java @@ -74,6 +74,7 @@ protected NodeImpl(JavaScriptObject jso) { * This function delegates to the native method appendChild in * XMLParserImpl. */ + @Override public Node appendChild(Node newChild) { try { final JavaScriptObject newChildJs = ((DOMItem) newChild).getJsObject(); @@ -89,22 +90,27 @@ public Node appendChild(Node newChild) { * This function delegates to the native method cloneNode in * XMLParserImpl. */ + @Override public Node cloneNode(boolean deep) { return NodeImpl.build(XMLParserImpl.cloneNode(this.getJsObject(), deep)); } + @Override public NamedNodeMap getAttributes() { return new NamedNodeMapImpl(XMLParserImpl.getAttributes(this.getJsObject())); } + @Override public NodeList getChildNodes() { return new NodeListImpl(XMLParserImpl.getChildNodes(this.getJsObject())); } + @Override public Node getFirstChild() { return getChildNodes().item(0); } + @Override public Node getLastChild() { return getChildNodes().item(getChildNodes().getLength() - 1); } @@ -113,30 +119,37 @@ public Node getLastChild() { * This function delegates to the native method getNamespaceURI * in XMLParserImpl. */ + @Override public String getNamespaceURI() { return XMLParserImpl.getNamespaceURI(this.getJsObject()); } + @Override public Node getNextSibling() { return NodeImpl.build(XMLParserImpl.getNextSibling(this.getJsObject())); } + @Override public String getNodeName() { return XMLParserImpl.getNodeName(this.getJsObject()); } + @Override public short getNodeType() { return XMLParserImpl.getNodeType(this.getJsObject()); } + @Override public String getNodeValue() { return XMLParserImpl.getNodeValue(this.getJsObject()); } + @Override public Document getOwnerDocument() { return (Document) NodeImpl.build(XMLParserImpl.getOwnerDocument(this.getJsObject())); } + @Override public Node getParentNode() { return NodeImpl.build(XMLParserImpl.getParentNode(this.getJsObject())); } @@ -145,10 +158,12 @@ public Node getParentNode() { * This function delegates to the native method getPrefix in * XMLParserImpl. */ + @Override public String getPrefix() { return XMLParserImpl.getPrefix(this.getJsObject()); } + @Override public Node getPreviousSibling() { return NodeImpl.build(XMLParserImpl.getPreviousSibling(this.getJsObject())); } @@ -157,6 +172,7 @@ public Node getPreviousSibling() { * This function delegates to the native method hasAttributes * in XMLParserImpl. */ + @Override public boolean hasAttributes() { return XMLParserImpl.hasAttributes(this.getJsObject()); } @@ -165,6 +181,7 @@ public boolean hasAttributes() { * This function delegates to the native method hasChildNodes * in XMLParserImpl. */ + @Override public boolean hasChildNodes() { return XMLParserImpl.hasChildNodes(this.getJsObject()); } @@ -173,6 +190,7 @@ public boolean hasChildNodes() { * This function delegates to the native method insertBefore in * XMLParserImpl. */ + @Override public Node insertBefore(Node newChild, Node refChild) { try { final JavaScriptObject newChildJs = ((DOMItem) newChild).getJsObject(); @@ -194,6 +212,7 @@ public Node insertBefore(Node newChild, Node refChild) { * This function delegates to the native method normalize in * XMLParserImpl. */ + @Override public void normalize() { XMLParserImpl.normalize(this.getJsObject()); } @@ -202,6 +221,7 @@ public void normalize() { * This function delegates to the native method removeChild in * XMLParserImpl. */ + @Override public Node removeChild(Node oldChild) { try { final JavaScriptObject oldChildJs = ((DOMItem) oldChild).getJsObject(); @@ -217,6 +237,7 @@ public Node removeChild(Node oldChild) { * This function delegates to the native method replaceChild in * XMLParserImpl. */ + @Override public Node replaceChild(Node newChild, Node oldChild) { try { final JavaScriptObject newChildJs = ((DOMItem) newChild).getJsObject(); @@ -233,6 +254,7 @@ public Node replaceChild(Node newChild, Node oldChild) { * This function delegates to the native method setNodeValue in * XMLParserImpl. */ + @Override public void setNodeValue(String nodeValue) { try { XMLParserImpl.setNodeValue(this.getJsObject(), nodeValue); diff --git a/user/src/com/google/gwt/xml/client/impl/NodeListImpl.java b/user/src/com/google/gwt/xml/client/impl/NodeListImpl.java index 5820e330c58..35c090a5d2b 100644 --- a/user/src/com/google/gwt/xml/client/impl/NodeListImpl.java +++ b/user/src/com/google/gwt/xml/client/impl/NodeListImpl.java @@ -29,6 +29,7 @@ protected NodeListImpl(JavaScriptObject o) { super(o); } + @Override public int getLength() { return XMLParserImpl.getLength(this.getJsObject()); } @@ -40,6 +41,7 @@ public int getLength() { * @return the item at this index * @see com.google.gwt.xml.client.NodeList#item(int) */ + @Override public Node item(int index) { return NodeImpl.build(XMLParserImpl.item(this.getJsObject(), index)); } diff --git a/user/src/com/google/gwt/xml/client/impl/ProcessingInstructionImpl.java b/user/src/com/google/gwt/xml/client/impl/ProcessingInstructionImpl.java index e2afa34d1b2..be3753102c3 100644 --- a/user/src/com/google/gwt/xml/client/impl/ProcessingInstructionImpl.java +++ b/user/src/com/google/gwt/xml/client/impl/ProcessingInstructionImpl.java @@ -34,6 +34,7 @@ protected ProcessingInstructionImpl(JavaScriptObject o) { * This function delegates to the native method getData in * XMLParserImpl. */ + @Override public String getData() { return XMLParserImpl.getData(this.getJsObject()); } @@ -42,6 +43,7 @@ public String getData() { * This function delegates to the native method getTarget in * XMLParserImpl. */ + @Override public String getTarget() { return XMLParserImpl.getTarget(this.getJsObject()); } @@ -50,6 +52,7 @@ public String getTarget() { * This function delegates to the native method setData in * XMLParserImpl. */ + @Override public void setData(String data) { try { XMLParserImpl.setData(this.getJsObject(), data); diff --git a/user/src/com/google/gwt/xml/client/impl/TextImpl.java b/user/src/com/google/gwt/xml/client/impl/TextImpl.java index 11f28cdad51..f376767738d 100644 --- a/user/src/com/google/gwt/xml/client/impl/TextImpl.java +++ b/user/src/com/google/gwt/xml/client/impl/TextImpl.java @@ -33,6 +33,7 @@ protected TextImpl(JavaScriptObject o) { * This function delegates to the native method splitText in * XMLParserImpl. */ + @Override public Text splitText(int offset) { try { return (Text) NodeImpl.build(XMLParserImpl.splitText(this.getJsObject(), diff --git a/user/src/com/google/web/bindery/autobean/gwt/client/impl/AbstractAutoBeanFactory.java b/user/src/com/google/web/bindery/autobean/gwt/client/impl/AbstractAutoBeanFactory.java index fc3a0cdeab5..1255499f0fe 100644 --- a/user/src/com/google/web/bindery/autobean/gwt/client/impl/AbstractAutoBeanFactory.java +++ b/user/src/com/google/web/bindery/autobean/gwt/client/impl/AbstractAutoBeanFactory.java @@ -33,11 +33,13 @@ public abstract class AbstractAutoBeanFactory implements AutoBeanFactory, EnumMa protected Map>> stringsToEnumsMap; private JsniCreatorMap creatorMap; + @Override public AutoBean create(Class clazz) { maybeInitializeCreatorMap(); return creatorMap.create(clazz, this); } + @Override public AutoBean create(Class clazz, U delegate) { maybeInitializeCreatorMap(); return creatorMap.create(clazz, this, delegate); @@ -46,6 +48,7 @@ public AutoBean create(Class clazz, U delegate) { /** * EnumMap support. */ + @Override public > E getEnum(Class clazz, String token) { maybeInitializeEnumMap(); List> list = stringsToEnumsMap.get(token); @@ -65,6 +68,7 @@ public > E getEnum(Class clazz, String token) { /** * EnumMap support. */ + @Override public String getToken(Enum e) { maybeInitializeEnumMap(); String toReturn = enumToStringMap.get(e); diff --git a/user/src/com/google/web/bindery/autobean/gwt/client/impl/ClientPropertyContext.java b/user/src/com/google/web/bindery/autobean/gwt/client/impl/ClientPropertyContext.java index 2208adac465..e53fcb81107 100644 --- a/user/src/com/google/web/bindery/autobean/gwt/client/impl/ClientPropertyContext.java +++ b/user/src/com/google/web/bindery/autobean/gwt/client/impl/ClientPropertyContext.java @@ -91,14 +91,17 @@ public ClientPropertyContext(Object instance, Setter setter, Class[] types, i } } + @Override public void accept(ParameterizationVisitor visitor) { traverse(visitor, 0); } + @Override public boolean canSet() { return setter != null; } + @Override public Class getElementType() { if (paramTypes == null || paramTypes.length < 2) { return null; @@ -109,6 +112,7 @@ public Class getElementType() { return null; } + @Override public Class getKeyType() { if (paramTypes == null || paramTypes.length < 3) { return null; @@ -119,10 +123,12 @@ public Class getKeyType() { return null; } + @Override public Class getType() { return simpleType == null ? paramTypes[0] : simpleType; } + @Override public Class getValueType() { if (paramTypes == null || paramTypes.length < 3) { return null; @@ -133,6 +139,7 @@ public Class getValueType() { return null; } + @Override public void set(Object value) { setter.call(instance, value); } diff --git a/user/src/com/google/web/bindery/autobean/gwt/client/impl/JsoSplittable.java b/user/src/com/google/web/bindery/autobean/gwt/client/impl/JsoSplittable.java index 43588dbf206..5fcd73860be 100644 --- a/user/src/com/google/web/bindery/autobean/gwt/client/impl/JsoSplittable.java +++ b/user/src/com/google/web/bindery/autobean/gwt/client/impl/JsoSplittable.java @@ -103,14 +103,17 @@ private static native boolean stringifyFastSupported0() /*-{ protected JsoSplittable() { }; + @Override public native boolean asBoolean() /*-{ return this && this.valueOf(); }-*/; + @Override public native double asNumber() /*-{ return this && this.valueOf(); }-*/; + @Override public void assign(Splittable parent, int index) { if (isString()) { assign0(parent, index, asString()); @@ -119,6 +122,7 @@ public void assign(Splittable parent, int index) { } } + @Override public void assign(Splittable parent, String index) { if (isString()) { assign0(parent, index, asString()); @@ -127,22 +131,27 @@ public void assign(Splittable parent, String index) { } } + @Override public native String asString() /*-{ return this.__s; }-*/; + @Override public Splittable deepCopy() { return StringQuoter.split(getPayload()); } + @Override public JsoSplittable get(int index) { return getRaw(index); } + @Override public JsoSplittable get(String key) { return getRaw(key); } + @Override public String getPayload() { if (isString()) { return JsonUtils.escapeValue(asString()); @@ -153,20 +162,24 @@ public String getPayload() { return stringifySlow(); } + @Override public List getPropertyKeys() { List toReturn = new ArrayList(); getPropertyKeys0(toReturn); return Collections.unmodifiableList(toReturn); } + @Override public native Object getReified(String key) /*-{ return this.__reified && this.__reified[':' + key]; }-*/; + @Override public Splittable getSplittable() { return this; } + @Override public native boolean isBoolean() /*-{ return this && typeof(this.valueOf()) === 'boolean'; }-*/; @@ -175,26 +188,32 @@ public native boolean isFunction() /*-{ return Object.prototype.toString.call(this) == '[object Function]'; }-*/; + @Override public native boolean isIndexed() /*-{ return Object.prototype.toString.call(this) == '[object Array]'; }-*/; + @Override public boolean isKeyed() { return this != NULL && !isString() && !isIndexed() && !isFunction(); } + @Override public native boolean isNull(int index) /*-{ return this[index] == null; }-*/; + @Override public native boolean isNull(String key) /*-{ return this[key] == null; }-*/; + @Override public native boolean isNumber() /*-{ return this && typeof(this.valueOf()) === 'number'; }-*/; + @Override public native boolean isReified(String key) /*-{ return !!(this.__reified && this.__reified.hasOwnProperty(':' + key)); }-*/; @@ -202,10 +221,12 @@ public native boolean isReified(String key) /*-{ /** * Returns whether or not the current object is a string-carrier. */ + @Override public native boolean isString() /*-{ return this && this.__s != null; }-*/; + @Override public native boolean isUndefined(String key) /*-{ return this[key] === undefined; }-*/; @@ -217,16 +238,19 @@ public native void removeReified(String key) /*-{ } }-*/; + @Override public native void setReified(String key, Object object) /*-{ // Use a function object so native JSON.stringify will ignore (this.__reified || (this.__reified = function() { }))[':' + key] = object; }-*/; + @Override public native void setSize(int size) /*-{ this.length = size; }-*/; + @Override public native int size() /*-{ return this.length; }-*/; diff --git a/user/src/com/google/web/bindery/autobean/gwt/rebind/model/AutoBeanType.java b/user/src/com/google/web/bindery/autobean/gwt/rebind/model/AutoBeanType.java index da40afec549..f3c82e863a5 100644 --- a/user/src/com/google/web/bindery/autobean/gwt/rebind/model/AutoBeanType.java +++ b/user/src/com/google/web/bindery/autobean/gwt/rebind/model/AutoBeanType.java @@ -56,6 +56,7 @@ public void setInterceptor(JMethod interceptor) { public void setMethods(List methods) { toReturn.methods = new ArrayList(methods); Collections.sort(toReturn.methods, new Comparator() { + @Override public int compare(AutoBeanMethod o1, AutoBeanMethod o2) { int c = o1.getAction().compareTo(o2.getAction()); if (c != 0) { diff --git a/user/src/com/google/web/bindery/autobean/shared/impl/AbstractAutoBean.java b/user/src/com/google/web/bindery/autobean/shared/impl/AbstractAutoBean.java index bc7a599fbde..3840497965a 100644 --- a/user/src/com/google/web/bindery/autobean/shared/impl/AbstractAutoBean.java +++ b/user/src/com/google/web/bindery/autobean/shared/impl/AbstractAutoBean.java @@ -97,24 +97,29 @@ protected AbstractAutoBean(T wrapped, AutoBeanFactory factory) { WeakMapping.setWeak(wrapped, AutoBean.class.getName(), this); } + @Override public void accept(AutoBeanVisitor visitor) { traverse(visitor, new OneShotContext()); } + @Override public abstract T as(); public AutoBean clone(boolean deep) { throw new UnsupportedOperationException(); } + @Override public AutoBeanFactory getFactory() { return factory; } + @Override public Splittable getSplittable() { return data; } + @Override @SuppressWarnings("unchecked") public Q getTag(String tagName) { return tags == null ? null : (Q) tags.get(tagName); @@ -128,10 +133,12 @@ public boolean hasUnsplittableValues() { return data.isReified(UNSPLITTABLE_VALUES_KEY); } + @Override public boolean isFrozen() { return frozen; } + @Override public boolean isWrapper() { return !usingSimplePeer; } @@ -146,10 +153,12 @@ public void setData(Splittable data) { wrapped = createSimplePeer(); } + @Override public void setFrozen(boolean frozen) { this.frozen = frozen; } + @Override public void setTag(String tagName, Object value) { if (tags == null) { tags = new HashMap(); @@ -168,6 +177,7 @@ public void traverse(AutoBeanVisitor visitor, OneShotContext ctx) { visitor.endVisit(this, ctx); } + @Override public T unwrap() { if (usingSimplePeer) { throw new IllegalStateException(); diff --git a/user/src/com/google/web/bindery/autobean/shared/impl/AutoBeanCodexImpl.java b/user/src/com/google/web/bindery/autobean/shared/impl/AutoBeanCodexImpl.java index 5170f2bb208..45a5589be05 100644 --- a/user/src/com/google/web/bindery/autobean/shared/impl/AutoBeanCodexImpl.java +++ b/user/src/com/google/web/bindery/autobean/shared/impl/AutoBeanCodexImpl.java @@ -138,6 +138,7 @@ public CollectionCoder(Class type, Coder elementDecoder) { this.type = type; } + @Override public Object decode(EncodeState state, Splittable data) { Collection collection; if (List.class.equals(type)) { @@ -151,6 +152,7 @@ public Object decode(EncodeState state, Splittable data) { return collection; } + @Override public void encode(EncodeState state, Object value) { if (value == null) { state.sb.append("null"); @@ -169,6 +171,7 @@ public void encode(EncodeState state, Object value) { state.sb.append("]"); } + @Override public Splittable extractSplittable(EncodeState state, Object value) { return tryExtractSplittable(value); } @@ -186,10 +189,12 @@ public EnumCoder(Class type) { this.type = type; } + @Override public Object decode(EncodeState state, Splittable data) { return state.enumMap.getEnum(type, data.asString()); } + @Override public void encode(EncodeState state, Object value) { if (value == null) { state.sb.append("null"); @@ -198,6 +203,7 @@ public void encode(EncodeState state, Object value) { state.sb.append(StringQuoter.quote(state.enumMap.getToken((Enum) value))); } + @Override public Splittable extractSplittable(EncodeState state, Object value) { return StringQuoter.split(StringQuoter.quote(state.enumMap.getToken((Enum) value))); } @@ -232,6 +238,7 @@ public MapCoder(Coder valueDecoder, Coder keyDecoder) { this.valueDecoder = valueDecoder; } + @Override public Object decode(EncodeState state, Splittable data) { Map toReturn; if (data.isIndexed()) { @@ -243,6 +250,7 @@ public Object decode(EncodeState state, Splittable data) { return toReturn; } + @Override public void encode(EncodeState state, Object value) { if (value == null) { state.sb.append("null"); @@ -293,6 +301,7 @@ public void encode(EncodeState state, Object value) { } } + @Override public Splittable extractSplittable(EncodeState state, Object value) { return tryExtractSplittable(value); } @@ -308,11 +317,13 @@ public ObjectCoder(Class type) { this.type = type; } + @Override public Object decode(EncodeState state, Splittable data) { AutoBean bean = doDecode(state, type, data); return bean == null ? null : bean.as(); } + @Override public void encode(EncodeState state, Object value) { if (value == null) { state.sb.append("null"); @@ -321,6 +332,7 @@ public void encode(EncodeState state, Object value) { doEncode(state, AutoBeanUtils.getAutoBean(value)); } + @Override public Splittable extractSplittable(EncodeState state, Object value) { return tryExtractSplittable(value); } @@ -457,10 +469,12 @@ protected void decodeProperty(String propertyName, PropertyContext ctx) { static class SplittableCoder implements Coder { static final Coder INSTANCE = new SplittableCoder(); + @Override public Object decode(EncodeState state, Splittable data) { return data; } + @Override public void encode(EncodeState state, Object value) { if (value == null) { state.sb.append("null"); @@ -469,6 +483,7 @@ public void encode(EncodeState state, Object value) { state.sb.append(((Splittable) value).getPayload()); } + @Override public Splittable extractSplittable(EncodeState state, Object value) { return (Splittable) value; } @@ -485,6 +500,7 @@ public ValueCoder(Class type) { this.type = type; } + @Override public Object decode(EncodeState state, Splittable propertyValue) { if (propertyValue == null || propertyValue == Splittable.NULL) { return ValueCodex.getUninitializedFieldValue(type); @@ -492,10 +508,12 @@ public Object decode(EncodeState state, Splittable propertyValue) { return ValueCodex.decode(type, propertyValue); } + @Override public void encode(EncodeState state, Object value) { state.sb.append(ValueCodex.encode(type, value).getPayload()); } + @Override public Splittable extractSplittable(EncodeState state, Object value) { return ValueCodex.encode(type, value); } diff --git a/user/src/com/google/web/bindery/autobean/shared/impl/SplittableComplexMap.java b/user/src/com/google/web/bindery/autobean/shared/impl/SplittableComplexMap.java index c118d29fb9b..bde798059b3 100644 --- a/user/src/com/google/web/bindery/autobean/shared/impl/SplittableComplexMap.java +++ b/user/src/com/google/web/bindery/autobean/shared/impl/SplittableComplexMap.java @@ -46,20 +46,24 @@ public SplittableComplexMap(Splittable data, Coder keyCoder, Coder valueCoder, E assert this.keys.size() == this.values.size(); } + @Override public void clear() { // Trigger ConcurrentModificationExceptions for any outstanding Iterators keys.clear(); values.clear(); } + @Override public boolean containsKey(Object key) { return keys.contains(key); } + @Override public boolean containsValue(Object value) { return values.contains(value); } + @Override public Set> entrySet() { return new AbstractSet>() { @@ -69,24 +73,29 @@ public Iterator> iterator() { Iterator keyIt = keys.iterator(); ListIterator valueIt = values.listIterator(); + @Override public boolean hasNext() { assert keyIt.hasNext() == valueIt.hasNext(); return keyIt.hasNext(); } + @Override public java.util.Map.Entry next() { return new Map.Entry() { final K key = keyIt.next(); final V value = valueIt.next(); + @Override public K getKey() { return key; } + @Override public V getValue() { return value; } + @Override public V setValue(V value) { valueIt.set(value); return value; @@ -94,6 +103,7 @@ public V setValue(V value) { }; } + @Override public void remove() { keyIt.remove(); valueIt.remove(); @@ -108,6 +118,7 @@ public int size() { }; } + @Override public V get(Object key) { int idx = keys.indexOf(key); if (idx == -1) { @@ -116,14 +127,17 @@ public V get(Object key) { return values.get(idx); } + @Override public Splittable getSplittable() { return data; } + @Override public boolean isEmpty() { return keys.isEmpty(); } + @Override public Set keySet() { return new AbstractSet() { @Override @@ -138,6 +152,7 @@ public int size() { }; } + @Override public V put(K key, V value) { int idx = keys.indexOf(key); if (idx == -1) { @@ -148,12 +163,14 @@ public V put(K key, V value) { return values.set(idx, value); } + @Override public void putAll(Map m) { for (Map.Entry entry : m.entrySet()) { put(entry.getKey(), entry.getValue()); } } + @Override public V remove(Object key) { int idx = keys.indexOf(key); if (idx == -1) { @@ -163,10 +180,12 @@ public V remove(Object key) { return values.remove(idx); } + @Override public int size() { return keys.size(); } + @Override public Collection values() { return new AbstractCollection() { @Override @@ -175,15 +194,18 @@ public Iterator iterator() { final Iterator keyIt = keys.iterator(); final Iterator valueIt = values.iterator(); + @Override public boolean hasNext() { return keyIt.hasNext(); } + @Override public V next() { keyIt.next(); return valueIt.next(); } + @Override public void remove() { keyIt.remove(); valueIt.remove(); diff --git a/user/src/com/google/web/bindery/autobean/shared/impl/SplittableList.java b/user/src/com/google/web/bindery/autobean/shared/impl/SplittableList.java index 0e076f87c06..8b05d66b9c0 100644 --- a/user/src/com/google/web/bindery/autobean/shared/impl/SplittableList.java +++ b/user/src/com/google/web/bindery/autobean/shared/impl/SplittableList.java @@ -83,6 +83,7 @@ public E get(int index) { return SplittableList. reify(state, data, index, elementCoder); } + @Override public Splittable getSplittable() { return data; } diff --git a/user/src/com/google/web/bindery/autobean/shared/impl/SplittableSet.java b/user/src/com/google/web/bindery/autobean/shared/impl/SplittableSet.java index 9b6d8abb5bb..744c9257c88 100644 --- a/user/src/com/google/web/bindery/autobean/shared/impl/SplittableSet.java +++ b/user/src/com/google/web/bindery/autobean/shared/impl/SplittableSet.java @@ -50,6 +50,7 @@ public void clear() { data.clear(); } + @Override public Splittable getSplittable() { return data.getSplittable(); } diff --git a/user/src/com/google/web/bindery/autobean/shared/impl/SplittableSimpleMap.java b/user/src/com/google/web/bindery/autobean/shared/impl/SplittableSimpleMap.java index fc4dc0f8022..16a378ce817 100644 --- a/user/src/com/google/web/bindery/autobean/shared/impl/SplittableSimpleMap.java +++ b/user/src/com/google/web/bindery/autobean/shared/impl/SplittableSimpleMap.java @@ -51,6 +51,7 @@ public SplittableSimpleMap(Splittable data, Coder keyCoder, Coder valueCoder, En this.valueCoder = valueCoder; } + @Override public void clear() { for (String key : data.getPropertyKeys()) { Splittable.NULL.assign(data, key); @@ -58,15 +59,18 @@ public void clear() { } } + @Override public boolean containsKey(Object key) { String encodedKey = encodedKey(key); return !data.isUndefined(encodedKey) || reified.isReified(encodedKey); } + @Override public boolean containsValue(Object value) { return values().contains(value); } + @Override public Set> entrySet() { return new AbstractSet>() { final List keys = data.getPropertyKeys(); @@ -77,10 +81,12 @@ public Iterator> iterator() { Iterator keyIterator = keys.iterator(); String encodedKey; + @Override public boolean hasNext() { return keyIterator.hasNext(); } + @Override public java.util.Map.Entry next() { encodedKey = keyIterator.next(); return new Map.Entry() { @@ -90,20 +96,24 @@ public java.util.Map.Entry next() { @SuppressWarnings("unchecked") final V value = (V) valueCoder.decode(state, data.get(encodedKey)); + @Override public K getKey() { return key; } + @Override public V getValue() { return value; } + @Override public V setValue(V newValue) { return put(key, newValue); } }; } + @Override public void remove() { Splittable.NULL.assign(data, encodedKey); reified.setReified(encodedKey, null); @@ -118,19 +128,23 @@ public int size() { }; } + @Override public V get(Object key) { String encodedKey = encodedKey(key); return getRaw(encodedKey); } + @Override public Splittable getSplittable() { return data; } + @Override public boolean isEmpty() { return data.getPropertyKeys().isEmpty(); } + @Override public Set keySet() { return new AbstractSet() { final List keys = data.getPropertyKeys(); @@ -141,10 +155,12 @@ public Iterator iterator() { final Iterator it = keys.iterator(); String lastEncodedKey; + @Override public boolean hasNext() { return it.hasNext(); } + @Override public K next() { lastEncodedKey = it.next(); @SuppressWarnings("unchecked") @@ -153,6 +169,7 @@ public K next() { return toReturn; } + @Override public void remove() { Splittable.NULL.assign(data, lastEncodedKey); reified.setReified(lastEncodedKey, null); @@ -167,6 +184,7 @@ public int size() { }; } + @Override public V put(K key, V value) { V toReturn = get(key); String encodedKey = encodedKey(key); @@ -181,12 +199,14 @@ public V put(K key, V value) { return toReturn; } + @Override public void putAll(Map m) { for (Map.Entry entry : m.entrySet()) { put(entry.getKey(), entry.getValue()); } } + @Override public V remove(Object key) { V toReturn = get(key); String encodedKey = encodedKey(key); @@ -195,10 +215,12 @@ public V remove(Object key) { return toReturn; } + @Override public int size() { return data.getPropertyKeys().size(); } + @Override public Collection values() { return new AbstractCollection() { final List keys = data.getPropertyKeys(); @@ -209,15 +231,18 @@ public Iterator iterator() { final Iterator it = keys.iterator(); String lastEncodedKey; + @Override public boolean hasNext() { return it.hasNext(); } + @Override public V next() { lastEncodedKey = it.next(); return getRaw(lastEncodedKey); } + @Override public void remove() { Splittable.NULL.assign(data, lastEncodedKey); reified.setReified(lastEncodedKey, null); diff --git a/user/src/com/google/web/bindery/autobean/vm/impl/FactoryHandler.java b/user/src/com/google/web/bindery/autobean/vm/impl/FactoryHandler.java index 7a21a9ddd93..e054445f2d3 100644 --- a/user/src/com/google/web/bindery/autobean/vm/impl/FactoryHandler.java +++ b/user/src/com/google/web/bindery/autobean/vm/impl/FactoryHandler.java @@ -45,6 +45,7 @@ public FactoryHandler(Configuration configuration) { * Handles both declared factory methods as well as the dynamic create * methods. */ + @Override public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { diff --git a/user/src/com/google/web/bindery/autobean/vm/impl/JsonSplittable.java b/user/src/com/google/web/bindery/autobean/vm/impl/JsonSplittable.java index d9c1a16a005..031634d66ce 100644 --- a/user/src/com/google/web/bindery/autobean/vm/impl/JsonSplittable.java +++ b/user/src/com/google/web/bindery/autobean/vm/impl/JsonSplittable.java @@ -139,14 +139,17 @@ private JsonSplittable(String string) { this.string = string; } + @Override public boolean asBoolean() { return bool; } + @Override public double asNumber() { return number; } + @Override public void assign(Splittable parent, int index) { try { ((JsonSplittable) parent).array.put(index, value()); @@ -155,6 +158,7 @@ public void assign(Splittable parent, int index) { } } + @Override public void assign(Splittable parent, String propertyName) { try { ((JsonSplittable) parent).obj.put(propertyName, value()); @@ -163,14 +167,17 @@ public void assign(Splittable parent, String propertyName) { } } + @Override public String asString() { return string; } + @Override public Splittable deepCopy() { return create(getPayload()); } + @Override public Splittable get(int index) { try { return makeSplittable(array.get(index)); @@ -179,6 +186,7 @@ public Splittable get(int index) { } } + @Override public Splittable get(String key) { try { return makeSplittable(obj.get(key)); @@ -187,6 +195,7 @@ public Splittable get(String key) { } } + @Override public String getPayload() { if (isNull) { return "null"; @@ -209,6 +218,7 @@ public String getPayload() { throw new RuntimeException("No data in this JsonSplittable"); } + @Override public List getPropertyKeys() { String[] names = getNames(obj); if (names == null) { @@ -218,47 +228,58 @@ public List getPropertyKeys() { } } + @Override public Object getReified(String key) { return reified.get(key); } + @Override public Splittable getSplittable() { return this; } + @Override public boolean isBoolean() { return bool != null; } + @Override public boolean isIndexed() { return array != null; } + @Override public boolean isKeyed() { return obj != null; } + @Override public boolean isNull(int index) { return array.isNull(index); } + @Override public boolean isNull(String key) { // Treat undefined and null as the same return !obj.has(key) || obj.isNull(key); } + @Override public boolean isNumber() { return number != null; } + @Override public boolean isReified(String key) { return reified.containsKey(key); } + @Override public boolean isString() { return string != null; } + @Override public boolean isUndefined(String key) { return !obj.has(key); } @@ -268,10 +289,12 @@ public void removeReified(String key) { reified.remove(key); } + @Override public void setReified(String key, Object object) { reified.put(key, object); } + @Override public void setSize(int size) { // This is terrible, but there's no API support for resizing or splicing JSONArray newArray = new JSONArray(); @@ -285,6 +308,7 @@ public void setSize(int size) { array = newArray; } + @Override public int size() { return array.length(); } diff --git a/user/src/com/google/web/bindery/autobean/vm/impl/MethodPropertyContext.java b/user/src/com/google/web/bindery/autobean/vm/impl/MethodPropertyContext.java index 0a4fca7d284..58f6f6fb462 100644 --- a/user/src/com/google/web/bindery/autobean/vm/impl/MethodPropertyContext.java +++ b/user/src/com/google/web/bindery/autobean/vm/impl/MethodPropertyContext.java @@ -41,28 +41,35 @@ protected MethodPropertyContext(Type genericType, Class type, Class elemen this.valueType = valueType; } + @Override public void accept(ParameterizationVisitor visitor) { traverse(visitor, genericType); } + @Override public abstract boolean canSet(); + @Override public Class getElementType() { return elementType; } + @Override public Class getKeyType() { return keyType; } + @Override public Class getType() { return type; } + @Override public Class getValueType() { return valueType; } + @Override public abstract void set(Object value); private void traverse(ParameterizationVisitor visitor, Type type) { diff --git a/user/src/com/google/web/bindery/autobean/vm/impl/ProxyAutoBean.java b/user/src/com/google/web/bindery/autobean/vm/impl/ProxyAutoBean.java index 620b796ee01..3ffa00b7b8e 100644 --- a/user/src/com/google/web/bindery/autobean/vm/impl/ProxyAutoBean.java +++ b/user/src/com/google/web/bindery/autobean/vm/impl/ProxyAutoBean.java @@ -233,6 +233,7 @@ public Configuration getConfiguration() { return configuration; } + @Override public Class getType() { return beanType; } diff --git a/user/src/com/google/web/bindery/autobean/vm/impl/ShimHandler.java b/user/src/com/google/web/bindery/autobean/vm/impl/ShimHandler.java index 95dabe85b25..0035f3d4579 100644 --- a/user/src/com/google/web/bindery/autobean/vm/impl/ShimHandler.java +++ b/user/src/com/google/web/bindery/autobean/vm/impl/ShimHandler.java @@ -66,6 +66,7 @@ public int hashCode() { return bean.getWrapped().hashCode(); } + @Override public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { method.setAccessible(true); Object toReturn; diff --git a/user/src/com/google/web/bindery/autobean/vm/impl/SimpleBeanHandler.java b/user/src/com/google/web/bindery/autobean/vm/impl/SimpleBeanHandler.java index a6624a67b9a..0d7ea4b6cdd 100644 --- a/user/src/com/google/web/bindery/autobean/vm/impl/SimpleBeanHandler.java +++ b/user/src/com/google/web/bindery/autobean/vm/impl/SimpleBeanHandler.java @@ -37,6 +37,7 @@ public ProxyAutoBean getBean() { /** * Delegates most work to {@link BeanMethod}. */ + @Override public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { for (BeanMethod type : BeanMethod.values()) { if (type.matches(this, method)) { diff --git a/user/src/com/google/web/bindery/event/shared/ResettableEventBus.java b/user/src/com/google/web/bindery/event/shared/ResettableEventBus.java index 9268c330270..9954dc6b69c 100644 --- a/user/src/com/google/web/bindery/event/shared/ResettableEventBus.java +++ b/user/src/com/google/web/bindery/event/shared/ResettableEventBus.java @@ -83,6 +83,7 @@ protected int getRegistrationSize() { private HandlerRegistration doRegisterHandler(final HandlerRegistration registration) { registrations.add(registration); return new HandlerRegistration() { + @Override public void removeHandler() { doUnregisterHandler(registration); } diff --git a/user/src/com/google/web/bindery/event/shared/SimpleEventBus.java b/user/src/com/google/web/bindery/event/shared/SimpleEventBus.java index de481035309..c59b33248ab 100644 --- a/user/src/com/google/web/bindery/event/shared/SimpleEventBus.java +++ b/user/src/com/google/web/bindery/event/shared/SimpleEventBus.java @@ -159,6 +159,7 @@ private HandlerRegistration doAdd(final Event.Type type, final Object sou } return new HandlerRegistration() { + @Override public void removeHandler() { doRemove(type, source, handler); } @@ -222,6 +223,7 @@ private void doRemoveNow(Event.Type type, Object source, H handler) { private void enqueueAdd(final Event.Type type, final Object source, final H handler) { defer(new Command() { + @Override public void execute() { doAddNow(type, source, handler); } @@ -230,6 +232,7 @@ public void execute() { private void enqueueRemove(final Event.Type type, final Object source, final H handler) { defer(new Command() { + @Override public void execute() { doRemoveNow(type, source, handler); } diff --git a/user/src/com/google/web/bindery/event/shared/testing/CountingEventBus.java b/user/src/com/google/web/bindery/event/shared/testing/CountingEventBus.java index 3b717fa7d39..7d3d7d4d5a8 100644 --- a/user/src/com/google/web/bindery/event/shared/testing/CountingEventBus.java +++ b/user/src/com/google/web/bindery/event/shared/testing/CountingEventBus.java @@ -105,6 +105,7 @@ public int getHandlerCount(Type type) { private HandlerRegistration makeReg(final Type type, final HandlerRegistration superReg) { return new HandlerRegistration() { + @Override public void removeHandler() { handlerCounts.decrement(type); superReg.removeHandler(); diff --git a/user/src/com/google/web/bindery/requestfactory/apt/DeobfuscatorBuilder.java b/user/src/com/google/web/bindery/requestfactory/apt/DeobfuscatorBuilder.java index 44cd2be8de1..e9eefc95391 100644 --- a/user/src/com/google/web/bindery/requestfactory/apt/DeobfuscatorBuilder.java +++ b/user/src/com/google/web/bindery/requestfactory/apt/DeobfuscatorBuilder.java @@ -45,6 +45,7 @@ class DeobfuscatorBuilder extends ScannerBase { private TypeElement requestFactoryElement; private final StringBuilder sb = new StringBuilder(); + @Override public String toString() { return sb.toString(); } diff --git a/user/src/com/google/web/bindery/requestfactory/gwt/client/DefaultRequestTransport.java b/user/src/com/google/web/bindery/requestfactory/gwt/client/DefaultRequestTransport.java index fd57778275d..b5d8fea8037 100644 --- a/user/src/com/google/web/bindery/requestfactory/gwt/client/DefaultRequestTransport.java +++ b/user/src/com/google/web/bindery/requestfactory/gwt/client/DefaultRequestTransport.java @@ -65,6 +65,7 @@ public String getRequestUrl() { return requestUrl; } + @Override public void send(String payload, TransportReceiver receiver) { RequestBuilder builder = createRequestBuilder(); configureRequestBuilder(builder); @@ -124,11 +125,13 @@ protected RequestBuilder createRequestBuilder() { protected RequestCallback createRequestCallback(final TransportReceiver receiver) { return new RequestCallback() { + @Override public void onError(Request request, Throwable exception) { wireLogger.log(Level.SEVERE, SERVER_ERROR, exception); receiver.onTransportFailure(new ServerFailure(exception.getMessage())); } + @Override public void onResponseReceived(Request request, Response response) { wireLogger.finest("Response received"); if (Response.SC_OK == response.getStatusCode()) { diff --git a/user/src/com/google/web/bindery/requestfactory/gwt/client/RequestFactoryEditorDriver.java b/user/src/com/google/web/bindery/requestfactory/gwt/client/RequestFactoryEditorDriver.java index 9274f43133a..22f68d34acd 100644 --- a/user/src/com/google/web/bindery/requestfactory/gwt/client/RequestFactoryEditorDriver.java +++ b/user/src/com/google/web/bindery/requestfactory/gwt/client/RequestFactoryEditorDriver.java @@ -76,6 +76,7 @@ public interface RequestFactoryEditorDriver> exte * @throws IllegalStateException if {@link #edit(Object, RequestContext)} has * not been called */ + @Override RequestContext flush(); /** diff --git a/user/src/com/google/web/bindery/requestfactory/gwt/client/impl/AbstractRequestFactoryEditorDriver.java b/user/src/com/google/web/bindery/requestfactory/gwt/client/impl/AbstractRequestFactoryEditorDriver.java index 330ec434ab5..89a862cc9f0 100644 --- a/user/src/com/google/web/bindery/requestfactory/gwt/client/impl/AbstractRequestFactoryEditorDriver.java +++ b/user/src/com/google/web/bindery/requestfactory/gwt/client/impl/AbstractRequestFactoryEditorDriver.java @@ -92,18 +92,22 @@ public ViolationIterable( this.violations = violations; } + @Override public Iterator iterator() { 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(); } @@ -134,6 +138,7 @@ public int hashCode() { } private static final DelegateMap.KeyMethod PROXY_ID_KEY = new DelegateMap.KeyMethod() { + @Override public Object key(Object object) { if (object instanceof EntityProxy) { return ((EntityProxy) object).stableId(); @@ -155,10 +160,12 @@ public Object key(Object object) { private RequestFactory factory; private RequestContext saveRequest; + @Override public void display(R object) { edit(object, null); } + @Override public void edit(R object, RequestContext saveRequest) { this.saveRequest = saveRequest; /* @@ -169,26 +176,31 @@ public void edit(R object, RequestContext saveRequest) { doEdit(object); } + @Override public RequestContext flush() { checkSaveRequest(); doFlush(); return saveRequest; } + @Override public String[] getPaths() { return paths.toArray(new String[paths.size()]); } + @Override public void initialize(E editor) { doInitialize(null, null, editor); } + @Override public void initialize(EventBus eventBus, RequestFactory requestFactory, E editor) { assert eventBus != null : "eventBus must not be null"; assert requestFactory != null : "requestFactory must not be null"; doInitialize(eventBus, requestFactory, editor); } + @Override public void initialize(RequestFactory requestFactory, E editor) { initialize(requestFactory.getEventBus(), requestFactory, editor); } diff --git a/user/src/com/google/web/bindery/requestfactory/gwt/client/impl/RequestFactoryEditorDelegate.java b/user/src/com/google/web/bindery/requestfactory/gwt/client/impl/RequestFactoryEditorDelegate.java index 4cbcf92a290..f5a793028b3 100644 --- a/user/src/com/google/web/bindery/requestfactory/gwt/client/impl/RequestFactoryEditorDelegate.java +++ b/user/src/com/google/web/bindery/requestfactory/gwt/client/impl/RequestFactoryEditorDelegate.java @@ -45,6 +45,7 @@ public abstract class RequestFactoryEditorDelegate> private class SubscriptionHandler implements EntityProxyChange.Handler { + @Override public void onProxyChange(EntityProxyChange event) { if (event.getWriteOperation().equals(WriteOperation.UPDATE) && event.getProxyId().equals(((EntityProxy) getObject()).stableId())) { @@ -113,6 +114,7 @@ public HandlerRegistration subscribe() { EntityProxyChange. registerForProxyType(eventBus, clazz, new SubscriptionHandler()); return new HandlerRegistration() { + @Override public void removeHandler() { toReturn.removeHandler(); } diff --git a/user/src/com/google/web/bindery/requestfactory/gwt/client/testing/MockRequestFactoryEditorDriver.java b/user/src/com/google/web/bindery/requestfactory/gwt/client/testing/MockRequestFactoryEditorDriver.java index e6f06a2323b..616aa3c2478 100644 --- a/user/src/com/google/web/bindery/requestfactory/gwt/client/testing/MockRequestFactoryEditorDriver.java +++ b/user/src/com/google/web/bindery/requestfactory/gwt/client/testing/MockRequestFactoryEditorDriver.java @@ -48,12 +48,14 @@ public class MockRequestFactoryEditorDriver> implements /** * A no-op method. */ + @Override public void accept(EditorVisitor visitor) { } /** * Records its arguments. */ + @Override public void display(P proxy) { this.proxy = proxy; } @@ -61,6 +63,7 @@ public void display(P proxy) { /** * Records its arguments. */ + @Override public void edit(P proxy, RequestContext saveRequest) { this.proxy = proxy; this.saveRequest = saveRequest; @@ -69,6 +72,7 @@ public void edit(P proxy, RequestContext saveRequest) { /** * Returns null or the last value recorded. */ + @Override public RequestContext flush() { return saveRequest; } @@ -83,6 +87,7 @@ public E getEditor() { /** * Returns an empty list. */ + @Override public List getErrors() { return Collections.emptyList(); } @@ -97,6 +102,7 @@ public EventBus getEventBus() { /** * Returns a zero-length array. */ + @Override public String[] getPaths() { return EMPTY_STRING; } @@ -125,10 +131,12 @@ public RequestContext getSaveRequest() { /** * Returns false. */ + @Override public boolean hasErrors() { return false; } + @Override public void initialize(E editor) { initialize(null, editor); } @@ -136,6 +144,7 @@ public void initialize(E editor) { /** * Records its arguments. */ + @Override public void initialize(EventBus eventBus, RequestFactory requestFactory, E editor) { this.eventBus = eventBus; @@ -143,6 +152,7 @@ public void initialize(EventBus eventBus, RequestFactory requestFactory, this.editor = editor; } + @Override public void initialize(RequestFactory requestFactory, E editor) { this.initialize(requestFactory.getEventBus(), requestFactory, editor); } @@ -150,6 +160,7 @@ public void initialize(RequestFactory requestFactory, E editor) { /** * Returns {@code false}. */ + @Override public boolean isDirty() { return false; } @@ -157,6 +168,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/web/bindery/requestfactory/gwt/rebind/model/ContextMethod.java b/user/src/com/google/web/bindery/requestfactory/gwt/rebind/model/ContextMethod.java index efa6b4c2938..81a816f663b 100644 --- a/user/src/com/google/web/bindery/requestfactory/gwt/rebind/model/ContextMethod.java +++ b/user/src/com/google/web/bindery/requestfactory/gwt/rebind/model/ContextMethod.java @@ -76,6 +76,7 @@ public Builder setRequestMethods(List requestMethods) { private ContextMethod() { } + @Override public void accept(ModelVisitor visitor) { if (visitor.visit(this)) { for (RequestMethod method : getRequestMethods()) { @@ -89,6 +90,7 @@ public Dialect getDialect() { return dialect; } + @Override public List getExtraTypes() { return Collections.unmodifiableList(extraTypes); } diff --git a/user/src/com/google/web/bindery/requestfactory/gwt/rebind/model/EntityProxyModel.java b/user/src/com/google/web/bindery/requestfactory/gwt/rebind/model/EntityProxyModel.java index 76756a46601..a94cbb7e027 100644 --- a/user/src/com/google/web/bindery/requestfactory/gwt/rebind/model/EntityProxyModel.java +++ b/user/src/com/google/web/bindery/requestfactory/gwt/rebind/model/EntityProxyModel.java @@ -97,6 +97,7 @@ public enum Type { private EntityProxyModel() { } + @Override public void accept(ModelVisitor visitor) { if (visitor.visit(this)) { for (RequestMethod method : requestMethods) { @@ -106,6 +107,7 @@ public void accept(ModelVisitor visitor) { visitor.endVisit(this); } + @Override public List getExtraTypes() { return Collections.unmodifiableList(extraTypes); } diff --git a/user/src/com/google/web/bindery/requestfactory/gwt/rebind/model/RequestFactoryModel.java b/user/src/com/google/web/bindery/requestfactory/gwt/rebind/model/RequestFactoryModel.java index 7e39193bd2e..2db6c28c32c 100644 --- a/user/src/com/google/web/bindery/requestfactory/gwt/rebind/model/RequestFactoryModel.java +++ b/user/src/com/google/web/bindery/requestfactory/gwt/rebind/model/RequestFactoryModel.java @@ -152,6 +152,7 @@ public RequestFactoryModel(TreeLogger logger, JClassType factoryType) } } + @Override public void accept(ModelVisitor visitor) { if (visitor.visit(this)) { for (EntityProxyModel model : getAllProxyModels()) { @@ -172,6 +173,7 @@ public Collection getAllProxyModels() { * These extra types will have already been added to the extra types for each * {@link ContextMethod} in the model. */ + @Override public List getExtraTypes() { return Collections.unmodifiableList(extraTypes); } diff --git a/user/src/com/google/web/bindery/requestfactory/gwt/rebind/model/RequestMethod.java b/user/src/com/google/web/bindery/requestfactory/gwt/rebind/model/RequestMethod.java index 6a1c596b0ca..2865b8ffcda 100644 --- a/user/src/com/google/web/bindery/requestfactory/gwt/rebind/model/RequestMethod.java +++ b/user/src/com/google/web/bindery/requestfactory/gwt/rebind/model/RequestMethod.java @@ -136,6 +136,7 @@ public enum CollectionType { private RequestMethod() { } + @Override public void accept(ModelVisitor visitor) { if (visitor.visit(this)) { // Empty diff --git a/user/src/com/google/web/bindery/requestfactory/gwt/ui/client/EntityProxyKeyProvider.java b/user/src/com/google/web/bindery/requestfactory/gwt/ui/client/EntityProxyKeyProvider.java index cc8e2714282..1e03db2b329 100644 --- a/user/src/com/google/web/bindery/requestfactory/gwt/ui/client/EntityProxyKeyProvider.java +++ b/user/src/com/google/web/bindery/requestfactory/gwt/ui/client/EntityProxyKeyProvider.java @@ -34,6 +34,7 @@ public class EntityProxyKeyProvider

implements ProvidesKe * * @param item an item of type P */ + @Override public Object getKey(P item) { return item == null ? null : item.stableId(); } diff --git a/user/src/com/google/web/bindery/requestfactory/server/DefaultExceptionHandler.java b/user/src/com/google/web/bindery/requestfactory/server/DefaultExceptionHandler.java index 489b75a17f4..589aea44197 100644 --- a/user/src/com/google/web/bindery/requestfactory/server/DefaultExceptionHandler.java +++ b/user/src/com/google/web/bindery/requestfactory/server/DefaultExceptionHandler.java @@ -22,6 +22,7 @@ * request. Suppresses stack traces and the exception class name. */ public class DefaultExceptionHandler implements ExceptionHandler { + @Override public ServerFailure createServerFailure(Throwable throwable) { return new ServerFailure( "Server Error: " + (throwable == null ? null : throwable.getMessage()), null, null, true); diff --git a/user/src/com/google/web/bindery/requestfactory/server/RequestFactoryJarExtractor.java b/user/src/com/google/web/bindery/requestfactory/server/RequestFactoryJarExtractor.java index 935c18b6e01..324d5c1be73 100644 --- a/user/src/com/google/web/bindery/requestfactory/server/RequestFactoryJarExtractor.java +++ b/user/src/com/google/web/bindery/requestfactory/server/RequestFactoryJarExtractor.java @@ -121,10 +121,12 @@ public ClassLoaderLoader(ClassLoader loader) { this.loader = loader; } + @Override public boolean exists(String resource) { return loader.getResource(resource) != null; } + @Override public InputStream getResourceAsStream(String resource) { return loader.getResourceAsStream(resource); } @@ -155,10 +157,12 @@ public JarEmitter(File outFile) throws IOException { out = new JarOutputStream(new FileOutputStream(outFile), m); } + @Override public void close() throws IOException { out.close(); } + @Override public void emit(String path, InputStream contents) throws IOException { ZipEntry entry = new ZipEntry(path); out.putNextEntry(entry); @@ -359,24 +363,29 @@ public AnnotationProcessor(String sourceType, AnnotationVisitor av) { this.av = av; } + @Override public void visit(String name, Object value) { value = processConstant(sourceType, value); av.visit(name, value); } + @Override public AnnotationVisitor visitAnnotation(String name, String desc) { desc = processDescriptor(sourceType, desc); return new AnnotationProcessor(desc, av.visitAnnotation(name, desc)); } + @Override public AnnotationVisitor visitArray(String name) { return new AnnotationProcessor(name, av.visitArray(name)); } + @Override public void visitEnd() { av.visitEnd(); } + @Override public void visitEnum(String name, String desc, String value) { desc = processDescriptor(sourceType, desc); av.visitEnum(name, desc, value); @@ -492,6 +501,7 @@ private EmitOneType(State state) { this.state = state; } + @Override public Void call() throws Exception { if (mode.isEmitClasses()) { String fileName = state.type.getInternalName(); @@ -527,14 +537,17 @@ public FieldProcessor(String sourceType, FieldVisitor fv) { this.fv = fv; } + @Override public AnnotationVisitor visitAnnotation(String desc, boolean visible) { return new AnnotationProcessor(sourceType, fv.visitAnnotation(desc, visible)); } + @Override public void visitAttribute(Attribute attr) { fv.visitAttribute(attr); } + @Override public void visitEnd() { fv.visitEnd(); } @@ -692,6 +705,7 @@ public ProcessOneType(Type type) { typeName = type.getClassName(); } + @Override public State call() { ClassWriter writer = new ClassWriter(0); ClassVisitor cv = writer; diff --git a/user/src/com/google/web/bindery/requestfactory/server/RequestState.java b/user/src/com/google/web/bindery/requestfactory/server/RequestState.java index c1d698a12cb..f2ec9744da7 100644 --- a/user/src/com/google/web/bindery/requestfactory/server/RequestState.java +++ b/user/src/com/google/web/bindery/requestfactory/server/RequestState.java @@ -116,6 +116,7 @@ public AutoBean getBeanForPayload(SimpleProxyId id, /** * EntityCodex support. */ + @Override public AutoBean getBeanForPayload(Splittable serializedProxyId) { IdMessage idMessage = AutoBeanCodex.decode(MessageFactoryHolder.FACTORY, IdMessage.class, serializedProxyId).as(); @@ -162,6 +163,7 @@ public Resolver getResolver() { *

* XXX: Merge this with AbstsractRequestContext's implementation */ + @Override public Splittable getSerializedProxyId(SimpleProxyId stableId) { AutoBean bean = MessageFactoryHolder.FACTORY.id(); IdMessage ref = bean.as(); @@ -196,6 +198,7 @@ public SimpleProxyId getStableId(Object domain) { /** * EntityCodex support. */ + @Override public boolean isEntityType(Class clazz) { return idFactory.isEntityType(clazz); } @@ -203,6 +206,7 @@ public boolean isEntityType(Class clazz) { /** * EntityCodex support. */ + @Override public boolean isValueType(Class clazz) { return idFactory.isValueType(clazz); } diff --git a/user/src/com/google/web/bindery/requestfactory/server/Resolver.java b/user/src/com/google/web/bindery/requestfactory/server/Resolver.java index fbefda141a6..363e0e847ba 100644 --- a/user/src/com/google/web/bindery/requestfactory/server/Resolver.java +++ b/user/src/com/google/web/bindery/requestfactory/server/Resolver.java @@ -71,10 +71,12 @@ public boolean equals(Object o) { return keyType.equals(other.keyType) && valueType.equals(other.valueType); } + @Override public Type[] getActualTypeArguments() { return new Type[] {keyType, valueType}; } + @Override public Type getOwnerType() { return null; } @@ -111,14 +113,17 @@ public boolean equals(Object o) { return rawType.equals(other.rawType) && elementType.equals(other.elementType); } + @Override public Type[] getActualTypeArguments() { return new Type[] {elementType}; } + @Override public Type getOwnerType() { return null; } + @Override public Type getRawType() { return rawType; } diff --git a/user/src/com/google/web/bindery/requestfactory/server/testing/InProcessRequestTransport.java b/user/src/com/google/web/bindery/requestfactory/server/testing/InProcessRequestTransport.java index 7b8c99e3543..ca5ac1e824b 100644 --- a/user/src/com/google/web/bindery/requestfactory/server/testing/InProcessRequestTransport.java +++ b/user/src/com/google/web/bindery/requestfactory/server/testing/InProcessRequestTransport.java @@ -46,6 +46,7 @@ public InProcessRequestTransport(SimpleRequestProcessor processor) { this.processor = processor; } + @Override public void send(String payload, TransportReceiver receiver) { String result; try { diff --git a/user/src/com/google/web/bindery/requestfactory/shared/DefaultProxyStore.java b/user/src/com/google/web/bindery/requestfactory/shared/DefaultProxyStore.java index f6ea45d32c5..0ec070a65de 100644 --- a/user/src/com/google/web/bindery/requestfactory/shared/DefaultProxyStore.java +++ b/user/src/com/google/web/bindery/requestfactory/shared/DefaultProxyStore.java @@ -95,14 +95,17 @@ public String encode() { return AutoBeanCodex.encode(messageBean).getPayload(); } + @Override public Splittable get(String key) { return map.get(key); } + @Override public int nextId() { return nextId++; } + @Override public void put(String key, Splittable value) { map.put(key, value); } diff --git a/user/src/com/google/web/bindery/requestfactory/shared/Receiver.java b/user/src/com/google/web/bindery/requestfactory/shared/Receiver.java index 372d1794889..6dae401834d 100644 --- a/user/src/com/google/web/bindery/requestfactory/shared/Receiver.java +++ b/user/src/com/google/web/bindery/requestfactory/shared/Receiver.java @@ -80,24 +80,29 @@ public void onConstraintViolation(Set> violations) { Set converted = new HashSet(); for (final ConstraintViolation v : violations) { converted.add(new Violation() { + @Override public BaseProxy getInvalidProxy() { return (BaseProxy) v.getRootBean(); } + @Override public String getMessage() { return v.getMessage(); } + @Override public BaseProxy getOriginalProxy() { AutoBean parent = AutoBeanUtils.getAutoBean(v.getRootBean()).getTag(Constants.PARENT_OBJECT); return parent == null ? null : parent.as(); } + @Override public String getPath() { return v.getPropertyPath().toString(); } + @Override public EntityProxyId getProxyId() { return v.getRootBean() instanceof EntityProxy ? ((EntityProxy) v.getRootBean()) .stableId() : null; diff --git a/user/src/com/google/web/bindery/requestfactory/shared/impl/AbstractRequest.java b/user/src/com/google/web/bindery/requestfactory/shared/impl/AbstractRequest.java index 71cd66f9949..1190acc4977 100644 --- a/user/src/com/google/web/bindery/requestfactory/shared/impl/AbstractRequest.java +++ b/user/src/com/google/web/bindery/requestfactory/shared/impl/AbstractRequest.java @@ -52,10 +52,12 @@ protected AbstractRequest(AbstractRequestContext requestContext) { this.requestContext = requestContext; } + @Override public void fire() { requestContext.fire(); } + @Override public void fire(Receiver receiver) { to(receiver); fire(); @@ -80,6 +82,7 @@ public RequestData getRequestData() { return requestData; } + @Override public RequestContext to(Receiver receiver) { this.receiver = receiver; return requestContext; @@ -89,6 +92,7 @@ public RequestContext to(Receiver receiver) { * This method comes from the {@link InstanceRequest} * interface. Instance methods place the instance in the first parameter slot. */ + @Override public Request using(P instanceObject) { getRequestData().getOrderedParameters()[0] = instanceObject; /* @@ -100,6 +104,7 @@ public Request using(P instanceObject) { return this; } + @Override public Request with(String... propertyRefs) { this.propertyRefs.addAll(Arrays.asList(propertyRefs)); return this; diff --git a/user/src/com/google/web/bindery/requestfactory/shared/impl/AbstractRequestContext.java b/user/src/com/google/web/bindery/requestfactory/shared/impl/AbstractRequestContext.java index 9cfebf084c5..b8fb7b8f09a 100644 --- a/user/src/com/google/web/bindery/requestfactory/shared/impl/AbstractRequestContext.java +++ b/user/src/com/google/web/bindery/requestfactory/shared/impl/AbstractRequestContext.java @@ -186,6 +186,7 @@ class JsonRpcPayloadDialect implements DialectImpl { /** * Called by generated subclasses to enqueue a method invocation. */ + @Override public void addInvocation(AbstractRequest request) { /* * TODO(bobv): Support for multiple invocations per request needs to be ironed out. Once this @@ -201,6 +202,7 @@ public void addInvocation(AbstractRequest request) { } } + @Override public String makePayload() { RequestData data = state.invocations.get(0).getRequestData(); @@ -226,6 +228,7 @@ public String makePayload() { return AutoBeanCodex.encode(bean).getPayload(); } + @Override public void processPayload(Receiver receiver, String payload) { Splittable raw = StringQuoter.split(payload); @@ -311,6 +314,7 @@ class StandardPayloadDialect implements DialectImpl { /** * Called by generated subclasses to enqueue a method invocation. */ + @Override public void addInvocation(AbstractRequest request) { state.invocations.add(request); for (Object arg : request.getRequestData().getOrderedParameters()) { @@ -325,6 +329,7 @@ public void addInvocation(AbstractRequest request) { *

  • Invocations accumulated as Request subtypes passed to {@link #addInvocation}. * */ + @Override public String makePayload() { // Get the factory from the runtime-specific holder. MessageFactory f = MessageFactoryHolder.FACTORY; @@ -345,6 +350,7 @@ public String makePayload() { return AutoBeanCodex.encode(bean).getPayload(); } + @Override public void processPayload(final Receiver receiver, String payload) { ResponseMessage response = AutoBeanCodex.decode(MessageFactoryHolder.FACTORY, ResponseMessage.class, payload).as(); @@ -434,28 +440,35 @@ public MyConstraintViolation(ViolationMessage msg) { rootBean = rootProxy.as(); } + @Override public ConstraintDescriptor getConstraintDescriptor() { return null; } + @Override public Object getInvalidValue() { return null; } + @Override public Object getLeafBean() { return leafBean; } + @Override public String getMessage() { return message; } + @Override public String getMessageTemplate() { return messageTemplate; } + @Override public Path getPropertyPath() { return new Path() { + @Override public Iterator iterator() { return Collections. emptyList().iterator(); } @@ -467,10 +480,12 @@ public String toString() { }; } + @Override public BaseProxy getRootBean() { return rootBean; } + @Override @SuppressWarnings("unchecked") public Class getRootBeanClass() { return (Class) rootBeanClass; @@ -500,6 +515,7 @@ protected AbstractRequestContext(AbstractRequestFactory factory, Dialect dialect setState(new State(factory, dialect.create(this), this)); } + @Override public T append(T other) { AbstractRequestContext child = (AbstractRequestContext) other; if (!state.isCompatible(child.state)) { @@ -516,6 +532,7 @@ public T append(T other) { /** * Create a new object, with an ephemeral id. */ + @Override public T create(Class clazz) { checkLocked(); @@ -524,6 +541,7 @@ public T create(Class clazz) { return takeOwnership(created); } + @Override public T edit(T object) { return editProxy(object); } @@ -575,6 +593,7 @@ protected RequestData makeRequestData() { * revisited when chaining is supported, depending on whether or not chained invocations can fail * independently. */ + @Override public void fire() { boolean needsReceiver = true; for (AbstractRequest request : state.invocations) { @@ -596,6 +615,7 @@ public void onSuccess(Void response) { } } + @Override public void fire(final Receiver receiver) { if (receiver == null) { throw new IllegalArgumentException(); @@ -606,6 +626,7 @@ public void fire(final Receiver receiver) { /** * EntityCodex support. */ + @Override public AutoBean getBeanForPayload(Splittable serializedProxyId) { IdMessage ref = AutoBeanCodex.decode(MessageFactoryHolder.FACTORY, IdMessage.class, serializedProxyId).as(); @@ -614,6 +635,7 @@ public AutoBean getBeanForPayload(Splittable serialized return getProxyForReturnPayloadGraph(id); } + @Override public AbstractRequestFactory getRequestFactory() { return state.requestFactory; } @@ -621,6 +643,7 @@ public AbstractRequestFactory getRequestFactory() { /** * EntityCodex support. */ + @Override public Splittable getSerializedProxyId(SimpleProxyId stableId) { AutoBean bean = MessageFactoryHolder.FACTORY.id(); IdMessage ref = bean.as(); @@ -636,6 +659,7 @@ public Splittable getSerializedProxyId(SimpleProxyId stableId) { return AutoBeanCodex.encode(bean); } + @Override public boolean isChanged() { /* * NB: Don't use the presence of ephemeral objects for this test. @@ -670,6 +694,7 @@ public boolean isChanged() { /** * EntityCodex support. */ + @Override public boolean isEntityType(Class clazz) { return state.requestFactory.isEntityType(clazz); } @@ -681,6 +706,7 @@ public boolean isLocked() { /** * EntityCodex support. */ + @Override public boolean isValueType(Class clazz) { return state.requestFactory.isValueType(clazz); } @@ -1152,10 +1178,12 @@ private void doFire(Receiver receiver) { String payload = state.dialect.makePayload(); state.requestFactory.getRequestTransport().send(payload, new TransportReceiver() { + @Override public void onTransportFailure(ServerFailure failure) { fail(finalReceiver, failure); } + @Override public void onTransportSuccess(String payload) { state.dialect.processPayload(finalReceiver, payload); } diff --git a/user/src/com/google/web/bindery/requestfactory/shared/impl/AbstractRequestFactory.java b/user/src/com/google/web/bindery/requestfactory/shared/impl/AbstractRequestFactory.java index 74db7ae9b22..9eaaf6ca7e1 100644 --- a/user/src/com/google/web/bindery/requestfactory/shared/impl/AbstractRequestFactory.java +++ b/user/src/com/google/web/bindery/requestfactory/shared/impl/AbstractRequestFactory.java @@ -46,6 +46,7 @@ protected boolean removeEldestEntry(Entry eldest) { }; private RequestTransport transport; + @Override public

    Request

    find(EntityProxyId

    proxyId) { if (((SimpleEntityProxyId

    ) proxyId).isEphemeral()) { throw new IllegalArgumentException("Cannot fetch unpersisted entity"); @@ -62,6 +63,7 @@ protected AutoBeanFactory getAutoBeanFactory() { return context.find(proxyId); } + @Override public EventBus getEventBus() { return eventBus; } @@ -72,14 +74,17 @@ public EventBus getEventBus() { */ public abstract String getFactoryTypeToken(); + @Override public String getHistoryToken(Class clazz) { return getTypeToken(clazz); } + @Override public String getHistoryToken(EntityProxyId proxy) { return getHistoryToken((SimpleProxyId) proxy); } + @Override public Class getProxyClass(String historyToken) { String typeToken = IdUtil.getTypeToken(historyToken); if (typeToken != null) { @@ -88,15 +93,18 @@ public Class getProxyClass(String historyToken) { return getTypeFromToken(historyToken); } + @Override @SuppressWarnings("unchecked") public EntityProxyId getProxyId(String historyToken) { return (EntityProxyId) getBaseProxyId(historyToken); } + @Override public RequestTransport getRequestTransport() { return transport; } + @Override public ProxySerializer getSerializer(ProxyStore store) { return new ProxySerializerImpl(this, store); } @@ -104,8 +112,10 @@ public ProxySerializer getSerializer(ProxyStore store) { /** * The choice of a default request transport is runtime-specific. */ + @Override public abstract void initialize(EventBus eventBus); + @Override public void initialize(EventBus eventBus, RequestTransport transport) { this.eventBus = eventBus; this.transport = transport; diff --git a/user/src/com/google/web/bindery/requestfactory/shared/impl/FindRequest.java b/user/src/com/google/web/bindery/requestfactory/shared/impl/FindRequest.java index e6c7a274d6b..225554e6f5a 100644 --- a/user/src/com/google/web/bindery/requestfactory/shared/impl/FindRequest.java +++ b/user/src/com/google/web/bindery/requestfactory/shared/impl/FindRequest.java @@ -31,5 +31,6 @@ public interface FindRequest extends RequestContext { /** * Use the implicit lookup in passing EntityProxy types to service methods. */ + @Override

    Request

    find(EntityProxyId

    proxyId); } \ No newline at end of file diff --git a/user/src/com/google/web/bindery/requestfactory/shared/impl/ProxySerializerImpl.java b/user/src/com/google/web/bindery/requestfactory/shared/impl/ProxySerializerImpl.java index b244642227f..f60839df37b 100644 --- a/user/src/com/google/web/bindery/requestfactory/shared/impl/ProxySerializerImpl.java +++ b/user/src/com/google/web/bindery/requestfactory/shared/impl/ProxySerializerImpl.java @@ -69,6 +69,7 @@ public ProxySerializerImpl(AbstractRequestFactory factory, ProxyStore store) { this.store = store; } + @Override public T deserialize(Class proxyType, String key) { // Fast exit to prevent getOperation from throwing an exception if (store.get(key) == null) { @@ -80,6 +81,7 @@ public T deserialize(Class proxyType, String key) { return doDeserialize(id); } + @Override public T deserialize(EntityProxyId id) { return doDeserialize((SimpleEntityProxyId) id); } @@ -92,6 +94,7 @@ public Splittable getSerializedProxyId(SimpleProxyId stableId) { return super.getSerializedProxyId(serializedId(stableId)); } + @Override public String serialize(BaseProxy rootObject) { if (rootObject == null) { return "null"; diff --git a/user/src/com/google/web/bindery/requestfactory/shared/impl/posers/DatePoser.java b/user/src/com/google/web/bindery/requestfactory/shared/impl/posers/DatePoser.java index 3d71032b577..d563925ee33 100644 --- a/user/src/com/google/web/bindery/requestfactory/shared/impl/posers/DatePoser.java +++ b/user/src/com/google/web/bindery/requestfactory/shared/impl/posers/DatePoser.java @@ -31,10 +31,12 @@ public DatePoser(Date copy) { setFrozen(true); } + @Override public Date getPosedValue() { return new Date(getTime()); } + @Override public boolean isFrozen() { return frozen; } @@ -45,6 +47,7 @@ public void setDate(int date) { super.setDate(date); } + @Override public void setFrozen(boolean frozen) { this.frozen = frozen; } diff --git a/user/src/com/google/web/bindery/requestfactory/vm/InProcessRequestContext.java b/user/src/com/google/web/bindery/requestfactory/vm/InProcessRequestContext.java index 9593cd1ce7f..00de34737b8 100644 --- a/user/src/com/google/web/bindery/requestfactory/vm/InProcessRequestContext.java +++ b/user/src/com/google/web/bindery/requestfactory/vm/InProcessRequestContext.java @@ -50,6 +50,7 @@ public InProcessRequestContext getContext() { return InProcessRequestContext.this; } + @Override public Object invoke(Object proxy, Method method, final Object[] args) throws Throwable { // Maybe delegate to superclass Class owner = method.getDeclaringClass(); @@ -165,6 +166,7 @@ protected RequestData makeRequestData() { Class requestType = method.getReturnType().asSubclass(Request.class); return Proxy.newProxyInstance(requestType.getClassLoader(), new Class[] {requestType}, new InvocationHandler() { + @Override public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { if (Object.class.equals(method.getDeclaringClass()) || Request.class.equals(method.getDeclaringClass())) { diff --git a/user/src/com/google/web/bindery/requestfactory/vm/InProcessRequestFactory.java b/user/src/com/google/web/bindery/requestfactory/vm/InProcessRequestFactory.java index 05b3f037df7..2abb8b24b28 100644 --- a/user/src/com/google/web/bindery/requestfactory/vm/InProcessRequestFactory.java +++ b/user/src/com/google/web/bindery/requestfactory/vm/InProcessRequestFactory.java @@ -50,6 +50,7 @@ interface Factory extends AutoBeanFactory { } class RequestFactoryHandler implements InvocationHandler { + @Override public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { if (Object.class.equals(method.getDeclaringClass()) || RequestFactory.class.equals(method.getDeclaringClass())) { diff --git a/user/super/com/google/gwt/emul/java/io/ByteArrayInputStream.java b/user/super/com/google/gwt/emul/java/io/ByteArrayInputStream.java index 6bdebc052f7..4bf2336a0c6 100644 --- a/user/super/com/google/gwt/emul/java/io/ByteArrayInputStream.java +++ b/user/super/com/google/gwt/emul/java/io/ByteArrayInputStream.java @@ -141,7 +141,8 @@ public int read() { return pos < count ? buf[pos++] & 0xFF : -1; } - @Override public int read(byte[] buffer, int byteOffset, int byteCount) { + @Override + public int read(byte[] buffer, int byteOffset, int byteCount) { IOUtils.checkOffsetAndCount(buffer, byteOffset, byteCount); // Are there any bytes available? diff --git a/user/super/com/google/gwt/emul/java/util/concurrent/ConcurrentHashMap.java b/user/super/com/google/gwt/emul/java/util/concurrent/ConcurrentHashMap.java index 8f4ff381064..a2e2e3436f5 100644 --- a/user/super/com/google/gwt/emul/java/util/concurrent/ConcurrentHashMap.java +++ b/user/super/com/google/gwt/emul/java/util/concurrent/ConcurrentHashMap.java @@ -93,42 +93,48 @@ public V replace(K key, V value) { } } - @Override public boolean containsKey(Object key) { + @Override + public boolean containsKey(Object key) { if (key == null) { throw new NullPointerException(); } return backingMap.containsKey(key); } - @Override public V get(Object key) { + @Override + public V get(Object key) { if (key == null) { throw new NullPointerException(); } return backingMap.get(key); } - @Override public V put(K key, V value) { + @Override + public V put(K key, V value) { if (key == null || value == null) { throw new NullPointerException(); } return backingMap.put(key, value); } - @Override public boolean containsValue(Object value) { + @Override + public boolean containsValue(Object value) { if (value == null) { throw new NullPointerException(); } return backingMap.containsValue(value); } - @Override public V remove(Object key) { + @Override + public V remove(Object key) { if (key == null) { throw new NullPointerException(); } return backingMap.remove(key); } - @Override public Set> entrySet() { + @Override + public Set> entrySet() { return backingMap.entrySet(); } diff --git a/user/super/com/google/gwt/emul/java/util/concurrent/atomic/AtomicInteger.java b/user/super/com/google/gwt/emul/java/util/concurrent/atomic/AtomicInteger.java index d167f087161..ad86316cb29 100644 --- a/user/super/com/google/gwt/emul/java/util/concurrent/atomic/AtomicInteger.java +++ b/user/super/com/google/gwt/emul/java/util/concurrent/atomic/AtomicInteger.java @@ -87,7 +87,8 @@ public final int addAndGet(int delta) { return value; } - @Override public String toString() { + @Override + public String toString() { return Integer.toString(value); } diff --git a/user/super/com/google/gwt/emul/java/util/concurrent/atomic/AtomicLong.java b/user/super/com/google/gwt/emul/java/util/concurrent/atomic/AtomicLong.java index 2e2a5f5ebb1..6161ae5b145 100644 --- a/user/super/com/google/gwt/emul/java/util/concurrent/atomic/AtomicLong.java +++ b/user/super/com/google/gwt/emul/java/util/concurrent/atomic/AtomicLong.java @@ -87,7 +87,8 @@ public final long addAndGet(long delta) { return value; } - @Override public String toString() { + @Override + public String toString() { return Long.toString(value); } diff --git a/user/super/com/google/gwt/emul/java/util/logging/Level.java b/user/super/com/google/gwt/emul/java/util/logging/Level.java index 4fb6dec6ff6..bf20d4e3f75 100644 --- a/user/super/com/google/gwt/emul/java/util/logging/Level.java +++ b/user/super/com/google/gwt/emul/java/util/logging/Level.java @@ -37,48 +37,71 @@ public class Level implements Serializable { public static Level WARNING = new LevelWarning(); private static class LevelAll extends Level { - @Override public String getName() { return "ALL"; } - @Override public int intValue() { return Integer.MIN_VALUE; } + @Override + public String getName() { + return "ALL"; + } + + @Override + public int intValue() { + return Integer.MIN_VALUE; + } } private static class LevelConfig extends Level { - @Override public String getName() { return "CONFIG"; } - @Override public int intValue() { return 700; } + @Override + public String getName() { return "CONFIG"; } + @Override + public int intValue() { return 700; } } private static class LevelFine extends Level { - @Override public String getName() { return "FINE"; } - @Override public int intValue() { return 500; } + @Override + public String getName() { return "FINE"; } + @Override + public int intValue() { return 500; } } private static class LevelFiner extends Level { - @Override public String getName() { return "FINER"; } - @Override public int intValue() { return 400; } + @Override + public String getName() { return "FINER"; } + @Override + public int intValue() { return 400; } } private static class LevelFinest extends Level { - @Override public String getName() { return "FINEST"; } - @Override public int intValue() { return 300; } + @Override + public String getName() { return "FINEST"; } + @Override + public int intValue() { return 300; } } private static class LevelInfo extends Level { - @Override public String getName() { return "INFO"; } - @Override public int intValue() { return 800; } + @Override + public String getName() { return "INFO"; } + @Override + public int intValue() { return 800; } } private static class LevelOff extends Level { - @Override public String getName() { return "OFF"; } - @Override public int intValue() { return Integer.MAX_VALUE; } + @Override + public String getName() { return "OFF"; } + @Override + public int intValue() { return Integer.MAX_VALUE; } } private static class LevelSevere extends Level { - @Override public String getName() { return "SEVERE"; } - @Override public int intValue() { return 1000; } + @Override + public String getName() { return "SEVERE"; } + @Override + public int intValue() { return 1000; } } private static class LevelWarning extends Level { - @Override public String getName() { return "WARNING"; } - @Override public int intValue() { return 900; } + @Override + public String getName() { return "WARNING"; } + @Override + public int intValue() { return 900; } } public static Level parse(String name) { diff --git a/user/test/com/google/gwt/core/client/JavaScriptExceptionTest.java b/user/test/com/google/gwt/core/client/JavaScriptExceptionTest.java index 744023198d0..d91525a08ca 100644 --- a/user/test/com/google/gwt/core/client/JavaScriptExceptionTest.java +++ b/user/test/com/google/gwt/core/client/JavaScriptExceptionTest.java @@ -71,7 +71,8 @@ public void testNull() { public void testObject() { Object o = new Object() { - @Override public String toString() { + @Override + public String toString() { return "myLameObject"; } }; diff --git a/user/test/com/google/gwt/core/client/testing/StubSchedulerTest.java b/user/test/com/google/gwt/core/client/testing/StubSchedulerTest.java index 286ea906577..ed1b300225f 100644 --- a/user/test/com/google/gwt/core/client/testing/StubSchedulerTest.java +++ b/user/test/com/google/gwt/core/client/testing/StubSchedulerTest.java @@ -44,7 +44,8 @@ protected void setUp() throws Exception { events = new ArrayList(); thrownExceptionMessages = new ArrayList(); GWT.setUncaughtExceptionHandler(new GWT.UncaughtExceptionHandler() { - @Override public void onUncaughtException(Throwable throwable) { + @Override + public void onUncaughtException(Throwable throwable) { if (throwable.getMessage().contains("Fake failure")) { thrownExceptionMessages.add(throwable.getMessage()); } else { diff --git a/user/test/com/google/gwt/dev/jjs/test/Java8Test.java b/user/test/com/google/gwt/dev/jjs/test/Java8Test.java index cf80c0f1116..4c9639a1ea9 100644 --- a/user/test/com/google/gwt/dev/jjs/test/Java8Test.java +++ b/user/test/com/google/gwt/dev/jjs/test/Java8Test.java @@ -222,7 +222,8 @@ public void testLambdaCaptureLocal() { public void testLambdaCaptureLocalWithInnerClass() { int x = 10; Lambda l = (a,b) -> new Lambda() { - @Override public Integer run(int a, int b) { + @Override + public Integer run(int a, int b) { int t = x; return t + a + b; } @@ -238,7 +239,8 @@ public void testLambdaCaptureLocalAndField() { public void testLambdaCaptureLocalAndFieldWithInnerClass() { int x = 10; Lambda l = (a,b) -> new Lambda() { - @Override public Integer run(int j, int k) { + @Override + public Integer run(int j, int k) { int t = x; int s = local; return t + s + a + b; diff --git a/user/test/com/google/gwt/dev/jjs/test/RunAsyncFailureTest.java b/user/test/com/google/gwt/dev/jjs/test/RunAsyncFailureTest.java index 68a3e327aad..d15ff22823b 100644 --- a/user/test/com/google/gwt/dev/jjs/test/RunAsyncFailureTest.java +++ b/user/test/com/google/gwt/dev/jjs/test/RunAsyncFailureTest.java @@ -238,7 +238,8 @@ public void testDownloadSuccessButInstallFailureStillRunsAsync() { // Give it little bit more time to loaded and try runAsync again Scheduler.get().scheduleFixedPeriod(new RepeatingCommand() { - @Override public boolean execute() { + @Override + public boolean execute() { if (staticWrittenByAsync == 0) { return true; } diff --git a/user/test/com/google/gwt/dev/jjs/test/RunAsyncTest.java b/user/test/com/google/gwt/dev/jjs/test/RunAsyncTest.java index 9f667cf6d4f..c7a0724ec20 100644 --- a/user/test/com/google/gwt/dev/jjs/test/RunAsyncTest.java +++ b/user/test/com/google/gwt/dev/jjs/test/RunAsyncTest.java @@ -133,7 +133,8 @@ public void testAsyncIsAlwaysAsync() { // Give it little bit more time to loaded and try runAsync again Scheduler.get().scheduleFixedPeriod(new RepeatingCommand() { - @Override public boolean execute() { + @Override + public boolean execute() { if (staticWrittenByAsync == 0) { return true; } diff --git a/user/test/com/google/gwt/editor/rebind/model/EditorModelTest.java b/user/test/com/google/gwt/editor/rebind/model/EditorModelTest.java index 64491888080..5dac8246dfb 100644 --- a/user/test/com/google/gwt/editor/rebind/model/EditorModelTest.java +++ b/user/test/com/google/gwt/editor/rebind/model/EditorModelTest.java @@ -96,6 +96,18 @@ public CharSequence getContent() { } } + private static class OverrideStrippedJavaResource extends RealJavaResource { + + public OverrideStrippedJavaResource(Class clazz) { + super(clazz); + } + + @Override + public CharSequence getContent() { + return super.getContent().toString().replace("@Override", ""); + } + } + private static TreeLogger createCompileLogger() { PrintWriterTreeLogger logger = new PrintWriterTreeLogger(new PrintWriter( System.err, true)); @@ -967,7 +979,7 @@ public CharSequence getContent() { new EmptyMockJavaResource(Iterable.class), new RealJavaResource(LeafValueEditor.class), new EmptyMockJavaResource(RequestFactory.class), - new RealJavaResource(RequestFactoryEditorDriver.class), + new OverrideStrippedJavaResource(RequestFactoryEditorDriver.class), new EmptyMockJavaResource(Request.class), new EmptyMockJavaResource(RequestContext.class), new RealJavaResource(SimpleEditor.class), diff --git a/user/test/com/google/gwt/emultest/java/io/InputStreamTest.java b/user/test/com/google/gwt/emultest/java/io/InputStreamTest.java index ba491d3891b..46fc44606de 100644 --- a/user/test/com/google/gwt/emultest/java/io/InputStreamTest.java +++ b/user/test/com/google/gwt/emultest/java/io/InputStreamTest.java @@ -30,7 +30,8 @@ protected InputStream createInputStream(final byte[] expectedBytes) { // note that GWT fails here when trying to use clone(). private final byte[] b = Arrays.copyOf(expectedBytes, expectedBytes.length); private int index = 0; - @Override public int read() { + @Override + public int read() { int c = -1; if (index < b.length) { c = b[index]; diff --git a/user/test/com/google/gwt/emultest/java/io/OutputStreamTest.java b/user/test/com/google/gwt/emultest/java/io/OutputStreamTest.java index 40992d05014..2d248b6c0cf 100644 --- a/user/test/com/google/gwt/emultest/java/io/OutputStreamTest.java +++ b/user/test/com/google/gwt/emultest/java/io/OutputStreamTest.java @@ -35,7 +35,8 @@ protected void gwtSetUp() throws Exception { @Override protected OutputStream createDefaultOutputStream() { return new OutputStream() { - @Override public void write(int b) { + @Override + public void write(int b) { outputBytes.add((byte) b); } }; diff --git a/user/test/com/google/gwt/emultest/java/lang/JsExceptionTest.java b/user/test/com/google/gwt/emultest/java/lang/JsExceptionTest.java index 503d3ecd153..4fcea9672fb 100644 --- a/user/test/com/google/gwt/emultest/java/lang/JsExceptionTest.java +++ b/user/test/com/google/gwt/emultest/java/lang/JsExceptionTest.java @@ -61,7 +61,8 @@ public void testCatchNativePropagatedFromFinally() { private static Thrower wrapWithFinally(final Thrower thrower) { return new Thrower() { - @Override public void throwException() throws Throwable { + @Override + public void throwException() throws Throwable { try { thrower.throwException(); } finally { diff --git a/user/test/com/google/gwt/emultest/java/lang/ThrowableTestBase.java b/user/test/com/google/gwt/emultest/java/lang/ThrowableTestBase.java index 4b2324299db..ba8db7cadf4 100644 --- a/user/test/com/google/gwt/emultest/java/lang/ThrowableTestBase.java +++ b/user/test/com/google/gwt/emultest/java/lang/ThrowableTestBase.java @@ -72,7 +72,8 @@ public void throwException() throws Throwable { protected static Thrower createNativeThrower(final Object e) { return new Thrower() { - @Override public void throwException() { + @Override + public void throwException() { throwNative(e); } };