- * The Dialog implementation of this framework method lays
- * out a button bar and calls the createButtonsForButtonBar
- * framework method to populate it. Subclasses may override.
- *
- * The returned control's layout data must be an instance of
- * GridData.
- *
null if
+ * it cannot be determined.
*/
- protected Control createButtonBar(Composite parent) {
- // Create a composite for the button bar contents.
- final Composite composite = new Composite(parent, SWT.NONE);
- composite.setLayout(new GridLayout());
- composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- composite.setBackground(parent.getBackground());
-
- /*
- * Figure out which key is used to open the key assist. If no key, then
- * just return.
- */
+ private String getKeySequenceString() {
final Command command = commandService
.getCommand("org.eclipse.ui.window.showKeyAssist"); //$NON-NLS-1$
final TriggerSequence[] keyBindings = bindingService
@@ -427,88 +386,27 @@
break;
}
if (keySequence == null) {
- return composite; // couldn't find a suitable key binding
+ return null; // couldn't find a suitable key binding
}
- // Create a horizontal separator line
- // Looks silly in this dialog, but might be useful in the general case.
- // final Label separator = new Label(composite, SWT.SEPARATOR
- // | SWT.HORIZONTAL | SWT.LINE_DOT);
- // separator.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- // Create the text widget
- final Label text = new Label(composite, SWT.NONE);
- text.setLayoutData(new GridData(SWT.END, SWT.CENTER, true, false));
- text.setBackground(composite.getBackground());
- text.setText(MessageFormat.format(Util.translateString(RESOURCE_BUNDLE,
+ return MessageFormat.format(Util.translateString(RESOURCE_BUNDLE,
"openPreferencePage"), //$NON-NLS-1$
- new Object[] { keySequence.format() }));
-
- return composite;
- }
-
- /**
- * Creates the contents of the dialog. This simply changes the colour of the
- * background to be SWT.COLOR_INFO_BACKGROUND and then calls
- * the super method.
- *
- * @param parent
- * The parent composite to contain the dialog contents; must not
- * be null.
- * @return The control for the dialog contents; must not be
- * null.
- */
- protected final Control createContents(final Composite parent) {
- // Create a black border around the outside of the shell.
- final Display display = parent.getDisplay();
- parent.setBackground(display.getSystemColor(SWT.COLOR_BLACK));
- final GridLayout shellLayout = new GridLayout(1, false);
- shellLayout.marginHeight = 1;
- shellLayout.marginWidth = 1;
- parent.setLayout(shellLayout);
-
- /*
- * Hook up the listeners and register the shell with the context
- * support.
- */
- registerListeners();
- registerShellType();
-
- // Create the top-level composite for the dialog
- final Composite contents = new Composite(parent, SWT.NONE);
- contents.setBackground(display
- .getSystemColor(SWT.COLOR_INFO_BACKGROUND));
- final GridLayout contentLayout = new GridLayout();
- contentLayout.marginHeight = 1;
- contentLayout.marginWidth = 1;
- contents.setLayout(contentLayout);
- contents.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- // Initialize the dialog units.
- initializeDialogUnits(contents);
-
- // Create the dialog area and button bar
- dialogArea = createDialogArea(contents);
- buttonBar = createButtonBar(contents);
-
- // Make sure everyone is using the right font.
- applyDialogFont(contents);
-
- return contents;
-
+ new Object[] { keySequence.format() });
}
/**
- * Creates the dialog area for the key assistant shell. This creates a table
+ * Creates the content area for the key assistant. This creates a table
* and places it inside the composite. The composite will contain a list of
* all the key bindings.
*
* @param parent
* The parent composite to contain the dialog area; must not be
* null.
- * @return The control for the dialog area; must not be null.
*/
protected final Control createDialogArea(final Composite parent) {
+ // First, register the shell type with the context support
+ registerShellType();
+
// Create a composite for the dialog area.
final Composite composite = new Composite(parent, SWT.NONE);
final GridLayout compositeLayout = new GridLayout();
@@ -525,7 +423,6 @@
} else {
createTableDialogArea(composite, partialMatches);
}
-
return composite;
}
@@ -563,8 +460,7 @@
private final void createTableDialogArea(final Composite parent,
final SortedMap partialMatches) {
// Layout the table.
- completionsTable = new Table(parent, SWT.BORDER | SWT.FULL_SELECTION
- | SWT.SINGLE);
+ completionsTable = new Table(parent, SWT.FULL_SELECTION | SWT.SINGLE);
final GridData gridData = new GridData(GridData.FILL_BOTH);
completionsTable.setLayoutData(gridData);
completionsTable.setBackground(parent.getBackground());
@@ -743,19 +639,6 @@
return super.open();
}
- /**
- * Adds a deactivation listener to the shell. This listener will close the
- * shell if it ever deactivates. This listener should be attached when the
- * shell is created, not opened.
- */
- private final void registerListeners() {
- final Shell shell = getShell();
- shell.addListener(SWT.Deactivate, new Listener() {
- public void handleEvent(Event event) {
- close();
- }
- });
- }
/**
* Registers the shell as the same type as its parent with the context