Fixed SD2-730: Closing one of the partial form classes of a newly created form

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/2.0@1348 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/AbstractDesignerGenerator.cs

@@ -152,6 +152,10 @@ namespace ICSharpCode.FormsDesigner
 			if (formClass == null || initializeComponent == null) {
 				throw new InvalidOperationException("InitializeComponent method not found in framework-generated CodeDom.");
 			}
+			if (this.formClass == null) {
+				MessageService.ShowMessage("Cannot save form: InitializeComponent method does not exist anymore. You should not modify the Designer.cs file while editing a form.");
+				return;
+			}
 			
 			if (formClass.Name != this.formClass.Name) {
 				LoggingService.Info("Renaming form to " + formClass.Name);

src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerLoader/NRefactoryDesignerLoader.cs

@@ -329,7 +329,11 @@ namespace ICSharpCode.FormsDesigner
 				this.CodeDomProvider.GenerateCodeFromCompileUnit(unit, Console.Out, null);
 			}
 			#endif
-			generator.MergeFormChanges(unit);
+			try {
+				generator.MergeFormChanges(unit);
+			} catch (Exception ex) {
+				MessageService.ShowError(ex);
+			}
 		}
 		
 //		public void Reload()

src/Main/Base/Project/Src/Commands/FileCommands.cs

@@ -30,7 +30,7 @@ namespace ICSharpCode.SharpDevelop.Commands
 				                                    "${res:Dialog.NewFile.AddToProjectQuestionTitle}",
 				                                    "${res:Dialog.NewFile.AddToProjectQuestionProject}",
 				                                    "${res:Dialog.NewFile.AddToProjectQuestionStandalone}")
-				    == 1)
+				    == 0)
 				{
 					new Project.Commands.AddNewItemsToProject().Run();
 					return;