From 341c4dbe68d9a56c00e03fd847312849f7c676b5 Mon Sep 17 00:00:00 2001 From: Waldi Ravens Date: Sun, 28 Jun 2015 20:40:42 +0200 Subject: [PATCH] Formatting (whitespace only) --- src/Forms/ImportText.cs | 2 -- src/Forms/VobSubEditCharacters.cs | 2 -- src/Forms/VobSubOcrNOcrCharacter.cs | 6 +----- src/Logic/BluRaySup/BluRaySupParser.cs | 2 -- .../MaterialExchangeFormat/KlvPacket.cs | 1 - src/Logic/OCR/OcrFixEngine.cs | 4 ---- src/Logic/SubtitleFormats/AdvancedSubStationAlpha.cs | 5 ----- src/Logic/Utilities.cs | 11 ++++++----- src/Test/Logic/Dictionaries/OcrFixReplaceListTest.cs | 10 +--------- 9 files changed, 8 insertions(+), 35 deletions(-) diff --git a/src/Forms/ImportText.cs b/src/Forms/ImportText.cs index ed868677c..57ada7930 100644 --- a/src/Forms/ImportText.cs +++ b/src/Forms/ImportText.cs @@ -326,7 +326,6 @@ namespace Nikse.SubtitleEdit.Forms var sb = new StringBuilder(); foreach (string line in lines) { - if (string.IsNullOrWhiteSpace(line)) { if (sb.Length > 0) @@ -750,7 +749,6 @@ namespace Nikse.SubtitleEdit.Forms textBoxText.Visible = true; buttonOpenText.Text = Configuration.Settings.Language.ImportText.OpenTextFile; groupBoxSplitting.Enabled = true; - } GeneratePreview(); } diff --git a/src/Forms/VobSubEditCharacters.cs b/src/Forms/VobSubEditCharacters.cs index 132c8986e..7a1597c19 100644 --- a/src/Forms/VobSubEditCharacters.cs +++ b/src/Forms/VobSubEditCharacters.cs @@ -132,7 +132,6 @@ namespace Nikse.SubtitleEdit.Forms listBoxFileNames.Items.Add("[" + text + "] " + node.InnerText); _italics.Add(node.Attributes["Italic"] != null); } - } } } @@ -567,7 +566,6 @@ namespace Nikse.SubtitleEdit.Forms return; } } - } } diff --git a/src/Forms/VobSubOcrNOcrCharacter.cs b/src/Forms/VobSubOcrNOcrCharacter.cs index 6901966c6..4ee623b92 100644 --- a/src/Forms/VobSubOcrNOcrCharacter.cs +++ b/src/Forms/VobSubOcrNOcrCharacter.cs @@ -497,7 +497,6 @@ namespace Nikse.SubtitleEdit.Forms } } } - } } return true; @@ -553,7 +552,6 @@ namespace Nikse.SubtitleEdit.Forms } } } - } } return true; @@ -674,9 +672,7 @@ namespace Nikse.SubtitleEdit.Forms if (count > giveUpCount - 100 && !tempVeryPrecise) tempVeryPrecise = true; - } - } private void removeForegroundToolStripMenuItem_Click(object sender, EventArgs e) @@ -742,4 +738,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} +} \ No newline at end of file diff --git a/src/Logic/BluRaySup/BluRaySupParser.cs b/src/Logic/BluRaySup/BluRaySupParser.cs index a8174db2d..497f18ba2 100644 --- a/src/Logic/BluRaySup/BluRaySupParser.cs +++ b/src/Logic/BluRaySup/BluRaySupParser.cs @@ -230,7 +230,6 @@ namespace Nikse.SubtitleEdit.Logic.BluRaySup bmp.SetPixel(x, y, color); } } - } public class PcsData @@ -290,7 +289,6 @@ namespace Nikse.SubtitleEdit.Logic.BluRaySup } return mergedBmp; } - } public class PdsData diff --git a/src/Logic/ContainerFormats/MaterialExchangeFormat/KlvPacket.cs b/src/Logic/ContainerFormats/MaterialExchangeFormat/KlvPacket.cs index a41fe2e42..1c752fd24 100644 --- a/src/Logic/ContainerFormats/MaterialExchangeFormat/KlvPacket.cs +++ b/src/Logic/ContainerFormats/MaterialExchangeFormat/KlvPacket.cs @@ -5,7 +5,6 @@ using Nikse.SubtitleEdit.Logic.VobSub; namespace Nikse.SubtitleEdit.Logic.ContainerFormats.MaterialExchangeFormat { - /// /// Key-Length-Value MXF package - http://en.wikipedia.org/wiki/KLV + http://en.wikipedia.org/wiki/Material_Exchange_Format /// diff --git a/src/Logic/OCR/OcrFixEngine.cs b/src/Logic/OCR/OcrFixEngine.cs index c42db6635..6e05cd170 100644 --- a/src/Logic/OCR/OcrFixEngine.cs +++ b/src/Logic/OCR/OcrFixEngine.cs @@ -116,7 +116,6 @@ namespace Nikse.SubtitleEdit.Logic.Ocr { if (culture.ThreeLetterISOLanguageName == threeLetterIsoLanguageName) { - string dictionaryFileName = null; foreach (string dic in Directory.GetFiles(dictionaryFolder, "*.dic")) { @@ -154,7 +153,6 @@ namespace Nikse.SubtitleEdit.Logic.Ocr { if (culture.ThreeLetterISOLanguageName == threeLetterIsoLanguageName) { - string dictionaryFileName = null; foreach (string dic in Directory.GetFiles(dictionaryFolder, "*.dic")) { @@ -636,7 +634,6 @@ namespace Nikse.SubtitleEdit.Logic.Ocr { input = input.Replace(".'", Configuration.Settings.Tools.MusicSymbol); } - } return input; @@ -1240,7 +1237,6 @@ namespace Nikse.SubtitleEdit.Logic.Ocr else _namesEtcListWithApostrophe.Add(s + "'"); } - } if (_namesList != null) _namesList.Add(s); diff --git a/src/Logic/SubtitleFormats/AdvancedSubStationAlpha.cs b/src/Logic/SubtitleFormats/AdvancedSubStationAlpha.cs index 029c97322..dac25f51d 100644 --- a/src/Logic/SubtitleFormats/AdvancedSubStationAlpha.cs +++ b/src/Logic/SubtitleFormats/AdvancedSubStationAlpha.cs @@ -42,7 +42,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats lines.Add(line); format.LoadSubtitle(sub, lines, string.Empty); return sub.Header; - } } @@ -356,8 +355,6 @@ Format: Layer, Start, End, Style, Actor, MarginL, MarginR, MarginV, Effect, Text p.Extra = p.Extra.Split('/')[0].Trim(); } } - - } catch { @@ -566,7 +563,6 @@ Format: Layer, Start, End, Style, Actor, MarginL, MarginR, MarginV, Effect, Text text += ""; } } - } text = text.Replace(@"{\i1}", ""); @@ -890,7 +886,6 @@ Format: Layer, Start, End, Style, Actor, MarginL, MarginR, MarginV, Effect, Text s = s.Replace("{}", string.Empty); p.Text = s; - } } } diff --git a/src/Logic/Utilities.cs b/src/Logic/Utilities.cs index e79e19d10..d31f48fc0 100644 --- a/src/Logic/Utilities.cs +++ b/src/Logic/Utilities.cs @@ -123,7 +123,9 @@ namespace Nikse.SubtitleEdit.Logic } } } - catch { } + catch + { + } return info; } @@ -144,7 +146,9 @@ namespace Nikse.SubtitleEdit.Logic info.Success = true; } } - catch { } + catch + { + } return info; } @@ -427,7 +431,6 @@ namespace Nikse.SubtitleEdit.Logic _lastNoBreakAfterListLanguage = languageName; return _lastNoBreakAfterList; - } public static string AutoBreakLineMoreThanTwoLines(string text, int maximumLineLength, string language) @@ -955,7 +958,6 @@ namespace Nikse.SubtitleEdit.Logic } catch { - } return encoding; } @@ -3061,7 +3063,6 @@ namespace Nikse.SubtitleEdit.Logic { subtitle.Header += Environment.NewLine + Environment.NewLine + "[Events]" + Environment.NewLine; } - } } else diff --git a/src/Test/Logic/Dictionaries/OcrFixReplaceListTest.cs b/src/Test/Logic/Dictionaries/OcrFixReplaceListTest.cs index 8b524ea34..d06b53609 100644 --- a/src/Test/Logic/Dictionaries/OcrFixReplaceListTest.cs +++ b/src/Test/Logic/Dictionaries/OcrFixReplaceListTest.cs @@ -29,7 +29,6 @@ namespace Test.Logic.Dictionaries } catch { - } } @@ -55,7 +54,6 @@ namespace Test.Logic.Dictionaries } catch { - } } @@ -80,7 +78,6 @@ namespace Test.Logic.Dictionaries } catch { - } } @@ -106,7 +103,6 @@ namespace Test.Logic.Dictionaries } catch { - } } @@ -132,7 +128,6 @@ namespace Test.Logic.Dictionaries } catch { - } } @@ -159,7 +154,6 @@ namespace Test.Logic.Dictionaries } catch { - } } @@ -185,7 +179,6 @@ namespace Test.Logic.Dictionaries } catch { - } } @@ -213,9 +206,8 @@ namespace Test.Logic.Dictionaries } catch { - } } } -} +} \ No newline at end of file