adapdev-commits

[Adapdev-commits] Adapdev/src/Adapdev.Data.Tests Adapdev.Data.Tests.csproj,1.13,1.14

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

Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data.Tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27953/src/Adapdev.Data.Tests

Modified Files:
	Adapdev.Data.Tests.csproj 
Log Message:
Fixed bug w/ dataschema saving and comparison
Fixed bugs w/ test multi-threading

Index: Adapdev.Data.Tests.csproj
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data.Tests/Adapdev.Data.Tests.csproj,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Adapdev.Data.Tests.csproj	26 Nov 2005 08:09:22 -0000	1.13
--- Adapdev.Data.Tests.csproj	27 Nov 2005 06:32:43 -0000	1.14
***************
*** 171,174 ****
--- 171,179 ----
                  />
                  <File
+                     RelPath = "Schema\CompareDatabaseSchemasTest.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "Schema\SaveDatabaseSchemaTest.cs"
                      SubType = "Code"

[Adapdev-commits] Adapdev/src/Adapdev.Data.Tests/Schema CompareDatabaseSchemasTest.cs,NONE,1.1 SaveDatabaseSchemaTest.cs,1.3,1.4

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

Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data.Tests/Schema
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27953/src/Adapdev.Data.Tests/Schema

Modified Files:
	SaveDatabaseSchemaTest.cs 
Added Files:
	CompareDatabaseSchemasTest.cs 
Log Message:
Fixed bug w/ dataschema saving and comparison
Fixed bugs w/ test multi-threading

Index: SaveDatabaseSchemaTest.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data.Tests/Schema/SaveDatabaseSchemaTest.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SaveDatabaseSchemaTest.cs	26 Nov 2005 08:09:23 -0000	1.3
--- SaveDatabaseSchemaTest.cs	27 Nov 2005 06:32:43 -0000	1.4
***************
*** 4,8 ****
  using NUnit.Framework;
  
! namespace Adapdev.Data.Tests.Schema
  {
  	/// <summary>
--- 4,8 ----
  using NUnit.Framework;
  
! namespace Adapdev.Data.Schema.Tests
  {
  	/// <summary>

--- NEW FILE: CompareDatabaseSchemasTest.cs ---
using System;
using Adapdev.Data.Schema;
using Adapdev.Serialization;
using NUnit.Framework;

namespace Adapdev.Data.Schema.Tests
{
	/// <summary>
	/// Summary description for CompareDatabaseSchemasTest.
	/// </summary>
	/// 
	[TestFixture]
	public class CompareDatabaseSchemasTest
	{
		[Test]
		public void CompareSame()
		{
			DatabaseSchema ds1 = this.CreateDatabaseSchema();
			DatabaseSchema ds2 = this.CreateDatabaseSchema();

			CompareDatabaseSchemas compare = new CompareDatabaseSchemas(ds1, ds2);
			DatabaseSchema ds3 = compare.Compare();

			Assert.IsTrue(ds3.Tables.Count == 1);
			Assert.IsTrue(ds3.GetTable("Table1").Columns.Count == 2);

			ColumnSchema column1 = ds3.GetTable("Table1").GetColumn("Column1");
			Assert.IsNotNull(column1, "Column1 could not be found");
			Assert.IsFalse(column1.IsPrimaryKey);
			Assert.AreEqual(0, column1.Length);
		}

		[Test]
		public void CompareDifferentColumns()
		{
			DatabaseSchema ds1 = this.CreateDatabaseSchema();
			DatabaseSchema ds2 = this.CreateDatabaseSchema();

			ColumnSchema column = ds2.GetTable("Table1").GetColumn("Column1");
			column.IsPrimaryKey = true;
			column.Length = 200;

			CompareDatabaseSchemas compare = new CompareDatabaseSchemas(ds1, ds2);
			DatabaseSchema ds3 = compare.Compare();

			Assert.IsTrue(ds3.Tables.Count == 1);
			Assert.IsTrue(ds3.GetTable("Table1").Columns.Count == 2);

			ColumnSchema column1 = ds3.GetTable("Table1").GetColumn("Column1");
			Assert.IsNotNull(column1, "Column1 could not be found");
			Assert.IsTrue(column1.IsPrimaryKey, "Column1 was not saved as a primary key");
			Assert.AreEqual(200, column1.Length, "Column1 length was not saved.");

		}

		[Test]
		public void CompareWithAddedColumn()
		{
			DatabaseSchema ds1 = this.CreateDatabaseSchema();
			DatabaseSchema ds2 = this.CreateDatabaseSchema();

			ColumnSchema column = ds2.GetTable("Table1").GetColumn("Column1");
			column.IsPrimaryKey = true;
			column.Length = 200;

			ColumnSchema column3 = new ColumnSchema();
			column3.Name = "Column3";
			ds1.GetTable("Table1").AddColumn(column3);

			CompareDatabaseSchemas compare = new CompareDatabaseSchemas(ds1, ds2);
			DatabaseSchema ds3 = compare.Compare();

			Assert.IsTrue(ds3.Tables.Count == 1);
			Assert.IsTrue(ds3.GetTable("Table1").Columns.Count == 3);

			ColumnSchema column1 = ds3.GetTable("Table1").GetColumn("Column1");
			Assert.IsNotNull(column1, "Column1 could not be found");
			Assert.IsTrue(column1.IsPrimaryKey, "Column1 was not saved as a primary key");
			Assert.AreEqual(200, column1.Length, "Column1 length was not saved.");

		}

		[Test]
		public void CompareWithRemovedColumn()
		{
			DatabaseSchema ds1 = this.CreateDatabaseSchema();
			DatabaseSchema ds2 = this.CreateDatabaseSchema();

			ds1.GetTable("Table1").RemoveColumn("Column1");
			Assert.IsTrue(ds1.GetTable("Table1").Columns.Count == 1, "Column1 was not removed.");

			CompareDatabaseSchemas compare = new CompareDatabaseSchemas(ds1, ds2);
			DatabaseSchema ds3 = compare.Compare();

			Console.WriteLine(ds3);
			Assert.IsTrue(ds3.Tables.Count == 1);
			Assert.IsTrue(ds3.GetTable("Table1").Columns.Count == 1, "Removed column is still present");
		}


		[Test]
		public void CompareWithAddedTable()
		{
			DatabaseSchema ds1 = this.CreateDatabaseSchema();
			DatabaseSchema ds2 = this.CreateDatabaseSchema();

			TableSchema table = new TableSchema();
			table.Name = "Table2";
			ds1.AddTable(table);

			CompareDatabaseSchemas compare = new CompareDatabaseSchemas(ds1, ds2);
			DatabaseSchema ds3 = compare.Compare();

			Assert.IsTrue(ds3.Tables.Count == 2);
		}

		[Test]
		public void CompareWithRemovedTable()
		{
			DatabaseSchema ds1 = this.CreateDatabaseSchema();
			DatabaseSchema ds2 = this.CreateDatabaseSchema();

			ds1.Tables.Remove("Table1");

			CompareDatabaseSchemas compare = new CompareDatabaseSchemas(ds1, ds2);
			DatabaseSchema ds3 = compare.Compare();

			Assert.IsTrue(ds3.Tables.Count == 1);
			Assert.AreEqual("REMOVED_Table1", ds3.GetTable("Table1").Name);
		}


		private DatabaseSchema CreateDatabaseSchema()
		{
			DatabaseSchema ds = new DatabaseSchema();
			
			TableSchema table = new TableSchema();
			table.Name = "Table1";

			ColumnSchema column1 = new ColumnSchema();
			column1.Name = "Column1";

			ColumnSchema column2 = new ColumnSchema();
			column2.Name = "Column2";

			table.AddColumn(column1);
			table.AddColumn(column2);

			ds.AddTable(table);

			return ds;

		}
			
	}
}

[Adapdev-commits] Adapdev/src/FullBuild/bin/Release - New directory

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

Update of /cvsroot/adapdev/Adapdev/src/FullBuild/bin/Release
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27835/Release

Log Message:
Directory /cvsroot/adapdev/Adapdev/src/FullBuild/bin/Release added to the repository

[Adapdev-commits] Adapdev/src/Adapdev.Data/obj/Release - New directory

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

Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data/obj/Release
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27775/Release

Log Message:
Directory /cvsroot/adapdev/Adapdev/src/Adapdev.Data/obj/Release added to the repository

[Adapdev-commits] Adapdev/src/Adapdev.Data/Sql ISelectQuery.cs,1.8,1.9 SelectQuery.cs,1.9,1.10

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

Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29386/src/Adapdev.Data/Sql

Modified Files:
	ISelectQuery.cs SelectQuery.cs 
Log Message:
Restoring some more hosed files

Index: SelectQuery.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql/SelectQuery.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** SelectQuery.cs	16 Nov 2005 07:01:48 -0000	1.9
--- SelectQuery.cs	26 Nov 2005 09:08:59 -0000	1.10
***************
*** 147,150 ****
--- 147,169 ----
  		}
  
+ 		public virtual void AddJoin(string secondTable, string firstTableColumn, string secondTableColumn, string thirdTable, string thirdTableColumn, string fourthTable, string fourthTableColumn, JoinType type)
+ 		{
+ 			this._join = String.Format(" {0} {1} ON {2}.{3} = {4}.{5} {6} {7} ON {8}.{9} = {10}.{11} ",	
+ 																			this.GetJoinType(type), 
+ 																			QueryHelper.GetPreDelimeter(this.type) + secondTable + QueryHelper.GetPostDelimeter(this.type), 
+ 																			this._table, 
+ 																			QueryHelper.GetPreDelimeter(this.type) + firstTableColumn + QueryHelper.GetPostDelimeter(this.type),
+ 																			QueryHelper.GetPreDelimeter(this.type) + secondTable + QueryHelper.GetPostDelimeter(this.type),
+ 																			QueryHelper.GetPreDelimeter(this.type) + secondTableColumn + QueryHelper.GetPostDelimeter(this.type),
+ 																			this.GetJoinType(type),
+ 																			QueryHelper.GetPreDelimeter(this.type) + fourthTable + QueryHelper.GetPostDelimeter(this.type),
+ 																			QueryHelper.GetPreDelimeter(this.type) + thirdTable + QueryHelper.GetPostDelimeter(this.type),
+ 																			QueryHelper.GetPreDelimeter(this.type) + thirdTableColumn + QueryHelper.GetPostDelimeter(this.type),
+ 																			QueryHelper.GetPreDelimeter(this.type) + fourthTable + QueryHelper.GetPostDelimeter(this.type),
+ 																			QueryHelper.GetPreDelimeter(this.type) + fourthTableColumn + QueryHelper.GetPostDelimeter(this.type));
+ 
+ 		}
+ 
+ 
  		public void SetTable(string tableName)
  		{

Index: ISelectQuery.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql/ISelectQuery.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ISelectQuery.cs	16 Nov 2005 07:01:48 -0000	1.8
--- ISelectQuery.cs	26 Nov 2005 09:08:59 -0000	1.9
***************
*** 78,81 ****
--- 78,83 ----
  		/// <param name="type">The join type</param>
  		void AddJoin(string secondTable, string firstTableColumn, string secondTableColumn, JoinType type);
+ 
+ 		void AddJoin(string secondTable, string firstTableColumn, string secondTableColumn, string thirdTable, string thirdTableColumn, string fourthTable, string fourtTableColumn, JoinType joinType);
  		/// <summary>
  		/// Set's the maximum number of records to retrieve

[Adapdev-commits] Adapdev/src/Adapdev.Data/Schema CompareDatabaseSchemas.cs,1.6,1.7 SchemaConstants.cs,1.6,1.7

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

Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29386/src/Adapdev.Data/Schema

Modified Files:
	CompareDatabaseSchemas.cs SchemaConstants.cs 
Log Message:
Restoring some more hosed files

Index: SchemaConstants.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema/SchemaConstants.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SchemaConstants.cs	16 Nov 2005 07:01:48 -0000	1.6
--- SchemaConstants.cs	26 Nov 2005 09:08:59 -0000	1.7
***************
*** 9,12 ****
--- 9,13 ----
  	{		
  		public static readonly string SCHEMAPATH = System.Environment.GetFolderPath(System.Environment.SpecialFolder.LocalApplicationData);
+ 		public static readonly string REDUNDANT = "ZZZZ";
  	}
  }

Index: CompareDatabaseSchemas.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema/CompareDatabaseSchemas.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CompareDatabaseSchemas.cs	16 Nov 2005 07:01:48 -0000	1.6
--- CompareDatabaseSchemas.cs	26 Nov 2005 09:08:59 -0000	1.7
***************
*** 25,28 ****
--- 25,34 ----
  		/// <returns>DatabaseSchema - the updated DatabaseSchema</returns>
  		public DatabaseSchema Compare()
+ 		{			
+ 			findAndUpdateTables();
+ 			return _savedDatabaseSchema;
+ 		}
+ 		
+ 		private void findAndUpdateTables()
  		{
  			foreach(TableSchema table in _databaseSchema.SortedTables.Values)
***************
*** 40,44 ****
  							}	
  						}
