[Wixedit-commits] wixedit/src DisplayBasePanel.cs,1.6,1.7 EditorForm.cs,1.50,1.51

[Jasper K. <ja...@us...>]

Update of /cvsroot/wixedit/wixedit/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26876/src

Modified Files:
	DisplayBasePanel.cs EditorForm.cs 
Log Message:
Minor improvements in error handling

Index: EditorForm.cs
===================================================================
RCS file: /cvsroot/wixedit/wixedit/src/EditorForm.cs,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** EditorForm.cs	3 May 2006 21:29:38 -0000	1.50
--- EditorForm.cs	3 May 2006 21:38:32 -0000	1.51
***************
*** 1041,1044 ****
--- 1041,1048 ----
              }
  
+             if (wixFiles == null) {
+                 return;
+             }
+ 
              wixFiles.wxsChanged += new EventHandler(wixFiles_wxsChanged);
  

Index: DisplayBasePanel.cs
===================================================================
RCS file: /cvsroot/wixedit/wixedit/src/DisplayBasePanel.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DisplayBasePanel.cs	1 May 2006 09:11:16 -0000	1.6
--- DisplayBasePanel.cs	3 May 2006 21:38:32 -0000	1.7
***************
*** 251,255 ****
  
              XmlDocument importXml = new XmlDocument();
!             importXml.Load(importFile);
  
              XmlNodeList itemList =  importXml.SelectNodes(xPath, WixFiles.WxsNsmgr);
--- 251,261 ----
  
              XmlDocument importXml = new XmlDocument();
!             try {
!                 importXml.Load(importFile);
!             } catch (Exception) {
!                 MessageBox.Show("Failed to load xml from file.", "Import failed", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); 
! 
!                 return false;
!             }
  
              XmlNodeList itemList =  importXml.SelectNodes(xPath, WixFiles.WxsNsmgr);
***************
*** 259,264 ****
--- 265,272 ----
                          continue;
                      }
+ 
                      string itemName = item.Attributes[currentKeyName].Value;
                      XmlNode importedItem = WixFiles.WxsDocument.ImportNode(item, true);
+ 
                      InsertNewXmlNode(currentParent, importedItem);
                  }