Utilisateur : Fcolin Date : 16/01/06 Heure : 13:58 Archivé dans $/CSharp/Ivy/IvyProbe Commentaire: (vss 9)

1 files changed, 19 insertions, 19 deletions

diff --git a/CSharp/Ivy/IvyProbe/IvyProbe.cs b/CSharp/Ivy/IvyProbe/IvyProbe.cs
index f61d655..da7626b 100644
--- a/CSharp/Ivy/IvyProbe/IvyProbe.cs
+++ b/CSharp/Ivy/IvyProbe/IvyProbe.cs
@@ -11,7 +11,7 @@ namespace IvyProbe
 	partial class IvyProbe :  System.Windows.Forms.Form

 	{

 

-		internal Ivy bus;

+		//internal Ivy bus;

         

 		public IvyProbe()

 		{

@@ -20,25 +20,25 @@ namespace IvyProbe
 			//

 			InitializeComponent();

 

-            bus = new Ivy("IvyProbe_C#", "IvyProbe_C# ready", this);

-			bus.Debug = true;

-			bus.clientConnected += new Ivy.ClientConnectedHandler( connect );

-			bus.clientDisconnected += new Ivy.ClientDisconnectedHandler( disconnect );

-			bus.addBinding +=new IvyBus.Ivy.ClientAddBindingHandler(bus_addBinding);

-			bus.removeBinding +=new IvyBus.Ivy.ClientAddBindingHandler(bus_removeBinding);

-			bus.dieReceived += new Ivy.DieHandler( die );

-			bus.directMessageReceived += new Ivy.DirectMessageHandler( directMessage );

-			bus.start(null);

+            //bus = new Ivy("IvyProbe_C#", "IvyProbe_C# ready", this);

+            //bus.Debug = true;

+            //bus.clientConnected += new Ivy.ClientConnectedHandler( connect );

+            //bus.clientDisconnected += new Ivy.ClientDisconnectedHandler( disconnect );

+            //bus.addBinding +=new IvyBus.Ivy.ClientAddBindingHandler(bus_addBinding);

+            //bus.removeBinding += new IvyBus.Ivy.ClientRemoveBindingHandler(bus_removeBinding);

+            //bus.dieReceived += new Ivy.DieHandler( die );

+            //bus.directMessageReceived += new Ivy.DirectMessageHandler( directMessage );

+            //bus.start(null);

 		}

 		

 

 		public void  stop()

 		{

-			bus.clientConnected -= new Ivy.ClientConnectedHandler( connect );

-			bus.clientDisconnected -= new Ivy.ClientDisconnectedHandler( disconnect );

-			bus.dieReceived -= new Ivy.DieHandler( die );

-			bus.directMessageReceived -= new Ivy.DirectMessageHandler( directMessage );

-			bus.stop();

+            //bus.clientConnected -= new Ivy.ClientConnectedHandler( connect );

+            //bus.clientDisconnected -= new Ivy.ClientDisconnectedHandler( disconnect );

+            //bus.dieReceived -= new Ivy.DieHandler( die );

+            //bus.directMessageReceived -= new Ivy.DirectMessageHandler( directMessage );

+            //bus.stop();

 		}

 		private void  connect(IvyClient client)

 		{

@@ -64,7 +64,7 @@ namespace IvyProbe
 			// ajoute la nouvelle regex

 			string regexp = tbRegexp.Text;

 			regexp.Trim();

-			int regexp_id = bus.bindMsg(regexp, new Ivy.MessageHandler(receive));

+			int regexp_id = bus.ivy.bindMsg(regexp, new Ivy.MessageHandler(receive));

 			tbRegexp.Text = "";

 			append( "bind("+regexp_id+") ->"+regexp);

 		}

@@ -73,7 +73,7 @@ namespace IvyProbe
 			// ajoute la nouvelle regex

 			string expression = tbRegexp.Text;

 			expression.Trim();

-			int regexp_id = bus.bindSimpleMsg(expression, new Ivy.MessageHandler(receive));

+			int regexp_id = bus.ivy.bindSimpleMsg(expression, new Ivy.MessageHandler(receive));

 			tbRegexp.Text = "";

 			append( "bind("+regexp_id+") ->"+expression);

 		}

@@ -99,7 +99,7 @@ namespace IvyProbe
 			int count;

 			System.String tosend = tbMsg.Text;

 			tbMsg.Text = "";

-			count = bus.sendMsg(tosend);

+			count = bus.ivy.sendMsg(tosend);

 			append("Sending '" + tosend + "' count " + count);

 		}

 		

@@ -129,7 +129,7 @@ namespace IvyProbe
 		{

 			// enleve la regex

 			string regexp = tbRegexp.Text;

-			bool removed = bus.unBindMsg( regexp );

+			bool removed = bus.ivy.unBindMsg( regexp );

 			if ( removed )

 			{

 				append( "unbind("+regexp+")");