From 87813befb7288f24d4144e09522bda2de5b38e97 Mon Sep 17 00:00:00 2001
From: Stefan Lay <stefan.lay@sap.com>
Date: Tue, 1 Jun 2010 17:13:02 +0200
Subject: [PATCH 3/4] Show untracked files per default and remember last selection

The old behaviour was not intuitive. Additionally many users
want to see the untracked files.

Bug: 314997

Signed-off-by: Stefan Lay <stefan.lay@sap.com>
---
 .../egit/ui/internal/actions/CommitAction.java     |    2 -
 .../egit/ui/internal/dialogs/CommitDialog.java     |   34 +++++++++----------
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/CommitAction.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/CommitAction.java
index a3ec158..a92eab5 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/CommitAction.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/CommitAction.java
@@ -144,8 +144,6 @@ public void execute(IAction act) {
 		commitDialog.setPreselectedFiles(getSelectedFiles());
 		commitDialog.setAuthor(author);
 		commitDialog.setCommitter(committer);
-		if(notTracked.size() == files.size())
-			commitDialog.setShowUntracked(true);
 
 		if (previousCommit != null) {
 			commitDialog.setPreviousCommitMessage(previousCommit.getMessage());
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitDialog.java
index da3a77c..64e6682 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitDialog.java
@@ -168,6 +168,8 @@ public boolean select(Viewer viewer, Object parentElement,
 
 	private static final String AUTHOR_VALUES_PREF = "CommitDialog.authorValues"; //$NON-NLS-1$
 
+	private static final String SHOW_UNTRACKED_PREF = "CommitDialog.showUntracked"; //$NON-NLS-1$
+
 
 	/**
 	 * @param parentShell
@@ -317,9 +319,18 @@ public void widgetDefaultSelected(SelectionEvent arg0) {
 		});
 
 		showUntrackedButton = new Button(container, SWT.CHECK);
-		showUntrackedButton.setSelection(showUntracked);
 		showUntrackedButton.setText(UIText.CommitDialog_ShowUntrackedFiles);
 		showUntrackedButton.setLayoutData(GridDataFactory.fillDefaults().grab(true, false).span(2, 1).create());
+
+		IDialogSettings settings = org.eclipse.egit.ui.Activator.getDefault()
+				.getDialogSettings();
+		if (settings.get(SHOW_UNTRACKED_PREF) != null) {
+			showUntracked = Boolean.valueOf(settings.get(SHOW_UNTRACKED_PREF))
+					.booleanValue();
+		}
+
+		showUntrackedButton.setSelection(showUntracked);
+
 		showUntrackedButton.addSelectionListener(new SelectionListener() {
 
 			public void widgetSelected(SelectionEvent e) {
@@ -559,7 +570,7 @@ public void setCommitMessage(String s) {
 	private boolean signedOff = false;
 	private boolean amending = false;
 	private boolean amendAllowed = true;
-	private boolean showUntracked = false;
+	private boolean showUntracked = true;
 
 	private ArrayList<IFile> selectedFiles = new ArrayList<IFile>();
 	private String previousCommitMessage = ""; //$NON-NLS-1$
@@ -729,6 +740,9 @@ protected void okPressed() {
 		addValueToPrefs(author, AUTHOR_VALUES_PREF);
 		addValueToPrefs(committer, COMMITTER_VALUES_PREF);
 
+		IDialogSettings settings = org.eclipse.egit.ui.Activator
+			.getDefault().getDialogSettings();
+		settings.put(SHOW_UNTRACKED_PREF, showUntracked);
 		super.okPressed();
 	}
 
@@ -869,22 +883,6 @@ public void setAmending(boolean amending) {
 	}
 
 	/**
-	 * @return whether the untracked files should be shown
-	 */
-	public boolean isShowUntracked() {
-		return showUntracked;
-	}
-
-	/**
-	 * Pre-set whether the untracked files should be shown
-	 *
-	 * @param showUntracked
-	 */
-	public void setShowUntracked(boolean showUntracked) {
-		this.showUntracked = showUntracked;
-	}
-
-	/**
 	 * Set the message from the previous commit for amending.
 	 *
 	 * @param string
-- 
1.7.0.2.msysgit.0