From 517da9a5c42ae0d436928cc2e985063ab0cceea4 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Fri, 4 Mar 2016 10:26:48 +0100 Subject: [PATCH] =?utf8?q?[java]=C2=A0fix=20some=20small=20issues=20found?= =?utf8?q?=20by=20SonarQube?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- examples/java/bittorrent/Common.java | 42 ++++++++----------- examples/java/kademlia/Contact.java | 2 + src/bindings/java/org/simgrid/NativeLib.java | 1 + src/bindings/java/org/simgrid/msg/As.java | 1 + src/bindings/java/org/simgrid/msg/File.java | 1 + src/bindings/java/org/simgrid/msg/Host.java | 1 + .../java/org/simgrid/msg/Process.java | 6 +-- .../java/org/simgrid/msg/Storage.java | 12 ++---- 8 files changed, 28 insertions(+), 38 deletions(-) diff --git a/examples/java/bittorrent/Common.java b/examples/java/bittorrent/Common.java index 2f030f3339..5833aafb26 100644 --- a/examples/java/bittorrent/Common.java +++ b/examples/java/bittorrent/Common.java @@ -8,29 +8,21 @@ package bittorrent; /* Common constants for use in the simulation */ public class Common { - public static String TRACKER_MAILBOX = "tracker_mailbox"; - public static int FILE_SIZE = 5120; - public static int FILE_PIECE_SIZE = 512; - public static int FILE_PIECES = 10; - public static int PIECES_BLOCKS = 5; - public static int BLOCKS_REQUESTED = 2; - public static int PIECE_COMM_SIZE = 1; - /* Information message size */ - public static int MESSAGE_SIZE = 1; - /* Max number of peers sent by the tracker to clients */ - public static int MAXIMUM_PEERS = 50; - /* Interval of time where the peer should send a request to the tracker */ - public static int TRACKER_QUERY_INTERVAL = 1000; - /* Communication size for a task to the tracker */ - public static double TRACKER_COMM_SIZE = 0.01; - /* Timeout for the get peers data */ - public static int GET_PEERS_TIMEOUT = 10000; - public static int TIMEOUT_MESSAGE = 10; - public static int TRACKER_RECEIVE_TIMEOUT = 10; - /* Number of peers that can be unchocked at a given time */ - public static int MAX_UNCHOKED_PEERS = 4; - /* Interval between each update of the choked peers */ - public static int UPDATE_CHOKED_INTERVAL = 30; - /* Number of pieces the peer asks for simultaneously */ - public static int MAX_PIECES = 1; + public static final String TRACKER_MAILBOX = "tracker_mailbox"; + public static final int FILE_SIZE = 5120; + public static final int FILE_PIECE_SIZE = 512; + public static final int FILE_PIECES = 10; + public static final int PIECES_BLOCKS = 5; + public static final int BLOCKS_REQUESTED = 2; + public static final int PIECE_COMM_SIZE = 1; + public static final int MESSAGE_SIZE = 1; /* Information message size */ + public static final int MAXIMUM_PEERS = 50; /* Max number of peers sent by the tracker to clients */ + public static final int TRACKER_QUERY_INTERVAL = 1000; /* Interval of time where the peer should send a request to the tracker */ + public static final double TRACKER_COMM_SIZE = 0.01; /* Communication size for a task to the tracker */ + public static final int GET_PEERS_TIMEOUT = 10000; /* Timeout for the get peers data */ + public static final int TIMEOUT_MESSAGE = 10; + public static final int TRACKER_RECEIVE_TIMEOUT = 10; + public static final int MAX_UNCHOKED_PEERS = 4; /* Number of peers that can be unchocked at a given time */ + public static final int UPDATE_CHOKED_INTERVAL = 30; /* Interval between each update of the choked peers */ + public static final int MAX_PIECES = 1; /* Number of pieces the peer asks for simultaneously */ } diff --git a/examples/java/kademlia/Contact.java b/examples/java/kademlia/Contact.java index 76e155bc92..0f95358ec1 100644 --- a/examples/java/kademlia/Contact.java +++ b/examples/java/kademlia/Contact.java @@ -23,10 +23,12 @@ public class Contact implements Comparable { return distance; } + @Override public boolean equals(Object x) { return x.equals(id) ; } + @Override public int compareTo(Object o) { Contact c = (Contact)o; if (distance < c.distance) { diff --git a/src/bindings/java/org/simgrid/NativeLib.java b/src/bindings/java/org/simgrid/NativeLib.java index c89c57f4ed..71b1595b6c 100644 --- a/src/bindings/java/org/simgrid/NativeLib.java +++ b/src/bindings/java/org/simgrid/NativeLib.java @@ -129,6 +129,7 @@ public final class NativeLib { public FileCleaner(File dir) { this.dir = dir; } + @Override public void run() { try { for (File f : dir.listFiles()) diff --git a/src/bindings/java/org/simgrid/msg/As.java b/src/bindings/java/org/simgrid/msg/As.java index 40b68dcc77..16c6889b69 100644 --- a/src/bindings/java/org/simgrid/msg/As.java +++ b/src/bindings/java/org/simgrid/msg/As.java @@ -13,6 +13,7 @@ public class As { protected As() { }; + @Override public String toString (){ return this.getName(); } diff --git a/src/bindings/java/org/simgrid/msg/File.java b/src/bindings/java/org/simgrid/msg/File.java index 015d080266..456e474268 100644 --- a/src/bindings/java/org/simgrid/msg/File.java +++ b/src/bindings/java/org/simgrid/msg/File.java @@ -20,6 +20,7 @@ public class File { public File(String path) { open(path); } + @Override protected void finalize() { } diff --git a/src/bindings/java/org/simgrid/msg/Host.java b/src/bindings/java/org/simgrid/msg/Host.java index aa058cfac4..ae953ee99d 100644 --- a/src/bindings/java/org/simgrid/msg/Host.java +++ b/src/bindings/java/org/simgrid/msg/Host.java @@ -66,6 +66,7 @@ public class Host { this.data = null; }; + @Override public String toString (){ return this.name; diff --git a/src/bindings/java/org/simgrid/msg/Process.java b/src/bindings/java/org/simgrid/msg/Process.java index 502348caa9..f408d1687f 100644 --- a/src/bindings/java/org/simgrid/msg/Process.java +++ b/src/bindings/java/org/simgrid/msg/Process.java @@ -328,13 +328,11 @@ public abstract class Process implements Runnable { } } - /** - * This method runs the process. Il calls the method function that you must overwrite. - */ + /** This method runs the process. Il calls the method function that you must overwrite. */ + @Override public void run() { String[] args = null; /* do not fill it before the signal or this.args will be empty */ - //waitSignal(); /* wait for other people to fill the process in */ try { args = new String[this.args.size()]; diff --git a/src/bindings/java/org/simgrid/msg/Storage.java b/src/bindings/java/org/simgrid/msg/Storage.java index d9ccd5a66c..b6953bc2ac 100644 --- a/src/bindings/java/org/simgrid/msg/Storage.java +++ b/src/bindings/java/org/simgrid/msg/Storage.java @@ -17,23 +17,17 @@ public class Storage { */ private long bind; - /** - * Storage name - */ + /** Storage name */ protected String name; - /** - * User data. - */ + /** User data. */ private Object data; - /** - * - */ protected Storage() { this.bind = 0; this.data = null; }; + @Override public String toString (){ return this.name; -- 2.20.1