Index: DeltaShell.sln.DotSettings =================================================================== diff -u -r482e2af47e9cb237f8e68f27337e621e1a9ec349 -rcfb6c5c646fce30eb797adf2cc27d2eff7e4ac99 --- DeltaShell.sln.DotSettings (.../DeltaShell.sln.DotSettings) (revision 482e2af47e9cb237f8e68f27337e621e1a9ec349) +++ DeltaShell.sln.DotSettings (.../DeltaShell.sln.DotSettings) (revision cfb6c5c646fce30eb797adf2cc27d2eff7e4ac99) @@ -1,4 +1,5 @@  + DO_NOT_SHOW D:\WTI\DeltaShell.DotSettings ..\DeltaShell.DotSettings True Index: src/Common/DelftTools.Controls.Swf/DataEditorGenerator/Metadata/FieldUIDescription.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -rcfb6c5c646fce30eb797adf2cc27d2eff7e4ac99 --- src/Common/DelftTools.Controls.Swf/DataEditorGenerator/Metadata/FieldUIDescription.cs (.../FieldUIDescription.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ src/Common/DelftTools.Controls.Swf/DataEditorGenerator/Metadata/FieldUIDescription.cs (.../FieldUIDescription.cs) (revision cfb6c5c646fce30eb797adf2cc27d2eff7e4ac99) @@ -32,7 +32,7 @@ this.setValueFunc = setValueFunc; this.isEnabledFunc = isEnabledFunc; this.isVisibleFunc = isVisibleFunc; - this.ValidationMethod = validationMethod; + ValidationMethod = validationMethod; } public Func ValidationMethod { get; set; } Index: src/Common/DelftTools.Utils/EventArgs.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -rcfb6c5c646fce30eb797adf2cc27d2eff7e4ac99 --- src/Common/DelftTools.Utils/EventArgs.cs (.../EventArgs.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ src/Common/DelftTools.Utils/EventArgs.cs (.../EventArgs.cs) (revision cfb6c5c646fce30eb797adf2cc27d2eff7e4ac99) @@ -6,7 +6,7 @@ { public EventArgs(T t) { - this.Value = t; + Value = t; } public T Value { get; set; } Index: src/Common/DelftTools.Utils/FormulaParser/ExcelFormulaToken.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -rcfb6c5c646fce30eb797adf2cc27d2eff7e4ac99 --- src/Common/DelftTools.Utils/FormulaParser/ExcelFormulaToken.cs (.../ExcelFormulaToken.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ src/Common/DelftTools.Utils/FormulaParser/ExcelFormulaToken.cs (.../ExcelFormulaToken.cs) (revision cfb6c5c646fce30eb797adf2cc27d2eff7e4ac99) @@ -10,9 +10,9 @@ internal ExcelFormulaToken(string value, ExcelFormulaTokenType type, ExcelFormulaTokenSubtype subtype) { - this.Value = value; - this.Type = type; - this.Subtype = subtype; + Value = value; + Type = type; + Subtype = subtype; } public string Value { get; internal set; } Index: src/Common/DelftTools.Utils/PropertyBag/PropertySpec.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -rcfb6c5c646fce30eb797adf2cc27d2eff7e4ac99 --- src/Common/DelftTools.Utils/PropertyBag/PropertySpec.cs (.../PropertySpec.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ src/Common/DelftTools.Utils/PropertyBag/PropertySpec.cs (.../PropertySpec.cs) (revision cfb6c5c646fce30eb797adf2cc27d2eff7e4ac99) @@ -81,11 +81,11 @@ /// no default value. public PropertySpec(string name, string type, string category, string description, object defaultValue) { - this.Name = name; - this.TypeName = type; - this.Category = category; - this.Description = description; - this.DefaultValue = defaultValue; + Name = name; + TypeName = type; + Category = category; + Description = description; + DefaultValue = defaultValue; Attributes = null; } @@ -123,8 +123,8 @@ string editor, string typeConverter) : this(name, type, category, description, defaultValue) { - this.EditorTypeName = editor; - this.ConverterTypeName = typeConverter; + EditorTypeName = editor; + ConverterTypeName = typeConverter; } /// Index: src/Common/DelftTools.Utils/Serialization/SerializationWriter.cs =================================================================== diff -u -r3e905c4e56df168cc8fe333589e2d5420a600f04 -rcfb6c5c646fce30eb797adf2cc27d2eff7e4ac99 --- src/Common/DelftTools.Utils/Serialization/SerializationWriter.cs (.../SerializationWriter.cs) (revision 3e905c4e56df168cc8fe333589e2d5420a600f04) +++ src/Common/DelftTools.Utils/Serialization/SerializationWriter.cs (.../SerializationWriter.cs) (revision cfb6c5c646fce30eb797adf2cc27d2eff7e4ac99) @@ -11,12 +11,6 @@ using System.Runtime.Serialization.Formatters.Binary; using System.Text; -// ReSharper disable PossibleInvalidCastException -// ReSharper disable PossibleNullReferenceException -// ReSharper disable AssignNullToNotNullAttribute -// ReSharper disable ConditionIsAlwaysTrueOrFalse -// ReSharper disable HeuristicUnreachableCode - namespace DelftTools.Utils.Serialization { /// Index: test/Common/DelftTools.Tests/Controls/Swf/FindAndReplaceControlTest.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -rcfb6c5c646fce30eb797adf2cc27d2eff7e4ac99 --- test/Common/DelftTools.Tests/Controls/Swf/FindAndReplaceControlTest.cs (.../FindAndReplaceControlTest.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ test/Common/DelftTools.Tests/Controls/Swf/FindAndReplaceControlTest.cs (.../FindAndReplaceControlTest.cs) (revision cfb6c5c646fce30eb797adf2cc27d2eff7e4ac99) @@ -7,10 +7,10 @@ [TestFixture] public class FindAndReplaceControlTest { - [Test] - public void FindNextText() + [TestCase(true)] // search for third "Test" occurrence (index 23) + [TestCase(false)] // search for second "Test" occurrence (index 11) + public void FindNextText(bool check2) { - var check2 = false; var text = "Test text\n Test text2\n Test text2"; var findAndReplaceControl = new FindAndReplaceControl { @@ -26,12 +26,7 @@ findAndReplaceControl.FindTextBox.Text = "Test"; - // search for second "Test" occurrence (index 11) TypeUtils.CallPrivateMethod(findAndReplaceControl, "FindNext"); - - // search for third "Test" occurrence (index 23) - check2 = true; - TypeUtils.CallPrivateMethod(findAndReplaceControl, "FindNext"); } [Test]