Show exception message in terminate/relaunch dialog (#1173) (#1180)

plugins/org.yakindu.sct.simulation.core.sexec/src/org/yakindu/sct/simulation/core/sexec/container/AbstractExecutionFlowSimulationEngine.java

@@ -41,7 +41,7 @@ import com.google.inject.Inject;
 public abstract class AbstractExecutionFlowSimulationEngine implements ISimulationEngine, IExecutionControl {
 
 	private static final String ERROR_MSG = "An unexpected error ocurred during simulation.";
-
+	
 	public static final int ERROR_DURING_SIMULATION = 765;
 
 	@Inject
@@ -75,12 +75,9 @@ public abstract class AbstractExecutionFlowSimulationEngine implements ISimulati
 		if (t instanceof WrappedException) {
 			t = ((WrappedException) t).getCause();
 		}
-		String message = ERROR_MSG;
-		if (t.getMessage() != null && !t.getMessage().isEmpty()) {
-			message += " ("+t.getMessage()+")";
-		}
+		String statusMessage = t.getMessage() == null ? ERROR_MSG : t.getMessage();
 		Status errorStatus = new Status(Status.ERROR, SimulationCoreActivator.PLUGIN_ID, ERROR_DURING_SIMULATION,
-				message, t);
+				statusMessage, t);
 		SimulationCoreActivator.getDefault().getLog().log(errorStatus);
 		IStatusHandler statusHandler = DebugPlugin.getDefault().getStatusHandler(errorStatus);
 		try {

plugins/org.yakindu.sct.simulation.ui/src/org/yakindu/sct/simulation/ui/handler/TerminateLaunchStatusHandler.java

@@ -30,12 +30,14 @@ import org.yakindu.sct.simulation.ui.dialogs.SimulationLaunchErrorDialog;
 @SuppressWarnings("restriction")
 public class TerminateLaunchStatusHandler implements IStatusHandler {
 
+	private static final String ERROR_MSG = "An unexpected error ocurred during simulation.";
+	
 	public Object handleStatus(final IStatus status, final Object source) {
 		Display.getDefault().asyncExec(new Runnable() {
 			public void run() {
 				Shell shell = DebugUIPlugin.getShell();
 				SimulationLaunchErrorDialog dialog = new SimulationLaunchErrorDialog(shell,
-						"Exception occured during simulation", status.getMessage(), status, Collections
+						"Exception occured during simulation", ERROR_MSG, status, Collections
 								.singletonList((IDebugTarget) source));
 				dialog.setBlockOnOpen(false);
 				dialog.open();