diff options
author | Justin Clark-Casey (justincc) | 2012-05-23 03:23:37 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-05-23 03:23:37 +0100 |
commit | 8f88c17df969b1fd3e4a93747201e9436c9a1fcd (patch) | |
tree | 1e0af0bf80c2ef94d997a8ec74ba8893339ba5bc | |
parent | Add ConsoleDisplayList for more consistent formatting of console output in li... (diff) | |
download | opensim-SC_OLD-8f88c17df969b1fd3e4a93747201e9436c9a1fcd.zip opensim-SC_OLD-8f88c17df969b1fd3e4a93747201e9436c9a1fcd.tar.gz opensim-SC_OLD-8f88c17df969b1fd3e4a93747201e9436c9a1fcd.tar.bz2 opensim-SC_OLD-8f88c17df969b1fd3e4a93747201e9436c9a1fcd.tar.xz |
refactor: Rename ConsoleTableRow and ConsoleTableColumn to ConsoleDisplayTableRow and ConsoleDisplayTableColumn
-rw-r--r-- | OpenSim/Framework/Console/ConsoleDisplayTable.cs | 18 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/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 49d5a17..e9d1628 100644 --- a/OpenSim/Framework/Console/ConsoleDisplayTable.cs +++ b/OpenSim/Framework/Console/ConsoleDisplayTable.cs | |||
@@ -48,12 +48,12 @@ namespace OpenSim.Framework.Console | |||
48 | /// <summary> | 48 | /// <summary> |
49 | /// Table columns. | 49 | /// Table columns. |
50 | /// </summary> | 50 | /// </summary> |
51 | public List<ConsoleTableColumn> Columns { get; private set; } | 51 | public List<ConsoleDisplayTableColumn> Columns { get; private set; } |
52 | 52 | ||
53 | /// <summary> | 53 | /// <summary> |
54 | /// Table rows | 54 | /// Table rows |
55 | /// </summary> | 55 | /// </summary> |
56 | public List<ConsoleTableRow> Rows { get; private set; } | 56 | public List<ConsoleDisplayTableRow> Rows { get; private set; } |
57 | 57 | ||
58 | /// <summary> | 58 | /// <summary> |
59 | /// Number of spaces to indent the table. | 59 | /// Number of spaces to indent the table. |
@@ -68,8 +68,8 @@ namespace OpenSim.Framework.Console | |||
68 | public ConsoleDisplayTable() | 68 | public ConsoleDisplayTable() |
69 | { | 69 | { |
70 | TableSpacing = DefaultTableSpacing; | 70 | TableSpacing = DefaultTableSpacing; |
71 | Columns = new List<ConsoleTableColumn>(); | 71 | Columns = new List<ConsoleDisplayTableColumn>(); |
72 | Rows = new List<ConsoleTableRow>(); | 72 | Rows = new List<ConsoleDisplayTableRow>(); |
73 | } | 73 | } |
74 | 74 | ||
75 | public override string ToString() | 75 | public override string ToString() |
@@ -88,7 +88,7 @@ namespace OpenSim.Framework.Console | |||
88 | sb.AppendFormat(formatString, Columns.ConvertAll(c => c.Header).ToArray()); | 88 | sb.AppendFormat(formatString, Columns.ConvertAll(c => c.Header).ToArray()); |
89 | 89 | ||
90 | // rows | 90 | // rows |
91 | foreach (ConsoleTableRow row in Rows) | 91 | foreach (ConsoleDisplayTableRow row in Rows) |
92 | sb.AppendFormat(formatString, row.Cells.ToArray()); | 92 | sb.AppendFormat(formatString, row.Cells.ToArray()); |
93 | } | 93 | } |
94 | 94 | ||
@@ -115,23 +115,23 @@ namespace OpenSim.Framework.Console | |||
115 | } | 115 | } |
116 | } | 116 | } |
117 | 117 | ||
118 | public struct ConsoleTableColumn | 118 | public struct ConsoleDisplayTableColumn |
119 | { | 119 | { |
120 | public string Header { get; set; } | 120 | public string Header { get; set; } |
121 | public int Width { get; set; } | 121 | public int Width { get; set; } |
122 | 122 | ||
123 | public ConsoleTableColumn(string header, int width) : this() | 123 | public ConsoleDisplayTableColumn(string header, int width) : this() |
124 | { | 124 | { |
125 | Header = header; | 125 | Header = header; |
126 | Width = width; | 126 | Width = width; |
127 | } | 127 | } |
128 | } | 128 | } |
129 | 129 | ||
130 | public struct ConsoleTableRow | 130 | public struct ConsoleDisplayTableRow |
131 | { | 131 | { |
132 | public List<string> Cells { get; private set; } | 132 | public List<string> Cells { get; private set; } |
133 | 133 | ||
134 | public ConsoleTableRow(List<string> cells) : this() | 134 | public ConsoleDisplayTableRow(List<string> cells) : this() |
135 | { | 135 | { |
136 | Cells = cells; | 136 | Cells = cells; |
137 | } | 137 | } |
diff --git a/OpenSim/Region/OptionalModules/Avatar/Attachments/AttachmentsCommandModule.cs b/OpenSim/Region/OptionalModules/Avatar/Attachments/AttachmentsCommandModule.cs index df32a1d..1b9e3ac 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 | |||
146 | sb.AppendFormat("Attachments for {0}\n", sp.Name); | 146 | sb.AppendFormat("Attachments for {0}\n", sp.Name); |
147 | 147 | ||
148 | ConsoleDisplayTable ct = new ConsoleDisplayTable() { Indent = 2 }; | 148 | ConsoleDisplayTable ct = new ConsoleDisplayTable() { Indent = 2 }; |
149 | ct.Columns.Add(new ConsoleTableColumn("Attachment Name", 36)); | 149 | ct.Columns.Add(new ConsoleDisplayTableColumn("Attachment Name", 36)); |
150 | ct.Columns.Add(new ConsoleTableColumn("Local ID", 10)); | 150 | ct.Columns.Add(new ConsoleDisplayTableColumn("Local ID", 10)); |
151 | ct.Columns.Add(new ConsoleTableColumn("Item ID", 36)); | 151 | ct.Columns.Add(new ConsoleDisplayTableColumn("Item ID", 36)); |
152 | ct.Columns.Add(new ConsoleTableColumn("Attach Point", 14)); | 152 | ct.Columns.Add(new ConsoleDisplayTableColumn("Attach Point", 14)); |
153 | ct.Columns.Add(new ConsoleTableColumn("Position", 15)); | 153 | ct.Columns.Add(new ConsoleDisplayTableColumn("Position", 15)); |
154 | 154 | ||
155 | // sb.AppendFormat( | 155 | // sb.AppendFormat( |
156 | // " {0,-36} {1,-10} {2,-36} {3,-14} {4,-15}\n", | 156 | // " {0,-36} {1,-10} {2,-36} {3,-14} {4,-15}\n", |
@@ -176,7 +176,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments | |||
176 | // attachmentObject.Name, attachmentObject.LocalId, attachmentObject.FromItemID, | 176 | // attachmentObject.Name, attachmentObject.LocalId, attachmentObject.FromItemID, |
177 | // (AttachmentPoint)attachmentObject.AttachmentPoint, attachmentObject.RootPart.AttachedPos); | 177 | // (AttachmentPoint)attachmentObject.AttachmentPoint, attachmentObject.RootPart.AttachedPos); |
178 | ct.Rows.Add( | 178 | ct.Rows.Add( |
179 | new ConsoleTableRow( | 179 | new ConsoleDisplayTableRow( |
180 | new List<string>() | 180 | new List<string>() |
181 | { | 181 | { |
182 | attachmentObject.Name, | 182 | attachmentObject.Name, |