Add setting for streamFileThreshold in the UI.

This was the only missing setting from WindowCacheConfig.

Change-Id: I73e72d8b35e448f01aa226b9eb5c157220a4cda5

6 files changed, 13 insertions, 0 deletions

diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/GitCorePreferenceInitializer.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/GitCorePreferenceInitializer.java
index c3242f01e0..ea2dce8ec1 100644
--- a/org.eclipse.egit.core/src/org/eclipse/egit/core/GitCorePreferenceInitializer.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/GitCorePreferenceInitializer.java
@@ -24,6 +24,7 @@ public class GitCorePreferenceInitializer extends AbstractPreferenceInitializer
 		p.putInt(GitCorePreferences.core_packedGitLimit, 10 * MB);
 		p.putBoolean(GitCorePreferences.core_packedGitMMAP, false);
 		p.putInt(GitCorePreferences.core_deltaBaseCacheLimit, 10 * MB);
+		p.putInt(GitCorePreferences.core_streamFileThreshold, 50 * MB);
 		p.putBoolean(GitCorePreferences.core_autoShareProjects, false);
 	}
 }
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/GitCorePreferences.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/GitCorePreferences.java
index 9be5749a21..edb2d354a7 100644
--- a/org.eclipse.egit.core/src/org/eclipse/egit/core/GitCorePreferences.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/GitCorePreferences.java
@@ -24,6 +24,9 @@ public class GitCorePreferences {
 	public static final String core_deltaBaseCacheLimit =
 		"core_deltaBaseCacheLimit";  //$NON-NLS-1$
 	/** */
+	public static final String core_streamFileThreshold =
+		"core_streamFileThreshold"; //$NON-NLS-1$
+	/** */
 	public static final String core_autoShareProjects =
 		"core_autoShareProjects";  //$NON-NLS-1$
 	/** */
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/project/GitProjectData.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/project/GitProjectData.java
index da6ac1bd68..213d0d6f7d 100644
--- a/org.eclipse.egit.core/src/org/eclipse/egit/core/project/GitProjectData.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/project/GitProjectData.java
@@ -274,6 +274,7 @@ public class GitProjectData {
 		c.setPackedGitWindowSize(p.getInt(GitCorePreferences.core_packedGitWindowSize, d.getInt(GitCorePreferences.core_packedGitWindowSize, 0)));
 		c.setPackedGitMMAP(p.getBoolean(GitCorePreferences.core_packedGitMMAP, d.getBoolean(GitCorePreferences.core_packedGitMMAP, false)));
 		c.setDeltaBaseCacheLimit(p.getInt(GitCorePreferences.core_deltaBaseCacheLimit, d.getInt(GitCorePreferences.core_deltaBaseCacheLimit, 0)));
+		c.setStreamFileThreshold(p.getInt(GitCorePreferences.core_streamFileThreshold, d.getInt(GitCorePreferences.core_streamFileThreshold, 0)));
 		WindowCache.reconfigure(c);
 	}
 
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java
index 6e8d351292..7dc25244fc 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java
@@ -2551,6 +2551,9 @@ public class UIText extends NLS {
 	public static String WindowCachePreferencePage_packedGitMMAP;
 
 	/** */
+	public static String WindowCachePreferencePage_streamFileThreshold;
+
+	/** */
 	public static String BasicConfigurationDialog_DialogMessage;
 
 	/** */
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/WindowCachePreferencePage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/WindowCachePreferencePage.java
index f2962f021d..73cbf84d2e 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/WindowCachePreferencePage.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/WindowCachePreferencePage.java
@@ -55,6 +55,10 @@ public class WindowCachePreferencePage extends FieldEditorPreferencePage
 				GitCorePreferences.core_deltaBaseCacheLimit,
 				UIText.WindowCachePreferencePage_deltaBaseCacheLimit,
 				getFieldEditorParent(), 512, 1 * GB));
+		addField(new StorageSizeFieldEditor(
+				GitCorePreferences.core_streamFileThreshold,
+				UIText.WindowCachePreferencePage_streamFileThreshold,
+				getFieldEditorParent(), 10 * MB, 1 * GB));
 
 		addField(new BooleanFieldEditor(GitCorePreferences.core_packedGitMMAP,
 				UIText.WindowCachePreferencePage_packedGitMMAP,
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
index 1b21f022b4..b9022cb362 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
@@ -847,6 +847,7 @@ WindowCachePreferencePage_packedGitWindowSize=Window size:
 WindowCachePreferencePage_packedGitLimit=Window cache limit:
 WindowCachePreferencePage_deltaBaseCacheLimit=Delta base cache limit:
 WindowCachePreferencePage_packedGitMMAP=Use virtual memory mapping
+WindowCachePreferencePage_streamFileThreshold=Stream File Threshold:
 
 ProjectsPreferencePage_AutoShareProjects=Auto share projects located in a git repository
 ProjectsPreferencePage_RestoreBranchProjects=Track each branch's imported projects and restore on checkout