From 9d369d8cf9344ba526a1bbff50fb31d9cde7a70d Mon Sep 17 00:00:00 2001
From: Martin Willemoes Hansen <mwh@mono-cvs.ximian.com>
Date: Wed, 23 Jul 2003 07:16:46 +0000
Subject: [PATCH]         * generator/ClassBase.cs: Fixed printouts of ctor
 validation.           Warnings refering to the same ctor were printed
 multiple times.

svn path=/trunk/gtk-sharp/; revision=16563
---
 ChangeLog              |  5 ++++
 generator/ClassBase.cs | 52 +++++++++++++++++++-----------------------
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2ff7ce312..750a505f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-23  Martin Willemoes Hansen <mwh@sysrq.dk>
+
+	* generator/ClassBase.cs: Fixed printouts of ctor validation.
+	  Warnings refering to the same ctor were printed multiple times.
+
 2003-07-22  John Luke  <jluke@cfl.rr.com>
 
 	* sample/TreeViewDemo.cs: 
diff --git a/generator/ClassBase.cs b/generator/ClassBase.cs
index d4c829367..02fb4f95c 100644
--- a/generator/ClassBase.cs
+++ b/generator/ClassBase.cs
@@ -156,7 +156,7 @@ namespace GtkSharp.Generation {
 				if (prop.Validate ())
 					prop.Generate (sw);
 				else
-					Console.WriteLine(" in Object " + QualifiedName);
+					Console.WriteLine("in Object " + QualifiedName);
 			}
 		}
 
@@ -169,7 +169,7 @@ namespace GtkSharp.Generation {
 				if (sig.Validate ())
 					sig.Generate (sw, implementor);
 				else
-					Console.WriteLine(" in Object " + QualifiedName);
+					Console.WriteLine("in Object " + QualifiedName);
 			}
 		}
 
@@ -221,7 +221,7 @@ namespace GtkSharp.Generation {
 					}
 				}
 				else
-					Console.WriteLine(" in Object " + QualifiedName);
+					Console.WriteLine("in Object " + QualifiedName);
 			}
 		}
 
@@ -316,29 +316,29 @@ namespace GtkSharp.Generation {
 		{
 			if (ctors_initted)
 				return;
-			
+
+			ArrayList valid_ctors = new ArrayList();
 			clash_map = new Hashtable();
 
-			if (ctors != null) {
-				bool has_preferred = false;
-				foreach (Ctor ctor in ctors) {
-					if (ctor.Validate ()) {
-						ctor.InitClashMap (clash_map);
-						if (ctor.Preferred)
-							has_preferred = true;
-					}
-					else
-						Console.WriteLine(" in Object " + QualifiedName);
+			bool has_preferred = false;
+			foreach (Ctor ctor in ctors) {
+				if (ctor.Validate ()) {
+					ctor.InitClashMap (clash_map);
+					if (ctor.Preferred)
+						has_preferred = true;
+					
+					valid_ctors.Add (ctor);
 				}
-				
-				if (!has_preferred && ctors.Count > 0)
-					((Ctor) ctors[0]).Preferred = true;
-
-				foreach (Ctor ctor in ctors) 
-					if (ctor.Validate ()) {
-						ctor.Initialize (clash_map);
-					}
+				else
+					Console.WriteLine("in Object " + QualifiedName);
 			}
+			ctors = valid_ctors;
+				
+			if (!has_preferred && ctors.Count > 0)
+				((Ctor) ctors[0]).Preferred = true;
+
+			foreach (Ctor ctor in ctors) 
+				ctor.Initialize (clash_map);
 
 			ctors_initted = true;
 		}
@@ -351,12 +351,8 @@ namespace GtkSharp.Generation {
 				klass = klass.Parent;
 			}
 			
-			if (ctors != null) {
-				foreach (Ctor ctor in ctors) {
-					if (ctor.Validate ())
-						ctor.Generate (sw);
-				}
-			}
+			foreach (Ctor ctor in ctors)
+				ctor.Generate (sw);
 
 			if (!clash_map.ContainsKey("") && hasDefaultConstructor) {
 				sw.WriteLine("\t\tprotected " + Name + "() : base(){}");