Changeset 8818

Timestamp:

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

Author:

jkarder

Message:

#1926:

• added OpenArgument
• refactored argument handling infrastructure

Location:

trunk/sources

Files:

• HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.3/Interfaces/IMainForm.cs (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/FileManager.cs (modified) (2 diffs)
• HeuristicLab.Optimizer/3.3/Plugin.cs.frame (modified) (3 diffs)
• HeuristicLab.Persistence.GUI/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.PluginInfrastructure/3.3/BaseClasses/ApplicationBase.cs (modified) (1 diff)
• HeuristicLab.PluginInfrastructure/3.3/CommandLineArgumentHandling/Arguments/HideStarterArgument.cs (modified) (1 diff)
• HeuristicLab.PluginInfrastructure/3.3/CommandLineArgumentHandling/Arguments/OpenArgument.cs (added)
• HeuristicLab.PluginInfrastructure/3.3/CommandLineArgumentHandling/Arguments/StartArgument.cs (modified) (1 diff)
• HeuristicLab.PluginInfrastructure/3.3/CommandLineArgumentHandling/CommandLineArgument.cs (modified) (1 diff)
• HeuristicLab.PluginInfrastructure/3.3/CommandLineArgumentHandling/CommandLineArgumentHandling.cs (modified) (2 diffs)
• HeuristicLab.PluginInfrastructure/3.3/HeuristicLab.PluginInfrastructure-3.3.csproj (modified) (1 diff)
• HeuristicLab.PluginInfrastructure/3.3/Interfaces/IApplication.cs (modified) (1 diff)
• HeuristicLab.PluginInfrastructure/3.3/Manager/PluginManager.cs (modified) (2 diffs)
• HeuristicLab.PluginInfrastructure/3.3/SandboxApplicationManager.cs (modified) (1 diff)
• HeuristicLab.PluginInfrastructure/3.3/Starter/StarterForm.cs (modified) (7 diffs)

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.cs

@@ -68 +68 @@
     }
 
+    private IEnumerable<ICommandLineArgument> arguments;
+    public IEnumerable<ICommandLineArgument> Arguments {
+      get { return arguments; }
+      set {
+        if (arguments == null) arguments = value;
+        else throw new InvalidOperationException("Arguments can only be set once and were already set.");
+      }
+    }
+
     public override Cursor Cursor {
       get { return base.Cursor; }

trunk/sources/HeuristicLab.MainForm/3.3/Interfaces/IMainForm.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using HeuristicLab.Common;
+using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.MainForm {
   public interface IMainForm {
     string Title { get; set; }
+    IEnumerable<ICommandLineArgument> Arguments { get; set; }
 
     IView ActiveView { get; }

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 {

trunk/sources/HeuristicLab.Persistence.GUI/3.3/Plugin.cs.frame

@@ -13 +13 @@
   [Application("Persistence Configuration", "Configure type mappings of persistence")]
   public class HeuristicLabPersistenceGUIApplication : ApplicationBase {
-    public override void Run() {
+    public override void Run(ICommandLineArgument[] args) {
       Application.EnableVisualStyles();
       Application.SetCompatibleTextRenderingDefault(false);

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/BaseClasses/ApplicationBase.cs

@@ -67 +67 @@
     /// Runs the application.
     /// </summary>
-    public abstract void Run();
+    public abstract void Run(ICommandLineArgument[] args);
 
     #endregion

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/CommandLineArgumentHandling/Arguments/HideStarterArgument.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+
 namespace HeuristicLab.PluginInfrastructure {
+  [Serializable]
   public class HideStarterArgument : CommandLineArgument<bool> {
     public const string TOKEN = "hideStarter";

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/CommandLineArgumentHandling/Arguments/StartArgument.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+
 namespace HeuristicLab.PluginInfrastructure {
+  [Serializable]
   public class StartArgument : CommandLineArgument<string> {
     public const string TOKEN = "start";

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/CommandLineArgumentHandling/CommandLineArgument.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+
 namespace HeuristicLab.PluginInfrastructure {
+  [Serializable]
   public abstract class CommandLineArgument<T> : ICommandLineArgument<T> {
     object ICommandLineArgument.Value { get { return Value; } }

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/CommandLineArgumentHandling/CommandLineArgumentHandling.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
@@ -43 +44 @@
     private static ICommandLineArgument ParseArgument(string entry) {
       var regex = new Regex(@"^/[A-Za-z]+(:[A-Za-z0-9\s]+)?$");
-      if (!regex.IsMatch(entry)) return null;
-      entry = entry.Remove(0, 1);
-      var parts = entry.Split(':');
-      string key = parts[0].Trim();
-      string value = parts.Length == 2 ? parts[1].Trim() : string.Empty;
-      switch (key) {
-        case StartArgument.TOKEN: return new StartArgument(value);
-        case HideStarterArgument.TOKEN: return new HideStarterArgument(value);
-        default: return null;
-      }
+      bool isFile = File.Exists(entry);
+      if (!regex.IsMatch(entry) && !isFile) return null;
+      if (!isFile) {
+        entry = entry.Remove(0, 1);
+        var parts = entry.Split(':');
+        string key = parts[0].Trim();
+        string value = parts.Length == 2 ? parts[1].Trim() : string.Empty;
+        switch (key) {
+          case StartArgument.TOKEN: return new StartArgument(value);
+          case HideStarterArgument.TOKEN: return new HideStarterArgument(value);
+          default: return null;
+        }
+      } else return new OpenArgument(entry);
     }
   }

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

@@ -215 +215 @@
       <DependentUpon>PluginView.cs</DependentUpon>
     </Compile>
+    <Compile Include="CommandLineArgumentHandling\Arguments\OpenArgument.cs" />
     <Compile Include="CommandLineArgumentHandling\Arguments\HideStarterArgument.cs" />
     <Compile Include="CommandLineArgumentHandling\Arguments\StartArgument.cs" />

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/Interfaces/IApplication.cs

@@ -37 +37 @@
     /// Main entry point for the application.
     /// </summary>
-    void Run();
+    void Run(ICommandLineArgument[] args);
   }
 }

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/Manager/PluginManager.cs

@@ -110 +110 @@
     /// </summary>
     /// <param name="appInfo">application to run</param>
-    public void Run(ApplicationDescription appInfo) {
+    public void Run(ApplicationDescription appInfo, ICommandLineArgument[] args) {
       if (!initialized) throw new InvalidOperationException("PluginManager is not initialized. DiscoverAndCheckPlugins() must be called before Run()");
       // create a separate AppDomain for the application
@@ -129 +129 @@
         applicationManager.PrepareApplicationDomain(applications, plugins);
         OnApplicationStarted(new PluginInfrastructureEventArgs(appInfo));
-        applicationManager.Run(appInfo);
+        applicationManager.Run(appInfo, args);
       }
       finally {

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/SandboxApplicationManager.cs

@@ -115 +115 @@
     /// </summary>
     /// <param name="appInfo">Description of the application to run</param>
-    internal void Run(ApplicationDescription appInfo) {
+    internal void Run(ApplicationDescription appInfo, ICommandLineArgument[] args) {
       IApplication runnablePlugin = (IApplication)Activator.CreateInstance(appInfo.DeclaringAssemblyName, appInfo.DeclaringTypeName).Unwrap();
       try {
-        runnablePlugin.Run();
+        runnablePlugin.Run(args);
       }
       finally {

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;