diff --git a/ChangeLog b/ChangeLog index 97922bb1d1704c38755296564f5e8ea810f43bb0..be8767f43e2e09efb60b83ded0a2b34a69c7be00 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +4.0.35 26/11/2020 +------ +* Connected users management. +* Users' roles management. + 4.0.34 13/11/2020 ------ * Cameo 1.0.0 integrated. diff --git a/pom.xml b/pom.xml index 7f35eec494b0a7ba57a2a8a44215069da5cfc205..1a28772c710a8e06c6f6613d21bf4bf88e602507 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 fr.ill.ics nomadcommandsystem - 4.0.35-SNAPSHOT + 4.0.35 NomadCommandSystem Java bridge for the communication with the Nomad server diff --git a/src/main/java/fr/ill/ics/nscclient/commandline/CommandLineAccessor.java b/src/main/java/fr/ill/ics/nscclient/commandline/CommandLineAccessor.java index 6b9d06a4cda18d3e1bedebe5dab8f7c7f0aed46b..e4f18a21bd0b783e2d7e5b533e8f248532d31e86 100644 --- a/src/main/java/fr/ill/ics/nscclient/commandline/CommandLineAccessor.java +++ b/src/main/java/fr/ill/ics/nscclient/commandline/CommandLineAccessor.java @@ -29,7 +29,6 @@ import fr.ill.ics.cameo.Application; import fr.ill.ics.cameo.RequesterCreationException; import fr.ill.ics.nomadserver.commandline.CommandLineRequest; import fr.ill.ics.nomadserver.common.Common; -import fr.ill.ics.nscclient.command.CommandZoneAccessor; import fr.ill.ics.nscclient.serverconnection.ServerInstance; import fr.ill.ics.nscclient.sessionmanagement.SessionManager; diff --git a/src/main/java/fr/ill/ics/nscclient/notification/DataNotificationClient.java b/src/main/java/fr/ill/ics/nscclient/notification/DataNotificationClient.java index 507d412a6d67eeb92245c786cfb07f194716a917..58a998a1f4bd8face0dd954a307ab20d18e417ca 100644 --- a/src/main/java/fr/ill/ics/nscclient/notification/DataNotificationClient.java +++ b/src/main/java/fr/ill/ics/nscclient/notification/DataNotificationClient.java @@ -640,6 +640,7 @@ public class DataNotificationClient { notifyChatMessage(chatData.getDate(), chatData.getOwner(), chatData.getMessage(), chatData.getFileName()); } else if (data instanceof ConnectedUsersChangedData) { + System.out.println("*************************************************** notifyConnectedUsersChangeListeners !!!! ***************************************************"); notifyConnectedUsersChangeListeners(); } } diff --git a/src/main/java/fr/ill/ics/nscclient/sessionmanagement/ConnectedUser.java b/src/main/java/fr/ill/ics/nscclient/sessionmanagement/ConnectedUser.java index c9f8c2115050d12c8f91562e7eb19e717a0237dd..5ed99a8e5630cde35f23e139f4e5c4a812e58d71 100644 --- a/src/main/java/fr/ill/ics/nscclient/sessionmanagement/ConnectedUser.java +++ b/src/main/java/fr/ill/ics/nscclient/sessionmanagement/ConnectedUser.java @@ -30,5 +30,11 @@ public class ConnectedUser { public String getEndpoint() { return endpoint; } + + @Override + public String toString() { + return "clientId = " + clientId + " user = " + user + " clientType = " + clientType + " endpoint = " + endpoint; + } + }