Changeset 5706 for trunk/sources/HeuristicLab.Clients.Common

Timestamp:

03/16/11 13:27:30 (13 years ago)

Author:

cneumuel

Message:

#1298

• removed Disposable

Location:

trunk/sources/HeuristicLab.Clients.Common/3.3

Files:

• ClientFactory.cs (modified) (2 diffs)
• Disposable.cs (deleted)
• HeuristicLab.Clients.Common-3.3.csproj (modified) (2 diffs)

trunk/sources/HeuristicLab.Clients.Common/3.3/ClientFactory.cs

@@ -24 +24 @@
 using System.ServiceModel.Description;
 using HeuristicLab.Clients.Common.Properties;
-using HeuristicLab.Common;
 
 namespace HeuristicLab.Clients.Common {
@@ -66 +65 @@
 
     #region CreateChannelFactory Methods
-    public static Disposable<ChannelFactory<I>> CreateChannelFactory<I>(string endpointConfigurationName)
+    public static ChannelFactory<I> CreateChannelFactory<I>(string endpointConfigurationName)
       where I : class {
       return CreateChannelFactory<I>(endpointConfigurationName, null);
     }
-    public static Disposable<ChannelFactory<I>> CreateChannelFactory<I>(string endpointConfigurationName, string remoteAddress)
+    public static ChannelFactory<I> CreateChannelFactory<I>(string endpointConfigurationName, string remoteAddress)
       where I : class {
       return CreateChannelFactory<I>(endpointConfigurationName, remoteAddress, Settings.Default.UserName, Settings.Default.Password);
     }
-    public static Disposable<ChannelFactory<I>> CreateChannelFactory<I>(string endpointConfigurationName, string remoteAddress, string userName, string password)
+    public static ChannelFactory<I> CreateChannelFactory<I>(string endpointConfigurationName, string remoteAddress, string userName, string password)
       where I : class {
       ChannelFactory<I> channelFactory = new ChannelFactory<I>(endpointConfigurationName);
-      channelFactory.Credentials.UserName.UserName = userName;
-      channelFactory.Credentials.UserName.Password = password;
-      channelFactory.Credentials.ServiceCertificate.Authentication.CertificateValidationMode = System.ServiceModel.Security.X509CertificateValidationMode.None;
-
       if (!string.IsNullOrEmpty(remoteAddress)) {
         SetEndpointAddress(channelFactory.Endpoint, remoteAddress);
       }
 
-      Disposable<ChannelFactory<I>> disposableChannelFactory = new Disposable<ChannelFactory<I>>(channelFactory);
-      disposableChannelFactory.OnDisposing += new EventHandler<EventArgs<object>>(DisposableChannelFactory_OnDisposing);
-      return disposableChannelFactory;
-    }
-
-    private static void DisposableChannelFactory_OnDisposing(object sender, EventArgs<object> e) {
-      DisposeCommunicationObject((ICommunicationObject)e.Value);
-      ((Disposable)sender).OnDisposing -= new EventHandler<EventArgs<object>>(DisposableChannelFactory_OnDisposing);
+      channelFactory.Credentials.UserName.UserName = userName;
+      channelFactory.Credentials.UserName.Password = password;
+      channelFactory.Credentials.ServiceCertificate.Authentication.CertificateValidationMode = System.ServiceModel.Security.X509CertificateValidationMode.None;
+      return channelFactory;
     }
     #endregion
-
-    public static void DisposeCommunicationObject(ICommunicationObject obj) {
-      if (obj != null) {
-        if (obj.State != CommunicationState.Faulted && obj.State != CommunicationState.Closed) {
-          try { obj.Close(); }
-          catch { obj.Abort(); }
-        } else {
-          obj.Abort();
-        }
-      }
-    }
 
     #region Helpers

trunk/sources/HeuristicLab.Clients.Common/3.3/HeuristicLab.Clients.Common-3.3.csproj

@@ -12 +12 @@
     <AssemblyName>HeuristicLab.Clients.Common-3.3</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile></TargetFrameworkProfile>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
@@ -116 +117 @@
   <ItemGroup>
     <Compile Include="ClientFactory.cs" />
-    <Compile Include="Disposable.cs" />
     <Compile Include="HeuristicLabClientsCommonPlugin.cs" />
     <Compile Include="PasswordDialog.cs">