[Adapdev-commits] Adapdev/src/Adapdev.NVelocity/Commons/Collections ExtendedProperties.cs,1.5,1.6 PropertiesReader.cs,1.5,1.6 PropertiesTokenizer.cs,1.5,1.6

[Sean M. <int...@us...>]

Update of /cvsroot/adapdev/Adapdev/src/Adapdev.NVelocity/Commons/Collections
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18792/src/Adapdev.NVelocity/Commons/Collections

Modified Files:
	ExtendedProperties.cs PropertiesReader.cs 
	PropertiesTokenizer.cs 
Log Message:
Cleaned up several warnings
Restored some lingering files

Index: PropertiesTokenizer.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.NVelocity/Commons/Collections/PropertiesTokenizer.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PropertiesTokenizer.cs	16 Nov 2005 07:01:48 -0000	1.5
--- PropertiesTokenizer.cs	26 Nov 2005 08:09:22 -0000	1.6
***************
*** 27,31 ****
  		/// </returns>
  		//UPGRADE_TODO: The equivalent of method java.util.StringTokenizer.hasMoreTokens is not an override method. 'ms-help://MS.VSCC/commoner/redir/redirect.htm?keyword="jlca5065"'
! 		public bool HasMoreTokens()
  		{
  			return base.HasMoreTokens();
--- 27,31 ----
  		/// </returns>
  		//UPGRADE_TODO: The equivalent of method java.util.StringTokenizer.hasMoreTokens is not an override method. 'ms-help://MS.VSCC/commoner/redir/redirect.htm?keyword="jlca5065"'
! 		public new bool HasMoreTokens()
  		{
  			return base.HasMoreTokens();
***************
*** 37,41 ****
  		/// </returns>
  		//UPGRADE_TODO: The equivalent of method java.util.StringTokenizer.nextToken is not an override method. 'ms-help://MS.VSCC/commoner/redir/redirect.htm?keyword="jlca5065"'
! 		public String NextToken()
  		{
  			StringBuilder buffer = new StringBuilder();
--- 37,41 ----
  		/// </returns>
  		//UPGRADE_TODO: The equivalent of method java.util.StringTokenizer.nextToken is not an override method. 'ms-help://MS.VSCC/commoner/redir/redirect.htm?keyword="jlca5065"'
! 		public new String NextToken()
  		{
  			StringBuilder buffer = new StringBuilder();

Index: PropertiesReader.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.NVelocity/Commons/Collections/PropertiesReader.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PropertiesReader.cs	16 Nov 2005 07:01:48 -0000	1.5
--- PropertiesReader.cs	26 Nov 2005 08:09:22 -0000	1.6
***************
*** 54,58 ****
  				}
  			}
! 			catch (NullReferenceException e)
  			{
  				return null;
--- 54,58 ----
  				}
  			}
! 			catch (NullReferenceException)
  			{
  				return null;

Index: ExtendedProperties.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.NVelocity/Commons/Collections/ExtendedProperties.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ExtendedProperties.cs	16 Nov 2005 07:01:48 -0000	1.5
--- ExtendedProperties.cs	26 Nov 2005 08:09:22 -0000	1.6
***************
*** 201,205 ****
  		}
  
! 		public virtual IEnumerator Keys
  		{
  			get { return keysAsListed.GetEnumerator(); }
--- 201,205 ----
  		}
  
! 		public new IEnumerator Keys
  		{
  			get { return keysAsListed.GetEnumerator(); }
***************
*** 256,260 ****
  						reader = new PropertiesReader(new StreamReader(input, Encoding.GetEncoding(enc)));
  					}
! 					catch (IOException e)
  					{
  						// Get one with the default encoding...
--- 256,260 ----
  						reader = new PropertiesReader(new StreamReader(input, Encoding.GetEncoding(enc)));
  					}
! 					catch (IOException)
  					{
  						// Get one with the default encoding...
***************
*** 339,343 ****
  					}
  				}
! 				catch (NullReferenceException e)
  				{
  					/*
--- 339,343 ----
  					}
  				}
! 				catch (NullReferenceException)
  				{
  					/*
***************
*** 346,350 ****
  					return;
  				}
- 				reader.Close();
  			}
  		}
--- 346,349 ----