[404672] delete key on multiple modules sends wrong deltakind flag
diff --git a/features/org.eclipse.wst.server_ui.feature.patch/buildnotes_org.eclipse.wst.server_ui.feature.patch.html b/features/org.eclipse.wst.server_ui.feature.patch/buildnotes_org.eclipse.wst.server_ui.feature.patch.html
index fc32f1b..5b2e4cb 100644
--- a/features/org.eclipse.wst.server_ui.feature.patch/buildnotes_org.eclipse.wst.server_ui.feature.patch.html
+++ b/features/org.eclipse.wst.server_ui.feature.patch/buildnotes_org.eclipse.wst.server_ui.feature.patch.html
@@ -21,6 +21,7 @@
<p>Bug <a href='https://bugs.eclipse.org/390583'>390583</a>. [Accessibility] Run on server table columns cannot be resized with keyboard only</p>
<p>Bug <a href='https://bugs.eclipse.org/390584'>390584</a>. [Accessibility] TCP/IP monitor view uses white background with green text in high contrast mode and labels are unreadable by a screenreader</p>
<p>Bug <a href='https://bugs.eclipse.org/400855'>400855</a>. [Accessibility] Mouse over on the module status in the server's view fails in high contrast mode</p>
+<p>Bug <a href='https://bugs.eclipse.org/404672'>404672</a>. delete key on multiple modules sends wrong deltakind flag</p>
</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.server_ui.feature.patch/feature.properties b/features/org.eclipse.wst.server_ui.feature.patch/feature.properties
index ad89a1f..da86e26 100644
--- a/features/org.eclipse.wst.server_ui.feature.patch/feature.properties
+++ b/features/org.eclipse.wst.server_ui.feature.patch/feature.properties
@@ -31,6 +31,7 @@
Bug https://bugs.eclipse.org/390583 [Accessibility] Run on server table columns cannot be resized with keyboard only\n\
Bug https://bugs.eclipse.org/390584 [Accessibility] TCP/IP monitor view uses white background with green text in high contrast mode and labels are unreadable by a screenreader\n\
Bug https://bugs.eclipse.org/400855 [Accessibility] Mouse over on the module status in the server's view fails in high contrast mode\n\
+Bug https://bugs.eclipse.org/404672 delete key on multiple modules sends wrong deltakind flag\n\
\n\
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/RemoveModuleAction.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/RemoveModuleAction.java
index 0048e68..a445aa4 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/RemoveModuleAction.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/RemoveModuleAction.java
@@ -71,12 +71,20 @@
public void run() {
String message = module.length == 1 ? Messages.dialogRemoveModuleConfirm : Messages.dialogRemoveModulesConfirm;
if (MessageDialog.openConfirm(shell, Messages.defaultDialogTitle, message)) {
- for( int i = 0; i < module.length; i++ )
- handleRemoveOneModule(module[i]);
+ removeModules(module);
}
}
+ /**
+ *
+ * @param mod
+ * @deprecated use removeModules instead.
+ */
protected void handleRemoveOneModule(final IModule mod) {
+ removeModules(new IModule[] { mod });
+ }
+
+ protected void removeModules(final IModule[] modules) {
try {
final ProgressMonitorDialog dialog = new ProgressMonitorDialog(shell);
dialog.setBlockOnOpen(false);
@@ -88,7 +96,7 @@
if (monitor.isCanceled()) {
return;
}
- wc.modifyModules(null, new IModule[] { mod }, monitor);
+ wc.modifyModules(null, modules, monitor);
if (monitor.isCanceled()) {
return;
}
