Revert "Revert "Us84""

hpi-swa-teaching · Jun 15, 2020 · 418a1b8 · 418a1b8
1 parent 29426e3
commit 418a1b8
Show file tree

Hide file tree

Showing 24 changed files with 126 additions and 6 deletions.
diff --git a/...s/RichTextEditing-Core.package/RichTextEditorModel.class/instance/buildLoadButtonWith..st b/...s/RichTextEditing-Core.package/RichTextEditorModel.class/instance/buildLoadButtonWith..st
@@ -3,7 +3,7 @@ buildLoadButtonWith: aBuilder
 
 	^ aBuilder pluggableButtonSpec new
 		model: self;
-		frame: (0.25 @ 0 corner: 0.375 @ 0.1);
+		frame: (0.25 @ 0 corner: 0.375 @ 0.05);
 		label: 'Load';
 		action: #loadDocumentFromSaver;
 		yourself
diff --git a/...chTextEditing-Core.package/RichTextEditorModel.class/instance/buildLoadFileButtonWith..st b/...chTextEditing-Core.package/RichTextEditorModel.class/instance/buildLoadFileButtonWith..st
@@ -0,0 +1,9 @@
+toolbuilder
+buildLoadFileButtonWith: aBuilder
+
+	^ aBuilder pluggableButtonSpec new
+		model: self;
+		frame: (0.25 @ 0.04 corner: 0.375 @ 0.1);
+		label: 'Load File';
+		action: #loadFileWithDialog;
+		yourself
diff --git a/...ichTextEditing-Core.package/RichTextEditorModel.class/instance/buildStructureListWith..st b/...ichTextEditing-Core.package/RichTextEditorModel.class/instance/buildStructureListWith..st
@@ -4,7 +4,7 @@ buildStructureListWith: aBuilder
 	^ aBuilder pluggableMultiSelectionListSpec new
 		name: 'structureList';
 		model: self;
-		frame: (0 @ 0.1 corner: 0.3 @ 0.9);
+		frame: (0 @ 0.1 corner: 0.3 @ 0.8);
 		list: #textStructureSymbols;
 		getSelectionList: #getStructureSelectionAt:;
 		setSelectionList: #structureSelectionAt:put:;

diff --git a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/buildWith..st b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/buildWith..st
@@ -11,6 +11,7 @@ buildWith: aBuilder
 			self buildSaveAsButtonWith: aBuilder.
 			self buildSaveButtonWith: aBuilder.
 			self buildLoadButtonWith: aBuilder.
+			self buildLoadFileButtonWith: aBuilder.
 			self buildUndoButtonWith: aBuilder.
 			self buildRedoButtonWith: aBuilder.
 			self buildStructureListWith: aBuilder.

diff --git a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/loadFileFrom..st b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/loadFileFrom..st
@@ -0,0 +1,10 @@
+saving and loading
+loadFileFrom: filePath
+
+	| filestream text document |
+	filestream := StandardFileStream readOnlyFileNamed: filePath.
+	text := Text fromString: filestream contents.
+	document := self documentClass fromText: text withStructures: (self documentClass initialTextStructures).
+	self setDocument: document.
+	filestream close
+
diff --git a/...ges/RichTextEditing-Core.package/RichTextEditorModel.class/instance/loadFileWithDialog.st b/...ges/RichTextEditing-Core.package/RichTextEditorModel.class/instance/loadFileWithDialog.st
@@ -0,0 +1,6 @@
+saving and loading
+loadFileWithDialog
+
+	| filePath |
+	filePath := self selectFilePath.
+	filePath ifNotNil: [self loadFileFrom: filePath]
diff --git a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/selectFilePath.st b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/selectFilePath.st
@@ -0,0 +1,5 @@
+saving and loading
+selectFilePath
+
+	^ UIManager default
+		chooseFileMatching: nil
diff --git a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/methodProperties.json
@@ -21,16 +21,17 @@
 		"buildHelpButtonWith:" : "kh 6/1/2020 14:21",
 		"buildInfoButtonWith:" : "kh 6/1/2020 14:21",
 		"buildInspectDocumentButtonWith:" : "ls 6/26/2019 18:57",
-		"buildLoadButtonWith:" : "ls 6/26/2019 21:13",
+		"buildLoadButtonWith:" : "frc 6/4/2020 18:11",
+		"buildLoadFileButtonWith:" : "frc 6/8/2020 14:24",
 		"buildManageStructuresButtonWith:" : "frc 5/25/2020 14:54",
 		"buildNewButtonWith:" : "lh 7/24/2019 20:03",
 		"buildRedoButtonWith:" : "MB 5/22/2019 21:04",
 		"buildSaveAsButtonWith:" : "ls 6/26/2019 19:02",
 		"buildSaveButtonWith:" : "ls 6/26/2019 18:54",
