Changeset 2481 for branches/PluginInfrastructure Refactoring/HeuristicLab

Timestamp:

11/11/09 18:25:15 (15 years ago)

Author:

gkronber

Message:

Refactored class Loader in plugin infrastructure. #799

Location:

branches/PluginInfrastructure Refactoring/HeuristicLab

Files:

• HeuristicLab.csproj (modified) (3 diffs)
• MainForm.cs (modified) (7 diffs)
• SplashScreen.cs (modified) (9 diffs)

branches/PluginInfrastructure Refactoring/HeuristicLab/HeuristicLab.csproj

@@ -19 +19 @@
     </UpgradeBackupLocation>
     <RunPostBuildEvent>Always</RunPostBuildEvent>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -72 +73 @@
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Deployment" />
@@ -123 +127 @@
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\HeuristicLab.PluginInfrastructure.GUI\HeuristicLab.PluginInfrastructure.GUI.csproj">
-      <Project>{D3F92C1F-42B4-4EFB-9E73-B64FD3428ADE}</Project>
-      <Name>HeuristicLab.PluginInfrastructure.GUI</Name>
+    <ProjectReference Include="..\HeuristicLab.PluginInfrastructure.Manager\HeuristicLab.PluginInfrastructure.Manager.csproj">
+      <Project>{CA8AAD91-E8E2-41AF-96AD-2BA94BC3EF2D}</Project>
+      <Name>HeuristicLab.PluginInfrastructure.Manager</Name>
     </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">

branches/PluginInfrastructure Refactoring/HeuristicLab/MainForm.cs

@@ -29 +29 @@
 using System.Diagnostics;
 using HeuristicLab.PluginInfrastructure;
-using HeuristicLab.PluginInfrastructure.GUI;
 using System.Threading;
