Merge branch 'master' of https://github.com/icsharpcode/SharpDevelop into MemoryPad

src/AddIns/Debugger/Debugger.AddIn/Pads/ParallelPad/SelectedFrameBookmark.cs

@@ -8,7 +8,7 @@ using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Bookmarks;
 using ICSharpCode.SharpDevelop.Editor;
 
-namespace Debugger.AddIn.Pads.ParallelPad
+namespace ICSharpCode.SharpDevelop.Bookmarks
 {
 	public class SelectedFrameBookmark : SDMarkerBookmark
 	{

src/AddIns/Debugger/Debugger.AddIn/Tooltips/DebuggerTooltipControl.xaml.cs

@@ -20,7 +20,6 @@ using ICSharpCode.SharpDevelop.Bookmarks;
 using ICSharpCode.SharpDevelop.Debugging;
 using ICSharpCode.SharpDevelop.Editor;
 using ICSharpCode.SharpDevelop.Gui;
-using Services.Debugger.Tooltips;
 
 namespace Debugger.AddIn.Tooltips
 {

src/AddIns/Debugger/Debugger.AddIn/Tooltips/PinDebuggerControl.xaml.cs

@@ -17,7 +17,6 @@ using ICSharpCode.SharpDevelop.Debugging;
 using ICSharpCode.SharpDevelop.Editor;
 using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.SharpDevelop.Services;
-using Services.Debugger.Tooltips;
 
 namespace Debugger.AddIn.Tooltips
 {

src/AddIns/Debugger/Debugger.AddIn/Tooltips/PinningBinding.cs

@@ -9,7 +9,6 @@ using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Bookmarks;
 using ICSharpCode.SharpDevelop.Debugging;
 using ICSharpCode.SharpDevelop.Editor;
-using Services.Debugger.Tooltips;
 
 namespace Debugger.AddIn.Tooltips
 {

src/AddIns/Misc/SearchAndReplace/Project/Engine/SearchReplaceManager.cs

@@ -150,7 +150,7 @@ namespace SearchAndReplace
 						return;
 					}
 				}
-				BookmarkManager.AddMark(new SDBookmark(result.FileName, textArea.Document.OffsetToPosition(result.Offset)));
+				BookmarkManager.AddMark(new Bookmark(result.FileName, textArea.Document.OffsetToPosition(result.Offset)));
 			}
 		}
 		

src/Main/Base/Project/ICSharpCode.SharpDevelop.addin

@@ -1978,17 +1978,16 @@
 		             icon    = "Bookmarks.GotoNext"
 		             tooltip = "${res:MainWindow.Windows.BookmarkPad.GotoNext.ToolTip}"
 		             class   = "ICSharpCode.SharpDevelop.Bookmarks.NextBookmarkPadCommand"/>
-		<ToolbarItem id = "GotoInFolderSeparator" type = "Separator" />
+		<!--<ToolbarItem id = "GotoInFolderSeparator" type = "Separator" />
 		<ToolbarItem id      = "EnableDisableAll"
 		             icon    = "Bookmarks.EnableDisableAll"
 		             tooltip = "${res:MainWindow.Windows.BookmarkPad.EnableDisableAll.ToolTip}"
-		             class   = "ICSharpCode.SharpDevelop.Bookmarks.EnableDisableAll"/>
+		             class   = "ICSharpCode.SharpDevelop.Bookmarks.EnableDisableAll"/>-->
 		<ToolbarItem id = "EnableDisableSeparator" type = "Separator" />
 		<ToolbarItem id      = "DeleteMark"
 		             icon    = "Bookmarks.DeleteMark"
 		             tooltip = "${res:MainWindow.Windows.BookmarkPad.DeleteMark.ToolTip}"
 		             class   = "ICSharpCode.SharpDevelop.Bookmarks.DeleteMark"/>
-		<ToolbarItem id = "EnableDisableSeparator" type = "Separator" />
 		<ToolbarItem id      = "DeleteAllMarks"
 		             icon    = "Bookmarks.DeleteAllMarks"
 		             tooltip = "${res:MainWindow.Windows.BookmarkPad.DeleteAllMarks.ToolTip}"

src/Main/Base/Project/Src/Bookmarks/BookmarkConverter.cs

@@ -9,7 +9,6 @@ using System.Windows;
 
 using ICSharpCode.Core;
 using ICSharpCode.NRefactory;
-using Services.Debugger.Tooltips;
 
 namespace ICSharpCode.SharpDevelop.Bookmarks
 {
@@ -72,7 +71,7 @@ namespace ICSharpCode.SharpDevelop.Bookmarks
 						bookmark = pin;
 						break;
 					default:
-						bookmark = new SDBookmark(fileName, new Location(columnNumber, lineNumber));
+						bookmark = new Bookmark(fileName, new Location(columnNumber, lineNumber));
 						break;
 				}
 				return bookmark;

src/Main/Base/Project/Src/Bookmarks/Commands/MenuCommands.cs

@@ -25,9 +25,9 @@ namespace ICSharpCode.SharpDevelop.Bookmarks
 			}
 		}
 		
