From 16feed456adbcf43a9ec797d1a499599aadda6b9 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 5 Oct 2012 04:16:38 +0100
Subject: refactor: eliminate some now duplicate code in ObjectCommandsModule

---
 .../World/Objects/Commands/ObjectCommandsModule.cs | 59 +++++++++-------------
 1 file changed, 25 insertions(+), 34 deletions(-)

(limited to 'OpenSim/Region/CoreModules')

diff --git a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
index 5ecf5a1..fbc64e3 100644
--- a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
@@ -139,7 +139,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                     + "show object pos 20,20 to 40,40\n"
                     + "show object pos ,20,20 to ,40,40\n"
                     + "show object pos ,,30 to ,,~\n"
-                    + "show object pos ,,-~ to ,,30\n",
+                    + "show object pos ,,-~ to ,,30",
                 HandleShowObjectByPos);
 
             m_console.Commands.AddCommand(
@@ -169,6 +169,23 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
 //            m_log.DebugFormat("[OBJECTS COMMANDS MODULE]: REGION {0} LOADED", scene.RegionInfo.RegionName);
         }
 
+        private void OutputSogsToConsole(Predicate<SceneObjectGroup> searchPredicate)
+        {
+            List<SceneObjectGroup> sceneObjects = m_scene.GetSceneObjectGroups().FindAll(searchPredicate);
+
+            StringBuilder sb = new StringBuilder();
+
+            foreach (SceneObjectGroup so in sceneObjects)
+            {
+                AddSceneObjectReport(sb, so);
+                sb.Append("\n");
+            }
+
+            sb.AppendFormat("{0} object(s) found in {1}\n", sceneObjects.Count, m_scene.Name);
+
+            m_console.OutputFormat(sb.ToString());
+        }
+
         private void HandleShowObjectByUuid(string module, string[] cmd)
         {
             if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
@@ -219,32 +236,19 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
 
             string name = mainParams[3];
 
-            List<SceneObjectGroup> sceneObjects = new List<SceneObjectGroup>();
-            Action<SceneObjectGroup> searchAction;
+            Predicate<SceneObjectGroup> searchPredicate;
 
             if (useRegex)
             {
                 Regex nameRegex = new Regex(name);
-                searchAction = so => { if (nameRegex.IsMatch(so.Name)) { sceneObjects.Add(so); }};
+                searchPredicate = so => nameRegex.IsMatch(so.Name);
             }
             else
             {
-                searchAction = so => { if (so.Name == name) { sceneObjects.Add(so); }};
+                searchPredicate = so => so.Name == name;
             }
 
-            m_scene.ForEachSOG(searchAction);
-
-            StringBuilder sb = new StringBuilder();
-
-            foreach (SceneObjectGroup so in sceneObjects)
-            {
-                AddSceneObjectReport(sb, so);
-                sb.Append("\n");
-            }
-
-            sb.AppendFormat("{0} objects found in {1}\n", sceneObjects.Count, m_scene.Name);
-
-            m_console.OutputFormat(sb.ToString());
+            OutputSogsToConsole(searchPredicate);
         }
 
         private void HandleShowObjectByPos(string module, string[] cmdparams)
@@ -276,23 +280,10 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                 return;
             }
 
-            List<SceneObjectGroup> sceneObjects = new List<SceneObjectGroup>();
-            Action<SceneObjectGroup> searchAction
-                = so => { if (Util.IsInsideBox(so.AbsolutePosition, startVector, endVector)) { sceneObjects.Add(so); }};
-
-            m_scene.ForEachSOG(searchAction);
+            Predicate<SceneObjectGroup> searchPredicate
+                = so => Util.IsInsideBox(so.AbsolutePosition, startVector, endVector);
 
-            StringBuilder sb = new StringBuilder();
-
-            foreach (SceneObjectGroup so in sceneObjects)
-            {
-                AddSceneObjectReport(sb, so);
-                sb.Append("\n");
-            }
-
-            sb.AppendFormat("{0} objects found in {1}\n", sceneObjects.Count, m_scene.Name);
-
-            m_console.OutputFormat(sb.ToString());
+            OutputSogsToConsole(searchPredicate);
         }
 
         private void HandleShowPartByUuid(string module, string[] cmd)
-- 
cgit v1.1