Fix NullPointerException in DeleteBranchDialog.refNameFromDialog

The original bug referred to DeleteBranchDialog only, but it seems
reasonable to change the same pattern in all sub classes of the abstract
branch dialog.

Bug: 544988
Change-Id: Iee83bddd86a45cfc6c89bb97978c5ec9bd430ccf
Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

8 files changed, 10 insertions, 12 deletions

diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/BranchSelectionAndEditDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/BranchSelectionAndEditDialog.java
index 239dff0709..80c4afe003 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/BranchSelectionAndEditDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/BranchSelectionAndEditDialog.java
@@ -153,7 +153,7 @@ public class BranchSelectionAndEditDialog extends
 		super.createButtonsForButtonBar(parent);
 
 		// can't advance without a selection
-		getButton(Window.OK).setEnabled(!branchTree.getSelection().isEmpty());
+		setOkButtonEnabled(!branchTree.getSelection().isEmpty());
 	}
 
 	/**
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CompareTargetSelectionDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CompareTargetSelectionDialog.java
index 430738283b..7810fcf81a 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CompareTargetSelectionDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CompareTargetSelectionDialog.java
@@ -67,6 +67,6 @@ public class CompareTargetSelectionDialog extends AbstractBranchSelectionDialog
 
 	@Override
 	protected void refNameSelected(String refName) {
-		getButton(Window.OK).setEnabled(refName != null);
+		setOkButtonEnabled(refName != null);
 	}
 }
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/DeleteBranchDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/DeleteBranchDialog.java
index b5b4807c7e..f8e930a16f 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/DeleteBranchDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/DeleteBranchDialog.java
@@ -86,7 +86,7 @@ public class DeleteBranchDialog extends AbstractBranchSelectionDialog {
 
 		boolean enabled = !selected.isEmpty()
 				&& !selected.contains(currentBranch);
-		getButton(Window.OK).setEnabled(enabled);
+		setOkButtonEnabled(enabled);
 
 		return null;
 	}
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 81772bdcd6..3c0c3f46f8 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
@@ -111,8 +111,7 @@ public class MergeTargetSelectionDialog extends AbstractBranchSelectionDialog {
 			currentSelected = false;
 		}
 
-		getButton(Window.OK).setEnabled(
-				!currentSelected && (branchSelected || tagSelected));
+		setOkButtonEnabled(!currentSelected && (branchSelected || tagSelected));
 	}
 
 	@Override
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/RebaseTargetSelectionDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/RebaseTargetSelectionDialog.java
index bbd23ebf86..ab15ad45c1 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/RebaseTargetSelectionDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/RebaseTargetSelectionDialog.java
@@ -107,8 +107,7 @@ public class RebaseTargetSelectionDialog extends AbstractBranchSelectionDialog {
 			currentSelected = false;
 		}
 
-		getButton(Window.OK).setEnabled(
-				!currentSelected && (branchSelected || tagSelected));
+		setOkButtonEnabled(!currentSelected && (branchSelected || tagSelected));
 	}
 
 	@Override
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/RenameBranchDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/RenameBranchDialog.java
index 457c37f55f..c577760c63 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/RenameBranchDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/RenameBranchDialog.java
@@ -115,6 +115,6 @@ public class RenameBranchDialog extends AbstractBranchSelectionDialog {
 				&& (refName.startsWith(Constants.R_HEADS) || refName
 						.startsWith(Constants.R_REMOTES));
 
-		getButton(Window.OK).setEnabled(branchSelected);
+		setOkButtonEnabled(branchSelected);
 	}
 }
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/ReplaceTargetSelectionDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/ReplaceTargetSelectionDialog.java
index a7bc5c704f..52f0f182f9 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/ReplaceTargetSelectionDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/ReplaceTargetSelectionDialog.java
@@ -67,6 +67,6 @@ public class ReplaceTargetSelectionDialog extends AbstractBranchSelectionDialog
 
 	@Override
 	protected void refNameSelected(String refName) {
-		getButton(Window.OK).setEnabled(refName != null);
+		setOkButtonEnabled(refName != null);
 	}
 }
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/ResetTargetSelectionDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/ResetTargetSelectionDialog.java
index fde0f9cffb..2d989e8b27 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/ResetTargetSelectionDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/ResetTargetSelectionDialog.java
@@ -146,7 +146,7 @@ public class ResetTargetSelectionDialog extends AbstractBranchSelectionDialog {
 						setMessage(
 								UIText.ResetTargetSelectionDialog_UnresolvableExpressionError,
 								IMessageProvider.ERROR);
-						getButton(OK).setEnabled(false);
+						setOkButtonEnabled(false);
 						parsedCommitish = null;
 						sha1.setText(""); //$NON-NLS-1$
 						subject.setText(""); //$NON-NLS-1$
@@ -162,7 +162,7 @@ public class ResetTargetSelectionDialog extends AbstractBranchSelectionDialog {
 							setMessage(""); //$NON-NLS-1$
 						}
 						parsedCommitish = text;
-						getButton(OK).setEnabled(true);
+						setOkButtonEnabled(true);
 						try (RevWalk rw = new RevWalk(repo)) {
 							RevCommit commit = rw.parseCommit(resolved);
 							sha1.setText(AbbreviatedObjectId
@@ -237,7 +237,7 @@ public class ResetTargetSelectionDialog extends AbstractBranchSelectionDialog {
 	@Override
 	protected void refNameSelected(String refName) {
 		boolean enabled = refName != null || parsedCommitish != null;
-		getButton(Window.OK).setEnabled(enabled);
+		setOkButtonEnabled(enabled);
 	}
 
 	@Override