[nant-commits] CVS: nant/src/NAnt/Tasks TStampTask.cs,1.6,1.7 ScriptTask.cs,1.10,1.11 StyleTask.cs,1.6,1.7 ExternalProgramBase.cs,1.15,1.16

[Scott H. <sk...@us...>]

Update of /cvsroot/nant/nant/src/NAnt/Tasks
In directory usw-pr-cvs1:/tmp/cvs-serv17250

Modified Files:
	TStampTask.cs ScriptTask.cs StyleTask.cs 
	ExternalProgramBase.cs 
Log Message:
Removed XPath expressions. Now uses XMLNode methods/props.
Checks for #comment/#X so they are not processed as tasks. Need a more elegant solution here?

Index: TStampTask.cs
===================================================================
RCS file: /cvsroot/nant/nant/src/NAnt/Tasks/TStampTask.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TStampTask.cs	28 Mar 2002 03:00:49 -0000	1.6
--- TStampTask.cs	23 Apr 2002 20:49:58 -0000	1.7
***************
*** 143,152 ****
          protected override void InitializeTask(XmlNode taskNode) {
              // now get formatters
!             XmlNodeList formatterNodeList = taskNode.SelectNodes("formatter");
!             foreach (XmlNode formatterNode in formatterNodeList) {
!                 FormatterElement f = new FormatterElement();
!                 f.Project = Project;
!                 f.Initialize(formatterNode);
!                 _formatterElements.Add(f);
              }
          }
--- 143,154 ----
          protected override void InitializeTask(XmlNode taskNode) {
              // now get formatters
!             foreach (XmlNode formatterNode in taskNode) {
! 				if(formatterNode.Name.Equals("formatter"))
! 				{
! 					FormatterElement f = new FormatterElement();
! 					f.Project = Project;
! 					f.Initialize(formatterNode);
! 					_formatterElements.Add(f);
! 				}
              }
          }

Index: ScriptTask.cs
===================================================================
RCS file: /cvsroot/nant/nant/src/NAnt/Tasks/ScriptTask.cs,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ScriptTask.cs	16 Apr 2002 20:26:38 -0000	1.10
--- ScriptTask.cs	23 Apr 2002 20:49:58 -0000	1.11
***************
*** 142,146 ****
              XmlNodeList importsList = taskNode.SelectNodes("imports/import");
              foreach (XmlNode import in importsList) {
!                 _imports.Add(import.SelectSingleNode("@name").InnerText);
              }
          }
--- 142,146 ----
              XmlNodeList importsList = taskNode.SelectNodes("imports/import");
              foreach (XmlNode import in importsList) {
!                 _imports.Add(import.Attributes["name"].InnerText);
              }
          }

Index: StyleTask.cs
===================================================================
RCS file: /cvsroot/nant/nant/src/NAnt/Tasks/StyleTask.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** StyleTask.cs	5 Mar 2002 04:58:42 -0000	1.6
--- StyleTask.cs	23 Apr 2002 20:49:58 -0000	1.7
***************
*** 97,105 ****
  
              // Load parameters
!             XmlNodeList paramList = taskNode.SelectNodes("param");
!             foreach (XmlNode node in paramList) {
!                 string paramname = node.SelectSingleNode("@name").Value;
!                 string paramval = node.SelectSingleNode("@expression").Value;
!                 _params[paramname] = paramval;
              }
          }
--- 97,106 ----
  
              // Load parameters
!             foreach (XmlNode node in taskNode) {
! 				if(node.Name.Equals("param")) {
! 					string paramname = node.Attributes["name"].Value;
! 					string paramval = node.Attributes["expression"].Value;
! 					_params[paramname] = paramval;
! 				}
              }
          }

Index: ExternalProgramBase.cs
===================================================================
RCS file: /cvsroot/nant/nant/src/NAnt/Tasks/ExternalProgramBase.cs,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ExternalProgramBase.cs	13 Apr 2002 20:01:42 -0000	1.15
--- ExternalProgramBase.cs	23 Apr 2002 20:49:58 -0000	1.16
***************
*** 55,74 ****
          protected override void InitializeTask(XmlNode taskNode) {
              // initialize the _args collection
!             foreach (XmlNode optionNode in taskNode.SelectNodes("arg")) {
  
!                 // TODO: decide if we should enforce arg elements not being able
!                 // to accept a file and value attribute on the same element.
!                 // Ideally this would be done via schema and since it doesn't
!                 // really hurt for now I'll leave it in.
  
!                 XmlNode valueNode = optionNode.SelectSingleNode("@value");
!                 if (valueNode != null) {
!                     _args.Add(Project.ExpandProperties(valueNode.Value));
!                 }
  
!                 XmlNode fileNode  = optionNode.SelectSingleNode("@file");
!                 if (fileNode != null) {
!                     _args.Add(Project.GetFullPath(Project.ExpandProperties(fileNode.Value)));
!                 }
              }
          }
--- 55,80 ----
          protected override void InitializeTask(XmlNode taskNode) {
              // initialize the _args collection
!             foreach (XmlNode optionNode in taskNode) {
! 				if(optionNode.Name.Equals("arg")) 
! 				{
  
! 					// TODO: decide if we should enforce arg elements not being able
! 					// to accept a file and value attribute on the same element.
! 					// Ideally this would be done via schema and since it doesn't
! 					// really hurt for now I'll leave it in.
  
!                 
! 					XmlNode valueNode = optionNode.Attributes["value"];
! 					if (valueNode != null) 
! 					{
! 						_args.Add(Project.ExpandProperties(valueNode.Value));
! 					}
  
! 					XmlNode fileNode  = optionNode.Attributes["file"];
! 					if (fileNode != null) 
! 					{
! 						_args.Add(Project.GetFullPath(Project.ExpandProperties(fileNode.Value)));
! 					}
! 				}
              }
          }