Changeset 2488 for branches/PluginInfrastructure Refactoring/HeuristicLab.PluginInfrastructure/BaseClasses

Timestamp:

11/12/09 17:45:45 (15 years ago)

Author:

gkronber

Message:

Worked on plugin infrastructure refactoring. (Fully functional revision). #799

Location:

branches/PluginInfrastructure Refactoring/HeuristicLab.PluginInfrastructure/BaseClasses

Files:

• ApplicationBase.cs (modified) (6 diffs)
• PluginBase.cs (modified) (2 diffs)

branches/PluginInfrastructure Refactoring/HeuristicLab.PluginInfrastructure/BaseClasses/ApplicationBase.cs

@@ -29 +29 @@
   /// Default implementation for the IApplication interface.
   /// </summary>
-  internal abstract class ApplicationBase : IApplication {
+  public abstract class ApplicationBase : IApplication {
     /// <summary>
     /// Initializes a new instance of <see cref="ApplicationBase"/>.
@@ -35 +35 @@
     public ApplicationBase() { }
 
-    private ApplicationDescriptionAttribute ApplicationDescriptionAttribute {
+    private ApplicationAttribute ApplicationAttribute {
       get {
-        object[] appDescAttributes = this.GetType().GetCustomAttributes(typeof(ApplicationDescriptionAttribute), false);
+        object[] appAttributes = this.GetType().GetCustomAttributes(typeof(ApplicationAttribute), false);
 
         // exactly one attribute of the type ClassInfoAttribute must be given
-        if (appDescAttributes.Length != 1) {
-          throw new InvalidPluginException("Found multiple ApplicationDescriptionAttributes on type " + this.GetType());
+        if (appAttributes.Length != 1) {
+          throw new InvalidPluginException("Found multiple ApplicationAttributes on type " + this.GetType());
         }
 
-        return (ApplicationDescriptionAttribute)appDescAttributes[0];
+        return (ApplicationAttribute)appAttributes[0];
       }
     }
@@ -54 +54 @@
     /// </summary>
     public string Name {
-      get { return ApplicationDescriptionAttribute.Name; }
+      get { return ApplicationAttribute.Name; }
     }
 
@@ -62 +62 @@
     public Version Version {
       get {
-        var appDescAttribute = ApplicationDescriptionAttribute;
-        // if the version is not explicitly set in the attribute then the version of the assembly is used as default
-        if (string.IsNullOrEmpty(appDescAttribute.Version)) {
-          return this.GetType().Assembly.GetName().Version;
-        } else {
-          return new Version(appDescAttribute.Version);
-        }
+        return this.GetType().Assembly.GetName().Version;
       }
     }
@@ -77 +71 @@
     public string Description {
       get {
-        var appDescAttribute = ApplicationDescriptionAttribute;
+        var appDescAttribute = ApplicationAttribute;
         // if the description is not explicitly set in the attribute then the name of the application is used as default
         if (string.IsNullOrEmpty(appDescAttribute.Description)) {
@@ -92 +86 @@
     public bool RestartOnErrors {
       get {
-        return ApplicationDescriptionAttribute.RestartOnErrors;
+        return ApplicationAttribute.RestartOnErrors;
       }
     }

branches/PluginInfrastructure Refactoring/HeuristicLab.PluginInfrastructure/BaseClasses/PluginBase.cs

@@ -37 +37 @@
     public PluginBase() { }
 
-    private PluginDescriptionAttribute PluginDescriptionAttribute {
+    private PluginAttribute PluginAttribute {
       get {
-        object[] pluginAttributes = this.GetType().GetCustomAttributes(typeof(PluginDescriptionAttribute), false);
+        object[] pluginAttributes = this.GetType().GetCustomAttributes(typeof(PluginAttribute), false);
         // exactly one attribute of the type PluginDescriptionAttribute must be given
         if (pluginAttributes.Length != 1) {
-          throw new InvalidPluginException("Found multiple PluginDescriptionAttributes on type " + this.GetType());
+          throw new InvalidPluginException("Found multiple PluginAttributes on type " + this.GetType());
         }
-        return (PluginDescriptionAttribute)pluginAttributes[0];
+        return (PluginAttribute)pluginAttributes[0];
       }
     }
@@ -52 +52 @@
     public string Name {
       get {
-        return PluginDescriptionAttribute.Name;
+        return PluginAttribute.Name;
       }
     }