keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Clean up some warnings about @Override

This commit is contained in:
Christian 2014-01-17 23:19:22 -05:00
parent b4a6418d1c
commit b21975b8f0
20 changed files with 74 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fml/src/main/java/cpw/mods/fml/common/DummyModContainer.java
View File

@ -109,6 +109,7 @@ public class DummyModContainer implements ModContainer
return md.version;
}
@Override
public boolean matches(Object mod)
{
return false;

2
fml/src/main/java/cpw/mods/fml/common/FMLModContainer.java
View File

@ -360,6 +360,7 @@ public class FMLModContainer implements ModContainer
parseSimpleFieldAnnotation(annotations, Instance.class.getName(), new Function<ModContainer, Object>()
{
@Override
public Object apply(ModContainer mc)
{
return mc.getMod();
@ -367,6 +368,7 @@ public class FMLModContainer implements ModContainer
});
parseSimpleFieldAnnotation(annotations, Metadata.class.getName(), new Function<ModContainer, Object>()
{
@Override
public Object apply(ModContainer mc)
{
return mc.getMetadata();

15
fml/src/main/java/cpw/mods/fml/common/InjectedModContainer.java
View File

@ -34,76 +34,91 @@ public class InjectedModContainer implements ModContainer
this.wrappedContainer = mc;
}
@Override
public String getModId()
{
return wrappedContainer.getModId();
}
@Override
public String getName()
{
return wrappedContainer.getName();
}
@Override
public String getVersion()
{
return wrappedContainer.getVersion();
}
@Override
public File getSource()
{
return source;
}
@Override
public ModMetadata getMetadata()
{
return wrappedContainer.getMetadata();
}
@Override
public void bindMetadata(MetadataCollection mc)
{
wrappedContainer.bindMetadata(mc);
}
@Override
public void setEnabledState(boolean enabled)
{
wrappedContainer.setEnabledState(enabled);
}
@Override
public Set<ArtifactVersion> getRequirements()
{
return wrappedContainer.getRequirements();
}
@Override
public List<ArtifactVersion> getDependencies()
{
return wrappedContainer.getDependencies();
}
@Override
public List<ArtifactVersion> getDependants()
{
return wrappedContainer.getDependants();
}
@Override
public String getSortingRules()
{
return wrappedContainer.getSortingRules();
}
@Override
public boolean registerBus(EventBus bus, LoadController controller)
{
return wrappedContainer.registerBus(bus, controller);
}
@Override
public boolean matches(Object mod)
{
return wrappedContainer.matches(mod);
}
@Override
public Object getMod()
{
return wrappedContainer.getMod();
}
@Override
public ArtifactVersion getProcessedVersion()
{
return wrappedContainer.getProcessedVersion();

1
fml/src/main/java/cpw/mods/fml/common/Loader.java
View File

@ -531,6 +531,7 @@ public class Loader
Map<String, Boolean> isEnabled = Maps.transformValues(modStates, new Function<String, Boolean>()
{
@Override
public Boolean apply(String input)
{
return Boolean.parseBoolean(input);

1
fml/src/main/java/cpw/mods/fml/common/LoaderState.java
View File

@ -112,6 +112,7 @@ public enum LoaderState
this.label = label;
}
@Override
public String toString()
{
return this.label;

1
fml/src/main/java/cpw/mods/fml/common/discovery/ASMDataTable.java
View File

@ -87,6 +87,7 @@ public class ASMDataTable
{
this.container = container;
}
@Override
public boolean apply(ASMData data)
{
return container.getSource().equals(data.candidate.getModContainer());

1
fml/src/main/java/cpw/mods/fml/common/functions/ArtifactVersionNameFunction.java
View File

@ -5,6 +5,7 @@ import com.google.common.base.Function;
import cpw.mods.fml.common.versioning.ArtifactVersion;
public class ArtifactVersionNameFunction implements Function<ArtifactVersion, String> {
@Override
public String apply(ArtifactVersion v)
{
return v.getLabel();

1
fml/src/main/java/cpw/mods/fml/common/functions/ModIdFunction.java
View File

@ -18,6 +18,7 @@ import cpw.mods.fml.common.ModContainer;
public final class ModIdFunction implements Function<ModContainer, String>
{
@Override
public String apply(ModContainer container)
{
return container.getModId();

5
fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeMessage.java
View File

@ -28,11 +28,13 @@ public abstract class FMLHandshakeMessage {
}
public static class ServerHello extends FMLHandshakeMessage {
private byte serverProtocolVersion;
@Override
public void toBytes(ByteBuf buffer)
{
buffer.writeByte(NetworkRegistry.FML_PROTOCOL);
}
@Override
public void fromBytes(ByteBuf buffer)
{
serverProtocolVersion = buffer.readByte();
@ -45,11 +47,13 @@ public abstract class FMLHandshakeMessage {
}
public static class ClientHello extends FMLHandshakeMessage {
private byte serverProtocolVersion;
@Override
public void toBytes(ByteBuf buffer)
{
buffer.writeByte(NetworkRegistry.FML_PROTOCOL);
}
@Override
public void fromBytes(ByteBuf buffer)
{
serverProtocolVersion = buffer.readByte();
@ -130,6 +134,7 @@ public abstract class FMLHandshakeMessage {
}
private Map<String,Integer> modIds;
@Override
public void fromBytes(ByteBuf buffer)
{
int length = ByteBufUtils.readVarInt(buffer, 3);

1
fml/src/main/java/cpw/mods/fml/common/network/handshake/NetworkDispatcher.java
View File

@ -229,6 +229,7 @@ public class NetworkDispatcher extends SimpleChannelInboundHandler<Packet> imple
final ChatComponentText chatcomponenttext = new ChatComponentText(message);
manager.func_150725_a(new S40PacketDisconnect(chatcomponenttext), new GenericFutureListener<Future<?>>()
{
@Override
public void operationComplete(Future<?> result)
{
manager.func_150718_a(chatcomponenttext);

1
fml/src/main/java/cpw/mods/fml/common/toposort/TopologicalSort.java
View File

@ -55,6 +55,7 @@ public class TopologicalSort
orderedNodes.add(node);
graph.put(node, new TreeSet<T>(new Comparator<T>()
{
@Override
public int compare(T o1, T o2) {
return orderedNodes.indexOf(o1)-orderedNodes.indexOf(o2);
}

16
fml/src/main/java/cpw/mods/fml/common/versioning/ComparableVersion.java
View File

@ -114,16 +114,19 @@ public class ComparableVersion
this.value = new BigInteger( str );
}
@Override
public int getType()
{
return INTEGER_ITEM;
}
@Override
public boolean isNull()
{
return BigInteger_ZERO.equals( value );
}
@Override
public int compareTo( Item item )
{
if ( item == null )
@ -147,6 +150,7 @@ public class ComparableVersion
}
}
@Override
public String toString()
{
return value.toString();
@ -200,11 +204,13 @@ public class ComparableVersion
this.value = ALIASES.getProperty( value , value );
}
@Override
public int getType()
{
return STRING_ITEM;
}
@Override
public boolean isNull()
{
return ( comparableQualifier( value ).compareTo( RELEASE_VERSION_INDEX ) == 0 );
@ -229,6 +235,7 @@ public class ComparableVersion
return i == -1 ? ( _QUALIFIERS.size() + "-" + qualifier ) : String.valueOf( i );
}
@Override
public int compareTo( Item item )
{
if ( item == null )
@ -252,6 +259,7 @@ public class ComparableVersion
}
}
@Override
public String toString()
{
return value;
@ -271,11 +279,13 @@ public class ComparableVersion
*/
private static final long serialVersionUID = 1L;
@Override
public int getType()
{
return LIST_ITEM;
}
@Override
public boolean isNull()
{
return ( size() == 0 );
@ -297,6 +307,7 @@ public class ComparableVersion
}
}
@Override
public int compareTo( Item item )
{
if ( item == null )
@ -341,6 +352,7 @@ public class ComparableVersion
}
}
@Override
public String toString()
{
StringBuilder buffer = new StringBuilder( "(" );
@ -462,21 +474,25 @@ public class ComparableVersion
return isDigit ? new IntegerItem( buf ) : new StringItem( buf, false );
}
@Override
public int compareTo( ComparableVersion o )
{
return items.compareTo( o.items );
}
@Override
public String toString()
{
return value;
}
@Override
public boolean equals( Object o )
{
return ( o instanceof ComparableVersion ) && canonical.equals( ( (ComparableVersion) o ).canonical );
}
@Override
public int hashCode()
{
return canonical.hashCode();

1
fml/src/main/java/cpw/mods/fml/common/versioning/Restriction.java
View File

@ -190,6 +190,7 @@ public class Restriction
return true;
}
@Override
public String toString()
{
StringBuilder buf = new StringBuilder();

3
fml/src/main/java/cpw/mods/fml/common/versioning/VersionRange.java
View File

@ -473,6 +473,7 @@ public class VersionRange
return restrictions;
}
@Override
public String toString()
{
if ( recommendedVersion != null )
@ -521,6 +522,7 @@ public class VersionRange
return !restrictions.isEmpty() && recommendedVersion == null;
}
@Override
public boolean equals( Object obj )
{
if ( this == obj )
@ -542,6 +544,7 @@ public class VersionRange
return equals;
}
@Override
public int hashCode()
{
int hash = 7;

3
fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/ByteBufferSeekableSource.java
View File

@ -59,6 +59,7 @@ public class ByteBufferSeekableSource implements SeekableSource {
}
}
@Override
public void seek(long pos) throws IOException {
cur = bb.slice();
if (pos > cur.limit())
@ -66,6 +67,7 @@ public class ByteBufferSeekableSource implements SeekableSource {
cur.position((int) pos);
}
@Override
public int read(ByteBuffer dest) throws IOException {
if (!cur.hasRemaining())
return -1;
@ -77,6 +79,7 @@ public class ByteBufferSeekableSource implements SeekableSource {
return c;
}
@Override
public void close() throws IOException {
bb = null;
cur = null;

16
fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/DebugDiffWriter.java
View File

@ -1,4 +1,4 @@
/*
/*
*
* Copyright (c) 2001 Torgeir Veimo
*
@ -32,20 +32,22 @@ import java.io.IOException;
* For debugging patch generation.
*/
public class DebugDiffWriter implements DiffWriter {
private ByteArrayOutputStream os = new ByteArrayOutputStream();
/**
* Constructs a new DebugDiffWriter.
*/
public DebugDiffWriter() {}
@Override
public void addCopy(long offset, int length) throws IOException {
if (os.size() > 0)
writeBuf();
System.err.println("COPY off: " + offset + ", len: " + length);
}
@Override
public void addData(byte b) throws IOException {
os.write(b);
writeBuf();
@ -63,10 +65,12 @@ public class DebugDiffWriter implements DiffWriter {
System.err.println("");
os.reset();
}
@Override
public void flush() throws IOException {
System.err.println("FLUSH");
}
@Override
public void close() throws IOException {
System.err.println("CLOSE");
}

1
fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/DiffWriter.java
View File

@ -52,6 +52,7 @@ public interface DiffWriter extends Closeable {
* Closes this stream.
* Note that {@link DiffWriter} will invoke this method at the end.
*/
@Override
public void close() throws IOException;
}

4
fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/GDiffWriter.java
View File

@ -83,6 +83,7 @@ public class GDiffWriter implements DiffWriter {
this(new DataOutputStream(output));
}
@Override
public void addCopy(long offset, int length) throws IOException {
writeBuf();
@ -130,6 +131,7 @@ public class GDiffWriter implements DiffWriter {
/**
* Adds a data byte.
*/
@Override
public void addData(byte b) throws IOException {
buf.write(b);
if (buf.size() >= CHUNK_SIZE)
@ -155,6 +157,7 @@ public class GDiffWriter implements DiffWriter {
/**
* Flushes accumulated data bytes, if any.
*/
@Override
public void flush() throws IOException
{
writeBuf();
@ -164,6 +167,7 @@ public class GDiffWriter implements DiffWriter {
/**
* Writes the final EOF byte, closes the underlying stream.
*/
@Override
public void close() throws IOException {
this.flush();
output.write((byte)EOF);

3
fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/RandomAccessFileSeekableSource.java
View File

@ -48,6 +48,7 @@ public class RandomAccessFileSeekableSource implements SeekableSource {
this.raf = raf;
}
@Override
public void seek(long pos) throws IOException {
raf.seek(pos);
}
@ -60,10 +61,12 @@ public class RandomAccessFileSeekableSource implements SeekableSource {
return raf.length();
}
@Override
public void close() throws IOException {
raf.close();
}
@Override
public int read(ByteBuffer bb) throws IOException {
int c = raf.read(bb.array(), bb.position(), bb.remaining());
if (c == -1)

3
fml/src/main/java/cpw/mods/fml/server/FMLServerHandler.java
View File

@ -69,6 +69,7 @@ public class FMLServerHandler implements IFMLSidedHandler
*
* @param minecraftServer
*/
@Override
public void beginServerLoading(MinecraftServer minecraftServer)
{
server = minecraftServer;
@ -78,6 +79,7 @@ public class FMLServerHandler implements IFMLSidedHandler
/**
* Called a bit later on during server initialization to finish loading mods
*/
@Override
public void finishServerLoading()
{
Loader.instance().initializeMods();
@ -92,6 +94,7 @@ public class FMLServerHandler implements IFMLSidedHandler
/**
* Get the server instance
*/
@Override
public MinecraftServer getServer()
{
return server;