Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Weiser2017-07-17 12:04:29 +0000
committerThomas Wolf2017-08-07 10:24:40 +0000
commit6e2aa3ac99281cee6afe13ff821370b2daef691c (patch)
tree745644af02f2d1496ff8f4a105b9d72180785d3f
parentee056596fa12e661b64f20da5be91d5a792cadbc (diff)
downloadegit-6e2aa3ac99281cee6afe13ff821370b2daef691c.tar.gz
egit-6e2aa3ac99281cee6afe13ff821370b2daef691c.tar.xz
egit-6e2aa3ac99281cee6afe13ff821370b2daef691c.zip
Commit is not possible should use verbs instead of OK
Bug: 518996 Change-Id: Ib6189b7c6d643105286f019a40944dfd8754b366 Signed-off-by: David Weiser <david.weiser@vogella.com>
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java
index 6663e14334..03ef44f305 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java
@@ -112,6 +112,7 @@ import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.Separator;
import org.eclipse.jface.action.ToolBarManager;
import org.eclipse.jface.dialogs.DialogSettings;
+import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.layout.GridDataFactory;
@@ -3947,9 +3948,11 @@ public class StagingView extends ViewPart
private void commit(boolean pushUpstream) {
if (!isCommitWithoutFilesAllowed()) {
- MessageDialog.openError(getSite().getShell(),
- UIText.StagingView_committingNotPossible,
- UIText.StagingView_noStagedFiles);
+ MessageDialog md = new MessageDialog(getSite().getShell(),
+ UIText.StagingView_committingNotPossible, null,
+ UIText.StagingView_noStagedFiles, MessageDialog.ERROR,
+ new String[] { IDialogConstants.CLOSE_LABEL }, 0);
+ md.open();
return;
}
if (!commitMessageComponent.checkCommitInfo())

Back to the top