Changeset 6195 for branches/histogram/HeuristicLab.PluginInfrastructure/3.3/ApplicationManager.cs

Timestamp:

05/14/11 16:45:46 (13 years ago)

Author:

abeham

Message:

#1465

• updated branch with latest version of trunk

Location:

branches/histogram

Files:

• . (modified) (1 prop)
• HeuristicLab.PluginInfrastructure/3.3/ApplicationManager.cs (modified) (2 diffs)

branches/histogram/HeuristicLab.PluginInfrastructure/3.3/ApplicationManager.cs

@@ -28 +28 @@
   /// </summary>
   public static class ApplicationManager {
-    // the singleton instance is initialized to LightweightApplicationManager as long as no other application manager is registered
-    private static IApplicationManager appManager = new LightweightApplicationManager();
+    // the singleton instance is initialized to LightweightApplicationManager as long as no other application manager is registered    
+    private static IApplicationManager appManager;
+
     /// <summary>
     /// Gets the application manager singleton.
     /// </summary>
     public static IApplicationManager Manager {
-      get { return appManager; }
+      get {
+        if (appManager == null)
+          appManager = new LightweightApplicationManager();
+        return appManager;
+      }
     }
 
@@ -42 +47 @@
     /// <param name="manager"></param>
     internal static void RegisterApplicationManager(IApplicationManager manager) {
-      if (!(appManager is LightweightApplicationManager)) throw new InvalidOperationException("The application manager has already been set.");
+      if (appManager != null && !(appManager is LightweightApplicationManager)) throw new InvalidOperationException("The application manager has already been set.");
       else {
         appManager = manager;