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
11e02b24
Commit
11e02b24
authored
Jan 12, 2018
by
Hélène Ortiz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
3.1.3
parent
16e16dc2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
4 deletions
+19
-4
pom.xml
pom.xml
+1
-1
src/main/java/fr/ill/ics/nscclient/dataprovider/PropertyDatabase.java
...a/fr/ill/ics/nscclient/dataprovider/PropertyDatabase.java
+18
-3
No files found.
pom.xml
View file @
11e02b24
...
...
@@ -2,7 +2,7 @@
<modelVersion>
4.0.0
</modelVersion>
<groupId>
fr.ill.ics
</groupId>
<artifactId>
nomadcommandsystem
</artifactId>
<version>
3.1.3
-SNAPSHOT
</version>
<version>
3.1.3
</version>
<name>
NomadCommandSystem
</name>
<description>
Java bridge for the communication with the Nomad server
</description>
<scm>
...
...
src/main/java/fr/ill/ics/nscclient/dataprovider/PropertyDatabase.java
View file @
11e02b24
...
...
@@ -75,9 +75,6 @@ public class PropertyDatabase {
* @param standardPropertyDescriptor
*/
public
void
addStandardPropertyDescriptor
(
int
servantId
,
StandardPropertyDescriptor
standardPropertyDescriptor
)
{
//System.out.println("added property " + standardPropertyDescriptor.getName() + " to servant " + servantId);
properties
.
put
(
standardPropertyDescriptor
.
getId
(),
standardPropertyDescriptor
);
if
(!
propertiesByServant
.
containsKey
(
servantId
))
{
Set
<
Integer
>
set
=
new
HashSet
<
Integer
>();
...
...
@@ -101,6 +98,12 @@ public class PropertyDatabase {
dynamicPropertiesByServant
.
get
(
servantId
).
add
(
dynamicPropertyDescriptor
);
}
/**
*
* @param servantId
* @param descriptor
*/
public
void
addSpyPropertyDescriptor
(
int
servantId
,
SpyPropertyDescriptor
descriptor
)
{
if
(!
spyPropertiesByServant
.
containsKey
(
servantId
))
{
...
...
@@ -130,6 +133,18 @@ public class PropertyDatabase {
public
StandardPropertyDescriptor
getStandardPropertyDescriptor
(
int
id
)
{
return
properties
.
get
(
id
);
}
public
DynamicPropertyDescriptor
getDynamicPropertyDescriptor
(
String
genericPropertyName
)
{
Iterator
<
Entry
<
Integer
,
DynamicPropertyDescriptor
>>
it
=
dynamicProperties
.
entrySet
().
iterator
();
while
(
it
.
hasNext
())
{
Entry
<
Integer
,
DynamicPropertyDescriptor
>
entry
=
it
.
next
();
if
(
entry
.
getValue
().
getName
().
equals
(
genericPropertyName
))
{
return
entry
.
getValue
();
}
}
return
null
;
}
public
void
removeDynamicPropertyDescriptors
(
int
servantId
)
{
...
...
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