diff options
| author | Alexander Kurtakov | 2012-09-05 10:26:28 +0000 |
|---|---|---|
| committer | Alexander Kurtakov | 2012-09-07 12:31:48 +0000 |
| commit | 6d3ff82a59fc262079e17ed66119c26448716cf3 (patch) | |
| tree | f7371a50f386a4d32324007eb4fc58a592389111 | |
| parent | b92871d45641e5b98991966cf3c7813e414d919a (diff) | |
| download | org.eclipse.linuxtools-6d3ff82a59fc262079e17ed66119c26448716cf3.tar.gz org.eclipse.linuxtools-6d3ff82a59fc262079e17ed66119c26448716cf3.tar.xz org.eclipse.linuxtools-6d3ff82a59fc262079e17ed66119c26448716cf3.zip | |
Replace buttonPressed override with okPressed when only OK is handled.
This makes the code smaller and prevents messing super implementation
for other buttons.
Change-Id: I669d8477c4a18a44b454d97d030d17c679fcc9dd
Reviewed-on: https://git.eclipse.org/r/7620
Tested-by: Hudson CI
Reviewed-by: Alexander Kurtakov <akurtako@redhat.com>
IP-Clean: Alexander Kurtakov <akurtako@redhat.com>
Tested-by: Alexander Kurtakov <akurtako@redhat.com>
2 files changed, 15 insertions, 23 deletions
diff --git a/profiling/org.eclipse.linuxtools.ssh.proxy/src/org/eclipse/linuxtools/internal/ssh/proxy/SSHPasswordDialog.java b/profiling/org.eclipse.linuxtools.ssh.proxy/src/org/eclipse/linuxtools/internal/ssh/proxy/SSHPasswordDialog.java index c399f9616d..3e51ffca8e 100644 --- a/profiling/org.eclipse.linuxtools.ssh.proxy/src/org/eclipse/linuxtools/internal/ssh/proxy/SSHPasswordDialog.java +++ b/profiling/org.eclipse.linuxtools.ssh.proxy/src/org/eclipse/linuxtools/internal/ssh/proxy/SSHPasswordDialog.java @@ -12,13 +12,10 @@ package org.eclipse.linuxtools.internal.ssh.proxy; import java.text.MessageFormat; -import org.eclipse.linuxtools.internal.ssh.proxy.Messages; - import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.window.Window; +import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; @@ -72,10 +69,9 @@ public class SSHPasswordDialog extends Dialog { @Override - protected void buttonPressed(int buttonId) { - if (buttonId == Window.OK) - this.password = passwordField.getText(); - super.buttonPressed(buttonId); + protected void okPressed() { + this.password = passwordField.getText(); + super.okPressed(); } public String getPassword() { diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/uistructures/StapSettingsDialog.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/uistructures/StapSettingsDialog.java index 6800f7b933..c628cecb89 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/uistructures/StapSettingsDialog.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/uistructures/StapSettingsDialog.java @@ -125,21 +125,17 @@ public class StapSettingsDialog extends Dialog { } @Override - protected void buttonPressed(int buttonID) { - LogManager.logDebug("Start buttonPressed: buttonID-" + buttonID, this); //$NON-NLS-1$ - if(0 == buttonID) { //OK - cmdOpts = new boolean[checkBox.length]; - cmdOptVals = new String[text.length]; - - for(int i=0; i<cmdOpts.length; i++) - cmdOpts[i] = checkBox[i].getSelection(); - - for(int i=0; i<cmdOptVals.length; i++) - cmdOptVals[i] = text[i].getText(); - } - - super.buttonPressed(buttonID); - LogManager.logDebug("End buttonPressed:", this); //$NON-NLS-1$ + protected void okPressed() { + cmdOpts = new boolean[checkBox.length]; + cmdOptVals = new String[text.length]; + + for (int i = 0; i < cmdOpts.length; i++) + cmdOpts[i] = checkBox[i].getSelection(); + + for (int i = 0; i < cmdOptVals.length; i++) + cmdOptVals[i] = text[i].getText(); + + super.okPressed(); } public boolean[] getStapOpts() { |