! 					}	
  					findAndUpdateColumns(table);				
  				}
--- 46,50 ----
  							}	
  						}
! 					}
  					findAndUpdateColumns(table);				
  				}
***************
*** 48,54 ****
  				}
  			}
! 			return _savedDatabaseSchema;
  		}
! 		
  		/// <summary>
  		/// Iterate through the ColumnSchema's for a TableSchema and update properties that are rewritable from the Database Schema
--- 54,61 ----
  				}
  			}
! 			this.markRedundantTables();
  		}
! 
! 
  		/// <summary>
  		/// Iterate through the ColumnSchema's for a TableSchema and update properties that are rewritable from the Database Schema
***************
*** 78,81 ****
--- 85,120 ----
  				}
  			}
+ 			markRedundantColumns(table.Name);
+ 		}
+ 
+ 		/// <summary>
+ 		/// Mark a column that no longer exits in the DB schema but is in our saved schema
+ 		/// </summary>
+ 		/// <param name="tableNameToUpdate">String</param>
+ 		private void markRedundantColumns(String tableNameToUpdate)
+ 		{	
+ 			foreach(ColumnSchema column in this._savedDatabaseSchema.GetTable(tableNameToUpdate).SortedColumns.Values)
+ 			{
+ 				if(null == this._databaseSchema.GetTable(tableNameToUpdate).GetColumn(column.Name))
+ 				{
+ 					this._savedDatabaseSchema.GetTable(tableNameToUpdate).GetColumn(column.Name).IsActive = false;
+ 					this._savedDatabaseSchema.GetTable(tableNameToUpdate).GetColumn(column.Name).Name = SchemaConstants.REDUNDANT + column.Name;
+ 				}
+ 			}
+ 		}
+ 
+ 		/// <summary>
+ 		/// Mark a table that no longer exits in the DB schema but is in our saved schema
+ 		/// </summary>
+ 		private void markRedundantTables()
+ 		{	
+ 			foreach(TableSchema table in this._savedDatabaseSchema.SortedTables.Values)
+ 			{	
+ 				if(null == this._databaseSchema.GetTable(table.Name))
+ 				{
+ 					this._savedDatabaseSchema.GetTable(table.Name).IsActive = false;
+ 					this._savedDatabaseSchema.GetTable(table.Name).Name = SchemaConstants.REDUNDANT + table.Name;
+ 				}
+ 			}
  		}
  
***************
*** 117,119 ****
  		
  	}
! }
--- 156,158 ----
  		
  	}
! }
\ No newline at end of file

[Adapdev-commits] Adapdev/src/Adapdev.Tests ObjectComparerTest.cs,1.5,1.6

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

Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29386/src/Adapdev.Tests

Modified Files:
	ObjectComparerTest.cs 
Log Message:
Restoring some more hosed files

Index: ObjectComparerTest.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Tests/ObjectComparerTest.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ObjectComparerTest.cs	16 Nov 2005 07:01:52 -0000	1.5
--- ObjectComparerTest.cs	26 Nov 2005 09:09:00 -0000	1.6
***************
*** 30,33 ****
--- 30,34 ----
  			e2.Created = now;
  
+ 			// Uses ISerializable comparison
  			Assert.IsTrue(ObjectComparer.AreEqual(e1, e2), "Objects should be equal.");
  
***************
*** 60,92 ****
  			Assert.IsFalse(ObjectComparer.AreEqual(e1, e2, true), "Objects should not be equal because InternalCreated is different.");
  		}
- 
- 		[Test]
- 		public void FailAreEqualWithFieldsSerialization()
- 		{
- 			DateTime now = DateTime.Now;
- 
- 			SuppliersEntity e1 = new SuppliersEntity();
- 			e1.Address = "Test";
- 			e1.SupplierID = 12;
- 			e1.Created = now;
- 
- 			SuppliersEntity e2 = new SuppliersEntity();
- 			e2.Address = "Test";
- 			e2.SupplierID = 12;
- 			e2.Created = now;
- 
- 			string a = Serializer.SerializeToXml(e1);
- 			string b = Serializer.SerializeToXml(e2);
- 
- 			Console.WriteLine(a);
- 			Console.WriteLine(b);
- 			Assert.IsTrue(a == b, "Objects should be equal.");
- 
- 			e2.Created = DateTime.Now.AddHours(1);
- 
- //			byte[] c = Serializer.SerializeToBinary(e2);
- //
- //			Assert.IsFalse(a == c, "Objects should not be equal.");
- 		}
  	}
  }
--- 61,64 ----

[Adapdev-commits] Adapdev/src/Adapdev.Web/Html HtmlParser.cs,1.4,1.5

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

Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Web/Html
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26163/src/Adapdev.Web/Html

