classified methods, renaming, helper methods

hpi-swa-teaching · Jul 12, 2020 · 901630c · 901630c
1 parent 97300dc
commit 901630c
Show file tree

Hide file tree

Showing 29 changed files with 46 additions and 40 deletions.
diff --git a/packages/RichTextEditing-Core.package/DocumentReadStream.class/class/on..st b/packages/RichTextEditing-Core.package/DocumentReadStream.class/class/on..st
@@ -1,4 +1,4 @@
-as yet unclassified
+instance creation
 on: aDocument
 
 	^ self basicNew on: aDocument
diff --git a/...es/RichTextEditing-Core.package/DocumentReadStream.class/instance/beginningOfStructure.st b/...es/RichTextEditing-Core.package/DocumentReadStream.class/instance/beginningOfStructure.st
@@ -1,11 +1,9 @@
 stop conditions
 beginningOfStructure
-	| currentStructures nextStructures diff |
+	| diff |
 
 	self position + 1 > self readLimit ifTrue: [^ nil].
-	currentStructures := self collection attributesAt: self position.
-	nextStructures := self collection attributesAt: self position + 1.
-	diff := nextStructures difference: currentStructures.
+	diff := self structureDifferenceBetween: self position + 1 and: self position.
 	^ diff isEmpty
 			ifTrue: [nil]
 		 	ifFalse: [{#beginningOfStructure. diff}]
diff --git a/packages/RichTextEditing-Core.package/DocumentReadStream.class/instance/collection..st b/packages/RichTextEditing-Core.package/DocumentReadStream.class/instance/collection..st
diff --git a/packages/RichTextEditing-Core.package/DocumentReadStream.class/instance/currentCharacter.st b/packages/RichTextEditing-Core.package/DocumentReadStream.class/instance/currentCharacter.st
@@ -0,0 +1,4 @@
+accessing
+currentCharacter
+
+	^ self text at: self position
diff --git a/packages/RichTextEditing-Core.package/DocumentReadStream.class/instance/endOfStructure.st b/packages/RichTextEditing-Core.package/DocumentReadStream.class/instance/endOfStructure.st
@@ -1,11 +1,9 @@
 stop conditions
 endOfStructure
-	| currentStructures nextStructures diff |
+	| diff |
 
 	self position + 1 > self readLimit ifTrue: [^ nil].
-	currentStructures := self collection attributesAt: self position.
-	nextStructures := self collection attributesAt: self position + 1.
-	diff := currentStructures difference: nextStructures.
+	diff := self structureDifferenceBetween: self position and: self position + 1.
 	^ diff isEmpty
 			ifTrue: [nil]
 		 	ifFalse: [{#endOfStructure. diff}]
diff --git a/packages/RichTextEditing-Core.package/DocumentReadStream.class/instance/lineBreak.st b/packages/RichTextEditing-Core.package/DocumentReadStream.class/instance/lineBreak.st
@@ -1,6 +1,6 @@
 stop conditions
 lineBreak
 
-	^ ((self collection at: self position) = Character lf)
+	^ self currentCharacter = Character lf
 		ifTrue: [#lineFeed]
 		ifFalse: [nil]
diff --git a/packages/RichTextEditing-Core.package/DocumentReadStream.class/instance/next.st b/packages/RichTextEditing-Core.package/DocumentReadStream.class/instance/next.st
@@ -8,4 +8,4 @@ next
 	startPosition := self position.
 	[self stopConditions isEmpty]
 		whileTrue: [self position: self position + 1].
-	^ {self collection copyFrom: startPosition to: self position. self stopConditions}
+	^ {self text copyFrom: startPosition to: self position. self stopConditions}
diff --git a/packages/RichTextEditing-Core.package/DocumentReadStream.class/instance/paragraph.st b/packages/RichTextEditing-Core.package/DocumentReadStream.class/instance/paragraph.st
@@ -1,6 +1,6 @@
 stop conditions
 paragraph
 
-	^ ((self collection at: self position) = self paragraphCharacter)
+	^ self currentCharacter = self paragraphCharacter
 		ifTrue: [#paragraph]
 		ifFalse: [nil]
diff --git a/...ages/RichTextEditing-Core.package/DocumentReadStream.class/instance/paragraphCharacter.st b/...ages/RichTextEditing-Core.package/DocumentReadStream.class/instance/paragraphCharacter.st
@@ -1,4 +1,4 @@
-as yet unclassified
+constants
 paragraphCharacter
 
 	^Character value: 182
diff --git a/packages/RichTextEditing-Core.package/DocumentReadStream.class/instance/stopConditions.st b/packages/RichTextEditing-Core.package/DocumentReadStream.class/instance/stopConditions.st
@@ -1,4 +1,4 @@
-stop conditions
+accessing
 stopConditions
 
 	^ {self endOfDocument.

diff --git a/...Editing-Core.package/DocumentReadStream.class/instance/structureDifferenceBetween.and..st b/...Editing-Core.package/DocumentReadStream.class/instance/structureDifferenceBetween.and..st
@@ -0,0 +1,4 @@
+stop conditions
+structureDifferenceBetween: firstPosition and: secondPosition
+
+	^ (self text attributesAt: firstPosition) difference: (self text attributesAt: secondPosition)
diff --git a/packages/RichTextEditing-Core.package/DocumentReadStream.class/instance/text..st b/packages/RichTextEditing-Core.package/DocumentReadStream.class/instance/text..st
@@ -0,0 +1,4 @@
+accessing
+text: aText
+
+	collection := aText
diff --git a/...ntReadStream.class/instance/collection.st → ...DocumentReadStream.class/instance/text.st b/...ntReadStream.class/instance/collection.st → ...DocumentReadStream.class/instance/text.st
@@ -1,4 +1,4 @@
 accessing
-collection
+text
 
 	^ collection
diff --git a/packages/RichTextEditing-Core.package/DocumentReadStream.class/methodProperties.json b/packages/RichTextEditing-Core.package/DocumentReadStream.class/methodProperties.json
@@ -2,16 +2,18 @@
 	"class" : {
 		"on:" : "kh 7/3/2020 19:29" },
 	"instance" : {
-		"beginningOfStructure" : "OS 7/4/2020 23:05",
-		"collection" : "kh 7/3/2020 19:51",
-		"collection:" : "kh 7/3/2020 19:51",
+		"beginningOfStructure" : "OS 7/12/2020 18:48",
+		"currentCharacter" : "OS 7/12/2020 18:42",
 		"endOfDocument" : "kh 7/3/2020 20:05",
-		"endOfStructure" : "OS 7/4/2020 23:05",
-		"lineBreak" : "kh 7/3/2020 19:40",
-		"next" : "kh 7/3/2020 20:08",
+		"endOfStructure" : "OS 7/12/2020 18:23",
+		"lineBreak" : "OS 7/12/2020 18:41",
+		"next" : "OS 7/12/2020 18:13",
 		"on:" : "kh 7/3/2020 19:30",
-		"paragraph" : "OS 7/4/2020 20:39",
+		"paragraph" : "OS 7/12/2020 18:42",
 		"paragraphCharacter" : "OS 7/4/2020 20:38",
 		"readLimit" : "kh 7/3/2020 19:56",
 		"readLimit:" : "kh 7/3/2020 19:56",
-		"stopConditions" : "OS 7/4/2020 23:01" } }
+		"stopConditions" : "OS 7/4/2020 23:01",
+		"structureDifferenceBetween:and:" : "OS 7/12/2020 18:21",
+		"text" : "OS 7/12/2020 18:12",
+		"text:" : "OS 7/12/2020 18:12" } }
diff --git a/...ichTextDocumentReadStream.class/README.md → ...xtDocumentReadStreamTests.class/README.md b/...ichTextDocumentReadStream.class/README.md → ...xtDocumentReadStreamTests.class/README.md
diff --git a/...tream.class/instance/boldTextStructure.st → ...Tests.class/instance/boldTextStructure.st b/...tream.class/instance/boldTextStructure.st → ...Tests.class/instance/boldTextStructure.st
@@ -1,4 +1,4 @@
-as yet unclassified
+constants
 boldTextStructure
 
 	^ TextStructure bold
diff --git a/...mentReadStream.class/instance/document.st → ...eadStreamTests.class/instance/document.st b/...mentReadStream.class/instance/document.st → ...eadStreamTests.class/instance/document.st
@@ -1,4 +1,4 @@
-as yet unclassified
+accessing
 document
 
 	^ self editorModel bufferDocument
diff --git a/...class/instance/isBeginningOfStructure..st → ...class/instance/isBeginningOfStructure..st b/...class/instance/isBeginningOfStructure..st → ...class/instance/isBeginningOfStructure..st
@@ -1,4 +1,4 @@
-as yet unclassified
+utilities
 isBeginningOfStructure: aListElement
 
 	^ aListElement first = #beginningOfStructure
diff --git a/...tream.class/instance/isEndOfStructure..st → ...Tests.class/instance/isEndOfStructure..st b/...tream.class/instance/isEndOfStructure..st → ...Tests.class/instance/isEndOfStructure..st
@@ -1,4 +1,4 @@
-as yet unclassified
+utilities
 isEndOfStructure: listElement
 
 	^ listElement first = #endOfStructure

diff --git a/...ReadStream.class/instance/isParagraph..st → ...treamTests.class/instance/isParagraph..st b/...ReadStream.class/instance/isParagraph..st → ...treamTests.class/instance/isParagraph..st
@@ -1,4 +1,4 @@
-as yet unclassified
+utilities
 isParagraph: aListElement
 
 	^ aListElement = #paragraph
diff --git a/...eam.class/instance/italicTextStructure.st → ...sts.class/instance/italicTextStructure.st b/...eam.class/instance/italicTextStructure.st → ...sts.class/instance/italicTextStructure.st
@@ -1,4 +1,4 @@
-as yet unclassified
+constants
 italicTextStructure
 
 	^ TextStructure italic
diff --git a/...ream.class/instance/paragraphCharacter.st → ...ests.class/instance/paragraphCharacter.st b/...ream.class/instance/paragraphCharacter.st → ...ests.class/instance/paragraphCharacter.st
@@ -1,4 +1,4 @@
-as yet unclassified
+constants
 paragraphCharacter
 
 	^ Character value: 182
diff --git a/...ureAndBeginOfStructureIncludeStructure.st → ...ureAndBeginOfStructureIncludeStructure.st b/...ureAndBeginOfStructureIncludeStructure.st → ...ureAndBeginOfStructureIncludeStructure.st
@@ -1,4 +1,4 @@
-as yet unclassified
+acceptance-tests
 testUS59EndOfStructureAndBeginOfStructureIncludeStructure
 
 	| stream stopConditions |

diff --git a/...xtSectionOfTextAndListOfStopConditions.st → ...xtSectionOfTextAndListOfStopConditions.st b/...xtSectionOfTextAndListOfStopConditions.st → ...xtSectionOfTextAndListOfStopConditions.st
@@ -1,4 +1,4 @@
-as yet unclassified
+acceptance-tests
 testUS59NextReturnsNextSectionOfTextAndListOfStopConditions
 
 	| testText stream |

diff --git a/...lass/instance/testUS59ReadStreamExists.st → ...lass/instance/testUS59ReadStreamExists.st b/...lass/instance/testUS59ReadStreamExists.st → ...lass/instance/testUS59ReadStreamExists.st
@@ -1,4 +1,4 @@
-as yet unclassified
+acceptance-tests
 testUS59ReadStreamExists
 
 	self assert: (Smalltalk hasClassNamed: #DocumentReadStream)
diff --git a/...estUS59StopConditionsAreInCorrectOrder.st → ...estUS59StopConditionsAreInCorrectOrder.st b/...estUS59StopConditionsAreInCorrectOrder.st → ...estUS59StopConditionsAreInCorrectOrder.st
@@ -1,4 +1,4 @@
-as yet unclassified
+acceptance-tests
 testUS59StopConditionsAreInCorrectOrder
 
 	| stream stopConditions |

diff --git a/...ream.class/instance/textWithAttributes.st → ...ests.class/instance/textWithAttributes.st b/...ream.class/instance/textWithAttributes.st → ...ests.class/instance/textWithAttributes.st
@@ -1,4 +1,4 @@
-as yet unclassified
+constants
 textWithAttributes
 
 	| text |

diff --git a/...entReadStream.class/methodProperties.json → ...adStreamTests.class/methodProperties.json b/...entReadStream.class/methodProperties.json → ...adStreamTests.class/methodProperties.json
diff --git a/...tDocumentReadStream.class/properties.json → ...mentReadStreamTests.class/properties.json b/...tDocumentReadStream.class/properties.json → ...mentReadStreamTests.class/properties.json
@@ -7,7 +7,7 @@
 	"commentStamp" : "",
 	"instvars" : [
 		 ],
-	"name" : "RichTextDocumentReadStream",
+	"name" : "RichTextDocumentReadStreamTests",
 	"pools" : [
 		 ],
 	"super" : "RichTextEditorTestCase",