From 7ec0116719b79a94c6de00d0c837488823d3a649 Mon Sep 17 00:00:00 2001 From: Christophe Demarey Date: Thu, 9 Jul 2020 19:31:55 +0200 Subject: [PATCH] fix possible loops when trying to set a var used as origin and convert it to a locator. --- .../PhLDirectoryBasedImageRepository.class.st | 2 +- src/PharoLauncher-Core/PhLTemplateSources.class.st | 2 +- src/PharoLauncher-Core/PhLVirtualMachineManager.class.st | 2 +- src/PharoLauncher-Spec2/PharoLauncherApplication.class.st | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/PharoLauncher-Core/PhLDirectoryBasedImageRepository.class.st b/src/PharoLauncher-Core/PhLDirectoryBasedImageRepository.class.st index b32ffce66..ff95e068b 100644 --- a/src/PharoLauncher-Core/PhLDirectoryBasedImageRepository.class.st +++ b/src/PharoLauncher-Core/PhLDirectoryBasedImageRepository.class.st @@ -79,7 +79,7 @@ PhLDirectoryBasedImageRepository class >> locationString [ { #category : #accessing } PhLDirectoryBasedImageRepository class >> locationString: aDirectoryString [ - ^ self location: aDirectoryString asFileLocatorOrReference + ^ self location: aDirectoryString asFileReference ] { #category : #private } diff --git a/src/PharoLauncher-Core/PhLTemplateSources.class.st b/src/PharoLauncher-Core/PhLTemplateSources.class.st index 905b5b7b5..f388a31d0 100644 --- a/src/PharoLauncher-Core/PhLTemplateSources.class.st +++ b/src/PharoLauncher-Core/PhLTemplateSources.class.st @@ -62,7 +62,7 @@ PhLTemplateSources class >> launcherCoreDir [ { #category : #accessing } PhLTemplateSources class >> launcherCoreDir: aFileUrl [ - LauncherCoreDir := aFileUrl asFileLocatorOrReference. + LauncherCoreDir := aFileUrl asFileReference. LauncherCoreDir ensureCreateDirectory ] diff --git a/src/PharoLauncher-Core/PhLVirtualMachineManager.class.st b/src/PharoLauncher-Core/PhLVirtualMachineManager.class.st index 71ded01e6..566c1cf33 100644 --- a/src/PharoLauncher-Core/PhLVirtualMachineManager.class.st +++ b/src/PharoLauncher-Core/PhLVirtualMachineManager.class.st @@ -173,7 +173,7 @@ PhLVirtualMachineManager class >> vmStore [ { #category : #accessing } PhLVirtualMachineManager class >> vmStore: anObject [ - vmStore := anObject asFileLocatorOrReference. + vmStore := anObject asFileReference. vmStore ensureCreateDirectory ] diff --git a/src/PharoLauncher-Spec2/PharoLauncherApplication.class.st b/src/PharoLauncher-Spec2/PharoLauncherApplication.class.st index 594131aa7..acc930e38 100644 --- a/src/PharoLauncher-Spec2/PharoLauncherApplication.class.st +++ b/src/PharoLauncher-Spec2/PharoLauncherApplication.class.st @@ -82,7 +82,7 @@ PharoLauncherApplication class >> initializationScriptsDirectory [ { #category : #accessing } PharoLauncherApplication class >> initializationScriptsDirectory: aFileUrl [ | directory | - directory := aFileUrl asFileLocatorOrReference. + directory := aFileUrl asFileReference. self default scriptsDirectory: directory. ^ directory ensureCreateDirectory