minor StyleCop cleanups

This commit is contained in:
Matthias Mailänder
2013-09-29 17:40:46 +02:00
parent 98e1fe852a
commit ecf9c260b6
3 changed files with 20 additions and 17 deletions

View File

@@ -21,7 +21,7 @@ namespace OpenRA.FileFormats
{ {
static IEnumerable<ZipEntry> GetEntries(this ZipInputStream z) static IEnumerable<ZipEntry> GetEntries(this ZipInputStream z)
{ {
for (; ; ) for (;;)
{ {
var e = z.GetNextEntry(); var e = z.GetNextEntry();
if (e != null) yield return e; else break; if (e != null) yield return e; else break;
@@ -43,9 +43,9 @@ namespace OpenRA.FileFormats
if (!Directory.Exists(destPath)) if (!Directory.Exists(destPath))
Directory.CreateDirectory(destPath); Directory.CreateDirectory(destPath);
if (!Directory.Exists(srcPath)) { onError("Cannot find "+package); return false; } if (!Directory.Exists(srcPath)) { onError("Cannot find " + package); return false; }
FileSystem.Mount(srcPath); FileSystem.Mount(srcPath);
if (!FileSystem.Exists(package)) { onError("Cannot find "+package); return false; } if (!FileSystem.Exists(package)) { onError("Cannot find " + package); return false; }
FileSystem.Mount(package); FileSystem.Mount(package);
foreach (string s in files) foreach (string s in files)
@@ -54,10 +54,11 @@ namespace OpenRA.FileFormats
using (var sourceStream = FileSystem.Open(s)) using (var sourceStream = FileSystem.Open(s))
using (var destStream = File.Create(destFile)) using (var destStream = File.Create(destFile))
{ {
onProgress("Extracting "+s); onProgress("Extracting " + s);
destStream.Write(sourceStream.ReadAllBytes()); destStream.Write(sourceStream.ReadAllBytes());
} }
} }
return true; return true;
} }
@@ -68,13 +69,15 @@ namespace OpenRA.FileFormats
var fromPath = Path.Combine(srcPath, file); var fromPath = Path.Combine(srcPath, file);
if (!File.Exists(fromPath)) if (!File.Exists(fromPath))
{ {
onError("Cannot find "+file); onError("Cannot find " + file);
return false; return false;
} }
var destFile = Path.GetFileName(file).ToLowerInvariant(); var destFile = Path.GetFileName(file).ToLowerInvariant();
onProgress("Extracting "+destFile); onProgress("Extracting " + destFile);
File.Copy(fromPath, Path.Combine(destPath, destFile), true); File.Copy(fromPath, Path.Combine(destPath, destFile), true);
} }
return true; return true;
} }
@@ -82,7 +85,7 @@ namespace OpenRA.FileFormats
{ {
if (!File.Exists(zipFile)) if (!File.Exists(zipFile))
{ {
onError("Invalid path: "+zipFile); onError("Invalid path: " + zipFile);
return false; return false;
} }
@@ -90,16 +93,17 @@ namespace OpenRA.FileFormats
try try
{ {
var z = new ZipInputStream(File.OpenRead(zipFile)); var z = new ZipInputStream(File.OpenRead(zipFile));
z.ExtractZip(dest, extracted, s => onProgress("Extracting "+s)); z.ExtractZip(dest, extracted, s => onProgress("Extracting " + s));
} }
catch (SharpZipBaseException) catch (SharpZipBaseException)
{ {
foreach(var f in extracted) foreach (var f in extracted)
File.Delete(f); File.Delete(f);
onError("Invalid archive"); onError("Invalid archive");
return false; return false;
} }
return true; return true;
} }

View File

@@ -22,13 +22,13 @@ namespace OpenRA.Mods.RA.Widgets.Logic
public class DownloadPackagesLogic public class DownloadPackagesLogic
{ {
Widget panel; Widget panel;
Dictionary<string,string> installData; Dictionary<string, string> installData;
ProgressBarWidget progressBar; ProgressBarWidget progressBar;
LabelWidget statusLabel; LabelWidget statusLabel;
Action afterInstall; Action afterInstall;
[ObjectCreator.UseCtor] [ObjectCreator.UseCtor]
public DownloadPackagesLogic(Widget widget, Dictionary<string,string> installData, Action afterInstall) public DownloadPackagesLogic(Widget widget, Dictionary<string, string> installData, Action afterInstall)
{ {
this.installData = installData; this.installData = installData;
this.afterInstall = afterInstall; this.afterInstall = afterInstall;
@@ -71,7 +71,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
{ {
Game.RunAfterTick(() => Game.RunAfterTick(() =>
{ {
statusLabel.GetText = () => "Error: "+s; statusLabel.GetText = () => "Error: " + s;
retryButton.IsVisible = () => true; retryButton.IsVisible = () => true;
}); });
}; };

View File

@@ -17,7 +17,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
public class RAInstallLogic public class RAInstallLogic
{ {
[ObjectCreator.UseCtor] [ObjectCreator.UseCtor]
public RAInstallLogic(Widget widget, Dictionary<string,string> installData, Action continueLoading) public RAInstallLogic(Widget widget, Dictionary<string, string> installData, Action continueLoading)
{ {
var panel = widget.Get("INSTALL_PANEL"); var panel = widget.Get("INSTALL_PANEL");
var args = new WidgetArgs() var args = new WidgetArgs()
@@ -39,8 +39,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
{ {
Ui.OpenWindow("MODS_PANEL", new WidgetArgs() Ui.OpenWindow("MODS_PANEL", new WidgetArgs()
{ {
{ "onExit", () => {} }, { "onExit", () => { } },
// Close this panel
{ "onSwitch", Ui.CloseWindow }, { "onSwitch", Ui.CloseWindow },
}); });
}; };