Changeset 2504 for branches/PluginInfrastructure Refactoring/HeuristicLab.PluginInfrastructure/Starter

Timestamp:

11/18/09 18:33:30 (15 years ago)

Author:

gkronber

Message:

Worked on core of plugin infrastructure.

• Collected all classes into a single assembly (HL.PluginInfrastructure)
• Moved SplashScreen and MainForm from HeuristicLab.exe project into the plugin infrastructure.
• Introduced namespaces
• Added strict access modifiers (internal)
• Fixed most FxCop warnings in plugin infrastructure core.
• Fixed issues with plugin load/unload events
• Deleted empty interface IControl

#799

Location:

branches/PluginInfrastructure Refactoring/HeuristicLab.PluginInfrastructure/Starter

Files:

• . (added)
• MainForm.Designer.cs (moved) (moved from branches/PluginInfrastructure Refactoring/HeuristicLab/MainForm.Designer.cs) (5 diffs)
• MainForm.cs (moved) (moved from branches/PluginInfrastructure Refactoring/HeuristicLab/MainForm.cs) (3 diffs)
• MainForm.resx (moved) (moved from branches/PluginInfrastructure Refactoring/HeuristicLab/MainForm.resx)
• SplashScreen.Designer.cs (moved) (moved from branches/PluginInfrastructure Refactoring/HeuristicLab/SplashScreen.Designer.cs) (3 diffs)
• SplashScreen.cs (moved) (moved from branches/PluginInfrastructure Refactoring/HeuristicLab/SplashScreen.cs) (3 diffs)
• SplashScreen.resx (moved) (moved from branches/PluginInfrastructure Refactoring/HeuristicLab/SplashScreen.resx)

