From 3c9d0c18a19de1f1ec1c4e77f6b89fdf84d39605 Mon Sep 17 00:00:00 2001 From: fcolin Date: Fri, 10 Oct 2008 15:45:54 +0000 Subject: Ajout de commentaire sur les menbres public --- Ivy.sln | 18 +++- Ivy/Ivy.cs | 121 ++++++++++++++++++------ Ivy/Ivy.csproj | 3 +- Ivy/IvyClient.cs | 48 +++++++--- Ivy/IvyEventArgs.cs | 61 ++++++++---- Ivy/IvyUDPStream.cs | 21 ++-- Ivy/IvyWatcher.cs | 20 ++-- IvyControl/IvyApplicationBindingControl.cs | 17 +--- IvyControl/IvyControl.cs | 35 ++----- IvyControl/IvyControl.csproj | 27 +++++- IvyControl/IvyDomain.cs | 2 +- IvyDaemon/IvyDaemon.cs | 2 +- IvyDaemon/IvyDaemon.csproj | 7 +- IvyDaemon/Properties/Settings.Designer.cs | 10 +- IvyFilter/Filter.cs | 7 +- IvyFilter/IvyFilter.csproj | 7 +- IvyPPC/IvyDomain.resx | 108 ++++++++++----------- IvyPPC/IvyPPC.csproj | 11 ++- IvyPerf/IvyPerf.csproj | 24 +++-- IvyProbe/IvyProbe.Designer.cs | 6 +- IvyProbe/IvyProbe.cs | 17 +++- IvyProbe/IvyProbe.csproj | 7 +- IvyProbe/Properties/Settings.Designer.cs | 10 +- IvyProbeConsole/IvyProbeConsole.cs | 7 +- IvyProbeConsole/IvyProbeConsole.csproj | 7 +- IvyProbeConsole/Properties/Settings.Designer.cs | 10 +- getopt/Arg.cs | 2 +- getopt/getopt.csproj | 3 +- getopt/vssver2.scc | Bin 119 -> 142 bytes 29 files changed, 386 insertions(+), 232 deletions(-) diff --git a/Ivy.sln b/Ivy.sln index 9b930c2..c3cdd2d 100644 --- a/Ivy.sln +++ b/Ivy.sln @@ -1,5 +1,5 @@ -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IvyDaemon", "IvyDaemon\IvyDaemon.csproj", "{B10AB29F-D678-4472-9BA3-D627262E14E1}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IvyPerf", "IvyPerf\IvyPerf.csproj", "{839C9A55-7EFD-4326-95C3-2960DF390FF2}" @@ -19,9 +19,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "getopt", "getopt\getopt.csp EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IvyControl", "IvyControl\IvyControl.csproj", "{9E7098F5-F4CA-4CAE-B517-C584691DBDB4}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IvyThroughput", "IvyThroughput\IvyThroughput\IvyThroughput.csproj", "{58BA0A9C-0655-4E65-BCA1-B5DD3FF62C0D}" +EndProject Global GlobalSection(SourceCodeControl) = preSolution - SccNumberOfProjects = 9 + SccNumberOfProjects = 10 SccLocalPath0 = . CanCheckoutShared = false SccProjectUniqueName1 = IvyDaemon\\IvyDaemon.csproj @@ -56,6 +58,10 @@ Global SccLocalPath8 = . CanCheckoutShared = false SccProjectFilePathRelativizedFromConnection8 = IvyControl\\ + SccProjectUniqueName9 = IvyThroughput\\IvyThroughput\\IvyThroughput.csproj + SccLocalPath9 = . + CanCheckoutShared = false + SccProjectFilePathRelativizedFromConnection9 = IvyThroughput\\IvyThroughput\\ EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -114,6 +120,12 @@ Global {9E7098F5-F4CA-4CAE-B517-C584691DBDB4}.Release|Any CPU.ActiveCfg = Release|Any CPU {9E7098F5-F4CA-4CAE-B517-C584691DBDB4}.Release|Any CPU.Build.0 = Release|Any CPU {9E7098F5-F4CA-4CAE-B517-C584691DBDB4}.Release|x86.ActiveCfg = Release|Any CPU + {58BA0A9C-0655-4E65-BCA1-B5DD3FF62C0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {58BA0A9C-0655-4E65-BCA1-B5DD3FF62C0D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {58BA0A9C-0655-4E65-BCA1-B5DD3FF62C0D}.Debug|x86.ActiveCfg = Debug|Any CPU + {58BA0A9C-0655-4E65-BCA1-B5DD3FF62C0D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {58BA0A9C-0655-4E65-BCA1-B5DD3FF62C0D}.Release|Any CPU.Build.0 = Release|Any CPU + {58BA0A9C-0655-4E65-BCA1-B5DD3FF62C0D}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Ivy/Ivy.cs b/Ivy/Ivy.cs index bfef8ab..1946133 100644 --- a/Ivy/Ivy.cs +++ b/Ivy/Ivy.cs @@ -30,17 +30,46 @@ namespace IvyBus public class Ivy { /* Event */ + /// + /// raise when an new IvyClient is connected + /// public event EventHandler ClientConnected; + /// + /// raise when an new IvyClient is disconnected + /// public event EventHandler ClientDisconnected; + /// + /// raise when a direct message is received + /// public event EventHandler DirectMessageReceived; + /// + /// raise when some IvyClient ask me to die + /// public event EventHandler DieReceived; + /// + /// raise when an IvyClient register a binding + /// public event EventHandler BindingAdd; + /// + /// raise when an IvyClient unregister a binding + /// public event EventHandler BindingRemove; + /// + /// raise when an IvyClient binding is filteredout + /// public event EventHandler BindingFilter; + /// + /// raise when an IvyClient changer a binding + /// public event EventHandler BindingChange; + /// + /// raise when an error message is received + /// public event EventHandler ErrorMessage; - + /// + /// Flag for displaying internal debug message of the protocol intrinsics + /// public static bool DebugProtocol { get @@ -53,7 +82,10 @@ namespace IvyBus } } - + /// + /// Language for the Ivy SendMsg formating default en-US + /// ie: send point on float value sent + /// public CultureInfo Culture { get @@ -92,7 +124,9 @@ namespace IvyBus } } - /// AppId the Application Unique ID + /// + /// AppId the Application Unique ID + /// public string AppId { @@ -103,7 +137,9 @@ namespace IvyBus } - + /// + /// the Ivy Protocol version + /// public int ProtocolVersion { get @@ -113,8 +149,9 @@ namespace IvyBus } - /// IsRunning is the bus Started and connected ? - + /// + /// IsRunning is the bus Started and connected ? + /// public bool IsRunning { get @@ -167,6 +204,9 @@ namespace IvyBus private Thread serverThread; // to ensure quick communication of the end private AutoResetEvent tcplistener_running; + /// + /// the Ivy Assembly version + /// static public Version Version { get { return Assembly.GetExecutingAssembly().GetName().Version; } @@ -200,7 +240,8 @@ namespace IvyBus /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the Ivy Bus. + /// Readies the structures for the software bus connexion. /// public Ivy() { @@ -351,7 +392,10 @@ namespace IvyBus OnClientRemoveBinding(new IvyEventArgs(clnt, id, clientbind.binding.Expression)); } - // Autobinding on static method + /// + /// Automatic binding on static method of a Type + /// + /// public void BindAttribute(Type type) { if (type == null) return; @@ -374,7 +418,12 @@ namespace IvyBus } } } - // Autobinding on instance method + + + /// + /// Autobinding on instance method + /// + /// public void BindAttribute(object target) { if (target == null) return; @@ -398,6 +447,10 @@ namespace IvyBus } // Autobinding on IvyBindingAttribute method + /// + /// Automatic binding of IvyBindAttribute in an assembly + /// + /// public void BindAttribute(Assembly target) { if (target != null) @@ -477,22 +530,7 @@ namespace IvyBus clients.Sort(); } } - /* a small private method for debbugging purposes */ - - public static string Domains(string toParse) - { - string domainbus = GetDomain(toParse); - StringBuilder s = new StringBuilder("broadcasting on "); - Ivy.Domain[] d = parseDomains(domainbus); - for (int index = 0; index < d.Length; index++) - { - s.Append(d[index].Domainaddr); - s.Append(":"); - s.Append(d[index].Port); - s.Append(" "); - } - return s.ToString(); - } + internal static Domain[] parseDomains(string domainbus) { @@ -584,6 +622,7 @@ namespace IvyBus { this.Join(Timeout.Infinite); } + /// /// Send a formated message to someone on the bus /// @@ -673,7 +712,11 @@ namespace IvyBus return count; } - // + /// + /// Make a binding to a message using regular expresssion + /// + /// + /// public int BindMsg(IvyApplicationBinding newBinding) { newBinding.Key = Interlocked.Increment(ref serial); @@ -729,7 +772,8 @@ namespace IvyBus { try { - c.stream.TokenDelBinding(id); + if ( c.stream != null ) + c.stream.TokenDelBinding(id); } catch (IOException) { @@ -739,6 +783,12 @@ namespace IvyBus } lock (bindings) bindings.Remove(id); } + /// + /// Change a binding already registred + /// + /// + /// + /// public int ChangeMsg(int id, string expression) { IvyApplicationBinding newbind; @@ -1048,7 +1098,10 @@ namespace IvyBus } - + /// + /// return the first non loopback adress + /// on a one network interface machine it will be my IP adresse + /// public static IPAddress LocalIP { get @@ -1065,7 +1118,11 @@ namespace IvyBus return returnaddr; } } - + /// + /// Get the FDQN Domain from a string + /// + /// + /// public static string GetDomain(string domainBus) { #if (PocketPC) // TODO integrate in normal version @@ -1264,7 +1321,11 @@ namespace IvyBus } } - + /// + /// check Validity of Ivy Bus Domain + /// + /// + /// public static bool ValidatingDomain(string domain) { // domain if of the form ip1[:port][,ip2[:port]] with ip of the form n1.n2.n3.n4 diff --git a/Ivy/Ivy.csproj b/Ivy/Ivy.csproj index 5076a47..38af05b 100644 --- a/Ivy/Ivy.csproj +++ b/Ivy/Ivy.csproj @@ -1,7 +1,7 @@  Local - 9.0.21022 + 9.0.30729 2.0 {F2F03CF7-0087-4EDB-AD15-80C9E8DA2617} SAK @@ -171,6 +171,7 @@ + SettingsSingleFileGenerator diff --git a/Ivy/IvyClient.cs b/Ivy/IvyClient.cs index 7f29e91..8421443 100644 --- a/Ivy/IvyClient.cs +++ b/Ivy/IvyClient.cs @@ -37,6 +37,9 @@ namespace IvyBus return (other.clientPriority - clientPriority); } + /// + /// the client application Name + /// public String ApplicationName { get @@ -68,6 +71,9 @@ namespace IvyBus } } + /// + /// adress of the client + /// public IPAddress RemoteAddress { get @@ -76,6 +82,9 @@ namespace IvyBus } } + /// + /// port of the client + /// public int RemotePort { get @@ -250,11 +259,19 @@ namespace IvyBus { } catch (IOException ioe) - { - if (!(ioe.InnerException is SocketException)) - throw new IvyException(ioe.Message); - if (((SocketException)ioe.InnerException).SocketErrorCode != SocketError.ConnectionReset) + { + SocketException se = ioe.InnerException as SocketException; + if (se != null) + { + if (!(se.SocketErrorCode == SocketError.ConnectionReset || + se.SocketErrorCode == SocketError.ConnectionAborted)) + + throw new IvyException(ioe.Message); + } + else + { throw new IvyException(ioe.Message); + } } // stop the thread and close the stream @@ -558,9 +575,12 @@ namespace IvyBus { Ivy.traceProtocol(Resources.IvyClient, Resources.PingReceive + appName + " : " + arg); } - - - + + + + /// + /// return full Application name pair + /// public override String ToString() { return Resources.IvyClient+ " " + bus.appName + ":" + appName; @@ -587,6 +607,9 @@ namespace IvyBus } Ivy.traceProtocol(Resources.IvyClient,Resources.PingerThreadStopped); } + /// + /// stop the pinger Thread + /// public virtual void StopPinging() { isPinging = false; @@ -608,14 +631,15 @@ namespace IvyBus if (disposing) { // Free other state (managed objects). + if (stream != null) + { + stream.Close(); + stream = null; + } } // Free your own state (unmanaged objects). // Set large fields to null. - if (stream != null) - { - stream.Close(); - stream = null; - } + } // Use C# destructor syntax for finalization code. diff --git a/Ivy/IvyEventArgs.cs b/Ivy/IvyEventArgs.cs index a08f314..279f7c4 100644 --- a/Ivy/IvyEventArgs.cs +++ b/Ivy/IvyEventArgs.cs @@ -15,20 +15,32 @@ namespace IvyBus private int id; private string arg; + /// + /// the client who raise the event + /// public IvyClient Client { get { return client; } } + /// + /// the id argument of the message + /// public int Id { get { return id; } } + /// + /// the general purpose argument of the event + /// public string Argument { get { return arg; } } + /// + /// Args of Ivy generated events + /// public IvyEventArgs(IvyClient app, int id, string arg) { this.client = app; @@ -41,46 +53,57 @@ namespace IvyBus /* return value for Die Event */ private bool forceExit; + /// + /// should we exit + /// + /// + /// by default the Ivy bus will make a call to Exit + /// set this flags to false if you wan't your application to survive + /// + /// true public bool ForceExit { get { return forceExit; } set { forceExit = value; } } + /// + /// Arg of the Die Event + /// public IvyDieEventArgs(IvyClient app, int id, string arg) : base(app, id, arg) { forceExit = true; } } - public class IvyMessageEventArgs : EventArgs + public class IvyMessageEventArgs : IvyEventArgs { - private IvyClient client; - private int id; - private string[] args; - - public IvyClient Client - { - get { return client; } - } - - public int Id - { - get { return id; } - } + private string[] arg_list; + /// + /// retreive all the arguments + /// + /// public string[] GetArguments() { - return (string[])args.Clone(); + return (string[])arg_list.Clone(); } + + /// + /// retreive the argument at specified index + /// + /// + /// public string this[int index] { - get { return args[index]; } + get { return arg_list[index]; } } + /// + /// Arg for the Normal Ivy Message received + /// public IvyMessageEventArgs(IvyClient app, int id, string[] args) + : base( app, id, null) { - this.client = app; - this.id = id; - this.args = args; + this.arg_list = args; } } } diff --git a/Ivy/IvyUDPStream.cs b/Ivy/IvyUDPStream.cs index 986a550..0e64381 100644 --- a/Ivy/IvyUDPStream.cs +++ b/Ivy/IvyUDPStream.cs @@ -77,19 +77,20 @@ namespace IvyBus if (disposing) { // Free other state (managed objects). + if (out_stream != null) + { + out_stream.Close(); + out_stream = null; + } + if (in_stream != null) + { + in_stream.Close(); + in_stream = null; + } } // Free your own state (unmanaged objects). // Set large fields to null. - if (out_stream != null) - { - out_stream.Close(); - out_stream = null; - } - if (in_stream != null) - { - in_stream.Close(); - in_stream = null; - } + } #endregion } diff --git a/Ivy/IvyWatcher.cs b/Ivy/IvyWatcher.cs index b985ada..cc3fab1 100644 --- a/Ivy/IvyWatcher.cs +++ b/Ivy/IvyWatcher.cs @@ -81,9 +81,10 @@ namespace IvyBus } } - /// the behaviour of each thread watching the UDP socket. + /// + /// the behaviour of each thread watching the UDP socket. /// - public void Run() + private void Run() { Ivy.traceProtocol(Resources.IvyWatcher, "beginning of a watcher Thread"); @@ -172,7 +173,9 @@ namespace IvyBus Ivy.traceProtocol(Resources.IvyWatcher, "ending stopping an IvyWatcher"); } } - + /// + /// send the boradcst message on all domains + /// internal virtual void start() { lock (stream) @@ -197,14 +200,15 @@ namespace IvyBus if (disposing) { // Free other state (managed objects). + if (stream != null) + { + stream.Close(); + stream = null; + } } // Free your own state (unmanaged objects). // Set large fields to null. - if (stream != null) - { - stream.Close(); - stream = null; - } + } #endregion diff --git a/IvyControl/IvyApplicationBindingControl.cs b/IvyControl/IvyApplicationBindingControl.cs index c4c236f..5772295 100644 --- a/IvyControl/IvyApplicationBindingControl.cs +++ b/IvyControl/IvyApplicationBindingControl.cs @@ -4,6 +4,7 @@ using System.Collections.Specialized; using System.Text; using System.ComponentModel; using System.Threading; +using System.Collections.ObjectModel; namespace IvyBus { @@ -34,21 +35,12 @@ namespace IvyBus [Browsable(false)] [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] #endif - public ushort Key + public int Key { get { return binding.Key; } set { binding.Key = value; } } -#if (!PocketPC) - [Browsable(false)] - [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] -#endif - public object[] Args - { - get { return binding.Args; } - set { binding.Args = value; } - } #if (!PocketPC) [Category("Ivy")] @@ -63,7 +55,7 @@ namespace IvyBus { get { - return binding.FormatedExpression; + return binding.FormattedExpression; } } @@ -83,7 +75,7 @@ namespace IvyBus [Description("Arguments used when formating the expression")] #endif - public List Arguments + public Collection Arguments { get { @@ -116,6 +108,7 @@ namespace IvyBus { container.Add(this); } + } } diff --git a/IvyControl/IvyControl.cs b/IvyControl/IvyControl.cs index a432914..20b43be 100644 --- a/IvyControl/IvyControl.cs +++ b/IvyControl/IvyControl.cs @@ -25,6 +25,7 @@ namespace IvyBus #if (!PocketPC) using System.ComponentModel.Design; + using System.Collections.ObjectModel; #endif // using System.Drawing.Design; @@ -202,24 +203,6 @@ namespace IvyBus } } - - /// AppPriority the Application Priority: the clients list is sorted against priority -#if (!PocketPC) - [Category("Ivy")] -#endif - [DefaultValue(Ivy.DEFAULT_PRIORITY)] - public ushort AppPriority - { - set - { - ivy.AppPriority = value; - } - get - { - return ivy.AppPriority; - } - - } ///SentMessageClasses the first word token of sent messages /// optimise the parsing process when sending messages @@ -231,7 +214,7 @@ namespace IvyBus // sinon bug System.String constructor not found ! [Editor("System.Windows.Forms.Design.StringCollectionEditor, System.Design", "System.Drawing.Design.UITypeEditor, System.Drawing")] #endif - public List SentMessageFilter + public Collection SentMessageFilter { get { @@ -293,7 +276,7 @@ namespace IvyBus #endif Assembly assembly = Assembly.GetCallingAssembly(); if ( assembly != this.GetType().Assembly ) - ivy.BindAttibute(assembly); + ivy.BindAttribute(assembly); } public IvyControl(IContainer container) : this() @@ -303,7 +286,7 @@ namespace IvyBus //TODO Autobinding attribute Assembly assembly = Assembly.GetCallingAssembly(); if (assembly != this.GetType().Assembly) - ivy.BindAttibute(assembly); + ivy.BindAttribute(assembly); } /// /// Readies the structures for the software bus connexion. @@ -337,7 +320,7 @@ namespace IvyBus //TODO Autobinding attribute Assembly assembly = Assembly.GetCallingAssembly(); if (assembly != this.GetType().Assembly) - ivy.BindAttibute(assembly); + ivy.BindAttribute(assembly); } protected override void Dispose(bool disposing) @@ -375,7 +358,7 @@ namespace IvyBus return ivy.SendMsg(format, args); } // - public ushort BindMsg(IvyApplicationBinding newbind) + public int BindMsg(IvyApplicationBinding newbind) { return ivy.BindMsg(newbind); } @@ -392,7 +375,7 @@ namespace IvyBus /// by another agent. A program doesn't receive its own messages. /// // - public ushort BindMsg(string regexp, EventHandler callback, params object[] args) + public int BindMsg(string regexp, EventHandler callback, params object[] args) { return ivy.BindMsg(regexp, callback,args); } @@ -401,7 +384,7 @@ namespace IvyBus /// unsubscribes a regular expression /// /// the id of the regular expression, returned when it was bound - public void UnbindMsg(ushort id) + public void UnbindMsg(int id) { ivy.UnbindMsg(id); } @@ -444,7 +427,7 @@ namespace IvyBus /// /// The name of the Ivy agent you're looking for /// - public List GetClientsByName(string name) + public ReadOnlyCollection GetClientsByName(string name) { return ivy.GetClientsByName( name ); diff --git a/IvyControl/IvyControl.csproj b/IvyControl/IvyControl.csproj index 786dc02..55ff36a 100644 --- a/IvyControl/IvyControl.csproj +++ b/IvyControl/IvyControl.csproj @@ -1,4 +1,4 @@ - + Debug AnyCPU @@ -13,6 +13,11 @@ SAK SAK SAK + + + + + 2.0 true @@ -31,6 +36,26 @@ prompt 4 + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + true + GlobalSuppressions.cs + prompt + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + true + GlobalSuppressions.cs + prompt + diff --git a/IvyControl/IvyDomain.cs b/IvyControl/IvyDomain.cs index 7099db7..36e749a 100644 --- a/IvyControl/IvyDomain.cs +++ b/IvyControl/IvyDomain.cs @@ -8,7 +8,7 @@ namespace IvyBus { public partial class IvyDomain : UserControl { - private string domain = ""; + private string domain = string.Empty; public event EventHandler DomainChanged; #if (!PocketPC) [Category("Ivy")] diff --git a/IvyDaemon/IvyDaemon.cs b/IvyDaemon/IvyDaemon.cs index 8c0b069..3924df2 100644 --- a/IvyDaemon/IvyDaemon.cs +++ b/IvyDaemon/IvyDaemon.cs @@ -87,7 +87,7 @@ namespace IvyDaemon */ bus = new Ivy(name, name + " ready"); if (!quiet) - System.Console.Out.WriteLine("broadcasting on " + Ivy.Domains(domain)); + System.Console.Out.WriteLine("broadcasting on " + Ivy.GetDomain(domain)); bus.Start(domain); if (!quiet) System.Console.Out.WriteLine("listening on " + servicePort); diff --git a/IvyDaemon/IvyDaemon.csproj b/IvyDaemon/IvyDaemon.csproj index 1dc6409..903b5e9 100644 --- a/IvyDaemon/IvyDaemon.csproj +++ b/IvyDaemon/IvyDaemon.csproj @@ -1,7 +1,7 @@ - + Local - 8.0.50727 + 9.0.30729 2.0 {B10AB29F-D678-4472-9BA3-D627262E14E1} SAK @@ -49,6 +49,8 @@ publish.htm 1.0.0.%2a true + 2.0 + 2 bin\Debug\ @@ -125,7 +127,6 @@ - SettingsSingleFileGenerator Settings.Designer.cs diff --git a/IvyDaemon/Properties/Settings.Designer.cs b/IvyDaemon/Properties/Settings.Designer.cs index 7555e19..afa5d91 100644 --- a/IvyDaemon/Properties/Settings.Designer.cs +++ b/IvyDaemon/Properties/Settings.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:2.0.50727.42 +// Ce code a été généré par un outil. +// Version du runtime :2.0.50727.1433 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si +// le code est régénéré. // //------------------------------------------------------------------------------ @@ -12,7 +12,7 @@ namespace IvyDaemon.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "8.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/IvyFilter/Filter.cs b/IvyFilter/Filter.cs index 03e2435..31ed364 100644 --- a/IvyFilter/Filter.cs +++ b/IvyFilter/Filter.cs @@ -55,7 +55,12 @@ namespace IvyFilter nbmsg = n; bus = new Ivy("Filter", "Filter ready"); if (f) - bus.SentMessageFilter.AddRange(filter); + { + foreach (string str in filter) + { + bus.SentMessageFilter.Add(str); + } + } bus.BindingAdd += new EventHandler(bus_BindingAdd); bus.BindingRemove += new EventHandler(bus_BindingRemove); bus.BindingFilter += new EventHandler(bus_BindingFilter); diff --git a/IvyFilter/IvyFilter.csproj b/IvyFilter/IvyFilter.csproj index 5dbc3cb..55deff5 100644 --- a/IvyFilter/IvyFilter.csproj +++ b/IvyFilter/IvyFilter.csproj @@ -1,4 +1,4 @@ - + Debug AnyCPU @@ -13,6 +13,11 @@ SAK SAK SAK + + + + + 2.0 true diff --git a/IvyPPC/IvyDomain.resx b/IvyPPC/IvyDomain.resx index ff31a6d..20181d0 100644 --- a/IvyPPC/IvyDomain.resx +++ b/IvyPPC/IvyDomain.resx @@ -1,6 +1,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx2.0System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 diff --git a/IvyPPC/IvyPPC.csproj b/IvyPPC/IvyPPC.csproj index c1c8af8..6de81b6 100644 --- a/IvyPPC/IvyPPC.csproj +++ b/IvyPPC/IvyPPC.csproj @@ -1,8 +1,8 @@ - + Debug AnyCPU - 8.0.50727 + 9.0.21022 2.0 {7E5552BD-0262-4C02-B0CE-E96305CFCD6D} Library @@ -21,6 +21,12 @@ SAK SAK SAK + + + + + 2.0 + Pocket PC 2003 true @@ -107,4 +113,5 @@ --> + \ No newline at end of file diff --git a/IvyPerf/IvyPerf.csproj b/IvyPerf/IvyPerf.csproj index c3742e6..6ff143f 100644 --- a/IvyPerf/IvyPerf.csproj +++ b/IvyPerf/IvyPerf.csproj @@ -1,7 +1,7 @@ - + Local - 8.0.50727 + 9.0.30729 2.0 {839C9A55-7EFD-4326-95C3-2960DF390FF2} Debug @@ -33,6 +33,8 @@ IvyPerf_TemporaryKey.pfx true true + true + 2.0 \\samba\fcolin\public_html\ClickOnce\IvyPerf\ true Web @@ -44,8 +46,9 @@ false true http://www.tls.cena.fr/~fcolin/ClickOnce/IvyPerf/ + 0 1.0.0.%2a - true + false true @@ -121,14 +124,21 @@ - - - False - .NET Framework 2.0 + .NET Framework 2.0 %28x86%29 true + + False + .NET Framework 3.0 %28x86%29 + false + + + False + .NET Framework 3.5 + false + diff --git a/IvyProbe/IvyProbe.Designer.cs b/IvyProbe/IvyProbe.Designer.cs index e0109e3..af5222a 100644 --- a/IvyProbe/IvyProbe.Designer.cs +++ b/IvyProbe/IvyProbe.Designer.cs @@ -161,8 +161,8 @@ namespace IvyProbe // ivyApplicationBinding1 // this.ivyApplicationBinding1.Arguments.Add("Name"); - this.ivyApplicationBinding1.Binding = IvyBus.BindingType.Regexp; - this.ivyApplicationBinding1.Expression = "^{0}(.*)"; + this.ivyApplicationBinding1.Binding = IvyBus.BindingType.RegularExpression; + this.ivyApplicationBinding1.Expression = "^%0%(.*)"; this.ivyApplicationBinding1.Callback += new System.EventHandler(this.ivyprobe); // // IvyProbe @@ -179,7 +179,7 @@ namespace IvyProbe this.Controls.Add(this.tbRegexp); this.Controls.Add(this.label2); this.Controls.Add(this.label1); - this.DoubleBuffered = true; + //this.DoubleBuffered = true; this.Name = "IvyProbe"; this.Text = "IvyProbe"; this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.IvyProbe_FormClosed); diff --git a/IvyProbe/IvyProbe.cs b/IvyProbe/IvyProbe.cs index d6ef049..270dbd8 100644 --- a/IvyProbe/IvyProbe.cs +++ b/IvyProbe/IvyProbe.cs @@ -8,6 +8,7 @@ namespace IvyProbe using System.Runtime.Serialization.Formatters.Binary; using System.Reflection; using System.Net; + using System.Text; partial class IvyProbe : System.Windows.Forms.Form { @@ -23,6 +24,7 @@ namespace IvyProbe private void append(string s) { // je mettrais bien la date, aussi. + if ( ! ta.IsDisposed ) ta.AppendText(s + "\r\n"); } @@ -44,11 +46,16 @@ namespace IvyProbe } private void receive(object sender, IvyMessageEventArgs e) { - string receive_str = "client " + e.Client.ApplicationName + " envoie: ["; - receive_str += string.Join(",", e.Arguments); - receive_str += "]"; - receive_str += " for '" + ((IvyApplicationBinding)sender).FormatedExpression + "'"; - append(receive_str); + StringBuilder sb = new StringBuilder(); + sb.Append("client "); + sb.Append(e.Client.ApplicationName); + sb.Append(" envoie: ["); + sb.Append( string.Join(",", e.GetArguments())); + sb.Append("]"); + sb.Append(" for '"); + sb.Append(((IvyApplicationBinding)sender).FormattedExpression); + sb.Append("'"); + append(sb.ToString()); } public void RegexpCB(System.Object event_sender, System.EventArgs e) { diff --git a/IvyProbe/IvyProbe.csproj b/IvyProbe/IvyProbe.csproj index 8be9885..60a4df2 100644 --- a/IvyProbe/IvyProbe.csproj +++ b/IvyProbe/IvyProbe.csproj @@ -1,7 +1,7 @@ - + Local - 8.0.50727 + 9.0.30729 2.0 {5EFDDE31-9A31-43EB-8E56-6C29F7EAAD48} SAK @@ -47,6 +47,8 @@ http://www.tls.cena.fr/~fcolin/ClickOnce/IvyProbe/ 1.0.0.%2a true + 2.0 + 3 bin\Debug\ @@ -142,7 +144,6 @@ - SettingsSingleFileGenerator Settings.Designer.cs diff --git a/IvyProbe/Properties/Settings.Designer.cs b/IvyProbe/Properties/Settings.Designer.cs index f2b2c1a..498601b 100644 --- a/IvyProbe/Properties/Settings.Designer.cs +++ b/IvyProbe/Properties/Settings.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:2.0.50727.42 +// Ce code a été généré par un outil. +// Version du runtime :2.0.50727.1433 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si +// le code est régénéré. // //------------------------------------------------------------------------------ @@ -12,7 +12,7 @@ namespace IvyProbe.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "8.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/IvyProbeConsole/IvyProbeConsole.cs b/IvyProbeConsole/IvyProbeConsole.cs index 516d702..72d4434 100644 --- a/IvyProbeConsole/IvyProbeConsole.cs +++ b/IvyProbeConsole/IvyProbeConsole.cs @@ -15,6 +15,7 @@ namespace IvyProbeConsole using System.Diagnostics; using IvyBus; using Gnu; + using System.Collections.ObjectModel; /// Console implementation of the ivyprobe test program. /// @@ -164,7 +165,7 @@ namespace IvyProbeConsole } if (!quiet) - System.Console.Out.WriteLine(Ivy.Domains(domain)); + System.Console.Out.WriteLine("broadcasting on " + Ivy.GetDomain(domain)); bus.Start(domain); @@ -273,7 +274,7 @@ namespace IvyProbeConsole target = result.Groups["target"].Value; ushort id = ushort.Parse(result.Groups["id"].Value); string message = result.Groups["message"].Value; - List v = bus.GetClientsByName(target); + ReadOnlyCollection v = bus.GetClientsByName(target); if (v.Count == 0) println("no Ivy client with the name \"" + target + "\""); for (int i = 0; i < v.Count; i++) @@ -352,7 +353,7 @@ namespace IvyProbeConsole private void receive(object sender, IvyMessageEventArgs e) { String s = e.Client.ApplicationName + " sent "; - s += string.Join(",", e.Arguments); + s += string.Join(",", e.GetArguments()); println(s); } [Conditional("DEBUG")] diff --git a/IvyProbeConsole/IvyProbeConsole.csproj b/IvyProbeConsole/IvyProbeConsole.csproj index c45b9e8..590e9e8 100644 --- a/IvyProbeConsole/IvyProbeConsole.csproj +++ b/IvyProbeConsole/IvyProbeConsole.csproj @@ -1,7 +1,7 @@ - + Local - 8.0.50727 + 9.0.30729 2.0 {19023DE7-AAD8-4EC4-8FAF-D793868F8861} SAK @@ -48,6 +48,8 @@ http://www.tls.cena.fr/~fcolin/ClickOnce/IvyProbeConsole/ 1.0.0.%2a true + 2.0 + 3 bin\Debug\ @@ -131,7 +133,6 @@ - SettingsSingleFileGenerator diff --git a/IvyProbeConsole/Properties/Settings.Designer.cs b/IvyProbeConsole/Properties/Settings.Designer.cs index 4d05e34..11b290c 100644 --- a/IvyProbeConsole/Properties/Settings.Designer.cs +++ b/IvyProbeConsole/Properties/Settings.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:2.0.50727.42 +// Ce code a été généré par un outil. +// Version du runtime :2.0.50727.1433 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si +// le code est régénéré. // //------------------------------------------------------------------------------ @@ -12,7 +12,7 @@ namespace IvyProbeConsole.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "8.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/getopt/Arg.cs b/getopt/Arg.cs index 0b86cad..30705ee 100644 --- a/getopt/Arg.cs +++ b/getopt/Arg.cs @@ -10,6 +10,6 @@ namespace Gnu public char Flag; public bool TakesParameter = false; - public string Parameter = ""; + public string Parameter = string.Empty; } } diff --git a/getopt/getopt.csproj b/getopt/getopt.csproj index 3cca427..5f312f0 100644 --- a/getopt/getopt.csproj +++ b/getopt/getopt.csproj @@ -1,4 +1,4 @@ - + Local 8.0.50727 @@ -30,6 +30,7 @@ SAK SAK SAK + 2.0 bin\Debug\ diff --git a/getopt/vssver2.scc b/getopt/vssver2.scc index 66524fe..6ff394e 100644 Binary files a/getopt/vssver2.scc and b/getopt/vssver2.scc differ -- cgit v1.1