Modified Files:
	HtmlParser.cs 
Log Message:


Index: HtmlParser.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Web/Html/HtmlParser.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** HtmlParser.cs	16 Nov 2005 07:02:00 -0000	1.4
--- HtmlParser.cs	26 Nov 2005 08:51:25 -0000	1.5
***************
*** 179,190 ****
  						if( "SCRIPT".Equals( element.Name.ToUpper() ) && ! element.IsClosed )
  						{
! 							bool ignoreSingleQuotes = true;
! 							/*
! 							 * TODO: Is VBScript the only fella that uses single quotes in a manner other than to quote things...?
! 							if( element.Attributes[ "VBSCRIPT" ] == null )
  							{
  								ignoreSingleQuotes = true;
  							}
- 							*/
  							String script = "";
  							inChar = ExtractScript( reader , ref script , inChar , ignoreSingleQuotes );
--- 179,188 ----
  						if( "SCRIPT".Equals( element.Name.ToUpper() ) && ! element.IsClosed )
  						{
! 							bool ignoreSingleQuotes = false;
! 							HtmlAttribute langAttr = element.Attributes[ "lang" ];
! 							if( langAttr != null && langAttr.Value != null && "vbscript".Equals( langAttr.Value.ToLower() ) )
  							{
  								ignoreSingleQuotes = true;
  							}
  							String script = "";
  							inChar = ExtractScript( reader , ref script , inChar , ignoreSingleQuotes );
***************
*** 199,202 ****
--- 197,207 ----
  							OnElementClose( document , new HtmlElementClose( element.Name ) );
  						}
+ 						else if( "TEXTAREA".Equals( element.Name.ToUpper() ) && ! element.IsClosed )
+ 						{
+ 							String textAreaContents = "";
+ 							inChar = ExtractTextArea( reader , ref textAreaContents , inChar );
+ 							OnText( document , new HtmlText( textAreaContents ) );
+ 							OnElementClose( document , new HtmlElementClose( element.Name ) );
+ 						}
  					}
  					else if( node != null )
***************
*** 417,429 ****
  		private int ExtractScript(TextReader reader,ref string text,int inChar,bool ignoreSingleQuotes)
  		{
! 			return ExtractUntil( reader , "</SCRIPT>" , ref text , inChar , "Script not closed" , true , ignoreSingleQuotes );
  		}
  
  		private int ExtractStyle(TextReader reader,ref string text,int inChar)
  		{
! 			return ExtractUntil( reader , "</STYLE>" , ref text , inChar , "Style not closed" , true , false );
  		}
  
! 		private int ExtractUntil(TextReader reader,String terminatorText,ref string text,int inChar,string failMessage,bool respectQuotationMarks,bool ignoreSingleQuotes)
  		{
  			StringBuilder comment = new StringBuilder();
--- 422,476 ----
  		private int ExtractScript(TextReader reader,ref string text,int inChar,bool ignoreSingleQuotes)
  		{
! 			return ExtractUntil( reader , "</SCRIPT>" , ref text , inChar , "Script not closed" , true , ignoreSingleQuotes, false, true );
  		}
  
  		private int ExtractStyle(TextReader reader,ref string text,int inChar)
  		{
! 			return ExtractUntil( reader , "</STYLE>" , ref text , inChar , "Style not closed" , true , false , true, false);
  		}
  
! 		private int ExtractTextArea(TextReader reader,ref string text,int inChar)
! 		{
! 			return ExtractBasicUntil( reader , "</TEXTAREA>" , ref text , inChar , "TextArea not closed" );
! 		}
! 
! 		private int ExtractBasicUntil(TextReader reader,String terminatorText,ref string text,int inChar,string failMessage)
! 		{
! 			StringBuilder comment = new StringBuilder();
! 			char[] terms = terminatorText.ToUpper().ToCharArray();
! 			char[] cTemp = new char [ terms.Length ];
! 			cTemp[ cTemp.Length - 1 ] = (char) inChar;
! 			while( inChar != END_OF_FILE )
! 			{
! 				int i = 0;
! 				for( i = 0 ; i < terms.Length ; i++ )
! 				{
! 					if( terms[i] != char.ToUpper( cTemp[i] ) ) break;
! 				}
! 				if( i == terms.Length ) break;
! 				for( i = 0 ; i < cTemp.Length - 1 ; i++ )
! 				{
! 					cTemp[ i ] = cTemp[ i + 1];
! 				}
! 				cTemp[ cTemp.Length - 1 ] = (char) inChar;
! 				comment.Append( (char) inChar );
! 				inChar = reader.Read();
! 			}
! 			text = comment.ToString();
! 			if( text.Length >= terminatorText.Length && text.Substring( text.Length - terminatorText.Length ).ToUpper().Equals( terminatorText.ToUpper() ) )
! 			{
! 				text = text.Substring( 0 , text.Length - terminatorText.Length );
! 			}
! 			else
! 			{
! 				if( ! IgnoreErrors )
! 				{
! 					throw new HtmlParserException( failMessage , mLineNumber );
! 				}
! 			}
! 			return inChar;
! 		}
! 
! 		private int ExtractUntil(TextReader reader,String terminatorText,ref string text,int inChar,string failMessage,bool respectQuotationMarks,bool ignoreSingleQuotes, bool hasCssCommments, bool hasJsComments)
  		{
  			StringBuilder comment = new StringBuilder();
***************
*** 433,436 ****
--- 480,487 ----
  			bool inDoubleQuotes = false;
  			bool inSingleQuotes = false;
+ 			bool inComment = false;
+ 			int c0 = 0;
+ 			int c1 = 0;
+ 			int c2 = inChar;
  			if( inChar == '\"' ) inDoubleQuotes = true;
  			if( inChar == '\'' ) inSingleQuotes = true;
***************
*** 464,471 ****
  				cTemp[ cTemp.Length - 1 ] = (char) inChar;
  				int oldChar = inChar;
  				inChar = reader.Read();
! 				if( inChar == '\"' && ! inSingleQuotes && ! ( oldChar == '\\' ) ) inDoubleQuotes = !inDoubleQuotes;
! 				if( inChar == '\'' && ! inDoubleQuotes && ! ( oldChar == '\\' ) ) inSingleQuotes = !inSingleQuotes;
! 				if( inChar == '\n' ) mLineNumber++;
  			}
  			text = comment.ToString();
--- 515,554 ----
  				cTemp[ cTemp.Length - 1 ] = (char) inChar;
  				int oldChar = inChar;
+ 				c0 = c1;
+ 				c1 = c2;
+ 				c2 = inChar;
  				inChar = reader.Read();
! 
! 				if (!inComment && !inSingleQuotes && !inDoubleQuotes && (hasCssCommments || hasJsComments) && ('/' == (char) c2) && ('*' == (char) inChar))
! 				{
! 					string s = "";
! 					inChar = ExtractJScriptComment(reader, ref s, inChar);
! 					comment.Append(s);
! 					comment.Append("*/");
! 					c0 = 0;
! 					c1 = 0;
! 					c2 = 0;
! 				}
! 				if (!inComment && !inSingleQuotes && !inDoubleQuotes && (hasCssCommments || hasJsComments) && ('<' == (char) c0) && ('!' == (char) c1) && ('-' == (char) c2) && ('-' == (char) inChar))
! 				{
! 					string s = "";
! 					inChar = ExtractComment(reader, ref s, inChar);
! 					comment.Append(s);
! 					comment.Append("-->");
! 					c0 = 0;
! 					c1 = 0;
! 					c2 = 0;
! 				}
! 				if (!inComment && !inSingleQuotes && !inDoubleQuotes && hasJsComments && ('/' == (char) c2) && ('/' == (char) inChar))
! 				{
! 					inComment = true;
! 				}
! 				if( inChar == '\"' && ! inSingleQuotes && !inComment && ! ( oldChar == '\\' ) ) inDoubleQuotes = !inDoubleQuotes;
! 				if( inChar == '\'' && ! inDoubleQuotes && !inComment && ! ( oldChar == '\\' ) ) inSingleQuotes = !inSingleQuotes;
! 				if( inChar == '\n' )
! 				{
! 					mLineNumber++;
! 					inComment = false;
! 				}
  			}
  			text = comment.ToString();
***************
*** 523,526 ****
--- 606,648 ----
  		}
  
