Changeset 2591 for trunk/sources/HeuristicLab.Constraints

Timestamp:

01/05/10 10:31:40 (15 years ago)

Author:

gkronber

Message:

Copied refactored plugin infrastructure from branch and merged changeset r2586:2589 from branch into the trunk. #799

Location:

trunk/sources/HeuristicLab.Constraints/3.2

Files:

• HeuristicLabConstraintsPlugin.cs (modified) (1 diff)
• NotConstraintView.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Constraints/3.2/HeuristicLabConstraintsPlugin.cs

@@ -29 +29 @@
   /// Plugin class for HeuristicLab.Constraints plugin.
   /// </summary>
-  [ClassInfo(Name = "HeuristicLab.Constraints-3.2")]
-  [PluginFile(Filename = "HeuristicLab.Constraints-3.2.dll", Filetype = PluginFileType.Assembly)]
-  [Dependency(Dependency = "HeuristicLab.Core-3.2")]
-  [Dependency(Dependency = "HeuristicLab.Data-3.2")]
+  [Plugin("HeuristicLab.Constraints-3.2")]
+  [PluginFile("HeuristicLab.Constraints-3.2.dll", PluginFileType.Assembly)]
+  [PluginDependency("HeuristicLab.Core-3.2")]
+  [PluginDependency("HeuristicLab.Data-3.2")]
   public class HeuristicLabConstraintsPlugin : PluginBase {
   }

trunk/sources/HeuristicLab.Constraints/3.2/NotConstraintView.cs

@@ -58 +58 @@
     public NotConstraintView() {
       InitializeComponent();
-      DiscoveryService discoveryService = new DiscoveryService();
-      itemTypes = discoveryService.GetTypes(typeof(ConstraintBase));
-      for (int i = 0; i < itemTypes.Length; i++) {
-        subConstraintComboBox.Items.Add(itemTypes[i].Name);
+      foreach (Type itemType in ApplicationManager.Manager.GetTypes(typeof(ConstraintBase))) {
+        subConstraintComboBox.Items.Add(itemType.Name);
       }
       subConstraintComboBox.SelectedIndex = 0;
@@ -130 +128 @@
         try {
           NotConstraint.SubConstraint = (ConstraintBase)Activator.CreateInstance(itemTypes[subConstraintComboBox.SelectedIndex]);
-        } catch (Exception) {
+        }
+        catch (Exception) {
           NotConstraint.SubConstraint = null;
         }
@@ -144 +143 @@
     private void UpdateSubConstraintComboBox() {
       subConstraintComboBox.SelectedIndexChanged -= new EventHandler(subConstraintComboBox_SelectedIndexChanged);
-      for (int i = 0 ; i < itemTypes.Length ; i++)
+      for (int i = 0; i < itemTypes.Length; i++)
         if (itemTypes[i].Name.Equals(NotConstraint.SubConstraint.GetType().Name))
           subConstraintComboBox.SelectedIndex = i;