Utilisateur : Fcolin Date : 23/12/05 Heure : 16:22 Archivé dans $/CSharp/Ivy Commentaire: (vss 31)

1 files changed, 6 insertions, 6 deletions

diff --git a/CSharp/Ivy/Ivy/Ivy.cs b/CSharp/Ivy/Ivy/Ivy.cs
index 7a3cec2..b1b9cdd 100644
--- a/CSharp/Ivy/Ivy/Ivy.cs
+++ b/CSharp/Ivy/Ivy/Ivy.cs
@@ -179,7 +179,7 @@ namespace IvyBus
 			internal BindingType type;

             internal ushort key;

 			internal MessageHandler callback;

-			internal string regexp;

+			internal string expression;

 			internal object[] args;

 		}

 

@@ -475,7 +475,7 @@ namespace IvyBus
 			ApplicationBinding newbind;

 			newbind.type = BindingType.BindRegexp;

 			newbind.key = serial++;

-			newbind.regexp = regexp;

+            newbind.expression = regexp;

 			newbind.callback = callback;

 			newbind.args = args;

 			lock (bindings) bindings.Add( newbind.key, newbind);

@@ -484,7 +484,7 @@ namespace IvyBus
 			{

 				foreach (IvyClient c in clients )

 				{

-					c.stream.TokenAddRegexp(newbind.key,newbind.regexp);

+                    c.stream.TokenAddRegexp(newbind);

 				}

 			}

 			return newbind.key;

@@ -524,7 +524,7 @@ namespace IvyBus
 		{

 			foreach (ApplicationBinding bind in bindings.Values )

 			{

-				if ( bind.regexp == re )

+                if (bind.expression == re)

 				{

 					try

 					{

@@ -563,7 +563,7 @@ namespace IvyBus
 			ApplicationBinding newbind;

 			newbind.type = BindingType.BindSimple;

 			newbind.key = serial++;

-			newbind.regexp = expression;

+            newbind.expression = expression;

 			newbind.callback = callback;

 			newbind.args = args;

 			lock (bindings) bindings.Add( newbind.key, newbind);

@@ -572,7 +572,7 @@ namespace IvyBus
 			{

 				foreach (IvyClient c in clients )

 				{

-					c.stream.TokenAddBinding(newbind.key,newbind.regexp);

+                    c.stream.TokenAddBinding(newbind.key, newbind.expression);

 				}

 			}

 			return newbind.key;