+ 		// Catalyst function
+ 		private int ExtractJScriptComment(TextReader reader,ref String text,int inChar)
+ 		{
+ 			StringBuilder comment = new StringBuilder();
+ 			int c1=0;
+ 			while( inChar != END_OF_FILE )
+ 			{
+ 				if( c1 == '*' && inChar == '/' )
+ 				{
+ 					break;
+ 				}
+ 				comment.Append( (char) inChar );
+ 				c1 = inChar;
+ 				inChar = reader.Read();
+ 				if( inChar == '\n' ) mLineNumber++;
+ 			}
+ 			if( comment.Length > 1 )
+ 			{
+ 				text = comment.ToString().Substring( 0 , comment.Length - 2 );
+ 			}
+ 			else
+ 			{
+ 				text = "";
+ 			}
+ 			if( inChar == '/' )
+ 			{
+ 				inChar = reader.Read();
+ 				if( inChar == '\n' ) mLineNumber++;
+ 			}
+ 			else
+ 			{
+ 				if( ! IgnoreErrors )
+ 				{
+ 					throw new HtmlParserException( "Comment not closed" , mLineNumber );
+ 				}
+ 			}
+ 			return inChar;
+ 		}
+ 
  		private int ExtractSGMLComment(TextReader reader,ref String text,int inChar)
  		{

[Adapdev-commits] Adapdev/src/Adapdev ObjectComparer.cs,1.9,1.10

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

Update of /cvsroot/adapdev/Adapdev/src/Adapdev
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26163/src/Adapdev

Modified Files:
	ObjectComparer.cs 
Log Message:


Index: ObjectComparer.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev/ObjectComparer.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ObjectComparer.cs	16 Nov 2005 07:02:01 -0000	1.9
--- ObjectComparer.cs	26 Nov 2005 08:51:25 -0000	1.10
***************
*** 1,5 ****
--- 1,7 ----
  using System;
  using System.Reflection;
+ using System.Runtime.Serialization;
  using Adapdev.Reflection;
+ using Adapdev.Serialization;
  
  namespace Adapdev
***************
*** 14,17 ****
--- 16,24 ----
  		}
  
+ 		public static bool AreEqual(ISerializable x, ISerializable y)
+ 		{
+ 			return AreBytesEqual(Serializer.SerializeToBinary(x), Serializer.SerializeToBinary(y));
+ 		}
+ 
  		public static bool AreEqual(object x, object y)
  		{
***************
*** 59,62 ****
--- 66,86 ----
  			return true;
  		}
+ 
+ 		public static bool AreBytesEqual(byte[] a, byte[] b)
+ 		{
+ 			int i=0;
+ 			bool same=true;
+ 			do
+ 			{
+ 				if(a[i]!=b[i])
+ 				{
+ 					same=false;
+ 					break;
+ 				}
+ 				i++;
+ 			}while(i<a.Length);	
+ 		
+ 			return same;
+ 		}
  	}
  }

[Adapdev-commits] Adapdev/src/Adapdev.Tests/XPath XPathObjectNavigatorTest.cs,1.4,1.5

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

Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Tests/XPath
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22905/src/Adapdev.Tests/XPath

Modified Files:
	XPathObjectNavigatorTest.cs 
Log Message:
Removed Assert inheritance

Index: XPathObjectNavigatorTest.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Tests/XPath/XPathObjectNavigatorTest.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** XPathObjectNavigatorTest.cs	26 Nov 2005 08:09:23 -0000	1.4
--- XPathObjectNavigatorTest.cs	26 Nov 2005 08:27:35 -0000	1.5
***************
*** 219,223 ****
  	/// </summary>
  	[TestFixture]
! 	public class XPathObjectNavigatorTest : Assert
  	{
  		[Test]
--- 219,223 ----
  	/// </summary>
  	[TestFixture]
! 	public class XPathObjectNavigatorTest
  	{
  		[Test]

[Adapdev-commits] Adapdev/src/Adapdev.Tests/Text/Indexing FullTextSearchTests.cs,1.4,1.5 SearchResultTest.cs,1.4,1.5 StringTokenizerTest.cs,1.4,1.5 WordFilterTest.cs,1.4,1.5

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

Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Tests/Text/Indexing
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22905/src/Adapdev.Tests/Text/Indexing

Modified Files:
	FullTextSearchTests.cs SearchResultTest.cs 
	StringTokenizerTest.cs WordFilterTest.cs 
Log Message:
Removed Assert inheritance

Index: StringTokenizerTest.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Tests/Text/Indexing/StringTokenizerTest.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** StringTokenizerTest.cs	26 Nov 2005 08:09:23 -0000	1.4
--- StringTokenizerTest.cs	26 Nov 2005 08:27:35 -0000	1.5
***************
*** 42,46 ****
  	/// </summary>
  	[TestFixture]
! 	public class StringTokenizerTest : Assert
  	{
  		[Test]
--- 42,46 ----
  	/// </summary>
  	[TestFixture]
! 	public class StringTokenizerTest
  	{
  		[Test]

Index: FullTextSearchTests.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Tests/Text/Indexing/FullTextSearchTests.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FullTextSearchTests.cs	26 Nov 2005 08:09:23 -0000	1.4
--- FullTextSearchTests.cs	26 Nov 2005 08:27:35 -0000	1.5
***************
*** 43,47 ****
  	/// </summary>
  	[TestFixture]
! 	public class FullTextSearchTests : Assert
  	{
  		IIndex _index;
--- 43,47 ----
  	/// </summary>
  	[TestFixture]
! 	public class FullTextSearchTests
  	{
  		IIndex _index;
***************
*** 242,246 ****
  				if (!result.Contains(record))
  				{
! 					Fail(string.Format("Expected record \"{0}\"!", record["Title"]));
  				}
  			}
--- 242,246 ----
  				if (!result.Contains(record))
  				{
! 					Assert.Fail(string.Format("Expected record \"{0}\"!", record["Title"]));
  				}
  			}

Index: SearchResultTest.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Tests/Text/Indexing/SearchResultTest.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SearchResultTest.cs	26 Nov 2005 08:09:23 -0000	1.4
--- SearchResultTest.cs	26 Nov 2005 08:27:35 -0000	1.5
***************
*** 70,74 ****
  	/// </summary>
  	[TestFixture]
! 	public class SearchResultTest : Assert
  	{
  		HashtableRecord _record1;
--- 70,74 ----
  	/// </summary>
  	[TestFixture]
! 	public class SearchResultTest
  	{
  		HashtableRecord _record1;

Index: WordFilterTest.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Tests/Text/Indexing/WordFilterTest.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** WordFilterTest.cs	26 Nov 2005 08:09:23 -0000	1.4
--- WordFilterTest.cs	26 Nov 2005 08:27:35 -0000	1.5
***************
*** 42,46 ****
  	/// </summary>
  	[TestFixture]
! 	public class WordFilterTest : Assert
  	{
  		[Test]
--- 42,46 ----
  	/// </summary>
  	[TestFixture]
! 	public class WordFilterTest
  	{
  		[Test]

[Adapdev-commits] Adapdev/src/Adapdev.Tests/Reflection ClassAccessorCacheTest.cs,1.4,1.5

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

Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Tests/Reflection
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22905/src/Adapdev.Tests/Reflection

Modified Files:
	ClassAccessorCacheTest.cs 
Log Message:
Removed Assert inheritance

Index: ClassAccessorCacheTest.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Tests/Reflection/ClassAccessorCacheTest.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ClassAccessorCacheTest.cs	26 Nov 2005 08:09:23 -0000	1.4
--- ClassAccessorCacheTest.cs	26 Nov 2005 08:27:35 -0000	1.5
***************
*** 59,63 ****
  			ClassAccessor c = ClassAccessorCache.Get(o);
  			c.LoadAllProperties();
! 			Console.WriteLine(ClassAccessorCache.Properties());
  		}
  	}
--- 59,63 ----
  			ClassAccessor c = ClassAccessorCache.Get(o);
  			c.LoadAllProperties();
! 			Console.WriteLine(ClassAccessorCache.ToString());
  		}
  	}

[Adapdev-commits] Adapdev/src/Adapdev.NVelocity/Runtime/Parser Parser.cs,1.5,1.6 ParserTokenManager.cs,1.5,1.6

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

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

Modified Files:
	Parser.cs ParserTokenManager.cs 
Log Message:
Cleaned up several warnings
Restored some lingering files

Index: ParserTokenManager.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.NVelocity/Runtime/Parser/ParserTokenManager.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ParserTokenManager.cs	16 Nov 2005 07:01:50 -0000	1.5
--- ParserTokenManager.cs	26 Nov 2005 08:09:23 -0000	1.6
***************
*** 41,45 ****
  			}
  				// was EmptyStackException
! 			catch (InvalidOperationException e)
  			{
  				lparen = 0;
--- 41,45 ----
  			}
  				// was EmptyStackException
! 			catch (InvalidOperationException)
  			{
[...1126 lines suppressed...]
  							}
--- 3884,3888 ----
  								continue;
  							}
! 							catch (IOException)
  							{
  							}
***************
*** 3909,3913 ****
  							input_stream.backup(1);
  						}
! 						catch (IOException e1)
  						{
  							EOFSeen = true;
--- 3897,3901 ----
  							input_stream.backup(1);
  						}
! 						catch (IOException)
  						{
  							EOFSeen = true;

Index: Parser.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.NVelocity/Runtime/Parser/Parser.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Parser.cs	16 Nov 2005 07:01:50 -0000	1.5
--- Parser.cs	26 Nov 2005 08:09:23 -0000	1.6
***************
*** 305,309 ****
  				}
  			}
