From 40dd0c2bc55abb47f8a66f9ff6316aa757893027 Mon Sep 17 00:00:00 2001 From: Louis Royer Date: Mon, 30 Mar 2020 18:33:45 +0200 Subject: [PATCH] Java code style --- src/serverP2P/ServerP2P.java | 13 ++++++------- src/tracker/Tracker.java | 13 ++++++------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/serverP2P/ServerP2P.java b/src/serverP2P/ServerP2P.java index b92488b..7835f62 100644 --- a/src/serverP2P/ServerP2P.java +++ b/src/serverP2P/ServerP2P.java @@ -23,16 +23,15 @@ public class ServerP2P { private Logger logger; private HostItem tracker; private HostItem server; - private boolean isinteractive; /** Constructor with portServerstr containing a port number. * @param hostnameServer binded hostname * @param portServer binded port * @param hostnameTracker tracker hostname * @param portTracker tracker port + * @param isInteractive true if application in interactive mode */ - public ServerP2P(String hostnameServer, int portServer, String hostnameTracker, int portTracker, boolean isinteractive) { - this.isinteractive = isinteractive; + public ServerP2P(String hostnameServer, int portServer, String hostnameTracker, int portTracker, boolean isInteractive) { Scanner scanner = new Scanner(System.in); server = new HostItem(hostnameServer, portServer); tracker = new HostItem(hostnameTracker, portTracker); @@ -40,7 +39,7 @@ public class ServerP2P { directories.createSubdir(subdir); logger = new Logger(directories.getDataHomeDirectory() + "server.log"); System.out.println("Server will listen on port " + portServer + " and serve files from " + directories.getDataHomeDirectory() + subdir); - if(isinteractive){ + if(isInteractive){ directories.askOpenDataHomeDirectory(subdir, scanner); } scanner.close(); @@ -60,7 +59,7 @@ public class ServerP2P { String hostnameTracker = ""; int portTracker = 0; Scanner scanner = new Scanner(System.in); - boolean isinteractive = false; + boolean isInteractive = false; if ((args.length != 5) && (args.length != 0)){ System.out.println("usage : java serveurP2P.ServeurP2P (interactive) or java serveurP2P.ServeurP2P -- (" + serverPortRange + " and " + trackerPortRange +")"); @@ -72,7 +71,7 @@ public class ServerP2P { hostnameTracker = args[3]; portTracker = Integer.valueOf(Integer.parseInt(args[4])); } else { - isinteractive = true; + isInteractive = true; System.out.println("Server, enter hostname to bind (default = localhost): "); hostnameServer = scanner.nextLine(); if(hostnameServer.equals("")){ @@ -109,7 +108,7 @@ public class ServerP2P { System.out.println("using port : " + portServer); System.out.println("tracker hostname : " + hostnameTracker); System.out.println("tracker port : " + portTracker); - ServerP2P s = new ServerP2P(hostnameServer, portServer, hostnameTracker, portTracker, isinteractive); + ServerP2P s = new ServerP2P(hostnameServer, portServer, hostnameTracker, portTracker, isInteractive); ServerManagementUDP smudp = new ServerManagementUDP(s.directories.getDataHomeDirectory() + subdir, s.server, s.tracker, s.logger); ServerManagementTCP smtcp = new ServerManagementTCP(s.directories.getDataHomeDirectory() + subdir, s.server, s.tracker, s.logger); Thread tudp = new Thread(smudp); diff --git a/src/tracker/Tracker.java b/src/tracker/Tracker.java index 807a3d5..9dec113 100644 --- a/src/tracker/Tracker.java +++ b/src/tracker/Tracker.java @@ -20,20 +20,19 @@ public class Tracker { private HostItem tracker; private Directories directories; private Logger logger; - private boolean isinteractive; /** Constructor with portStr containing a port number. * @param hostname hostname to bind * @param port port to bind + * @param isInteractive true if application is in interactive mode */ - public Tracker(String hostname, int port, boolean isinteractive) { - this.isinteractive = isinteractive; + public Tracker(String hostname, int port, boolean isInteractive) { tracker = new HostItem(hostname, port); directories = new Directories("P2P_JAVA_PROJECT_TRACKER_" + port); logger = new Logger(directories.getDataHomeDirectory() + "tracker.log"); System.out.println("Tracker will listen on port " + port + " and write logs into " + directories.getDataHomeDirectory()); Scanner scanner = new Scanner(System.in); - if(isinteractive){ + if(isInteractive){ directories.askOpenDataHomeDirectory(null, scanner); } scanner.close(); @@ -51,7 +50,7 @@ public class Tracker { String hostname = ""; int port = 0; Tracker t; - boolean isinteractive = false; + boolean isInteractive = false; if ((args.length != 3) && (args.length != 0)){ System.out.println("usage : java tracker.Tracker (interactive) or java trackerP2P.trackerP2P -- (" + trackerPortRange +")"); @@ -60,7 +59,7 @@ public class Tracker { hostname = args[1]; port = Integer.valueOf(Integer.parseInt(args[2])); } else { - isinteractive = true; + isInteractive = true; System.out.println("Tracker Server, enter hostname to bind (default = localhost): "); hostname = scanner.nextLine(); if(hostname.equals("")){ @@ -80,7 +79,7 @@ public class Tracker { System.out.println("using hostname : " + hostname); if(trackerPortRange.isPortInRange(port)) { System.out.println("using port : " + port); - t = new Tracker(hostname, port, isinteractive); + t = new Tracker(hostname, port, isInteractive); TrackerManagementUDP tmudp = new TrackerManagementUDP(t.tracker, t.logger); TrackerManagementTCP tmtcp = new TrackerManagementTCP(t.tracker, t.logger); Thread tudp = new Thread(tmudp);