Merge branch 'master' into CSSTUDIO-1684

ControlSystemStudio · Nov 12, 2023 · ebc41df · ebc41df
2 parents db12971 + fae097d
commit ebc41df
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/app/display/runtime/src/main/java/org/csstudio/display/builder/runtime/app/DisplayInfo.java b/app/display/runtime/src/main/java/org/csstudio/display/builder/runtime/app/DisplayInfo.java
@@ -57,7 +57,7 @@ public static DisplayInfo forURI(final URI uri)
         // Get basic file or http 'path' from path
         final String path;
         if (uri.getScheme() == null  ||  uri.getScheme().equals("file"))
-            path = uri.getRawPath();
+            path = uri.getPath();
         else
         {
             final StringBuilder buf = new StringBuilder();

diff --git a/core/pv/src/main/resources/pv_ca_preferences.properties b/core/pv/src/main/resources/pv_ca_preferences.properties
@@ -2,6 +2,17 @@
 # Package org.phoebus.pv.ca
 # -------------------------
 
+# By default, we use the following preferences settings,
+# but when the System property "jca.use_env" is "true",
+# JCA falls back to the EPICS_CA_... environment variables.
+#
+# Sites that prefer to use the EPICS_CA_... environment variables
+# thus need to add
+#
+#      -Djca.use_env=true
+#
+# to their launcher script.
+
 # Channel Access address list
 addr_list=
 

diff --git a/core/ui/src/main/java/org/phoebus/ui/docking/DockItemWithInput.java b/core/ui/src/main/java/org/phoebus/ui/docking/DockItemWithInput.java
@@ -11,6 +11,8 @@
 
 import java.io.File;
 import java.net.URI;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.List;
@@ -166,7 +168,8 @@ public void setInput(final URI input)
                 name_tab.setTooltip(new Tooltip(Messages.DockNotSaved));
             else
             {
-                name_tab.setTooltip(new Tooltip(input.toString()));
+                String decodedInputURI = URLDecoder.decode(input.toString(), StandardCharsets.UTF_8);
+                name_tab.setTooltip(new Tooltip(decodedInputURI));
                 setLabel(name);
             }
         });