branches/PluginInfrastructure Refactoring/HeuristicLab.PluginInfrastructure/Starter/MainForm.Designer.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab {
+namespace HeuristicLab.PluginInfrastructure {
   partial class MainForm {
     /// <summary>
@@ -32 +32 @@
     /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
     protected override void Dispose(bool disposing) {
-      if(disposing && (components != null)) {
+      if (disposing && (components != null)) {
         components.Dispose();
       }
@@ -131 +131 @@
       this.detailsButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
       this.detailsButton.AutoSize = true;
-      this.detailsButton.Image = global::HeuristicLab.Properties.Resources.Details;
+      this.detailsButton.Image = HeuristicLab.PluginInfrastructure.Properties.Resources.Details;
       this.detailsButton.Location = new System.Drawing.Point(68, 511);
       this.detailsButton.Name = "detailsButton";
@@ -144 +144 @@
       this.listButton.AutoSize = true;
       this.listButton.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-      this.listButton.Image = global::HeuristicLab.Properties.Resources.List;
+      this.listButton.Image = HeuristicLab.PluginInfrastructure.Properties.Resources.List;
       this.listButton.Location = new System.Drawing.Point(40, 511);
       this.listButton.Name = "listButton";
@@ -157 +157 @@
       this.largeIconsButton.AutoSize = true;
       this.largeIconsButton.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-      this.largeIconsButton.Image = global::HeuristicLab.Properties.Resources.LargeIcons;
+      this.largeIconsButton.Image = HeuristicLab.PluginInfrastructure.Properties.Resources.LargeIcons;
       this.largeIconsButton.Location = new System.Drawing.Point(12, 511);
       this.largeIconsButton.Name = "largeIconsButton";

branches/PluginInfrastructure Refactoring/HeuristicLab.PluginInfrastructure/Starter/MainForm.cs

@@ -33 +33 @@
 using System.IO;
 
-namespace HeuristicLab {
+namespace HeuristicLab.PluginInfrastructure {
   public partial class MainForm : Form {
 
@@ -44 +44 @@
       InitializeComponent();
 
-      abortRequested = false;
       string pluginPath = Path.GetFullPath(HeuristicLab.PluginInfrastructure.Properties.Settings.Default.PluginDir);
       pluginManager = new PluginManager(pluginPath);
@@ -142 +141 @@
     }
 
-    public void ShowErrorMessageBox(Exception ex) {
-      MessageBox.Show(BuildErrorMessage(ex),
-                      "Error - " + ex.GetType().Name,
-                      MessageBoxButtons.OK,
-                      MessageBoxIcon.Error);
+    private void ShowErrorMessageBox(Exception ex) {
+      MessageBoxOptions options = RightToLeft == RightToLeft.Yes ? MessageBoxOptions.RightAlign | MessageBoxOptions.RtlReading : MessageBoxOptions.DefaultDesktopOnly;
+      MessageBox.Show(this,
+         BuildErrorMessage(ex),
+         "Error - " + ex.GetType().Name,
+         MessageBoxButtons.OK,
+         MessageBoxIcon.Error, MessageBoxDefaultButton.Button1, options);
     }
-    private string BuildErrorMessage(Exception ex) {
+    private static string BuildErrorMessage(Exception ex) {
       StringBuilder sb = new StringBuilder();
       sb.Append("Sorry, but something went wrong!\n\n" + ex.Message + "\n\n" + ex.StackTrace);

branches/PluginInfrastructure Refactoring/HeuristicLab.PluginInfrastructure/Starter/SplashScreen.Designer.cs

@@ -21 +21 @@
 
 using HeuristicLab.PluginInfrastructure;
-namespace HeuristicLab {
+namespace HeuristicLab.PluginInfrastructure {
   partial class SplashScreen {
     /// <summary>
@@ -39 +39 @@
       base.Dispose(disposing);
     }
-    
+
 
     #region Windows Form Designer generated code
@@ -191 +191 @@
       this.pictureBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
                   | System.Windows.Forms.AnchorStyles.Left)));
-      this.pictureBox.Image = global::HeuristicLab.Properties.Resources.Logo_white;
+      this.pictureBox.Image = global::HeuristicLab.PluginInfrastructure.Properties.Resources.Logo_white;
       this.pictureBox.Location = new System.Drawing.Point(-1, -1);
       this.pictureBox.Name = "pictureBox";

branches/PluginInfrastructure Refactoring/HeuristicLab.PluginInfrastructure/Starter/SplashScreen.cs

@@ -29 +29 @@
 using HeuristicLab.PluginInfrastructure.Manager;
 
-namespace HeuristicLab {
-  public partial class SplashScreen : Form {
+namespace HeuristicLab.PluginInfrastructure {
+  internal partial class SplashScreen : Form {
     private const int FADE_INTERVAL = 50;
     private System.Timers.Timer fadeTimer;
     private int initialInterval;
     private object bigLock = new object();
-    private bool closing = false;
+    private bool closing;
     private PluginManager manager;
 
-    public SplashScreen() {
+    internal SplashScreen() {
       InitializeComponent();
     }
 
-    public SplashScreen(PluginManager manager, int initialInterval, string initialText)
+    internal SplashScreen(PluginManager manager, int initialInterval, string initialText)
       : this() {
       this.initialInterval = initialInterval;
@@ -57 +57 @@
 
       foreach (object obj in attributes) {
-        if (obj is AssemblyCopyrightAttribute) {
-          copyrightLabel.Text = "Copyright " + ((AssemblyCopyrightAttribute)obj).Copyright;
+        var attr = obj as AssemblyCopyrightAttribute;
+        if (attr != null) {
+          copyrightLabel.Text = "Copyright " + attr.Copyright;
         }
       }
 
-      try {
-        user = HeuristicLab.Properties.Settings.Default.User;
-        company = HeuristicLab.Properties.Settings.Default.Organization;
+      user = HeuristicLab.PluginInfrastructure.Properties.Settings.Default.User;
+      company = HeuristicLab.PluginInfrastructure.Properties.Settings.Default.Organization;
 
-        if ((user == null) || (user.Equals(""))) {
-          userNameLabel.Text = "-";
-        } else {
-          userNameLabel.Text = user;
-        }
+      if (string.IsNullOrEmpty(user)) {
+        userNameLabel.Text = "-";
+      } else {
+        userNameLabel.Text = user;
+      }
 
-        if ((company == null) || (company.Equals(""))) {
-          companyLabel.Text = "-";
-        } else {
-          companyLabel.Text = company;
-        }
-      }
-      catch (Exception) {
-        userNameLabel.Text = "-";
+      if (string.IsNullOrEmpty(company)) {
         companyLabel.Text = "-";
+      } else {
+        companyLabel.Text = company;
       }
     }
@@ -88 +83 @@
     }
 
-    public void managerActionEventHandler(object sender, PluginInfrastructureEventArgs e) {
+    private void managerActionEventHandler(object sender, PluginInfrastructureEventArgs e) {
       string info = e.Action + ": " + e.Entity;
       //if (e.Action == PluginManagerAction.Initializing) info = "Initializing ...";