-		"buildStructureListWith:" : "OS 6/3/2020 23:50",
+		"buildStructureListWith:" : "frc 6/4/2020 18:42",
 		"buildTextFieldWith:" : "tok 5/31/2020 20:20",
 		"buildUndoButtonWith:" : "MB 5/22/2019 21:03",
-		"buildWith:" : "kh 5/25/2020 16:36",
+		"buildWith:" : "frc 6/4/2020 18:11",
 		"chosenDocument" : "AG 7/25/2019 13:13",
 		"createNewStructure:" : "ls 7/24/2019 15:11",
 		"currentSaveName" : "ls 6/26/2019 17:58",
@@ -59,6 +60,8 @@
 		"label" : "ls 5/11/2019 12:23",
 		"label:" : "ls 6/26/2019 17:46",
 		"loadDocumentFromSaver" : "lh 7/24/2019 18:11",
+		"loadFileFrom:" : "frc 6/12/2020 16:53",
+		"loadFileWithDialog" : "tok 6/15/2020 12:33",
 		"noUnacceptedEdits" : "ls 7/24/2019 21:08",
 		"okToChange" : "ls 6/12/2019 22:15",
 		"openNewEditor" : "ls 6/12/2019 18:10",
@@ -75,6 +78,7 @@
 		"saveText:" : "ls 6/26/2019 18:33",
 		"saver" : "ls 6/26/2019 21:15",
 		"saves" : "ls 6/26/2019 21:15",
+		"selectFilePath" : "frc 6/4/2020 18:26",
 		"selectInvisibly" : "lh 7/24/2019 18:02",
 		"selectedStructures" : "MB 6/19/2019 17:36",
 		"selectedStructures:" : "AG 7/25/2019 11:18",

