Changeset 2591 for trunk/sources/HeuristicLab.DataAccess.ADOHelper

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.DataAccess.ADOHelper/3.2

Files:

• DataAccessADOHelperPlugin.cs (modified) (1 diff)
• Session.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.DataAccess.ADOHelper/3.2/DataAccessADOHelperPlugin.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.DataAccess.ADOHelper {
-  [ClassInfo(Name = "HeuristicLab.DataAccess.ADOHelper-3.2")]
-  [PluginFile(Filename = "HeuristicLab.DataAccess.ADOHelper-3.2.dll", Filetype = PluginFileType.Assembly)]
-  [Dependency(Dependency = "HeuristicLab.Core-3.2")]
+  [Plugin("HeuristicLab.DataAccess.ADOHelper-3.2")]
+  [PluginFile("HeuristicLab.DataAccess.ADOHelper-3.2.dll", PluginFileType.Assembly)]
+  [PluginDependency("HeuristicLab.Core-3.2")]
   public class DataAccessADOHelperPlugin : PluginBase {
   }

trunk/sources/HeuristicLab.DataAccess.ADOHelper/3.2/Session.cs

@@ -31 +31 @@
 namespace HeuristicLab.DataAccess.ADOHelper {
   public class Session: ISession {
-    private static DiscoveryService discoveryService =
-      new DiscoveryService();
-
     private SessionFactory factory;
 
@@ -115 +112 @@
       if (!adapters.ContainsKey(adapterId)) {
         IDataAdapter<ObjT> adapter =
-          discoveryService.GetInstances<IDataAdapter<ObjT>>()[0];
+          ApplicationManager.Manager.GetInstances<IDataAdapter<ObjT>>().First();
 
         adapter.Session = this;
@@ -135 +132 @@
       if (!adapters.ContainsKey(adapterId)) {
         T adapter =
-          discoveryService.GetInstances<T>()[0];
+          ApplicationManager.Manager.GetInstances<T>().First();
 
         adapter.Session = this;