From 3021baa3e423d0e81e7806acf9ab449d10e1ce70 Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Tue, 8 Nov 2011 19:10:07 +0100 Subject: [PATCH] Fixing the BuilderParents generated by protobuf with FQN and fixing @returns => @return --- .../src/main/scala/akka/actor/Actor.scala | 4 ++-- .../src/main/scala/akka/actor/ActorRef.scala | 8 +++---- .../src/main/scala/akka/event/EventBus.scala | 4 ++-- .../src/main/scala/akka/util/Index.scala | 2 +- .../src/main/scala/akka/cluster/Cluster.scala | 2 +- .../main/java/akka/remote/RemoteProtocol.java | 22 +++++++++---------- .../java/akka/actor/ProtobufProtocol.java | 2 +- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/akka-actor/src/main/scala/akka/actor/Actor.scala b/akka-actor/src/main/scala/akka/actor/Actor.scala index 2cce44bec8..a0d62bc76e 100644 --- a/akka-actor/src/main/scala/akka/actor/Actor.scala +++ b/akka-actor/src/main/scala/akka/actor/Actor.scala @@ -393,13 +393,13 @@ trait Actor { /** * Registers this actor as a Monitor for the provided ActorRef - * @returns the provided ActorRef + * @return the provided ActorRef */ def watch(subject: ActorRef): ActorRef = self startsMonitoring subject /** * Unregisters this actor as Monitor for the provided ActorRef - * @returns the provided ActorRef + * @return the provided ActorRef */ def unwatch(subject: ActorRef): ActorRef = self stopsMonitoring subject diff --git a/akka-actor/src/main/scala/akka/actor/ActorRef.scala b/akka-actor/src/main/scala/akka/actor/ActorRef.scala index 8ac11ffbae..d25572c3e0 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorRef.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorRef.scala @@ -122,7 +122,7 @@ abstract class ActorRef extends java.lang.Comparable[ActorRef] with Serializable * This means that this actor will get a Terminated()-message when the provided actor * is permanently terminated. * - * @returns the same ActorRef that is provided to it, to allow for cleaner invocations + * @return the same ActorRef that is provided to it, to allow for cleaner invocations */ def startsMonitoring(subject: ActorRef): ActorRef //TODO FIXME REMOVE THIS @@ -131,7 +131,7 @@ abstract class ActorRef extends java.lang.Comparable[ActorRef] with Serializable * This means that this actor will not get a Terminated()-message when the provided actor * is permanently terminated. * - * @returns the same ActorRef that is provided to it, to allow for cleaner invocations + * @return the same ActorRef that is provided to it, to allow for cleaner invocations */ def stopsMonitoring(subject: ActorRef): ActorRef //TODO FIXME REMOVE THIS @@ -202,7 +202,7 @@ class LocalActorRef private[akka] ( * This means that this actor will get a Terminated()-message when the provided actor * is permanently terminated. * - * @returns the same ActorRef that is provided to it, to allow for cleaner invocations + * @return the same ActorRef that is provided to it, to allow for cleaner invocations */ def startsMonitoring(subject: ActorRef): ActorRef = actorCell.startsMonitoring(subject) @@ -211,7 +211,7 @@ class LocalActorRef private[akka] ( * This means that this actor will not get a Terminated()-message when the provided actor * is permanently terminated. * - * @returns the same ActorRef that is provided to it, to allow for cleaner invocations + * @return the same ActorRef that is provided to it, to allow for cleaner invocations */ def stopsMonitoring(subject: ActorRef): ActorRef = actorCell.stopsMonitoring(subject) diff --git a/akka-actor/src/main/scala/akka/event/EventBus.scala b/akka-actor/src/main/scala/akka/event/EventBus.scala index 36b878dcb9..e66b68c7e8 100644 --- a/akka-actor/src/main/scala/akka/event/EventBus.scala +++ b/akka-actor/src/main/scala/akka/event/EventBus.scala @@ -22,13 +22,13 @@ trait EventBus { /** * Attempts to register the subscriber to the specified Classifier - * @returns true if successful and false if not (because it was already subscribed to that Classifier, or otherwise) + * @return true if successful and false if not (because it was already subscribed to that Classifier, or otherwise) */ def subscribe(subscriber: Subscriber, to: Classifier): Boolean /** * Attempts to deregister the subscriber from the specified Classifier - * @returns true if successful and false if not (because it wasn't subscribed to that Classifier, or otherwise) + * @return true if successful and false if not (because it wasn't subscribed to that Classifier, or otherwise) */ def unsubscribe(subscriber: Subscriber, from: Classifier): Boolean diff --git a/akka-actor/src/main/scala/akka/util/Index.scala b/akka-actor/src/main/scala/akka/util/Index.scala index afbb7a2c20..c8155f235c 100644 --- a/akka-actor/src/main/scala/akka/util/Index.scala +++ b/akka-actor/src/main/scala/akka/util/Index.scala @@ -119,7 +119,7 @@ class Index[K, V](val mapSize: Int, val valueComparator: Comparator[V]) { /** * Disassociates all the values for the specified key - * @returns None if the key wasn't associated at all, or Some(scala.Iterable[V]) if it was associated + * @return None if the key wasn't associated at all, or Some(scala.Iterable[V]) if it was associated */ def remove(key: K): Option[Iterable[V]] = { val set = container get key diff --git a/akka-cluster/src/main/scala/akka/cluster/Cluster.scala b/akka-cluster/src/main/scala/akka/cluster/Cluster.scala index db5f5306d9..7227839c9a 100644 --- a/akka-cluster/src/main/scala/akka/cluster/Cluster.scala +++ b/akka-cluster/src/main/scala/akka/cluster/Cluster.scala @@ -1275,7 +1275,7 @@ class DefaultClusterNode private[akka] ( * Update the list of connections to other nodes in the cluster. * Tail recursive, using lockless optimimistic concurrency. * - * @returns a Map with the remote socket addresses to of disconnected node connections + * @return a Map with the remote socket addresses to of disconnected node connections */ @tailrec final private[cluster] def connectToAllNewlyArrivedMembershipNodesInCluster( diff --git a/akka-remote/src/main/java/akka/remote/RemoteProtocol.java b/akka-remote/src/main/java/akka/remote/RemoteProtocol.java index 8d1d7f8c94..89ee558709 100644 --- a/akka-remote/src/main/java/akka/remote/RemoteProtocol.java +++ b/akka-remote/src/main/java/akka/remote/RemoteProtocol.java @@ -552,7 +552,7 @@ public final class RemoteProtocol { maybeForceBuilderInitialization(); } - private Builder(BuilderParent parent) { + private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -1254,7 +1254,7 @@ public final class RemoteProtocol { maybeForceBuilderInitialization(); } - private Builder(BuilderParent parent) { + private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -2371,7 +2371,7 @@ public final class RemoteProtocol { maybeForceBuilderInitialization(); } - private Builder(BuilderParent parent) { + private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -2995,7 +2995,7 @@ public final class RemoteProtocol { maybeForceBuilderInitialization(); } - private Builder(BuilderParent parent) { + private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -3471,7 +3471,7 @@ public final class RemoteProtocol { maybeForceBuilderInitialization(); } - private Builder(BuilderParent parent) { + private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -3884,7 +3884,7 @@ public final class RemoteProtocol { maybeForceBuilderInitialization(); } - private Builder(BuilderParent parent) { + private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -4317,7 +4317,7 @@ public final class RemoteProtocol { maybeForceBuilderInitialization(); } - private Builder(BuilderParent parent) { + private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -4768,7 +4768,7 @@ public final class RemoteProtocol { maybeForceBuilderInitialization(); } - private Builder(BuilderParent parent) { + private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -5238,7 +5238,7 @@ public final class RemoteProtocol { maybeForceBuilderInitialization(); } - private Builder(BuilderParent parent) { + private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -5751,7 +5751,7 @@ public final class RemoteProtocol { maybeForceBuilderInitialization(); } - private Builder(BuilderParent parent) { + private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -6383,7 +6383,7 @@ public final class RemoteProtocol { maybeForceBuilderInitialization(); } - private Builder(BuilderParent parent) { + private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } diff --git a/akka-remote/src/test/java/akka/actor/ProtobufProtocol.java b/akka-remote/src/test/java/akka/actor/ProtobufProtocol.java index 4307c64e3f..f29c9efee3 100644 --- a/akka-remote/src/test/java/akka/actor/ProtobufProtocol.java +++ b/akka-remote/src/test/java/akka/actor/ProtobufProtocol.java @@ -273,7 +273,7 @@ public final class ProtobufProtocol { maybeForceBuilderInitialization(); } - private Builder(BuilderParent parent) { + private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); }