From cd6d413f3b390be4c1ec24e8153d0d0b37d1bdb6 Mon Sep 17 00:00:00 2001 From: ebragge Date: Mon, 14 Mar 2016 16:34:19 +0200 Subject: [PATCH] fix(AsyncStorageModule): capitalize internal function names AsyncStorageModule provides permanent storage for React Native JavaScript applications. - implement PR #3 comments Fixes #136 --- .../Modules/Storage/AsyncStorageModule.cs | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/ReactWindows/ReactNative/Modules/Storage/AsyncStorageModule.cs b/ReactWindows/ReactNative/Modules/Storage/AsyncStorageModule.cs index ebb3512a117..e57dc2544b7 100644 --- a/ReactWindows/ReactNative/Modules/Storage/AsyncStorageModule.cs +++ b/ReactWindows/ReactNative/Modules/Storage/AsyncStorageModule.cs @@ -82,7 +82,7 @@ public void multiGet(string[] keys, ICallback callback) result.Add(new JArray { key, - getTokenFromContainer(key), + GetTokenFromContainer(key), }); } @@ -121,7 +121,7 @@ public void multiSet(JArray keyValueArray, ICallback callback) var pair = keyValue.Value(); if (pair.First.Type == JTokenType.String) { - addTokenToContainer(pair.First.Value(), pair.Last); + AddTokenToContainer(pair.First.Value(), pair.Last); } else { @@ -210,27 +210,27 @@ public void multiMerge(JArray keyValueArray, ICallback callback) if (pair.First.Type == JTokenType.String) { var key = pair.First.Value(); - var tokenOld = getTokenFromContainer(key); + var tokenOld = GetTokenFromContainer(key); var tokenNew = pair.Last; if (tokenOld.Type == JTokenType.Object && tokenNew.Type == JTokenType.Object) { - deepMergeInto((JObject)tokenOld, (JObject)tokenNew); - addTokenToContainer(key, tokenOld); + DeepMergeInto((JObject)tokenOld, (JObject)tokenNew); + AddTokenToContainer(key, tokenOld); } else if (tokenOld.Type == JTokenType.Array) { (tokenOld as JArray).Merge(tokenNew); - addTokenToContainer(key, tokenOld); + AddTokenToContainer(key, tokenOld); } else if (tokenNew.Type == JTokenType.Array) { (tokenNew as JArray).Merge(tokenOld); - addTokenToContainer(key, tokenNew); + AddTokenToContainer(key, tokenNew); } else if (tokenOld.Type == JTokenType.Null) { - addTokenToContainer(key, tokenNew); + AddTokenToContainer(key, tokenNew); } } else @@ -289,13 +289,13 @@ public void getAllKeys(ICallback callback) /// /// The key. /// The token. - private void addTokenToContainer(string key, JToken token) + private void AddTokenToContainer(string key, JToken token) { switch (token.Type) { case JTokenType.Null: _dataContainer.Values[key] = ""; - addTokenTypeToContainer(key, _DataType.Null); + AddTokenTypeToContainer(key, _DataType.Null); break; case JTokenType.Boolean: _dataContainer.Values[key] = token.Value(); @@ -314,31 +314,31 @@ private void addTokenToContainer(string key, JToken token) break; case JTokenType.Date: _dataContainer.Values[key] = token.ToString(); - addTokenTypeToContainer(key, _DataType.Date); + AddTokenTypeToContainer(key, _DataType.Date); break; case JTokenType.Uri: _dataContainer.Values[key] = token.ToString(); - addTokenTypeToContainer(key, _DataType.Uri); + AddTokenTypeToContainer(key, _DataType.Uri); break; case JTokenType.String: _dataContainer.Values[key] = token.Value(); - addTokenTypeToContainer(key, _DataType.String); + AddTokenTypeToContainer(key, _DataType.String); break; case JTokenType.Array: _dataContainer.Values[key] = token.ToString(); - addTokenTypeToContainer(key, _DataType.Array); + AddTokenTypeToContainer(key, _DataType.Array); break; case JTokenType.Constructor: _dataContainer.Values[key] = token.ToString(); - addTokenTypeToContainer(key, _DataType.Constructor); + AddTokenTypeToContainer(key, _DataType.Constructor); break; case JTokenType.Object: _dataContainer.Values[key] = token.ToString(); - addTokenTypeToContainer(key, _DataType.Object); + AddTokenTypeToContainer(key, _DataType.Object); break; case JTokenType.Raw: _dataContainer.Values[key] = token.ToString(); - addTokenTypeToContainer(key, _DataType.Raw); + AddTokenTypeToContainer(key, _DataType.Raw); break; default: Debug.Assert(false); // Not supported JToken type @@ -350,7 +350,7 @@ private void addTokenToContainer(string key, JToken token) /// Gets related value for a specific key from as . /// /// The key. - private JToken getTokenFromContainer(string key) + private JToken GetTokenFromContainer(string key) { object value; if (_dataContainer.Values.TryGetValue(key, out value)) @@ -361,7 +361,7 @@ private JToken getTokenFromContainer(string key) } else if (value is string) { - var type = getTokenTypeFromContainer(key); + var type = GetTokenTypeFromContainer(key); switch (type) { case _DataType.Array: @@ -392,7 +392,7 @@ private JToken getTokenFromContainer(string key) /// /// The key. /// The type. - private void addTokenTypeToContainer(string key, _DataType type) + private void AddTokenTypeToContainer(string key, _DataType type) { _typeContainer.Values[key] = (int)type; } @@ -401,7 +401,7 @@ private void addTokenTypeToContainer(string key, _DataType type) /// Gets token's type for a specific key from . /// /// The key. - private _DataType getTokenTypeFromContainer(string key) + private _DataType GetTokenTypeFromContainer(string key) { object value; if (_typeContainer.Values.TryGetValue(key, out value)) @@ -419,7 +419,7 @@ private _DataType getTokenTypeFromContainer(string key) /// /// The old value. /// The old value. - private static void deepMergeInto(JObject oldObj, JObject newObj) + private static void DeepMergeInto(JObject oldObj, JObject newObj) { IDictionary dictionary = newObj; var keys = dictionary.Keys; @@ -431,15 +431,15 @@ private static void deepMergeInto(JObject oldObj, JObject newObj) oldObj.TryGetValue(key, out tokenOld); if (tokenNew?.Type == JTokenType.Object && tokenOld?.Type == JTokenType.Object) { - deepMergeInto(tokenOld as JObject, tokenNew as JObject); - putToJObject(key, tokenOld, oldObj); + DeepMergeInto(tokenOld as JObject, tokenNew as JObject); + PutToJObject(key, tokenOld, oldObj); } else { var property = newObj.Property(key); foreach (var token in property) { - putToJObject(key, token, oldObj); + PutToJObject(key, token, oldObj); } } } @@ -452,7 +452,7 @@ private static void deepMergeInto(JObject oldObj, JObject newObj) /// The key. /// The token. /// The object. - private static void putToJObject(string key, JToken token, JObject obj) + private static void PutToJObject(string key, JToken token, JObject obj) { obj.Remove(key); obj.Add(key, token);