reintroduce usage of arguments in serverP2P

src/serverP2P/ServerP2P.java

@@ -1,6 +1,7 @@
 package serverP2P;
 
 import java.util.Scanner;
+import javafx.util.Pair;
 import serverP2P.ServerManagementUDP;
 import serverP2P.ServerManagementTCP;
 import tools.Directories;
@@ -47,53 +48,68 @@ public class ServerP2P {
 			final String defaultHostname = "localhost";
 			final String defaultPortServer = "7070";
 			final String defaultPortTracker = "6969";
+			String hostnameServer = "";
+			String portServer = "";
+			String hostnameTracker = "";
+			String portTracker = "";
 			Scanner scanner = new Scanner(System.in);
 			TestPort testPort = new TestPort();
 
+			if ((args.length != 5) && (args.length != 0)){
+				System.out.println("usage : java serveurP2P.ServeurP2P (interactive) or java serveurP2P.ServeurP2P -- <serveurHOSTNAME> <serveurPORT> <trackerHOSTNAME> <trackerPORT>");
+			}
+			else{
+				if(args.length == 5){
+					hostnameServer = args[1];
+					portServer = args[2];
+					hostnameTracker = args[3];
+					portTracker = args[4];
+				}
+				else{
 					System.out.println("Server, enter hostname to bind (default = localhost): ");
-			String hostnameServer = scanner.nextLine();
+					hostnameServer = scanner.nextLine();
 					if(hostnameServer.equals("")){
 						hostnameServer = defaultHostname;
 						System.out.println("using default hostname : " + hostnameServer);
-			}	else{
-				System.out.println("using hostname : " + hostnameServer);
 					}
 					System.out.println("enter port (default = 7070): ");
-			String portServer = scanner.nextLine();
+					portServer = scanner.nextLine();
 					if(portServer.equals("")){
 						portServer = defaultPortServer;
 						System.out.println("using default port : " + portServer);
 					}
-			else {
-				if(!testPort.testPortServer(Integer.parseInt(portServer))){
-					System.out.println("Wrong port (7000 -> 7999), using default port 7070");
-					portServer = defaultPortServer;
-				} else {
-					System.out.println("using port : " + portServer);
-				}
-			}
-
 					System.out.println("enter hostname of tracker (default = localhost): ");
-			String hostnameTracker = scanner.nextLine();
+					hostnameTracker = scanner.nextLine();
 					if(hostnameTracker.equals("")){
 						hostnameTracker = defaultHostname;
 						System.out.println("tracker default hostname : " + hostnameTracker);
-			}	else{
-				System.out.println("tracker hostname : " + hostnameTracker);
 					}
 					System.out.println("enter tracker's port (default = 6969): ");
-			String portTracker = scanner.nextLine();
+					portTracker = scanner.nextLine();
 					if(portTracker.equals("")){
 						portTracker = defaultPortTracker;
 						System.out.println("using default port : " + portTracker);
 					}
+				}
+
+				System.out.println("using hostname : " + hostnameServer);
+				Pair<Integer, String> PtestPortServer = testPort.testPortServer(Integer.parseInt(portServer));
+				if(PtestPortServer.getKey() == 0){
+					System.out.println("using port : " + portServer);
+				}
 				else {
-				if(!testPort.testPortTracker(Integer.parseInt(portTracker))){
+					System.out.println(PtestPortServer.getValue());
-					System.out.println("Wrong port (6000 -> 6999), using default port 6969");
+					portServer = defaultPortServer;
-					portTracker = defaultPortTracker;
+				}
-				} else {
+				System.out.println("tracker hostname : " + hostnameTracker);
+
+				Pair<Integer, String> PtestPortTracker = testPort.testPortTracker(Integer.parseInt(portTracker));
+				if(PtestPortTracker.getKey() == 0){
 					System.out.println("using port : " + portTracker);
 				}
+				else {
+					System.out.println(PtestPortTracker.getValue());
+					portTracker = defaultPortTracker;
 				}
 
 				ServerP2P s = new ServerP2P(portServer, hostnameTracker, portTracker);
@@ -107,3 +123,4 @@ public class ServerP2P {
 				ttcp.start();
 			}
 		}
+}

src/tools/TestPort.java

@@ -10,12 +10,11 @@ import javafx.util.Pair;
  */
 public class TestPort {
 
-	public boolean testPortServer(int port, String message) {
+	public Pair<Integer,String> testPortServer(int port) {
 		if((port > 7000) && (port < 7999)){
-			return true;
+			return new Pair<>(0,"");
 		}
-		message = message + "Wrong port (7000 -> 7999), using default port 7070";
+		return new Pair<>(1, "Wrong port (7000 -> 7999), using default port 7070");
-		return false;
 	}
 
 	public Pair<Integer,String> testPortTracker(int port) {

src/tracker/Tracker.java

@@ -48,10 +48,8 @@ public class Tracker {
 			String port;
 			Tracker t;
 
-			System.out.println("args.lenght : " + args.length);
-
 			if ((args.length != 3) && (args.length != 0)){
-				System.out.println("usage : java tracker.Tracker or java trackerP2P.trackerP2P -- <hostname> <PORT> (default localhost:6969, range 6000 -> 6999)");
+				System.out.println("usage : java tracker.Tracker (interactive) or java trackerP2P.trackerP2P -- <hostname> <PORT> (default localhost:6969, range 6000 -> 6999)");
 			}
 			else{
 				if(args.length == 3){