Changeset 6618 for branches/GP.Grammar.Editor/HeuristicLab.PluginInfrastructure/3.3/Advanced

Timestamp:

08/01/11 17:48:53 (13 years ago)

Author:

mkommend

Message:

#1479: Integrated trunk changes.

Location:

branches/GP.Grammar.Editor/HeuristicLab.PluginInfrastructure/3.3/Advanced

Files:

• AvailablePluginsView.cs (modified) (2 diffs)
• BasicUpdateView.cs (modified) (1 diff)
• InstallationManager.cs (modified) (4 diffs)
• InstallationManagerForm.Designer.cs (modified) (7 diffs)
• InstallationManagerForm.cs (modified) (1 diff)
• InstalledPluginsView.cs (modified) (1 diff)
• PluginUpdaterForm.Designer.cs (added)
• PluginUpdaterForm.cs (added)
• Util.cs (modified) (1 diff)

branches/GP.Grammar.Editor/HeuristicLab.PluginInfrastructure/3.3/Advanced/AvailablePluginsView.cs

@@ -117 +117 @@
     void updateOrInstallPluginsBackgroundWorker_DoWork(object sender, DoWorkEventArgs e) {
       UpdateOrInstallPluginsBackgroundWorkerArgument info = (UpdateOrInstallPluginsBackgroundWorkerArgument)e.Argument;
+      bool cancelled = false;
       if (info.PluginsToInstall.Count() > 0)
-        installationManager.Install(info.PluginsToInstall);
+        installationManager.Install(info.PluginsToInstall, out cancelled);
       if (info.PluginsToUpdate.Count() > 0)
-        installationManager.Update(info.PluginsToUpdate);
-
-      if (info.PluginsToInstall.Count() > 0 || info.PluginsToUpdate.Count() > 0)
+        installationManager.Update(info.PluginsToUpdate, out cancelled);
+
+      if (!cancelled && (info.PluginsToInstall.Count() > 0 || info.PluginsToUpdate.Count() > 0))
         pluginManager.DiscoverAndCheckPlugins();
     }
@@ -176 +177 @@
       var pluginsToInstall = selectedProduct.Plugins.Except(pluginsToUpdate);
 
-      updateOrInstallInfo.PluginsToInstall = 
+      updateOrInstallInfo.PluginsToInstall =
         pluginsToInstall
         .Cast<IPluginDescription>()
         .ToList();
-      updateOrInstallInfo.PluginsToUpdate = 
+      updateOrInstallInfo.PluginsToUpdate =
         pluginsToUpdate
         .Cast<IPluginDescription>()

branches/GP.Grammar.Editor/HeuristicLab.PluginInfrastructure/3.3/Advanced/BasicUpdateView.cs

