Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/MergeTargetSelectionDialog.java')
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/MergeTargetSelectionDialog.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/MergeTargetSelectionDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/MergeTargetSelectionDialog.java
index 0ebcae64a2..ad97f04ab1 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/MergeTargetSelectionDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/MergeTargetSelectionDialog.java
@@ -129,6 +129,7 @@ public class MergeTargetSelectionDialog extends AbstractBranchSelectionDialog {
commit.setSelection(true);
commit.setText(UIText.MergeTargetSelectionDialog_MergeTypeCommitButton);
commit.addListener(SWT.Selection, new Listener() {
+ @Override
public void handleEvent(Event event) {
if (((Button) event.widget).getSelection()) {
mergeSquash = false;
@@ -142,6 +143,7 @@ public class MergeTargetSelectionDialog extends AbstractBranchSelectionDialog {
noCommit.setSelection(true);
noCommit.setText(UIText.MergeTargetSelectionDialog_MergeTypeNoCommitButton);
noCommit.addListener(SWT.Selection, new Listener() {
+ @Override
public void handleEvent(Event event) {
if (((Button) event.widget).getSelection()) {
mergeSquash = false;
@@ -155,6 +157,7 @@ public class MergeTargetSelectionDialog extends AbstractBranchSelectionDialog {
squash.setSelection(true);
squash.setText(UIText.MergeTargetSelectionDialog_MergeTypeSquashButton);
squash.addListener(SWT.Selection, new Listener() {
+ @Override
public void handleEvent(Event event) {
if (((Button) event.widget).getSelection()) {
mergeSquash = true;
@@ -186,6 +189,7 @@ public class MergeTargetSelectionDialog extends AbstractBranchSelectionDialog {
Button btn = new Button(grp, SWT.RADIO);
btn.setText(text);
btn.addListener(SWT.Selection, new Listener() {
+ @Override
public void handleEvent(Event event) {
if (((Button) event.widget).getSelection())
fastForwardMode = ffMode;

Back to the top