changeset 46:1576f669b3eb

Fixes #137: Remove use of old collections * Remove all references (lots unused) in WinForms code * Remove DebugOutput window as it isn't used any more * Remove unused static hashtable from UnitEquipmentChoice
author IBBoard <dev@ibboard.co.uk>
date Sun, 13 Sep 2009 17:33:36 +0000
parents 1c74b51abac1
children 2f2e46cd4171
files FrmDebugOutput.cs FrmDebugOutput.resources FrmDebugOutput.resx FrmEditUnitEquipment.cs FrmMain.cs FrmNewArmy.cs FrmNewUnit.cs FrmNewUnitEquipment.cs FrmReplaceUnitEquipment.cs FrmSelectSystem.cs IBBoard.WarFoundry.GUI.WinForms.csproj Util/UnitEquipmentChoice.cs
diffstat 12 files changed, 10 insertions(+), 564 deletions(-) [+]
line diff
     1.1 --- a/FrmDebugOutput.cs	Wed Sep 09 19:56:24 2009 +0000
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,309 +0,0 @@
     1.4 -// This file (FrmDebugOutput.cs) is a part of the IBBoard.WarFoundry.GUI.WinForms project and is copyright 2009 IBBoard.
     1.5 -//
     1.6 -// The file and the library/program it is in are licensed and distributed, without warranty, under the GNU Affero GPL license, either version 3 of the License or (at your option) any later version. Please see COPYING for more information and the full license.
     1.7 -
     1.8 -using System;
     1.9 -using System.Drawing;
    1.10 -using System.Collections;
    1.11 -using System.ComponentModel;
    1.12 -using System.Text;
    1.13 -using System.Windows.Forms;
    1.14 -using IBBoard.Lang;
    1.15 -using IBBoard.Logging;
    1.16 -using IBBoard.Windows.Forms;
    1.17 -
    1.18 -namespace IBBoard.WarFoundry
    1.19 -{
    1.20 -	/// <summary>
    1.21 -	/// Summary description for FrmDebugOutput.
    1.22 -	/// </summary>
    1.23 -	public class FrmDebugOutput : IBBForm
    1.24 -	{
    1.25 -		private System.Windows.Forms.ListBox lstDebugItems;
    1.26 -		private System.Windows.Forms.ComboBox cmbDebugLevel;
    1.27 -		private System.Windows.Forms.Label lblDebugLevel;
    1.28 -		/// <summary>
    1.29 -		/// Required designer variable.
    1.30 -		/// </summary>
    1.31 -		private System.ComponentModel.Container components = null;
    1.32 -		private System.Windows.Forms.ContextMenu contextMenu;
    1.33 -		private System.Windows.Forms.MenuItem miCopy;
    1.34 -		private System.Windows.Forms.TextBox txtDetail;
    1.35 -		private System.Windows.Forms.Splitter splitter1;
    1.36 -		private System.Windows.Forms.Panel panel1;
    1.37 -		//private int MAX_LIST_LENGTH = 50;
    1.38 -
    1.39 -		public FrmDebugOutput()
    1.40 -		{
    1.41 -			//this.logger = logger;
    1.42 -			//logger.LogUpdatedEvent+=new IBBoard.Logging.Logger.LogUpdatedDelegate(logger_LogUpdatedEvent);
    1.43 -			//
    1.44 -			// Required for Windows Form Designer support
    1.45 -			//
    1.46 -			InitializeComponent();
    1.47 -
    1.48 -			/*if (LogLevels.Debug >= logger.LogLevel)
    1.49 -			{
    1.50 -				cmbDebugLevel.Items.Add(LogLevels.Debug);
    1.51 -			}
    1.52 -
    1.53 -			if (LogLevels.Info >= logger.LogLevel)
    1.54 -			{
    1.55 -				cmbDebugLevel.Items.Add(LogLevels.Info);
    1.56 -			}
    1.57 -
    1.58 -			if (LogLevels.Warning >= logger.LogLevel)
    1.59 -			{
    1.60 -				cmbDebugLevel.Items.Add(LogLevels.Warning);
    1.61 -			}
    1.62 -
    1.63 -			if (LogLevels.Error >= logger.LogLevel)
    1.64 -			{
    1.65 -				cmbDebugLevel.Items.Add(LogLevels.Error);
    1.66 -			}
    1.67 -
    1.68 -			if (LogLevels.Critical >= logger.LogLevel)
    1.69 -			{
    1.70 -				cmbDebugLevel.Items.Add(LogLevels.Critical);
    1.71 -			}*/
    1.72 -
    1.73 -			this.Name = "DebugOutputForm";
    1.74 -
    1.75 -			//cmbDebugLevel.SelectedItem = logger.LogLevel;
    1.76 -
    1.77 -			Translation.Translate(this, true);
    1.78 -
    1.79 -			fillDebugList();
    1.80 -		}
    1.81 -
    1.82 -		/// <summary>
    1.83 -		/// Clean up any resources being used.
    1.84 -		/// </summary>
    1.85 -		protected override void Dispose( bool disposing )
    1.86 -		{
    1.87 -			if( disposing )
    1.88 -			{
    1.89 -				if(components != null)
    1.90 -				{
    1.91 -					components.Dispose();
    1.92 -				}
    1.93 -			}
    1.94 -			base.Dispose( disposing );
    1.95 -		}
    1.96 -
    1.97 -		#region Windows Form Designer generated code
    1.98 -		/// <summary>
    1.99 -		/// Required method for Designer support - do not modify
   1.100 -		/// the contents of this method with the code editor.
   1.101 -		/// </summary>
   1.102 -		private void InitializeComponent()
   1.103 -		{
   1.104 -			this.lstDebugItems = new System.Windows.Forms.ListBox();
   1.105 -			this.contextMenu = new System.Windows.Forms.ContextMenu();
   1.106 -			this.miCopy = new System.Windows.Forms.MenuItem();
   1.107 -			this.cmbDebugLevel = new System.Windows.Forms.ComboBox();
   1.108 -			this.lblDebugLevel = new System.Windows.Forms.Label();
   1.109 -			this.txtDetail = new System.Windows.Forms.TextBox();
   1.110 -			this.splitter1 = new System.Windows.Forms.Splitter();
   1.111 -			this.panel1 = new System.Windows.Forms.Panel();
   1.112 -			this.SuspendLayout();
   1.113 -			// 
   1.114 -			// lstDebugItems
   1.115 -			// 
   1.116 -			this.lstDebugItems.ContextMenu = this.contextMenu;
   1.117 -			this.lstDebugItems.Dock = System.Windows.Forms.DockStyle.Fill;
   1.118 -			this.lstDebugItems.IntegralHeight = false;
   1.119 -			this.lstDebugItems.Location = new System.Drawing.Point(0, 24);
   1.120 -			this.lstDebugItems.Name = "lstDebugItems";
   1.121 -			this.lstDebugItems.ScrollAlwaysVisible = true;
   1.122 -			this.lstDebugItems.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended;
   1.123 -			this.lstDebugItems.Size = new System.Drawing.Size(656, 144);
   1.124 -			this.lstDebugItems.TabIndex = 0;
   1.125 -			this.lstDebugItems.MouseDown += new System.Windows.Forms.MouseEventHandler(this.lstDebugItems_MouseDown);
   1.126 -			this.lstDebugItems.SelectedIndexChanged += new System.EventHandler(this.lstDebugItems_SelectedIndexChanged);
   1.127 -			// 
   1.128 -			// contextMenu
   1.129 -			// 
   1.130 -			this.contextMenu.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] {
   1.131 -																						this.miCopy});
   1.132 -			this.contextMenu.Popup += new System.EventHandler(this.contextMenu_Popup);
   1.133 -			// 
   1.134 -			// miCopy
   1.135 -			// 
   1.136 -			this.miCopy.Index = 0;
   1.137 -			this.miCopy.Text = "&Copy";
   1.138 -			this.miCopy.Click += new System.EventHandler(this.miCopy_Click);
   1.139 -			// 
   1.140 -			// cmbDebugLevel
   1.141 -			// 
   1.142 -			this.cmbDebugLevel.Location = new System.Drawing.Point(190, 2);
   1.143 -			this.cmbDebugLevel.Name = "cmbDebugLevel";
   1.144 -			this.cmbDebugLevel.Size = new System.Drawing.Size(464, 21);
   1.145 -			this.cmbDebugLevel.TabIndex = 1;
   1.146 -			this.cmbDebugLevel.SelectedIndexChanged += new System.EventHandler(this.cmbDebugLevel_SelectedIndexChanged);
   1.147 -			// 
   1.148 -			// lblDebugLevel
   1.149 -			// 
   1.150 -			this.lblDebugLevel.Location = new System.Drawing.Point(16, 0);
   1.151 -			this.lblDebugLevel.Name = "lblDebugLevel";
   1.152 -			this.lblDebugLevel.Size = new System.Drawing.Size(168, 21);
   1.153 -			this.lblDebugLevel.TabIndex = 2;
   1.154 -			this.lblDebugLevel.Text = "debug level:";
   1.155 -			this.lblDebugLevel.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
   1.156 -			// 
   1.157 -			// txtDetail
   1.158 -			// 
   1.159 -			this.txtDetail.Dock = System.Windows.Forms.DockStyle.Bottom;
   1.160 -			this.txtDetail.Location = new System.Drawing.Point(0, 172);
   1.161 -			this.txtDetail.Multiline = true;
   1.162 -			this.txtDetail.Name = "txtDetail";
   1.163 -			this.txtDetail.ReadOnly = true;
   1.164 -			this.txtDetail.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
   1.165 -			this.txtDetail.Size = new System.Drawing.Size(656, 64);
   1.166 -			this.txtDetail.TabIndex = 3;
   1.167 -			this.txtDetail.TabStop = false;
   1.168 -			this.txtDetail.Text = "";
   1.169 -			this.txtDetail.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtDetail_KeyDown);
   1.170 -			// 
   1.171 -			// splitter1
   1.172 -			// 
   1.173 -			this.splitter1.Cursor = System.Windows.Forms.Cursors.HSplit;
   1.174 -			this.splitter1.Dock = System.Windows.Forms.DockStyle.Bottom;
   1.175 -			this.splitter1.Location = new System.Drawing.Point(0, 168);
   1.176 -			this.splitter1.MinExtra = 50;
   1.177 -			this.splitter1.MinSize = 50;
   1.178 -			this.splitter1.Name = "splitter1";
   1.179 -			this.splitter1.Size = new System.Drawing.Size(656, 4);
   1.180 -			this.splitter1.TabIndex = 4;
   1.181 -			this.splitter1.TabStop = false;
   1.182 -			// 
   1.183 -			// panel1
   1.184 -			// 
   1.185 -			this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
   1.186 -			this.panel1.Location = new System.Drawing.Point(0, 0);
   1.187 -			this.panel1.Name = "panel1";
   1.188 -			this.panel1.Size = new System.Drawing.Size(656, 24);
   1.189 -			this.panel1.TabIndex = 5;
   1.190 -			// 
   1.191 -			// FrmDebugOutput
   1.192 -			// 
   1.193 -			this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
   1.194 -			this.ClientSize = new System.Drawing.Size(656, 236);
   1.195 -			this.Controls.Add(this.lblDebugLevel);
   1.196 -			this.Controls.Add(this.cmbDebugLevel);
   1.197 -			this.Controls.Add(this.lstDebugItems);
   1.198 -			this.Controls.Add(this.splitter1);
   1.199 -			this.Controls.Add(this.panel1);
   1.200 -			this.Controls.Add(this.txtDetail);
   1.201 -			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
   1.202 -			this.Name = "FrmDebugOutput";
   1.203 -			this.ShowInTaskbar = false;
   1.204 -			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
   1.205 -			this.Text = "FrmDebugOutput";
   1.206 -			this.ResumeLayout(false);
   1.207 -
   1.208 -		}
   1.209 -		#endregion
   1.210 -
   1.211 -		private void cmbDebugLevel_SelectedIndexChanged(object sender, System.EventArgs e)
   1.212 -		{
   1.213 -			fillDebugList();
   1.214 -		}
   1.215 -
   1.216 -		private void fillDebugList()
   1.217 -		{
   1.218 -			lstDebugItems.Items.Clear();
   1.219 -			/*LogItem[] items = logger.GetLogItems((LogLevels)cmbDebugLevel.SelectedItem);
   1.220 -			int last = items.Length - 1;
   1.221 -			int stop = last - MAX_LIST_LENGTH;
   1.222 -
   1.223 -			if (stop < 0)
   1.224 -			{
   1.225 -				stop = 0;
   1.226 -			}
   1.227 -
   1.228 -			//reverse fill the list so that we can have newest items at the top
   1.229 -			for (int i = last; i >= stop; i--)
   1.230 -			{
   1.231 -				lstDebugItems.Items.Add(items[i]);
   1.232 -			}*/
   1.233 -		}
   1.234 -
   1.235 -		private void logger_LogUpdatedEvent(LogItem item)
   1.236 -		{
   1.237 -			/*if (item.Level >= (LogLevels)cmbDebugLevel.SelectedItem)
   1.238 -			{
   1.239 -				lock (lstDebugItems)
   1.240 -				{
   1.241 -					lstDebugItems.Items.Insert(0, item);
   1.242 -
   1.243 -					if (lstDebugItems.Items.Count > MAX_LIST_LENGTH)
   1.244 -					{
   1.245 -						lstDebugItems.Items.RemoveAt(lstDebugItems.Items.Count - 1);
   1.246 -					}
   1.247 -				}
   1.248 -			}*/
   1.249 -		}
   1.250 -
   1.251 -		private void miCopy_Click(object sender, System.EventArgs e)
   1.252 -		{
   1.253 -			if (lstDebugItems.SelectedIndices.Count==1)
   1.254 -			{				
   1.255 -				Clipboard.SetDataObject(lstDebugItems.SelectedItem.ToString());
   1.256 -			}
   1.257 -			else if (lstDebugItems.SelectedIndices.Count > 1)
   1.258 -			{
   1.259 -				StringBuilder sb = new StringBuilder();
   1.260 -
   1.261 -				foreach (int idx in lstDebugItems.SelectedIndices)
   1.262 -				{
   1.263 -					sb.Append(lstDebugItems.Items[idx].ToString()+Environment.NewLine);
   1.264 -				}
   1.265 -
   1.266 -				Clipboard.SetDataObject(sb.ToString().Trim());
   1.267 -			}
   1.268 -		}
   1.269 -
   1.270 -		private void contextMenu_Popup(object sender, System.EventArgs e)
   1.271 -		{
   1.272 -			foreach (MenuItem mi in contextMenu.MenuItems)
   1.273 -			{
   1.274 -				mi.Visible = lstDebugItems.SelectedIndex > -1;
   1.275 -			}
   1.276 -		}
   1.277 -
   1.278 -		private void lstDebugItems_MouseDown(object sender, System.Windows.Forms.MouseEventArgs e)
   1.279 -		{
   1.280 -			if (e.Button == MouseButtons.Right)
   1.281 -			{
   1.282 -				int idx = lstDebugItems.IndexFromPoint(e.X, e.Y);
   1.283 -
   1.284 -				if (lstDebugItems.SelectedIndices.Contains(idx))
   1.285 -				{
   1.286 -					lstDebugItems.SelectedIndex = idx;
   1.287 -				}
   1.288 -			}
   1.289 -		}
   1.290 -
   1.291 -		private void lstDebugItems_SelectedIndexChanged(object sender, System.EventArgs e)
   1.292 -		{
   1.293 -			if (lstDebugItems.SelectedIndex > -1)
   1.294 -			{
   1.295 -				LogItem item = (LogItem)lstDebugItems.SelectedItem;
   1.296 -				txtDetail.Text = item.ToString() + Environment.NewLine + Environment.NewLine + "Stack Trace: "+ item.StackTrace;
   1.297 -			}
   1.298 -			else
   1.299 -			{
   1.300 -				txtDetail.Text = "";
   1.301 -			}
   1.302 -		}
   1.303 -
   1.304 -		private void txtDetail_KeyDown(object sender, System.Windows.Forms.KeyEventArgs e)
   1.305 -		{
   1.306 -			if(e.KeyData == (Keys.Control|Keys.A) && e.Control)
   1.307 -			{
   1.308 -				txtDetail.SelectAll();
   1.309 -			}
   1.310 -		}
   1.311 -	}
   1.312 -}
     2.1 Binary file FrmDebugOutput.resources has changed
     3.1 --- a/FrmDebugOutput.resx	Wed Sep 09 19:56:24 2009 +0000
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,208 +0,0 @@
     3.4 -<?xml version="1.0" encoding="utf-8"?>
     3.5 -<root>
     3.6 -  <!-- 
     3.7 -    Microsoft ResX Schema 
     3.8 -    
     3.9 -    Version 1.3
    3.10 -    
    3.11 -    The primary goals of this format is to allow a simple XML format 
    3.12 -    that is mostly human readable. The generation and parsing of the 
    3.13 -    various data types are done through the TypeConverter classes 
    3.14 -    associated with the data types.
    3.15 -    
    3.16 -    Example:
    3.17 -    
    3.18 -    ... ado.net/XML headers & schema ...
    3.19 -    <resheader name="resmimetype">text/microsoft-resx</resheader>
    3.20 -    <resheader name="version">1.3</resheader>
    3.21 -    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
    3.22 -    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
    3.23 -    <data name="Name1">this is my long string</data>
    3.24 -    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
    3.25 -    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
    3.26 -        [base64 mime encoded serialized .NET Framework object]
    3.27 -    </data>
    3.28 -    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    3.29 -        [base64 mime encoded string representing a byte array form of the .NET Framework object]
    3.30 -    </data>
    3.31 -                
    3.32 -    There are any number of "resheader" rows that contain simple 
    3.33 -    name/value pairs.
    3.34 -    
    3.35 -    Each data row contains a name, and value. The row also contains a 
    3.36 -    type or mimetype. Type corresponds to a .NET class that support 
    3.37 -    text/value conversion through the TypeConverter architecture. 
    3.38 -    Classes that don't support this are serialized and stored with the 
    3.39 -    mimetype set.
    3.40 -    
    3.41 -    The mimetype is used forserialized objects, and tells the 
    3.42 -    ResXResourceReader how to depersist the object. This is currently not 
    3.43 -    extensible. For a given mimetype the value must be set accordingly:
    3.44 -    
    3.45 -    Note - application/x-microsoft.net.object.binary.base64 is the format 
    3.46 -    that the ResXResourceWriter will generate, however the reader can 
    3.47 -    read any of the formats listed below.
    3.48 -    
    3.49 -    mimetype: application/x-microsoft.net.object.binary.base64
    3.50 -    value   : The object must be serialized with 
    3.51 -            : System.Serialization.Formatters.Binary.BinaryFormatter
    3.52 -            : and then encoded with base64 encoding.
    3.53 -    
    3.54 -    mimetype: application/x-microsoft.net.object.soap.base64
    3.55 -    value   : The object must be serialized with 
    3.56 -            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
    3.57 -            : and then encoded with base64 encoding.
    3.58 -
    3.59 -    mimetype: application/x-microsoft.net.object.bytearray.base64
    3.60 -    value   : The object must be serialized into a byte array 
    3.61 -            : using a System.ComponentModel.TypeConverter
    3.62 -            : and then encoded with base64 encoding.
    3.63 -    -->
    3.64 -  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
    3.65 -    <xsd:element name="root" msdata:IsDataSet="true">
    3.66 -      <xsd:complexType>
    3.67 -        <xsd:choice maxOccurs="unbounded">
    3.68 -          <xsd:element name="data">
    3.69 -            <xsd:complexType>
    3.70 -              <xsd:sequence>
    3.71 -                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
    3.72 -                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
    3.73 -              </xsd:sequence>
    3.74 -              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
    3.75 -              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
    3.76 -              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
    3.77 -            </xsd:complexType>
    3.78 -          </xsd:element>
    3.79 -          <xsd:element name="resheader">
    3.80 -            <xsd:complexType>
    3.81 -              <xsd:sequence>
    3.82 -                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
    3.83 -              </xsd:sequence>
    3.84 -              <xsd:attribute name="name" type="xsd:string" use="required" />
    3.85 -            </xsd:complexType>
    3.86 -          </xsd:element>
    3.87 -        </xsd:choice>
    3.88 -      </xsd:complexType>
    3.89 -    </xsd:element>
    3.90 -  </xsd:schema>
    3.91 -  <resheader name="resmimetype">
    3.92 -    <value>text/microsoft-resx</value>
    3.93 -  </resheader>
    3.94 -  <resheader name="version">
    3.95 -    <value>1.3</value>
    3.96 -  </resheader>
    3.97 -  <resheader name="reader">
    3.98 -    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
    3.99 -  </resheader>
   3.100 -  <resheader name="writer">
   3.101 -    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   3.102 -  </resheader>
   3.103 -  <data name="lstDebugItems.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
   3.104 -    <value>Private</value>
   3.105 -  </data>
   3.106 -  <data name="lstDebugItems.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
   3.107 -    <value>False</value>
   3.108 -  </data>
   3.109 -  <data name="lstDebugItems.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
   3.110 -    <value>Private</value>
   3.111 -  </data>
   3.112 -  <data name="contextMenu.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
   3.113 -    <value>Private</value>
   3.114 -  </data>
   3.115 -  <data name="contextMenu.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
   3.116 -    <value>17, 17</value>
   3.117 -  </data>
   3.118 -  <data name="contextMenu.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
   3.119 -    <value>Private</value>
   3.120 -  </data>
   3.121 -  <data name="miCopy.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
   3.122 -    <value>Private</value>
   3.123 -  </data>
   3.124 -  <data name="miCopy.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
   3.125 -    <value>Private</value>
   3.126 -  </data>
   3.127 -  <data name="cmbDebugLevel.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
   3.128 -    <value>Private</value>
   3.129 -  </data>
   3.130 -  <data name="cmbDebugLevel.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
   3.131 -    <value>False</value>
   3.132 -  </data>
   3.133 -  <data name="cmbDebugLevel.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
   3.134 -    <value>Private</value>
   3.135 -  </data>
   3.136 -  <data name="lblDebugLevel.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
   3.137 -    <value>False</value>
   3.138 -  </data>
   3.139 -  <data name="lblDebugLevel.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
   3.140 -    <value>Private</value>
   3.141 -  </data>
   3.142 -  <data name="lblDebugLevel.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
   3.143 -    <value>Private</value>
   3.144 -  </data>
   3.145 -  <data name="txtDetail.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
   3.146 -    <value>Private</value>
   3.147 -  </data>
   3.148 -  <data name="txtDetail.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
   3.149 -    <value>Private</value>
   3.150 -  </data>
   3.151 -  <data name="txtDetail.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
   3.152 -    <value>False</value>
   3.153 -  </data>
   3.154 -  <data name="splitter1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
   3.155 -    <value>False</value>
   3.156 -  </data>
   3.157 -  <data name="splitter1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
   3.158 -    <value>Private</value>
   3.159 -  </data>
   3.160 -  <data name="splitter1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
   3.161 -    <value>Private</value>
   3.162 -  </data>
   3.163 -  <data name="panel1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
   3.164 -    <value>False</value>
   3.165 -  </data>
   3.166 -  <data name="panel1.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
   3.167 -    <value>True</value>
   3.168 -  </data>
   3.169 -  <data name="panel1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
   3.170 -    <value>Private</value>
   3.171 -  </data>
   3.172 -  <data name="panel1.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
   3.173 -    <value>8, 8</value>
   3.174 -  </data>
   3.175 -  <data name="panel1.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
   3.176 -    <value>True</value>
   3.177 -  </data>
   3.178 -  <data name="panel1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
   3.179 -    <value>Private</value>
   3.180 -  </data>
   3.181 -  <data name="$this.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
   3.182 -    <value>False</value>
   3.183 -  </data>
   3.184 -  <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
   3.185 -    <value>False</value>
   3.186 -  </data>
   3.187 -  <data name="$this.Localizable" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
   3.188 -    <value>False</value>
   3.189 -  </data>
   3.190 -  <data name="$this.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
   3.191 -    <value>8, 8</value>
   3.192 -  </data>
   3.193 -  <data name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
   3.194 -    <value>(Default)</value>
   3.195 -  </data>
   3.196 -  <data name="$this.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
   3.197 -    <value>True</value>
   3.198 -  </data>
   3.199 -  <data name="$this.Name">
   3.200 -    <value>FrmDebugOutput</value>
   3.201 -  </data>
   3.202 -  <data name="$this.TrayHeight" type="System.Int32, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
   3.203 -    <value>80</value>
   3.204 -  </data>
   3.205 -  <data name="$this.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
   3.206 -    <value>True</value>
   3.207 -  </data>
   3.208 -  <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
   3.209 -    <value>Private</value>
   3.210 -  </data>
   3.211 -</root>
   3.212 \ No newline at end of file
     4.1 --- a/FrmEditUnitEquipment.cs	Wed Sep 09 19:56:24 2009 +0000
     4.2 +++ b/FrmEditUnitEquipment.cs	Sun Sep 13 17:33:36 2009 +0000
     4.3 @@ -4,7 +4,6 @@
     4.4  
     4.5  using System;
     4.6  using System.Drawing;
     4.7 -using System.Collections;
     4.8  using System.ComponentModel;
     4.9  using System.Windows.Forms;
    4.10  using IBBoard.Commands;
     5.1 --- a/FrmMain.cs	Wed Sep 09 19:56:24 2009 +0000
     5.2 +++ b/FrmMain.cs	Sun Sep 13 17:33:36 2009 +0000
     5.3 @@ -5,7 +5,6 @@
     5.4  using System;
     5.5  using System.Drawing;
     5.6  using System.Drawing.Drawing2D;
     5.7 -using System.Collections;
     5.8  using System.ComponentModel;
     5.9  using System.Windows.Forms;
    5.10  using System.Data;
    5.11 @@ -50,7 +49,6 @@
    5.12  		//public FailedUnitRequirementDelegate FailedUnitRequirementMethod;
    5.13  
    5.14  		private FrmArmyTree armyTree;
    5.15 -		private FrmDebugOutput debugWindow;
    5.16  		private string loadedFilePath;
    5.17  
    5.18  		private System.ComponentModel.IContainer components;
    5.19 @@ -81,7 +79,6 @@
    5.20  		private IBBoard.Windows.Forms.IBBMenuItem miUndo;
    5.21  		private IBBoard.Windows.Forms.IBBMenuItem miRedo;
    5.22  		private IBBoard.Windows.Forms.IBBMenuItem menuHelp;
    5.23 -		private IBBoard.Windows.Forms.IBBMenuItem miDebugWindow;
    5.24  		private IBBoard.Windows.Forms.IBBMenuItem miAbout;
    5.25  		private IBBoard.Windows.Forms.ColorableStatusBarPanel sbMainPanel;
    5.26  		private IBBoard.Windows.Forms.ColorableStatusBarPanel sbErrorPanel;
    5.27 @@ -243,14 +240,13 @@
    5.28  			this.miRedo = new IBBoard.Windows.Forms.IBBMenuItem();
    5.29  			this.menuHelp = new IBBoard.Windows.Forms.IBBMenuItem();
    5.30  			this.miAbout = new IBBoard.Windows.Forms.IBBMenuItem();
    5.31 -			this.miDebugWindow = new IBBoard.Windows.Forms.IBBMenuItem();
    5.32  			this.openArmyDialog = new System.Windows.Forms.OpenFileDialog();
    5.33  			this.saveArmyDialog = new System.Windows.Forms.SaveFileDialog();
    5.34  			this.pnlRight = new System.Windows.Forms.Panel();
    5.35  			this.statusBarTimer = new System.Windows.Forms.Timer(this.components);
    5.36 -			((System.ComponentModel.ISupportInitialize)(this.sbMainPanel)).BeginInit();
    5.37 -			((System.ComponentModel.ISupportInitialize)(this.sbErrorPanel)).BeginInit();
    5.38 -			((System.ComponentModel.ISupportInitialize)(this.sbPointsPanel)).BeginInit();
    5.39 +			((System.ComponentModel.ISupportInitialize) (this.sbMainPanel)).BeginInit();
    5.40 +			((System.ComponentModel.ISupportInitialize) (this.sbErrorPanel)).BeginInit();
    5.41 +			((System.ComponentModel.ISupportInitialize) (this.sbPointsPanel)).BeginInit();
    5.42  			this.SuspendLayout();
    5.43  			// 
    5.44  			// statusBar
    5.45 @@ -350,7 +346,7 @@
    5.46  			// 
    5.47  			// buttonIcons
    5.48  			// 
    5.49 -			this.buttonIcons.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("buttonIcons.ImageStream")));
    5.50 +			this.buttonIcons.ImageStream = ((System.Windows.Forms.ImageListStreamer) (resources.GetObject("buttonIcons.ImageStream")));
    5.51  			this.buttonIcons.TransparentColor = System.Drawing.Color.Transparent;
    5.52  			this.buttonIcons.Images.SetKeyName(0, "");
    5.53  			this.buttonIcons.Images.SetKeyName(1, "");
    5.54 @@ -492,8 +488,7 @@
    5.55  			// 
    5.56  			this.menuHelp.Index = 2;
    5.57  			this.menuHelp.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] {
    5.58 -            this.miAbout,
    5.59 -            this.miDebugWindow});
    5.60 +            this.miAbout});
    5.61  			this.menuHelp.Text = "&help";
    5.62  			// 
    5.63  			// miAbout
    5.64 @@ -502,19 +497,13 @@
    5.65  			this.miAbout.Index = 0;
    5.66  			this.miAbout.Text = "&about";
    5.67  			// 
    5.68 -			// miDebugWindow
    5.69 -			// 
    5.70 -			this.miDebugWindow.Index = 1;
    5.71 -			this.miDebugWindow.Text = "&debug";
    5.72 -			this.miDebugWindow.Click += new System.EventHandler(this.miDebugWindow_Click);
    5.73 -			// 
    5.74  			// saveArmyDialog
    5.75  			// 
    5.76  			this.saveArmyDialog.Title = "Translatable:saveArmyDialog";
    5.77  			// 
    5.78  			// pnlRight
    5.79  			// 
    5.80 -			this.pnlRight.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    5.81 +			this.pnlRight.Anchor = ((System.Windows.Forms.AnchorStyles) (((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    5.82  						| System.Windows.Forms.AnchorStyles.Right)));
    5.83  			this.pnlRight.BackColor = System.Drawing.SystemColors.AppWorkspace;
    5.84  			this.pnlRight.Location = new System.Drawing.Point(726, 30);
    5.85 @@ -536,14 +525,14 @@
    5.86  			this.Controls.Add(this.pnlRight);
    5.87  			this.Controls.Add(this.toolBar);
    5.88  			this.Controls.Add(this.statusBar);
    5.89 -			this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
    5.90 +			this.Icon = ((System.Drawing.Icon) (resources.GetObject("$this.Icon")));
    5.91  			this.IsMdiContainer = true;
    5.92  			this.Menu = this.mainMenu;
    5.93  			this.Name = "FrmMain";
    5.94  			this.Text = "WarFoundry";
    5.95 -			((System.ComponentModel.ISupportInitialize)(this.sbMainPanel)).EndInit();
    5.96 -			((System.ComponentModel.ISupportInitialize)(this.sbErrorPanel)).EndInit();
    5.97 -			((System.ComponentModel.ISupportInitialize)(this.sbPointsPanel)).EndInit();
    5.98 +			((System.ComponentModel.ISupportInitialize) (this.sbMainPanel)).EndInit();
    5.99 +			((System.ComponentModel.ISupportInitialize) (this.sbErrorPanel)).EndInit();
   5.100 +			((System.ComponentModel.ISupportInitialize) (this.sbPointsPanel)).EndInit();
   5.101  			this.ResumeLayout(false);
   5.102  			this.PerformLayout();
   5.103  
   5.104 @@ -1223,17 +1212,6 @@
   5.105  			statusBar.ColorableStatusBarDrawItem(sender, sbdevent);
   5.106  		}
   5.107  
   5.108 -		private void miDebugWindow_Click(object sender, EventArgs e)
   5.109 -		{
   5.110 -			if (debugWindow == null || debugWindow.IsDisposed)
   5.111 -			{
   5.112 -				debugWindow = new FrmDebugOutput();
   5.113 -			}
   5.114 -
   5.115 -			debugWindow.Show();
   5.116 -			debugWindow.Focus();
   5.117 -		}
   5.118 -
   5.119  		private void FrmMain_Closing(object sender, CancelEventArgs e)
   5.120  		{
   5.121  			if (!CloseCurrentArmy())
     6.1 --- a/FrmNewArmy.cs	Wed Sep 09 19:56:24 2009 +0000
     6.2 +++ b/FrmNewArmy.cs	Sun Sep 13 17:33:36 2009 +0000
     6.3 @@ -4,7 +4,6 @@
     6.4  
     6.5  using System;
     6.6  using System.Drawing;
     6.7 -using System.Collections;
     6.8  using System.ComponentModel;
     6.9  using System.Windows.Forms;
    6.10  using IBBoard;
     7.1 --- a/FrmNewUnit.cs	Wed Sep 09 19:56:24 2009 +0000
     7.2 +++ b/FrmNewUnit.cs	Sun Sep 13 17:33:36 2009 +0000
     7.3 @@ -4,7 +4,6 @@
     7.4  
     7.5  using System;
     7.6  using System.Drawing;
     7.7 -using System.Collections;
     7.8  using System.ComponentModel;
     7.9  using System.Windows.Forms;
    7.10  using IBBoard;
     8.1 --- a/FrmNewUnitEquipment.cs	Wed Sep 09 19:56:24 2009 +0000
     8.2 +++ b/FrmNewUnitEquipment.cs	Sun Sep 13 17:33:36 2009 +0000
     8.3 @@ -4,7 +4,6 @@
     8.4  
     8.5  using System;
     8.6  using System.Drawing;
     8.7 -using System.Collections;
     8.8  using System.ComponentModel;
     8.9  using System.Windows.Forms;
    8.10  using IBBoard;
     9.1 --- a/FrmReplaceUnitEquipment.cs	Wed Sep 09 19:56:24 2009 +0000
     9.2 +++ b/FrmReplaceUnitEquipment.cs	Sun Sep 13 17:33:36 2009 +0000
     9.3 @@ -4,7 +4,6 @@
     9.4  
     9.5  using System;
     9.6  using System.Drawing;
     9.7 -using System.Collections;
     9.8  using System.ComponentModel;
     9.9  using System.Windows.Forms;
    9.10  using IBBoard;
    10.1 --- a/FrmSelectSystem.cs	Wed Sep 09 19:56:24 2009 +0000
    10.2 +++ b/FrmSelectSystem.cs	Sun Sep 13 17:33:36 2009 +0000
    10.3 @@ -5,7 +5,6 @@
    10.4  using System;
    10.5  using System.IO;
    10.6  using System.Drawing;
    10.7 -using System.Collections;
    10.8  using System.ComponentModel;
    10.9  using System.Windows.Forms;
   10.10  using IBBoard;
    11.1 --- a/IBBoard.WarFoundry.GUI.WinForms.csproj	Wed Sep 09 19:56:24 2009 +0000
    11.2 +++ b/IBBoard.WarFoundry.GUI.WinForms.csproj	Sun Sep 13 17:33:36 2009 +0000
    11.3 @@ -118,9 +118,6 @@
    11.4      <Compile Include="FrmArmyTree.cs">
    11.5        <SubType>Form</SubType>
    11.6      </Compile>
    11.7 -    <Compile Include="FrmDebugOutput.cs">
    11.8 -      <SubType>Form</SubType>
    11.9 -    </Compile>
   11.10      <Compile Include="FrmEditUnitEquipment.cs">
   11.11        <SubType>Form</SubType>
   11.12      </Compile>
   11.13 @@ -158,9 +155,6 @@
   11.14      <EmbeddedResource Include="FrmArmyTree.resx">
   11.15        <DependentUpon>FrmArmyTree.cs</DependentUpon>
   11.16      </EmbeddedResource>
   11.17 -    <EmbeddedResource Include="FrmDebugOutput.resx">
   11.18 -      <DependentUpon>FrmDebugOutput.cs</DependentUpon>
   11.19 -    </EmbeddedResource>
   11.20      <EmbeddedResource Include="FrmEditUnitEquipment.resx">
   11.21        <DependentUpon>FrmEditUnitEquipment.cs</DependentUpon>
   11.22      </EmbeddedResource>
    12.1 --- a/Util/UnitEquipmentChoice.cs	Wed Sep 09 19:56:24 2009 +0000
    12.2 +++ b/Util/UnitEquipmentChoice.cs	Sun Sep 13 17:33:36 2009 +0000
    12.3 @@ -3,7 +3,6 @@
    12.4  // The file and the library/program it is in are licensed and distributed, without warranty, under the GNU Affero GPL license, either version 3 of the License or (at your option) any later version. Please see COPYING for more information and the full license.
    12.5  
    12.6  using System;
    12.7 -using System.Collections;
    12.8  using IBBoard.WarFoundry.API.Objects;
    12.9  
   12.10  
   12.11 @@ -19,8 +18,6 @@
   12.12          private Unit unit;
   12.13  		private UnitEquipmentItem item;
   12.14  
   12.15 -        private static Hashtable equipObjs = new Hashtable();
   12.16 -
   12.17          public UnitEquipmentChoice(Unit unit, UnitEquipmentItem unitItem)
   12.18          {
   12.19              this.unit = unit;