- 			throw new ApplicationException("Missing return statement in function");
  		}
  
--- 305,308 ----
***************
*** 943,947 ****
  				}
  			}
- 			throw new ApplicationException("Missing return statement in function");
  		}
  
--- 942,945 ----
***************
*** 4866,4870 ****
  		private int jj_la;
  		public bool lookingAhead = false;
! 		private bool jj_semLA;
  		private int jj_gen;
  		//UPGRADE_NOTE: Final was removed from the declaration of 'jj_la1 '. 'ms-help://MS.VSCC/commoner/redir/redirect.htm?keyword="jlca1003"'
--- 4864,4868 ----
  		private int jj_la;
  		public bool lookingAhead = false;
! 		
  		private int jj_gen;
  		//UPGRADE_NOTE: Final was removed from the declaration of 'jj_la1 '. 'ms-help://MS.VSCC/commoner/redir/redirect.htm?keyword="jlca1003"'

[Adapdev-commits] Adapdev/src/Adapdev.NVelocity/Runtime/Resource ResourceManagerImpl.cs,1.5,1.6

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

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

Modified Files:
	ResourceManagerImpl.cs 
Log Message:
Cleaned up several warnings
Restored some lingering files

Index: ResourceManagerImpl.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.NVelocity/Runtime/Resource/ResourceManagerImpl.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ResourceManagerImpl.cs	16 Nov 2005 07:01:51 -0000	1.5
--- ResourceManagerImpl.cs	26 Nov 2005 08:09:23 -0000	1.6
***************
*** 146,150 ****
  					o = Activator.CreateInstance(type);
  				}
! 				catch (Exception cnfe)
  				{
  					String err = "The specified class for ResourceCache (" + claz + ") does not exist (or is not accessible to the current classlaoder).";
--- 146,150 ----
  					o = Activator.CreateInstance(type);
  				}
! 				catch (Exception)
  				{
  					String err = "The specified class for ResourceCache (" + claz + ") does not exist (or is not accessible to the current classlaoder).";
***************
*** 269,273 ****
  					refreshResource(resource, encoding);
  				}
