Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
NomadCommandSystem
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Instrument Control
NomadCommandSystem
Commits
0bf3042b
Commit
0bf3042b
authored
Sep 28, 2020
by
Cristina Cocho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Corrected some problems found after merge
parent
03e5d06a
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
115 additions
and
209 deletions
+115
-209
src/main/java/fr/ill/ics/nscclient/dataprovider/ServantManagerAccessor.java
...ll/ics/nscclient/dataprovider/ServantManagerAccessor.java
+114
-208
src/main/java/fr/ill/ics/nscclient/sessionmanagement/SessionManager.java
...r/ill/ics/nscclient/sessionmanagement/SessionManager.java
+1
-1
No files found.
src/main/java/fr/ill/ics/nscclient/dataprovider/ServantManagerAccessor.java
View file @
0bf3042b
This diff is collapsed.
Click to expand it.
src/main/java/fr/ill/ics/nscclient/sessionmanagement/SessionManager.java
View file @
0bf3042b
...
@@ -41,7 +41,7 @@ public class SessionManager {
...
@@ -41,7 +41,7 @@ public class SessionManager {
// If remote access
// If remote access
private
String
remoteUserName
;
private
String
remoteUserName
;
private
String
password
;
private
String
password
;
private
String
instrumentName
;
private
String
instrumentName
=
""
;
private
int
plotyVersion
=
0
;
private
int
plotyVersion
=
0
;
private
String
user
=
null
;
private
String
user
=
null
;
...
...
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