Changeset 11

Timestamp:

02/20/08 13:15:31 (17 years ago)

Author:

gkronber

Message:

fixed #22 by moving the code that creates tree-nodes for availablePlugins into the InitPlugins method

Location:

trunk/sources

Files:

• HeuristicLab.PluginInfrastructure.GUI/ManagerForm.cs (modified) (8 diffs)
• HeuristicLab.PluginInfrastructure/Loader.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.PluginInfrastructure.GUI/ManagerForm.cs

@@ -37 +37 @@
     private TreeNode availablePlugins;
     private TreeNode allPlugins;
-
     private List<PluginTag> allTags = new List<PluginTag>();
     private Dictionary<PluginTag, PluginAction> actions = new Dictionary<PluginTag, PluginAction>();
-
+    private List<PluginDescription> allAvailablePlugins = new List<PluginDescription>();
     private string pluginDir = Application.StartupPath + "/" + HeuristicLab.PluginInfrastructure.GUI.Properties.Settings.Default.PluginDir;
     private string cacheDir = Application.StartupPath + "/" + HeuristicLab.PluginInfrastructure.GUI.Properties.Settings.Default.CacheDir;
@@ -48 +47 @@
     public ManagerForm() {
       InitializeComponent();
-
       InitializePlugins();
     }
 
     private void InitializePlugins() {
-
       pluginTreeView.Nodes.Clear();
       allTags.Clear();
@@ -102 +99 @@
       }
 
-      // TASK populate the "inactive plugins" node by reading a list of inactive plugins from the PluginManager
+      allAvailablePlugins = FilterMostRecentPluginVersions(allAvailablePlugins);
+      // find all plugins that are installed for which a new version is available
+      List<PluginDescription> upgrades = FindUpgrades(allTags, allAvailablePlugins);
+      // find all available plugins that are not installed and new (= new name not new version) since the last update
+      List<PluginDescription> newPlugins = FindNewPlugins(allTags, allAvailablePlugins);
+      // find all plugins that are available (not installed) for which a new version has been released since the last update
+      List<PluginDescription> overridingPlugins = FindOverridingPlugins(allTags, allAvailablePlugins);
+      newPlugins.ForEach(delegate(PluginDescription plugin) {
+        PluginTag tag = new PluginTag(allTags, plugin, PluginState.Available);
+        allTags.Add(tag);
+        TreeNode node = new TreeNode(plugin.Name);
+        node.ContextMenuStrip = pluginContextMenuStrip;
+        node.Tag = tag;
+        node.ImageIndex = 0;
+        allPlugins.Nodes.Add(node);
+        TreeNode availableNode = new TreeNode(plugin.Name);
+        availableNode.ContextMenuStrip = pluginContextMenuStrip;
+        availableNode.Tag = tag;
+        availablePlugins.Nodes.Add(availableNode);
+
+      });
+      upgrades.ForEach(delegate(PluginDescription upgrade) {
+        // find the installed plugins that have the same name
+        List<PluginTag> oldPlugins = allTags.FindAll(delegate(PluginTag tag) {
+          return tag.PluginName == upgrade.Name;
+        });
+        PluginTag oldPlugin = oldPlugins[0];
+        // store the upgrade in the old plugin
+        oldPlugin.UpgradePluginDescription = upgrade;
+        UpdateTreeNodes(oldPlugins);
+      });
+      overridingPlugins.ForEach(delegate(PluginDescription overridingPlugin) {
+        List<PluginTag> currentPlugins = allTags.FindAll(delegate(PluginTag tag) {
+          return tag.PluginName == overridingPlugin.Name;
+        });
+        PluginTag currentPlugin = currentPlugins[0];
+        // replace the plugin description of the available plugin to point to the overriding plugin
+        currentPlugin.PluginDescription = overridingPlugin;
+      });
+      RebuildActionHulls();
     }
 
