[Csharp-classlib-cvs] demos/DirectoryScanner/DirectoryScanner/Classes clsDirectoryScanner.cs,1.1,1.2

[Marcel K. <gen...@us...>]

Update of /cvsroot/csharp-classlib/demos/DirectoryScanner/DirectoryScanner/Classes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21735/DirectoryScanner/DirectoryScanner/Classes

Modified Files:
	clsDirectoryScanner.cs 
Log Message:
- updated to revision 1.3

Index: clsDirectoryScanner.cs
===================================================================
RCS file: /cvsroot/csharp-classlib/demos/DirectoryScanner/DirectoryScanner/Classes/clsDirectoryScanner.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** clsDirectoryScanner.cs	3 May 2005 15:41:07 -0000	1.1
--- clsDirectoryScanner.cs	2 Jun 2005 06:37:58 -0000	1.2
***************
*** 44,53 ****
   	 *  \note 
   	 *  $Log$
   	 *  Revision 1.1  2005/05/03 15:41:07  generalpd
   	 *  - import of DirectoryScannerClass demos
   	 *
-  	 *
   	 */
- 
  	public class DirectoryScanner : System.Object
  	{
--- 44,54 ----
   	 *  \note 
   	 *  $Log$
+  	 *  Revision 1.2  2005/06/02 06:37:58  generalpd
+  	 *  - updated to revision 1.3
+  	 *
   	 *  Revision 1.1  2005/05/03 15:41:07  generalpd
   	 *  - import of DirectoryScannerClass demos
   	 *
   	 */
  	public class DirectoryScanner : System.Object
  	{
***************
*** 57,65 ****
  		private System.Collections.ArrayList m_oFileList;
  		// Is this class instance scanning (true) or not
! 		private bool m_boolBusy;
  		// The search pattern expression for files
! 		private string m_strSearchPatternFiles;
  		// The search pattern expression for directories
! 		private string m_strSearchPatternDirectories;
  		
  		/// framework of the OnScanComplete event handler
--- 58,66 ----
  		private System.Collections.ArrayList m_oFileList;
  		// Is this class instance scanning (true) or not
! 		private System.Boolean m_boolBusy;
  		// The search pattern expression for files
! 		private System.String m_strSearchPatternFiles;
  		// The search pattern expression for directories
! 		private System.String m_strSearchPatternDirectories;
  		
  		/// framework of the OnScanComplete event handler
***************
*** 93,104 ****
  			this.Clear();
  		
! 			m_boolBusy = false;
! 			SearchPatternFiles = "";
! 			SearchPatternDirectories = "";
  		
  			return;
  		}
  		
! 		/*! \property string SearchPatternFiles
           *  \brief Returns or sets the search pattern expression for files
           * 
--- 94,105 ----
  			this.Clear();
  		
! 			this.m_boolBusy = false;
! 			this.SearchPatternFiles = "";
! 			this.SearchPatternDirectories = "";
  		
  			return;
  		}
  		
! 		/*! \property System.String SearchPatternFiles
           *  \brief Returns or sets the search pattern expression for files
           * 
***************
*** 117,127 ****
  	 	 * 
  	 	 */
! 		public string SearchPatternFiles
  		{
! 			get { return (("" == m_strSearchPatternFiles.Trim()) ? "*" : m_strSearchPatternFiles); }
! 	 	 	set { m_strSearchPatternFiles = value; }
  	 	}
  		
! 		/*! \property string SearchPatternDirectories
           *  \brief Returns or sets the search pattern expression for directories
           * 
--- 118,128 ----
  	 	 * 
  	 	 */
! 		public System.String SearchPatternFiles
  		{
! 			get { return (("" == this.m_strSearchPatternFiles.Trim()) ? "*" : this.m_strSearchPatternFiles); }
! 	 	 	set { this.m_strSearchPatternFiles = value; }
  	 	}
  		
! 		/*! \property System.String SearchPatternDirectories
           *  \brief Returns or sets the search pattern expression for directories
           * 
***************
*** 140,150 ****
  	 	 * 
  	 	 */
! 		public string SearchPatternDirectories
  		{
! 			get { return (("" == m_strSearchPatternDirectories.Trim()) ? "*" : m_strSearchPatternDirectories); }
! 	 	 	set { m_strSearchPatternDirectories = value; }
  	 	}				
  		
! 		/*! \property bool Busy
           *  \brief Returns if this class instance is scanning or not
           * 
--- 141,151 ----
  	 	 * 
  	 	 */
! 		public System.String SearchPatternDirectories
  		{
! 			get { return (("" == this.m_strSearchPatternDirectories.Trim()) ? "*" : this.m_strSearchPatternDirectories); }
! 	 	 	set { this.m_strSearchPatternDirectories = value; }
  	 	}				
  		
! 		/*! \property System.Boolean Busy
           *  \brief Returns if this class instance is scanning or not
           * 
***************
*** 163,167 ****
  	 	 * 
  	 	 */
! 		public bool Busy { get { return m_boolBusy; } }
  		
  		/*! \property Directories
--- 164,168 ----
  	 	 * 
  	 	 */
! 		public System.Boolean Busy { get { return this.m_boolBusy; } }
  		
  		/*! \property Directories
***************
*** 186,191 ****
  			get
  			{
! 				System.IO.DirectoryInfo[] oBuffer = new System.IO.DirectoryInfo[m_oDirList.Count];
! 				m_oDirList.CopyTo(oBuffer);
  
  				return oBuffer;
--- 187,192 ----
  			get
  			{
! 				System.IO.DirectoryInfo[] oBuffer = new System.IO.DirectoryInfo[this.m_oDirList.Count];
! 				this.m_oDirList.CopyTo(oBuffer);
  
  				return oBuffer;
***************
*** 214,219 ****
  			get
  			{
! 				System.IO.FileInfo[] oBuffer = new System.IO.FileInfo[m_oFileList.Count];
! 				m_oFileList.CopyTo(oBuffer);
  				
  				return oBuffer;
--- 215,220 ----
  			get
  			{
! 				System.IO.FileInfo[] oBuffer = new System.IO.FileInfo[this.m_oFileList.Count];
! 				this.m_oFileList.CopyTo(oBuffer);
  				
  				return oBuffer;
***************
*** 261,265 ****
  		}
  
! 		/*! \fn void Start (bool Recursive)
  	  	 *  \brief Start the scan process with the following options:
  	  	 *         - scans the current path
--- 262,266 ----
  		}
  
! 		/*! \fn void Start (System.Boolean Recursive)
  	  	 *  \brief Start the scan process with the following options:
  	  	 *         - scans the current path
***************
*** 295,299 ****
  	 	 * 
  	 	 */
! 		public void Start (bool Recursive)
  		{				
  			this.Start(Recursive, System.Environment.CurrentDirectory);
--- 296,300 ----
  	 	 * 
  	 	 */
! 		public void Start (System.Boolean Recursive)
  		{				
  			this.Start(Recursive, System.Environment.CurrentDirectory);
***************
*** 302,306 ****
  		}
  
! 		/*! \fn void Start (bool Recursive, string Path)
  	  	 *  \brief Start the scan process
  	  	 * 
--- 303,307 ----
  		}
  
! 		/*! \fn void Start (System.Boolean Recursive, System.String Path)
  	  	 *  \brief Start the scan process
  	  	 * 
***************
*** 336,340 ****
  	 	 * 
  	 	 */
! 		public void Start (bool Recursive, string Path)
  		{				
  			if (this.Busy)
--- 337,341 ----
  	 	 * 
  	 	 */
! 		public void Start (System.Boolean Recursive, System.String Path)
  		{				
  			if (this.Busy)
***************
*** 385,389 ****
           * 
  	 	 */
! 		private void Scan (string Path, bool Recursive, System.Collections.ArrayList DirectoryList, System.Collections.ArrayList FileList)
  		{
  			if (!System.IO.Directory.Exists(Path))
--- 386,390 ----
           * 
  	 	 */
! 		private void Scan (System.String Path, System.Boolean Recursive, System.Collections.ArrayList DirectoryList, System.Collections.ArrayList FileList)
  		{
  			if (!System.IO.Directory.Exists(Path))
***************
*** 391,395 ****
  				throw ( new System.IO.DirectoryNotFoundException("\"" + Path + "\" does not exist!") );
  	
! 			int i = 0;
  			
  			// get dirs & files of Path
--- 392,396 ----
  				throw ( new System.IO.DirectoryNotFoundException("\"" + Path + "\" does not exist!") );
  	
! 			System.Int32 i = 0;
  			
  			// get dirs & files of Path