Merge pull request #706 from pharo-spec/renaming

Align suffixes of FileBrowser
pharo-spec · Feb 20, 2024 · 7ffc0bc · 7ffc0bc
2 parents b1673f5 + a0a66db
commit 7ffc0bc
Show file tree

Hide file tree

Showing 9 changed files with 69 additions and 126 deletions.
diff --git a/src/NewTools-Compression-Utils/ZipArchive.extension.st b/src/NewTools-Compression-Utils/ZipArchive.extension.st
@@ -8,7 +8,7 @@ ZipArchive class >> extractAllIn: aFileReferenceOrFileName [
 		"
 	| directory |
 
-	directory := (StOpenDirectoryDialog new
+	directory := (StOpenDirectoryPresenter new
 		currentDirectory: FileSystem workingDirectory;
 		openModal) ifNil: [ ^ self ].
 

diff --git a/...leBrowser-Tests/StFileDialogTest.class.st → ...rowser-Tests/StFilePresenterTest.class.st b/...leBrowser-Tests/StFileDialogTest.class.st → ...rowser-Tests/StFilePresenterTest.class.st
@@ -1,5 +1,5 @@
 Class {
-	#name : 'StFileDialogTest',
+	#name : 'StFilePresenterTest',
 	#superclass : 'StFileBrowserTestCase',
 	#instVars : [
 		'dialog',
@@ -11,17 +11,17 @@ Class {
 }
 
 { #category : 'testing' }
-StFileDialogTest class >> isAbstract [
-	^ self = StFileDialogTest
+StFilePresenterTest class >> isAbstract [
+	^ self = StFilePresenterTest
 ]
 
 { #category : 'accessing' }
-StFileDialogTest >> dialogClass [
+StFilePresenterTest >> dialogClass [
 	^ self subclassResponsibility
 ]
 
 { #category : 'tests' }
-StFileDialogTest >> fileListAllMustBeFilterByPNGFIlter [
+StFilePresenterTest >> fileListAllMustBeFilterByPNGFIlter [
 	self
 		assert:
 			(dialog fileReferenceTable items
@@ -31,50 +31,50 @@ StFileDialogTest >> fileListAllMustBeFilterByPNGFIlter [
 ]
 
 { #category : 'running' }
-StFileDialogTest >> setUp [
+StFilePresenterTest >> setUp [
 
 	super setUp.
 	(dialog := self dialogClass owner: fileSystemPresenter on: fileSystemModel) defaultFolder: root
 ]
 
 { #category : 'running' }
-StFileDialogTest >> tearDown [
+StFilePresenterTest >> tearDown [
 
 	dialog class initialize.
 	window ifNotNil: [ : w | w delete ].
 	super tearDown
 ]
 
 { #category : 'tests' }
-StFileDialogTest >> testIsRootDirectory [
+StFilePresenterTest >> testIsRootDirectory [
 	self assert: (dialog isRootDirectory: FileLocator root)
 ]
 
 { #category : 'tests' }
-StFileDialogTest >> testIsRootDirectoryWindowsDrive [
+StFilePresenterTest >> testIsRootDirectoryWindowsDrive [
 	OSPlatform current isWindows
 		ifFalse: [ ^ self ].
 	self assert: (dialog isRootDirectory: FileLocator C)
 ]
 
 { #category : 'tests' }
-StFileDialogTest >> testOpen [
+StFilePresenterTest >> testOpen [
 
 	"will it even open?"
 
 	window := dialog openDialog
 ]
 
 { #category : 'tests' }
-StFileDialogTest >> testOpenFolder [
+StFilePresenterTest >> testOpenFolder [
 	window := dialog open.
 	self assert: dialog currentDirectory equals: root.
 	dialog showDirectory: root / 'dir'.
 	self assert: dialog currentDirectory equals: root / 'dir'
 ]
 
 { #category : 'tests' }
-StFileDialogTest >> testWhenAddACollectionOfBookmarkToCustomBookmarkShouldBeAddedToBookmarkTreeTable [
+StFilePresenterTest >> testWhenAddACollectionOfBookmarkToCustomBookmarkShouldBeAddedToBookmarkTreeTable [
 	| aCollectionOfBookmark |
 
 	aCollectionOfBookmark := {
@@ -93,9 +93,9 @@ StFileDialogTest >> testWhenAddACollectionOfBookmarkToCustomBookmarkShouldBeAdde
 ]
 
 { #category : 'tests' }
-StFileDialogTest >> testWhenAddingBookmarkOnDefaultBookmarksShouldBeAddToAllInstance [
+StFilePresenterTest >> testWhenAddingBookmarkOnDefaultBookmarksShouldBeAddToAllInstance [
 	| anOtherInstance addCommand |
-	anOtherInstance := StOpenDirectoryDialog new.
+	anOtherInstance := StOpenDirectoryPresenter new.
 	self
 		assertCollection: anOtherInstance bookmarks
 		hasSameElements: dialog bookmarks.
@@ -113,14 +113,14 @@ StFileDialogTest >> testWhenAddingBookmarkOnDefaultBookmarksShouldBeAddToAllInst
 ]
 
 { #category : 'tests' }
-StFileDialogTest >> testWhenAddingBookmarkOnIsolateBookmarksShouldBeAddToAllInstance [
+StFilePresenterTest >> testWhenAddingBookmarkOnIsolateBookmarksShouldBeAddToAllInstance [
 	| anOtherInstance addCommand |
 	dialog isolate.
 	addCommand := StFileBrowserAddBookmarkCommand new.
 	addCommand context: dialog fileNavigationSystem.
 	dialog fileReferenceTable selectIndex: ((dialog fileReferenceTable items collect: #basename) indexOf: 'dir'). 
 	addCommand execute.
-	anOtherInstance := StOpenDirectoryDialog new.
+	anOtherInstance := StOpenDirectoryPresenter new.
 	self 
 		assert: anOtherInstance bookmarks 
 		equals: dialog bookmarks.

diff --git a/...-Tests/StOpenDirectoryDialogTest.class.st → ...sts/StOpenDirectoryPresenterTest.class.st b/...-Tests/StOpenDirectoryDialogTest.class.st → ...sts/StOpenDirectoryPresenterTest.class.st
@@ -1,26 +1,26 @@
 Class {
-	#name : 'StOpenDirectoryDialogTest',
-	#superclass : 'StFileDialogTest',
+	#name : 'StOpenDirectoryPresenterTest',
+	#superclass : 'StFilePresenterTest',
 	#category : 'NewTools-FileBrowser-Tests-UI',
 	#package : 'NewTools-FileBrowser-Tests',
 	#tag : 'UI'
 }
 
 { #category : 'accessing' }
-StOpenDirectoryDialogTest >> dialogClass [
+StOpenDirectoryPresenterTest >> dialogClass [
 
-	^ StOpenDirectoryDialog
+	^ StOpenDirectoryPresenter
 ]
 
 { #category : 'tests' }
-StOpenDirectoryDialogTest >> testDefaultDirectory [
+StOpenDirectoryPresenterTest >> testDefaultDirectory [
 	self assert: dialog selectedEntry equals: root.
 	dialog defaultFolder: root / 'dir'.
 	self assert: dialog selectedEntry equals: root / 'dir'
 ]
 
 { #category : 'tests' }
-StOpenDirectoryDialogTest >> testSelectDirectory [
+StOpenDirectoryPresenterTest >> testSelectDirectory [
 
 	| selectedDirectory |
 	dialog okAction: [ :dir | selectedDirectory := dir ].
@@ -37,7 +37,7 @@ StOpenDirectoryDialogTest >> testSelectDirectory [
 ]
 
 { #category : 'tests' }
-StOpenDirectoryDialogTest >> testSelectNonexistingDirectory [
+StOpenDirectoryPresenterTest >> testSelectNonexistingDirectory [
 
 	self
 		should: [ dialog defaultFolder: root / 'idontexist' ]
@@ -46,7 +46,7 @@ StOpenDirectoryDialogTest >> testSelectNonexistingDirectory [
 ]
 
 { #category : 'tests' }
-StOpenDirectoryDialogTest >> testWhenChangeDirectoryShouldFilesListContainsHisChildren [
+StOpenDirectoryPresenterTest >> testWhenChangeDirectoryShouldFilesListContainsHisChildren [
 	| newDirectory |
 	newDirectory := (root / 'dir') asFileReference.
 	dialog defaultFolder: newDirectory.

diff --git a/...owser-Tests/StOpenFileDialogTest.class.st → ...er-Tests/StOpenFilePresenterTest.class.st b/...owser-Tests/StOpenFileDialogTest.class.st → ...er-Tests/StOpenFilePresenterTest.class.st
@@ -1,19 +1,19 @@
 Class {
-	#name : 'StOpenFileDialogTest',
-	#superclass : 'StFileDialogTest',
+	#name : 'StOpenFilePresenterTest',
+	#superclass : 'StFilePresenterTest',
 	#category : 'NewTools-FileBrowser-Tests-UI',
 	#package : 'NewTools-FileBrowser-Tests',
 	#tag : 'UI'
 }
 
 { #category : 'accessing' }
-StOpenFileDialogTest >> dialogClass [
+StOpenFilePresenterTest >> dialogClass [
 
-	^ StOpenFileDialog
+	^ StOpenFilePresenter
 ]
 
 { #category : 'tests' }
-StOpenFileDialogTest >> testExtensions [
+StOpenFilePresenterTest >> testExtensions [
 
 	dialog extensions: #( ext ) named: 'Ext files'.
 	self
@@ -27,7 +27,7 @@ StOpenFileDialogTest >> testExtensions [
 ]
 
 { #category : 'tests' }
-StOpenFileDialogTest >> testMultipleExtensions [
+StOpenFilePresenterTest >> testMultipleExtensions [
 
 	dialog extensions: #( image changes sources ) named: 'Src files'.
 	self
@@ -41,7 +41,7 @@ StOpenFileDialogTest >> testMultipleExtensions [
 ]
 
 { #category : 'tests' }
-StOpenFileDialogTest >> testSelectFile [
+StOpenFilePresenterTest >> testSelectFile [
 
 	| selectedFile |
 	dialog okAction: [ :file | selectedFile := file ].
@@ -54,7 +54,7 @@ StOpenFileDialogTest >> testSelectFile [
 ]
 
 { #category : 'tests' }
-StOpenFileDialogTest >> testWhenChangeDirectoryShouldFilesListContainsHisChildren [
+StOpenFilePresenterTest >> testWhenChangeDirectoryShouldFilesListContainsHisChildren [
 	| newDirectory |
 	newDirectory := (root / 'dir') asFileReference.
 	dialog defaultFolder: newDirectory.

diff --git a/src/NewTools-FileBrowser/StMorphicUIManager.class.st b/src/NewTools-FileBrowser/StMorphicUIManager.class.st
@@ -36,7 +36,7 @@ StMorphicUIManager class >> isValidForCurrentSystemConfiguration [
 StMorphicUIManager >> chooseDirectory: label from: dir [
 	self flag: #ToDoWhenIntegration.
 	self flag: 'use chooseDirectory:path: instead of this'.
-	^ StOpenDirectoryDialog new
+	^ StOpenDirectoryPresenter new
 		defaultFolder: dir;
 		title: (label ifNil: [ 'Choose Directory' translated ]);
 		open
@@ -45,77 +45,20 @@ StMorphicUIManager >> chooseDirectory: label from: dir [
 { #category : 'ui requests' }
 StMorphicUIManager >> chooseDirectory: label path: path [
 
-	^ StOpenDirectoryDialog new
+	^ StOpenDirectoryPresenter new
 		  defaultFolder: (path ifNil: [ StFileSystemModel defaultDirectory ]);
 		  title: (label ifNil: [ 'Choose Directory' translated ]);
 		  openModal;
 		  selectedEntry
 ]
 
-{ #category : 'ui requests' }
-StMorphicUIManager >> chooseFileMatching: patterns label: label [
-	self deprecated: 'now you have to give a filter see NewTools-FileBrowser-Filtering'.
-	^ StOpenFileDialog new
-		title: (label ifNil: [ 'Choose File' translated ]);
-		"fileFilters: pattern  ;"
-		open
-]
-
-{ #category : 'ui requests' }
-StMorphicUIManager >> chooseFileName: title extensions: exts path: path preview: preview [
-	self
-		deprecated: 'now you have to give a filter see FileDialog-filterStrategie'.
-	^ (StOpenFileDialog new
-		title: (title ifNil: [ 'Choose File' translated ]);
-		"fileFilters: (exts ifNil: [ #() ] ifNotNil: [ :e | e collect: [ :each | '*.' , each ] ]);"
-			defaultFolder: path;
-			previewer: preview;
-		open) ifNotNil: #basename
-]
-
-{ #category : 'ui requests' }
-StMorphicUIManager >> chooseFullFileName: title extensions: exts path: path preview: preview [
-	self
-		deprecated: 'now you have to give a filter see FileDialog-filterStrategie'.
-	^ (StOpenFileDialog new
-		title: (title ifNil: [ 'Choose File' translated ]);
-		"fileFilters: (exts ifNil: [ #() ] ifNotNil: [ :e | e collect: [ :each | '*.' , each ] ]);"
-			defaultFolder: path;
-			previewer: preview;
-		open) ifNotNil: #fullName
-]
-
 { #category : 'ui requests' }
 StMorphicUIManager >> chooseFullFileNameMatching: patterns label: title [
 	self
 		deprecated: 'now you have to give a filter see FileDialog-filterStrategie'.
-	^ StOpenFileDialog new
+	^ StOpenFilePresenter new
 		title: (title ifNil: [ 'Choose File' translated ]);
 		"fileFilters: (patterns ifNil: [ #() ] ifNotNil: [ :e | e collect: [ :each | '*.' , each ] ]);
 		"
 			open
 ]
-
-{ #category : 'ui requests' }
-StMorphicUIManager >> fileOpen: title extensions: exts path: path preview: preview [
-	self
-		deprecated: 'now you have to give a filter see FileDialog-filterStrategie'.
-	^ (StOpenFileDialog new
-		title: (title ifNil: [ 'Choose File' translated ]);
-		"fileFilters: (exts ifNil: [ #() ] ifNotNil: [ :e | e collect: [ :each | '*.' , each ] ]);
-		"defaultFolder: path;
-		previewer: preview;
-		openModal) ifNotNil: #readStream
-]
-
-{ #category : 'ui requests' }
-StMorphicUIManager >> fileSave: title extensions: exts path: path [
-	self
-		deprecated: 'now you have to give a filter see FileDialog-filterStrategie'.
-	^ StSaveFileDialog new
-		title: (title ifNil: [ 'Choose File' translated ]);
-		"fileFilters: (exts ifNil: [ #() ] ifNotNil: [ :e | e collect: [ :each | '*.' , each ] ]);
-		"
-			defaultFolder: path;
-		open
-]
diff --git a/...ileBrowser/StOpenDirectoryDialog.class.st → ...Browser/StOpenDirectoryPresenter.class.st b/...ileBrowser/StOpenDirectoryDialog.class.st → ...Browser/StOpenDirectoryPresenter.class.st
@@ -6,52 +6,52 @@ So no files will be shown in the file/folder listings.
 see my super for more information about customization
 "
 Class {
-	#name : 'StOpenDirectoryDialog',
-	#superclass : 'StOpenFileOrDirectoryDialog',
+	#name : 'StOpenDirectoryPresenter',
+	#superclass : 'StOpenFileOrDirectoryPresenter',
 	#category : 'NewTools-FileBrowser-UI',
 	#package : 'NewTools-FileBrowser',
 	#tag : 'UI'
 }
 
 { #category : 'examples' }
-StOpenDirectoryDialog class >> example [
+StOpenDirectoryPresenter class >> example [
 
 	<example>
 	^ self chooseThenInspect
 ]
 
 { #category : 'examples' }
-StOpenDirectoryDialog class >> exampleModal [
+StOpenDirectoryPresenter class >> exampleModal [
 
 	<example>
 	^ self chooseModalAndInspect
 ]
 
 { #category : 'hooks' }
-StOpenDirectoryDialog class >> navigationSystemClass [
+StOpenDirectoryPresenter class >> navigationSystemClass [
 
 	^ StDirectoryNavigationSystemPresenter 
 ]
 
 { #category : 'hooks' }
-StOpenDirectoryDialog >> allowsChooseDirectoryIfNoFilename [
+StOpenDirectoryPresenter >> allowsChooseDirectoryIfNoFilename [
 
 	^ true
 ]
 
 { #category : 'initialization' }
-StOpenDirectoryDialog >> initialExtentForWindow [
+StOpenDirectoryPresenter >> initialExtentForWindow [
 
 	^ (1050 @ 550) scaledByDisplayScaleFactor
 ]
 
 { #category : 'hooks' }
-StOpenDirectoryDialog >> initialTitle [
+StOpenDirectoryPresenter >> initialTitle [
 	^ 'Select Directory To Open'
 ]
 
 { #category : 'actions' }
-StOpenDirectoryDialog >> selectedEntry [
+StOpenDirectoryPresenter >> selectedEntry [
 
 	super selectedEntry ifNotNil: [ :fileReference | 
 		fileReference isDirectory ifTrue: [ ^ fileReference ] ].