Changeset 8076 for trunk

Timestamp:

06/21/12 13:42:34 (12 years ago)

Author:

ascheibe

Message:

#1648 fetch user and client information when the optimizer starts

Location:

trunk/sources

Files:

• HeuristicLab.Clients.Access.Views/3.3/UserViews/UserInformationDialog.cs (modified) (2 diffs)
• HeuristicLab.Clients.Access/3.3/ClientInformation.cs (modified) (4 diffs)
• HeuristicLab.Clients.Access/3.3/UserInformation.cs (modified) (4 diffs)
• HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/Plugin.cs.frame (modified) (3 diffs)

trunk/sources/HeuristicLab.Clients.Access.Views/3.3/UserViews/UserInformationDialog.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Windows.Forms;
 
@@ -37 +38 @@
     }
 
-    void Instance_Refreshed(object sender, System.EventArgs e) {
-      closeButton.Enabled = true;
+    void Instance_Refreshed(object sender, EventArgs e) {
+      if (this.InvokeRequired)
+        this.Invoke(new Action<object, EventArgs>(Instance_Refreshed), sender, e);
+      else
+        closeButton.Enabled = true;
     }
 
-    void Instance_Refreshing(object sender, System.EventArgs e) {
-      closeButton.Enabled = false;
+    void Instance_Refreshing(object sender, EventArgs e) {
+      if (this.InvokeRequired)
+        this.Invoke(new Action<object, EventArgs>(Instance_Refreshing), sender, e);
+      else
+        closeButton.Enabled = false;
     }
 

trunk/sources/HeuristicLab.Clients.Access/3.3/ClientInformation.cs

@@ -22 +22 @@
 using System;
 using System.ServiceModel.Security;
+using System.Threading.Tasks;
 
 namespace HeuristicLab.Clients.Access {
@@ -28 +29 @@
     public static ClientInformation Instance {
       get {
-        if (instance == null) instance = new ClientInformation();
+        InitializeClientInformation();
         return instance;
       }
@@ -54 +55 @@
 
     private ClientInformation() {
-      if (ClientInformationUtils.IsClientHeuristicLab()) {
-        FetchClientInformationFromServer();
-      } else {
-        // this means we are executed by an Hive slave, therefore we just get our machine id (e.g. for OKB Algs)
-        // because the slave has already done the registration process
-        GenerateLocalClientConfig();
+      if (instance == null) {
+        if (ClientInformationUtils.IsClientHeuristicLab()) {
+          FetchClientInformationFromServer();
+        } else {
+          // this means we are executed by an Hive slave, therefore we just get our machine id (e.g. for OKB Algs)
+          // because the slave has already done the registration process
+          GenerateLocalClientConfig();
+        }
       }
     }
@@ -100 +103 @@
       FetchClientInformationFromServer();
     }
+
+    private static void InitializeClientInformation() {
+      if (instance == null) instance = new ClientInformation();
+    }
+
+    public static void InitializeAsync() {
+      Task.Factory.StartNew(InitializeClientInformation);
+    }
   }
 }

trunk/sources/HeuristicLab.Clients.Access/3.3/UserInformation.cs

@@ -22 +22 @@
 using System;
 using System.ServiceModel.Security;
+using System.Threading.Tasks;
 
 namespace HeuristicLab.Clients.Access {
@@ -30 +31 @@
     public static UserInformation Instance {
       get {
-        if (instance == null) instance = new UserInformation();
+        InitializeUserInformation();
         return instance;
       }
@@ -61 +62 @@
 
     private UserInformation() {
-      //this blocks, so there should be anywhere in the Optimizer startup process
-      //a call to FetchUserInformationFromServerAsync which is non-blocking
-      FetchUserInformationFromServer();
+      if (instance == null) {
+        FetchUserInformationFromServer();
+      }
     }
-
 
     private void FetchUserInformationFromServer() {
@@ -92 +92 @@
       FetchUserInformationFromServer();
     }
+
+    private static void InitializeUserInformation() {
+      if (instance == null) instance = new UserInformation();
+    }
+
+    public static void InitializeAsync() {
+      Task.Factory.StartNew(InitializeUserInformation);
+    }
   }
 }

trunk/sources/HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj

@@ -215 +215 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Clients.Access\3.3\HeuristicLab.Clients.Access-3.3.csproj">
+      <Project>{494F87F4-0F25-4D33-A382-10CDB2174D48}</Project>
+      <Name>HeuristicLab.Clients.Access-3.3</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Clients.Common\3.3\HeuristicLab.Clients.Common-3.3.csproj">
       <Project>{730A9104-D4D1-4360-966B-E49B7571DDA3}</Project>

trunk/sources/HeuristicLab.Optimizer/3.3/Plugin.cs.frame

@@ -21 +21 @@
 
 using System.Windows.Forms;
+using HeuristicLab.Clients.Access;
 using HeuristicLab.Optimizer.Properties;
 using HeuristicLab.PluginInfrastructure;
@@ -41 +42 @@
   [PluginDependency("HeuristicLab.Persistence", "3.3")]
   [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
+  [PluginDependency("HeuristicLab.Clients.Access", "3.3")]
   public class HeuristicLabOptimizerPlugin : PluginBase {
   }
@@ -58 +60 @@
 
       if (mainForm != null) {
+        ClientInformation.InitializeAsync();
+        UserInformation.InitializeAsync();
+
         mainForm.ShowContentInViewHost = true;
         Application.Run(mainForm);