diff options
author | Lluis Sanchez Gual <lluis@novell.com> | 2011-02-22 20:12:12 +0300 |
---|---|---|
committer | Lluis Sanchez Gual <lluis@novell.com> | 2011-02-22 20:12:12 +0300 |
commit | 7c7c5a331127744136d98fa10b2cfddad2dac95d (patch) | |
tree | 8af75cc79d503ca8e15cc9a8f99bd6dd998d6417 /Mono.Addins.Setup | |
parent | 283e90d83ddab62bffdefd456a7d327164612622 (diff) |
Fix mixed line endings.
Diffstat (limited to 'Mono.Addins.Setup')
-rw-r--r-- | Mono.Addins.Setup/Mono.Addins.Setup.ProgressMonitoring/ConsoleProgressMonitor.cs | 46 | ||||
-rw-r--r-- | Mono.Addins.Setup/Mono.Addins.Setup/TextFormatter.cs | 4 |
2 files changed, 25 insertions, 25 deletions
diff --git a/Mono.Addins.Setup/Mono.Addins.Setup.ProgressMonitoring/ConsoleProgressMonitor.cs b/Mono.Addins.Setup/Mono.Addins.Setup.ProgressMonitoring/ConsoleProgressMonitor.cs index 918960b..cfd8fe5 100644 --- a/Mono.Addins.Setup/Mono.Addins.Setup.ProgressMonitoring/ConsoleProgressMonitor.cs +++ b/Mono.Addins.Setup/Mono.Addins.Setup.ProgressMonitoring/ConsoleProgressMonitor.cs @@ -135,26 +135,26 @@ namespace Mono.Addins.Setup.ProgressMonitoring else WriteText (text, 0); } -
- void WriteText (string text, int leftMargin)
- {
+ + void WriteText (string text, int leftMargin) + { if (text == null || text.Length == 0) return; - int n = 0;
- int maxCols = wrap ? columns : int.MaxValue;
+ int n = 0; + int maxCols = wrap ? columns : int.MaxValue; - while (n < text.Length)
- {
+ while (n < text.Length) + { if (col == -1) { Console.Write (new String (' ', leftMargin)); col = leftMargin; } - int lastWhite = -1;
+ int lastWhite = -1; int sn = n; bool eol = false; -
+ while (col < maxCols && n < text.Length) { char c = text [n]; if (c == '\r') { @@ -164,26 +164,26 @@ namespace Mono.Addins.Setup.ProgressMonitoring if (c == '\n') { eol = true; break; - }
- if (char.IsWhiteSpace (c))
- lastWhite = n;
- col++;
- n++;
- }
-
- if (lastWhite == -1 || col < maxCols)
- lastWhite = n;
- else if (col >= maxCols)
- n = lastWhite + 1;
-
+ } + if (char.IsWhiteSpace (c)) + lastWhite = n; + col++; + n++; + } + + if (lastWhite == -1 || col < maxCols) + lastWhite = n; + else if (col >= maxCols) + n = lastWhite + 1; + Console.Write (text.Substring (sn, lastWhite - sn)); if (eol || col >= maxCols) { col = -1; Console.WriteLine (); if (eol) n++; - }
- }
+ } + } } void Indent () diff --git a/Mono.Addins.Setup/Mono.Addins.Setup/TextFormatter.cs b/Mono.Addins.Setup/Mono.Addins.Setup/TextFormatter.cs index 9a3d5e1..0aa3719 100644 --- a/Mono.Addins.Setup/Mono.Addins.Setup/TextFormatter.cs +++ b/Mono.Addins.Setup/Mono.Addins.Setup/TextFormatter.cs @@ -188,8 +188,8 @@ namespace Mono.Addins.Setup } int n = 0; -
- while (n < text.Length)
+ + while (n < text.Length) { int sn = n; bool foundSpace = false; |