condense code

src/RTree-Tests/RTCollectionTest.class.st

@@ -152,7 +152,7 @@ RTCollectionTest >> testOneElement [
 RTCollectionTest >> testSortResultArray [
 
 	| shapes a b c d tree e |
-	shapes := { 
+	shapes := {
 		          ((a := RTreeBox model: 'a') -> { 1. 1 }).
 		          ((b := RTreeBox model: 'b') -> { 1. 2 }).
 		          ((c := RTreeBox model: 'c') -> { 3. 1 }).
@@ -161,7 +161,7 @@ RTCollectionTest >> testSortResultArray [
 	tree := RTreeCollection new.
 	tree sortResultList: shapes.
 
-	self assert: (shapes collect: #key) equals: { 
+	self assert: (shapes collect: #key) equals: {
 			c.
 			e.
 			d.

src/RTree-Tests/RTreeBox.class.st

@@ -26,8 +26,7 @@ Class {
 RTreeBox class >> model: anObject [
 	^ self new
 		model: anObject;
-		yourself 
-
+		yourself
 ]
 
 { #category : 'adding' }

src/RTree-Tests/RTreeTest.class.st

@@ -258,7 +258,7 @@ RTreeTest >> testSearchPath3 [
 RTreeTest >> testSortResultArray [
 
 	| entries a b c d e |
-	entries := { 
+	entries := {
 		          ((a := RTreeBox model: 'a') -> { 1. 1 }).
 		          ((b := RTreeBox model: 'b') -> { 1. 2 }).
 		          ((c := RTreeBox model: 'c') -> { 3. 1 }).
@@ -267,7 +267,7 @@ RTreeTest >> testSortResultArray [
 	tree := RTreeCollection new.
 	tree sortResultList: entries.
 
-	self assert: (entries collect: #key) equals: { 
+	self assert: (entries collect: #key) equals: {
 			c.
 			e.
 			d.
@@ -314,7 +314,7 @@ RTreeTest >> testThreeElementsContains [
 
 	result := tree entriesAtRectangle: (-20@ -20 corner: 40@40).
 	self assert: result size equals: 3.
-	self assert: result asArray equals: { b2. b1. b3 }.
+	self assert: result asArray equals: { b2. b1. b3 }
 ]
 
 { #category : 'tests' }
@@ -352,7 +352,7 @@ RTreeTest >> testTwoElementsContains [
 	| b1 b2 result |
 	b1 := RTreeBox new size: 10; entryIndex: 1.
 	b2 := RTreeBox new size: 30; position: 25@ 25; entryIndex: 2.
-	
+
 	tree addAll: { b1. b2 }.
 	result := tree entriesAtPoint: 0@0.
 	self assert: result first equals: b1.
@@ -387,14 +387,14 @@ RTreeTest >> testUpdateExtentShouldUpdateTreeRectangle [
 	box := RTreeBox new.
 	box extent: oldExtent.
 	collection add: box.
-	
+
 	self assert: collection root rectangle equals: box encompassingRectangle.
-	
+
 	box extent: newExtent.
 	collection updateEntry: box.
-	
+
 	self assert: box encompassingRectangle extent equals: newExtent.
-	self assert: collection root rectangle equals: box encompassingRectangle.
+	self assert: collection root rectangle equals: box encompassingRectangle
 ]
 
 { #category : 'tests' }

src/RTree/RTAbstractCollection.class.st

@@ -18,13 +18,13 @@ Class {
 { #category : 'examples' }
 RTAbstractCollection class >> exampleList [
 	"in the inspector add and remove shapes"
-	^ StInspectorPresenter openOn: RTSequenceableCollection new.
+	^ StInspectorPresenter openOn: RTSequenceableCollection new
 ]
 
 { #category : 'examples' }
 RTAbstractCollection class >> exampleRTree [
 	"this has normal method collections with some new more"
-	^ StInspectorPresenter openOn: RTreeCollection new.
+	^ StInspectorPresenter openOn: RTreeCollection new
 ]
 
 { #category : 'adding' }

src/RTree/RTNode.class.st

@@ -66,15 +66,14 @@ RTNode >> balanceZ: z y: y x: x [
 		^ self llrotationZ: c y: b x: a ].
 	(y key not and: [ x key ]) ifTrue: [
 		^ self lrrotationZ: c y: b x: a ].
-	^ self rlrotationZ: c y: b x: a.
+	^ self rlrotationZ: c y: b x: a
 ]
 
 { #category : 'accessing' }
 RTNode >> children [
 	^ self isLeaf
 		ifTrue: [ #() ]
 		ifFalse: [ { left. right } ]
-
 ]
 
 { #category : 'enumerating' }
@@ -146,7 +145,7 @@ RTNode >> ensureBalancePath: aCollection [
 				self balanceZ: z y: y x: x.
 			]
 		]
-	].
+	]
 ]
 
 { #category : 'private' }

src/RTree/RTSequenceableCollection.class.st

@@ -46,7 +46,7 @@ RTSequenceableCollection >> initialize [
 
 { #category : 'shapes - ordering' }
 RTSequenceableCollection >> pushBack: anRTEntry [
-	entries remove: anRTEntry; addFirst: anRTEntry.
+	entries remove: anRTEntry; addFirst: anRTEntry
 ]
 
 { #category : 'shapes - ordering' }

src/RTree/RTreeCollection.class.st

@@ -34,7 +34,7 @@ RTreeCollection >> add: anRTEntry [
 
 { #category : 'private - removing' }
 RTreeCollection >> balanceRemovedPath: path [
-	
+
 	(1 to: path size -2) reverseDo: [ :index | | tree |
 		tree := (path at: index) value.
 		tree height: (tree left height max: tree right height)+1.
@@ -51,7 +51,7 @@ RTreeCollection >> balanceRemovedPath: path [
 			 in order to keep it balanced
 			maybe you can move a lot of nodes"
 		].
-	].
+	]
 ]
 
 { #category : 'enumerating' }
@@ -142,7 +142,7 @@ RTreeCollection >> removeLastNodeInPath: path [
 	parent := path nextToLast value.
 	isRight := last key.
 	last := last value.
-	brother := isRight 
+	brother := isRight
 		ifTrue: [ parent left ]
 		ifFalse: [ parent right ].
 
@@ -157,8 +157,8 @@ RTreeCollection >> root [
 ]
 
 { #category : 'public' }
-RTreeCollection >> shouldSwap: anAssociation and: anAssociation2 [ 
-	
+RTreeCollection >> shouldSwap: anAssociation and: anAssociation2 [
+
 	| v1 v2 size|
 	v1 := anAssociation value.
 	v2 := anAssociation2 value.
@@ -167,13 +167,12 @@ RTreeCollection >> shouldSwap: anAssociation and: anAssociation2 [
 	1 to: size do: [ :i| |index1 index2|
 		index1 := v1 at: i.
 		index2 := v2 at: i.
-		index1 = index2 ifFalse: [ 
+		index1 = index2 ifFalse: [
 			^ index1 > index2 ]
 	].
-	^ v1 size = v2 size 
+	^ v1 size = v2 size
 		ifTrue: [ false ]
 		ifFalse: [ v1 size > v2 size  ]
-
 ]
 
 { #category : 'public' }