From 7f9a025e30e896c115c2bdff9f2b8473747422a6 Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Wed, 23 May 2012 03:23:37 +0100
Subject: [PATCH] refactor: Rename ConsoleTableRow and ConsoleTableColumn to
 ConsoleDisplayTableRow and ConsoleDisplayTableColumn

---
 .../Framework/Console/ConsoleDisplayTable.cs   | 18 +++++++++---------
 .../Attachments/AttachmentsCommandModule.cs    | 12 ++++++------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/OpenSim/Framework/Console/ConsoleDisplayTable.cs b/OpenSim/Framework/Console/ConsoleDisplayTable.cs
index 49d5a179d0..e9d1628b1d 100644
--- a/OpenSim/Framework/Console/ConsoleDisplayTable.cs
+++ b/OpenSim/Framework/Console/ConsoleDisplayTable.cs
@@ -48,12 +48,12 @@ namespace OpenSim.Framework.Console
         /// <summary>
         /// Table columns.
         /// </summary>
-        public List<ConsoleTableColumn> Columns { get; private set; }
+        public List<ConsoleDisplayTableColumn> Columns { get; private set; }
 
         /// <summary>
         /// Table rows
         /// </summary>
-        public List<ConsoleTableRow> Rows { get; private set; }
+        public List<ConsoleDisplayTableRow> Rows { get; private set; }
 
         /// <summary>
         /// Number of spaces to indent the table.
@@ -68,8 +68,8 @@ namespace OpenSim.Framework.Console
         public ConsoleDisplayTable()
         {
             TableSpacing = DefaultTableSpacing;
-            Columns = new List<ConsoleTableColumn>();
-            Rows = new List<ConsoleTableRow>();
+            Columns = new List<ConsoleDisplayTableColumn>();
+            Rows = new List<ConsoleDisplayTableRow>();
         }
 
         public override string ToString()
@@ -88,7 +88,7 @@ namespace OpenSim.Framework.Console
             sb.AppendFormat(formatString, Columns.ConvertAll(c => c.Header).ToArray());
 
             // rows
-            foreach (ConsoleTableRow row in Rows)
+            foreach (ConsoleDisplayTableRow row in Rows)
                 sb.AppendFormat(formatString, row.Cells.ToArray());
         }
 
@@ -115,23 +115,23 @@ namespace OpenSim.Framework.Console
         }
     }
 
-    public struct ConsoleTableColumn
+    public struct ConsoleDisplayTableColumn
     {
         public string Header { get; set; }
         public int Width { get; set; }
 
-        public ConsoleTableColumn(string header, int width) : this()
+        public ConsoleDisplayTableColumn(string header, int width) : this()
         {
             Header = header;
             Width = width;
         }
     }
 
-    public struct ConsoleTableRow
+    public struct ConsoleDisplayTableRow
     {
         public List<string> Cells { get; private set; }
 
-        public ConsoleTableRow(List<string> cells) : this()
+        public ConsoleDisplayTableRow(List<string> cells) : this()
         {
             Cells = cells;
         }
diff --git a/OpenSim/Region/OptionalModules/Avatar/Attachments/AttachmentsCommandModule.cs b/OpenSim/Region/OptionalModules/Avatar/Attachments/AttachmentsCommandModule.cs
index df32a1d623..1b9e3ace5c 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Attachments/AttachmentsCommandModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Attachments/AttachmentsCommandModule.cs
@@ -146,11 +146,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
             sb.AppendFormat("Attachments for {0}\n", sp.Name);
 
             ConsoleDisplayTable ct = new ConsoleDisplayTable() { Indent = 2 };
-            ct.Columns.Add(new ConsoleTableColumn("Attachment Name", 36));
-            ct.Columns.Add(new ConsoleTableColumn("Local ID", 10));
-            ct.Columns.Add(new ConsoleTableColumn("Item ID", 36));
-            ct.Columns.Add(new ConsoleTableColumn("Attach Point", 14));
-            ct.Columns.Add(new ConsoleTableColumn("Position", 15));
+            ct.Columns.Add(new ConsoleDisplayTableColumn("Attachment Name", 36));
+            ct.Columns.Add(new ConsoleDisplayTableColumn("Local ID", 10));
+            ct.Columns.Add(new ConsoleDisplayTableColumn("Item ID", 36));
+            ct.Columns.Add(new ConsoleDisplayTableColumn("Attach Point", 14));
+            ct.Columns.Add(new ConsoleDisplayTableColumn("Position", 15));
 
 //            sb.AppendFormat(
 //                "  {0,-36}  {1,-10}  {2,-36}  {3,-14}  {4,-15}\n",
@@ -176,7 +176,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
 //                        attachmentObject.Name, attachmentObject.LocalId, attachmentObject.FromItemID,
 //                        (AttachmentPoint)attachmentObject.AttachmentPoint, attachmentObject.RootPart.AttachedPos);
                     ct.Rows.Add(
-                        new ConsoleTableRow(
+                        new ConsoleDisplayTableRow(
                             new List<string>()
                             {
                                 attachmentObject.Name,