Changeset 2591 for trunk/sources/HeuristicLab.Hive.Engine/3.2

Timestamp:

01/05/10 10:31:40 (14 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.Hive.Engine/3.2

Files:

• HeuristicLabHiveEnginePlugin.cs (modified) (1 diff)
• HiveEngine.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Hive.Engine/3.2/HeuristicLabHiveEnginePlugin.cs

@@ -29 +29 @@
   /// Plugin class for HeuristicLab.Hive.Engine plugin.
   /// </summary>
-  [ClassInfo(Name = "HeuristicLab.Hive.Engine-3.2")]
-  [PluginFile(Filename = "HeuristicLab.Hive.Engine-3.2.dll", Filetype = PluginFileType.Assembly)]
-  [Dependency(Dependency = "HeuristicLab.Common-3.2")]
-  [Dependency(Dependency = "HeuristicLab.Core-3.2")]
-  [Dependency(Dependency = "HeuristicLab.Data-3.2")]
-  [Dependency(Dependency = "HeuristicLab.DataAccess-3.2")]
-  [Dependency(Dependency = "HeuristicLab.Hive.Contracts-3.2")]
-  [Dependency(Dependency = "HeuristicLab.Hive.JobBase-3.2")]
-  [Dependency(Dependency = "HeuristicLab.SequentialEngine-3.2")]
-  [Dependency(Dependency = "HeuristicLab.Tracing-3.2")]
+  [Plugin("HeuristicLab.Hive.Engine-3.2")]
+  [PluginFile("HeuristicLab.Hive.Engine-3.2.dll", PluginFileType.Assembly)]
+  [PluginDependency("HeuristicLab.Common-3.2")]
+  [PluginDependency("HeuristicLab.Core-3.2")]
+  [PluginDependency("HeuristicLab.Data-3.2")]
+  [PluginDependency("HeuristicLab.DataAccess-3.2")]
+  [PluginDependency("HeuristicLab.Hive.Contracts-3.2")]
+  [PluginDependency("HeuristicLab.Hive.JobBase-3.2")]
+  [PluginDependency("HeuristicLab.SequentialEngine-3.2")]
+  [PluginDependency("HeuristicLab.Tracing-3.2")]
   public class HeuristicLabHiveEnginePlugin : PluginBase {
   }

trunk/sources/HeuristicLab.Hive.Engine/3.2/HiveEngine.cs

@@ -125 +125 @@
 
         job = restoredJob;
-        PluginManager.ControlManager.ShowControl(job.Engine.CreateView());
+        ControlManager.Manager.ShowControl(job.Engine.CreateView());
         OnChanged();
         OnFinished();
@@ -168 +168 @@
         HiveLogger.Debug("HiveEngine: Results-polling - Got result!");
         job = (Job)PersistenceManager.RestoreFromGZip(jobResult.SerializedJobResultData);
-        PluginManager.ControlManager.ShowControl(job.Engine.CreateView());
+        ControlManager.Manager.ShowControl(job.Engine.CreateView());
       }
       //HiveLogger.Debug("HiveEngine: Results-polling - Exception!");
@@ -218 +218 @@
       executableJobObj.SerializedJobData = memStream.ToArray();
 
-      DiscoveryService service = new DiscoveryService();
-      List<PluginInfo> plugins = new List<PluginInfo>();
+      List<IPluginDescription> plugins = new List<IPluginDescription>();
 
       foreach (IStorable storeable in dictionary.Values) {
-        PluginInfo pluginInfo = service.GetDeclaringPlugin(storeable.GetType());
+        IPluginDescription pluginInfo = ApplicationManager.Manager.GetDeclaringPlugin(storeable.GetType());
         if (!plugins.Contains(pluginInfo)) {
           plugins.Add(pluginInfo);
@@ -233 +232 @@
       List<HivePluginInfo> pluginsNeeded =
         new List<HivePluginInfo>();
-      foreach (PluginInfo uniquePlugin in plugins) {
+      foreach (IPluginDescription uniquePlugin in plugins) {
         HivePluginInfo pluginInfo =
           new HivePluginInfo();