Exclude sys:// and formula functions from widget info dialog and archiver status. Externalize string resources

Author: georgweiss

app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/Messages.java

@@ -27,6 +27,12 @@ public class Messages
                          AddJavaScriptFile,
                          AddPythonFile,
                          Alpha,
+                         ArchivedStatus,
+                         ArchivedStatusGet,
+                         ArchivedStatusNo,
+                         ArchivedStatusNotApplicable,
+                         ArchivedStatusPleaseWait,
+                         ArchivedStatusYes,
                          BoolButtonError_Body,
                          BoolButtonError_Title,
                          Blue,

app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/WidgetInfoDialog.java

@@ -448,21 +448,20 @@ private Tab createPVs(final Collection<NameStateValue> pvs) {
         boolean archiveDataSourceAvailable =
                 ServiceLoader.load(PVFactory.class).stream().filter(f -> f.get().getType().equals("archive")).findFirst().isPresent();
 
-        final TableColumn<NameStateValue, ArchivedStatus> archiverValue = new TableColumn<>("Archived?");
+        final TableColumn<NameStateValue, ArchivedStatus> archiverValue = new TableColumn<>(Messages.ArchivedStatus);
         archiverValue.setCellValueFactory(cell -> cell.getValue().archiverValue);
         archiverValue.setCellFactory(c -> new TableCell<>() {
             @Override
             protected void updateItem(ArchivedStatus item, boolean empty) {
-                if (empty) {
+                if (empty || item.equals(ArchivedStatus.UNKNOWN)) {
                     setText(null);
-                } else if (item.equals(ArchivedStatus.NOT_APPLICABLE)) {
-                    setText("Not Applicable");
-                } else if (item.equals(ArchivedStatus.NO)) {
-                    setText("No");
-                } else if (item.equals(ArchivedStatus.LOADING)) {
-                    setText("Please Wait...");
-                } else if (item.equals(ArchivedStatus.YES)) {
-                    setText("Yes");
+                    return;
+                }
+                switch (item){
+                    case NOT_APPLICABLE -> setText(Messages.ArchivedStatusNotApplicable);
+                    case YES ->  setText(Messages.ArchivedStatusYes);
+                    case NO -> setText(Messages.ArchivedStatusNo);
+                    case LOADING -> setText(Messages.ArchivedStatusPleaseWait);
                 }
             }
         });
@@ -638,8 +637,18 @@ private void fetchArchiverStatus() {
         });
     }
 
+    /**
+     * Uses the archive:// data source to retrieve last archived sample.
+     * For loc://, sim://, sys:// and formula functions, {@link ArchivedStatus#NOT_APPLICABLE} is returned.
+     * @param pvName A valid PV name.
+     * @return The {@link ArchivedStatus} of the PV, if any, or {@link ArchivedStatus#UNKNOWN} if there is
+     * an issue interacting with the data source.
+     */
     private ArchivedStatus getFromArchiver(String pvName) {
-        if (pvName.toLowerCase().startsWith("loc://") || pvName.toLowerCase().startsWith("sim://")) {
+        if (pvName.toLowerCase().startsWith("loc://") ||
+            pvName.toLowerCase().startsWith("sim://") ||
+            pvName.toLowerCase().startsWith("sys://") ||
+            pvName.toLowerCase().startsWith("=")) {
             return ArchivedStatus.NOT_APPLICABLE;
         }
         // Check if pv name is prefixed with a scheme, e.g. pva://, ca://...

app/display/representation-javafx/src/main/resources/org/csstudio/display/builder/representation/javafx/messages.properties

@@ -16,6 +16,12 @@ AddEmbeddedJavaScript=Add Embedded JavaScript\u2026
 AddEmbeddedPython=Add Embedded Python\u2026
 AddJavaScriptFile=Add JavaScript File
 AddPythonFile=Add Python File
+ArchivedStatus=Archived
+ArchivedStatusGet=Get Archived Status
+ArchivedStatusNo=No
+ArchivedStatusNotApplicable=Not Applicable
+ArchivedStatusPleaseWait=Please Wait
+ArchivedStatusYes=Yes
 Alpha=Alpha
 Blue=Blue
 BoolButtonError_Body=Confirmation dialog supported only for toggle mode.