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

Timestamp:

09/24/10 10:24:20 (14 years ago)

Author:

gkronber

Message:

Preparations for next HL release. #1203

Location:

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/Advanced

Files:

• AvailablePluginsView.cs (modified) (1 diff)
• BasicUpdateView.cs (modified) (1 diff)
• DeploymentService/PluginDescription.cs (modified) (1 diff)
• EditProductsView.cs (modified) (1 diff)
• InstallationManager.cs (modified) (1 diff)
• InstallationManagerConsole.cs (deleted)
• InstallationManagerException.cs (modified) (1 diff)
• InstallationManagerForm.cs (modified) (8 diffs)
• InstalledPluginsView.cs (modified) (3 diffs)
• MultiSelectListView.cs (modified) (2 diffs)
• UploadPluginsView.cs (modified) (1 diff)

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

@@ -311 +311 @@
     }
 
-    private bool IsNewerThan(IPluginDescription plugin1, IPluginDescription 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;

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

@@ -87 +87 @@
     }
 
-    private bool IsNewerThan(IPluginDescription plugin1, IPluginDescription 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;

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/Advanced/DeploymentService/PluginDescription.cs

@@ -69 +69 @@
     }
 
-    [Obsolete]
-    public DateTime BuildDate {
-      get { throw new NotImplementedException(); }
-    }
-
     /// <summary>
     /// Gets an enumerable of dependencies of the plugin

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

@@ -257 +257 @@
 
         // populate plugins list view
