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
0ec1c595
Commit
0ec1c595
authored
Apr 22, 2020
by
Locatelli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add plotyVersion server property
Do switch stuff between this version
parent
3fb0e8c1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
7 deletions
+23
-7
src/main/java/fr/ill/ics/bridge/ChangeManager.java
src/main/java/fr/ill/ics/bridge/ChangeManager.java
+4
-1
src/main/java/fr/ill/ics/nscclient/sessionmanagement/ServerSessionManager.java
...ics/nscclient/sessionmanagement/ServerSessionManager.java
+11
-6
src/main/java/fr/ill/ics/util/ConfigManager.java
src/main/java/fr/ill/ics/util/ConfigManager.java
+8
-0
No files found.
src/main/java/fr/ill/ics/bridge/ChangeManager.java
View file @
0ec1c595
...
...
@@ -28,6 +28,7 @@ import fr.ill.ics.nscclient.notification.commandzone.CommandZoneEventClient;
import
fr.ill.ics.nscclient.notification.commandzone.sync.CommandZoneSyncEventClient
;
import
fr.ill.ics.nscclient.ploty.PlotyInstance
;
import
fr.ill.ics.nscclient.survey.SurveySubscriberImpl
;
import
fr.ill.ics.util.ConfigManager
;
public
class
ChangeManager
{
...
...
@@ -51,7 +52,9 @@ public class ChangeManager {
DataNotificationClient
.
getInstance
().
readAndDispatch
();
CommandZoneEventClient
.
getInstance
().
readAndDispatch
();
CommandZoneSyncEventClient
.
getInstance
().
readAndDispatch
();
PlotyInstance
.
getInstance
().
readAndDispatch
();
if
(
ConfigManager
.
getInstance
().
getPlotyVersion
()
==
2
)
{
PlotyInstance
.
getInstance
().
readAndDispatch
();
}
// Iterate the map of log subscribers.
Map
<
String
,
LogSubscriber
>
logSubscriberMap
=
LogSubscriber
.
getInstances
();
...
...
src/main/java/fr/ill/ics/nscclient/sessionmanagement/ServerSessionManager.java
View file @
0ec1c595
...
...
@@ -39,6 +39,7 @@ import fr.ill.ics.nscclient.servant.ConfigurationManager.LoadFailure;
import
fr.ill.ics.nscclient.sessionmanagement.SessionManager.ClientAlreadyLaunchedException
;
import
fr.ill.ics.nscclient.survey.SurveySubscriberImpl
;
import
fr.ill.ics.nscclient.variable.VariableManagerAccessor
;
import
fr.ill.ics.util.ConfigManager
;
public
class
ServerSessionManager
{
...
...
@@ -151,7 +152,9 @@ public class ServerSessionManager {
SurveySubscriberImpl
.
getInstance
(
serverId
).
unsubscribe
();
DataChangeSubscriber
.
getInstance
(
serverId
).
unsubscribe
();
if
(
serverId
.
equals
(
"real"
))
{
PlotyInstance
.
getInstance
().
unsubscribe
();
if
(
ConfigManager
.
getInstance
().
getPlotyVersion
()
==
2
)
{
PlotyInstance
.
getInstance
().
unsubscribe
();
}
}
DataAccessor
.
getInstance
(
serverId
).
reset
();
...
...
@@ -188,11 +191,13 @@ public class ServerSessionManager {
}
if
(
serverId
.
equals
(
"real"
))
{
try
{
PlotyInstance
.
getInstance
().
unsubscribe
();
}
catch
(
Exception
e
)
{
System
.
out
.
println
(
"Cannot unsubscribe data change"
);
}
if
(
ConfigManager
.
getInstance
().
getPlotyVersion
()
==
2
)
{
try
{
PlotyInstance
.
getInstance
().
unsubscribe
();
}
catch
(
Exception
e
)
{
System
.
out
.
println
(
"Cannot unsubscribe data change"
);
}
}
}
}
...
...
src/main/java/fr/ill/ics/util/ConfigManager.java
View file @
0ec1c595
...
...
@@ -615,6 +615,14 @@ public class ConfigManager {
return
false
;
}
public
int
getPlotyVersion
()
{
String
value
=
getStringOrNothingAtAll
(
"plotyVersion"
);
if
(
value
!=
null
)
{
return
Integer
.
valueOf
(
value
);
}
return
1
;
}
public
boolean
isRemoteClient
()
{
return
remoteClient
;
}
...
...
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