From 6c959f77027434f39ecfb6b7c59bb964fe51824b Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 3 Jan 2012 15:24:55 -0800 Subject: [PATCH] Use constants from ConfigConstants in CoreConfig Change-Id: Ic1253498ecdd7545c6b1f114f4c83a3b77273874 --- .../src/org/eclipse/jgit/lib/ConfigConstants.java | 9 +++++++++ .../src/org/eclipse/jgit/lib/CoreConfig.java | 9 ++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java index ce11e6663..237fb66d0 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java @@ -75,6 +75,9 @@ public class ConfigConstants { /** The "submodule" section */ public static final String CONFIG_SUBMODULE_SECTION = "submodule"; + /** The "pack" section */ + public static final String CONFIG_PACK_SECTION = "pack"; + /** The "algorithm" key */ public static final String CONFIG_KEY_ALGORITHM = "algorithm"; @@ -169,4 +172,10 @@ public class ConfigConstants { /** The "update" key */ public static final String CONFIG_KEY_UPDATE = "update"; + + /** The "compression" key */ + public static final String CONFIG_KEY_COMPRESSION = "compression"; + + /** The "indexversion" key */ + public static final String CONFIG_KEY_INDEXVERSION = "indexversion"; } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/CoreConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/CoreConfig.java index 2d9f44aad..23aca3794 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/CoreConfig.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/CoreConfig.java @@ -83,9 +83,12 @@ public class CoreConfig { private final String excludesfile; private CoreConfig(final Config rc) { - compression = rc.getInt("core", "compression", DEFAULT_COMPRESSION); - packIndexVersion = rc.getInt("pack", "indexversion", 2); - logAllRefUpdates = rc.getBoolean("core", "logallrefupdates", true); + compression = rc.getInt(ConfigConstants.CONFIG_CORE_SECTION, + ConfigConstants.CONFIG_KEY_COMPRESSION, DEFAULT_COMPRESSION); + packIndexVersion = rc.getInt(ConfigConstants.CONFIG_PACK_SECTION, + ConfigConstants.CONFIG_KEY_INDEXVERSION, 2); + logAllRefUpdates = rc.getBoolean(ConfigConstants.CONFIG_CORE_SECTION, + ConfigConstants.CONFIG_KEY_LOGALLREFUPDATES, true); excludesfile = rc.getString(ConfigConstants.CONFIG_CORE_SECTION, null, ConfigConstants.CONFIG_KEY_EXCLUDESFILE); }