@@ -111 +147 @@
 
     private void publishButton_Click(object sender, EventArgs args) {
-
       PluginInfo plugin = ((PluginTag)pluginTreeView.SelectedNode.Tag).Plugin;
-
       try {
         string packageFileName = plugin.Name + "-" + plugin.Version + ".zip";
@@ -128 +162 @@
         zipFile.CommitUpdate();
         zipFile.Close();
-
         FileInfo fileInfo = new FileInfo(packageFileName);
-
         infoTextBox.Text += "\nCreated " + packageFileName + " (" + fileInfo.Length + " bytes)\n";
         infoTextBox.Text += "Upload this file to your plugin source and add the following entry to" +
@@ -145 +177 @@
 
     private void updateButton_Click(object sender, EventArgs e) {
-
       // connect to all plugin sources and get a list of available plugins
       // log progress in the infoPane
@@ -162 +193 @@
 
       worker.DoWork += delegate(object doWorkSender, DoWorkEventArgs args) {
-        List<PluginDescription> allAvailablePlugins = new List<PluginDescription>();
-
-        //infoTextBox.Text = "Updating available plugins...\n";
+        allAvailablePlugins.Clear();
         dialog.SetDownloadDescription("Updating available plugins...");
-
         int i = 0;
         int n = HeuristicLab.PluginInfrastructure.GUI.Properties.Settings.Default.PluginSources.Count;
-
         foreach(string pluginSourceUrl in HeuristicLab.PluginInfrastructure.GUI.Properties.Settings.Default.PluginSources) {
           if(!worker.CancellationPending) {
@@ -200 +227 @@
       worker.RunWorkerCompleted += delegate(object runWorkerCompletedSender, RunWorkerCompletedEventArgs args) {
         if(!args.Cancelled && args.Error == null) {
-          List<PluginDescription> allAvailablePlugins = (List<PluginDescription>)args.Result;
-          allAvailablePlugins = FilterMostRecentPluginVersions(allAvailablePlugins);
-
-          // find all plugins that are installed for which a new version is available
-          List<PluginDescription> upgrades = FindUpgrades(allTags, allAvailablePlugins);
-
-          // find all available plugins that are not installed and new (= new name not new version) since the last update
-          List<PluginDescription> newPlugins = FindNewPlugins(allTags, allAvailablePlugins);
-
-          // find all plugins that are available (not installed) for which a new version has been released since the last update
-          List<PluginDescription> overridingPlugins = FindOverridingPlugins(allTags, allAvailablePlugins);
-
-          newPlugins.ForEach(delegate(PluginDescription plugin) {
-            PluginTag tag = new PluginTag(allTags, plugin, PluginState.Available);
-            allTags.Add(tag);
-
-            TreeNode node = new TreeNode(plugin.Name);
-            node.ContextMenuStrip = pluginContextMenuStrip;
-            node.Tag = tag;
-            node.ImageIndex = 0;
-            allPlugins.Nodes.Add(node);
-
-            TreeNode availableNode = new TreeNode(plugin.Name);
-            availableNode.ContextMenuStrip = pluginContextMenuStrip;
-            availableNode.Tag = tag;
-            availablePlugins.Nodes.Add(availableNode);
-
-          });
-
-          upgrades.ForEach(delegate(PluginDescription upgrade) {
-            // find the installed plugins that have the same name
-            List<PluginTag> oldPlugins = allTags.FindAll(delegate(PluginTag tag) {
-              return tag.PluginName == upgrade.Name;
-            });
-            PluginTag oldPlugin = oldPlugins[0];
-
-            // store the upgrade in the old plugin
-            oldPlugin.UpgradePluginDescription = upgrade;
-
-            UpdateTreeNodes(oldPlugins);
-          });
-
-          overridingPlugins.ForEach(delegate(PluginDescription overridingPlugin) {
-            List<PluginTag> currentPlugins = allTags.FindAll(delegate(PluginTag tag) {
-              return tag.PluginName == overridingPlugin.Name;
-            });
-
-            PluginTag currentPlugin = currentPlugins[0];
-
-            // replace the plugin description of the available plugin to point to the overriding plugin
-            currentPlugin.PluginDescription = overridingPlugin;
-          });
-
-          RebuildActionHulls();
+          InitializePlugins();
         }
         dialog.Close();

trunk/sources/HeuristicLab.PluginInfrastructure/Loader.cs

@@ -41 +41 @@
 
     private List<string> loadablePlugins = new List<string>();
-    private string pluginDir = Application.StartupPath+"/"+ HeuristicLab.PluginInfrastructure.Properties.Settings.Default.PluginDir;
+    private string pluginDir = Application.StartupPath + "/" + HeuristicLab.PluginInfrastructure.Properties.Settings.Default.PluginDir;
 
     internal event PluginLoadFailedEventHandler MissingPluginFile;
@@ -207 +207 @@
         if(filenameArg.MemberInfo != null && filetypeArg.MemberInfo != null) {
           if((PluginFileType)filetypeArg.TypedValue.Value == PluginFileType.Assembly) {
-            pluginAssemblies.Add(pluginDir +"/"+ (string)filenameArg.TypedValue.Value);
+            pluginAssemblies.Add(pluginDir + "/" + (string)filenameArg.TypedValue.Value);
           }
         }
@@ -296 +296 @@
         string filename = pluginDir + "/" + file;
         // always use \ as the directory separator
-        pluginInfo.Files.Add(filename.Replace('/','\\')); 
+        pluginInfo.Files.Add(filename.Replace('/', '\\'));
       });