diff --git a/core/ui/src/main/java/org/phoebus/ui/Messages.java b/core/ui/src/main/java/org/phoebus/ui/Messages.java index 268639c251..02774b00aa 100644 --- a/core/ui/src/main/java/org/phoebus/ui/Messages.java +++ b/core/ui/src/main/java/org/phoebus/ui/Messages.java @@ -34,6 +34,7 @@ public class Messages public static String DefaultNewColumnName; /**DoNotShow */ public static String DoNotShow; + /**Format_Binary */ public static String Format_Binary; /**Format_Compact */ @@ -68,6 +69,7 @@ public class Messages public static String MoveRowDown; /**MoveRowUp */ public static String MoveRowUp; + public static String NoExceptionAvailable; /**NumberInputHdr */ public static String NumberInputHdr; /**Num_Selected */ diff --git a/core/ui/src/main/java/org/phoebus/ui/dialog/ExceptionDetailsErrorDialog.java b/core/ui/src/main/java/org/phoebus/ui/dialog/ExceptionDetailsErrorDialog.java index c91be76d9c..4d8b63e777 100644 --- a/core/ui/src/main/java/org/phoebus/ui/dialog/ExceptionDetailsErrorDialog.java +++ b/core/ui/src/main/java/org/phoebus/ui/dialog/ExceptionDetailsErrorDialog.java @@ -16,6 +16,7 @@ import javafx.scene.control.TextArea; import javafx.scene.input.Clipboard; import javafx.scene.input.ClipboardContent; +import org.phoebus.ui.Messages; import java.io.ByteArrayOutputStream; import java.io.PrintStream; @@ -91,8 +92,11 @@ public static void openError(final String title, final Exception exception) private static void doOpenError(final Node node, final String title, final String message, final Exception exception, final boolean append_stacktrace_msgs) { StringBuilder messageBuilder = new StringBuilder(message).append(LINE_SEPARATOR); - if(append_stacktrace_msgs) - { + + if(exception == null){ + messageBuilder.append(System.lineSeparator()).append(Messages.NoExceptionAvailable); + } + else{ messageBuilder.append(exception.getMessage() != null ? exception.getMessage() : exception.getClass()).append(LINE_SEPARATOR).append("Cause:").append(LINE_SEPARATOR); Throwable cause = exception.getCause(); int exceptionIndex = 1; diff --git a/core/ui/src/main/resources/org/phoebus/ui/messages.properties b/core/ui/src/main/resources/org/phoebus/ui/messages.properties index 4730b8b1b9..2681f4c072 100644 --- a/core/ui/src/main/resources/org/phoebus/ui/messages.properties +++ b/core/ui/src/main/resources/org/phoebus/ui/messages.properties @@ -25,6 +25,7 @@ MoveColumnLeft=Move Column Left MoveColumnRight=Move Column Right MoveRowDown=Move Row Down MoveRowUp=Move Row Up +NoExceptionAvailable= NumberInputHdr=Please enter a number Num_Selected=selected Redo_TT=Re-do last change