Merge lp:~simone.busoli/nunitv2/1043641 into lp:nunitv2

[Simone Busoli]

[Charlie Poole (charlie.poole)]

It works!

review: Approve

=== modified file 'src/GuiComponents/UiKit/ResultTabs.cs'
--- src/GuiComponents/UiKit/ResultTabs.cs	2012-01-11 17:52:54 +0000
+++ src/GuiComponents/UiKit/ResultTabs.cs	2012-10-14 21:53:19 +0000
@@ -230,8 +230,6 @@
 				ITestEvents events = Services.TestLoader.Events;
 				errorDisplay.Subscribe( events );
 				notRunTree.Subscribe( events );
-
-				displayController.Subscribe( events );
 			}
 
 			base.OnLoad (e);
@@ -350,7 +348,7 @@
             tabControl.ItemSize = new Size(tabControl.ItemSize.Width, this.Font.Height + 7);
         }
 
-		private class TextDisplayController : TestObserver
+		private class TextDisplayController
 		{
 			private TabControl tabControl;
 			List<TextDisplayTabPage> tabPages = new List<TextDisplayTabPage>();
@@ -416,8 +414,11 @@
 								break;
 							}
 
-						if ( thePage == null )
-							thePage = new TextDisplayTabPage( tabInfo );
+						if ( thePage == null )
+						{
+							thePage = new TextDisplayTabPage( tabInfo );
+							thePage.Display.Subscribe(Services.TestLoader.Events);
+						}
 
 						thePage.DisplayFont = displayFont;
 
@@ -472,14 +473,6 @@
                     ? new Font(FontFamily.GenericMonospace, 8.0f) 
                     : settings.GetSetting("Gui.FixedFont", new Font(FontFamily.GenericMonospace, 8.0f));
 			}
-
-			#region TestObserver Members
-			public void Subscribe(ITestEvents events)
-			{
-				foreach( TextDisplayTabPage page in tabPages )
-					page.Display.Subscribe(events);
-			}
-			#endregion
 		}
 	}
 }