Merge pull request #100 from samuelrince/Valentin4

MAJ de la commande 'help'

src/fr/ecp/IS1220/myVelib/core/system/CommandLineInterpreter.java

@@ -682,26 +682,28 @@ public static void interprete(String[] tokens) {
 		case "help": {
 			if (arguments.length == 0) {		
 				System.err.println("\n"+"exit"+"\n"
-						+"setup <velibnetworkName>"+"\n"
-						+"setup <velibnetworkName> <nstations> <nslots> <radius> <nbikes>"+"\n"
+						+"setup <networkName>"+"\n"
+						+"setup <networkName> <nstations> <nplus> <nslots> <shape> <centerLat> <centerLong> <param> <populationPercent> <type1Percent> <type2Percent>"+"\n"
 						+"createBackup"+"\n"
 						+"listBackup"+"\n"
-						+"loadBackup <velibnetworkName>"+"\n"
+						+"loadBackup <networkName>"+"\n"
 						+"loadBackup <networkBackupFileName>"+"\n"
 						+"addUser <userName> <cardType>"+"\n"
 						+"addUser <userName> <password> <cardType>"+"\n"
-						+"switch <velibnetworkName>"+"\n"
+						+"switch <networkName>"+"\n"
 						+"time <hour> <min> <sec>"+"\n"
 						+"date <year> <month> <day>"+"\n"
 						+"offline <stationID>"+"\n"
 						+"online <stationID>"+"\n"
+						+"locateUser <userID> <latitude> <longitude>"+"\n"
+						+"notifyUser <userID> <message>"+"\n"
 						+"rentBike <userID> <stationID>"+"\n"
 						+"rentBike <userID> <stationID> <bicycleType>"+"\n"
 						+"returnBike <userID> <stationID>"+"\n"
 						+"displayStation <stationID>"+"\n"
 						+"displayUser <userID>"+"\n"
 						+"sortStation <sortpolicy>"+"\n"
-						+"display <velibnetworkName>"+"\n"
+						+"display <networkName>"+"\n"
 						+"runTest <testScenarioN.txt>"+"\n"
 						+"startStationGUI <stationID>"+"\n"
 						+"startUserGUI <userID>"+"\n");

testScenario4.txt

@@ -1,5 +1,5 @@
 delete all
-day 2019 4 1
+date 2019 4 1
 time 10 0 0
 setup 'City' 3 0 1 'square' 48 2 10 60 100 0
 addUser 'Bob' 'vlibre'