From f4f683b6500e116a070230eb7ec9b64e344440c1 Mon Sep 17 00:00:00 2001 From: andreashuber-lawo Date: Fri, 8 Jan 2016 09:20:59 +0100 Subject: [PATCH] Rename invocationCollection parameter to pendingInvocations References #8 --- Lawo.EmberPlusSharp/Model/Element.cs | 2 +- Lawo.EmberPlusSharp/Model/FunctionBase.cs | 8 ++++---- Lawo.EmberPlusSharp/Model/Matrix.cs | 2 +- Lawo.EmberPlusSharp/Model/Node.cs | 4 ++-- Lawo.EmberPlusSharp/Model/NodeBase.cs | 4 ++-- Lawo.EmberPlusSharp/Model/ParameterBase.cs | 2 +- Lawo.EmberPlusSharp/Model/Root.cs | 4 ++-- Lawo.EmberPlusSharp/Model/ShadowNode.cs | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Lawo.EmberPlusSharp/Model/Element.cs b/Lawo.EmberPlusSharp/Model/Element.cs index 46054bcb..aaf4287d 100644 --- a/Lawo.EmberPlusSharp/Model/Element.cs +++ b/Lawo.EmberPlusSharp/Model/Element.cs @@ -260,7 +260,7 @@ internal virtual bool WriteRequest(EmberWriter writer, IStreamedParameterCollect return false; } - internal abstract void WriteChanges(EmberWriter writer, IInvocationCollection invocationCollection); + internal abstract void WriteChanges(EmberWriter writer, IInvocationCollection pendingInvocations); internal virtual void SetComplete() { diff --git a/Lawo.EmberPlusSharp/Model/FunctionBase.cs b/Lawo.EmberPlusSharp/Model/FunctionBase.cs index 5371aa20..31e7da2e 100644 --- a/Lawo.EmberPlusSharp/Model/FunctionBase.cs +++ b/Lawo.EmberPlusSharp/Model/FunctionBase.cs @@ -105,7 +105,7 @@ internal override RequestState ReadContents(EmberReader reader, ElementType actu return RequestState.Complete; } - internal sealed override void WriteChanges(EmberWriter writer, IInvocationCollection invocationCollection) + internal sealed override void WriteChanges(EmberWriter writer, IInvocationCollection pendingInvocations) { if (this.HasChanges) { @@ -115,7 +115,7 @@ internal sealed override void WriteChanges(EmberWriter writer, IInvocationCollec writer.WriteValue(GlowQualifiedFunction.Path.OuterId, this.NumberPath); writer.WriteStartApplicationDefinedType( GlowQualifiedFunction.Children.OuterId, GlowElementCollection.InnerNumber); - this.WriteInvocations(writer, invocationCollection); + this.WriteInvocations(writer, pendingInvocations); writer.WriteEndContainer(); writer.WriteEndContainer(); this.HasChanges = false; @@ -195,7 +195,7 @@ private async Task InvokeCoreAsync(object[] actualArguments) this.arguments.Zip(actualArguments, (e, a) => CreateWriter(e, a)).ToArray()); } - private void WriteInvocations(EmberWriter writer, IInvocationCollection invocationCollection) + private void WriteInvocations(EmberWriter writer, IInvocationCollection pendingInvocations) { while (this.invocations.Count > 0) { @@ -203,7 +203,7 @@ private void WriteInvocations(EmberWriter writer, IInvocationCollection invocati writer.WriteValue(GlowCommand.Number.OuterId, 33); writer.WriteStartApplicationDefinedType(GlowCommand.Invocation.OuterId, GlowInvocation.InnerNumber); var invocation = this.invocations.Dequeue(); - var invocationId = invocationCollection.Add(invocation.Key); + var invocationId = pendingInvocations.Add(invocation.Key); writer.WriteValue(GlowInvocation.InvocationId.OuterId, invocationId); writer.WriteStartSequence(GlowInvocation.Arguments.OuterId); diff --git a/Lawo.EmberPlusSharp/Model/Matrix.cs b/Lawo.EmberPlusSharp/Model/Matrix.cs index af8a3256..b8f97807 100644 --- a/Lawo.EmberPlusSharp/Model/Matrix.cs +++ b/Lawo.EmberPlusSharp/Model/Matrix.cs @@ -188,7 +188,7 @@ internal override RequestState ReadContents(EmberReader reader, ElementType actu return this.RequestState; } - internal sealed override void WriteChanges(EmberWriter writer, IInvocationCollection invocationCollection) + internal sealed override void WriteChanges(EmberWriter writer, IInvocationCollection pendingInvocations) { ////if (this.HasChanges) ////{ diff --git a/Lawo.EmberPlusSharp/Model/Node.cs b/Lawo.EmberPlusSharp/Model/Node.cs index 8ca8fa36..0c60a2fc 100644 --- a/Lawo.EmberPlusSharp/Model/Node.cs +++ b/Lawo.EmberPlusSharp/Model/Node.cs @@ -115,11 +115,11 @@ internal sealed override RequestState ReadContents(EmberReader reader, ElementTy return this.RequestState; } - internal override void WriteChanges(EmberWriter writer, IInvocationCollection invocationCollection) + internal override void WriteChanges(EmberWriter writer, IInvocationCollection pendingInvocations) { if (this.HasChanges) { - this.WriteChangesCollection(writer, invocationCollection); + this.WriteChangesCollection(writer, pendingInvocations); this.HasChanges = false; } } diff --git a/Lawo.EmberPlusSharp/Model/NodeBase.cs b/Lawo.EmberPlusSharp/Model/NodeBase.cs index 35a1f887..fe2809c2 100644 --- a/Lawo.EmberPlusSharp/Model/NodeBase.cs +++ b/Lawo.EmberPlusSharp/Model/NodeBase.cs @@ -82,11 +82,11 @@ internal bool WriteCommandCollection(EmberWriter writer, IStreamedParameterColle } } - internal void WriteChangesCollection(EmberWriter writer, IInvocationCollection invocationCollection) + internal void WriteChangesCollection(EmberWriter writer, IInvocationCollection pendingInvocations) { foreach (var child in this.children.Values) { - child.WriteChanges(writer, invocationCollection); + child.WriteChanges(writer, pendingInvocations); } } diff --git a/Lawo.EmberPlusSharp/Model/ParameterBase.cs b/Lawo.EmberPlusSharp/Model/ParameterBase.cs index 214ee52e..bebd8ae9 100644 --- a/Lawo.EmberPlusSharp/Model/ParameterBase.cs +++ b/Lawo.EmberPlusSharp/Model/ParameterBase.cs @@ -332,7 +332,7 @@ internal override RequestState ReadContents(EmberReader reader, ElementType actu return this.RequestState; } - internal sealed override void WriteChanges(EmberWriter writer, IInvocationCollection invocationCollection) + internal sealed override void WriteChanges(EmberWriter writer, IInvocationCollection pendingInvocations) { if (this.HasChanges) { diff --git a/Lawo.EmberPlusSharp/Model/Root.cs b/Lawo.EmberPlusSharp/Model/Root.cs index 92428128..953e1cf1 100644 --- a/Lawo.EmberPlusSharp/Model/Root.cs +++ b/Lawo.EmberPlusSharp/Model/Root.cs @@ -142,12 +142,12 @@ internal sealed override bool WriteRequest(EmberWriter writer, IStreamedParamete } [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", Justification = "Method is not public, CA bug?")] - internal sealed override void WriteChanges(EmberWriter writer, IInvocationCollection invocationCollection) + internal sealed override void WriteChanges(EmberWriter writer, IInvocationCollection pendingInvocations) { if (this.HasChanges) { writer.WriteStartApplicationDefinedType(GlowGlobal.Root.OuterId, GlowRootElementCollection.InnerNumber); - this.WriteChangesCollection(writer, invocationCollection); + this.WriteChangesCollection(writer, pendingInvocations); writer.WriteEndContainer(); this.HasChanges = false; } diff --git a/Lawo.EmberPlusSharp/Model/ShadowNode.cs b/Lawo.EmberPlusSharp/Model/ShadowNode.cs index 7330fedc..a6159f2e 100644 --- a/Lawo.EmberPlusSharp/Model/ShadowNode.cs +++ b/Lawo.EmberPlusSharp/Model/ShadowNode.cs @@ -25,7 +25,7 @@ internal sealed override RequestState ReadContents(EmberReader reader, ElementTy throw new ModelException("Unexpected contents for intermediate node in basePath."); } - internal sealed override void WriteChanges(EmberWriter writer, IInvocationCollection invocationCollection) + internal sealed override void WriteChanges(EmberWriter writer, IInvocationCollection pendingInvocations) { this.HasChanges = false; }