Browse Source

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
pull/1/head
Daniel Grunwald 16 years ago
parent
commit
57354103f5
  1. 2
      src/Libraries/AvalonDock/AvalonDock/AvalonDock.csproj
  2. 7
      src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/IncludeDoozer.cs

2
src/Libraries/AvalonDock/AvalonDock/AvalonDock.csproj

@ -36,7 +36,7 @@
<DefineConstants>TRACE;NET4</DefineConstants> <DefineConstants>TRACE;NET4</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release\AvalonDock.XML</DocumentationFile> <DocumentationFile>$(OutputPath)\AvalonDock.XML</DocumentationFile>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<SignAssembly>true</SignAssembly> <SignAssembly>true</SignAssembly>

7
src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/IncludeDoozer.cs

@ -69,13 +69,12 @@ namespace ICSharpCode.Core
public void Apply(IList items) public void Apply(IList items)
{ {
AddInTreeNode node; AddInTreeNode node = AddInTree.GetTreeNode(path, false);
try { if (node != null) {
node = AddInTree.GetTreeNode(path);
foreach (object o in node.BuildChildItems(caller)) { foreach (object o in node.BuildChildItems(caller)) {
items.Add(o); items.Add(o);
} }
} catch (TreePathNotFoundException) { } else {
MessageService.ShowError("IncludeDoozer: AddinTree-Path not found: " + path); MessageService.ShowError("IncludeDoozer: AddinTree-Path not found: " + path);
} }
} }

Loading…
Cancel
Save