From e2a73ed2228276ebfb13cfd6a4a1b8fd4c955ec5 Mon Sep 17 00:00:00 2001 From: John Cortell Date: Mon, 31 Mar 2008 19:50:48 +0000 Subject: [PATCH] Applied modified version of patch in 224976. --- .../cdt/launch/AbstractCLaunchDelegate.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java index 5c339d9ab1c..a4332ccf126 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java @@ -705,18 +705,18 @@ abstract public class AbstractCLaunchDelegate extends LaunchConfigurationDelegat } } IBinaryParser parser = CCorePlugin.getDefault().getDefaultBinaryParser(); + Exception exception; try { return (IBinaryObject)parser.getBinary(exePath); } catch (ClassCastException e) { + exception = e; } catch (IOException e) { + exception = e; } - Throwable exception = new FileNotFoundException(LaunchMessages.getFormattedString( - "AbstractCLaunchDelegate.Program_is_not_a_recongnized_executable", exePath.toOSString())); //$NON-NLS-1$ - int code = ICDTLaunchConfigurationConstants.ERR_PROGRAM_NOT_BINARY; - MultiStatus status = new MultiStatus(getPluginID(), code, LaunchMessages - .getString("AbstractCLaunchDelegate.Program_is_not_a_recongnized_executable"), exception); //$NON-NLS-1$ - status.add(new Status(IStatus.ERROR, getPluginID(), code, exception == null ? "" : exception.getLocalizedMessage(), //$NON-NLS-1$ - exception)); + Status status = new Status(IStatus.ERROR,getPluginID(), + ICDTLaunchConfigurationConstants.ERR_PROGRAM_NOT_BINARY, + LaunchMessages.getString("AbstractCLaunchDelegate.Program_is_not_a_recongnized_executable") + " " + exePath.toOSString(), //$NON-NLS-1$ + exception); throw new CoreException(status); }