Changeset 16102


Ignore:
Timestamp:
08/30/18 09:47:50 (12 months ago)
Author:
abeham
Message:

#2213: some pending changes exploring the topic

Location:
branches/2213_irace
Files:
13 added
5 edited

Legend:

Unmodified
Added
Removed
  • branches/2213_irace/HeuristicLab.PluginInfrastructure/3.3/CommandLineArgumentHandling/CommandLineArgumentHandling.cs

    r15583 r16102  
    4343
    4444    private static ICommandLineArgument ParseArgument(string entry) {
    45       var regex = new Regex(@"^/[A-Za-z]+(:\w[\w\s]*)?$");
     45      var regex = new Regex(@"^/[A-Za-z]+(:[^/]*)?$");
    4646      bool isFile = File.Exists(entry);
    4747      if (!regex.IsMatch(entry) && !isFile) return null;
     
    5454          case StartArgument.TOKEN: return new StartArgument(value);
    5555          case HideStarterArgument.TOKEN: return new HideStarterArgument(value);
    56           default: return null;
     56          default: return new SimpleArgument(key, value);
    5757        }
    5858      } else return new OpenArgument(entry);
  • branches/2213_irace/HeuristicLab.PluginInfrastructure/3.3/HeuristicLab.PluginInfrastructure-3.3.csproj

    r11650 r16102  
    222222    <Compile Include="CommandLineArgumentHandling\Arguments\OpenArgument.cs" />
    223223    <Compile Include="CommandLineArgumentHandling\Arguments\HideStarterArgument.cs" />
     224    <Compile Include="CommandLineArgumentHandling\Arguments\SimpleArgument.cs" />
    224225    <Compile Include="CommandLineArgumentHandling\Arguments\StartArgument.cs" />
    225226    <Compile Include="CommandLineArgumentHandling\CommandLineArgument.cs" />
     
    234235    <Compile Include="BaseClasses\ApplicationBase.cs" />
    235236    <Compile Include="BaseClasses\PluginBase.cs" />
     237    <Compile Include="CrossDomainTracing.cs" />
    236238    <Compile Include="SandboxApplicationManager.cs" />
    237239    <Compile Include="DefaultApplicationManager.cs" />
  • branches/2213_irace/HeuristicLab.PluginInfrastructure/3.3/Manager/PluginManager.cs

    r15583 r16102  
    129129        applicationManager.PrepareApplicationDomain(applications, plugins);
    130130        OnApplicationStarted(new PluginInfrastructureEventArgs(appInfo));
     131        CrossDomainTracer.StartListening(applicationDomain);
    131132        applicationManager.Run(appInfo, args);
    132133      }
  • branches/2213_irace/HeuristicLab.PluginInfrastructure/3.3/Starter/SplashScreen.cs

    r15583 r16102  
    100100    private void SafeUpdateMessage(string msg) {
    101101      try {
    102         Invoke((Action<string>)UpdateMessage, msg);
    103       }
    104       catch (ObjectDisposedException) { }
     102        if (InvokeRequired) {
     103          Invoke((Action<string>)UpdateMessage, msg);
     104        } else {
     105          UpdateMessage(msg);
     106        }
     107      } catch (ObjectDisposedException) { }
    105108    }
    106109
  • branches/2213_irace/HeuristicLab.PluginInfrastructure/3.3/Starter/StarterForm.cs

    r15583 r16102  
    8888      : this() {
    8989      arguments = CommandLineArgumentHandling.GetArguments(args);
     90
     91      InitializeComponent();
     92      largeImageList.Images.Add(HeuristicLab.PluginInfrastructure.Resources.HeuristicLab.ToBitmap());
     93      largeImageList.Images.Add(HeuristicLab.PluginInfrastructure.Resources.UpdateAvailable.ToBitmap());
     94      smallImageList.Images.Add(HeuristicLab.PluginInfrastructure.Resources.HeuristicLab.ToBitmap());
     95      smallImageList.Images.Add(HeuristicLab.PluginInfrastructure.Resources.UpdateAvailable.ToBitmap());
     96      Text = "HeuristicLab " + AssemblyHelpers.GetFileVersion(GetType().Assembly);
     97
     98      string pluginPath = Path.GetFullPath(Application.StartupPath);
     99      pluginManager = new PluginManager(pluginPath);
     100      splashScreen = new SplashScreen(pluginManager, 1000);
     101      splashScreen.VisibleChanged += new EventHandler(splashScreen_VisibleChanged);
     102      if (arguments.All(x => !(x is HideStarterArgument)))
     103        splashScreen.Show(this, "Loading HeuristicLab...");
     104
     105      if (CheckSavedStarterFormSettings()) {
     106        Location = Settings.Default.StarterFormLocation;
     107        Size = Settings.Default.StarterFormSize;
     108        WindowState = Settings.Default.StarterFormWindowState;
     109      }
     110
     111      pluginManager.DiscoverAndCheckPlugins();
     112      UpdateApplicationsList();
     113
     114      CheckUpdatesAvailableAsync();
    90115    }
    91116
     
    320345
    321346    private void StartApplication(ApplicationDescription app, ICommandLineArgument[] args) {
    322       splashScreen.Show("Loading " + app.Name);
     347      if (args.All(x => !(x is HideStarterArgument)))
     348        splashScreen.Show("Loading " + app.Name);
    323349      Thread t = new Thread(delegate() {
    324350        bool stopped = false;
Note: See TracChangeset for help on using the changeset viewer.