! 				catch (ResourceNotFoundException rnfe)
  				{
  					/*
--- 269,273 ----
  					refreshResource(resource, encoding);
  				}
! 				catch (ResourceNotFoundException)
  				{
  					/*
***************
*** 400,404 ****
  					}
  				}
! 				catch (ResourceNotFoundException rnfe)
  				{
  					/*
--- 400,404 ----
  					}
  				}
! 				catch (ResourceNotFoundException)
  				{
  					/*
***************
*** 565,569 ****
  					}
  				}
! 				catch (ResourceNotFoundException e)
  				{
  					/*
--- 565,569 ----
  					}
  				}
! 				catch (ResourceNotFoundException)
  				{
  					/*
***************
*** 583,587 ****
  							is_Renamed.Close();
  						}
! 						catch (IOException ioe)
  						{
  						}
--- 583,587 ----
  							is_Renamed.Close();
  						}
! 						catch (IOException)
  						{
  						}

[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 ----

[Adapdev-commits] Adapdev/src/Adapdev.NVelocity/Runtime/Directive Parse.cs,1.5,1.6 ParseDirectiveException.cs,1.5,1.6

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

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

Modified Files:
	Parse.cs ParseDirectiveException.cs 
Log Message:
Cleaned up several warnings
Restored some lingering files

Index: Parse.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.NVelocity/Runtime/Directive/Parse.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Parse.cs	16 Nov 2005 07:01:50 -0000	1.5
--- Parse.cs	26 Nov 2005 08:09:22 -0000	1.6
***************
*** 101,106 ****
  		}
  
- 		private bool ready = false;
- 
  		/// <summary> Return name of this directive.
  		/// </summary>
--- 101,104 ----

Index: ParseDirectiveException.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.NVelocity/Runtime/Directive/ParseDirectiveException.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ParseDirectiveException.cs	16 Nov 2005 07:01:50 -0000	1.5
--- ParseDirectiveException.cs	26 Nov 2005 08:09:22 -0000	1.6
***************
*** 88,92 ****
  					}
  				}
! 				catch (Exception e)
  				{
  				}
--- 88,92 ----
  					}
  				}
! 				catch (Exception)
  				{
  				}

[Adapdev-commits] Adapdev/src/Adapdev.Data/Schema ColumnSchema.cs,1.12,1.13 DatabaseSchema.cs,1.9,1.10 ForeignKeyAssociation.cs,1.8,1.9 OleDbSchemaBuilder.cs,1.7,1.8 SaveDatabaseSchema.cs,1.6,1.7 TableSchema.cs,1.11,1.12

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

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

Modified Files:
	ColumnSchema.cs DatabaseSchema.cs ForeignKeyAssociation.cs 
	OleDbSchemaBuilder.cs SaveDatabaseSchema.cs TableSchema.cs 
Log Message:
Cleaned up several warnings
Restored some lingering files

Index: DatabaseSchema.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema/DatabaseSchema.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** DatabaseSchema.cs	16 Nov 2005 07:01:48 -0000	1.9
--- DatabaseSchema.cs	26 Nov 2005 08:09:22 -0000	1.10
***************
*** 1,2 ****
--- 1,3 ----
+ using System.ComponentModel;
  using System.Xml.Serialization;
  
***************
*** 115,118 ****
--- 116,122 ----
  		/// </summary>
  		/// <returns>SortedList</returns>
+ 		/// 
+ 		[XmlIgnore]
+ 		[Browsable(false)]
  		public SortedList SortedTables
  		{

Index: TableSchema.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema/TableSchema.cs,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** TableSchema.cs	16 Nov 2005 07:01:48 -0000	1.11
--- TableSchema.cs	26 Nov 2005 08:09:22 -0000	1.12
***************
*** 1,2 ****
--- 1,4 ----
+ using System.ComponentModel;
+ 
  namespace Adapdev.Data.Schema
  {
***************
*** 151,154 ****
--- 153,157 ----
  		/// <returns></returns>
  		[XmlIgnore]
+ 		[Browsable(false)]
  		public SortedList OrdinalColumns
  		{
***************
*** 169,172 ****
--- 172,176 ----
  		/// <returns></returns>
  		[XmlIgnore]
+ 		[Browsable(false)]
  		public SortedList SortedColumns
  		{
***************
*** 258,262 ****
--- 262,269 ----
  		/// </summary>
  		/// <returns></returns>
+ 		/// 
+ 		[Browsable(false)]
  		[XmlElement(Type = typeof(ColumnSchemaDictionary), ElementName = "Columns")]
+ 		[SchemaDataRewritableAttribute(true)]
  		public ColumnSchemaDictionary Columns
  		{
***************
*** 269,272 ****
--- 276,281 ----
  		/// </summary>
  		/// <returns></returns>
+ 		/// 
+ 		[Browsable(false)]
  		[XmlElement(Type = typeof(ColumnSchemaDictionary), ElementName = "PrimaryKeys")]
  		public ColumnSchemaDictionary PrimaryKeys
***************
*** 287,290 ****
--- 296,301 ----
  		/// </summary>
  		/// <returns></returns>
+ 		/// 
+ 		[Browsable(false)]
  		[XmlElement(Type = typeof(ColumnSchemaDictionary), ElementName = "ForeignKeys")]
  		public ColumnSchemaDictionary ForeignKeys
***************
*** 301,304 ****
--- 312,316 ----
  		}
  
+ 		[Browsable(false)]
  		public override string ToString()
  		{

Index: ForeignKeyAssociation.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema/ForeignKeyAssociation.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ForeignKeyAssociation.cs	16 Nov 2005 07:01:48 -0000	1.8
--- ForeignKeyAssociation.cs	26 Nov 2005 08:09:22 -0000	1.9
***************
*** 1,3 ****
--- 1,4 ----
  using System;
+ using System.ComponentModel;
  
  namespace Adapdev.Data.Schema
***************
*** 10,13 ****
--- 11,15 ----
  	public class ForeignKeyAssociation
  	{
+ 		private TableSchema _table = null;
  		private ColumnSchema _foreignColumn = null;
  		private TableSchema _foreignTable = null;
***************
*** 15,18 ****
--- 17,21 ----
  		private AssociationType _association = AssociationType.OneToMany;
  		
+ 		[Browsable(false)]
  		public ColumnSchema ForeignColumn
  		{
***************
*** 26,29 ****
--- 29,33 ----
  		}
  
+ 		[Browsable(false)]
  		public ColumnSchema Column
  		{
***************
*** 37,40 ****
--- 41,45 ----
  		}
  
+ 		[Browsable(false)]
  		public TableSchema ForeignTable
  		{
***************
*** 50,54 ****
  		public string ForeignKeyName
  		{
! 			get{return this.ColumnName + "-" + this.ForeignTableName + "." + this.ForeignColumnName;}
  		}
  
--- 55,59 ----
  		public string ForeignKeyName
  		{
! 			get{return this._table.Name + "." + this.ColumnName + "-" + this.ForeignTableName + "." + this.ForeignColumnName;}
  		}
  
***************
*** 59,64 ****
  		}
  
! 		public ForeignKeyAssociation(ColumnSchema columnSchema, ColumnSchema foreignColumn, TableSchema foreignTable)
  		{
  			this._columnSchema = columnSchema;
  			this._foreignColumn = foreignColumn;
--- 64,70 ----
  		}
  
! 		public ForeignKeyAssociation(TableSchema table, ColumnSchema columnSchema, TableSchema foreignTable, ColumnSchema foreignColumn)
  		{
+ 			this._table = table;
  			this._columnSchema = columnSchema;
  			this._foreignColumn = foreignColumn;
***************
*** 66,70 ****
  		}
  
! 
  		public override string ToString()
  		{
--- 72,76 ----
  		}
  
! 		[Browsable(false)]
  		public override string ToString()
  		{

Index: SaveDatabaseSchema.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema/SaveDatabaseSchema.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SaveDatabaseSchema.cs	16 Nov 2005 07:01:48 -0000	1.6
--- SaveDatabaseSchema.cs	26 Nov 2005 08:09:22 -0000	1.7
***************
*** 1,3 ****
--- 1,4 ----
  using System;
+ using Adapdev.Serialization;
  
  namespace Adapdev.Data.Schema
***************
*** 27,34 ****
  		{	
  			schemaFile = System.IO.Path.Combine(SchemaConstants.SCHEMAPATH,_savedSchemaName);
! 			XmlSerializer dbSerializer = new XmlSerializer(typeof(DatabaseSchema));
! 			StreamWriter schemaWriter = new StreamWriter(schemaFile);
! 			dbSerializer.Serialize(schemaWriter, _dbSchema);
! 			schemaWriter.Close();
  		}
  	}
--- 28,32 ----
  		{	
  			schemaFile = System.IO.Path.Combine(SchemaConstants.SCHEMAPATH,_savedSchemaName);
! 			Serializer.SerializeToXmlFile(this._dbSchema, schemaFile);
  		}
  	}

Index: ColumnSchema.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema/ColumnSchema.cs,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ColumnSchema.cs	16 Nov 2005 07:01:48 -0000	1.12
--- ColumnSchema.cs	26 Nov 2005 08:09:22 -0000	1.13
***************
*** 1,2 ****
--- 1,4 ----
+ using System.ComponentModel;
+ 
  namespace Adapdev.Data.Schema
  {
***************
*** 31,35 ****
  		private string _defaultTestValue = String.Empty;
  		private ArrayList _fkReferences = new ArrayList();
- 		private TableSchema _parent = null;
  
  		/// <summary>
--- 33,36 ----
***************
*** 185,189 ****
  		/// </summary>
  		[XmlAttribute]
! 		[SchemaDataRewritableAttribute(false)]
  		public string Alias
  		{
--- 186,190 ----
  		/// </summary>
  		[XmlAttribute]
! 		[SchemaDataRewritableAttribute(true)]
  		public string Alias
  		{
***************
*** 212,216 ****
  		/// <value></value>
  		[XmlAttribute]
! 		[SchemaDataRewritableAttribute(false)]
  		public string DefaultValue
  		{
--- 213,217 ----
  		/// <value></value>
  		[XmlAttribute]
! 		[SchemaDataRewritableAttribute(true)]
  		public string DefaultValue
  		{
***************
*** 224,228 ****
  		/// <value></value>
  		[XmlAttribute]
! 		[SchemaDataRewritableAttribute(false)]
  		public string DefaultTestValue
  		{
--- 225,229 ----
  		/// <value></value>
  		[XmlAttribute]
! 		[SchemaDataRewritableAttribute(true)]
  		public string DefaultTestValue
  		{
***************
*** 236,239 ****
--- 237,241 ----
  		/// <value></value>
  		[XmlIgnore]
+ 		[Browsable(false)]
  		public ArrayList ForeignKeyTables
  		{
***************
*** 280,283 ****
--- 282,286 ----
  		}
  
+ 		[Browsable(false)]
  		public override string ToString()
  		{

Index: OleDbSchemaBuilder.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema/OleDbSchemaBuilder.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** OleDbSchemaBuilder.cs	16 Nov 2005 07:01:48 -0000	1.7
--- OleDbSchemaBuilder.cs	26 Nov 2005 08:09:22 -0000	1.8
***************
*** 128,132 ****
  								{
  									// Add the association to the table and column containing the foreign key
! 									ci.ForeignKeyTables.Add(new ForeignKeyAssociation(ci, cf ,fk));
  								}
  							}
--- 128,132 ----
  								{
  									// Add the association to the table and column containing the foreign key
! 									ci.ForeignKeyTables.Add(new ForeignKeyAssociation(tif, ci, fk ,cf));
  								}
  							}

[Adapdev-commits] Adapdev/src/Adapdev.NVelocity/Runtime/Resource/Loader FileResourceLoader.cs,1.5,1.6 ResourceLocator.cs,1.5,1.6

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

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

Modified Files:
	FileResourceLoader.cs ResourceLocator.cs 
Log Message:
Cleaned up several warnings
Restored some lingering files

Index: ResourceLocator.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.NVelocity/Runtime/Resource/Loader/ResourceLocator.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ResourceLocator.cs	16 Nov 2005 07:01:51 -0000	1.5
--- ResourceLocator.cs	26 Nov 2005 08:09:23 -0000	1.6
***************
*** 134,138 ****
  				}
  			}
! 			catch (FileNotFoundException fnfe)
  			{
  				/*
--- 134,138 ----
  				}
  			}
! 			catch (FileNotFoundException)
  			{
  				/*

Index: FileResourceLoader.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.NVelocity/Runtime/Resource/Loader/FileResourceLoader.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FileResourceLoader.cs	16 Nov 2005 07:01:51 -0000	1.5
--- FileResourceLoader.cs	26 Nov 2005 08:09:23 -0000	1.6
***************
*** 140,144 ****
  				}
  			}
! 			catch (FileNotFoundException fnfe)
  			{
  				// log and convert to a general Velocity ResourceNotFoundException
--- 140,144 ----
  				}
  			}
! 			catch (FileNotFoundException)
  			{
  				// log and convert to a general Velocity ResourceNotFoundException

[Adapdev-commits] Adapdev/src/Adapdev.NVelocity/Runtime/Parser/Node ASTMethod.cs,1.5,1.6 ASTReference.cs,1.5,1.6 GetExecutor.cs,1.5,1.6 PropertyExecutor.cs,1.5,1.6

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

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

Modified Files:
	ASTMethod.cs ASTReference.cs GetExecutor.cs 
	PropertyExecutor.cs 
Log Message:
Cleaned up several warnings
Restored some lingering files

Index: ASTMethod.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.NVelocity/Runtime/Parser/Node/ASTMethod.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ASTMethod.cs	16 Nov 2005 07:01:51 -0000	1.5
--- ASTMethod.cs	26 Nov 2005 08:09:23 -0000	1.6
***************
*** 283,287 ****
  		*/
  
! 				if (ec != null && ite.GetBaseException() is Exception)
  				{
  					try
--- 283,287 ----
  		*/
  
! 				if (ec != null)
  				{
  					try

Index: PropertyExecutor.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.NVelocity/Runtime/Parser/Node/PropertyExecutor.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PropertyExecutor.cs	16 Nov 2005 07:01:51 -0000	1.5
--- PropertyExecutor.cs	26 Nov 2005 08:09:23 -0000	1.6
***************
*** 111,115 ****
  		*/
  
! 				if (ec != null && ite.GetBaseException() is Exception)
  				{
  					try
--- 111,115 ----
  		*/
  
! 				if (ec != null)
  				{
  					try
***************
*** 117,121 ****
  						return ec.methodException(o.GetType(), propertyUsed, (Exception) ite.GetBaseException());
  					}
! 					catch (Exception e)
  					{
  						throw new MethodInvocationException("Invocation of property '" + propertyUsed + "'" + " in  " + o.GetType() + " threw exception " + ite.GetBaseException().GetType() + " : " + ite.GetBaseException().Message, ite.GetBaseException(), propertyUsed);
--- 117,121 ----
  						return ec.methodException(o.GetType(), propertyUsed, (Exception) ite.GetBaseException());
  					}
! 					catch (Exception)
  					{
  						throw new MethodInvocationException("Invocation of property '" + propertyUsed + "'" + " in  " + o.GetType() + " threw exception " + ite.GetBaseException().GetType() + " : " + ite.GetBaseException().Message, ite.GetBaseException(), propertyUsed);
***************
*** 131,135 ****
  				}
  			}
! 			catch (ArgumentException iae)
  			{
  				return null;
--- 131,135 ----
  				}
  			}
! 			catch (ArgumentException)
  			{
  				return null;

Index: ASTReference.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.NVelocity/Runtime/Parser/Node/ASTReference.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ASTReference.cs	16 Nov 2005 07:01:51 -0000	1.5
--- ASTReference.cs	26 Nov 2005 08:09:23 -0000	1.6
***************
*** 570,574 ****
  					}
  				}
! 				catch (MethodAccessException nsme2)
  				{
  					StringBuilder sb = new StringBuilder();
--- 570,574 ----
  					}
  				}
