summaryrefslogtreecommitdiff
path: root/IvyControl
diff options
context:
space:
mode:
authorfcolin2008-10-10 15:45:54 +0000
committerfcolin2008-10-10 15:45:54 +0000
commit3c9d0c18a19de1f1ec1c4e77f6b89fdf84d39605 (patch)
treeb4c691f61e44c2310887ccb77b94a519a73a7fdb /IvyControl
parent8d10e8bbd1e19adc7c70e1101dbb69c213c910dd (diff)
downloadivy-csharp-3c9d0c18a19de1f1ec1c4e77f6b89fdf84d39605.zip
ivy-csharp-3c9d0c18a19de1f1ec1c4e77f6b89fdf84d39605.tar.gz
ivy-csharp-3c9d0c18a19de1f1ec1c4e77f6b89fdf84d39605.tar.bz2
ivy-csharp-3c9d0c18a19de1f1ec1c4e77f6b89fdf84d39605.tar.xz
Ajout de commentaire sur les menbres public
Diffstat (limited to 'IvyControl')
-rw-r--r--IvyControl/IvyApplicationBindingControl.cs17
-rw-r--r--IvyControl/IvyControl.cs35
-rw-r--r--IvyControl/IvyControl.csproj27
-rw-r--r--IvyControl/IvyDomain.cs2
4 files changed, 41 insertions, 40 deletions
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<string> Arguments
+ public Collection<string> 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
}
}
-
- /// <summary>AppPriority the Application Priority: the clients list is sorted against priority</summary>
-#if (!PocketPC)
- [Category("Ivy")]
-#endif
- [DefaultValue(Ivy.DEFAULT_PRIORITY)]
- public ushort AppPriority
- {
- set
- {
- ivy.AppPriority = value;
- }
- get
- {
- return ivy.AppPriority;
- }
-
- }
///<summary>SentMessageClasses the first word token of sent messages
///<remarks> optimise the parsing process when sending messages </remarks>
@@ -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<string> SentMessageFilter
+ public Collection<string> 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);
}
/// <summary>
/// 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.
/// </remarks>
//
- public ushort BindMsg(string regexp, EventHandler<IvyMessageEventArgs> callback, params object[] args)
+ public int BindMsg(string regexp, EventHandler<IvyMessageEventArgs> callback, params object[] args)
{
return ivy.BindMsg(regexp, callback,args);
}
@@ -401,7 +384,7 @@ namespace IvyBus
/// unsubscribes a regular expression
/// </summary>
/// <param name="id">the id of the regular expression, returned when it was bound</param>
- public void UnbindMsg(ushort id)
+ public void UnbindMsg(int id)
{
ivy.UnbindMsg(id);
}
@@ -444,7 +427,7 @@ namespace IvyBus
/// </summary>
/// <param name="name">The name of the Ivy agent you're looking for</param>
/// <returns></returns>
- public List<IvyClient> GetClientsByName(string name)
+ public ReadOnlyCollection<IvyClient> 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 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -13,6 +13,11 @@
<SccLocalPath>SAK</SccLocalPath>
<SccAuxPath>SAK</SccAuxPath>
<SccProvider>SAK</SccProvider>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ <OldToolsVersion>2.0</OldToolsVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -31,6 +36,26 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <DebugSymbols>true</DebugSymbols>
+ <OutputPath>bin\x86\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DebugType>full</DebugType>
+ <PlatformTarget>x86</PlatformTarget>
+ <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
+ <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <OutputPath>bin\x86\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <Optimize>true</Optimize>
+ <DebugType>pdbonly</DebugType>
+ <PlatformTarget>x86</PlatformTarget>
+ <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
+ <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
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")]