[R-Console] Adapt delete action to new UI recommendations
diff --git a/r/org.eclipse.statet.nico.ui/src/org/eclipse/statet/nico/ui/util/ToolMessageDialog.java b/r/org.eclipse.statet.nico.ui/src/org/eclipse/statet/nico/ui/util/ToolMessageDialog.java
index 58c14d9..2085645 100644
--- a/r/org.eclipse.statet.nico.ui/src/org/eclipse/statet/nico/ui/util/ToolMessageDialog.java
+++ b/r/org.eclipse.statet.nico.ui/src/org/eclipse/statet/nico/ui/util/ToolMessageDialog.java
@@ -31,11 +31,12 @@
public class ToolMessageDialog extends MessageDialog {
- public static boolean openConfirm(final ToolProcess tool, final Shell parent, final String title, final String message) {
+ public static boolean openConfirm(final ToolProcess tool, final Shell parent, final String title, final String message,
+ final String okLabel) {
final ToolMessageDialog dialog= new ToolMessageDialog(tool,
parent, title, null,
message, QUESTION,
- new String[] { IDialogConstants.OK_LABEL, IDialogConstants.CANCEL_LABEL }, 0 );
+ new String[] { okLabel, IDialogConstants.CANCEL_LABEL }, 0 );
return (dialog.open() == 0);
}
diff --git a/r/org.eclipse.statet.r.ui/srcDebug/org/eclipse/statet/internal/r/objectbrowser/DeleteHandler.java b/r/org.eclipse.statet.r.ui/srcDebug/org/eclipse/statet/internal/r/objectbrowser/DeleteHandler.java
index a6af569..cb4eafd 100644
--- a/r/org.eclipse.statet.r.ui/srcDebug/org/eclipse/statet/internal/r/objectbrowser/DeleteHandler.java
+++ b/r/org.eclipse.statet.r.ui/srcDebug/org/eclipse/statet/internal/r/objectbrowser/DeleteHandler.java
@@ -214,8 +214,8 @@
}
final StringBuilder message = new StringBuilder(names.size() == 1 ?
- "Are you sure you want to delete the object" :
- NLS.bind("Are you sure you want to delete these {0} objects:", names.size()));
+ "Delete this object?" :
+ NLS.bind("Delete these {0} objects?", names.size()));
final int show = (names.size() > 5) ? 3 : names.size();
for (int i = 0; i < show; i++) {
message.append("\n\t"); //$NON-NLS-1$
@@ -226,7 +226,8 @@
}
final ToolProcess process = this.view.getTool();
- if (ToolMessageDialog.openConfirm(process, this.view.getSite().getShell(), "Delete", message.toString())) {
+ if (ToolMessageDialog.openConfirm(process, this.view.getSite().getShell(), "Delete R Objects",
+ message.toString(), "Delete")) {
process.getQueue().add(new DeleteRunnable(names, commands, topEnvirs));
}
