From 19c2f08a8b54bc77ca85d93b6ad403b332037fb4 Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Tue, 26 Jun 2012 00:40:46 +0100
Subject: [PATCH] Add much easier ConsoleDisplayTable AddColumn() and AddRow()
 methods.

Use these for new "show regions" command rather than old cumbersome stuff.
---
 OpenSim/Framework/Console/ConsoleDisplayTable.cs | 15 +++++++++++++++
 OpenSim/Services/GridService/GridService.cs      | 11 +++++------
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/OpenSim/Framework/Console/ConsoleDisplayTable.cs b/OpenSim/Framework/Console/ConsoleDisplayTable.cs
index e9d1628b1d..c620dfe10c 100644
--- a/OpenSim/Framework/Console/ConsoleDisplayTable.cs
+++ b/OpenSim/Framework/Console/ConsoleDisplayTable.cs
@@ -79,6 +79,16 @@ namespace OpenSim.Framework.Console
             return sb.ToString();
         }
 
+        public void AddColumn(string name, int width)
+        {
+            Columns.Add(new ConsoleDisplayTableColumn(name, width));
+        }
+
+        public void AddRow(params string[] cells)
+        {
+            Rows.Add(new ConsoleDisplayTableRow(cells));
+        }
+
         public void AddToStringBuilder(StringBuilder sb)
         {
             string formatString = GetFormatString();
@@ -135,5 +145,10 @@ namespace OpenSim.Framework.Console
         {
             Cells = cells;
         }
+
+        public ConsoleDisplayTableRow(params string[] cells) : this()
+        {
+            Cells = new List<string>(cells);
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index e4c32467a2..842a6979a9 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -648,16 +648,15 @@ namespace OpenSim.Services.GridService
         private void OutputRegionsToConsoleSummary(List<RegionData> regions)
         {
             ConsoleDisplayTable dispTable = new ConsoleDisplayTable();
-            dispTable.Columns.Add(new ConsoleDisplayTableColumn("Name", 16));
-            dispTable.Columns.Add(new ConsoleDisplayTableColumn("ID", 36));
-            dispTable.Columns.Add(new ConsoleDisplayTableColumn("Owner ID", 36));
-            dispTable.Columns.Add(new ConsoleDisplayTableColumn("Flags", 60));
+            dispTable.AddColumn("Name", 16);
+            dispTable.AddColumn("ID", 36);
+            dispTable.AddColumn("Owner ID", 36);
+            dispTable.AddColumn("Flags", 60);
 
             foreach (RegionData r in regions)
             {
                 OpenSim.Data.RegionFlags flags = (OpenSim.Data.RegionFlags)Convert.ToInt32(r.Data["flags"]);
-                dispTable.Rows.Add(
-                    new ConsoleDisplayTableRow(new List<string> { r.RegionName, r.RegionID.ToString(), r.Data["owner_uuid"].ToString(), flags.ToString() }));
+                dispTable.AddRow(r.RegionName, r.RegionID.ToString(), r.Data["owner_uuid"].ToString(), flags.ToString());
             }
 
             MainConsole.Instance.Output(dispTable.ToString());