From 96009c67aaeaec96e5a85164bcb22a339de33564 Mon Sep 17 00:00:00 2001 From: Jan Bliznicenko Date: Tue, 18 Jun 2024 12:20:11 +0200 Subject: [PATCH] Moved to Tonel 3 --- .../ConfigurationOfXmlDomVisitor.class.st | 11 ++--- .../ConfigurationOfXmlDomVisitor/package.st | 2 +- .../XML-DOM-Visitor/XMLCData.extension.st | 4 +- .../XMLDOMElementVisitor.class.st | 22 +++++----- .../XMLDOMElementVisitorTest.class.st | 10 +++-- .../XMLDOMTestVisitor.class.st | 18 +++++---- .../XMLDOMTypedElement.class.st | 38 +++++++++--------- .../XMLDOMTypedElementTest.class.st | 40 ++++++++++--------- .../XML-DOM-Visitor/XMLDOMVisitor.class.st | 18 +++++---- .../XMLDOMVisitorTest.class.st | 12 +++--- .../XML-DOM-Visitor/XMLDocument.extension.st | 4 +- .../XML-DOM-Visitor/XMLElement.extension.st | 4 +- .../XML-DOM-Visitor/XMLString.extension.st | 4 +- repository/XML-DOM-Visitor/package.st | 2 +- 14 files changed, 102 insertions(+), 87 deletions(-) diff --git a/repository/ConfigurationOfXmlDomVisitor/ConfigurationOfXmlDomVisitor.class.st b/repository/ConfigurationOfXmlDomVisitor/ConfigurationOfXmlDomVisitor.class.st index 209949b..f16e426 100644 --- a/repository/ConfigurationOfXmlDomVisitor/ConfigurationOfXmlDomVisitor.class.st +++ b/repository/ConfigurationOfXmlDomVisitor/ConfigurationOfXmlDomVisitor.class.st @@ -1,10 +1,11 @@ Class { - #name : #ConfigurationOfXmlDomVisitor, - #superclass : #ConfigurationOf, - #category : 'ConfigurationOfXmlDomVisitor' + #name : 'ConfigurationOfXmlDomVisitor', + #superclass : 'ConfigurationOf', + #category : 'ConfigurationOfXmlDomVisitor', + #package : 'ConfigurationOfXmlDomVisitor' } -{ #category : #baselines } +{ #category : 'baselines' } ConfigurationOfXmlDomVisitor >> baseline_0_1_0: spec [ spec @@ -22,7 +23,7 @@ ConfigurationOfXmlDomVisitor >> baseline_0_1_0: spec [ spec group: 'default' with: #('XML-DOM-Visitor') ] ] -{ #category : #'symbolic versions' } +{ #category : 'symbolic versions' } ConfigurationOfXmlDomVisitor >> development: spec [ spec for: #common version: '0.1.0-baseline' diff --git a/repository/ConfigurationOfXmlDomVisitor/package.st b/repository/ConfigurationOfXmlDomVisitor/package.st index c77d27b..6fd0cf4 100644 --- a/repository/ConfigurationOfXmlDomVisitor/package.st +++ b/repository/ConfigurationOfXmlDomVisitor/package.st @@ -1 +1 @@ -Package { #name : #ConfigurationOfXmlDomVisitor } +Package { #name : 'ConfigurationOfXmlDomVisitor' } diff --git a/repository/XML-DOM-Visitor/XMLCData.extension.st b/repository/XML-DOM-Visitor/XMLCData.extension.st index 183e0b8..af6679e 100644 --- a/repository/XML-DOM-Visitor/XMLCData.extension.st +++ b/repository/XML-DOM-Visitor/XMLCData.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #XMLCData } +Extension { #name : 'XMLCData' } -{ #category : #'*XML-DOM-Visitor-visitor' } +{ #category : '*XML-DOM-Visitor-visitor' } XMLCData >> accept: aVisitor [ aVisitor visitCData: self ] diff --git a/repository/XML-DOM-Visitor/XMLDOMElementVisitor.class.st b/repository/XML-DOM-Visitor/XMLDOMElementVisitor.class.st index 7467841..a0e0c70 100644 --- a/repository/XML-DOM-Visitor/XMLDOMElementVisitor.class.st +++ b/repository/XML-DOM-Visitor/XMLDOMElementVisitor.class.st @@ -4,41 +4,43 @@ I am a DOM visitor that visits elements and delegates the visition to pluggable e.g. upon visiting `` element the `elementVisitor visitActorRoles:` method will be called. " Class { - #name : #XMLDOMElementVisitor, - #superclass : #XMLDOMVisitor, + #name : 'XMLDOMElementVisitor', + #superclass : 'XMLDOMVisitor', #instVars : [ 'elementVisitor', 'ignoredElements' ], - #category : 'XML-DOM-Visitor-Visitor' + #category : 'XML-DOM-Visitor-Visitor', + #package : 'XML-DOM-Visitor', + #tag : 'Visitor' } -{ #category : #accessing } +{ #category : 'accessing' } XMLDOMElementVisitor >> elementVisitor [ ^ elementVisitor ] -{ #category : #accessing } +{ #category : 'accessing' } XMLDOMElementVisitor >> elementVisitor: aVisitor [ elementVisitor := aVisitor ] -{ #category : #accessing } +{ #category : 'accessing' } XMLDOMElementVisitor >> ignoredElements [ ^ ignoredElements ifNil: [ #() ] ] -{ #category : #accessing } +{ #category : 'accessing' } XMLDOMElementVisitor >> ignoredElements: aCollection [ ignoredElements := aCollection ] -{ #category : #testing } +{ #category : 'testing' } XMLDOMElementVisitor >> isIgnored: anElement [ ^ self ignoredElements includes: anElement name ] -{ #category : #visiting } +{ #category : 'visiting' } XMLDOMElementVisitor >> visitElement: anElement [ (self isIgnored: anElement) ifTrue: [ ^ self ]. @@ -46,7 +48,7 @@ XMLDOMElementVisitor >> visitElement: anElement [ super visitElement: anElement ] -{ #category : #visitor } +{ #category : 'visitor' } XMLDOMElementVisitor >> visitSelectorFor: aNodeName [ ^ ('visit' , aNodeName capitalized , ':') asSymbol ] diff --git a/repository/XML-DOM-Visitor/XMLDOMElementVisitorTest.class.st b/repository/XML-DOM-Visitor/XMLDOMElementVisitorTest.class.st index a44b9d8..da547c6 100644 --- a/repository/XML-DOM-Visitor/XMLDOMElementVisitorTest.class.st +++ b/repository/XML-DOM-Visitor/XMLDOMElementVisitorTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #XMLDOMElementVisitorTest, - #superclass : #TestCase, - #category : 'XML-DOM-Visitor-Tests' + #name : 'XMLDOMElementVisitorTest', + #superclass : 'TestCase', + #category : 'XML-DOM-Visitor-Tests', + #package : 'XML-DOM-Visitor', + #tag : 'Tests' } -{ #category : #tests } +{ #category : 'tests' } XMLDOMElementVisitorTest >> testVisitSelectorFor [ self assert: (XMLDOMElementVisitor new visitSelectorFor: 'someName') diff --git a/repository/XML-DOM-Visitor/XMLDOMTestVisitor.class.st b/repository/XML-DOM-Visitor/XMLDOMTestVisitor.class.st index 3145f07..c520f40 100644 --- a/repository/XML-DOM-Visitor/XMLDOMTestVisitor.class.st +++ b/repository/XML-DOM-Visitor/XMLDOMTestVisitor.class.st @@ -1,37 +1,39 @@ Class { - #name : #XMLDOMTestVisitor, - #superclass : #XMLDOMVisitor, + #name : 'XMLDOMTestVisitor', + #superclass : 'XMLDOMVisitor', #instVars : [ 'entries' ], - #category : 'XML-DOM-Visitor-Visitor' + #category : 'XML-DOM-Visitor-Visitor', + #package : 'XML-DOM-Visitor', + #tag : 'Visitor' } -{ #category : #accessing } +{ #category : 'accessing' } XMLDOMTestVisitor >> entries [ ^ entries ] -{ #category : #initialization } +{ #category : 'initialization' } XMLDOMTestVisitor >> initialize [ super initialize. entries := OrderedCollection new ] -{ #category : #visiting } +{ #category : 'visiting' } XMLDOMTestVisitor >> visitDocument: aDocument [ entries add: 'version' -> aDocument version. entries add: 'encoding' -> aDocument encoding. super visitDocument: aDocument ] -{ #category : #visiting } +{ #category : 'visiting' } XMLDOMTestVisitor >> visitElement: anElement [ entries add: anElement name -> anElement name. super visitElement: anElement ] -{ #category : #visiting } +{ #category : 'visiting' } XMLDOMTestVisitor >> visitString: aStringNode [ entries add: #string -> aStringNode string ] diff --git a/repository/XML-DOM-Visitor/XMLDOMTypedElement.class.st b/repository/XML-DOM-Visitor/XMLDOMTypedElement.class.st index e737fe7..b46c7a3 100644 --- a/repository/XML-DOM-Visitor/XMLDOMTypedElement.class.st +++ b/repository/XML-DOM-Visitor/XMLDOMTypedElement.class.st @@ -1,80 +1,82 @@ Class { - #name : #XMLDOMTypedElement, - #superclass : #XMLElement, - #category : 'XML-DOM-Visitor-DOM' + #name : 'XMLDOMTypedElement', + #superclass : 'XMLElement', + #category : 'XML-DOM-Visitor-DOM', + #package : 'XML-DOM-Visitor', + #tag : 'DOM' } -{ #category : #'typed attribute accessing' } +{ #category : 'typed attribute accessing' } XMLDOMTypedElement >> booleanAt: aName [ ^ self booleanFrom: (self attributeAt: aName) ] -{ #category : #'private - converting' } +{ #category : 'private - converting' } XMLDOMTypedElement >> booleanFrom: aString [ ^ #('1' 'true' 'yes') includes: aString ] -{ #category : #'typed value accessing' } +{ #category : 'typed value accessing' } XMLDOMTypedElement >> booleanValue [ ^ self booleanFrom: self rawContentString ] -{ #category : #'typed attribute accessing' } +{ #category : 'typed attribute accessing' } XMLDOMTypedElement >> dateAt: aName [ ^ self dateFrom: (self attributeAt: aName) ] -{ #category : #'private - converting' } +{ #category : 'private - converting' } XMLDOMTypedElement >> dateFrom: aString [ ^ DateAndTime fromString: aString ] -{ #category : #'typed value accessing' } +{ #category : 'typed value accessing' } XMLDOMTypedElement >> dateValue [ ^ self dateFrom: self rawContentString ] -{ #category : #'typed value accessing' } +{ #category : 'typed value accessing' } XMLDOMTypedElement >> isEmptyValue [ ^ self rawContentString isEmpty ] -{ #category : #'typed attribute accessing' } +{ #category : 'typed attribute accessing' } XMLDOMTypedElement >> numberAt: aName [ ^ (self attributeAt: aName) asNumber ] -{ #category : #'typed value accessing' } +{ #category : 'typed value accessing' } XMLDOMTypedElement >> numberValue [ ^ self rawContentString asNumber ] -{ #category : #'typed attribute accessing' } +{ #category : 'typed attribute accessing' } XMLDOMTypedElement >> stringAt: aName [ ^ self attributeAt: aName ] -{ #category : #'typed value accessing' } +{ #category : 'typed value accessing' } XMLDOMTypedElement >> stringValue [ ^ self rawContentString ] -{ #category : #'typed attribute accessing' } +{ #category : 'typed attribute accessing' } XMLDOMTypedElement >> symbolAt: aName [ ^ (self attributeAt: aName) asSymbol ] -{ #category : #'typed value accessing' } +{ #category : 'typed value accessing' } XMLDOMTypedElement >> symbolValue [ ^ self rawContentString asSymbol ] -{ #category : #'typed attribute accessing' } +{ #category : 'typed attribute accessing' } XMLDOMTypedElement >> uuidAt: aName [ ^ UUID fromString: (self attributeAt: aName) ] -{ #category : #'typed value accessing' } +{ #category : 'typed value accessing' } XMLDOMTypedElement >> uuidValue [ ^ UUID fromString: self rawContentString ] diff --git a/repository/XML-DOM-Visitor/XMLDOMTypedElementTest.class.st b/repository/XML-DOM-Visitor/XMLDOMTypedElementTest.class.st index 78e21fe..c7882da 100644 --- a/repository/XML-DOM-Visitor/XMLDOMTypedElementTest.class.st +++ b/repository/XML-DOM-Visitor/XMLDOMTypedElementTest.class.st @@ -1,13 +1,15 @@ Class { - #name : #XMLDOMTypedElementTest, - #superclass : #TestCase, + #name : 'XMLDOMTypedElementTest', + #superclass : 'TestCase', #instVars : [ 'element' ], - #category : 'XML-DOM-Visitor-Tests' + #category : 'XML-DOM-Visitor-Tests', + #package : 'XML-DOM-Visitor', + #tag : 'Tests' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } XMLDOMTypedElementTest >> elementValued: aString [ ^ XMLDOMTypedElement new name: 'element'; @@ -15,12 +17,12 @@ XMLDOMTypedElementTest >> elementValued: aString [ yourself ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } XMLDOMTypedElementTest >> elementWithAttributes: aDictionary [ ^ XMLDOMTypedElement name: 'element' attributes: aDictionary ] -{ #category : #running } +{ #category : 'running' } XMLDOMTypedElementTest >> setUp [ super setUp. element := XMLElement @@ -30,7 +32,7 @@ XMLDOMTypedElementTest >> setUp [ #isSomething -> true} asDictionary ] -{ #category : #'tests-typed attribute accessing' } +{ #category : 'tests-typed attribute accessing' } XMLDOMTypedElementTest >> testBooleanAt [ element := self elementWithAttributes: @@ -48,7 +50,7 @@ XMLDOMTypedElementTest >> testBooleanAt [ self assert: (element booleanAt: #noBit) equals: false ] -{ #category : #'tests-typed value accessing' } +{ #category : 'tests-typed value accessing' } XMLDOMTypedElementTest >> testBooleanValue [ self assert: (self elementValued: 'true') booleanValue equals: true. self assert: (self elementValued: 'false') booleanValue equals: false. @@ -58,7 +60,7 @@ XMLDOMTypedElementTest >> testBooleanValue [ self assert: (self elementValued: '0') booleanValue equals: false ] -{ #category : #'tests-typed attribute accessing' } +{ #category : 'tests-typed attribute accessing' } XMLDOMTypedElementTest >> testDateAt [ element := self elementWithAttributes: {#date -> '2016-10-22T17:16:59'} asDictionary. self @@ -73,7 +75,7 @@ XMLDOMTypedElementTest >> testDateAt [ second: 59) ] -{ #category : #'tests-typed value accessing' } +{ #category : 'tests-typed value accessing' } XMLDOMTypedElementTest >> testDateValue [ self assert: (self elementValued: '2016-10-22T17:16:59') dateValue @@ -87,13 +89,13 @@ XMLDOMTypedElementTest >> testDateValue [ second: 59) ] -{ #category : #'tests-typed value accessing' } +{ #category : 'tests-typed value accessing' } XMLDOMTypedElementTest >> testIsEmptyValue [ self assert: (self elementValued: '') isEmptyValue. self deny: (self elementValued: '15') isEmptyValue ] -{ #category : #'tests-typed attribute accessing' } +{ #category : 'tests-typed attribute accessing' } XMLDOMTypedElementTest >> testNumberAt [ element := self elementWithAttributes: @@ -103,38 +105,38 @@ XMLDOMTypedElementTest >> testNumberAt [ self assert: (element numberAt: #float) equals: 10.4 ] -{ #category : #'tests-typed value accessing' } +{ #category : 'tests-typed value accessing' } XMLDOMTypedElementTest >> testNumberValue [ self assert: (self elementValued: '12') numberValue equals: 12. self assert: (self elementValued: '10.4') numberValue equals: 10.4 ] -{ #category : #'tests-typed attribute accessing' } +{ #category : 'tests-typed attribute accessing' } XMLDOMTypedElementTest >> testStringAt [ element := self elementWithAttributes: {#str -> 'value'} asDictionary. self assert: (element stringAt: #str) equals: 'value'. self deny: (element stringAt: #str) isSymbol ] -{ #category : #'tests-typed value accessing' } +{ #category : 'tests-typed value accessing' } XMLDOMTypedElementTest >> testStringValue [ self assert: (self elementValued: 'value') stringValue equals: 'value' ] -{ #category : #'tests-typed attribute accessing' } +{ #category : 'tests-typed attribute accessing' } XMLDOMTypedElementTest >> testSymbolAt [ element := self elementWithAttributes: {#str -> 'value'} asDictionary. self assert: (element symbolAt: #str) equals: #value. self assert: (element symbolAt: #str) isSymbol ] -{ #category : #'tests-typed value accessing' } +{ #category : 'tests-typed value accessing' } XMLDOMTypedElementTest >> testSymbolValue [ self assert: (self elementValued: 'value') symbolValue equals: #value. self assert: (self elementValued: 'value') symbolValue isSymbol ] -{ #category : #'tests-typed attribute accessing' } +{ #category : 'tests-typed attribute accessing' } XMLDOMTypedElementTest >> testUuidAt [ element := self elementWithAttributes: {#uuid -> 'c95c1cd5-832d-4b46-b73f-a080ba157501'} asDictionary. @@ -143,7 +145,7 @@ XMLDOMTypedElementTest >> testUuidAt [ equals: (UUID fromString: 'c95c1cd5-832d-4b46-b73f-a080ba157501') ] -{ #category : #'tests-typed value accessing' } +{ #category : 'tests-typed value accessing' } XMLDOMTypedElementTest >> testUuidValue [ self assert: (self elementValued: 'c95c1cd5-832d-4b46-b73f-a080ba157501') uuidValue diff --git a/repository/XML-DOM-Visitor/XMLDOMVisitor.class.st b/repository/XML-DOM-Visitor/XMLDOMVisitor.class.st index 7c713e7..c8fc902 100644 --- a/repository/XML-DOM-Visitor/XMLDOMVisitor.class.st +++ b/repository/XML-DOM-Visitor/XMLDOMVisitor.class.st @@ -2,32 +2,34 @@ I am a base class for XML DOM visitors. " Class { - #name : #XMLDOMVisitor, - #superclass : #Object, - #category : 'XML-DOM-Visitor-Visitor' + #name : 'XMLDOMVisitor', + #superclass : 'Object', + #category : 'XML-DOM-Visitor-Visitor', + #package : 'XML-DOM-Visitor', + #tag : 'Visitor' } -{ #category : #visitor } +{ #category : 'visitor' } XMLDOMVisitor >> visit: aDocument [ ^ aDocument accept: self ] -{ #category : #visiting } +{ #category : 'visiting' } XMLDOMVisitor >> visitCData: aCDataNode [ ] -{ #category : #visiting } +{ #category : 'visiting' } XMLDOMVisitor >> visitDocument: aDocument [ aDocument nodes do: [ :each | each accept: self ] ] -{ #category : #visiting } +{ #category : 'visiting' } XMLDOMVisitor >> visitElement: anElement [ ^ anElement nodes do: [ :each | each accept: self ] ] -{ #category : #visiting } +{ #category : 'visiting' } XMLDOMVisitor >> visitString: aStringNode [ ] diff --git a/repository/XML-DOM-Visitor/XMLDOMVisitorTest.class.st b/repository/XML-DOM-Visitor/XMLDOMVisitorTest.class.st index 5532559..5ca582c 100644 --- a/repository/XML-DOM-Visitor/XMLDOMVisitorTest.class.st +++ b/repository/XML-DOM-Visitor/XMLDOMVisitorTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #XMLDOMVisitorTest, - #superclass : #TestCase, - #category : 'XML-DOM-Visitor-Tests' + #name : 'XMLDOMVisitorTest', + #superclass : 'TestCase', + #category : 'XML-DOM-Visitor-Tests', + #package : 'XML-DOM-Visitor', + #tag : 'Tests' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } XMLDOMVisitorTest >> newDocument [ ^ XMLDOMParser parse: ' @@ -14,7 +16,7 @@ XMLDOMVisitorTest >> newDocument [ ' ] -{ #category : #'as yet unclassified' } +{ #category : 'as yet unclassified' } XMLDOMVisitorTest >> testVisit [ | visitor | visitor := XMLDOMTestVisitor new. diff --git a/repository/XML-DOM-Visitor/XMLDocument.extension.st b/repository/XML-DOM-Visitor/XMLDocument.extension.st index cf18a14..c67b267 100644 --- a/repository/XML-DOM-Visitor/XMLDocument.extension.st +++ b/repository/XML-DOM-Visitor/XMLDocument.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #XMLDocument } +Extension { #name : 'XMLDocument' } -{ #category : #'*XML-DOM-Visitor-visitor' } +{ #category : '*XML-DOM-Visitor-visitor' } XMLDocument >> accept: aVisitor [ ^ aVisitor visitDocument: self ] diff --git a/repository/XML-DOM-Visitor/XMLElement.extension.st b/repository/XML-DOM-Visitor/XMLElement.extension.st index 2d5f5a1..e2e3d89 100644 --- a/repository/XML-DOM-Visitor/XMLElement.extension.st +++ b/repository/XML-DOM-Visitor/XMLElement.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #XMLElement } +Extension { #name : 'XMLElement' } -{ #category : #'*XML-DOM-Visitor' } +{ #category : '*XML-DOM-Visitor' } XMLElement >> accept: aVisitor [ ^ aVisitor visitElement: self ] diff --git a/repository/XML-DOM-Visitor/XMLString.extension.st b/repository/XML-DOM-Visitor/XMLString.extension.st index 087e505..95e8323 100644 --- a/repository/XML-DOM-Visitor/XMLString.extension.st +++ b/repository/XML-DOM-Visitor/XMLString.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #XMLString } +Extension { #name : 'XMLString' } -{ #category : #'*XML-DOM-Visitor-visitor' } +{ #category : '*XML-DOM-Visitor-visitor' } XMLString >> accept: aVisitor [ aVisitor visitString: self ] diff --git a/repository/XML-DOM-Visitor/package.st b/repository/XML-DOM-Visitor/package.st index b37cea9..89cc138 100644 --- a/repository/XML-DOM-Visitor/package.st +++ b/repository/XML-DOM-Visitor/package.st @@ -1 +1 @@ -Package { #name : #'XML-DOM-Visitor' } +Package { #name : 'XML-DOM-Visitor' }