! 				catch (MethodAccessException)
  				{
  					StringBuilder sb = new StringBuilder();
***************
*** 599,603 ****
  				p.SetValue(result, value_Renamed, args);
  			}
! 			catch (MethodAccessException nsme)
  			{
  				/*
--- 599,603 ----
  				p.SetValue(result, value_Renamed, args);
  			}
! 			catch (MethodAccessException)
  			{
  				/*

Index: GetExecutor.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.NVelocity/Runtime/Parser/Node/GetExecutor.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** GetExecutor.cs	16 Nov 2005 07:01:51 -0000	1.5
--- GetExecutor.cs	26 Nov 2005 08:09:23 -0000	1.6
***************
*** 62,66 ****
  				throw new MethodInvocationException("Invocation of method 'get(\"" + args[0] + "\")'" + " in  " + o.GetType() + " threw exception " + ite.GetBaseException().GetType(), ite.GetBaseException(), "get");
  			}
! 			catch (ArgumentException iae)
  			{
  				return null;
--- 62,66 ----
  				throw new MethodInvocationException("Invocation of method 'get(\"" + args[0] + "\")'" + " in  " + o.GetType() + " threw exception " + ite.GetBaseException().GetType(), ite.GetBaseException(), "get");
  			}
! 			catch (ArgumentException)
  			{
  				return null;

[Adapdev-commits] Adapdev/src/Adapdev.NVelocity/Dvsl Dvsl.cs,1.5,1.6 DvslNodeContext.cs,1.5,1.6 DvslNodeImpl.cs,1.5,1.6

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

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

Modified Files:
	Dvsl.cs DvslNodeContext.cs DvslNodeImpl.cs 
Log Message:
Cleaned up several warnings
Restored some lingering files

Index: DvslNodeImpl.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.NVelocity/Dvsl/DvslNodeImpl.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DvslNodeImpl.cs	16 Nov 2005 07:01:49 -0000	1.5
--- DvslNodeImpl.cs	26 Nov 2005 08:09:22 -0000	1.6
***************
*** 209,213 ****
  				return tw.ToString();
  			}
! 			catch (Exception e)
  			{
  			}
--- 209,213 ----
  				return tw.ToString();
  			}
! 			catch (Exception)
  			{
  			}

Index: DvslNodeContext.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.NVelocity/Dvsl/DvslNodeContext.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DvslNodeContext.cs	16 Nov 2005 07:01:49 -0000	1.5
--- DvslNodeContext.cs	26 Nov 2005 08:09:22 -0000	1.6
***************
*** 56,60 ****
  		public override Object InternalGet(String key)
  		{
- 			Object o = null;
  
  			/*
--- 56,59 ----

Index: Dvsl.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.NVelocity/Dvsl/Dvsl.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Dvsl.cs	16 Nov 2005 07:01:49 -0000	1.5
--- Dvsl.cs	26 Nov 2005 08:09:22 -0000	1.6
***************
*** 23,28 ****
  
  		private VelocityEngine ve = null;
- 		private XmlDocument currentDocument = null;
- 		private StreamWriter currentWriter = null;
  		private IContext toolContext;
  		private IContext userContext;
--- 23,26 ----
***************
*** 166,170 ****
  							i = Int32.Parse(val);
  						}
! 						catch (Exception ee)
  						{
  						}
--- 164,168 ----
  							i = Int32.Parse(val);
  						}
! 						catch (Exception )
  						{
  						}
***************
*** 209,213 ****
  				SetStylesheet(fr);
  			}
! 			catch (Exception e)
  			{
  				throw;
--- 207,211 ----
  				SetStylesheet(fr);
  			}
! 			catch (Exception)
  			{
  				throw;

[Adapdev-commits] Adapdev/src/Adapdev.NVelocity Template.cs,1.3,1.4

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

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

Modified Files:
	Template.cs 
Log Message:
Cleaned up several warnings
Restored some lingering files

Index: Template.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.NVelocity/Template.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Template.cs	17 Nov 2005 02:48:31 -0000	1.3
--- Template.cs	26 Nov 2005 08:09:23 -0000	1.4
***************
*** 38,42 ****
  		/// to perform this.
  		/// </summary>
- 		private bool initialized = false;
  
  		private System.Exception errorCondition = null;
--- 38,41 ----
***************
*** 103,107 ****
  					return true;
  				}
! 				catch (IOException uce)
  				{
  					String msg = "Template.process : Unsupported input encoding : " + encoding + " for template " + name;
--- 102,106 ----
  					return true;
  				}
! 				catch (IOException)
  				{
  					String msg = "Template.process : Unsupported input encoding : " + encoding + " for template " + name;

[Adapdev-commits] Adapdev/src/Adapdev.NVelocity/IO VelocityWriter.cs,1.5,1.6

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

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

Modified Files:
	VelocityWriter.cs 
Log Message:
Cleaned up several warnings
Restored some lingering files

Index: VelocityWriter.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.NVelocity/IO/VelocityWriter.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** VelocityWriter.cs	16 Nov 2005 07:01:49 -0000	1.5
--- VelocityWriter.cs	26 Nov 2005 08:09:22 -0000	1.6
***************
*** 51,55 ****
  		private static int defaultCharBufferSize = 8*1024;
  
! 		private Boolean flushed = false;
  
  		/**
--- 51,55 ----
  		private static int defaultCharBufferSize = 8*1024;
  
! 		private bool flushed = false;
  
  		/**
***************
*** 136,142 ****
  			if (bufferSize == 0)
  				return;
! 			flushed = true;
  			if (nextChar == 0)
  				return;
  			writer.Write(cb, 0, nextChar);
  			nextChar = 0;
--- 136,145 ----
  			if (bufferSize == 0)
  				return;
! 
! 			this.flushed = true;
! 			
  			if (nextChar == 0)
  				return;
+ 			
  			writer.Write(cb, 0, nextChar);
  			nextChar = 0;

[Adapdev-commits] Adapdev/src/Adapdev.NVelocity/App FieldMethodizer.cs,1.5,1.6 Velocity.cs,1.5,1.6 VelocityEngine.cs,1.5,1.6

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

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

Modified Files:
	FieldMethodizer.cs Velocity.cs VelocityEngine.cs 
Log Message:
Cleaned up several warnings
Restored some lingering files

Index: Velocity.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.NVelocity/App/Velocity.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Velocity.cs	16 Nov 2005 07:01:48 -0000	1.5
--- Velocity.cs	26 Nov 2005 08:09:22 -0000	1.6
***************
*** 174,178 ****
  				reader = new StreamReader(new StreamReader(instream, Encoding.GetEncoding(encoding)).BaseStream);
  			}
! 			catch (IOException uce)
  			{
  				String msg = "Unsupported input encoding : " + encoding + " for template " + logTag;
--- 174,178 ----
  				reader = new StreamReader(new StreamReader(instream, Encoding.GetEncoding(encoding)).BaseStream);
  			}
! 			catch (IOException)
  			{
  				String msg = "Unsupported input encoding : " + encoding + " for template " + logTag;

Index: VelocityEngine.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.NVelocity/App/VelocityEngine.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** VelocityEngine.cs	16 Nov 2005 07:01:48 -0000	1.5
--- VelocityEngine.cs	26 Nov 2005 08:09:22 -0000	1.6
***************
*** 183,187 ****
  				br = new StreamReader(new StreamReader(instream, Encoding.GetEncoding(encoding)).BaseStream);
  			}
! 			catch (IOException uce)
  			{
  				String msg = "Unsupported input encoding : " + encoding + " for template " + logTag;
--- 183,187 ----
  				br = new StreamReader(new StreamReader(instream, Encoding.GetEncoding(encoding)).BaseStream);
  			}
! 			catch (IOException)
  			{
  				String msg = "Unsupported input encoding : " + encoding + " for template " + logTag;

Index: FieldMethodizer.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.NVelocity/App/FieldMethodizer.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FieldMethodizer.cs	16 Nov 2005 07:01:48 -0000	1.5
--- FieldMethodizer.cs	26 Nov 2005 08:09:22 -0000	1.6
***************
*** 121,125 ****
  					return f.GetValue((Type) classHash[fieldName]);
  			}
! 			catch (Exception e)
  			{
  			}
--- 121,125 ----
  					return f.GetValue((Type) classHash[fieldName]);
  			}
! 			catch (Exception)
  			{
  			}

[Adapdev-commits] Adapdev/src/Adapdev.NVelocity/Dvsl/Directive MatchDirective.cs,1.5,1.6

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

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

Modified Files:
	MatchDirective.cs 
Log Message:
Cleaned up several warnings
Restored some lingering files

Index: MatchDirective.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.NVelocity/Dvsl/Directive/MatchDirective.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MatchDirective.cs	16 Nov 2005 07:01:49 -0000	1.5
--- MatchDirective.cs	26 Nov 2005 08:09:22 -0000	1.6
***************
*** 44,48 ****
  					th.RegisterMatch(element, (SimpleNode) node.jjtGetChild(node.jjtGetNumChildren() - 1));
  				}
! 				catch (Exception ee)
  				{
  				}
--- 44,48 ----
  					th.RegisterMatch(element, (SimpleNode) node.jjtGetChild(node.jjtGetNumChildren() - 1));
  				}
! 				catch (Exception)
  				{
  				}

[Adapdev-commits] Adapdev/src/Adapdev.NVelocity/Util/Introspection ClassMap.cs,1.5,1.6 Introspector.cs,1.5,1.6 MethodMap.cs,1.5,1.6

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

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

Modified Files:
	ClassMap.cs Introspector.cs MethodMap.cs 
Log Message:
Cleaned up several warnings
Restored some lingering files

Index: MethodMap.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.NVelocity/Util/Introspection/MethodMap.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MethodMap.cs	16 Nov 2005 07:01:52 -0000	1.5
--- MethodMap.cs	26 Nov 2005 08:09:23 -0000	1.6
***************
*** 83,87 ****
  			int numMethods = methodList.Count;
  
- 			int bestDistance = - 2;
  			MethodInfo bestMethod = null;
  			Twonk bestTwonk = null;
--- 83,86 ----
***************
*** 182,187 ****
  			Twonk twonk = new Twonk(set.Length);
  
- 			int distance = 0;
- 
  			for (int i = 0; i < set.Length; i++)
  			{
--- 181,184 ----

Index: ClassMap.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.NVelocity/Util/Introspection/ClassMap.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ClassMap.cs	16 Nov 2005 07:01:52 -0000	1.5
--- ClassMap.cs	26 Nov 2005 08:09:23 -0000	1.6
***************
*** 140,145 ****
  		private void populateMethodCache()
  		{
- 			StringBuilder methodKey;
- 
  			/*
  	    *  get all publicly accessible methods
--- 140,143 ----
***************
*** 177,182 ****
  		private void populatePropertyCache()
  		{
- 			StringBuilder methodKey;
- 
  			/*
  	    *  get all publicly accessible methods
--- 175,178 ----
***************
*** 302,350 ****
  			// TODO:  the rest of this method is trying to determine what is supposed to be callable - I think .Net just returns what is callable
  			return methods;
- 
- 			/*
- 	    *  Short circuit for the (hopefully) majority of cases where the
- 	    *  clazz is public
- 	    */
- 
- 			//UPGRADE_TODO: Method java.lang.reflect.Modifier.isPublic was not converted. 'ms-help://MS.VSCC/commoner/redir/redirect.htm?keyword="jlca1095"'
- 			//UPGRADE_ISSUE: Method 'java.lang.Class.getModifiers' was not converted. 'ms-help://MS.VSCC/commoner/redir/redirect.htm?keyword="jlca1000_javalangClassgetModifiers"'
- 			if (clazz.IsPublic)
- 			{
- 				return methods;
- 			}
- 
- 			/*
- 	    *  No luck - the class is not public, so we're going the longer way.
- 	    */
- 
- 			MethodInfo[] methodInfos = new MethodInfo[methods.Length];
- 
- 			for (int i = methods.Length; i-- > 0; )
- 			{
- 				methodInfos[i] = new MethodInfo(methods[i]);
- 			}
- 
- 			int upcastCount = getAccessibleMethods(clazz, methodInfos, 0);
- 
- 			/*
- 	    *  Reallocate array in case some method had no accessible counterpart.
- 	    */
- 
- 			if (upcastCount < methods.Length)
- 			{
- 				methods = new System.Reflection.MethodInfo[upcastCount];
- 			}
- 
- 			int j = 0;
- 			for (int i = 0; i < methodInfos.Length; ++i)
- 			{
- 				MethodInfo methodInfo = methodInfos[i];
- 				if (methodInfo.upcast)
- 				{
- 					methods[j++] = methodInfo.method;
- 				}
- 			}
- 			return methods;
  		}
  
