From fe06b49dd6fac1c27c6f17e5eb43e0e2c931e4ca Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Thu, 14 Feb 2013 21:11:58 +0000
Subject: [PATCH] Rename new JsonScript functions JsonPathType() ->
 JsonGetPathType() and JsonArrayLength() -> JsonGetArrayLength()

This is for consistentency with the verb:noun naming approach existing json script functions and other script functions.
Corresponding c# methods also changed since verb:noun is also the .net c# method naming guideline (as used by OpenSimulator) and for consistency with script functions.
As agreed with cmickeyb
---
 OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs   | 4 ++--
 .../Scripting/JsonStore/JsonStoreModule.cs                | 4 ++--
 .../Scripting/JsonStore/JsonStoreScriptModule.cs          | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs b/OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs
index 20484d4156..c55ec84cb6 100644
--- a/OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Region.Framework.Interfaces
         bool CreateStore(string value, ref UUID result);
         bool DestroyStore(UUID storeID);
 
-        JsonStoreNodeType PathType(UUID storeID, string path);
+        JsonStoreNodeType GetPathType(UUID storeID, string path);
         bool TestStore(UUID storeID);
         bool TestPath(UUID storeID, string path, bool useJson);
 
@@ -59,6 +59,6 @@ namespace OpenSim.Region.Framework.Interfaces
         void TakeValue(UUID storeID, string path, bool useJson, TakeValueCallback cback);
         void ReadValue(UUID storeID, string path, bool useJson, TakeValueCallback cback);
 
-        int ArrayLength(UUID storeID, string path);
+        int GetArrayLength(UUID storeID, string path);
     }
 }
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs
index fabd8840da..43f9613536 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs
@@ -234,7 +234,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
         /// 
         /// </summary>
         // -----------------------------------------------------------------
-        public JsonStoreNodeType PathType(UUID storeID, string path)
+        public JsonStoreNodeType GetPathType(UUID storeID, string path)
         {
             if (! m_enabled) return JsonStoreNodeType.Undefined;
 
@@ -362,7 +362,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
         /// 
         /// </summary>
         // -----------------------------------------------------------------
-        public int ArrayLength(UUID storeID, string path)
+        public int GetArrayLength(UUID storeID, string path)
         {
             if (! m_enabled) return -1;
 
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
index 5a4a95271d..36df521185 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
@@ -320,9 +320,9 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
         /// </summary>
         // -----------------------------------------------------------------
         [ScriptInvocation]
-        public int JsonPathType(UUID hostID, UUID scriptID, UUID storeID, string path)
+        public int JsonGetPathType(UUID hostID, UUID scriptID, UUID storeID, string path)
         {
-            return (int)m_store.PathType(storeID,path);
+            return (int)m_store.GetPathType(storeID,path);
         }
 
         [ScriptInvocation]
@@ -371,9 +371,9 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
         /// </summary>
         // -----------------------------------------------------------------
         [ScriptInvocation]
-        public int JsonArrayLength(UUID hostID, UUID scriptID, UUID storeID, string path)
+        public int JsonGetArrayLength(UUID hostID, UUID scriptID, UUID storeID, string path)
         {
-            return m_store.ArrayLength(storeID,path);
+            return m_store.GetArrayLength(storeID,path);
         }
         
         // -----------------------------------------------------------------