fix merge

pharo-project · Jul 3, 2024 · 0c58f6a · 0c58f6a
1 parent 7550aec
commit 0c58f6a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/BaselineOfPharoLauncher/BaselineOfPharoLauncher.class.st b/src/BaselineOfPharoLauncher/BaselineOfPharoLauncher.class.st
@@ -17,6 +17,7 @@ BaselineOfPharoLauncher >> baseline: spec [
 		self xmlParser: spec.
 		self clap: spec.
 		self objCBridge: spec.
+		self interactions: spec.
 
 		spec
 			package: 'PharoLauncher-100Compatibility'; 
@@ -26,6 +27,7 @@ BaselineOfPharoLauncher >> baseline: spec [
 					'OSSubprocess' 
 					'OSWinSubprocess' 
 					'Ston'
+					'Interactions'
 					'ObjCBridge' 
 					'PharoLauncher-100Compatibility'). ];
 			package: 'PharoLauncher-Spec2' with: [ 
@@ -55,8 +57,8 @@ BaselineOfPharoLauncher >> baseline: spec [
 				'PharoLauncher-Tests-Core' 
 				'PharoLauncher-Tests-Download' 
 				'PharoLauncher-Core' 
-				'PharoLauncher-Spec2' 
-				'PharoLauncher-Spec2-Gtk'
+				'PharoLauncher-Spec2'
+				'PharoLauncher-Spec2-Gtk' 
 				'PharoLauncher-Tests-SpecUI' 
 				'PharoLauncher-Tests-Functional'
 				'PharoLauncher-CLI-Tests' 

diff --git a/src/PharoLauncher-Core/PhLImportImageCommand.class.st b/src/PharoLauncher-Core/PhLImportImageCommand.class.st
@@ -83,18 +83,18 @@ PhLImportImageCommand >> importImage [
 	| imageFile |
 	imageFile := self imagesPresenter newFileRequest
 		title: 'Import a Pharo image (will move image, changes file and pharo-local folder)';
-		extensionsToShow: #('image');
-		path: FileLocator home;
+		filter: '.image';
+		currentFolder: FileLocator home;
 		chooseFile.
 	imageFile ifNil: [ 
-		self imagesPresenter newInformation 
+		self imagesPresenter newInformation
 			title: 'Import';
 			message: 'No path selected. Import failed.';
 			inform.
 		^ self ].
 	imageFile asFileReference isDirectory ifTrue: [ 
-		self imagesPresenter newInformation
-			title: 'Import'; 
+		self imagesPresenter newInformation 
+			title: 'Import';
 			message: 'The file selected is a directory and not a Pharo image. Import failed.';
 			inform.
 		^ self ].