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
6efc0815
Commit
6efc0815
authored
Apr 20, 2020
by
helene ortiz
Browse files
Add parameter 'addServerHome' to method saveFile in ResourceManager.
parent
c8f2cbc6
Changes
5
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
6efc0815
4.0.4 20/04/2020
-----
* Add parameter 'addServerHome' to method saveFile in ResourceManager.
4.0.3 20/04/2020
-----
* Chat files are located on server side: do not create a directory in virtual homes.
...
...
pom.xml
View file @
6efc0815
...
...
@@ -2,7 +2,7 @@
<modelVersion>
4.0.0
</modelVersion>
<groupId>
fr.ill.ics
</groupId>
<artifactId>
nomadcommandsystem
</artifactId>
<version>
4.0.
3
</version>
<version>
4.0.
4
</version>
<name>
NomadCommandSystem
</name>
<description>
Java bridge for the communication with the Nomad server
</description>
<scm>
...
...
src/main/java/fr/ill/ics/bridge/ResourceManager.java
View file @
6efc0815
...
...
@@ -76,8 +76,8 @@ public class ResourceManager {
}
public
void
saveFile
(
String
fileName
,
String
content
,
int
fileType
)
{
CommandZoneAccessor
.
getInstance
(
serverId
).
saveFile
(
fileName
,
content
,
fileType
);
public
void
saveFile
(
String
fileName
,
String
content
,
int
fileType
,
boolean
addServerHome
)
{
CommandZoneAccessor
.
getInstance
(
serverId
).
saveFile
(
fileName
,
content
,
fileType
,
addServerHome
);
}
...
...
src/main/java/fr/ill/ics/core/property/parser/PropertyParser.java
View file @
6efc0815
...
...
@@ -231,7 +231,7 @@ public class PropertyParser extends GenericParser {
}
}
fileContent
=
fileContent
+
"</"
+
TAG_CONTROLLER
+
">"
+
LINE_SEPARATOR
;
ResourceManager
.
getInstance
().
saveFile
(
filename
,
fileContent
,
-
1
);
ResourceManager
.
getInstance
().
saveFile
(
filename
,
fileContent
,
-
1
,
false
);
return
filename
;
}
...
...
src/main/java/fr/ill/ics/nscclient/command/CommandZoneAccessor.java
View file @
6efc0815
...
...
@@ -3185,7 +3185,7 @@ public class CommandZoneAccessor {
}
public
void
saveFile
(
String
fileName
,
String
content
,
int
fileType
)
{
public
void
saveFile
(
String
fileName
,
String
content
,
int
fileType
,
boolean
addServerHome
)
{
// Create the message type.
CommandZoneRequests
.
Message
type
=
CommandZoneRequests
.
Message
.
newBuilder
()
...
...
@@ -3197,6 +3197,7 @@ public class CommandZoneAccessor {
.
setFileName
(
fileName
)
.
setFileType
(
fileType
)
.
setContent
(
content
)
.
setAddServerHome
(
addServerHome
)
.
build
();
commandBoxRequester
.
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