[Wixedit-commits] wixedit/src/PropertyGridExtensions XmlAttributeAdapter.cs,1.23,1.24

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

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

Modified Files:
	XmlAttributeAdapter.cs 
Log Message:
Implemented threaded actions (search, build, install and uninstall)
Added cancellation with Ctrl-C for actions (search, build, install and uninstall)

Index: XmlAttributeAdapter.cs
===================================================================
RCS file: /cvsroot/wixedit/wixedit/src/PropertyGridExtensions/XmlAttributeAdapter.cs,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** XmlAttributeAdapter.cs	1 May 2006 16:36:23 -0000	1.23
--- XmlAttributeAdapter.cs	3 May 2006 21:29:39 -0000	1.24
***************
*** 53,57 ****
  
              if (xmlNodeElement == null) {
!                 MessageBox.Show(String.Format("\"{0}\" is not supported!\r\n\r\nPossibly this type is supported in another version of WiX and wix.xsd.", xmlNode.Name), xmlNode.Name, MessageBoxButtons.OK, MessageBoxIcon.Error);
              } else {
                  if (xmlNodeElement.Attributes["type"] != null && xmlNodeElement.Attributes["type"].Value != null) {
--- 53,59 ----
  
              if (xmlNodeElement == null) {
!                 if (xmlNode.NodeType != XmlNodeType.ProcessingInstruction) {
!                     MessageBox.Show(String.Format("\"{0}\" is not supported!\r\n\r\nPossibly this type is supported in another version of WiX and wix.xsd.", xmlNode.Name), xmlNode.Name, MessageBoxButtons.OK, MessageBoxIcon.Error);
!                 }
              } else {
                  if (xmlNodeElement.Attributes["type"] != null && xmlNodeElement.Attributes["type"].Value != null) {
***************
*** 118,121 ****
--- 120,127 ----
  
          public override PropertyDescriptorCollection GetProperties(Attribute[] attributes) {
+             if (xmlNodeDefinition == null) {
+                 return new PropertyDescriptorCollection(new PropertyDescriptor[] {});
+             }
+ 
              ArrayList props = new ArrayList();