Changeset 4527 for trunk/sources/HeuristicLab.PluginInfrastructure/3.3/Advanced

Timestamp:

09/27/10 18:29:30 (14 years ago)

Author:

gkronber

Message:

Fixed #1216 via Invoke() call.

Location:

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/Advanced

Files:

• AvailablePluginsView.cs (modified) (1 diff)
• BasicUpdateView.cs (modified) (1 diff)
• InstallationManagerForm.cs (modified) (3 diffs)
• InstalledPluginsView.cs (modified) (1 diff)

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/Advanced/AvailablePluginsView.cs

@@ -311 +311 @@
     }
 
+    // compares for two plugins with same major and minor version if plugin1 is newer than plugin2
     private static bool IsNewerThan(IPluginDescription plugin1, IPluginDescription plugin2) {
       // newer: build version is higher, or if build version is the same revision is higher
-      if (plugin1.Version.Build < plugin2.Version.Build) return false;
-      else if (plugin1.Version.Build > plugin2.Version.Build) return true;
-      else return plugin1.Version.Revision > plugin2.Version.Revision;
+      return plugin1.Version.Build > plugin2.Version.Build ||
+        (plugin1.Version.Build == plugin2.Version.Build && plugin1.Version.Revision > plugin2.Version.Revision);
     }
     #endregion

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/Advanced/BasicUpdateView.cs

@@ -87 +87 @@
     }
 
+    // compares for two plugins with same major and minor version if plugin1 is newer than plugin2
     private static bool IsNewerThan(IPluginDescription plugin1, IPluginDescription plugin2) {
       // newer: build version is higher, or if build version is the same revision is higher
-      if (plugin1.Version.Build < plugin2.Version.Build) return false;
-      else if (plugin1.Version.Build > plugin2.Version.Build) return true;
-      else return plugin1.Version.Revision > plugin2.Version.Revision;
+      return plugin1.Version.Build > plugin2.Version.Build ||
+        (plugin1.Version.Build == plugin2.Version.Build && plugin1.Version.Revision > plugin2.Version.Revision);
     }
 

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/Advanced/InstallationManagerForm.cs

@@ -83 +83 @@
 
     #region plugin manager event handlers
-    void pluginManager_Initialized(object sender, PluginInfrastructureEventArgs e) {
+    private void pluginManager_Initialized(object sender, PluginInfrastructureEventArgs e) {
       SetStatusStrip("Initialized PluginInfrastructure");
     }
 
-    void pluginManager_Initializing(object sender, PluginInfrastructureEventArgs e) {
+    private void pluginManager_Initializing(object sender, PluginInfrastructureEventArgs e) {
       SetStatusStrip("Initializing PluginInfrastructure");
     }
 
-    void pluginManager_PluginUnloaded(object sender, PluginInfrastructureEventArgs e) {
+    private void pluginManager_PluginUnloaded(object sender, PluginInfrastructureEventArgs e) {
       SetStatusStrip("Unloaded " + e.Entity);
     }
 
-    void pluginManager_PluginLoaded(object sender, PluginInfrastructureEventArgs e) {
+    private void pluginManager_PluginLoaded(object sender, PluginInfrastructureEventArgs e) {
       SetStatusStrip("Loaded " + e.Entity);
     }
@@ -101 +101 @@
 
     #region installation manager event handlers
-    void installationManager_PreUpdatePlugin(object sender, PluginInfrastructureCancelEventArgs e) {
+    private void installationManager_PreUpdatePlugin(object sender, PluginInfrastructureCancelEventArgs e) {
       if (e.Plugins.Count() > 0) {
-        e.Cancel = ConfirmUpdateAction(e.Plugins) == false;
-      }
-    }
-
-    void installationManager_PreRemovePlugin(object sender, PluginInfrastructureCancelEventArgs e) {
+        e.Cancel = (bool)Invoke((Func<IEnumerable<IPluginDescription>, bool>)ConfirmUpdateAction, e.Plugins) == false;
+      }
+    }
+
+    private void installationManager_PreRemovePlugin(object sender, PluginInfrastructureCancelEventArgs e) {
       if (e.Plugins.Count() > 0) {
-        e.Cancel = ConfirmRemoveAction(e.Plugins) == false;
-      }
-    }
-
-    void installationManager_PreInstallPlugin(object sender, PluginInfrastructureCancelEventArgs e) {
+        e.Cancel = (bool)Invoke((Func<IEnumerable<IPluginDescription>, bool>)ConfirmRemoveAction, e.Plugins) == false;
+      }
+    }
+
+    private void installationManager_PreInstallPlugin(object sender, PluginInfrastructureCancelEventArgs e) {
       if (e.Plugins.Count() > 0)
-        if (ConfirmInstallAction(e.Plugins) == true) {
+        if ((bool)Invoke((Func<IEnumerable<IPluginDescription>, bool>)ConfirmInstallAction, e.Plugins) == true) {
           SetStatusStrip("Installing " + e.Plugins.Aggregate("", (a, b) => a.ToString() + "; " + b.ToString()));
           e.Cancel = false;
@@ -124 +124 @@
     }
 
-    void installationManager_PluginUpdated(object sender, PluginInfrastructureEventArgs e) {
+    private void installationManager_PluginUpdated(object sender, PluginInfrastructureEventArgs e) {
       SetStatusStrip("Updated " + e.Entity);
     }
 
-    void installationManager_PluginRemoved(object sender, PluginInfrastructureEventArgs e) {
+    private void installationManager_PluginRemoved(object sender, PluginInfrastructureEventArgs e) {
       SetStatusStrip("Removed " + e.Entity);
     }
 
-    void installationManager_PluginInstalled(object sender, PluginInfrastructureEventArgs e) {
+    private void installationManager_PluginInstalled(object sender, PluginInfrastructureEventArgs e) {
       SetStatusStrip("Installed " + e.Entity);
     }

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/Advanced/InstalledPluginsView.cs

@@ -120 +120 @@
     }
 
+    // compares for two plugins with same major and minor version if plugin1 is newer than plugin2
     private static bool IsNewerThan(IPluginDescription plugin1, IPluginDescription plugin2) {
       // newer: build version is higher, or if build version is the same revision is higher
-      if (plugin1.Version.Build < plugin2.Version.Build) return false;
-      else if (plugin1.Version.Build > plugin2.Version.Build) return true;
-      else return plugin1.Version.Revision > plugin2.Version.Revision;
+      return plugin1.Version.Build > plugin2.Version.Build ||
+        (plugin1.Version.Build == plugin2.Version.Build && plugin1.Version.Revision > plugin2.Version.Revision);
     }
     #endregion