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
c68a83fe
Commit
c68a83fe
authored
Sep 18, 2019
by
Cristina Cocho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Work done related to the setting/change of a servant name via Configura
parent
73740fde
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
38 additions
and
1 deletion
+38
-1
src/main/java/fr/ill/ics/nscclient/dataprovider/ServantDatabase.java
...va/fr/ill/ics/nscclient/dataprovider/ServantDatabase.java
+22
-0
src/main/java/fr/ill/ics/nscclient/dataprovider/ServantManagerAccessor.java
...ll/ics/nscclient/dataprovider/ServantManagerAccessor.java
+11
-0
src/main/java/fr/ill/ics/nscclient/servant/ClientControllerServantDescriptor.java
.../nscclient/servant/ClientControllerServantDescriptor.java
+1
-1
src/main/java/fr/ill/ics/nscclient/servant/ClientServantDescriptor.java
...fr/ill/ics/nscclient/servant/ClientServantDescriptor.java
+4
-0
No files found.
src/main/java/fr/ill/ics/nscclient/dataprovider/ServantDatabase.java
View file @
c68a83fe
...
@@ -22,10 +22,14 @@ import java.util.Collection;
...
@@ -22,10 +22,14 @@ import java.util.Collection;
import
java.util.Iterator
;
import
java.util.Iterator
;
import
java.util.LinkedHashMap
;
import
java.util.LinkedHashMap
;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.Map.Entry
;
import
java.util.Optional
;
import
java.util.Set
;
import
java.util.Set
;
import
java.util.TreeSet
;
import
java.util.TreeSet
;
import
fr.ill.ics.nscclient.dataprovider.DataAccessor.ClientConfigurationState
;
import
fr.ill.ics.nscclient.dataprovider.DataAccessor.ClientConfigurationState
;
import
fr.ill.ics.nscclient.servant.ClientControllerServantDescriptor
;
import
fr.ill.ics.nscclient.servant.ClientControllerServantDescriptor.ReferencesDescriptor
;
import
fr.ill.ics.nscclient.servant.ClientServantDescriptor
;
import
fr.ill.ics.nscclient.servant.ClientServantDescriptor
;
public
class
ServantDatabase
{
public
class
ServantDatabase
{
...
@@ -247,4 +251,22 @@ public class ServantDatabase {
...
@@ -247,4 +251,22 @@ public class ServantDatabase {
controllers
.
clear
();
controllers
.
clear
();
}
}
/*
* Method from Configura project. Update all references to an specific servant.
* The update is related to a change of name. Is it possible to be due to another parameter change (like the type or the role?)
*/
public
void
updateReferencesToServant
(
ClientServantDescriptor
servantDescriptor
,
String
servantDescriptorName
)
{
// The descriptor is the real servant descriptor of the reference and it can be a driver or controller. However, we will search only in the controllers because they are the only ones that have references.
Iterator
<
Entry
<
Integer
,
ClientServantDescriptor
>>
it
=
controllers
.
entrySet
().
iterator
();
while
(
it
.
hasNext
())
{
ClientControllerServantDescriptor
controllerDescriptor
=
(
ClientControllerServantDescriptor
)
it
.
next
().
getValue
();
Optional
<
ReferencesDescriptor
>
refDescriptor
=
controllerDescriptor
.
getReferencesDescriptor
().
stream
().
filter
(
referenceDescriptor
->
(
referenceDescriptor
.
getName
().
equals
(
servantDescriptor
.
getName
())
&&
referenceDescriptor
.
getType
().
equals
(
servantDescriptor
.
getType
()))).
findAny
();
if
(
refDescriptor
.
isPresent
())
{
ReferencesDescriptor
descript
=
refDescriptor
.
get
();
// Update the name
descript
.
setName
(
servantDescriptorName
);
}
}
}
}
}
\ No newline at end of file
src/main/java/fr/ill/ics/nscclient/dataprovider/ServantManagerAccessor.java
View file @
c68a83fe
...
@@ -571,6 +571,17 @@ public class ServantManagerAccessor {
...
@@ -571,6 +571,17 @@ public class ServantManagerAccessor {
// TODO Auto-generated catch block
// TODO Auto-generated catch block
e
.
printStackTrace
();
e
.
printStackTrace
();
}
}
if
(!
answer
.
equals
(
"NOT OK"
))
{
ClientServantDescriptor
descriptor
=
ServantDatabase
.
getInstance
().
getServantDescriptorWithId
(
servantID
);
// First update all references to the servant whose name has been changed
ServantDatabase
.
getInstance
().
updateReferencesToServant
(
descriptor
,
servantName
);
// Second update the descriptor of servant
descriptor
.
setName
(
servantName
);
// The answer is not the name!
}
return
answer
;
return
answer
;
}
}
...
...
src/main/java/fr/ill/ics/nscclient/servant/ClientControllerServantDescriptor.java
View file @
c68a83fe
...
@@ -79,7 +79,7 @@ public class ClientControllerServantDescriptor extends ClientServantDescriptor {
...
@@ -79,7 +79,7 @@ public class ClientControllerServantDescriptor extends ClientServantDescriptor {
}
}
public
boolean
isConfigured
()
{
public
boolean
isConfigured
()
{
return
(
name
!=
NOT_CONFIGURED_NAME
);
return
!
name
.
equals
(
NOT_CONFIGURED_NAME
);
}
}
}
}
...
...
src/main/java/fr/ill/ics/nscclient/servant/ClientServantDescriptor.java
View file @
c68a83fe
...
@@ -85,6 +85,10 @@ public class ClientServantDescriptor {
...
@@ -85,6 +85,10 @@ public class ClientServantDescriptor {
public
boolean
isRoot
()
{
public
boolean
isRoot
()
{
return
isRoot
;
return
isRoot
;
}
}
public
void
setName
(
String
name
)
{
this
.
name
=
name
;
}
public
void
setVisible
(
boolean
isVisible
)
{
public
void
setVisible
(
boolean
isVisible
)
{
this
.
isVisible
=
isVisible
;
this
.
isVisible
=
isVisible
;
...
...
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