--- 298,301 ----
***************
*** 355,400 ****
  			//TODO
  			return properties;
- 
- 			/*
- 	    *  Short circuit for the (hopefully) majority of cases where the
- 	    *  clazz is public
- 	    */
- 			if (clazz.IsPublic)
- 			{
- 				return properties;
- 			}
- 
- 			/*
- 	    *  No luck - the class is not public, so we're going the longer way.
- 	    */
- 
- 			properties = new PropertyInfo[0];
- 			return properties;
- 
- // TODO			
- //	    MethodInfo[] methodInfos = new MethodInfo[methods.Length];
- //			
- //	    for (int i = methods.Length; i-- > 0; ) {
- //		methodInfos[i] = new MethodInfo(methods[i]);
- //	    }
- //			
- //	    int upcastCount = getAccessibleMethods(clazz, methodInfos, 0);
- //			
- //	    /*
- //	    *  Reallocate array in case some method had no accessible counterpart.
- //	    */
- //			
- //	    if (upcastCount < methods.Length) {
- //		methods = new System.Reflection.MethodInfo[upcastCount];
- //	    }
- //			
- //	    int j = 0;
- //	    for (int i = 0; i < methodInfos.Length; ++i) {
- //		MethodInfo methodInfo = methodInfos[i];
- //		if (methodInfo.upcast) {
- //		    methods[j++] = methodInfo.method;
- //		}
- //	    }
- //	    return methods;
  		}
  
--- 306,309 ----
***************
*** 433,437 ****
  						}
  					}
! 					catch (MethodAccessException e)
  					{
  						/*
--- 342,346 ----
  						}
  					}
! 					catch (MethodAccessException)
  					{
  						/*
***************
*** 515,529 ****
  			return method;
  
- 			/*
- 	    *   Short circuit for (hopefully the majority of) cases where the declaring
- 	    *   class is public.
- 	    */
- 
- 			if (clazz.IsPublic)
- 			{
- 				return method;
- 			}
- 
- 			return getPublicMethod(clazz, method.Name, GetMethodParameterTypes(method));
  		}
  
--- 424,427 ----
***************
*** 534,551 ****
  			// TODO:
  			return property;
- 
- 			/*
- 	    *   Short circuit for (hopefully the majority of) cases where the declaring
- 	    *   class is public.
- 	    */
- 			if (clazz.IsPublic)
- 			{
- 				return property;
- 			}
- 
- 
- //TODO
- 			return null;
- //	    return getPublicMethod(clazz, method.Name, GetMethodParameterTypes(method));
  		}
  
--- 432,435 ----
***************
*** 572,576 ****
  					return clazz.GetMethod(name, (Type[]) paramTypes);
  				}
! 				catch (MethodAccessException e)
  				{
  					/*
--- 456,460 ----
  					return clazz.GetMethod(name, (Type[]) paramTypes);
  				}
! 				catch (MethodAccessException)
  				{
  					/*

Index: Introspector.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.NVelocity/Util/Introspection/Introspector.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Introspector.cs	16 Nov 2005 07:01:52 -0000	1.5
--- Introspector.cs	26 Nov 2005 08:09:23 -0000	1.6
***************
*** 69,76 ****
  			catch (AmbiguousException ae)
  			{
- 				/*
- 		*  whoops.  Ambiguous.  Make a nice log message and return null...
- 		*/
- 
  				String msg = "Introspection Error : Ambiguous method invocation " + name + "( ";
  
--- 69,72 ----
***************
*** 85,88 ****
--- 81,86 ----
  				msg = msg + ") for class " + c;
  
+ 				Console.WriteLine(ae.Message);
+ 
  				rsvc.error(msg);
  			}
***************
*** 115,124 ****
  			catch (AmbiguousException ae)
  			{
- 				/*
- 		*  whoops.  Ambiguous.  Make a nice log message and return null...
- 		*/
- 
  				String msg = "Introspection Error : Ambiguous property invocation " + name + " ";
  				msg = msg + " for class " + c;
  				rsvc.error(msg);
  			}
--- 113,119 ----
  			catch (AmbiguousException ae)
  			{
  				String msg = "Introspection Error : Ambiguous property invocation " + name + " ";
  				msg = msg + " for class " + c;
+ 				Console.WriteLine(ae.Message);
  				rsvc.error(msg);
  			}