From 90e4505467939384dcf268efbec07b82811dd539 Mon Sep 17 00:00:00 2001
From: Xavier G <104097021+XavSPM@users.noreply.github.com>
Date: Mon, 27 May 2024 14:46:05 +0200
Subject: [PATCH 1/3] Add phoebus.name.folder.preference varibale

---
 .../java/org/phoebus/framework/workbench/Locations.java  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/core/framework/src/main/java/org/phoebus/framework/workbench/Locations.java b/core/framework/src/main/java/org/phoebus/framework/workbench/Locations.java
index b41cd52cb3..e7fbcbf317 100644
--- a/core/framework/src/main/java/org/phoebus/framework/workbench/Locations.java
+++ b/core/framework/src/main/java/org/phoebus/framework/workbench/Locations.java
@@ -21,6 +21,8 @@ public class Locations
     public static final String PHOEBUS_INSTALL = "phoebus.install";
     /** system property for phoebus logged user */
     public static final String PHOEBUS_USER = "phoebus.user";
+    /** system property for the name of the folder containing preferences and the memento file */
+    public static final String NAME_FOLDER_PREFERENCE = "phoebus.name.folder.preference";
 
     /** Initialize locations */
     public static void initialize()
@@ -66,9 +68,14 @@ private static void initInstall() throws Exception
     private static void initUser()
     {
         String phoebus_user = System.getProperty(PHOEBUS_USER);
+        String name_folder_preference = System.getProperty(NAME_FOLDER_PREFERENCE);
         if (phoebus_user == null)
         {
-            phoebus_user = new File(System.getProperty("user.home"), ".phoebus").getAbsolutePath();
+            if (name_folder_preference == null) 
+            {
+            name_folder_preference = ".phoebus";
+            }
+            phoebus_user = new File(System.getProperty("user.home"), name_folder_preference).getAbsolutePath();
             System.setProperty(PHOEBUS_USER, phoebus_user);
         }
     }

From 60b0fb0bee603d68c7f3a170eab3b83487cc7b98 Mon Sep 17 00:00:00 2001
From: Xavier G <104097021+XavSPM@users.noreply.github.com>
Date: Tue, 4 Jun 2024 11:44:54 +0200
Subject: [PATCH 2/3] Update Locations.java

midification of variable names.
phoebus.name.folder.preference --> phoebus.folder.name.preference
---
 .../java/org/phoebus/framework/workbench/Locations.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/framework/src/main/java/org/phoebus/framework/workbench/Locations.java b/core/framework/src/main/java/org/phoebus/framework/workbench/Locations.java
index e7fbcbf317..31c6cdcefe 100644
--- a/core/framework/src/main/java/org/phoebus/framework/workbench/Locations.java
+++ b/core/framework/src/main/java/org/phoebus/framework/workbench/Locations.java
@@ -22,7 +22,7 @@ public class Locations
     /** system property for phoebus logged user */
     public static final String PHOEBUS_USER = "phoebus.user";
     /** system property for the name of the folder containing preferences and the memento file */
-    public static final String NAME_FOLDER_PREFERENCE = "phoebus.name.folder.preference";
+    public static final String FOLDER_NAME_PREFERENCE = "phoebus.folder.name.preference";
 
     /** Initialize locations */
     public static void initialize()
@@ -68,14 +68,14 @@ private static void initInstall() throws Exception
     private static void initUser()
     {
         String phoebus_user = System.getProperty(PHOEBUS_USER);
-        String name_folder_preference = System.getProperty(NAME_FOLDER_PREFERENCE);
+        String folder_name_preference = System.getProperty(FOLDER_NAME_PREFERENCE);
         if (phoebus_user == null)
         {
-            if (name_folder_preference == null) 
+            if (folder_name_preference == null) 
             {
             name_folder_preference = ".phoebus";
             }
-            phoebus_user = new File(System.getProperty("user.home"), name_folder_preference).getAbsolutePath();
+            phoebus_user = new File(System.getProperty("user.home"), folder_name_preference).getAbsolutePath();
             System.setProperty(PHOEBUS_USER, phoebus_user);
         }
     }

From be4c7c9388c5be07cb175c653a4b94889e94e716 Mon Sep 17 00:00:00 2001
From: Xavier G <104097021+XavSPM@users.noreply.github.com>
Date: Tue, 4 Jun 2024 11:46:19 +0200
Subject: [PATCH 3/3] Update Locations.java

---
 .../main/java/org/phoebus/framework/workbench/Locations.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/framework/src/main/java/org/phoebus/framework/workbench/Locations.java b/core/framework/src/main/java/org/phoebus/framework/workbench/Locations.java
index 31c6cdcefe..f6002b6b58 100644
--- a/core/framework/src/main/java/org/phoebus/framework/workbench/Locations.java
+++ b/core/framework/src/main/java/org/phoebus/framework/workbench/Locations.java
@@ -73,7 +73,7 @@ private static void initUser()
         {
             if (folder_name_preference == null) 
             {
-            name_folder_preference = ".phoebus";
+            folder_name_preference = ".phoebus";
             }
             phoebus_user = new File(System.getProperty("user.home"), folder_name_preference).getAbsolutePath();
             System.setProperty(PHOEBUS_USER, phoebus_user);