+using HeuristicLab.PluginInfrastructure.Manager;
 
 namespace HeuristicLab {
@@ -38 +38 @@
     private bool abortRequested;
 
-    public MainForm() {
+    public MainForm()
+      : base() {
+      InitializeComponent();
+
       abortRequested = false;
-      SplashScreen splashScreen = new SplashScreen(1000, "Loading HeuristicLab...");
+      PluginManager pluginManager = new PluginManager(HeuristicLab.PluginInfrastructure.Properties.Settings.Default.PluginDir);
+      SplashScreen splashScreen = new SplashScreen(pluginManager, 1000, "Loading HeuristicLab...");
       splashScreen.Owner = this;
       splashScreen.Show();
@@ -47 +51 @@
       this.Enabled = false;
 
-      PluginManager.Manager.Action += new PluginManagerActionEventHandler(splashScreen.Manager_Action);
-      PluginManager.Manager.Initialize();
+      pluginManager.Initialize();
 
-      InitializeComponent();
-
-      RefreshApplicationsList();
-
-      this.Enabled = true;
-      this.Visible = true;
-    }
-
-    private void RefreshApplicationsList() {
       applicationsListView.Items.Clear();
 
@@ -69 +63 @@
       applicationsListView.Items.Add(pluginManagerListViewItem);
 
-      foreach (ApplicationInfo info in PluginManager.Manager.InstalledApplications) {
+      foreach (ApplicationDescription info in pluginManager.Applications) {
         ListViewItem item = new ListViewItem(info.Name, 0);
         item.Tag = info;
@@ -78 +72 @@
         applicationsListView.Items.Add(item);
       }
+
+
+      this.Enabled = true;
+      this.Visible = true;
     }
 
@@ -89 +87 @@
             this.Visible = false;
             form.ShowDialog(this);
-            RefreshApplicationsList();
+            // RefreshApplicationsList();
             this.Visible = true;
           }
@@ -96 +94 @@
           }
         } else {
-          ApplicationInfo app = (ApplicationInfo)applicationsListView.SelectedItems[0].Tag;
+          ApplicationDescription app = (ApplicationDescription)applicationsListView.SelectedItems[0].Tag;
           SplashScreen splashScreen = new SplashScreen(2000, "Loading " + app.Name);
           splashScreen.Owner = this;

branches/PluginInfrastructure Refactoring/HeuristicLab/SplashScreen.cs

@@ -27 +27 @@
 using System.Reflection;
 using HeuristicLab.PluginInfrastructure;
+using HeuristicLab.PluginInfrastructure.Manager;
 
 namespace HeuristicLab {
@@ -35 +36 @@
     private object bigLock = new object();
     private bool closing = false;
+    private PluginManager manager;
 
     public SplashScreen() {
       InitializeComponent();
+    }
 
+    public SplashScreen(PluginManager manager, int initialInterval, string initialText)
+      : this() {
+      this.initialInterval = initialInterval;
+      infoLabel.Text = initialText;
+      this.manager = manager;
+      manager.Action += new PluginManagerActionEventHandler(Manager_Action);
       Assembly assembly = this.GetType().Assembly;
       object[] attributes = assembly.GetCustomAttributes(false);
@@ -47 +56 @@
       infoLabel.Text = "";
 
-      foreach(object obj in attributes) {
-        if(obj is AssemblyCopyrightAttribute) {
+      foreach (object obj in attributes) {
+        if (obj is AssemblyCopyrightAttribute) {
           copyrightLabel.Text = "Copyright " + ((AssemblyCopyrightAttribute)obj).Copyright;
         }
@@ -57 +66 @@
         company = HeuristicLab.Properties.Settings.Default.Organization;
 
-        if((user == null) || (user.Equals(""))) {
+        if ((user == null) || (user.Equals(""))) {
           userNameLabel.Text = "-";
         } else {
@@ -63 +72 @@
         }
 
-        if((company == null) || (company.Equals(""))) {
+        if ((company == null) || (company.Equals(""))) {
           companyLabel.Text = "-";
         } else {
           companyLabel.Text = company;
         }
-      } catch(Exception) {
+      }
+      catch (Exception) {
         userNameLabel.Text = "-";
         companyLabel.Text = "-";
       }
-    }
-
-    public SplashScreen(int initialInterval, string initialText)
-      : this() {
-      this.initialInterval = initialInterval;
-      infoLabel.Text = initialText;
     }
 
@@ -86 +90 @@
     public void Manager_Action(object sender, PluginManagerActionEventArgs e) {
       string info;
-      if(e.Action == PluginManagerAction.Initializing) info = "Initializing ...";
-      else if(e.Action == PluginManagerAction.InitializingPlugin) info = "Initializing Plugin " + e.Id + " ...";
-      else if(e.Action == PluginManagerAction.InitializedPlugin) info = "Initializing Plugin " + e.Id + " ... Initialized";
-      else if(e.Action == PluginManagerAction.Initialized) {
+      if (e.Action == PluginManagerAction.Initializing) info = "Initializing ...";
+      else if (e.Action == PluginManagerAction.PluginLoaded) info = "Loaded plugin " + e.Id + " ...";
+      else if (e.Action == PluginManagerAction.Initialized) {
         info = "Initialization Completed";
         fadeTimer = new System.Timers.Timer();
@@ -98 +101 @@
         fadeTimer.Start();
       } else {
-        if(e.Id != null) info = e.Action.ToString() + "   (" + e.Id + ")";
+        if (e.Id != null) info = e.Action.ToString() + "   (" + e.Id + ")";
         else info = e.Action.ToString();
       }
@@ -107 +110 @@
     private void fadeTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e) {
       fadeTimer.Stop();
-      if(InvokeRequired) {
+      if (InvokeRequired) {
         Invoke((MethodInvoker)UpdateOpacity);
       } else {
@@ -140 +143 @@
           closing = true;
           if (fadeTimer != null) fadeTimer.Stop();
-          PluginManager.Manager.Action -= new PluginManagerActionEventHandler(this.Manager_Action); // remove event before calling close
+          manager.Action -= new PluginManagerActionEventHandler(this.Manager_Action); // remove event before calling close
           Application.DoEvents(); // work up all existing events
           Close(); // close