Merge jv
authorMerge Script
Fri, 13 Nov 2015 06:40:27 +0100
branchjv
changeset 15937 b79f5d644b9a
parent 15934 0dbb17d42cbd (current diff)
parent 15936 4d0368c047f5 (diff)
child 15949 9c20ced90e66
child 15950 23be8cf85415
Merge
AbstractFileBrowser.st
FileApplicationNoteBook.st
--- a/AbstractFileBrowser.st	Fri Oct 30 07:00:16 2015 +0100
+++ b/AbstractFileBrowser.st	Fri Nov 13 06:40:27 2015 +0100
@@ -3195,7 +3195,16 @@
 newTextEditor
     self 
         applicationNamed:#FileApplicationNoteBook
-        ifPresentDo:[:appl | ^ appl newTextEditor].
+        ifPresentDo:[:appl | 
+            |editor files item|
+
+            editor := appl newTextEditor.
+            (files := self currentSelectedFiles) size == 1 ifTrue:[
+                item := DirectoryContentsBrowser itemClass fileName:files first.
+                editor item:item.     
+            ].    
+            ^ editor
+        ].
 
     ^ nil.
 !
@@ -8706,7 +8715,7 @@
         sel size == 1 ifTrue:[
             fileName := sel first.
             fileName notNil ifTrue:[
-                #('xml' 'vdx') includes:fileName suffix asLowercase
+                #('xml' 'xsd' 'vdx') includes:fileName suffix asLowercase
             ] ifFalse:[
                 false
             ]
--- a/FileApplicationNoteBook.st	Fri Oct 30 07:00:16 2015 +0100
+++ b/FileApplicationNoteBook.st	Fri Nov 13 06:40:27 2015 +0100
@@ -6925,9 +6925,12 @@
 !FileApplicationNoteBook::XMLViewApplication class methodsFor:'queries'!
 
 canOpenItem:anItem
+    |mime|
+    
     (Smalltalk at:#'XML::XMLInspector') isNil ifTrue:[^ false].
-
-    ^ (anItem hasMimeType and:[anItem mimeType isXmlType])
+    ((mime := anItem mimeType) isNil or:[ mime == #unknown]) ifTrue:[^ false].
+    
+    ^ mime isXmlType
 
     "Modified: / 17-02-2011 / 13:34:08 / cg"
 !