Add @Override annotations that are missing for JDK-1.6 compatibility.

[jFCPlib.git] / src / main / java / net / pterodactylus / fcp / FcpConnection.java

diff --git a/src/main/java/net/pterodactylus/fcp/FcpConnection.java b/src/main/java/net/pterodactylus/fcp/FcpConnection.java
index 2f40785..2688d21 100644 (file)
--- a/src/main/java/net/pterodactylus/fcp/FcpConnection.java
+++ b/src/main/java/net/pterodactylus/fcp/FcpConnection.java
@@ -31,6 +31,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Logger;
 
+import net.pterodactylus.util.logging.Logging;
+
 /**
  * An FCP connection to a Freenet node.
  *
@@ -39,7 +41,7 @@ import java.util.logging.Logger;
 public class FcpConnection implements Closeable {
 
        /** Logger. */
-       private static final Logger logger = Logger.getLogger(FcpConnection.class.getName());
+       private static final Logger logger = Logging.getLogger(FcpConnection.class.getName());
 
        /** The default port for FCP v2. */
        public static final int DEFAULT_PORT = 9481;
@@ -66,7 +68,7 @@ public class FcpConnection implements Closeable {
        private FcpConnectionHandler connectionHandler;
 
        /** Incoming message statistics. */
-       private Map<String, Integer> incomingMessageStatistics = Collections.synchronizedMap(new HashMap<String, Integer>());
+       private static final Map<String, Integer> incomingMessageStatistics = Collections.synchronizedMap(new HashMap<String, Integer>());
 
        /**
         * Creates a new FCP connection to the freenet node running on localhost,
@@ -194,6 +196,7 @@ public class FcpConnection implements Closeable {
         * Closes the connection. If there is no connection to the node, this method
         * does nothing.
         */
+       @Override
        public void close() {
                handleDisconnect(null);
        }
@@ -452,7 +455,7 @@ public class FcpConnection implements Closeable {
                 * @see java.io.FilterInputStream#mark(int)
                 */
                @Override
-               public void mark(int readlimit) {
+               public synchronized void mark(int readlimit) {
                        /* do nothing. */
                }
 
@@ -474,7 +477,7 @@ public class FcpConnection implements Closeable {
                 * @see java.io.FilterInputStream#reset()
                 */
                @Override
-               public void reset() throws IOException {
+               public synchronized void reset() throws IOException {
                        /* do nothing. */
                }