[nant-commits] CVS: nant/src/NAnt.Core DataTypeBaseBuilder.cs, 1.7, 1.8 TaskBuilder.cs, 1.12, 1.13

[Gert D. <dri...@us...>]

Update of /cvsroot/nant/nant/src/NAnt.Core
In directory sc8-pr-cvs16:/tmp/cvs-serv24059

Modified Files:
	DataTypeBaseBuilder.cs TaskBuilder.cs 
Log Message:
Use lazy init for DataTypeName and TaskName.

Index: DataTypeBaseBuilder.cs
===================================================================
RCS file: /cvsroot/nant/nant/src/NAnt.Core/DataTypeBaseBuilder.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DataTypeBaseBuilder.cs	18 Feb 2007 03:46:36 -0000	1.7
--- DataTypeBaseBuilder.cs	17 Apr 2007 09:52:33 -0000	1.8
***************
*** 39,48 ****
          public DataTypeBaseBuilder(ExtensionAssembly extensionAssembly, string className) : base (extensionAssembly) {
              _className = className;
- 
-             // get Element name from attribute
-             ElementNameAttribute ElementNameAttribute = (ElementNameAttribute) 
-                 Attribute.GetCustomAttribute(Assembly.GetType(ClassName), typeof(ElementNameAttribute));
- 
-             _dataTypeName = ElementNameAttribute.Name;
          }
  
--- 39,42 ----
***************
*** 72,76 ****
          /// </value>
          public string DataTypeName {
!             get { return _dataTypeName; }
          }
  
--- 66,78 ----
          /// </value>
          public string DataTypeName {
!             get {
!                 if (_dataTypeName == null) {
!                     ElementNameAttribute ElementNameAttribute = (ElementNameAttribute) 
!                         Attribute.GetCustomAttribute(Assembly.GetType(ClassName), 
!                         typeof(ElementNameAttribute));
!                     _dataTypeName = ElementNameAttribute.Name;
!                 }
!                 return _dataTypeName;
!             }
          }
  
***************
*** 96,100 ****
  
          private readonly string _className;
!         private readonly string _dataTypeName;
  
          #endregion Private Instance Fields
--- 98,102 ----
  
          private readonly string _className;
!         private string _dataTypeName;
  
          #endregion Private Instance Fields

Index: TaskBuilder.cs
===================================================================
RCS file: /cvsroot/nant/nant/src/NAnt.Core/TaskBuilder.cs,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** TaskBuilder.cs	18 Feb 2007 03:46:36 -0000	1.12
--- TaskBuilder.cs	17 Apr 2007 09:52:33 -0000	1.13
***************
*** 41,49 ****
          internal TaskBuilder(ExtensionAssembly extensionAssembly, string className) : base (extensionAssembly) {
              _className = className;
- 
-             // get task name from attribute
-             TaskNameAttribute taskNameAttribute = (TaskNameAttribute) 
-                 Attribute.GetCustomAttribute(Assembly.GetType(ClassName), typeof(TaskNameAttribute));
-             _taskName = taskNameAttribute.Name;
          }
  
--- 41,44 ----
***************
*** 73,77 ****
          /// </value>
          public string TaskName {
!             get { return _taskName; }
          }
  
--- 68,80 ----
          /// </value>
          public string TaskName {
!             get {
!                 if (_taskName == null) {
!                     TaskNameAttribute taskNameAttribute = (TaskNameAttribute) 
!                         Attribute.GetCustomAttribute(Assembly.GetType(ClassName), 
!                         typeof(TaskNameAttribute));
!                     _taskName = taskNameAttribute.Name;
!                 }
!                 return _taskName;
!             }
          }
  
***************
*** 102,106 ****
  
          private readonly string _className;
!         private readonly string _taskName;
  
          #endregion Private Instance Fields
--- 105,109 ----
  
          private readonly string _className;
!         private string _taskName;
  
          #endregion Private Instance Fields