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
5d885f2a
Commit
5d885f2a
authored
Apr 23, 2019
by
ics
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
File management for multiclient version
parent
28960c47
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
src/main/java/fr/ill/ics/bridge/ResourceManager.java
src/main/java/fr/ill/ics/bridge/ResourceManager.java
+6
-2
src/main/java/fr/ill/ics/nscclient/dataprovider/ServantManagerAccessor.java
...ll/ics/nscclient/dataprovider/ServantManagerAccessor.java
+2
-1
No files found.
src/main/java/fr/ill/ics/bridge/ResourceManager.java
View file @
5d885f2a
...
@@ -27,6 +27,10 @@ import fr.ill.ics.nscclient.servant.ResourceNotFoundException;
...
@@ -27,6 +27,10 @@ import fr.ill.ics.nscclient.servant.ResourceNotFoundException;
public
class
ResourceManager
{
public
class
ResourceManager
{
public
final
static
String
NAME
=
"name"
;
public
final
static
String
ISDIRECTORY
=
"isDirectory"
;
public
final
static
String
CHILDREN
=
"children"
;
private
String
serverId
;
private
String
serverId
;
private
static
ResourceManager
instance
=
null
;
private
static
ResourceManager
instance
=
null
;
...
@@ -96,8 +100,8 @@ public class ResourceManager {
...
@@ -96,8 +100,8 @@ public class ResourceManager {
}
}
public
String
getTree
(
String
rootDirectory
)
{
public
String
getTree
(
String
rootDirectory
,
String
extension
)
{
return
ServantManagerAccessor
.
getInstance
(
serverId
).
getTree
(
rootDirectory
);
return
ServantManagerAccessor
.
getInstance
(
serverId
).
getTree
(
rootDirectory
,
extension
);
}
}
...
...
src/main/java/fr/ill/ics/nscclient/dataprovider/ServantManagerAccessor.java
View file @
5d885f2a
...
@@ -1082,7 +1082,7 @@ public class ServantManagerAccessor {
...
@@ -1082,7 +1082,7 @@ public class ServantManagerAccessor {
}
}
public
String
getTree
(
String
rootDirectory
)
{
public
String
getTree
(
String
rootDirectory
,
String
extension
)
{
// Create the message type.
// Create the message type.
ServantManagerRequest
.
Message
type
=
ServantManagerRequest
.
Message
.
newBuilder
()
ServantManagerRequest
.
Message
type
=
ServantManagerRequest
.
Message
.
newBuilder
()
.
setType
(
ServantManagerRequest
.
Message
.
Type
.
GetTree
)
.
setType
(
ServantManagerRequest
.
Message
.
Type
.
GetTree
)
...
@@ -1091,6 +1091,7 @@ public class ServantManagerAccessor {
...
@@ -1091,6 +1091,7 @@ public class ServantManagerAccessor {
// Create the request.
// Create the request.
ServantManagerRequest
.
GetTreeRequest
request
=
ServantManagerRequest
.
GetTreeRequest
.
newBuilder
()
ServantManagerRequest
.
GetTreeRequest
request
=
ServantManagerRequest
.
GetTreeRequest
.
newBuilder
()
.
setRootDirectory
(
rootDirectory
)
.
setRootDirectory
(
rootDirectory
)
.
setExtension
(
extension
)
.
build
();
.
build
();
servantManagerRequester
.
sendTwoParts
(
type
.
toByteArray
(),
request
.
toByteArray
());
servantManagerRequester
.
sendTwoParts
(
type
.
toByteArray
(),
request
.
toByteArray
());
...
...
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