Changeset 8818 for trunk/sources/HeuristicLab.Optimizer

Timestamp:

10/17/12 21:46:00 (12 years ago)

Author:

jkarder

Message:

#1926:

• added OpenArgument
• refactored argument handling infrastructure

Location:

trunk/sources/HeuristicLab.Optimizer/3.3

Files:

• FileManager.cs (modified) (2 diffs)
• Plugin.cs.frame (modified) (3 diffs)

trunk/sources/HeuristicLab.Optimizer/3.3/FileManager.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
@@ -59 +60 @@
 
       if (openFileDialog.ShowDialog() == DialogResult.OK) {
-        foreach (string filename in openFileDialog.FileNames) {
-          ((MainForm.WindowsForms.MainForm)MainFormManager.MainForm).SetAppStartingCursor();
-          ContentManager.LoadAsync(filename, LoadingCompleted);
-        }
+        OpenFiles(openFileDialog.FileNames);
       }
     }
+
+    public static void OpenFiles(IEnumerable<string> fileNames) {
+      foreach (string filename in fileNames) {
+        ((MainForm.WindowsForms.MainForm)MainFormManager.MainForm).SetAppStartingCursor();
+        ContentManager.LoadAsync(filename, LoadingCompleted);
+      }
+    }
+
     private static void LoadingCompleted(IStorableContent content, Exception error) {
       try {

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

@@ -20 +20 @@
 #endregion
 
+using System.Linq;
 using System.Windows.Forms;
 using HeuristicLab.Clients.Access;
@@ -48 +49 @@
   [Application("Optimizer", "HeuristicLab Optimizer 3.3.7.$WCREV$")]
   internal class HeuristicLabOptimizerApplication : ApplicationBase {
-    public override void Run() {
-     HeuristicLab.MainForm.WindowsForms.MainForm mainForm = null;
+    public override void Run(ICommandLineArgument[] args) {
+      HeuristicLab.MainForm.WindowsForms.MainForm mainForm = null;
 
       if (Settings.Default.MainFormType == OptimizerMainFormTypes.DockingMainForm) {
@@ -64 +65 @@
 
         mainForm.ShowContentInViewHost = true;
+        mainForm.Arguments = args;
+        var filesToOpen = mainForm.Arguments.OfType<OpenArgument>().Select(x => x.Value);
+        mainForm.Load += (sender, eventArgs) => FileManager.OpenFiles(filesToOpen);
         Application.Run(mainForm);
       } else {