Remove dependency on utils package.

[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 84f7ce9..66377a2 100644 (file)
--- a/src/main/java/net/pterodactylus/fcp/FcpConnection.java
+++ b/src/main/java/net/pterodactylus/fcp/FcpConnection.java
@@ -31,8 +31,6 @@ 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.
  *
@@ -41,7 +39,7 @@ import net.pterodactylus.util.logging.Logging;
 public class FcpConnection implements Closeable {
 
        /** Logger. */
-       private static final Logger logger = Logging.getLogger(FcpConnection.class.getName());
+       private static final Logger logger = Logger.getLogger(FcpConnection.class.getName());
 
        /** The default port for FCP v2. */
        public static final int DEFAULT_PORT = 9481;
@@ -68,7 +66,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,
@@ -193,9 +191,10 @@ public class FcpConnection implements Closeable {
        }
 
        /**
-        * Closes the connection. If there is no connection to the node, this method
-        * does nothing.
+        * Closes the connection. If there is no connection to the node, this
+        * method does nothing.
         */
+       @Override
        public void close() {
                handleDisconnect(null);
        }
@@ -323,8 +322,8 @@ public class FcpConnection implements Closeable {
         * Handles a disconnect from the node.
         *
         * @param throwable
-        *            The exception that caused the disconnect, or <code>null</code>
-        *            if there was no exception
+        *            The exception that caused the disconnect, or
+        *            <code>null</code> if there was no exception
         */
        synchronized void handleDisconnect(Throwable throwable) {
                FcpUtils.close(remoteInputStream);
@@ -372,8 +371,8 @@ public class FcpConnection implements Closeable {
        }
 
        /**
-        * A wrapper around an {@link InputStream} that only supplies a limit number
-        * of bytes from the underlying input stream.
+        * A wrapper around an {@link InputStream} that only supplies a limit
+        * number of bytes from the underlying input stream.
         *
         * @author David ‘Bombe’ Roden &lt;bombe@freenetproject.org&gt;
         */
@@ -454,7 +453,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. */
                }
 
@@ -476,7 +475,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. */
                }