Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Instrument Control
NomadCommandSystem
Commits
847744ec
Commit
847744ec
authored
Apr 01, 2020
by
helene ortiz
Browse files
remove password from login methods + use last YLG's method to login
parent
75eaf520
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/main/java/fr/ill/ics/bridge/LoginManager.java
View file @
847744ec
...
...
@@ -42,9 +42,9 @@ public class LoginManager {
public
class
ConnectionFailure
extends
Exception
{};
public
void
login
(
String
login
,
String
password
,
boolean
standalone
,
String
serverId
)
throws
LoginIncorrectException
,
ClientAlreadyLaunchedException
,
ConnectionFailure
{
public
void
login
(
String
login
,
boolean
standalone
,
String
serverId
)
throws
LoginIncorrectException
,
ClientAlreadyLaunchedException
,
ConnectionFailure
{
try
{
ServerSessionManager
.
getInstance
(
serverId
).
login
(
standalone
);
ServerSessionManager
.
getInstance
(
serverId
).
login
(
standalone
,
login
);
}
catch
(
SessionManager
.
ClientAlreadyLaunchedException
e
)
{
throw
new
ClientAlreadyLaunchedException
();
}
catch
(
ServerSessionManager
.
ConnectionFailure
e
)
{
...
...
src/main/java/fr/ill/ics/nscclient/sessionmanagement/ServerSessionManager.java
View file @
847744ec
...
...
@@ -82,12 +82,12 @@ public class ServerSessionManager {
return
instances
.
get
(
serverId
);
}
public
void
login
(
boolean
standAlone
)
throws
SessionManager
.
ClientAlreadyLaunchedException
,
ConnectionFailure
,
LoadFailure
{
public
void
login
(
boolean
standAlone
,
String
user
)
throws
SessionManager
.
ClientAlreadyLaunchedException
,
ConnectionFailure
,
LoadFailure
{
init
();
try
{
SessionManager
.
getInstance
(
serverId
).
login
(
standAlone
);
SessionManager
.
getInstance
(
serverId
).
login
(
standAlone
,
user
);
}
catch
(
ClientAlreadyLaunchedException
e
)
{
// Only rethrow the exception. The call to logoutAll is made in the main application.
...
...
src/main/java/fr/ill/ics/util/ConfigManager.java
View file @
847744ec
...
...
@@ -104,6 +104,7 @@ public class ConfigManager {
public
static
final
String
CLIENT_TYPE_PROPERTY
=
"clientType"
;
public
final
static
String
FCU_EXTENSION
=
".txt"
;
public
static
final
String
MAIN_USER
=
"main"
;
private
Set
<
String
>
instrumentsAllowingPALFiles
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment