2008-12-17 Jb Evain <jbevain@novell.com>

	* MainWindow.cs
	* Metadata.cs
	* Comparison.cs
	* CompareContext.cs:
		PascalCase public fields in Comparison.


svn path=/trunk/mono-tools/; revision=121677

5 files changed, 51 insertions, 43 deletions

diff --git a/gui-compare/ChangeLog b/gui-compare/ChangeLog
index 578ad0bd..1e5d12d4 100644
--- a/gui-compare/ChangeLog
+++ b/gui-compare/ChangeLog
@@ -1,5 +1,13 @@
 2008-12-17  Jb Evain  <jbevain@novell.com>
 
+	* MainWindow.cs
+	* Metadata.cs
+	* Comparison.cs
+	* CompareContext.cs:
+		PascalCase public fields in Comparison.
+
+2008-12-17  Jb Evain  <jbevain@novell.com>
+
 	* CecilMetadata.cs: treat Finalizers as an implementation detail
 	and ignore it for the comparison.
 
diff --git a/gui-compare/CompareContext.cs b/gui-compare/CompareContext.cs
index 000da5a9..364b2ef0 100644
--- a/gui-compare/CompareContext.cs
+++ b/gui-compare/CompareContext.cs
@@ -336,7 +336,7 @@ namespace GuiCompare {
 
 							comparison.AddError (String.Format ("reference access is '<i>{0}</i>', target access is '<i>{1}</i>'{2}",
 							                                    reference_access, target_access, extra_msg));
-							comparison.status = ComparisonStatus.Error;
+							comparison.Status = ComparisonStatus.Error;
 						}
 					}
 
@@ -344,7 +344,7 @@ namespace GuiCompare {
 						if (((CompMethod)target_list[a]).ThrowsNotImplementedException ()
 						    && !((CompMethod)reference_list[m]).ThrowsNotImplementedException ()) {
 							
-							comparison.throws_niex = true;
+							comparison.ThrowsNIE = true;
 						}
 					}
 
@@ -354,7 +354,7 @@ namespace GuiCompare {
 							comparison.AddError (String.Format ("reference field has value {0}, target field has value {1}",
 							                                    ((CompField)reference_list[m]).GetLiteralValue(),
 							                                    ((CompField)target_list[a]).GetLiteralValue()));
-							comparison.status = ComparisonStatus.Error;
+							comparison.Status = ComparisonStatus.Error;
 						}
 					}
 					
