Simplify document roots and fix tree

pharo-contributions · Oct 22, 2024 · f8619c6 · f8619c6
1 parent bd54c0a
commit f8619c6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/XML-Parser-Tools/XMLDocument.extension.st b/src/XML-Parser-Tools/XMLDocument.extension.st
@@ -0,0 +1,7 @@
+Extension { #name : 'XMLDocument' }
+
+{ #category : '*XML-Parser-Tools' }
+XMLDocument >> inspectorRoots [ 
+
+	^ Array with: self root
+]
diff --git a/src/XML-Parser-Tools/XMLNode.extension.st b/src/XML-Parser-Tools/XMLNode.extension.st
@@ -14,19 +14,27 @@ XMLNode >> inspectTreeIn: specBuilder [
 	<inspectorPresentationOrder: 28 title: 'Tree'>
 
 	| roots |
-	roots := self isDocument ifTrue: [ (Array with: self root) ] ifFalse: [ (Array with: self) ].
+
+	roots := self inspectorRoots.
 	^ specBuilder newTree
 		roots: roots;
 		display: [ :aNode | 
 			self inspectorTreeStringFor: aNode 			
 			];
 "		displayIcon: [ :aNode | aNode iconName ifNotNil: [ :aName | self iconNamed: aName ] ];"
 		children: [ :aNode | 
-			aNode isContentNode ifFalse: [ aNode descendantElements ] ifTrue: [ #() ]]
+
+			aNode hasChildren ifTrue: [ aNode descendantElements ] ifFalse: [ #() ]]
 
 
 ]
 
+{ #category : '*XML-Parser-Tools' }
+XMLNode >> inspectorRoots [
+
+	^ Array with: self
+]
+
 { #category : '*XML-Parser-Tools' }
 XMLNode >> inspectorTreeStringFor: anXMLElement [
 	| display |