From edaf2907bd952f6b1bc8eb5e2839c65287ee2fa0 Mon Sep 17 00:00:00 2001 From: jlewin Date: Fri, 1 Mar 2019 18:19:16 -0800 Subject: [PATCH] Place access modifiers before override --- MatterControlLib/DesignTools/Braille/BrailleCardObject3D.cs | 2 +- MatterControlLib/DesignTools/Braille/BrailleObject3D.cs | 2 +- MatterControlLib/DesignTools/LithophaneObject3D.cs | 2 +- MatterControlLib/DesignTools/Obsolete/CurveObject3D.cs | 2 +- MatterControlLib/DesignTools/Obsolete/FitToBoundsObject3D.cs | 2 +- MatterControlLib/DesignTools/Obsolete/PinchObject3D.cs | 2 +- .../DesignTools/Operations/Path/InflatePathObject3D.cs | 2 +- MatterControlLib/DesignTools/Primitives/CylinderObject3D.cs | 2 +- MatterControlLib/DesignTools/Primitives/HalfCylinderObject3D.cs | 2 +- MatterControlLib/DesignTools/Primitives/HalfSphereObject3D.cs | 2 +- MatterControlLib/DesignTools/Primitives/HalfWedgeObject3D.cs | 2 +- MatterControlLib/DesignTools/Primitives/PyramidObject3D.cs | 2 +- MatterControlLib/DesignTools/Primitives/RingObject3D.cs | 2 +- MatterControlLib/DesignTools/Primitives/SphereObject3D.cs | 2 +- MatterControlLib/DesignTools/Primitives/TextPathObject3D.cs | 2 +- MatterControlLib/DesignTools/Primitives/TorusObject3D.cs | 2 +- MatterControlLib/DesignTools/Primitives/WedgeObject3D.cs | 2 +- .../Utilities/MarkdigAgg/Inlines/AggLinkInlineRenderer.cs | 2 -- Submodules/agg-sharp | 2 +- 19 files changed, 18 insertions(+), 20 deletions(-) diff --git a/MatterControlLib/DesignTools/Braille/BrailleCardObject3D.cs b/MatterControlLib/DesignTools/Braille/BrailleCardObject3D.cs index 0b1300200..af08910a0 100644 --- a/MatterControlLib/DesignTools/Braille/BrailleCardObject3D.cs +++ b/MatterControlLib/DesignTools/Braille/BrailleCardObject3D.cs @@ -70,7 +70,7 @@ namespace MatterHackers.MatterControl.DesignTools base.OnInvalidate(invalidateType); } - override public async Task Rebuild() + public override async Task Rebuild() { using (RebuildLock()) { diff --git a/MatterControlLib/DesignTools/Braille/BrailleObject3D.cs b/MatterControlLib/DesignTools/Braille/BrailleObject3D.cs index 51240f769..ef2307673 100644 --- a/MatterControlLib/DesignTools/Braille/BrailleObject3D.cs +++ b/MatterControlLib/DesignTools/Braille/BrailleObject3D.cs @@ -96,7 +96,7 @@ namespace MatterHackers.MatterControl.DesignTools base.OnInvalidate(invalidateType); } - override public Task Rebuild() + public override Task Rebuild() { using (RebuildLock()) { diff --git a/MatterControlLib/DesignTools/LithophaneObject3D.cs b/MatterControlLib/DesignTools/LithophaneObject3D.cs index 8ef259acd..c88ca9059 100644 --- a/MatterControlLib/DesignTools/LithophaneObject3D.cs +++ b/MatterControlLib/DesignTools/LithophaneObject3D.cs @@ -87,7 +87,7 @@ namespace MatterHackers.MatterControl.Plugins.Lithophane } } - override public Task Rebuild() + public override Task Rebuild() { this.DebugDepth("Rebuild"); var activeImage = AggContext.ImageIO.LoadImage(this.Image.AssetPath); diff --git a/MatterControlLib/DesignTools/Obsolete/CurveObject3D.cs b/MatterControlLib/DesignTools/Obsolete/CurveObject3D.cs index fe28ae30c..82c6b254f 100644 --- a/MatterControlLib/DesignTools/Obsolete/CurveObject3D.cs +++ b/MatterControlLib/DesignTools/Obsolete/CurveObject3D.cs @@ -169,7 +169,7 @@ namespace MatterHackers.MatterControl.DesignTools } } - override public Task Rebuild() + public override Task Rebuild() { this.DebugDepth("Rebuild"); bool valuesChanged = Diameter == double.MinValue; diff --git a/MatterControlLib/DesignTools/Obsolete/FitToBoundsObject3D.cs b/MatterControlLib/DesignTools/Obsolete/FitToBoundsObject3D.cs index 226432281..ae608c9f7 100644 --- a/MatterControlLib/DesignTools/Obsolete/FitToBoundsObject3D.cs +++ b/MatterControlLib/DesignTools/Obsolete/FitToBoundsObject3D.cs @@ -166,7 +166,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations return fitToBounds; } - override public Task Rebuild() + public override Task Rebuild() { this.DebugDepth("Rebuild"); diff --git a/MatterControlLib/DesignTools/Obsolete/PinchObject3D.cs b/MatterControlLib/DesignTools/Obsolete/PinchObject3D.cs index 5f3ad6dc8..d8002ccb4 100644 --- a/MatterControlLib/DesignTools/Obsolete/PinchObject3D.cs +++ b/MatterControlLib/DesignTools/Obsolete/PinchObject3D.cs @@ -77,7 +77,7 @@ namespace MatterHackers.MatterControl.DesignTools } } - override public Task Rebuild() + public override Task Rebuild() { this.DebugDepth("Rebuild"); diff --git a/MatterControlLib/DesignTools/Operations/Path/InflatePathObject3D.cs b/MatterControlLib/DesignTools/Operations/Path/InflatePathObject3D.cs index 76e14a070..61f84a729 100644 --- a/MatterControlLib/DesignTools/Operations/Path/InflatePathObject3D.cs +++ b/MatterControlLib/DesignTools/Operations/Path/InflatePathObject3D.cs @@ -78,7 +78,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations } } - override public Task Rebuild() + public override Task Rebuild() { this.DebugDepth("Rebuild"); using (RebuildLock()) diff --git a/MatterControlLib/DesignTools/Primitives/CylinderObject3D.cs b/MatterControlLib/DesignTools/Primitives/CylinderObject3D.cs index 40d473b91..a3f2aa53a 100644 --- a/MatterControlLib/DesignTools/Primitives/CylinderObject3D.cs +++ b/MatterControlLib/DesignTools/Primitives/CylinderObject3D.cs @@ -133,7 +133,7 @@ namespace MatterHackers.MatterControl.DesignTools } } - override public Task Rebuild() + public override Task Rebuild() { this.DebugDepth("Rebuild"); bool valuesChanged = false; diff --git a/MatterControlLib/DesignTools/Primitives/HalfCylinderObject3D.cs b/MatterControlLib/DesignTools/Primitives/HalfCylinderObject3D.cs index 0112b1e2c..2b1592b8d 100644 --- a/MatterControlLib/DesignTools/Primitives/HalfCylinderObject3D.cs +++ b/MatterControlLib/DesignTools/Primitives/HalfCylinderObject3D.cs @@ -70,7 +70,7 @@ namespace MatterHackers.MatterControl.DesignTools } } - override public Task Rebuild() + public override Task Rebuild() { this.DebugDepth("Rebuild"); bool valuesChanged = false; diff --git a/MatterControlLib/DesignTools/Primitives/HalfSphereObject3D.cs b/MatterControlLib/DesignTools/Primitives/HalfSphereObject3D.cs index 374e64127..8cfd07b30 100644 --- a/MatterControlLib/DesignTools/Primitives/HalfSphereObject3D.cs +++ b/MatterControlLib/DesignTools/Primitives/HalfSphereObject3D.cs @@ -78,7 +78,7 @@ namespace MatterHackers.MatterControl.DesignTools } } - override public Task Rebuild() + public override Task Rebuild() { this.DebugDepth("Rebuild"); bool valuesChanged = false; diff --git a/MatterControlLib/DesignTools/Primitives/HalfWedgeObject3D.cs b/MatterControlLib/DesignTools/Primitives/HalfWedgeObject3D.cs index 7742e0484..2a1f78d81 100644 --- a/MatterControlLib/DesignTools/Primitives/HalfWedgeObject3D.cs +++ b/MatterControlLib/DesignTools/Primitives/HalfWedgeObject3D.cs @@ -68,7 +68,7 @@ namespace MatterHackers.MatterControl.DesignTools } } - override public Task Rebuild() + public override Task Rebuild() { this.DebugDepth("Rebuild"); using (RebuildLock()) diff --git a/MatterControlLib/DesignTools/Primitives/PyramidObject3D.cs b/MatterControlLib/DesignTools/Primitives/PyramidObject3D.cs index 86cf41352..7162d4d09 100644 --- a/MatterControlLib/DesignTools/Primitives/PyramidObject3D.cs +++ b/MatterControlLib/DesignTools/Primitives/PyramidObject3D.cs @@ -69,7 +69,7 @@ namespace MatterHackers.MatterControl.DesignTools } } - override public Task Rebuild() + public override Task Rebuild() { this.DebugDepth("Rebuild"); using (RebuildLock()) diff --git a/MatterControlLib/DesignTools/Primitives/RingObject3D.cs b/MatterControlLib/DesignTools/Primitives/RingObject3D.cs index 2b1b3a610..4b49765f2 100644 --- a/MatterControlLib/DesignTools/Primitives/RingObject3D.cs +++ b/MatterControlLib/DesignTools/Primitives/RingObject3D.cs @@ -86,7 +86,7 @@ namespace MatterHackers.MatterControl.DesignTools } } - override public Task Rebuild() + public override Task Rebuild() { this.DebugDepth("Rebuild"); bool valuesChanged = false; diff --git a/MatterControlLib/DesignTools/Primitives/SphereObject3D.cs b/MatterControlLib/DesignTools/Primitives/SphereObject3D.cs index b33bf3676..aa53f4e1c 100644 --- a/MatterControlLib/DesignTools/Primitives/SphereObject3D.cs +++ b/MatterControlLib/DesignTools/Primitives/SphereObject3D.cs @@ -83,7 +83,7 @@ namespace MatterHackers.MatterControl.DesignTools } } - override public Task Rebuild() + public override Task Rebuild() { this.DebugDepth("Rebuild"); bool valuesChanged = false; diff --git a/MatterControlLib/DesignTools/Primitives/TextPathObject3D.cs b/MatterControlLib/DesignTools/Primitives/TextPathObject3D.cs index af02c9004..59590e648 100644 --- a/MatterControlLib/DesignTools/Primitives/TextPathObject3D.cs +++ b/MatterControlLib/DesignTools/Primitives/TextPathObject3D.cs @@ -109,7 +109,7 @@ namespace MatterHackers.MatterControl.DesignTools } } - override public Task Rebuild() + public override Task Rebuild() { this.DebugDepth("Rebuild"); using (RebuildLock()) diff --git a/MatterControlLib/DesignTools/Primitives/TorusObject3D.cs b/MatterControlLib/DesignTools/Primitives/TorusObject3D.cs index 171a2fe95..a7f91c329 100644 --- a/MatterControlLib/DesignTools/Primitives/TorusObject3D.cs +++ b/MatterControlLib/DesignTools/Primitives/TorusObject3D.cs @@ -75,7 +75,7 @@ namespace MatterHackers.MatterControl.DesignTools } } - override public Task Rebuild() + public override Task Rebuild() { this.DebugDepth("Rebuild"); bool valuesChanged = false; diff --git a/MatterControlLib/DesignTools/Primitives/WedgeObject3D.cs b/MatterControlLib/DesignTools/Primitives/WedgeObject3D.cs index 4ad76d49f..38ca40439 100644 --- a/MatterControlLib/DesignTools/Primitives/WedgeObject3D.cs +++ b/MatterControlLib/DesignTools/Primitives/WedgeObject3D.cs @@ -68,7 +68,7 @@ namespace MatterHackers.MatterControl.DesignTools } } - override public Task Rebuild() + public override Task Rebuild() { this.DebugDepth("Rebuild"); using (RebuildLock()) diff --git a/MatterControlLib/Utilities/MarkdigAgg/Inlines/AggLinkInlineRenderer.cs b/MatterControlLib/Utilities/MarkdigAgg/Inlines/AggLinkInlineRenderer.cs index d57d298b6..27bd062f5 100644 --- a/MatterControlLib/Utilities/MarkdigAgg/Inlines/AggLinkInlineRenderer.cs +++ b/MatterControlLib/Utilities/MarkdigAgg/Inlines/AggLinkInlineRenderer.cs @@ -136,8 +136,6 @@ namespace Markdig.Renderers.Agg.Inlines if (response.IsSuccessStatusCode) { - Console.WriteLine(task.Result.Headers); - response.Content.ReadAsStreamAsync().ContinueWith(streamTask => { //response.Headers.TryGetValues("", s[""] == "" || diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 21a6e6ba1..a017e905a 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 21a6e6ba19c3bbb4b73b8fbc323dc351fe0fed84 +Subproject commit a017e905a3289530645cae1bd97bc5ff0d6db4f9