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
bca2066b
Commit
bca2066b
authored
Jul 10, 2020
by
legoc
Browse files
Merge branch 'V4.0' into check-client-token
parents
980a1fbb
8b4d3fbe
Changes
5
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
bca2066b
4.0.27 06/07/2020
------
* Change updateImageData message for ploty version 1: give all the path of the image
* Change updateImageData message for ploty version 1: give all the path of the image
* Store plotyVersion in ConfigManager.
4.0.26 01/07/2020
4.0.26 01/07/2020
------
------
...
...
pom.xml
View file @
bca2066b
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
<groupId>
fr.ill.ics
</groupId>
<groupId>
fr.ill.ics
</groupId>
<artifactId>
nomadcommandsystem
</artifactId>
<artifactId>
nomadcommandsystem
</artifactId>
<version>
4.0.2
6
</version>
<version>
4.0.2
7
</version>
<name>
NomadCommandSystem
</name>
<name>
NomadCommandSystem
</name>
<description>
Java bridge for the communication with the Nomad server
</description>
<description>
Java bridge for the communication with the Nomad server
</description>
<scm>
<scm>
...
...
src/main/java/fr/ill/ics/bridge/ChangeManager.java
View file @
bca2066b
...
@@ -30,7 +30,6 @@ import fr.ill.ics.nscclient.notification.commandzone.sync.CommandZoneSyncEventCl
...
@@ -30,7 +30,6 @@ import fr.ill.ics.nscclient.notification.commandzone.sync.CommandZoneSyncEventCl
import
fr.ill.ics.nscclient.ploty.PlotyInstance
;
import
fr.ill.ics.nscclient.ploty.PlotyInstance
;
import
fr.ill.ics.nscclient.sessionmanagement.SessionManager
;
import
fr.ill.ics.nscclient.sessionmanagement.SessionManager
;
import
fr.ill.ics.nscclient.survey.SurveySubscriberImpl
;
import
fr.ill.ics.nscclient.survey.SurveySubscriberImpl
;
import
fr.ill.ics.util.ConfigManager
;
public
class
ChangeManager
{
public
class
ChangeManager
{
...
...
src/main/java/fr/ill/ics/nscclient/sessionmanagement/ServerSessionManager.java
View file @
bca2066b
...
@@ -152,7 +152,7 @@ public class ServerSessionManager {
...
@@ -152,7 +152,7 @@ public class ServerSessionManager {
SurveySubscriberImpl
.
getInstance
(
serverId
).
unsubscribe
();
SurveySubscriberImpl
.
getInstance
(
serverId
).
unsubscribe
();
DataChangeSubscriber
.
getInstance
(
serverId
).
unsubscribe
();
DataChangeSubscriber
.
getInstance
(
serverId
).
unsubscribe
();
if
(
serverId
.
equals
(
"real"
))
{
if
(
serverId
.
equals
(
"real"
))
{
if
(
Session
Manager
.
getInstance
(
serverId
).
getPlotyVersion
()
==
2
)
{
if
(
Config
Manager
.
getInstance
().
getPlotyVersion
()
==
2
)
{
PlotyInstance
.
getInstance
().
unsubscribe
();
PlotyInstance
.
getInstance
().
unsubscribe
();
}
}
}
}
...
@@ -191,7 +191,7 @@ public class ServerSessionManager {
...
@@ -191,7 +191,7 @@ public class ServerSessionManager {
}
}
if
(
serverId
.
equals
(
"real"
))
{
if
(
serverId
.
equals
(
"real"
))
{
if
(
Session
Manager
.
getInstance
(
serverId
).
getPlotyVersion
()
==
2
)
{
if
(
Config
Manager
.
getInstance
().
getPlotyVersion
()
==
2
)
{
try
{
try
{
PlotyInstance
.
getInstance
().
unsubscribe
();
PlotyInstance
.
getInstance
().
unsubscribe
();
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
...
...
src/main/java/fr/ill/ics/util/ConfigManager.java
View file @
bca2066b
...
@@ -41,6 +41,8 @@ import java.util.logging.Level;
...
@@ -41,6 +41,8 @@ import java.util.logging.Level;
import
java.util.logging.Logger
;
import
java.util.logging.Logger
;
import
fr.ill.ics.bridge.TokenManager
;
import
fr.ill.ics.bridge.TokenManager
;
import
fr.ill.ics.bridge.command.CommandZoneWrapper
;
import
fr.ill.ics.nscclient.sessionmanagement.SessionManager
;
import
fr.ill.ics.util.exception.CommandNotFoundException
;
import
fr.ill.ics.util.exception.CommandNotFoundException
;
import
fr.ill.ics.util.exception.ConfigurationException
;
import
fr.ill.ics.util.exception.ConfigurationException
;
import
fr.ill.ics.util.exception.ConfigurationException.PluginType
;
import
fr.ill.ics.util.exception.ConfigurationException.PluginType
;
...
@@ -128,6 +130,8 @@ public class ConfigManager {
...
@@ -128,6 +130,8 @@ public class ConfigManager {
public
static
String
NOMADENDPOINT_DIRECTORY
=
System
.
getProperty
(
"java.io.tmpdir"
)
+
FILE_SEPARATOR
+
"nomad"
;
public
static
String
NOMADENDPOINT_DIRECTORY
=
System
.
getProperty
(
"java.io.tmpdir"
)
+
FILE_SEPARATOR
+
"nomad"
;
public
static
String
NOMADENDPOINT_FILE
=
"session.properties"
;
public
static
String
NOMADENDPOINT_FILE
=
"session.properties"
;
private
int
plotyVersion
=
1
;
/**
/**
* @return the unique instance of this class
* @return the unique instance of this class
*/
*/
...
@@ -676,4 +680,12 @@ public class ConfigManager {
...
@@ -676,4 +680,12 @@ public class ConfigManager {
}
}
}
}
}
}
public
void
setPlotyVersion
()
{
plotyVersion
=
SessionManager
.
getInstance
(
CommandZoneWrapper
.
SERVER_ID
).
getPlotyVersion
();
}
public
int
getPlotyVersion
()
{
return
plotyVersion
;
}
}
}
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