@@ -392,7 +392,7 @@ namespace GuiCompare {
 		{
 			ComparisonNode node = item.GetComparisonNode ();
 			parent.AddChild (node);
-			node.status = ComparisonStatus.Extra;
+			node.Status = ComparisonStatus.Extra;
 
 			if (item is ICompTypeContainer) {
 				ICompTypeContainer c = (ICompTypeContainer)item;
@@ -411,7 +411,7 @@ namespace GuiCompare {
 		{
 			ComparisonNode node = item.GetComparisonNode ();
 			parent.AddChild (node);
-			node.status = ComparisonStatus.Missing;
+			node.Status = ComparisonStatus.Missing;
 
 			comparisons_performed ++;
 
diff --git a/gui-compare/Comparison.cs b/gui-compare/Comparison.cs
index 2097accb..70cb8319 100644
--- a/gui-compare/Comparison.cs
+++ b/gui-compare/Comparison.cs
@@ -39,49 +39,49 @@ namespace GuiCompare {
 		public ComparisonNode (CompType type,
 		                       string name)
 		{
-			this.type = type;
-			this.name = name;
-			this.children = new List<ComparisonNode>();
-			this.messages = new List<string>();
-			this.todos = new List<string>();
+			Type = type;
+			Name = name;
+			Children = new List<ComparisonNode>();
+			Messages = new List<string>();
+			Todos = new List<string>();
 		}
 
 		public void AddChild (ComparisonNode node)
 		{
-			children.Add (node);
-			node.parent = this;
+			Children.Add (node);
+			node.Parent = this;
 		}
 
 		public void PropagateCounts ()
 		{
-			Todo = todos.Count;
-			Niex = throws_niex ? 1 : 0;
-			foreach (ComparisonNode n in children) {
+			Todo = Todos.Count;
+			Niex = ThrowsNIE ? 1 : 0;
+			foreach (ComparisonNode n in Children) {
 				n.PropagateCounts ();
-				Extra += n.Extra + (n.status == ComparisonStatus.Extra ? 1 : 0);
-				Missing += n.Missing + (n.status == ComparisonStatus.Missing ? 1 : 0);
+				Extra += n.Extra + (n.Status == ComparisonStatus.Extra ? 1 : 0);
+				Missing += n.Missing + (n.Status == ComparisonStatus.Missing ? 1 : 0);
 				Present += n.Present; // XXX
 				Todo += n.Todo;
 				Niex += n.Niex;
-				Warning += n.Warning + (n.status == ComparisonStatus.Error ? 1 : 0);
+				Warning += n.Warning + (n.Status == ComparisonStatus.Error ? 1 : 0);
 			}
 		}
 
 		public void AddError (string msg)
 		{
-			status = ComparisonStatus.Error;
-			messages.Add (msg);
+			Status = ComparisonStatus.Error;
+			Messages.Add (msg);
 		}
 		
-		public ComparisonStatus status;
-		public CompType type;
+		public ComparisonStatus Status;
+		public readonly CompType Type;
 
-		public ComparisonNode parent;
+		public ComparisonNode Parent;
 
-		public string name;
-		public List<string> messages;
-		public List<string> todos;
-		public bool throws_niex;
+		public readonly string Name;
+		public readonly List<string> Messages;
+		public readonly List<string> Todos;
+		public bool ThrowsNIE;
 		
 		public int Extra;
 		public int Missing;
@@ -90,6 +90,6 @@ namespace GuiCompare {
 		public int Todo;
 		public int Niex;
 
-		public List<ComparisonNode> children;
+		public readonly List<ComparisonNode> Children;
 	}
 }
diff --git a/gui-compare/MainWindow.cs b/gui-compare/MainWindow.cs
index 7bdc3f5f..e4b411e0 100644
--- a/gui-compare/MainWindow.cs
+++ b/gui-compare/MainWindow.cs
@@ -192,7 +192,7 @@ public partial class MainWindow: Gtk.Window
 				ComparisonNode n = tree.Model.GetValue (iter, (int)TreeCol.Node) as ComparisonNode;
 				StringBuilder sb = new StringBuilder();
 
-				if (n != null) msgs = n.messages;
+				if (n != null) msgs = n.Messages;
 				if (msgs != null && msgs.Count > 0) {
 					sb.Append ("<b>Errors:</b>\n");
 
@@ -201,7 +201,7 @@ public partial class MainWindow: Gtk.Window
 					}
 				}
 				
-				if (n != null) msgs = n.todos;
+				if (n != null) msgs = n.Todos;
 				if (msgs != null && msgs.Count > 0) {
 					sb.Append ("<b>TODO:</b>\n");
 					for (int i = 0; i < msgs.Count; i ++) {
@@ -361,7 +361,7 @@ public partial class MainWindow: Gtk.Window
 	
 	Gdk.Pixbuf TypePixbufFromComparisonNode (ComparisonNode node)
 	{
-		switch (node.type) {
+		switch (node.Type) {
 		case CompType.Assembly: return assemblyPixbuf;
 		case CompType.Namespace: return namespacePixbuf;
 		case CompType.Attribute: return attributePixbuf;
@@ -380,7 +380,7 @@ public partial class MainWindow: Gtk.Window
 	
 	Gdk.Pixbuf StatusPixbufFromComparisonNode (ComparisonNode node)
 	{
-		switch (node.status) {
+		switch (node.Status) {
 		case ComparisonStatus.None: return okPixbuf;
 		case ComparisonStatus.Missing: return missingPixbuf;
 		case ComparisonStatus.Extra: return extraPixbuf;
@@ -391,7 +391,7 @@ public partial class MainWindow: Gtk.Window
 
 	string StatusForegroundFromComparisonNode (ComparisonNode node)
 	{
-		switch (node.status) {
+		switch (node.Status) {
 		case ComparisonStatus.Missing: return "darkred";
 		case ComparisonStatus.Extra: return "green";
 		case ComparisonStatus.Error: return "red";
@@ -404,7 +404,7 @@ public partial class MainWindow: Gtk.Window
 	void PopulateTreeFromComparison (ComparisonNode root)
 	{
 		Gtk.TreeIter iter =
-			treeStore.AppendValues (root.name,
+			treeStore.AppendValues (root.Name,
 			                        TypePixbufFromComparisonNode (root),
 			                        StatusPixbufFromComparisonNode (root),
 			                        root.Missing == 0 ? null : missingPixbuf,
@@ -422,7 +422,7 @@ public partial class MainWindow: Gtk.Window
 		
 		Gtk.TreePath path = treeStore.GetPath (iter);
 		
-		foreach (ComparisonNode n in root.children) {
+		foreach (ComparisonNode n in root.Children) {
 			PopulateTreeFromComparison (iter, n);
 		}
 		
@@ -433,7 +433,7 @@ public partial class MainWindow: Gtk.Window
 	{
 		Gtk.TreeIter citer = 
 			treeStore.AppendValues (iter,
-			                        node.name,
+			                        node.Name,
 			                        TypePixbufFromComparisonNode (node),
 			                        StatusPixbufFromComparisonNode (node),
 			                        node.Missing == 0 ? null : missingPixbuf,
@@ -445,12 +445,12 @@ public partial class MainWindow: Gtk.Window
 			                        node.Todo == 0 ? null : todoPixbuf,
 			                        node.Todo == 0 ? null : String.Format (":{0}", node.Todo),
 			                        node.Niex == 0 ? null : niexPixbuf,
-			                        node.Niex == 0 ? null : ((node.Niex == 1 && node.throws_niex) ? null : String.Format (":{0}", node.Niex)),
+			                        node.Niex == 0 ? null : ((node.Niex == 1 && node.ThrowsNIE) ? null : String.Format (":{0}", node.Niex)),
 			                        node,
 			                        StatusForegroundFromComparisonNode (node));
 
 		
-		foreach (ComparisonNode n in node.children) {
+		foreach (ComparisonNode n in node.Children) {
 			PopulateTreeFromComparison (citer, n);
 		}
 	}
@@ -463,12 +463,12 @@ public partial class MainWindow: Gtk.Window
 		if (n == null)
 			return false;
 		
-		if ((ShowMissing.Active && (n.status == ComparisonStatus.Missing || n.Missing > 0)) ||
-		    (ShowExtra.Active && (n.status == ComparisonStatus.Extra || n.Extra > 0)) ||
-		    (ShowErrors.Active && (n.status == ComparisonStatus.Error || n.Warning > 0)) ||
+		if ((ShowMissing.Active && (n.Status == ComparisonStatus.Missing || n.Missing > 0)) ||
+		    (ShowExtra.Active && (n.Status == ComparisonStatus.Extra || n.Extra > 0)) ||
+		    (ShowErrors.Active && (n.Status == ComparisonStatus.Error || n.Warning > 0)) ||
 		    (ShowTodo.Active && (n.Todo > 0)) ||
 		    (ShowNotImplemented.Active && (n.Niex > 0)) ||
-		    ShowPresent.Active && n.status == ComparisonStatus.None)
+		    ShowPresent.Active && n.Status == ComparisonStatus.None)
 			
 			return true;
 		else
diff --git a/gui-compare/Metadata.cs b/gui-compare/Metadata.cs
index de94a43c..4bd95333 100644
--- a/gui-compare/Metadata.cs
+++ b/gui-compare/Metadata.cs
@@ -99,7 +99,7 @@ namespace GuiCompare {
 		public ComparisonNode GetComparisonNode ()
 		{
 			ComparisonNode node = new ComparisonNode (type, DisplayName);
-			node.todos.AddRange (todos);
+			node.Todos.AddRange (todos);
 			return node;
 		}