Merge pull request #3673 from ControlSystemStudio/CSSTUDIO-3598

Fixes for log (and email) entry from Alarm Table UI

Author: shroffk

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

@@ -114,14 +114,14 @@ public String toString()
     {
         final StringBuilder buf = new StringBuilder();
 
-        buf.append("PV: ").append(pv.get()).append("\n");
-        buf.append("Description: ").append(description.get()).append("\n");
-        buf.append("Alarm Time: ").append(time.get()).append("\n");
+        buf.append("PV: ").append(pv.get()).append("  \n");
+        buf.append("Description: ").append(description.get()).append("  \n");
+        buf.append("Alarm Time: ").append(time.get()).append("  \n");
         buf.append("Alarm Severity: ").append(severity.get());
         buf.append(", Status: ").append(status.get());
-        buf.append(", Value: ").append(value.get()).append("\n");
+        buf.append(", Value: ").append(value.get()).append("  \n");
         buf.append("Current PV Severity: ").append(pv_severity.get());
-        buf.append(", Status: ").append(pv_status.get()).append("\n");
+        buf.append(", Status: ").append(pv_status.get()).append("  \n");
 
         return buf.toString();
     }

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

@@ -597,7 +597,7 @@ private String list_alarms()
 
         buf.append("Acknowledged Alarms\n");
         buf.append("===================\n");
-        for (AlarmInfoRow row : active_rows)
+        for (AlarmInfoRow row : acknowledged_rows)
             buf.append(row).append("\n");
 
         return buf.toString();