From 8d6f4a2903e83497071b9b9645634686c5bba2b7 Mon Sep 17 00:00:00 2001 From: alcexhim Date: Wed, 12 Nov 2014 10:06:53 -0500 Subject: [PATCH] Changed access modifiers of ReadInternal/WriteInternal to protected internal so they can be used in subclasses --- CSharp/Libraries/UniversalEditor.Core/Accessor.cs | 4 ++-- .../Libraries/UniversalEditor.Core/Accessors/FileAccessor.cs | 4 ++-- .../UniversalEditor.Core/Accessors/MemoryAccessor.cs | 4 ++-- .../UniversalEditor.Core/Accessors/StreamAccessor.cs | 4 ++-- .../UniversalEditor.Core/Accessors/StringAccessor.cs | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CSharp/Libraries/UniversalEditor.Core/Accessor.cs b/CSharp/Libraries/UniversalEditor.Core/Accessor.cs index 7b4fac53..804d7b8d 100644 --- a/CSharp/Libraries/UniversalEditor.Core/Accessor.cs +++ b/CSharp/Libraries/UniversalEditor.Core/Accessor.cs @@ -42,8 +42,8 @@ namespace UniversalEditor } public abstract void Seek(long length, SeekOrigin position); - internal abstract int ReadInternal(byte[] buffer, int start, int count); - internal abstract int WriteInternal(byte[] buffer, int start, int count); + protected internal abstract int ReadInternal(byte[] buffer, int start, int count); + protected internal abstract int WriteInternal(byte[] buffer, int start, int count); internal virtual void FlushInternal() { diff --git a/CSharp/Libraries/UniversalEditor.Core/Accessors/FileAccessor.cs b/CSharp/Libraries/UniversalEditor.Core/Accessors/FileAccessor.cs index 22cd5981..0ca3ecc7 100644 --- a/CSharp/Libraries/UniversalEditor.Core/Accessors/FileAccessor.cs +++ b/CSharp/Libraries/UniversalEditor.Core/Accessors/FileAccessor.cs @@ -46,13 +46,13 @@ namespace UniversalEditor.Accessors mvarFileStream.Seek(length, (System.IO.SeekOrigin)origin); } - internal override int ReadInternal(byte[] buffer, int offset, int count) + protected internal override int ReadInternal(byte[] buffer, int offset, int count) { int length = mvarFileStream.Read(buffer, offset, count); return length; } - internal override int WriteInternal(byte[] buffer, int offset, int count) + protected internal override int WriteInternal(byte[] buffer, int offset, int count) { mvarFileStream.Write(buffer, offset, count); return count; diff --git a/CSharp/Libraries/UniversalEditor.Core/Accessors/MemoryAccessor.cs b/CSharp/Libraries/UniversalEditor.Core/Accessors/MemoryAccessor.cs index 29efe8dd..e3573829 100644 --- a/CSharp/Libraries/UniversalEditor.Core/Accessors/MemoryAccessor.cs +++ b/CSharp/Libraries/UniversalEditor.Core/Accessors/MemoryAccessor.cs @@ -90,13 +90,13 @@ namespace UniversalEditor.Accessors return data; } - internal override int ReadInternal(byte[] buffer, int start, int count) + protected internal override int ReadInternal(byte[] buffer, int start, int count) { System.Array.Copy(_data, Position, buffer, start, count); Position += count; return count; } - internal override int WriteInternal(byte[] buffer, int start, int count) + protected internal override int WriteInternal(byte[] buffer, int start, int count) { ResizeArray(ref _data, _data.Length + count); System.Array.Copy(buffer, start, _data, _data.Length - count, count); diff --git a/CSharp/Libraries/UniversalEditor.Core/Accessors/StreamAccessor.cs b/CSharp/Libraries/UniversalEditor.Core/Accessors/StreamAccessor.cs index 9b0c8367..4292d6db 100644 --- a/CSharp/Libraries/UniversalEditor.Core/Accessors/StreamAccessor.cs +++ b/CSharp/Libraries/UniversalEditor.Core/Accessors/StreamAccessor.cs @@ -67,7 +67,7 @@ namespace UniversalEditor.Accessors mvarBaseStream.Seek(offset, origin); } - internal override int ReadInternal(byte[] buffer, int start, int count) + protected internal override int ReadInternal(byte[] buffer, int start, int count) { // TODO: will ct ever be != count? should we add ct to Position instead of count?? int ct = mvarBaseStream.Read(buffer, start, count); @@ -75,7 +75,7 @@ namespace UniversalEditor.Accessors return count; } - internal override int WriteInternal(byte[] buffer, int start, int count) + protected internal override int WriteInternal(byte[] buffer, int start, int count) { mvarBaseStream.Write(buffer, start, count); // Position += count; diff --git a/CSharp/Libraries/UniversalEditor.Core/Accessors/StringAccessor.cs b/CSharp/Libraries/UniversalEditor.Core/Accessors/StringAccessor.cs index 5afc99a9..de0c1173 100644 --- a/CSharp/Libraries/UniversalEditor.Core/Accessors/StringAccessor.cs +++ b/CSharp/Libraries/UniversalEditor.Core/Accessors/StringAccessor.cs @@ -96,12 +96,12 @@ namespace UniversalEditor.Accessors return new System.String(ToArray()); } - internal override int ReadInternal(byte[] buffer, int start, int count) + protected internal override int ReadInternal(byte[] buffer, int start, int count) { System.Array.Copy(_data, 0, buffer, start, count); return count; } - internal override int WriteInternal(byte[] buffer, int start, int count) + protected internal override int WriteInternal(byte[] buffer, int start, int count) { string value = DefaultEncoding.GetString(buffer); int j = _data.Length;