Changeset 2488 for branches/PluginInfrastructure Refactoring/HeuristicLab

Timestamp:

11/12/09 17:45:45 (15 years ago)

Author:

gkronber

Message:

Worked on plugin infrastructure refactoring. (Fully functional revision). #799

Location:

branches/PluginInfrastructure Refactoring/HeuristicLab

Files:

• MainForm.cs (modified) (5 diffs)
• Program.cs (modified) (1 diff)

branches/PluginInfrastructure Refactoring/HeuristicLab/MainForm.cs

@@ -37 +37 @@
     private ListViewItem pluginManagerListViewItem;
     private bool abortRequested;
+    private PluginManager pluginManager;
 
     public MainForm()
@@ -43 +44 @@
 
       abortRequested = false;
-      PluginManager pluginManager = new PluginManager(HeuristicLab.PluginInfrastructure.Properties.Settings.Default.PluginDir);
+      pluginManager = new PluginManager(HeuristicLab.PluginInfrastructure.Properties.Settings.Default.PluginDir);
       SplashScreen splashScreen = new SplashScreen(pluginManager, 1000, "Loading HeuristicLab...");
       splashScreen.Owner = this;
@@ -83 +84 @@
         if (selected == pluginManagerListViewItem) {
           try {
-            Cursor = Cursors.AppStarting;
-            ManagerForm form = new ManagerForm();
-            this.Visible = false;
-            form.ShowDialog(this);
-            // RefreshApplicationsList();
-            this.Visible = true;
+            //Cursor = Cursors.AppStarting;
+            //ManagerForm form = new ManagerForm();
+            //this.Visible = false;
+            //form.ShowDialog(this);
+            //// RefreshApplicationsList();
+            //this.Visible = true;
           }
           finally {
@@ -95 +96 @@
         } else {
           ApplicationDescription app = (ApplicationDescription)applicationsListView.SelectedItems[0].Tag;
-          SplashScreen splashScreen = new SplashScreen(2000, "Loading " + app.Name);
+          SplashScreen splashScreen = new SplashScreen(pluginManager, 2000, "Loading " + app.Name);
           splashScreen.Owner = this;
           splashScreen.Show();
-          PluginManager.Manager.Action += new PluginManagerActionEventHandler(splashScreen.Manager_Action);
           Thread t = new Thread(delegate() {
             bool stopped = false;
@@ -104 +104 @@
               try {
                 if (!abortRequested)
-                  PluginManager.Manager.Run(app);
+                  pluginManager.Run(app);
                 stopped = true;
               }

branches/PluginInfrastructure Refactoring/HeuristicLab/Program.cs

@@ -38 +38 @@
           Application.Run(new MainForm());
         } else if (args.Length == 1) {  // start specific application
-          PluginManager.Manager.Initialize();
+          //PluginManager.Manager.Initialize();
 
-          ApplicationInfo app = null;
-          foreach (ApplicationInfo info in PluginManager.Manager.InstalledApplications) {
-            if (info.Name == args[0])
-              app = info;
-          }
-          if (app == null) {  // application not found
-            MessageBox.Show("Cannot start application.\nApplication " + args[0] + " is not installed.\n\nStarting HeuristicLab in normal mode ...",
-                            "HeuristicLab",
-                            MessageBoxButtons.OK,
-                            MessageBoxIcon.Warning);
-            Application.EnableVisualStyles();
-            Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(new MainForm());
-          } else {
-            PluginManager.Manager.Run(app);
-          }
+          //ApplicationInfo app = null;
+          //foreach (ApplicationInfo info in PluginManager.Manager.InstalledApplications) {
+          //  if (info.Name == args[0])
+          //    app = info;
+          //}
+          //if (app == null) {  // application not found
+          //  MessageBox.Show("Cannot start application.\nApplication " + args[0] + " is not installed.\n\nStarting HeuristicLab in normal mode ...",
+          //                  "HeuristicLab",
+          //                  MessageBoxButtons.OK,
+          //                  MessageBoxIcon.Warning);
+          //  Application.EnableVisualStyles();
+          //  Application.SetCompatibleTextRenderingDefault(false);
+          //  Application.Run(new MainForm());
+          //} else {
+          //  PluginManager.Manager.Run(app);
+          //}
         }
       }