Changeset 8818 for trunk/sources/HeuristicLab.PluginInfrastructure/3.3/Starter

Timestamp:

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

Author:

jkarder

Message:

#1926:

• added OpenArgument
• refactored argument handling infrastructure

File:

• trunk/sources/HeuristicLab.PluginInfrastructure/3.3/Starter/StarterForm.cs (modified) (7 diffs)

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/Starter/StarterForm.cs

@@ -39 +39 @@
     private const string pluginManagerItemName = "Plugin Manager";
     private const string updatePluginsItemName = "Updates Available";
+    private const string optimizerItemName = "Optimizer";
 
     private readonly ICommandLineArgument[] arguments;
@@ -84 +85 @@
 
     protected override void SetVisibleCore(bool value) {
-      value &= !arguments.OfType<HideStarterArgument>().Any();
+      value &= !(arguments.OfType<HideStarterArgument>().Any() || arguments.OfType<OpenArgument>().Any());
       if (!value) HandleArguments();
       base.SetVisibleCore(value);
@@ -144 +145 @@
         } else {
           ApplicationDescription app = (ApplicationDescription)applicationsListView.SelectedItems[0].Tag;
-          StartApplication(app);
+          StartApplication(app, arguments);
         }
       }
@@ -171 +172 @@
     private void splashScreen_VisibleChanged(object sender, EventArgs e) {
       // close hidden starter form
-      if (!splashScreen.Visible && arguments != null && arguments.OfType<HideStarterArgument>().Any())
+      if (!splashScreen.Visible && arguments != null &&
+           (arguments.OfType<HideStarterArgument>().Any() || arguments.OfType<OpenArgument>().Any()))
         Close();
     }
@@ -263 +265 @@
     private void HandleArguments() {
       try {
+        if (arguments.OfType<OpenArgument>().Any() && !arguments.OfType<StartArgument>().Any()) {
+          InitiateApplicationStart(optimizerItemName);
+        }
         foreach (var argument in arguments) {
           if (argument is StartArgument) {
-            var appDesc = (from desc in pluginManager.Applications
-                           where desc.Name.Equals(argument.Value)
-                           select desc).SingleOrDefault();
-            if (appDesc != null) {
-              StartApplication(appDesc);
-            } else {
-              MessageBox.Show("Cannot start application " + argument.Value + ".",
-                              "HeuristicLab",
-                              MessageBoxButtons.OK,
-                              MessageBoxIcon.Warning);
-            }
+            var arg = (StartArgument)argument;
+            InitiateApplicationStart(arg.Value);
           }
         }
@@ -284 +280 @@
     }
 
-    private void StartApplication(ApplicationDescription app) {
+    private void InitiateApplicationStart(string appName) {
+      var appDesc = (from desc in pluginManager.Applications
+                     where desc.Name.Equals(appName)
+                     select desc).SingleOrDefault();
+      if (appDesc != null) {
+        StartApplication(appDesc, arguments);
+      } else {
+        MessageBox.Show("Cannot start application " + appName + ".",
+                        "HeuristicLab",
+                        MessageBoxButtons.OK,
+                        MessageBoxIcon.Warning);
+      }
+    }
+
+    private void StartApplication(ApplicationDescription app, ICommandLineArgument[] args) {
       splashScreen.Show("Loading " + app.Name);
       Thread t = new Thread(delegate() {
@@ -291 +301 @@
           try {
             if (!abortRequested) {
-              pluginManager.Run(app);
+              pluginManager.Run(app, args);
             }
             stopped = true;