diff options
Diffstat (limited to 'Ivy/IvyBinding.cs')
| -rw-r--r-- | Ivy/IvyBinding.cs | 39 |
1 files changed, 17 insertions, 22 deletions
diff --git a/Ivy/IvyBinding.cs b/Ivy/IvyBinding.cs index 624b401..bb2498a 100644 --- a/Ivy/IvyBinding.cs +++ b/Ivy/IvyBinding.cs @@ -1,11 +1,13 @@ -using System;
-using System.Collections;
-using System.Collections.Specialized;
-using System.Text.RegularExpressions;
-using System.Diagnostics;
-
+
namespace IvyBus
{
+ using System;
+ using System.Collections;
+ using System.Collections.Specialized;
+ using System.Text.RegularExpressions;
+ using System.Diagnostics;
+ using IvyBus.Properties;
+
/* This is the Client side of binding storage */
/* association of a generated Key and the expression and a compiled Expression matching */
/* this is RECEIVED from other client */
@@ -16,22 +18,15 @@ namespace IvyBus internal abstract class IvyBindingBase
{
- private ushort key;
-
- internal ushort Key
- {
- get { return key; }
- }
- protected string expression;
+ private string expression;
internal string Expression
{
get { return expression; }
}
- internal IvyBindingBase(ushort id, string exp)
+ internal IvyBindingBase(string exp)
{
- key = id;
expression = exp;
}
internal abstract string[] Match(string message);
@@ -41,10 +36,10 @@ namespace IvyBus {
internal Regex regexp;
- public IvyBindingRegexp(ushort id, string exp)
- : base(id, exp)
+ public IvyBindingRegexp( string exp)
+ : base(exp)
{
- regexp = new Regex(expression, /* RegexOptions.Compiled | */RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
+ regexp = new Regex(Expression, /* RegexOptions.Compiled | */RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
//regexp.Match("###"); // for really compile the expression really slow on 3000 expression
}
internal override string[] Match(string message)
@@ -71,10 +66,10 @@ namespace IvyBus static string msgtag; // send message name
static StringDictionary args_values; // send message args[name]=value
- internal IvyBindingSimple(ushort id, string exp)
- : base(id, exp)
+ internal IvyBindingSimple(string exp)
+ : base(exp)
{
- string[] expr = expression.Split( ' ' );
+ string[] expr = Expression.Split( ' ' );
msgname = expr[0];
msgargs = new string[ expr.Length -1 ];
for ( int i = 1; i < expr.Length; i++ )
@@ -92,7 +87,7 @@ namespace IvyBus args_values[arg[0]] = arg[1];
else
{
- Ivy.traceError("IvyBindingSimple" , "abnormally Formed message expected 'msg champ=valeur champ=valeur....' :" + message);
+ Ivy.traceError("IvyBindingSimple" , Resources.BadSimpleBinding + message);
}
}
|