-		protected static List<SDBookmark> GetBookmarks(IBookmarkMargin bookmarkMargin)
+		protected static List<Bookmark> GetBookmarks(IBookmarkMargin bookmarkMargin)
 		{
-			return (from b in bookmarkMargin.Bookmarks.OfType<SDBookmark>()
+			return (from b in bookmarkMargin.Bookmarks.OfType<Bookmark>()
 			        where b.CanToggle
 			        orderby b.LineNumber
 			        select b).ToList();
@@ -42,7 +42,7 @@ namespace ICSharpCode.SharpDevelop.Bookmarks
 		{
 			BookmarkManager.ToggleBookmark(editor, editor.Caret.Line,
 			                               b => b.CanToggle && b.GetType() == typeof(SDBookmark),
-			                               location => new SDBookmark(editor.FileName, location));
+			                               location => new Bookmark(editor.FileName, location));
 		}
 	}
 	public class PrevBookmark : BookmarkMenuCommand
@@ -81,7 +81,7 @@ namespace ICSharpCode.SharpDevelop.Bookmarks
 	{
 		protected override void Run(ITextEditor editor, IBookmarkMargin bookmarkMargin)
 		{
-			var bookmarks = (from b in bookmarkMargin.Bookmarks.OfType<SDBookmark>()
+			var bookmarks = (from b in bookmarkMargin.Bookmarks.OfType<Bookmark>()
 			                 where b.CanToggle
 			                 select b).ToList();
 			foreach (SDBookmark b in bookmarks)

src/Main/Base/Project/Src/Bookmarks/Pad/BookmarkPad.cs

@@ -40,7 +40,7 @@ namespace ICSharpCode.SharpDevelop.Bookmarks
 		{
 			instance = this;			
 			myPanel.Children.Add(CreateToolBar());
-			listView.HideColumns(3, 0);
+			listView.HideColumns(2, 0);
 		}
 	}
 	
@@ -96,9 +96,9 @@ namespace ICSharpCode.SharpDevelop.Bookmarks
 			}
 		}
 		
-		public ListViewPadItemModel PrevItem {
+		public ListViewPadItemModel PreviousItem {
 			get {
-				return this.listView.PrevItem;
+				return this.listView.PreviousItem;
 			}
 		}
 		

src/Main/Base/Project/Src/Bookmarks/Pad/BookmarkPadToolbarCommands.cs

@@ -56,7 +56,7 @@ namespace ICSharpCode.SharpDevelop.Bookmarks
 			var bookmarkBase = (BookmarkPadBase)Owner;			
 			var nextItem = bookmarkBase.NextItem;
 			
-			base.Run(nextItem);
+			Run(nextItem);
 		}
 	}
 	
@@ -65,9 +65,9 @@ namespace ICSharpCode.SharpDevelop.Bookmarks
 		public override void Run()
 		{
 			var bookmarkBase = (BookmarkPadBase)Owner;			
-			var prevItem = bookmarkBase.PrevItem;
+			var prevItem = bookmarkBase.PreviousItem;
 			
-			base.Run(prevItem);	
+			Run(prevItem);	
 		}
 	}
 	#endregion Goto Commands

src/Main/Base/Project/Src/Bookmarks/Pad/Controls/ListViewPad.xaml

@@ -10,9 +10,11 @@
 					IsChecked="{Binding Path=IsChecked, Mode=TwoWay}" />
 			</DataTemplate>
 			<DataTemplate
-				x:Key="ImageTemplate">
+				x:Key="InformationTemplate">
-				<Image
+				<StackPanel Orientation="Horizontal">
-					Source="{Binding Path=Image, UpdateSourceTrigger=PropertyChanged}" />
+					<Image Source="{Binding Path=Image, UpdateSourceTrigger=PropertyChanged}" Margin="1, 1, 5, 1" />
+					<TextBlock Text="{Binding Path=Location}" />
+				</StackPanel>
 			</DataTemplate>
 		</Grid.Resources>
 		<ListView
@@ -24,14 +26,10 @@
 						Header=""
 						Width="Auto"
 						CellTemplate="{StaticResource CheckBoxTemplate}" />
-					<GridViewColumn
-						Header=""
-						Width="Auto"
-						CellTemplate="{StaticResource ImageTemplate}" />
 					<GridViewColumn
 						Header="{core:Localize MainWindow.Windows.BookmarkPad.LocationText}"
 						Width="Auto"
