Merge pull request #686 from mono/dependentFilesDuplicates

Dependent files duplicates

2 files changed, 1 insertions, 58 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs
index 3674412943..b1d00c27ba 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs
@@ -345,7 +345,7 @@ namespace MonoDevelop.Ide.Gui.Pads.ProjectPad
 				}
 
 				if (file.HasChildren) {
-					foreach (var child in file.DependentChildren) {
+					foreach (var child in file.DependentChildren.ToArray()) {
 						project.Files.Remove (child);
 						if (result == AlertButton.Delete)
 							FileService.DeleteFile (child.Name);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/SapNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/SapNodeBuilder.cs
deleted file mode 100644
index dcc30c86c1..0000000000
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/SapNodeBuilder.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-//
-// SharedProjectNodeBuilder.cs
-//
-// Author:
-//       Lluis Sanchez Gual <lluis@xamarin.com>
-//
-// Copyright (c) 2014 Xamarin, Inc (http://www.xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using MonoDevelop.Projects.SharedAssetsProjects;
-
-namespace MonoDevelop.Ide.Gui.Pads.ProjectPad
-{
-	class SapNodeBuilder: ProjectNodeBuilder
-	{
-		public override Type NodeDataType {
-			get {
-				return typeof(SharedAssetsProject);
-			}
-		}
-
-		public override Type CommandHandlerType {
-			get {
-				return typeof(SapCommandHandler);
-			}
-		}
-	}
-
-	class SapCommandHandler: ProjectNodeCommandHandler
-	{
-		/*		[CommandUpdateHandler (ProjectCommands.SetAsStartupProject)]
-		public void UpdateSetAsStartupProject (CommandInfo ci)
-		{
-			Project project = (Project) CurrentNode.DataItem;
-			ci.Visible = project.SupportsExecute;
-		}*/
-
-	}
-}
-