From 57354103f54ad12a50065b8e71d0fe28e6aba86e Mon Sep 17 00:00:00 2001
From: Daniel Grunwald <daniel@danielgrunwald.de>
Date: Thu, 8 Jul 2010 12:56:36 +0000
Subject: [PATCH] IncludeDoozer: show error message only if included path was
 not found (don't catch unrelated TreePathNotFoundException)

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@6070 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
---
 src/Libraries/AvalonDock/AvalonDock/AvalonDock.csproj      | 2 +-
 .../Src/AddInTree/AddIn/DefaultDoozers/IncludeDoozer.cs    | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/Libraries/AvalonDock/AvalonDock/AvalonDock.csproj b/src/Libraries/AvalonDock/AvalonDock/AvalonDock.csproj
index 06887dc446..c65adb1df5 100644
--- a/src/Libraries/AvalonDock/AvalonDock/AvalonDock.csproj
+++ b/src/Libraries/AvalonDock/AvalonDock/AvalonDock.csproj
@@ -36,7 +36,7 @@
     <DefineConstants>TRACE;NET4</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\AvalonDock.XML</DocumentationFile>
+    <DocumentationFile>$(OutputPath)\AvalonDock.XML</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/IncludeDoozer.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/IncludeDoozer.cs
index 9a1968dc93..f5a011f34f 100644
--- a/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/IncludeDoozer.cs
+++ b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/IncludeDoozer.cs
@@ -69,13 +69,12 @@ namespace ICSharpCode.Core
 			
 			public void Apply(IList items)
 			{
-				AddInTreeNode node;
-				try {
-					node = AddInTree.GetTreeNode(path);
+				AddInTreeNode node = AddInTree.GetTreeNode(path, false);
+				if (node != null) {
 					foreach (object o in node.BuildChildItems(caller)) {
 						items.Add(o);
 					}
-				} catch (TreePathNotFoundException) {
+				} else {
 					MessageService.ShowError("IncludeDoozer: AddinTree-Path not found: " + path);
 				}
 			}