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
NomadGUI
Commits
c1cf8cb4
Commit
c1cf8cb4
authored
Sep 07, 2020
by
helene ortiz
Browse files
Fix bug: delete of an unknown command box in the launch pad did not
delete it on server side.
parent
5a08aa5c
Changes
2
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
c1cf8cb4
...
...
@@ -4,6 +4,7 @@
* Add 2 preference values to restore main window x and y.
* Fix bug: PAL and XBU files were not read properly.
* Fix bug: when synchronizing view state of launchpad (among box view or text view), also synchronize swithview button icon.
* Fix bug: delete of an unknown command box in the launch pad did not delete it on server side.
4.0.60 26/08/2020
------
...
...
src/main/java/fr/ill/ics/client/control/command/ServerCommandZone.java
View file @
c1cf8cb4
...
...
@@ -456,24 +456,18 @@ public class ServerCommandZone extends CommandZone implements ServerCommandState
*/
public
void
delete
(
CommandBox
commandBox
)
{
if
(
commandBox
instanceof
UnknownCommandBox
)
{
// H.ORTIZ 22 AUG 2016: No need to delete stuff from an unknown command box in the server part, code from super class is sufficient
super
.
delete
(
commandBox
);
}
else
{
IServerCommand
serverCommandToDelete
=
((
IServerCommandBox
)
commandBox
).
getServerCommand
();
IServerCommand
serverCommandToDelete
=
((
IServerCommandBox
)
commandBox
).
getServerCommand
();
// detach from command in server before delete
((
IServerCommandBox
)
commandBox
).
detach
();
// detach from command in server before delete
((
IServerCommandBox
)
commandBox
).
detach
();
if
(
CommandZoneWrapper
.
getInstance
(
serverId
).
deleteCommand
(
serverCommandToDelete
))
{
super
.
delete
(
commandBox
);
if
(
CommandZoneWrapper
.
getInstance
(
serverId
).
deleteCommand
(
serverCommandToDelete
))
{
super
.
delete
(
commandBox
);
}
else
{
// re-attach if delete failed
((
IServerCommandBox
)
commandBox
).
attach
();
MainWindowPeer
.
getInstance
().
displayAccessDeniedDialog
();
}
}
else
{
// re-attach if delete failed
((
IServerCommandBox
)
commandBox
).
attach
();
MainWindowPeer
.
getInstance
().
displayAccessDeniedDialog
();
}
}
...
...
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