Updated Branches: refs/heads/master dc6ecc78c -> 8e693353e
Improves support of Java 7. By Andrew Kaplanov. https://reviews.apache.org/r/16548 Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/8e693353 Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/8e693353 Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/8e693353 Branch: refs/heads/master Commit: 8e693353eaf0e9880dc6c5713c28429ca1011b44 Parents: dc6ecc7 Author: Yuri Zelikov <[email protected]> Authored: Tue Dec 31 23:51:38 2013 +0200 Committer: Yuri Zelikov <[email protected]> Committed: Tue Dec 31 23:51:38 2013 +0200 ---------------------------------------------------------------------- build-macros.xml | 25 +++++++++++++++++--- build.xml | 4 ++-- src/com/google/wave/api/BlipContentRefs.java | 1 + .../converter/v21/EventDataConverterV21.java | 2 +- src/com/google/wave/api/impl/Tuple.java | 2 ++ .../robots/agent/AbstractCliRobotAgent.java | 2 +- .../waveserver/SimpleSearchProviderImpl.java | 2 ++ .../client/editor/content/ContentDocument.java | 2 +- .../content/ValidSelectionStrategy.java | 2 +- .../client/render/CompositeRendererHelper.java | 1 + .../wavepanel/impl/toolbar/EditToolbar.java | 1 + .../client/widget/button/ButtonBuilder.java | 2 +- .../wave/federation/xmpp/XmppUtil.java | 2 +- .../model/document/indexed/DocumentEvent.java | 10 ++++---- .../model/document/indexed/OffsetPoint.java | 2 +- .../wave/model/document/util/DocumentImpl.java | 2 +- .../wave/model/document/util/FilterProduct.java | 2 ++ .../model/document/util/FocusedPointRange.java | 2 +- .../document/util/MutableDocumentProxy.java | 2 +- .../wave/model/document/util/PointRange.java | 2 +- .../model/testing/RandomNindoGenerator.java | 2 ++ .../wave/model/testing/Response.java | 1 + .../wave/model/util/CollectionUtils.java | 4 ++++ .../ObservablePluggableMutableDocument.java | 2 +- test/com/google/wave/api/ElementRobotTest.java | 2 +- .../server/waveserver/WaveletStateTestBase.java | 2 ++ .../client/editor/extract/RepairerGwtTest.java | 1 + .../gwt/GwtRenderingMutationHandlerGwtTest.java | 9 +++++++ .../client/OperationQueueTest.java | 1 + .../DocumentBasedMonotonicValueTest.java | 1 + .../model/conversation/AnchorManagerTest.java | 1 + .../DocumentBasedManifestBlipTest.java | 2 +- .../conversation/DocumentBasedManifestTest.java | 2 +- .../DocumentBasedManifestThreadTest.java | 2 +- .../document/indexed/AnnotationTreeTest.java | 2 +- .../wave/model/util/ConcurrentSetTest.java | 1 + .../wave/model/util/CopyOnWriteSetTest.java | 1 + .../wave/model/util/Utf16UtilTest.java | 2 +- 38 files changed, 80 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8e693353/build-macros.xml ---------------------------------------------------------------------- diff --git a/build-macros.xml b/build-macros.xml index 3f7fae9..e39f300 100644 --- a/build-macros.xml +++ b/build-macros.xml @@ -73,14 +73,33 @@ <!-- Deprecation warnings are generated for .class files for some compilers, e.g. org.hamcrest.Matcher -> org.hamcrest.BaseMatcher. --> <compilerarg value="-Xlint:-deprecation"/> - <!-- TODO(akaplanov): remove -Xlint:-static after protobuf issue will be fixed - issue --> - <compilerarg value="-Xlint:-static"/> + <compilerarg value="-Werror"/> <javac-elements/> </javac> </sequential> </macrodef> + <!-- TODO(akaplanov): remove this and use buildjava after protobuf issue + https://code.google.com/p/protobuf/issues/detail?id=323 will be fixed --> + <macrodef name="buildproto"> + <attribute name="srcpattern" description="Pattern id describing files to build" + default="default-src-pattern"/> + <!--attribute name="srcdir" description="Source root directory"/--> + <attribute name="destdir" description="Build root directory"/> + <element name="javac-elements" description="Extra elements to pass to javac" implicit="true"/> + <sequential> + <patternset id="default-src-pattern"> + <include name="**/*.java"/> + </patternset> + <javac destdir="@{destdir}" debug="true"> + <exclude name="org/waveprotocol/pst/**"/> + <patternset refid="@{srcpattern}"/> + <compilerarg value="-Xlint:none"/> + <javac-elements/> + </javac> + </sequential> + </macrodef> + <!-- Macro which packages class and source files into jars --> <macrodef name="distlib"> <attribute name="srcpattern" description="Pattern id describing files to package"/> http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8e693353/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 5d91d73..70db95c 100644 --- a/build.xml +++ b/build.xml @@ -97,12 +97,12 @@ <target name="compile-proto" depends="init, compile-proto-dep" unless="skip.compile-proto" description="Compiles protocol buffers"> - <buildjava destdir="${build.proto.dir}"> + <buildproto destdir="${build.proto.dir}"> <src path="${src.proto.dir}"/> <classpath> <path refid="libpath"/> </classpath> - </buildjava> + </buildproto> <touch file="${dep}/compile-proto"/> </target> http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8e693353/src/com/google/wave/api/BlipContentRefs.java ---------------------------------------------------------------------- diff --git a/src/com/google/wave/api/BlipContentRefs.java b/src/com/google/wave/api/BlipContentRefs.java index 23e8976..542c171 100644 --- a/src/com/google/wave/api/BlipContentRefs.java +++ b/src/com/google/wave/api/BlipContentRefs.java @@ -643,6 +643,7 @@ public class BlipContentRefs implements Iterable<Range> { * @param newProperties an array of new properties map. * @return an instance of this blip references, for chaining. */ + @SuppressWarnings("unchecked") public BlipContentRefs updateElement(Map<String, String>... newProperties) { return execute(ModifyHow.UPDATE_ELEMENT, null, (Object[]) newProperties); } http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8e693353/src/com/google/wave/api/data/converter/v21/EventDataConverterV21.java ---------------------------------------------------------------------- diff --git a/src/com/google/wave/api/data/converter/v21/EventDataConverterV21.java b/src/com/google/wave/api/data/converter/v21/EventDataConverterV21.java index baea2aa..694567a 100644 --- a/src/com/google/wave/api/data/converter/v21/EventDataConverterV21.java +++ b/src/com/google/wave/api/data/converter/v21/EventDataConverterV21.java @@ -87,7 +87,7 @@ public class EventDataConverterV21 implements EventDataConverter { // Add the tags. if (wavelet.getDocument(IdConstants.TAGS_DOC_ID) != null) { - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) TagsDocument tags = new TagsDocument(wavelet.getDocument(IdConstants.TAGS_DOC_ID)); tags.addListener(new TagsDocument.Listener() { @Override http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8e693353/src/com/google/wave/api/impl/Tuple.java ---------------------------------------------------------------------- diff --git a/src/com/google/wave/api/impl/Tuple.java b/src/com/google/wave/api/impl/Tuple.java index a565cdd..af1040f 100644 --- a/src/com/google/wave/api/impl/Tuple.java +++ b/src/com/google/wave/api/impl/Tuple.java @@ -41,6 +41,7 @@ public class Tuple<A> { * @param elements The elements of the tuple * @return A new tuple that contains {@code elements} */ + @SuppressWarnings("unchecked") public static <A> Tuple<A> of(A ... elements) { return new Tuple<A>(elements); } @@ -50,6 +51,7 @@ public class Tuple<A> { * * @param elements The elements of the tuple. */ + @SuppressWarnings("unchecked") public Tuple(A ... elements) { this.elements = elements; } http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8e693353/src/org/waveprotocol/box/server/robots/agent/AbstractCliRobotAgent.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/box/server/robots/agent/AbstractCliRobotAgent.java b/src/org/waveprotocol/box/server/robots/agent/AbstractCliRobotAgent.java index 9913089..dd878bc 100755 --- a/src/org/waveprotocol/box/server/robots/agent/AbstractCliRobotAgent.java +++ b/src/org/waveprotocol/box/server/robots/agent/AbstractCliRobotAgent.java @@ -200,7 +200,7 @@ public abstract class AbstractCliRobotAgent extends AbstractBaseRobotAgent { // Create Options. Options options = new Options(); // The robot has only "help" option. - @SuppressWarnings("static-access") + @SuppressWarnings({"static-access", "static"}) Option help = OptionBuilder.withDescription("Displays help for the command.").create("help"); options.addOption(help); return options; http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8e693353/src/org/waveprotocol/box/server/waveserver/SimpleSearchProviderImpl.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/box/server/waveserver/SimpleSearchProviderImpl.java b/src/org/waveprotocol/box/server/waveserver/SimpleSearchProviderImpl.java index ee7093f..9469743 100644 --- a/src/org/waveprotocol/box/server/waveserver/SimpleSearchProviderImpl.java +++ b/src/org/waveprotocol/box/server/waveserver/SimpleSearchProviderImpl.java @@ -73,6 +73,7 @@ public class SimpleSearchProviderImpl implements SearchProvider { sharedDomainParticipantId = ParticipantIdUtil.makeUnsafeSharedDomainParticipantId(waveDomain); } + @SuppressWarnings("rawtypes") @Override public SearchResult search(final ParticipantId user, String query, int startAt, int numResults) { @@ -125,6 +126,7 @@ public class SimpleSearchProviderImpl implements SearchProvider { return digester.generateSearchResult(user, query, searchResult); } + @SuppressWarnings("rawtypes") private Multimap<WaveId, WaveletId> createWavesViewToFilter(final ParticipantId user, final boolean isAllQuery) { Multimap<WaveId, WaveletId> currentUserWavesView; http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8e693353/src/org/waveprotocol/wave/client/editor/content/ContentDocument.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/wave/client/editor/content/ContentDocument.java b/src/org/waveprotocol/wave/client/editor/content/ContentDocument.java index 15a37a6..3bf4cde 100644 --- a/src/org/waveprotocol/wave/client/editor/content/ContentDocument.java +++ b/src/org/waveprotocol/wave/client/editor/content/ContentDocument.java @@ -321,7 +321,7 @@ public class ContentDocument { } }; - @SuppressWarnings({"unchecked", "fallthrough"}) // NodeMutationHandler is generic + @SuppressWarnings({"unchecked", "fallthrough", "rawtypes"}) // NodeMutationHandler is generic private void setupBehaviour(ContentElement element, Level oldLevel) { AgentAdapter e = (AgentAdapter) element; http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8e693353/src/org/waveprotocol/wave/client/editor/selection/content/ValidSelectionStrategy.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/wave/client/editor/selection/content/ValidSelectionStrategy.java b/src/org/waveprotocol/wave/client/editor/selection/content/ValidSelectionStrategy.java index 3e72517..7926013 100644 --- a/src/org/waveprotocol/wave/client/editor/selection/content/ValidSelectionStrategy.java +++ b/src/org/waveprotocol/wave/client/editor/selection/content/ValidSelectionStrategy.java @@ -89,7 +89,7 @@ public class ValidSelectionStrategy implements SkipStrategy<ContentNode> { * @param renderedFilter Rendered view of the document * @return Selection filtered view of the document. */ - @SuppressWarnings("unchecked") // TODO(patcoleman) Deal with varargs + generics + @SuppressWarnings({"unchecked", "rawtypes"}) // TODO(patcoleman) Deal with varargs + generics public static FilteredView<ContentNode, ContentElement, ContentTextNode> buildSelectionFilter( FilteredView<ContentNode, ContentElement, ContentTextNode> persistentFilter, FilteredView<ContentNode, ContentElement, ContentTextNode> renderedFilter) { http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8e693353/src/org/waveprotocol/wave/client/render/CompositeRendererHelper.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/wave/client/render/CompositeRendererHelper.java b/src/org/waveprotocol/wave/client/render/CompositeRendererHelper.java index a39e9f1..c60d509 100644 --- a/src/org/waveprotocol/wave/client/render/CompositeRendererHelper.java +++ b/src/org/waveprotocol/wave/client/render/CompositeRendererHelper.java @@ -36,6 +36,7 @@ public class CompositeRendererHelper implements ResultProducingRenderHelper<Safe private final ResultProducingRenderHelper<? extends UiBuilder>[] helpers; + @SuppressWarnings("unchecked") public CompositeRendererHelper(ResultProducingRenderHelper<? extends UiBuilder> ... helpers){ this.helpers = helpers; } http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8e693353/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/EditToolbar.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/EditToolbar.java b/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/EditToolbar.java index 4ef7d69..7abe368 100644 --- a/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/EditToolbar.java +++ b/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/EditToolbar.java @@ -607,6 +607,7 @@ public class EditToolbar { StyleAnnotationHandler.key(styleName), value)); } + @SuppressWarnings("unchecked") private static <E> E[] asArray(E... elements) { return elements; } http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8e693353/src/org/waveprotocol/wave/client/widget/button/ButtonBuilder.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/wave/client/widget/button/ButtonBuilder.java b/src/org/waveprotocol/wave/client/widget/button/ButtonBuilder.java index ecf82a3..5919402 100644 --- a/src/org/waveprotocol/wave/client/widget/button/ButtonBuilder.java +++ b/src/org/waveprotocol/wave/client/widget/button/ButtonBuilder.java @@ -37,7 +37,7 @@ public class ButtonBuilder { /** * Properties supported by all types of buttons. */ - @SuppressWarnings({"unchecked"}) // we're doing some clever tricks in here + @SuppressWarnings({"unchecked", "rawtypes"}) // we're doing some clever tricks in here public abstract static class Base<T extends Base> { protected String text; protected String tooltip; http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8e693353/src/org/waveprotocol/wave/federation/xmpp/XmppUtil.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/wave/federation/xmpp/XmppUtil.java b/src/org/waveprotocol/wave/federation/xmpp/XmppUtil.java index d3a91f5..7ca2971 100644 --- a/src/org/waveprotocol/wave/federation/xmpp/XmppUtil.java +++ b/src/org/waveprotocol/wave/federation/xmpp/XmppUtil.java @@ -63,7 +63,7 @@ public class XmppUtil { * Helper method to translate from the XMPP package (1.4 without generics) to * type-safe element lists. */ - @SuppressWarnings({"cast", "unchecked"}) + @SuppressWarnings({"cast", "unchecked", "rawtypes"}) public static List<Element> toSafeElementList(List elements) { return (List<Element>) elements; } http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8e693353/src/org/waveprotocol/wave/model/document/indexed/DocumentEvent.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/wave/model/document/indexed/DocumentEvent.java b/src/org/waveprotocol/wave/model/document/indexed/DocumentEvent.java index 9b07412..8f12777 100644 --- a/src/org/waveprotocol/wave/model/document/indexed/DocumentEvent.java +++ b/src/org/waveprotocol/wave/model/document/indexed/DocumentEvent.java @@ -185,7 +185,7 @@ public abstract class DocumentEvent<N, E extends N, T extends N> { return result; } - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) @Override public boolean equals(Object obj) { if (this == obj) return true; @@ -239,7 +239,7 @@ public abstract class DocumentEvent<N, E extends N, T extends N> { return result; } - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) @Override public boolean equals(Object obj) { if (this == obj) return true; @@ -285,7 +285,7 @@ public abstract class DocumentEvent<N, E extends N, T extends N> { return result; } - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) @Override public boolean equals(Object obj) { if (this == obj) return true; @@ -333,7 +333,7 @@ public abstract class DocumentEvent<N, E extends N, T extends N> { result = prime * result + location; return result; } - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) @Override public boolean equals(Object obj) { if (this == obj) return true; @@ -537,7 +537,7 @@ public abstract class DocumentEvent<N, E extends N, T extends N> { return result; } - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) @Override public boolean equals(Object obj) { if (this == obj) return true; http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8e693353/src/org/waveprotocol/wave/model/document/indexed/OffsetPoint.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/wave/model/document/indexed/OffsetPoint.java b/src/org/waveprotocol/wave/model/document/indexed/OffsetPoint.java index c9a9c6f..662c518 100644 --- a/src/org/waveprotocol/wave/model/document/indexed/OffsetPoint.java +++ b/src/org/waveprotocol/wave/model/document/indexed/OffsetPoint.java @@ -106,7 +106,7 @@ public final class OffsetPoint<T> { } /** {@inheritDoc} */ - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) @Override public boolean equals(Object obj) { if (this == obj) http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8e693353/src/org/waveprotocol/wave/model/document/util/DocumentImpl.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/wave/model/document/util/DocumentImpl.java b/src/org/waveprotocol/wave/model/document/util/DocumentImpl.java index 3f42aac..af1ca27 100644 --- a/src/org/waveprotocol/wave/model/document/util/DocumentImpl.java +++ b/src/org/waveprotocol/wave/model/document/util/DocumentImpl.java @@ -39,7 +39,7 @@ public class DocumentImpl extends MutableDocumentImpl<Doc.N, Doc.E, Doc.T> imple */ // Unfortunately, java does not permit <N extends N, E extends N & Doc.E, ...> // which would be required to make this typesafe. - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) public DocumentImpl(OperationSequencer<Nindo> sequencer, ReadableWDocument document) { super(sequencer, document); http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8e693353/src/org/waveprotocol/wave/model/document/util/FilterProduct.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/wave/model/document/util/FilterProduct.java b/src/org/waveprotocol/wave/model/document/util/FilterProduct.java index 6bb7f37..a282f52 100644 --- a/src/org/waveprotocol/wave/model/document/util/FilterProduct.java +++ b/src/org/waveprotocol/wave/model/document/util/FilterProduct.java @@ -52,6 +52,7 @@ public class FilterProduct<N, E extends N, T extends N> extends FilteredView<N, * Constructs a product of multiple filters, given a resolution strategy. * See {@link #argumentCheck} for details on preconditions for parameters. */ + @SuppressWarnings("unchecked") public FilterProduct(SkipStrategy<N> resolver, FilteredView<N, E, T>... filters) { super(argumentCheck(filters)); this.filters = filters; @@ -79,6 +80,7 @@ public class FilterProduct<N, E extends N, T extends N> extends FilteredView<N, * @param filters The sub-filters for this product. * @return The readable inner document that all the filters wrap around. */ + @SuppressWarnings("unchecked") public static <N, E extends N, T extends N> ReadableDocument<N, E, T> argumentCheck(FilteredView<N, E, T>... filters) { assert filters.length > 0; http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8e693353/src/org/waveprotocol/wave/model/document/util/FocusedPointRange.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/wave/model/document/util/FocusedPointRange.java b/src/org/waveprotocol/wave/model/document/util/FocusedPointRange.java index 11bb5ae..9ed4e6a 100644 --- a/src/org/waveprotocol/wave/model/document/util/FocusedPointRange.java +++ b/src/org/waveprotocol/wave/model/document/util/FocusedPointRange.java @@ -87,7 +87,7 @@ public class FocusedPointRange<N> { return result; } - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) @Override public final boolean equals(Object obj) { if (this == obj) return true; http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8e693353/src/org/waveprotocol/wave/model/document/util/MutableDocumentProxy.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/wave/model/document/util/MutableDocumentProxy.java b/src/org/waveprotocol/wave/model/document/util/MutableDocumentProxy.java index 2e0b3dc..2903436 100644 --- a/src/org/waveprotocol/wave/model/document/util/MutableDocumentProxy.java +++ b/src/org/waveprotocol/wave/model/document/util/MutableDocumentProxy.java @@ -54,7 +54,7 @@ public class MutableDocumentProxy<N, E extends N, T extends N> super(delegate, noDelegateErrorMessage); } - @SuppressWarnings("unchecked") // Adapter + @SuppressWarnings({"unchecked", "rawtypes"}) // Adapter public DocumentProxy(MutableDocument delegate, String noDelegateErrorMessage) { super(delegate, noDelegateErrorMessage); Preconditions.checkArgument(delegate.getDocumentElement() instanceof Doc.E, http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8e693353/src/org/waveprotocol/wave/model/document/util/PointRange.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/wave/model/document/util/PointRange.java b/src/org/waveprotocol/wave/model/document/util/PointRange.java index a2ffc54..ab72ba2 100644 --- a/src/org/waveprotocol/wave/model/document/util/PointRange.java +++ b/src/org/waveprotocol/wave/model/document/util/PointRange.java @@ -85,7 +85,7 @@ public class PointRange<N> { } /** {@inheritDoc} */ - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) @Override public final boolean equals(Object obj) { if (this == obj) { http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8e693353/src/org/waveprotocol/wave/model/testing/RandomNindoGenerator.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/wave/model/testing/RandomNindoGenerator.java b/src/org/waveprotocol/wave/model/testing/RandomNindoGenerator.java index 8c01261..65d97b7 100644 --- a/src/org/waveprotocol/wave/model/testing/RandomNindoGenerator.java +++ b/src/org/waveprotocol/wave/model/testing/RandomNindoGenerator.java @@ -651,6 +651,7 @@ public final class RandomNindoGenerator { final RandomProvider r; final Parameters p; final DocumentSchema schemaConstraints; + @SuppressWarnings("rawtypes") NindoAutomaton a; NindoCursor targetDoc; final IndexedDocument<Node, Element, Text> doc; @@ -677,6 +678,7 @@ public final class RandomNindoGenerator { new EndAnnotationGenerator() ); + @SuppressWarnings("rawtypes") Nindo generate() { while (true) { this.a = new NindoAutomaton(schemaConstraints, doc); http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8e693353/src/org/waveprotocol/wave/model/testing/Response.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/wave/model/testing/Response.java b/src/org/waveprotocol/wave/model/testing/Response.java index 40d3df3..5efb790 100644 --- a/src/org/waveprotocol/wave/model/testing/Response.java +++ b/src/org/waveprotocol/wave/model/testing/Response.java @@ -79,6 +79,7 @@ public final class Response { /** * Creates a response which returns a list of values. */ + @SuppressWarnings("unchecked") public static <T> ResponseAnswer<List<T>> ofList(T... responses) { return new ResponseAnswer<List<T>>(Arrays.asList(responses)); } http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8e693353/src/org/waveprotocol/wave/model/util/CollectionUtils.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/wave/model/util/CollectionUtils.java b/src/org/waveprotocol/wave/model/util/CollectionUtils.java index a0347a4..f35595e 100644 --- a/src/org/waveprotocol/wave/model/util/CollectionUtils.java +++ b/src/org/waveprotocol/wave/model/util/CollectionUtils.java @@ -941,6 +941,7 @@ public class CollectionUtils { * @param elements the elements that the set should contain * @return a newly created {@code HashSet} containing those elements. */ + @SuppressWarnings("unchecked") public static <E> HashSet<E> newHashSet(E... elements) { int capacity = Math.max((int) (elements.length / .75f) + 1, 16); HashSet<E> set = new HashSet<E>(capacity); @@ -984,6 +985,7 @@ public class CollectionUtils { * @param elements the elements that the set should contain * @return a newly created set containing those elements. */ + @SuppressWarnings("unchecked") public static <E> Set<E> immutableSet(E... elements) { // TODO(anorth): optimise to a truly immutable set. return Collections.unmodifiableSet(newHashSet(elements)); @@ -1030,6 +1032,7 @@ public class CollectionUtils { } /** Creates a new linked list containing the provided elements. */ + @SuppressWarnings("unchecked") public static <T> LinkedList<T> newLinkedList(T... elements) { return newLinkedList(Arrays.asList(elements)); } @@ -1049,6 +1052,7 @@ public class CollectionUtils { } /** Creates a new array list containing the provided elements. */ + @SuppressWarnings("unchecked") public static <T> ArrayList<T> newArrayList(T... elements) { return newArrayList(Arrays.asList(elements)); } http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8e693353/src/org/waveprotocol/wave/model/wave/data/impl/ObservablePluggableMutableDocument.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/wave/model/wave/data/impl/ObservablePluggableMutableDocument.java b/src/org/waveprotocol/wave/model/wave/data/impl/ObservablePluggableMutableDocument.java index 66a21e5..8908320 100644 --- a/src/org/waveprotocol/wave/model/wave/data/impl/ObservablePluggableMutableDocument.java +++ b/src/org/waveprotocol/wave/model/wave/data/impl/ObservablePluggableMutableDocument.java @@ -75,7 +75,7 @@ public class ObservablePluggableMutableDocument extends PluggableMutableDocument // time with wild cards (which then propagate everywhere, causing nastiness). // // Avoiding use of call-site wild cards with an unchecked conversion instead. - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) @Override public void onDocumentEvents(EventBundle event) { if (isPaused) { http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8e693353/test/com/google/wave/api/ElementRobotTest.java ---------------------------------------------------------------------- diff --git a/test/com/google/wave/api/ElementRobotTest.java b/test/com/google/wave/api/ElementRobotTest.java index aa98959..30c6385 100644 --- a/test/com/google/wave/api/ElementRobotTest.java +++ b/test/com/google/wave/api/ElementRobotTest.java @@ -131,7 +131,7 @@ public class ElementRobotTest extends TestCase { assertEquals("5", element.getProperty("width")); } - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) private static Element createElementWithProperty(ElementType type, String key, Object value) { Map properties = new HashMap(); properties.put(key, value); http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8e693353/test/org/waveprotocol/box/server/waveserver/WaveletStateTestBase.java ---------------------------------------------------------------------- diff --git a/test/org/waveprotocol/box/server/waveserver/WaveletStateTestBase.java b/test/org/waveprotocol/box/server/waveserver/WaveletStateTestBase.java index db3e86e..d5c27ef 100644 --- a/test/org/waveprotocol/box/server/waveserver/WaveletStateTestBase.java +++ b/test/org/waveprotocol/box/server/waveserver/WaveletStateTestBase.java @@ -197,6 +197,7 @@ public abstract class WaveletStateTestBase extends TestCase { appliedDeltasReceiver, IllegalArgumentException.class); } + @SuppressWarnings("rawtypes") private void checkGetTransformedDeltasThrowsException(HashedVersion startVersion, HashedVersion endVersion, Receiver<TransformedWaveletDelta> receiver, Class exceptionClass) { try { @@ -207,6 +208,7 @@ public abstract class WaveletStateTestBase extends TestCase { } } + @SuppressWarnings("rawtypes") private void checkGetAppliedDeltasThrowsException(HashedVersion startVersion, HashedVersion endVersion, Receiver<ByteStringMessage<Proto.ProtocolAppliedWaveletDelta>> receiver, Class exceptionClass) { try { http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8e693353/test/org/waveprotocol/wave/client/editor/extract/RepairerGwtTest.java ---------------------------------------------------------------------- diff --git a/test/org/waveprotocol/wave/client/editor/extract/RepairerGwtTest.java b/test/org/waveprotocol/wave/client/editor/extract/RepairerGwtTest.java index 832b575..751c108 100644 --- a/test/org/waveprotocol/wave/client/editor/extract/RepairerGwtTest.java +++ b/test/org/waveprotocol/wave/client/editor/extract/RepairerGwtTest.java @@ -232,6 +232,7 @@ public class RepairerGwtTest extends GWTTestCase { range = 0; } + @SuppressWarnings("static") public void fail() { RepairerGwtTest.this.fail("Ended up with " + full + ", " + range); } http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8e693353/test/org/waveprotocol/wave/client/editor/gwt/GwtRenderingMutationHandlerGwtTest.java ---------------------------------------------------------------------- diff --git a/test/org/waveprotocol/wave/client/editor/gwt/GwtRenderingMutationHandlerGwtTest.java b/test/org/waveprotocol/wave/client/editor/gwt/GwtRenderingMutationHandlerGwtTest.java index 3916184..e165099 100644 --- a/test/org/waveprotocol/wave/client/editor/gwt/GwtRenderingMutationHandlerGwtTest.java +++ b/test/org/waveprotocol/wave/client/editor/gwt/GwtRenderingMutationHandlerGwtTest.java @@ -63,6 +63,7 @@ public class GwtRenderingMutationHandlerGwtTest extends GWTTestCase { } } + @SuppressWarnings("static") public void testRegistersContainerNodelet() { complexHandler(Flow.INLINE); @@ -76,6 +77,7 @@ public class GwtRenderingMutationHandlerGwtTest extends GWTTestCase { } + @SuppressWarnings("static") public void testReceivesNewWidgetSafely() { simpleHandler(Flow.INLINE); @@ -104,6 +106,7 @@ public class GwtRenderingMutationHandlerGwtTest extends GWTTestCase { } + @SuppressWarnings("static") public void testReceivesNewWidgetWithContainerNodeletSafely() { complexHandler(Flow.INLINE); @@ -130,6 +133,7 @@ public class GwtRenderingMutationHandlerGwtTest extends GWTTestCase { } + @SuppressWarnings("static") private void simpleHandler(final Flow flow) { handler = new GwtRenderingMutationHandler(flow) { @Override @@ -141,6 +145,7 @@ public class GwtRenderingMutationHandlerGwtTest extends GWTTestCase { initDoc(); } + @SuppressWarnings("static") private void deferredHandler(final Flow flow) { handler = new GwtRenderingMutationHandler(flow) { @Override @@ -152,6 +157,7 @@ public class GwtRenderingMutationHandlerGwtTest extends GWTTestCase { initDoc(); } + @SuppressWarnings("static") private void complexHandler(final Flow flow) { handler = new GwtRenderingMutationHandler(flow) { @Override @@ -168,6 +174,7 @@ public class GwtRenderingMutationHandlerGwtTest extends GWTTestCase { initDoc(); } + @SuppressWarnings("static") private FlowPanel createComplexWidget() { FlowPanel panel = new FlowPanel(); FlowPanel child = new FlowPanel(); @@ -175,6 +182,7 @@ public class GwtRenderingMutationHandlerGwtTest extends GWTTestCase { return panel; } + @SuppressWarnings("static") private void initDoc() { Editor.ROOT_HANDLER_REGISTRY.registerRenderingMutationHandler("ab", handler); Editor.ROOT_HANDLER_REGISTRY.registerRenderingMutationHandler("cd", handler); @@ -184,6 +192,7 @@ public class GwtRenderingMutationHandlerGwtTest extends GWTTestCase { panel = (EditorImpl) doc.getContext().editing().editorContext(); } + @SuppressWarnings("static") private AgentAdapter elem(String tagName) { return (AgentAdapter) doc.getAnnotatableContent().transparentCreate(tagName, Collections.<String, String>emptyMap(), http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8e693353/test/org/waveprotocol/wave/concurrencycontrol/client/OperationQueueTest.java ---------------------------------------------------------------------- diff --git a/test/org/waveprotocol/wave/concurrencycontrol/client/OperationQueueTest.java b/test/org/waveprotocol/wave/concurrencycontrol/client/OperationQueueTest.java index 0ba3560..2a2b8ca 100644 --- a/test/org/waveprotocol/wave/concurrencycontrol/client/OperationQueueTest.java +++ b/test/org/waveprotocol/wave/concurrencycontrol/client/OperationQueueTest.java @@ -475,6 +475,7 @@ public class OperationQueueTest extends TestCase { assertTrue("Expected queue size <= " + maxSize + ", was " + estimate, estimate <= maxSize); } + @SuppressWarnings("unchecked") private static <T> List<T> list(T... es) { return Collections.unmodifiableList(CollectionUtils.newArrayList(es)); } http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8e693353/test/org/waveprotocol/wave/model/adt/docbased/DocumentBasedMonotonicValueTest.java ---------------------------------------------------------------------- diff --git a/test/org/waveprotocol/wave/model/adt/docbased/DocumentBasedMonotonicValueTest.java b/test/org/waveprotocol/wave/model/adt/docbased/DocumentBasedMonotonicValueTest.java index 6361a45..304b97d 100644 --- a/test/org/waveprotocol/wave/model/adt/docbased/DocumentBasedMonotonicValueTest.java +++ b/test/org/waveprotocol/wave/model/adt/docbased/DocumentBasedMonotonicValueTest.java @@ -80,6 +80,7 @@ public class DocumentBasedMonotonicValueTest extends TestCase { return expectedValues.get(expectedValues.size() - 1); } + @SuppressWarnings("unchecked") void expect(C ... expectedValues) { this.expectedValues.addAll(Arrays.asList(expectedValues)); } http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8e693353/test/org/waveprotocol/wave/model/conversation/AnchorManagerTest.java ---------------------------------------------------------------------- diff --git a/test/org/waveprotocol/wave/model/conversation/AnchorManagerTest.java b/test/org/waveprotocol/wave/model/conversation/AnchorManagerTest.java index b3205ca..f75a174 100644 --- a/test/org/waveprotocol/wave/model/conversation/AnchorManagerTest.java +++ b/test/org/waveprotocol/wave/model/conversation/AnchorManagerTest.java @@ -65,6 +65,7 @@ public final class AnchorManagerTest extends TestCase { * @param xs elements for the collection * @return a collection describing {@code xs}. */ + @SuppressWarnings("unchecked") private static <T> Collection<T> collection(T... xs) { return CollectionUtils.newHashSet(xs); } http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8e693353/test/org/waveprotocol/wave/model/conversation/DocumentBasedManifestBlipTest.java ---------------------------------------------------------------------- diff --git a/test/org/waveprotocol/wave/model/conversation/DocumentBasedManifestBlipTest.java b/test/org/waveprotocol/wave/model/conversation/DocumentBasedManifestBlipTest.java index f4b16f7..becceaa 100644 --- a/test/org/waveprotocol/wave/model/conversation/DocumentBasedManifestBlipTest.java +++ b/test/org/waveprotocol/wave/model/conversation/DocumentBasedManifestBlipTest.java @@ -45,7 +45,7 @@ public class DocumentBasedManifestBlipTest extends TestCase { /** * Test the delegation is wired up properly */ - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) public void testWiringUp() { // Create mock list and value. final ObservableElementList<ObservableManifestThread, http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8e693353/test/org/waveprotocol/wave/model/conversation/DocumentBasedManifestTest.java ---------------------------------------------------------------------- diff --git a/test/org/waveprotocol/wave/model/conversation/DocumentBasedManifestTest.java b/test/org/waveprotocol/wave/model/conversation/DocumentBasedManifestTest.java index 5453dc6..dccb294 100644 --- a/test/org/waveprotocol/wave/model/conversation/DocumentBasedManifestTest.java +++ b/test/org/waveprotocol/wave/model/conversation/DocumentBasedManifestTest.java @@ -43,7 +43,7 @@ public class DocumentBasedManifestTest extends TestCase { /** * Tests that the manifest appropriately delegates to its composite values. */ - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) public void testWiringUp() { // Manifest's delegates final ObservableManifestThread rootThread = mock(ObservableManifestThread.class); http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8e693353/test/org/waveprotocol/wave/model/conversation/DocumentBasedManifestThreadTest.java ---------------------------------------------------------------------- diff --git a/test/org/waveprotocol/wave/model/conversation/DocumentBasedManifestThreadTest.java b/test/org/waveprotocol/wave/model/conversation/DocumentBasedManifestThreadTest.java index 9cabb94..e30853d 100644 --- a/test/org/waveprotocol/wave/model/conversation/DocumentBasedManifestThreadTest.java +++ b/test/org/waveprotocol/wave/model/conversation/DocumentBasedManifestThreadTest.java @@ -46,7 +46,7 @@ public class DocumentBasedManifestThreadTest extends TestCase { /** * Test the delegation is wired up properly */ - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) public void testWiringUp() { // Create mock list and value. ObservableElementList<ObservableManifestBlip, String> blips = mock( http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8e693353/test/org/waveprotocol/wave/model/document/indexed/AnnotationTreeTest.java ---------------------------------------------------------------------- diff --git a/test/org/waveprotocol/wave/model/document/indexed/AnnotationTreeTest.java b/test/org/waveprotocol/wave/model/document/indexed/AnnotationTreeTest.java index d0cfe2d..cc9431c 100644 --- a/test/org/waveprotocol/wave/model/document/indexed/AnnotationTreeTest.java +++ b/test/org/waveprotocol/wave/model/document/indexed/AnnotationTreeTest.java @@ -243,7 +243,7 @@ public class AnnotationTreeTest extends AnnotationSetTestBase { } - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) public void testModificationFromListener() throws OperationException { final int callCounter[] = new int[] { 0 }; // Chicken-and-egg problem: listener needs a reference to m in a final local http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8e693353/test/org/waveprotocol/wave/model/util/ConcurrentSetTest.java ---------------------------------------------------------------------- diff --git a/test/org/waveprotocol/wave/model/util/ConcurrentSetTest.java b/test/org/waveprotocol/wave/model/util/ConcurrentSetTest.java index 34e29b9..06992ba 100644 --- a/test/org/waveprotocol/wave/model/util/ConcurrentSetTest.java +++ b/test/org/waveprotocol/wave/model/util/ConcurrentSetTest.java @@ -89,6 +89,7 @@ public class ConcurrentSetTest extends TestCase { * @param xs items to put in the set * @return a set containing {@code xs}. */ + @SuppressWarnings("unchecked") private static <T> Set<T> setOf(T ... xs) { return new HashSet<T>(Arrays.asList(xs)); } http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8e693353/test/org/waveprotocol/wave/model/util/CopyOnWriteSetTest.java ---------------------------------------------------------------------- diff --git a/test/org/waveprotocol/wave/model/util/CopyOnWriteSetTest.java b/test/org/waveprotocol/wave/model/util/CopyOnWriteSetTest.java index 78a50b7..ccb0a63 100644 --- a/test/org/waveprotocol/wave/model/util/CopyOnWriteSetTest.java +++ b/test/org/waveprotocol/wave/model/util/CopyOnWriteSetTest.java @@ -113,6 +113,7 @@ public class CopyOnWriteSetTest extends TestCase { * @param xs items to put in the set * @return a set containing {@code xs}. */ + @SuppressWarnings("unchecked") private static <T> Set<T> setOf(T ... xs) { return new HashSet<T>(Arrays.asList(xs)); } http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8e693353/test/org/waveprotocol/wave/model/util/Utf16UtilTest.java ---------------------------------------------------------------------- diff --git a/test/org/waveprotocol/wave/model/util/Utf16UtilTest.java b/test/org/waveprotocol/wave/model/util/Utf16UtilTest.java index 54387c7..713484d 100644 --- a/test/org/waveprotocol/wave/model/util/Utf16UtilTest.java +++ b/test/org/waveprotocol/wave/model/util/Utf16UtilTest.java @@ -132,7 +132,7 @@ public class Utf16UtilTest extends TestCase { )); - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) public static List<String> concatenateLists(List... lists) { int len = 0; for (List l : lists) {
