Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
S
SnapArchivingServers
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software Control System
Tango controls archiving
SnapArchivingServers
Commits
879ab692
Commit
879ab692
authored
Feb 19, 2016
by
Raphael GIRARDOT
Browse files
Options
Downloads
Patches
Plain Diff
spelling correction
parent
68b4c6e5
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
snaparchiver/src/main/java/SnapArchiver/SnapArchiver.java
+2
-2
2 additions, 2 deletions
snaparchiver/src/main/java/SnapArchiver/SnapArchiver.java
snapmanager/src/main/java/SnapManager/SnapManager.java
+4
-4
4 additions, 4 deletions
snapmanager/src/main/java/SnapManager/SnapManager.java
with
6 additions
and
6 deletions
snaparchiver/src/main/java/SnapArchiver/SnapArchiver.java
+
2
−
2
View file @
879ab692
...
...
@@ -128,7 +128,7 @@ import fr.soleil.archiving.snap.api.persistence.SnapshotPersistenceManager;
import
fr.soleil.archiving.snap.api.persistence.SnapshotPersistenceManagerFactory
;
import
fr.soleil.archiving.snap.api.tools.SnapAttributeExtract
;
import
fr.soleil.archiving.snap.api.tools.SnapContext
;
import
fr.soleil.archiving.snap.api.tools.Snap
S
hot
;
import
fr.soleil.archiving.snap.api.tools.Snap
s
hot
;
import
fr.soleil.archiving.snap.api.tools.SnapshotingException
;
/**
...
...
@@ -398,7 +398,7 @@ public class SnapArchiver extends DeviceImpl
int
snapId
=
-
1
;
try
{
Snap
S
hot
snapShot
=
SnapManagerApi
.
registerSnapShot
(
contextID
);
Snap
s
hot
snapShot
=
SnapManagerApi
.
registerSnapShot
(
contextID
);
if
(
snapShot
==
null
)
{
Except
.
throw_exception
(
"INPUT_ERROR"
,
"Invalid Context ID"
,
"SnapArchiver.TriggerLaunchSnapshot"
);
}
...
...
This diff is collapsed.
Click to expand it.
snapmanager/src/main/java/SnapManager/SnapManager.java
+
4
−
4
View file @
879ab692
...
...
@@ -144,7 +144,7 @@ import fr.soleil.archiving.snap.api.manager.SnapManagerImpl;
import
fr.soleil.archiving.snap.api.tools.SnapAttributeExtract
;
import
fr.soleil.archiving.snap.api.tools.SnapConst
;
import
fr.soleil.archiving.snap.api.tools.SnapContext
;
import
fr.soleil.archiving.snap.api.tools.Snap
S
hot
;
import
fr.soleil.archiving.snap.api.tools.Snap
s
hot
;
import
fr.soleil.archiving.snap.api.tools.SnapshotingException
;
import
fr.soleil.tango.clientapi.TangoCommand
;
...
...
@@ -385,7 +385,7 @@ public class SnapManager extends DeviceImpl
m_manager
=
new
SnapManagerImpl
();
}
SnapContext
context
=
new
SnapContext
();
Snap
S
hot
snapShot
=
null
;
Snap
s
hot
snapShot
=
null
;
context
.
setId
(
contextID
);
try
{
snapShot
=
m_manager
.
launchSnapshot
(
context
);
...
...
@@ -414,7 +414,7 @@ public class SnapManager extends DeviceImpl
get_logger
().
info
(
"Entering set_equipments_with_snapshot() xxx"
);
try
{
// System.out.println("set_equipments_with_snapshot(String[] argin)");
Snap
S
hot
snapShot
=
new
Snap
S
hot
(
argin
);
Snap
s
hot
snapShot
=
new
Snap
s
hot
(
argin
);
// ---Add your Own code to control device here ---
// System.out.println("snapshot : " + snapShot.toString());
SnapManagerApi
.
TriggerSetEquipments
(
snapShot
);
...
...
@@ -625,7 +625,7 @@ public class SnapManager extends DeviceImpl
if
(
snapAttributeExtractArray
==
null
||
snapAttributeExtractArray
.
length
==
0
)
{
Except
.
throw_exception
(
"CONFIGURATION_ERROR"
,
"Invalid SnapId"
,
"SnapManager.SetEquipments"
);
}
Snap
S
hot
snapShot
=
Snap
S
hot
.
getPartialSnapShot
(
argin
,
snapId
,
snapAttributeExtractArray
);
Snap
s
hot
snapShot
=
Snap
s
hot
.
getPartialSnapShot
(
argin
,
snapId
,
snapAttributeExtractArray
);
if
(
snapShot
==
null
)
{
return
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment