Refactor code to allow other terminal implementations in File Browser

src/NewTools-FileBrowser-Tests/StFileBrowserOpenTerminalCommandTest.class.st

@@ -34,27 +34,27 @@ StFileBrowserOpenTerminalCommandTest >> terminalShellCommandTest: aBlock withPat
 StFileBrowserOpenTerminalCommandTest >> testOpenLinuxTerminalShellCommand [
 
 	self terminalShellCommandTest: [ :command :path |
-		command openLinuxTerminalShellCommand: path ]
+		command terminalInterface openLinuxTerminalShellCommand: path ]
 ]
 
 { #category : 'tests' }
 StFileBrowserOpenTerminalCommandTest >> testOpenMacTerminalShellCommand [
 
 	self terminalShellCommandTest: [ :command :path |
-		command openMacTerminalShellCommand: path ]
+		command terminalInterface openMacTerminalShellCommand: path ]
 ]
 
 { #category : 'tests' }
 StFileBrowserOpenTerminalCommandTest >> testOpenWindowsTerminalShellCommand [
 
 	self terminalShellCommandTest: [ :command :path |
-		command openWindowsTerminalCommand: path ]
+		command terminalInterface openWindowsTerminalCommand: path ]
 ]
 
 { #category : 'tests' }
 StFileBrowserOpenTerminalCommandTest >> testTerminalShellCommand [
 	"tests for a current platform"
 
 	self terminalShellCommandTest: [ :command :path |
-		command terminalShellCommand: path ]
+		command terminalInterface terminalShellCommand: path ]
 ]

src/NewTools-FileBrowser/StFileBrowserOpenTerminalCommand.class.st

@@ -24,93 +24,20 @@ StFileBrowserOpenTerminalCommand >> execute [
 	"Execute the actions that should be done by the command.
 	 This method expect that the context has been put in #context inst. var. if any context is relevant."
 
-	self openTerminalOn: self context currentDirectory
+	self terminalInterface openTerminalOn: self context currentDirectory
 ]
 
 { #category : 'initialization' }
 StFileBrowserOpenTerminalCommand >> initialize [
+
 	super initialize.
 	self
 		name: 'Open terminal here';
 		description: 'Open an OS terminal in this directory.'
 ]
 
-{ #category : 'private' }
-StFileBrowserOpenTerminalCommand >> openLinuxTerminalShellCommand: aPath [
-
-	^ String streamContents: [ : stream |
-		stream
-			<< 'gnome-terminal --working-directory=';
-			<< aPath fullName;
-			<< ' &' ]
-]
-
-{ #category : 'private' }
-StFileBrowserOpenTerminalCommand >> openMacTerminalShellCommand: aPath [
-
-	| escaped |
-	escaped := aPath fullName copyReplaceAll: ' ' with: '\ '. 
-	^ String streamContents: [ : stream |
-		stream
-			<< 'open -a ';
-			<< self preferredMacTerminalProgram;
-			space;
-			<< escaped;
-			<< ' &' ]
-]
-
-{ #category : 'accessing' }
-StFileBrowserOpenTerminalCommand >> openTerminalOn: aPath [
-
-	(self terminalShellCommand: aPath)
-		ifNotEmpty: [ : shellCmd | 
-			(Delay forMilliseconds: 1000) wait.
-			LibC system: shellCmd ]
-
-]
-
-{ #category : 'private' }
-StFileBrowserOpenTerminalCommand >> openWindowsTerminalCommand: aPath [
-
-	^ String streamContents: [ : stream |
-		stream
-			<< 'start cmd.exe /K "cd /d ';
-			<< aPath fullName;
-			<< '"' ]
-]
-
-{ #category : 'private' }
-StFileBrowserOpenTerminalCommand >> preferredLinuxTerminalProgram [
-
-	^ StFileBrowserSettings linuxTerminalProgram
-
-]
-
-{ #category : 'private' }
-StFileBrowserOpenTerminalCommand >> preferredMacTerminalProgram [
-
-	^ StFileBrowserSettings macTerminalProgram
-
-]
-
-{ #category : 'private' }
-StFileBrowserOpenTerminalCommand >> preferredWindowsTerminalProgram [
-
-	^ StFileBrowserSettings windowsTerminalProgram
-
-]
-
-{ #category : 'accessing' }
-StFileBrowserOpenTerminalCommand >> terminalShellCommand: aPath [
-	"Answer a <String> with the shell command to open a terminal for the receiver's OS"
+{ #category : 'initialization' }
+StFileBrowserOpenTerminalCommand >> terminalInterface [
 
-	Smalltalk os isWindows
-		ifTrue: [ ^ self openWindowsTerminalCommand: aPath ].
-	Smalltalk os isMacOS
-		ifTrue: [ ^ self openMacTerminalShellCommand: aPath ].
-	(Smalltalk os version beginsWith: 'linux')
-		ifTrue: [ ^ self openLinuxTerminalShellCommand: aPath ].
-
-	self inform: 'No terminal for platform implemented'.
-	^ String empty.
+	^ StTerminalInterface default 
 ]

src/NewTools-FileBrowser/StFileBrowserSettings.class.st

@@ -49,6 +49,12 @@ StFileBrowserSettings class >> defaultDirectoryOn: aBuilder [
 
 ]
 
+{ #category : 'settings' }
+StFileBrowserSettings class >> defaultTerminalProgram [
+
+	^ 'Terminal'
+]
+
 { #category : 'settings' }
 StFileBrowserSettings class >> groupSettingsOn: aBuilder [
 	<systemsettings>
@@ -76,7 +82,7 @@ StFileBrowserSettings class >> linuxTerminalProgram: aString [
 StFileBrowserSettings class >> macTerminalProgram [
 
 	^ MacTerminalProgram
-		ifNil: [ MacTerminalProgram := 'Terminal' ]
+		ifNil: [ MacTerminalProgram := self defaultTerminalProgram ]
 ]
 
 { #category : 'settings' }

src/NewTools-FileBrowser/StTerminalInterface.class.st

@@ -0,0 +1,88 @@
+Class {
+	#name : 'StTerminalInterface',
+	#superclass : 'Object',
+	#classVars : [
+		'Default'
+	],
+	#category : 'NewTools-FileBrowser-Utilities',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'Utilities'
+}
+
+{ #category : 'instance creation' }
+StTerminalInterface class >> default [
+
+	^ Default 
+		ifNil: [ Default := self new ]
+]
+
+{ #category : 'accessing' }
+StTerminalInterface class >> default: aClass [ 
+
+	Default := aClass
+]
+
+{ #category : 'accessing' }
+StTerminalInterface >> openLinuxTerminalShellCommand: aPath [
+
+	^ String streamContents: [ : stream |
+		stream
+			<< 'gnome-terminal --working-directory=';
+			<< aPath fullName;
+			<< ' &' ]
+]
+
+{ #category : 'accessing' }
+StTerminalInterface >> openMacTerminalShellCommand: aPath [
+
+	| escaped |
+	escaped := aPath fullName copyReplaceAll: ' ' with: '\ '. 
+	^ String streamContents: [ : stream |
+		stream
+			<< 'open -a ';
+			<< self preferredMacTerminalProgram;
+			space;
+			<< escaped;
+			<< ' &' ]
+]
+
+{ #category : 'accessing' }
+StTerminalInterface >> openTerminalOn: aPath [
+
+	(self terminalShellCommand: aPath)
+		ifNotEmpty: [ : shellCmd | 
+			(Delay forMilliseconds: 1000) wait.
+			LibC system: shellCmd ]
+]
+
+{ #category : 'accessing' }
+StTerminalInterface >> openWindowsTerminalCommand: aPath [
+
+	^ String streamContents: [ : stream |
+		stream
+			<< 'start cmd.exe /K "cd /d ';
+			<< aPath fullName;
+			<< '"' ]
+]
+
+{ #category : 'accessing' }
+StTerminalInterface >> preferredMacTerminalProgram [
+
+	^ StFileBrowserSettings macTerminalProgram
+
+]
+
+{ #category : 'accessing' }
+StTerminalInterface >> terminalShellCommand: aPath [
+	"Answer a <String> with the shell command to open a terminal for the receiver's OS"
+
+	Smalltalk os isWindows
+		ifTrue: [ ^ self openWindowsTerminalCommand: aPath ].
+	Smalltalk os isMacOS
+		ifTrue: [ ^ self openMacTerminalShellCommand: aPath ].
+	(Smalltalk os version beginsWith: 'linux')
+		ifTrue: [ ^ self openLinuxTerminalShellCommand: aPath ].
+
+	self inform: 'No terminal for platform implemented'.
+	^ String empty.
+]