-        ListViewItem activeItem = (ListViewItem)productsListView.SelectedItems[0];
         pluginListView.SuppressItemCheckedEvents = true;
         foreach (var plugin in plugins.OfType<IPluginDescription>()) {

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

@@ -179 +179 @@
       using (ZipInputStream s = new ZipInputStream(new MemoryStream(zippedPackage))) {
         ZipEntry theEntry;
-        string tmpEntry = String.Empty;
         while ((theEntry = s.GetNextEntry()) != null) {
           string directoryName = pluginDir;
           string fileName = Path.GetFileName(theEntry.Name);
           // create directory 
-          if (directoryName != "") {
+          if (!string.IsNullOrEmpty(directoryName)) {
             Directory.CreateDirectory(directoryName);
           }
-          if (fileName != String.Empty) {
+          if (!string.IsNullOrEmpty(fileName)) {
             string fullPath = Path.Combine(directoryName, fileName);
             string fullDirPath = Path.GetDirectoryName(fullPath);
             if (!Directory.Exists(fullDirPath)) Directory.CreateDirectory(fullDirPath);
-            FileStream streamWriter = File.Create(fullPath);
-            int size = 2048;
-            byte[] data = new byte[2048];
-            while (true) {
-              size = s.Read(data, 0, data.Length);
-              if (size > 0) {
-                streamWriter.Write(data, 0, size);
-              } else {
-                break;
+            using (FileStream streamWriter = File.Create(fullPath)) {
+              int size = 2048;
+              byte[] data = new byte[2048];
+              while (true) {
+                size = s.Read(data, 0, data.Length);
+                if (size > 0) {
+                  streamWriter.Write(data, 0, size);
+                } else {
+                  break;
+                }
               }
+              streamWriter.Close();
             }
-            streamWriter.Close();
           }
         }

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

@@ -29 +29 @@
     public InstallationManagerException(string msg) : base(msg) { }
     public InstallationManagerException(string msg, Exception e) : base(msg, e) { }
-    public InstallationManagerException(SerializationInfo info, StreamingContext context) : base(info, context) { }
+    protected InstallationManagerException(SerializationInfo info, StreamingContext context) : base(info, context) { }
   }
 }

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

@@ -32 +32 @@
   internal partial class InstallationManagerForm : Form, IStatusView {
     private InstallationManager installationManager;
-    private PluginManager pluginManager;
     private string pluginDir;
 
@@ -40 +39 @@
       FileVersionInfo pluginInfrastructureVersion = FileVersionInfo.GetVersionInfo(GetType().Assembly.Location);
       Text = "HeuristicLab Plugin Manager " + pluginInfrastructureVersion.FileVersion;
-
-      this.pluginManager = pluginManager;
 
       pluginManager.PluginLoaded += pluginManager_PluginLoaded;
@@ -142 +139 @@
     #region button events
     private void connectionSettingsToolStripMenuItem_Click(object sender, EventArgs e) {
-      new ConnectionSetupView().ShowDialog(this);
+      using (var conSetupView = new ConnectionSetupView()) {
+        conSetupView.ShowDialog(this);
+      }
     }
     private void tabControl_SelectedIndexChanged(object sender, EventArgs e) {
@@ -157 +156 @@
         }
       }
-      return (new ConfirmationDialog("Confirm Delete", "Do you want to delete following files?", strBuilder.ToString())).ShowDialog(this) == DialogResult.OK;
+      using (var confirmationDialog = new ConfirmationDialog("Confirm Delete", "Do you want to delete following files?", strBuilder.ToString())) {
+        return (confirmationDialog.ShowDialog(this)) == DialogResult.OK;
+      }
     }
 
@@ -165 +166 @@
         strBuilder.AppendLine(plugin.ToString());
       }
-      return (new ConfirmationDialog("Confirm Update", "Do you want to update following plugins?", strBuilder.ToString())).ShowDialog(this) == DialogResult.OK;
+      using (var confirmationDialog = new ConfirmationDialog("Confirm Update", "Do you want to update following plugins?", strBuilder.ToString())) {
+        return (confirmationDialog.ShowDialog(this)) == DialogResult.OK;
+      }
     }
 
@@ -171 +174 @@
       foreach (var plugin in plugins) {
         if (!string.IsNullOrEmpty(plugin.LicenseText)) {
-          var licenseConfirmationBox = new LicenseConfirmationDialog(plugin);
-          if (licenseConfirmationBox.ShowDialog(this) != DialogResult.OK)
-            return false;
+          using (var licenseConfirmationBox = new LicenseConfirmationDialog(plugin)) {
+            if (licenseConfirmationBox.ShowDialog(this) != DialogResult.OK)
+              return false;
+          }
         }
       }
@@ -207 +211 @@
 
     public void ShowProgressIndicator(double percentProgress) {
-      if (percentProgress < 0.0 || percentProgress > 1.0) throw new ArgumentException();
+      if (percentProgress < 0.0 || percentProgress > 1.0) throw new ArgumentException("percentProgress");
       toolStripProgressBar.Visible = true;
       toolStripProgressBar.Style = ProgressBarStyle.Continuous;
@@ -224 +228 @@
 
     public void ShowMessage(string message) {
-      if (toolStripStatusLabel.Text == string.Empty)
+      if (string.IsNullOrEmpty(toolStripStatusLabel.Text))
         toolStripStatusLabel.Text = message;
       else

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

@@ -120 +120 @@
     }
 
-    private bool IsNewerThan(IPluginDescription plugin1, IPluginDescription 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;
@@ -153 +153 @@
     }
 
-    private ListViewItem CreateListViewItem(PluginDescription plugin) {
+    private static ListViewItem CreateListViewItem(PluginDescription plugin) {
       ListViewItem item = new ListViewItem(new string[] { plugin.Name, plugin.Version.ToString(), plugin.Description });
       item.Tag = plugin;
@@ -190 +190 @@
         List<ListViewItem> modifiedItems = new List<ListViewItem>();
         foreach (ListViewItem item in localPluginsListView.SelectedItems) {
-          var plugin = (IPluginDescription)item.Tag;
           modifiedItems.Add(item);
         }

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

@@ -22 +22 @@
 using System.Linq;
 using System.Windows.Forms;
+using System;
 
 namespace HeuristicLab.PluginInfrastructure.Advanced {
@@ -43 +44 @@
     // and then one the item whose checkbox was clicked
     protected override void OnItemCheck(ItemCheckEventArgs ice) {
+      if (ice == null) throw new ArgumentNullException("ice");
       // don't change the checked state of items that were not clicked directly
       if (inhibitAutoCheck) {

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

@@ -260 +260 @@
     }
 
-    private byte[] CreateZipPackage(IPluginDescription plugin) {
+    private static byte[] CreateZipPackage(IPluginDescription plugin) {
       using (MemoryStream stream = new MemoryStream()) {
         ZipFile zipFile = new ZipFile(stream);