-						DisplayMemberBinding="{Binding Path=Location}" />
+						CellTemplate="{StaticResource InformationTemplate}" />
 					<GridViewColumn
 						Header="{core:Localize MainWindow.Windows.Debug.CallStack.Language}"
 						Width="Auto"

src/Main/Base/Project/Src/Bookmarks/Pad/Controls/ListViewPad.xaml.cs

@@ -64,7 +64,7 @@ namespace ICSharpCode.SharpDevelop.Bookmarks.Pad.Controls
 			}
 		}
 		
-		public ListViewPadItemModel PrevItem {
+		public ListViewPadItemModel PreviousItem {
 			get {
 				bool found = false;
 				ListViewPadItemModel prev = null;
@@ -220,6 +220,11 @@ namespace ICSharpCode.SharpDevelop.Bookmarks.Pad.Controls
 			}
 		}
 		
+		public override string ToString()
+		{
+			return Location;
+		}
+		
 		private string GetLocation(SDBookmark bookmark)
 		{
 			return string.Format(StringParser.Parse("${res:MainWindow.Windows.BookmarkPad.LineText}"),

src/Main/Base/Project/Src/Bookmarks/SDBookmark.cs

@@ -12,7 +12,7 @@ namespace ICSharpCode.SharpDevelop.Bookmarks
 	/// A bookmark that is persistant across SharpDevelop sessions.
 	/// </summary>
 	[TypeConverter(typeof(BookmarkConverter))]
-	public class SDBookmark : BookmarkBase
+	public abstract class SDBookmark : BookmarkBase
 	{
 		public SDBookmark(FileName fileName, Location location) : base(location)
 		{
@@ -91,4 +91,14 @@ namespace ICSharpCode.SharpDevelop.Bookmarks
 			BookmarkManager.RemoveMark(this);
 		}
 	}
+	
+	/// <summary>
+	/// Bookmark class.
+	/// </summary>
+	public sealed class Bookmark : SDBookmark
+	{ 
+		public Bookmark(FileName fileName, Location location) : base(fileName, location)
+		{
+		}
+	}
 }

src/Main/Base/Project/Src/Services/Debugger/Tooltips/IPinDebuggerControl.cs

@@ -5,9 +5,9 @@ using System;
 using System.Collections.Generic;
 using System.Windows;
 
-using ICSharpCode.SharpDevelop.Debugging;
+using ICSharpCode.SharpDevelop.Bookmarks;
 
-namespace Services.Debugger.Tooltips
+namespace ICSharpCode.SharpDevelop.Debugging
 {
 	public interface IPinDebuggerControl
 	{

src/Main/Base/Project/Src/Services/Debugger/Tooltips/PinBookmark.cs

@@ -13,7 +13,7 @@ using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Bookmarks;
 using ICSharpCode.SharpDevelop.Debugging;
 
-namespace Services.Debugger.Tooltips
+namespace ICSharpCode.SharpDevelop.Bookmarks
 {
 	public class PinBookmark : SDBookmark
 	{

src/Tools/NUnit/nunit-console/AssemblyInfo.cs

@@ -36,5 +36,5 @@ using System.Reflection;
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("2.5.9")]
+[assembly: AssemblyVersion("2.5.10")]
-[assembly: AssemblyInformationalVersion("2.5.9")]
+[assembly: AssemblyInformationalVersion("2.5.10")]

src/Tools/NUnit/nunit-console/ExtendedConsoleUi.cs

@@ -93,7 +93,7 @@ namespace NUnit.ConsoleRunner
 				if ( options.run != null && options.run != string.Empty )
 				{
 					Console.WriteLine( "Selected test(s): " + options.run );
-					testFilter = new SimpleNameFilter( options.run );
+					testFilter = new SimpleNameFilter( TestNameParser.Parse(options.run) );
 				}
 
 				if ( options.include != null && options.include != string.Empty )
@@ -163,7 +163,7 @@ namespace NUnit.ConsoleRunner
                     else
                     {
                         WriteSummaryReport(summary);
-                        if (summary.ErrorsAndFailures > 0)
+                        if (summary.ErrorsAndFailures > 0 || result.IsError || result.IsFailure)
                             WriteErrorsAndFailuresReport(result);
                         if (summary.TestsNotRun > 0)
                             WriteNotRunReport(result);
@@ -297,7 +297,8 @@ namespace NUnit.ConsoleRunner
             {
                 if (result.HasResults)
                 {
-                    if ( (result.IsFailure || result.IsError) && result.FailureSite == FailureSite.SetUp)
+                    if (result.IsFailure || result.IsError)
+                        if (result.FailureSite == FailureSite.SetUp || result.FailureSite == FailureSite.TearDown)
                             WriteSingleResult(result);
 
                     foreach (TestResult childResult in result.Results)