#17: fix namespaces in Muzzle

examples/JabberNet.Example/MainForm.cs

@@ -24,6 +24,7 @@
 using jabber.protocol;
 using jabber.protocol.client;
 using jabber.protocol.iq;
+using JabberNet.Muzzle;
 
 namespace JabberNet.Example
 {
@@ -48,12 +49,12 @@ public class MainForm : Form
         private MenuItem mnuAvailable;
         private MenuItem mnuAway;
         private IContainer components;
-        private muzzle.RosterTree roster;
+        private RosterTree roster;
         private StatusBarPanel pnlSSL;
         private DiscoManager dm;
         private TabPage tpServices;
         private CapsManager cm;
-        private muzzle.XmppDebugger debug;
+        private XmppDebugger debug;
         private PubSubManager psm;
         private MenuStrip menuStrip1;
         private ToolStripMenuItem fileToolStripMenuItem;
@@ -155,7 +156,7 @@ private void InitializeComponent()
             this.pnlPresence = new System.Windows.Forms.StatusBarPanel();
             this.tabControl1 = new System.Windows.Forms.TabControl();
             this.tpRoster = new System.Windows.Forms.TabPage();
-            this.roster = new muzzle.RosterTree();
+            this.roster = new RosterTree();
             this.jc = new jabber.client.JabberClient();
             this.pm = new jabber.client.PresenceManager();
             this.cm = new jabber.connection.CapsManager();
@@ -169,7 +170,7 @@ private void InitializeComponent()
             this.chNick = new System.Windows.Forms.ColumnHeader();
             this.chAutoJoin = new System.Windows.Forms.ColumnHeader();
             this.tpDebug = new System.Windows.Forms.TabPage();
-            this.debug = new muzzle.XmppDebugger();
+            this.debug = new XmppDebugger();
             this.mnuPresence = new System.Windows.Forms.ContextMenu();
             this.mnuAvailable = new System.Windows.Forms.MenuItem();
             this.mnuAway = new System.Windows.Forms.MenuItem();
@@ -697,7 +698,7 @@ static void Main()
 
         private void Connect()
         {
-            muzzle.ClientLogin.Login(jc, "login.xml");
+            ClientLogin.Login(jc, "login.xml");
         }
 
         private void jc_OnAuthenticate(object sender)
@@ -780,7 +781,7 @@ private bool jc_OnRegisterInfo(object sender, Register r)
         {
             if (r.Form == null)
                 return true;
-            muzzle.XDataForm f = new muzzle.XDataForm(r.Form);
+            XDataForm f = new XDataForm(r.Form);
             if (f.ShowDialog() != DialogResult.OK)
                 return false;
             f.FillInResponse(r.Form);
@@ -792,7 +793,7 @@ private void jc_OnMessage(object sender, jabber.protocol.client.Message msg)
             jabber.protocol.x.Data x = msg["x", URI.XDATA] as jabber.protocol.x.Data;
             if (x != null)
             {
-                muzzle.XDataForm f = new muzzle.XDataForm(msg);
+                XDataForm f = new XDataForm(msg);
                 f.ShowDialog(this);
                 jc.Write(f.GetResponse());
             }
@@ -845,7 +846,7 @@ private void jc_OnIQ(object sender, IQ iq)
 
         private void roster_DoubleClick(object sender, EventArgs e)
         {
-            muzzle.RosterTree.ItemNode n = roster.SelectedNode as muzzle.RosterTree.ItemNode;
+            RosterTree.ItemNode n = roster.SelectedNode as RosterTree.ItemNode;
             if (n == null)
                 return;
             new SendMessage(jc, n.JID).Show();
@@ -971,7 +972,7 @@ private void menuItem3_Click(object sender, EventArgs e)
 
         private void menuItem5_Click(object sender, EventArgs e)
         {
-            muzzle.RosterTree.ItemNode n = roster.SelectedNode as muzzle.RosterTree.ItemNode;
+            RosterTree.ItemNode n = roster.SelectedNode as RosterTree.ItemNode;
             if (n == null)
                 return;
             jc.RemoveRosterItem(n.JID);
@@ -1135,7 +1136,7 @@ private void joinConferenceToolStripMenuItem_Click(object sender, EventArgs e)
 
         private IQ muc_OnRoomConfig(Room room, IQ parent)
         {
-            muzzle.XDataForm form = new muzzle.XDataForm(parent);
+            XDataForm form = new XDataForm(parent);
             if (form.ShowDialog() != DialogResult.OK)
                 return null;
 

src/JabberNet.Muzzle/BottomScrollRichText.cs

@@ -11,17 +11,15 @@
  * Jabber-Net is licensed under the LGPL.
  * See licenses/Jabber-Net_LGPLv3.txt for details.
  * --------------------------------------------------------------------------*/
+
 using System;
-using System.Collections;
 using System.ComponentModel;
 using System.Drawing;
-using System.Windows.Forms;
 using System.Runtime.InteropServices;
-
+using System.Windows.Forms;
 using bedrock.util;
-using System.Diagnostics;
 
-namespace muzzle
+namespace JabberNet.Muzzle
 {
 
     /// <summary>

src/JabberNet.Muzzle/ChatHistory.cs

@@ -11,17 +11,12 @@
  * Jabber-Net is licensed under the LGPL.
  * See licenses/Jabber-Net_LGPLv3.txt for details.
  * --------------------------------------------------------------------------*/
+
 using System;
-using System.ComponentModel;
-using System.ComponentModel.Design;
 using System.Drawing;
-
 using bedrock.util;
 
-using jabber;
-using jabber.client;
-
-namespace muzzle
+namespace JabberNet.Muzzle
 {
     /// <summary>
     /// Keep track of the history of a conversation or room.

src/JabberNet.Muzzle/ClientLogin.cs

@@ -11,19 +11,15 @@
  * Jabber-Net is licensed under the LGPL.
  * See licenses/Jabber-Net_LGPLv3.txt for details.
  * --------------------------------------------------------------------------*/
+
 using System;
-using System.Drawing;
-using System.Collections;
 using System.ComponentModel;
-using System.ComponentModel.Design;
 using System.Windows.Forms;
-using System.Xml;
-
 using bedrock.util;
 using jabber.connection;
 using jabber.connection.sasl;
 
-namespace muzzle
+namespace JabberNet.Muzzle
 {
     /// <summary>
     /// A login form for client connections.

src/JabberNet.Muzzle/ComponentLogin.cs

@@ -11,19 +11,15 @@
  * Jabber-Net is licensed under the LGPL.
  * See licenses/Jabber-Net_LGPLv3.txt for details.
  * --------------------------------------------------------------------------*/
+
 using System;
-using System.Collections;
 using System.ComponentModel;
-using System.ComponentModel.Design;
 using System.Windows.Forms;
-using System.Xml;
-
 using bedrock.util;
-
 using jabber.connection;
 using jabber.server;
 
-namespace muzzle
+namespace JabberNet.Muzzle
 {
     /// <summary>
     /// A login form for client connections.

src/JabberNet.Muzzle/InputBox.cs

@@ -11,14 +11,11 @@
  * Jabber-Net is licensed under the LGPL.
  * See licenses/Jabber-Net_LGPLv3.txt for details.
  * --------------------------------------------------------------------------*/
-using System;
-using System.ComponentModel;
-using System.Drawing;
-using System.Windows.Forms;
 
+using System.Windows.Forms;
 using bedrock.util;
 
-namespace muzzle
+namespace JabberNet.Muzzle
 {
 
     /// <summary>

src/JabberNet.Muzzle/JabberNet.Muzzle.csproj

@@ -19,7 +19,7 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>
     <DelaySign>false</DelaySign>
     <OutputType>Library</OutputType>
-    <RootNamespace>muzzle</RootNamespace>
+    <RootNamespace>JabberNet.Muzzle</RootNamespace>
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
     <StartupObject>
     </StartupObject>

src/JabberNet.Muzzle/JidMulti.cs

@@ -11,16 +11,12 @@
  * Jabber-Net is licensed under the LGPL.
  * See licenses/Jabber-Net_LGPLv3.txt for details.
  * --------------------------------------------------------------------------*/
-using System;
 
-using System.Collections;
-using System.ComponentModel;
-using System.Drawing;
+using System;
 using System.Windows.Forms;
-
 using bedrock.util;
 
-namespace muzzle
+namespace JabberNet.Muzzle
 {
     /// <summary>
     /// Summary description for JidMulti.

src/JabberNet.Muzzle/Litmus.cs

@@ -11,17 +11,15 @@
  * Jabber-Net is licensed under the LGPL.
  * See licenses/Jabber-Net_LGPLv3.txt for details.
  * --------------------------------------------------------------------------*/
-using System;
 
+using System;
 using System.Collections;
 using System.ComponentModel;
 using System.Drawing;
 using System.Drawing.Drawing2D;
-using System.Windows.Forms;
-
 using bedrock.util;
 
-namespace muzzle
+namespace JabberNet.Muzzle
 {
     /// <summary>
     /// How should colors be picked?

src/JabberNet.Muzzle/OptionForm.cs

@@ -11,16 +11,16 @@
  * Jabber-Net is licensed under the LGPL.
  * See licenses/Jabber-Net_LGPLv3.txt for details.
  * --------------------------------------------------------------------------*/
+
 using System;
 using System.Collections;
 using System.ComponentModel;
 using System.Windows.Forms;
 using System.Xml;
-
 using bedrock.util;
 using jabber.connection;
 
-namespace muzzle
+namespace JabberNet.Muzzle
 {
     /// <summary>
     /// Base class for forms that configure XmppStream subclasses.

src/JabberNet.Muzzle/RosterTree.cs

@@ -11,21 +11,20 @@
  * Jabber-Net is licensed under the LGPL.
  * See licenses/Jabber-Net_LGPLv3.txt for details.
  * --------------------------------------------------------------------------*/
-using System;
 
+using System;
 using System.Collections;
 using System.ComponentModel;
 using System.Drawing;
 using System.Windows.Forms;
-
 using bedrock.collections;
 using bedrock.util;
 using jabber;
 using jabber.client;
 using jabber.protocol.client;
 using jabber.protocol.iq;
 
-namespace muzzle
+namespace JabberNet.Muzzle
 {
     /// <summary>
     /// A TreeView optimized for showing Jabber roster items.  Make sure that the

src/JabberNet.Muzzle/StreamControl.cs

@@ -11,15 +11,15 @@
  * Jabber-Net is licensed under the LGPL.
  * See licenses/Jabber-Net_LGPLv3.txt for details.
  * --------------------------------------------------------------------------*/
+
 using System.ComponentModel;
 using System.Xml;
-
 using bedrock.util;
 using jabber;
 using jabber.connection;
 using jabber.protocol.client;
 
-namespace muzzle
+namespace JabberNet.Muzzle
 {
     /// <summary>
     /// A UserControl that references an XmppStream.

src/JabberNet.Muzzle/StripChart.cs

@@ -11,20 +11,18 @@
  * Jabber-Net is licensed under the LGPL.
  * See licenses/Jabber-Net_LGPLv3.txt for details.
  * --------------------------------------------------------------------------*/
-using System;
 
+using System;
 using System.Collections;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.Drawing;
-using System.Windows.Forms;
 using System.Drawing.Drawing2D;
-using System.Drawing.Imaging;
-using System.Diagnostics;
 using System.Threading;
-
+using System.Windows.Forms;
 using bedrock.util;
 
-namespace muzzle
+namespace JabberNet.Muzzle
 {
     /// <summary>
     /// How should the chart be rendered?

src/JabberNet.Muzzle/XDataForm.cs

@@ -11,24 +11,19 @@
  * Jabber-Net is licensed under the LGPL.
  * See licenses/Jabber-Net_LGPLv3.txt for details.
  * --------------------------------------------------------------------------*/
-using System;
 
-using System.Drawing;
-using System.Collections;
+using System;
 using System.ComponentModel;
-using System.Windows.Forms;
+using System.Diagnostics;
+using System.Drawing;
 using System.Text.RegularExpressions;
-using System.Xml;
-
+using System.Windows.Forms;
 using bedrock.util;
-
 using jabber.protocol;
-using jabber.protocol.x;
 using jabber.protocol.client;
-using Msg = jabber.protocol.client.Message;
-using System.Diagnostics;
+using jabber.protocol.x;
 
-namespace muzzle
+namespace JabberNet.Muzzle
 {
     /// <summary>
     /// Summary description for XData.

src/JabberNet.Muzzle/XmppDebugger.cs

@@ -11,16 +11,16 @@
  * Jabber-Net is licensed under the LGPL.
  * See licenses/Jabber-Net_LGPLv3.txt for details.
  * --------------------------------------------------------------------------*/
+
 using System;
 using System.ComponentModel;
-using System.Drawing;
 using System.Diagnostics;
+using System.Drawing;
 using System.Windows.Forms;
 using System.Xml;
-
 using bedrock.util;
 
-namespace muzzle
+namespace JabberNet.Muzzle
 {
     /// <summary>
     /// Debug stream for XMPP, so I don't have write it every time.
@@ -339,7 +339,7 @@ private void InitializeComponent()
         {
             this.rtSend = new System.Windows.Forms.RichTextBox();
             this.splitter1 = new System.Windows.Forms.Splitter();
-            this.rtDebug = new muzzle.BottomScrollRichText();
+            this.rtDebug = new BottomScrollRichText();
             this.SuspendLayout();
             //
             // rtSend