Changeset 4342 for branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3

Timestamp:

08/30/10 13:47:43 (14 years ago)

Author:

cneumuel

Message:

added connection setup dialog

Location:

branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3

Files:

• HiveSlaveConsole.cs (modified) (1 diff)
• Service References/SlaveConsoleService/Reference.cs (modified) (4 diffs)
• Service References/SlaveConsoleService/service.wsdl (modified) (3 diffs)
• Service References/SlaveConsoleService/service.xsd (modified) (1 diff)

branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/HiveSlaveConsole.cs

@@ -549 +549 @@
 
     private void btnDisconnect_Click(object sender, EventArgs e) {
-      slaveCommunicator.DisconnectAsync();
+      //slaveCommunicator.DisconnectAsync(); // [chn] todo
     }
 

branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/Service References/SlaveConsoleService/Reference.cs

@@ -346 +346 @@
         void EndSetConnection(System.IAsyncResult result);
         
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISlaveConsoleCommunicator/Disconnect", ReplyAction="http://tempuri.org/ISlaveConsoleCommunicator/DisconnectResponse")]
-        void Disconnect();
-        
-        [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/ISlaveConsoleCommunicator/Disconnect", ReplyAction="http://tempuri.org/ISlaveConsoleCommunicator/DisconnectResponse")]
-        System.IAsyncResult BeginDisconnect(System.AsyncCallback callback, object asyncState);
-        
-        void EndDisconnect(System.IAsyncResult result);
-        
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISlaveConsoleCommunicator/GetCurrentConnection", ReplyAction="http://tempuri.org/ISlaveConsoleCommunicator/GetCurrentConnectionResponse")]
         HeuristicLab.Hive.Slave.Console.SlaveConsoleService.ConnectionContainer GetCurrentConnection();
@@ -464 +456 @@
         private System.Threading.SendOrPostCallback onSetConnectionCompletedDelegate;
         
-        private BeginOperationDelegate onBeginDisconnectDelegate;
-        
-        private EndOperationDelegate onEndDisconnectDelegate;
-        
-        private System.Threading.SendOrPostCallback onDisconnectCompletedDelegate;
-        
         private BeginOperationDelegate onBeginGetCurrentConnectionDelegate;
         
@@ -516 +502 @@
         
         public event System.EventHandler<System.ComponentModel.AsyncCompletedEventArgs> SetConnectionCompleted;
-        
-        public event System.EventHandler<System.ComponentModel.AsyncCompletedEventArgs> DisconnectCompleted;
         
         public event System.EventHandler<GetCurrentConnectionCompletedEventArgs> GetCurrentConnectionCompleted;
@@ -624 +608 @@
         }
         
-        public void Disconnect() {
-            base.Channel.Disconnect();
-        }
-        
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-        public System.IAsyncResult BeginDisconnect(System.AsyncCallback callback, object asyncState) {
-            return base.Channel.BeginDisconnect(callback, asyncState);
-        }
-        
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-        public void EndDisconnect(System.IAsyncResult result) {
-            base.Channel.EndDisconnect(result);
-        }
-        
-        private System.IAsyncResult OnBeginDisconnect(object[] inValues, System.AsyncCallback callback, object asyncState) {
-            return this.BeginDisconnect(callback, asyncState);
-        }
-        
-        private object[] OnEndDisconnect(System.IAsyncResult result) {
-            this.EndDisconnect(result);
-            return null;
-        }
-        
-        private void OnDisconnectCompleted(object state) {
-            if ((this.DisconnectCompleted != null)) {
-                InvokeAsyncCompletedEventArgs e = ((InvokeAsyncCompletedEventArgs)(state));
-                this.DisconnectCompleted(this, new System.ComponentModel.AsyncCompletedEventArgs(e.Error, e.Cancelled, e.UserState));
-            }
-        }
-        
-        public void DisconnectAsync() {
-            this.DisconnectAsync(null);
-        }
-        
-        public void DisconnectAsync(object userState) {
-            if ((this.onBeginDisconnectDelegate == null)) {
-                this.onBeginDisconnectDelegate = new BeginOperationDelegate(this.OnBeginDisconnect);
-            }
-            if ((this.onEndDisconnectDelegate == null)) {
-                this.onEndDisconnectDelegate = new EndOperationDelegate(this.OnEndDisconnect);
-            }
-            if ((this.onDisconnectCompletedDelegate == null)) {
-                this.onDisconnectCompletedDelegate = new System.Threading.SendOrPostCallback(this.OnDisconnectCompleted);
-            }
-            base.InvokeAsync(this.onBeginDisconnectDelegate, null, this.onEndDisconnectDelegate, this.onDisconnectCompletedDelegate, userState);
-        }
-        
         public HeuristicLab.Hive.Slave.Console.SlaveConsoleService.ConnectionContainer GetCurrentConnection() {
             return base.Channel.GetCurrentConnection();

branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/Service References/SlaveConsoleService/service.wsdl

@@ -33 +33 @@
     <wsdl:part name="parameters" element="tns:SetConnectionResponse" />
   </wsdl:message>
-  <wsdl:message name="ISlaveConsoleCommunicator_Disconnect_InputMessage">
-    <wsdl:part name="parameters" element="tns:Disconnect" />
-  </wsdl:message>
-  <wsdl:message name="ISlaveConsoleCommunicator_Disconnect_OutputMessage">
-    <wsdl:part name="parameters" element="tns:DisconnectResponse" />
-  </wsdl:message>
   <wsdl:message name="ISlaveConsoleCommunicator_GetCurrentConnection_InputMessage">
     <wsdl:part name="parameters" element="tns:GetCurrentConnection" />
@@ -72 +66 @@
       <wsdl:output wsaw:Action="http://tempuri.org/ISlaveConsoleCommunicator/SetConnectionResponse" message="tns:ISlaveConsoleCommunicator_SetConnection_OutputMessage" />
     </wsdl:operation>
-    <wsdl:operation name="Disconnect">
-      <wsdl:input wsaw:Action="http://tempuri.org/ISlaveConsoleCommunicator/Disconnect" message="tns:ISlaveConsoleCommunicator_Disconnect_InputMessage" />
-      <wsdl:output wsaw:Action="http://tempuri.org/ISlaveConsoleCommunicator/DisconnectResponse" message="tns:ISlaveConsoleCommunicator_Disconnect_OutputMessage" />
-    </wsdl:operation>
     <wsdl:operation name="GetCurrentConnection">
       <wsdl:input wsaw:Action="http://tempuri.org/ISlaveConsoleCommunicator/GetCurrentConnection" message="tns:ISlaveConsoleCommunicator_GetCurrentConnection_InputMessage" />
@@ -108 +98 @@
     <wsdl:operation name="SetConnection">
       <soap12:operation soapAction="http://tempuri.org/ISlaveConsoleCommunicator/SetConnection" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="Disconnect">
-      <soap12:operation soapAction="http://tempuri.org/ISlaveConsoleCommunicator/Disconnect" style="document" />
       <wsdl:input>
         <soap12:body use="literal" />

branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/Service References/SlaveConsoleService/service.xsd

@@ -23 +23 @@
   </xs:element>
   <xs:element name="SetConnectionResponse">
-    <xs:complexType>
-      <xs:sequence />
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Disconnect">
-    <xs:complexType>
-      <xs:sequence />
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="DisconnectResponse">
     <xs:complexType>
       <xs:sequence />