AbstractFileBrowser.st
changeset 8611 3d979ab577b7
parent 8601 85c62034c1ff
child 8617 d6b870180825
--- a/AbstractFileBrowser.st	Thu May 07 19:05:33 2009 +0200
+++ b/AbstractFileBrowser.st	Thu May 07 19:06:41 2009 +0200
@@ -1941,7 +1941,7 @@
                   translateLabel: true
                 )
                (MenuItem
-                  enabled: hasXmlFileSelected
+                  "/ enabled: hasXmlFileSelected
                   label: 'XML Inspector'
                   itemValue: parseXmlFile
                   translateLabel: true
@@ -6340,7 +6340,12 @@
 
         selectedFiles:= self currentSelectedFiles.
         selectedFiles do:[:fileName |
-            xmlDocument := XML::XMLParser processDocumentInFilename:fileName beforeScanDo:[:parse| parse validate:false].
+            XML::XMLSignal handle:[:ex |    
+                Dialog information:('Error while reading XML:\    %1' bindWith:ex description) withCRs.
+                ^ self.
+            ] do:[
+                xmlDocument := XML::XMLParser processDocumentInFilename:fileName beforeScanDo:[:parse| parse validate:false].
+            ].
             XML::XMLInspector notNil ifTrue:[
                 XML::XMLInspector openOn:xmlDocument.
             ] ifFalse:[
@@ -6803,6 +6808,8 @@
 !
 
 hasXmlFileSelected
+    "/ cg - no longer use this to enable XML-inspector (always enabled).
+    "/ then handle the error when it ever fails during xml-parsing.
 
     ^ [
         |sel fileName|
@@ -6811,7 +6818,7 @@
         sel size == 1 ifTrue:[
             fileName := sel first.
             fileName notNil ifTrue:[
-                fileName suffix asLowercase = 'xml'
+                #('xml' 'vdx') includes:fileName suffix asLowercase
             ] ifFalse:[
                 false
             ]
@@ -7748,5 +7755,5 @@
 !AbstractFileBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.404 2009-05-05 15:40:34 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.405 2009-05-07 17:06:41 cg Exp $'
 ! !