diff --git a/...chTextEditing-Tests.package/RichTextEditorFileManipulationTests.class/README.md b/...chTextEditing-Tests.package/RichTextEditorFileManipulationTests.class/README.md
diff --git a/...ckage/RichTextEditorFileManipulationTests.class/instance/createTestFileWithContent.at..st b/...ckage/RichTextEditorFileManipulationTests.class/instance/createTestFileWithContent.at..st
@@ -0,0 +1,8 @@
+utilities
+createTestFileWithContent: aString at: filePath
+
+	| new_file |
+	new_file := StandardFileStream fileNamed: filePath.
+	new_file nextPutAll: aString.
+	self file: new_file.
+	new_file close
diff --git a/...iting-Tests.package/RichTextEditorFileManipulationTests.class/instance/exampleFilePath.st b/...iting-Tests.package/RichTextEditorFileManipulationTests.class/instance/exampleFilePath.st
@@ -0,0 +1,4 @@
+utilities
+exampleFilePath
+
+	^ 'test_file.txt'
diff --git a/...RichTextEditing-Tests.package/RichTextEditorFileManipulationTests.class/instance/file..st b/...RichTextEditing-Tests.package/RichTextEditorFileManipulationTests.class/instance/file..st
@@ -0,0 +1,6 @@
+utilities
+file: aFile
+
+	file := aFile
+
+
diff --git a/.../RichTextEditing-Tests.package/RichTextEditorFileManipulationTests.class/instance/file.st b/.../RichTextEditing-Tests.package/RichTextEditorFileManipulationTests.class/instance/file.st
@@ -0,0 +1,6 @@
+utilities
+file
+
+	^ file
+
+
diff --git a/...xtEditing-Tests.package/RichTextEditorFileManipulationTests.class/instance/fileContent.st b/...xtEditing-Tests.package/RichTextEditorFileManipulationTests.class/instance/fileContent.st
@@ -0,0 +1,5 @@
+utilities
+fileContent
+
+	^ 'This is the content of the file
+	This is another line! ÄÖÜ'
diff --git a/...RichTextEditing-Tests.package/RichTextEditorFileManipulationTests.class/instance/setUp.st b/...RichTextEditing-Tests.package/RichTextEditorFileManipulationTests.class/instance/setUp.st
@@ -0,0 +1,5 @@
+utilities
+setUp
+
+	super setUp.
+	self setupFile
diff --git a/...TextEditing-Tests.package/RichTextEditorFileManipulationTests.class/instance/setupFile.st b/...TextEditing-Tests.package/RichTextEditorFileManipulationTests.class/instance/setupFile.st
@@ -0,0 +1,4 @@
+utilities
+setupFile
+
+	self createTestFileWithContent: self fileContent at: self exampleFilePath
diff --git a/...hTextEditing-Tests.package/RichTextEditorFileManipulationTests.class/instance/tearDown.st b/...hTextEditing-Tests.package/RichTextEditorFileManipulationTests.class/instance/tearDown.st
@@ -0,0 +1,5 @@
+utilities
+tearDown
+
+	super tearDown.
+	self tearDownFile
diff --git a/...tEditing-Tests.package/RichTextEditorFileManipulationTests.class/instance/tearDownFile.st b/...tEditing-Tests.package/RichTextEditorFileManipulationTests.class/instance/tearDownFile.st
@@ -0,0 +1,4 @@
+utilities
+tearDownFile
+
+	FileDirectory deleteFilePath: self file fullName
diff --git a/...kage/RichTextEditorFileManipulationTests.class/instance/testUS84loadFileFromFilesystem.st b/...kage/RichTextEditorFileManipulationTests.class/instance/testUS84loadFileFromFilesystem.st
@@ -0,0 +1,5 @@
+acceptance-tests
+testUS84loadFileFromFilesystem
+
+	self editorModel loadFileFrom: self exampleFilePath.
+	self assert: (self fileContent) equals: (self editorModel bufferDocument text string)
diff --git a/...TextEditing-Tests.package/RichTextEditorFileManipulationTests.class/methodProperties.json b/...TextEditing-Tests.package/RichTextEditorFileManipulationTests.class/methodProperties.json
@@ -0,0 +1,14 @@
+{
+	"class" : {
+		 },
+	"instance" : {
+		"createTestFileWithContent:at:" : "frc 6/8/2020 15:03",
+		"exampleFilePath" : "frc 6/8/2020 14:31",
+		"file" : "frc 6/8/2020 15:00",
+		"file:" : "frc 6/8/2020 14:59",
+		"fileContent" : "frc 6/8/2020 14:50",
+		"setUp" : "frc 6/12/2020 16:55",
+		"setupFile" : "frc 6/8/2020 14:31",
+		"tearDown" : "frc 6/12/2020 16:56",
+		"tearDownFile" : "frc 6/8/2020 15:04",
+		"testUS84loadFileFromFilesystem" : "frc 6/12/2020 16:55" } }
diff --git a/...s/RichTextEditing-Tests.package/RichTextEditorFileManipulationTests.class/properties.json b/...s/RichTextEditing-Tests.package/RichTextEditorFileManipulationTests.class/properties.json
@@ -0,0 +1,14 @@
+{
+	"category" : "RichTextEditing-Tests",
+	"classinstvars" : [
+		 ],
+	"classvars" : [
+		 ],
+	"commentStamp" : "",
+	"instvars" : [
+		"file" ],
+	"name" : "RichTextEditorFileManipulationTests",
+	"pools" : [
+		 ],
+	"super" : "RichTextEditorTestCase",
+	"type" : "normal" }
diff --git a/...tEditing-Tests.package/RichTextEditorTests.class/instance/testUS84LoadFileButtonExists.st b/...tEditing-Tests.package/RichTextEditorTests.class/instance/testUS84LoadFileButtonExists.st
@@ -0,0 +1,4 @@
+tests
+testUS84LoadFileButtonExists
+
+	self assert: (self buttonWithLabelExists: 'Load File')
diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/methodProperties.json b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/methodProperties.json
@@ -50,4 +50,5 @@
 		"testUS63InfoButtonExists" : "6/1/2020 14:03:20",
 		"testUS67HelpBrowserIsOpended" : "kh 5/25/2020 22:44",
 		"testUS67HelpButtonExists" : "kh 5/25/2020 22:35",
+		"testUS84LoadFileButtonExists" : "frc 6/11/2020 20:56",
 		"text" : "MB 7/25/2019 11:02" } }
diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/methodProperties.json b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/methodProperties.json
@@ -32,7 +32,7 @@
 		"testUS23TriangleIsStillVisibleWhenSaveDialogIsCancelled" : "AG 6/21/2019 14:16",
 		"testUS23TriangleReappearsWhenEditing" : "AG 6/21/2019 14:33",
 		"testUS23WhenTriangleIsVisibleCtrlSCanBePressedForSaveDialog" : "lh 7/24/2019 16:19",
-		"testUS36StructureIsNotExtendable" : "lh 6/5/2019 22:03",
+		"testUS36StructureIsExtendable" : "frc 6/4/2020 18:21",
 		"testUS49ApplySelectedStructureWithoutASelectionToNextTextBeginning" : "MB 7/25/2019 10:33",
 		"testUS49ApplySelectedStructureWithoutASelectionToNextTextEnd" : "MB 7/25/2019 10:33",
 		"testUS49ApplySelectedStructureWithoutASelectionToNextTextMiddle" : "MB 7/25/2019 10:33",