@@ -79 +79 @@
                             select remotePlugin;
       if (pluginsToUpdate.Count() > 0) {
-        installationManager.Update(pluginsToUpdate);
-        pluginManager.DiscoverAndCheckPlugins();
+        bool cancelled;
+        installationManager.Update(pluginsToUpdate, out cancelled);
+        if (!cancelled)
+          pluginManager.DiscoverAndCheckPlugins();
         e.Cancel = false;
       } else {

branches/GP.Grammar.Editor/HeuristicLab.PluginInfrastructure/3.3/Advanced/InstallationManager.cs

@@ -98 +98 @@
     /// </summary>
     /// <param name="plugins"></param>
-    public void Install(IEnumerable<IPluginDescription> plugins) {
+    public void Install(IEnumerable<IPluginDescription> plugins, out bool cancelled) {
       var args = new PluginInfrastructureCancelEventArgs(plugins);
       OnPreInstall(args);
       if (!args.Cancel) {
+        cancelled = false;
         var client = DeploymentService.UpdateServiceClientFactory.CreateClient();
         try {
@@ -123 +124 @@
           throw new InstallationManagerException("General communication exception in connection to server.", e);
         }
+      } else {
+        cancelled = true;
       }
     }
@@ -130 +133 @@
     /// </summary>
     /// <param name="plugins"></param>
-    public void Update(IEnumerable<IPluginDescription> plugins) {
+    public void Update(IEnumerable<IPluginDescription> plugins, out bool cancelled) {
       PluginInfrastructureCancelEventArgs args = new PluginInfrastructureCancelEventArgs(plugins);
       OnPreUpdate(args);
       if (!args.Cancel) {
+        cancelled = false;
         var client = DeploymentService.UpdateServiceClientFactory.CreateClient();
         try {
@@ -155 +159 @@
           throw new InstallationManagerException("General communication exception in connection to server.", e);
         }
+      } else {
+        cancelled = true;
       }
     }

branches/GP.Grammar.Editor/HeuristicLab.PluginInfrastructure/3.3/Advanced/InstallationManagerForm.Designer.cs

@@ -45 +45 @@
     private void InitializeComponent() {
       this.components = new System.ComponentModel.Container();
-      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(InstallationManagerForm));
       this.statusStrip = new System.Windows.Forms.StatusStrip();
       this.toolStripProgressBar = new System.Windows.Forms.ToolStripProgressBar();
       this.toolStripStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
       this.tabControl = new System.Windows.Forms.TabControl();
-      this.updateAllPluginsTabPage = new System.Windows.Forms.TabPage();
-      this.basicUpdateView = new HeuristicLab.PluginInfrastructure.Advanced.BasicUpdateView();
       this.localPluginsTabPage = new System.Windows.Forms.TabPage();
       this.localPluginsView = new HeuristicLab.PluginInfrastructure.Advanced.InstalledPluginsView();
@@ -68 +65 @@
       this.statusStrip.SuspendLayout();
       this.tabControl.SuspendLayout();
-      this.updateAllPluginsTabPage.SuspendLayout();
       this.localPluginsTabPage.SuspendLayout();
       this.availablePluginsTabPage.SuspendLayout();
@@ -105 +101 @@
                   | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
-      this.tabControl.Controls.Add(this.updateAllPluginsTabPage);
       this.tabControl.Controls.Add(this.localPluginsTabPage);
       this.tabControl.Controls.Add(this.availablePluginsTabPage);
@@ -118 +113 @@
       this.tabControl.SelectedIndexChanged += new System.EventHandler(this.tabControl_SelectedIndexChanged);
       // 
-      // updateAllPluginsTabPage
-      // 
-      this.updateAllPluginsTabPage.Controls.Add(this.basicUpdateView);
-      this.updateAllPluginsTabPage.Location = new System.Drawing.Point(4, 22);
-      this.updateAllPluginsTabPage.Name = "updateAllPluginsTabPage";
-      this.updateAllPluginsTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.updateAllPluginsTabPage.Size = new System.Drawing.Size(590, 366);
-      this.updateAllPluginsTabPage.TabIndex = 5;
-      this.updateAllPluginsTabPage.Text = "Update Plugins";
-      this.toolTip.SetToolTip(this.updateAllPluginsTabPage, "Update all installed plugins");
-      this.updateAllPluginsTabPage.UseVisualStyleBackColor = true;
-      // 
-      // basicUpdateView
-      // 
-      this.basicUpdateView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                  | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.basicUpdateView.InstallationManager = null;
-      this.basicUpdateView.Location = new System.Drawing.Point(6, 6);
-      this.basicUpdateView.Name = "basicUpdateView";
-      this.basicUpdateView.PluginManager = null;
-      this.basicUpdateView.Size = new System.Drawing.Size(578, 354);
-      this.basicUpdateView.StatusView = null;
-      this.basicUpdateView.TabIndex = 0;
-      // 
       // localPluginsTabPage
       // 
@@ -298 +268 @@
       this.Controls.Add(this.statusStrip);
       this.Controls.Add(this.menuStrip);
-      this.Icon = HeuristicLab.PluginInfrastructure.Resources.HeuristicLab;
+      this.Icon = global::HeuristicLab.PluginInfrastructure.Resources.HeuristicLab;
       this.MainMenuStrip = this.menuStrip;
       this.Name = "InstallationManagerForm";
@@ -305 +275 @@
       this.statusStrip.PerformLayout();
       this.tabControl.ResumeLayout(false);
-      this.updateAllPluginsTabPage.ResumeLayout(false);
       this.localPluginsTabPage.ResumeLayout(false);
       this.availablePluginsTabPage.ResumeLayout(false);
@@ -338 +307 @@
     private EditProductsView productEditor;
     private InstalledPluginsView localPluginsView;
-    private System.Windows.Forms.TabPage updateAllPluginsTabPage;
-    private BasicUpdateView basicUpdateView;
     private System.Windows.Forms.ToolTip toolTip;
   }

branches/GP.Grammar.Editor/HeuristicLab.PluginInfrastructure/3.3/Advanced/InstallationManagerForm.cs

@@ -67 +67 @@
       localPluginsView.InstallationManager = installationManager;
 
-      basicUpdateView.StatusView = this;
-      basicUpdateView.PluginManager = pluginManager;
-      basicUpdateView.InstallationManager = installationManager;
-
       remotePluginInstaller.StatusView = this;
       remotePluginInstaller.InstallationManager = installationManager;

branches/GP.Grammar.Editor/HeuristicLab.PluginInfrastructure/3.3/Advanced/InstalledPluginsView.cs

@@ -116 +116 @@
                             select remotePlugin;
       if (pluginsToUpdate.Count() > 0) {
-        installationManager.Update(pluginsToUpdate);
-      }
-      pluginManager.DiscoverAndCheckPlugins();
+        bool cancelled;
+        installationManager.Update(pluginsToUpdate, out cancelled);
+        if (!cancelled) pluginManager.DiscoverAndCheckPlugins();
+      }
     }
 

branches/GP.Grammar.Editor/HeuristicLab.PluginInfrastructure/3.3/Advanced/Util.cs

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