Merge pull request #3307 from ControlSystemStudio/alarm_table

minor logging and docs improvements based on #3271 reviews

Author: shroffk

app/alarm/model/src/main/resources/alarm_preferences.properties

@@ -65,6 +65,7 @@ alarm_tree_startup_ms=2000
 
 # Order of columns in alarm table
 # Allows re-ordering as well as omitting columns
+# The supported columns are: Icon, PV, Description, Alarm Severity, Alarm Message, Alarm Time, Alarm Value, PV Severity, PV Message
 alarm_table_columns=Icon, PV, Description, Alarm Severity, Alarm Message, Alarm Time, Alarm Value, PV Severity, PV Message
 
 # By default, the alarm table uses the common alarm severity colors

app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/table/AlarmTableUI.java

@@ -16,8 +16,10 @@
 import java.util.Optional;
 import java.util.logging.Level;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import javafx.application.Platform;
+import javafx.scene.control.TableColumnBase;
 import javafx.scene.layout.Background;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.Priority;
@@ -493,7 +495,8 @@ private TableView<AlarmInfoRow> createTable(final ObservableList<AlarmInfoRow> r
             if (to_add.isPresent())
                 table.getColumns().add(to_add.get());
             else
-                logger.log(Level.WARNING, "Unknown Alarm Table column '" + header + "'");
+                logger.log(Level.SEVERE, "Unknown Alarm Table column '" + header + "' " +
+                        " Supported columns are: " + cols.stream().map(TableColumnBase::getText).collect(Collectors.joining(", ")));
         }
 
         // Initially, sort on PV name