Commit d68fd701 authored by helene ortiz's avatar helene ortiz
Browse files

rename sender => user. remove user parameter in calls to SessionManager

methods as it is stored in it
parent 22319fc7
...@@ -22,7 +22,6 @@ import fr.ill.ics.bridge.command.CommandZoneWrapper; ...@@ -22,7 +22,6 @@ import fr.ill.ics.bridge.command.CommandZoneWrapper;
import fr.ill.ics.bridge.events.TokenEvent; import fr.ill.ics.bridge.events.TokenEvent;
import fr.ill.ics.bridge.events.TokenEvent.TokenServerState; import fr.ill.ics.bridge.events.TokenEvent.TokenServerState;
import fr.ill.ics.nscclient.sessionmanagement.SessionManager; import fr.ill.ics.nscclient.sessionmanagement.SessionManager;
import fr.ill.ics.util.ConfigManager;
/** /**
* *
...@@ -54,12 +53,12 @@ public class TokenManager { ...@@ -54,12 +53,12 @@ public class TokenManager {
public void freeToken() { public void freeToken() {
SessionManager.getInstance(SERVER_ID).releaseToken(SessionManager.getInstance(SERVER_ID).getSender()); SessionManager.getInstance(SERVER_ID).releaseToken();
} }
public void askForToken(String clientType) { public void askForToken(String clientType) {
SessionManager.getInstance(SERVER_ID).requestToken(clientType, SessionManager.getInstance(SERVER_ID).getSender()); SessionManager.getInstance(SERVER_ID).requestToken(clientType);
} }
} }
\ No newline at end of file
...@@ -39,12 +39,12 @@ public class SessionManager { ...@@ -39,12 +39,12 @@ public class SessionManager {
private int clientId = 0; private int clientId = 0;
// If remote access // If remote access
private String userName; private String remoteUserName;
private String password; private String password;
private String instrumentName; private String instrumentName;
private String sender = null; private String user = null;
private static Map<String, SessionManager> instances = new HashMap<String, SessionManager>(); private static Map<String, SessionManager> instances = new HashMap<String, SessionManager>();
...@@ -169,7 +169,7 @@ public class SessionManager { ...@@ -169,7 +169,7 @@ public class SessionManager {
} }
} }
public void enableRemoteControl(String clientType, String user) { public void enableRemoteControl(String clientType) {
// Create the message type. // Create the message type.
SessionRequests.Message type = SessionRequests.Message.newBuilder() SessionRequests.Message type = SessionRequests.Message.newBuilder()
...@@ -193,7 +193,7 @@ public class SessionManager { ...@@ -193,7 +193,7 @@ public class SessionManager {
} }
} }
public void disableRemoteControl(String clientType, String user) { public void disableRemoteControl(String clientType) {
// Create the message type. // Create the message type.
SessionRequests.Message type = SessionRequests.Message.newBuilder() SessionRequests.Message type = SessionRequests.Message.newBuilder()
...@@ -218,7 +218,7 @@ public class SessionManager { ...@@ -218,7 +218,7 @@ public class SessionManager {
} }
public void requestToken(String clientType, String user) { public void requestToken(String clientType) {
// Create the message type. // Create the message type.
SessionRequests.Message type = SessionRequests.Message.newBuilder() SessionRequests.Message type = SessionRequests.Message.newBuilder()
...@@ -242,7 +242,7 @@ public class SessionManager { ...@@ -242,7 +242,7 @@ public class SessionManager {
} }
} }
public void releaseToken(String user) { public void releaseToken() {
// Create the message type. // Create the message type.
SessionRequests.Message type = SessionRequests.Message.newBuilder() SessionRequests.Message type = SessionRequests.Message.newBuilder()
...@@ -319,7 +319,7 @@ public class SessionManager { ...@@ -319,7 +319,7 @@ public class SessionManager {
} }
public void setSessionInformation(String userName, String password, String instrumentName) { public void setSessionInformation(String userName, String password, String instrumentName) {
this.userName = userName; this.remoteUserName = userName;
this.password = password; this.password = password;
this.instrumentName = instrumentName; this.instrumentName = instrumentName;
} }
...@@ -331,19 +331,19 @@ public class SessionManager { ...@@ -331,19 +331,19 @@ public class SessionManager {
public String getUserName() { public String getUserName() {
return userName; return remoteUserName;
} }
public String getSender() { public String getUser() {
if (sender == null) { if (user == null) {
if (ConfigManager.getInstance().isRemoteClient()) { if (ConfigManager.getInstance().isRemoteClient()) {
sender = getUserName(); user = getUserName();
} else { } else {
sender = getInstrumentName(); user = getInstrumentName();
} }
} }
return sender; return user;
} }
} }
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment