Skip to content

Commit 1731041

Browse files
committed
[UI] Keep showing module name in confirmation popup when only one module
is selected
1 parent 4a7ff51 commit 1731041

File tree

1 file changed

+12
-6
lines changed
  • sensorhub-webui-core/src/main/java/org/sensorhub/ui

1 file changed

+12
-6
lines changed

sensorhub-webui-core/src/main/java/org/sensorhub/ui/AdminUI.java

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -838,7 +838,8 @@ else if (!selectedModules.isEmpty())
838838
return;
839839
}
840840

841-
final ConfirmDialog popup = new ConfirmDialog("Are you sure you want to remove " + selectedModules.size() + " module(s)?</br>All settings will be lost.");
841+
var targetText = (selectedModules.size() == 1) ? selectedModules.get(0).getName() : selectedModules.size() + " modules";
842+
final ConfirmDialog popup = new ConfirmDialog("Are you sure you want to remove " + targetText + "?</br>All settings will be lost.");
842843
popup.addCloseListener(new CloseListener() {
843844
@Override
844845
public void windowClose(CloseEvent e)
@@ -953,7 +954,8 @@ else if (action == REMOVE_SUBMODULE_ACTION)
953954
return;
954955
}
955956

956-
final ConfirmDialog popup = new ConfirmDialog("Are you sure you want to remove " + selectedModules.size() + " module(s)?</br>All settings will be lost.");
957+
var targetText = (selectedModules.size() == 1) ? selectedModules.get(0).getName() : selectedModules.size() + " modules";
958+
final ConfirmDialog popup = new ConfirmDialog("Are you sure you want to remove " + targetText + "?</br>All settings will be lost.");
957959
popup.addCloseListener(new CloseListener() {
958960
@Override
959961
public void windowClose(CloseEvent e)
@@ -998,7 +1000,8 @@ else if (action == START_MODULE_ACTION)
9981000
return;
9991001
}
10001002

1001-
final ConfirmDialog popup = new ConfirmDialog("Are you sure you want to start " + selectedModules.size() + " module(s)?");
1003+
var targetText = (selectedModules.size() == 1) ? selectedModules.get(0).getName() : selectedModules.size() + " modules";
1004+
final ConfirmDialog popup = new ConfirmDialog("Are you sure you want to start " + targetText + "?");
10021005
popup.addCloseListener(new CloseListener() {
10031006
@Override
10041007
public void windowClose(CloseEvent e)
@@ -1048,7 +1051,8 @@ else if (action == STOP_MODULE_ACTION)
10481051
return;
10491052
}
10501053

1051-
final ConfirmDialog popup = new ConfirmDialog("Are you sure you want to stop " + selectedModules.size() + " module(s)?");
1054+
var targetText = (selectedModules.size() == 1) ? selectedModules.get(0).getName() : selectedModules.size() + " modules";
1055+
final ConfirmDialog popup = new ConfirmDialog("Are you sure you want to stop " + targetText + "?");
10521056
popup.addCloseListener(new CloseListener() {
10531057
@Override
10541058
public void windowClose(CloseEvent e)
@@ -1088,7 +1092,8 @@ else if (action == RESTART_MODULE_ACTION)
10881092
return;
10891093
}
10901094

1091-
final ConfirmDialog popup = new ConfirmDialog("Are you sure you want to restart " + selectedModules.size() + " module(s)?");
1095+
var targetText = (selectedModules.size() == 1) ? selectedModules.get(0).getName() : selectedModules.size() + " modules";
1096+
final ConfirmDialog popup = new ConfirmDialog("Are you sure you want to restart " + targetText + "?");
10921097
popup.addCloseListener(new CloseListener() {
10931098
@Override
10941099
public void windowClose(CloseEvent e)
@@ -1128,7 +1133,8 @@ else if (action == REINIT_MODULE_ACTION)
11281133
return;
11291134
}
11301135

1131-
final ConfirmDialog popup = new ConfirmDialog("Are you sure you want to force re-init " + selectedModules.size() + " module(s)?");
1136+
var targetText = (selectedModules.size() == 1) ? selectedModules.get(0).getName() : selectedModules.size() + " modules";
1137+
final ConfirmDialog popup = new ConfirmDialog("Are you sure you want to force re-init " + targetText + "?");
11321138
popup.addCloseListener(new CloseListener() {
11331139
@Override
11341140
public void windowClose(CloseEvent e)

0 commit comments

Comments
 (0)