Remove some @Overrides that were for things that were implementing an interface method, not overriding a base class method - this is a 1.6ism.
Also, add some @Overrides that were missing on things that were overriding a base class method. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6570 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
@@ -600,6 +600,7 @@ public abstract class Streamer
|
|||||||
super.readObject(object, in, useReader);
|
super.readObject(object, in, useReader);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
protected void initMarshallers ()
|
protected void initMarshallers ()
|
||||||
{
|
{
|
||||||
// we will lazy-initialize the marshallers only if needed, so we don't call super
|
// we will lazy-initialize the marshallers only if needed, so we don't call super
|
||||||
|
|||||||
@@ -76,10 +76,10 @@ public class Resulting<T> extends Invoker.Unit
|
|||||||
String name, final ResultListener<Q> chain, final Function<? super T, ? extends Q> xform)
|
String name, final ResultListener<Q> chain, final Function<? super T, ? extends Q> xform)
|
||||||
{
|
{
|
||||||
this(name, new ResultListener<T>() {
|
this(name, new ResultListener<T>() {
|
||||||
@Override public void requestCompleted (T result) {
|
public void requestCompleted (T result) {
|
||||||
chain.requestCompleted(xform.apply(result));
|
chain.requestCompleted(xform.apply(result));
|
||||||
}
|
}
|
||||||
@Override public void requestFailed (Exception cause) {
|
public void requestFailed (Exception cause) {
|
||||||
chain.requestFailed(cause);
|
chain.requestFailed(cause);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -370,6 +370,7 @@ public class StreamableTest
|
|||||||
return (strizzing == null) ? 0 : strizzing.hashCode();
|
return (strizzing == null) ? 0 : strizzing.hashCode();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public String toString ()
|
public String toString ()
|
||||||
{
|
{
|
||||||
return "Wacket[" + strizzing + "]";
|
return "Wacket[" + strizzing + "]";
|
||||||
@@ -457,6 +458,7 @@ public class StreamableTest
|
|||||||
public abstract String act ();
|
public abstract String act ();
|
||||||
}
|
}
|
||||||
Action act = new Action() {
|
Action act = new Action() {
|
||||||
|
@Override
|
||||||
public String act () {
|
public String act () {
|
||||||
return "bang!";
|
return "bang!";
|
||||||
}
|
}
|
||||||
@@ -475,6 +477,7 @@ public class StreamableTest
|
|||||||
final int count = unsafeOuterCall();
|
final int count = unsafeOuterCall();
|
||||||
final String arg = "hello";
|
final String arg = "hello";
|
||||||
Action act = new Action() {
|
Action act = new Action() {
|
||||||
|
@Override
|
||||||
public String act () {
|
public String act () {
|
||||||
return count + ":" + arg;
|
return count + ":" + arg;
|
||||||
}
|
}
|
||||||
@@ -495,6 +498,7 @@ public class StreamableTest
|
|||||||
}
|
}
|
||||||
final String arg = "hello";
|
final String arg = "hello";
|
||||||
Action act = new Action() {
|
Action act = new Action() {
|
||||||
|
@Override
|
||||||
public String act () {
|
public String act () {
|
||||||
return unsafeOuterCall() + ":" + arg;
|
return unsafeOuterCall() + ":" + arg;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user