Remove unnecessary parameter in Configuration methods

CKAN.sln

@@ -89,5 +89,6 @@ Global
  $2.inheritsSet = Mono
  $2.inheritsScope = text/x-csharp
  $2.scope = text/x-csharp
+ $2.SpaceAfterMethodCallName = False
  EndGlobalSection
 EndGlobal

GUI/Configuration.cs

@@ -78,28 +78,28 @@ public Point WindowLoc
 
  public void Save()
  {
- SaveConfiguration(this, path);
+ SaveConfiguration(this);
  }
 
- public static Configuration LoadOrCreateConfiguration(string path, string defaultRepo)
+ public static Configuration LoadOrCreateConfiguration(string path)
  {
  if (!File.Exists(path))
  {
  var configuration = new Configuration
  {
  path = path,
-  CommandLineArguments = Platform.IsUnix ? "./KSP.x86_64 -single-instance" :
+ CommandLineArguments = Platform.IsUnix ? "./KSP.x86_64 -single-instance" :
  Platform.IsMac ? "./KSP.app/Contents/MacOS/KSP" :
  "KSP_x64.exe -single-instance"
  };
 
- SaveConfiguration(configuration, path);
+ SaveConfiguration(configuration);
  }
 
  return LoadConfiguration(path);
  }
 
- public static Configuration LoadConfiguration(string path)
+ private static Configuration LoadConfiguration(string path)
  {
  var serializer = new XmlSerializer(typeof (Configuration));
 
@@ -137,11 +137,11 @@ public static Configuration LoadConfiguration(string path)
  return configuration;
  }
 
- public static void SaveConfiguration(Configuration configuration, string path)
+ private static void SaveConfiguration(Configuration configuration)
  {
  var serializer = new XmlSerializer(typeof (Configuration));
 
- using (var writer = new StreamWriter(path))
+ using (var writer = new StreamWriter(configuration.path))
  {
  serializer.Serialize(writer, configuration);
  writer.Close();

GUI/Main.cs

@@ -213,8 +213,7 @@ public Main(string[] cmdlineArgs, KSPManager mgr, GUIUser user, bool showConsole
 
  configuration = Configuration.LoadOrCreateConfiguration
  (
- Path.Combine(CurrentInstance.CkanDir(), "GUIConfig.xml"),
- CKAN.Repository.default_ckan_repo_uri.ToString()
+ Path.Combine(CurrentInstance.CkanDir(), "GUIConfig.xml")
  );
 
  // Check if there is any other instances already running.
@@ -477,8 +476,7 @@ private void CurrentInstanceUpdated()
  });
 
  configuration = Configuration.LoadOrCreateConfiguration(
- Path.Combine(CurrentInstance.CkanDir(), "GUIConfig.xml"),
- CKAN.Repository.default_ckan_repo_uri.ToString()
+ Path.Combine(CurrentInstance.CkanDir (), "GUIConfig.xml")
  );
 
  if (CurrentInstance.CompatibleVersionsAreFromDifferentKsp)

Tests/GUI/Configuration.cs

@@ -23,7 +23,7 @@ public void TearDown()
  }
 
  [Test]
- public void LoadConfiguration_MalformedXMLFile_ThrowsKraken()
+ public void LoadOrCreateConfiguration_MalformedXMLFile_ThrowsKraken()
  {
  string tempFile = Path.Combine(tempDir, "invalid.xml");
 
@@ -32,11 +32,11 @@ public void LoadConfiguration_MalformedXMLFile_ThrowsKraken()
  stream.Write("This is not a valid XML file.");
  }
 
- Assert.Throws<Kraken>(() => Configuration.LoadConfiguration(tempFile));
+ Assert.Throws<Kraken>(() => Configuration.LoadOrCreateConfiguration(tempFile));
  }
 
  [Test]
- public void LoadConfiguration_CorrectConfigurationFile_Loaded()
+ public void LoadOrCreateConfiguration_CorrectConfigurationFile_Loaded()
  {
  string tempFile = Path.Combine(tempDir, "valid.xml");
 
@@ -45,7 +45,7 @@ public void LoadConfiguration_CorrectConfigurationFile_Loaded()
  stream.Write(TestData.ConfigurationFile());
  }
 
- var result = Configuration.LoadConfiguration(tempFile);
+ var result = Configuration.LoadOrCreateConfiguration(tempFile);
 
  Assert.IsNotNull(result);
  }