Bug 11982 - Logging exceptions

26 files changed, 113 insertions, 180 deletions

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugPluginImages.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugPluginImages.java
index eb4ad8d89..d633d55d2 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugPluginImages.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugPluginImages.java
@@ -160,7 +160,7 @@ public class DebugPluginImages {
 					iconURL = new URL(iconURL, iconPath);			

 					desc= ImageDescriptor.createFromURL(iconURL);

 				} catch (MalformedURLException e) {

-					DebugUIPlugin.logError(e);

+					DebugUIPlugin.log(e);

 				} 

 				imageRegistry.put(launcher.getIdentifier(), desc);				

 				imageDescriptors.put(launcher.getIdentifier(), desc);

@@ -180,7 +180,7 @@ public class DebugPluginImages {
 				iconURL = new URL(iconURL, iconPath);

 				imageDescriptor = ImageDescriptor.createFromURL(iconURL);

 			} catch (MalformedURLException mue) {

-				DebugUIPlugin.logError(mue);

+				DebugUIPlugin.log(mue);

 			}

 			String configTypeID = configElement.getAttribute(ATTR_LAUNCH_CONFIG_TYPE_ID);			

 			imageRegistry.put(configTypeID, imageDescriptor);				

@@ -199,7 +199,7 @@ public class DebugPluginImages {
 		try {

 			desc= ImageDescriptor.createFromURL(makeIconFileURL(path));

 		} catch (MalformedURLException me) {

-			DebugUIPlugin.logError(me);

+			DebugUIPlugin.log(me);

 		}

 		imageRegistry.put(key, desc);

 		imageDescriptors.put(key, desc);

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java
index 5bf1f6465..c5cdabc81 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java
@@ -393,7 +393,7 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener,
 		try {

 			persistLaunchHistory();

 		} catch (IOException e) {

-			logError(e);

+			log(e);

 		}

 		if (fgPresentation != null) {

 			fgPresentation.dispose();

@@ -415,7 +415,7 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener,
 		try {

 			restoreLaunchHistory();

 		} catch (IOException e) {

-			logError(e);

+			log(e);

 		}

 		for (int i = 0; i < launches.length; i++) {

 			launchAdded(launches[i]);

@@ -542,7 +542,7 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener,
 								page.bringToTop(consoleView);

 							}

 						} catch (PartInitException pie) {

-							logError(pie);

+							log(pie);

 						}

 					}

 				}

@@ -580,7 +580,7 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener,
 				}

 				delta.accept(fgDeletedVisitor, false);

 			} catch (CoreException ce) {

-				logError(ce);

+				log(ce.getStatus());

 			}

 		}		

 	}

@@ -662,7 +662,7 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener,
 				removeRunFavorite(config);

 			}

 		} catch (CoreException e) {

-			logError(e);

+			log(e.getStatus());

 		}	

 	}

 	

@@ -1204,10 +1204,10 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener,
 			DocumentBuilder parser = DocumentBuilderFactory.newInstance().newDocumentBuilder();

 			rootHistoryElement = parser.parse(new InputSource(stream)).getDocumentElement();

 		} catch (SAXException e) {

-			logError(e);

+			log(e);

 			return;

 		} catch (ParserConfigurationException e) {

-			logError(e);

+			log(e);

 			return;

 		} finally {

 			stream.close();

@@ -1382,6 +1382,15 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener,
 			message= null;

 		}

 		ErrorDialog.openError(shell, title, message, s);

+		log(s);

+	}

+	

+	/**

+	 * Utility method with conventions

+	 */

+	public static void errorDialog(Shell shell, String title, String message, Throwable t) {

+		IStatus status= new Status(IStatus.ERROR, getDefault().getDescriptor().getUniqueIdentifier(), IDebugUIConstants.INTERNAL_ERROR, "Error logged from Debug UI: ", t); //$NON-NLS-1$	

+		errorDialog(shell, title, message, status);

 	}

 

 	/**

@@ -1394,13 +1403,30 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener,
 	}

 	

 	/**

-	 * Convenience method to log internal UI errors

+	 * Logs the specified throwable with this plug-in's log.

+	 * 

+	 * @param t throwable to log 

+	 */

+	public static void log(Throwable t) {

+		IStatus status= null;

+		if (t instanceof CoreException) {

+			status= ((CoreException)t).getStatus();

+		} else {

+			status= new Status(IStatus.ERROR, getDefault().getDescriptor().getUniqueIdentifier(), IDebugUIConstants.INTERNAL_ERROR, "Error logged from Debug UI: ", t); //$NON-NLS-1$

+		}

+		log(status);

+	}

+	

+	/**

+	 * Logs the given message if in debug mode.

+	 * 

+	 * @param String message to log

 	 */

-	public static void logError(Exception e) {

+	public static void logDebugMessage(String message) {

 		if (getDefault().isDebugging()) {

 			// this message is intentionally not internationalized, as an exception may

 			// be due to the resource bundle itself

-			log(new Status(IStatus.ERROR, getDefault().getDescriptor().getUniqueIdentifier(), IDebugUIConstants.INTERNAL_ERROR, "Internal error logged from Debug UI: ", e));  //$NON-NLS-1$		

+			log(new Status(IStatus.ERROR, getDefault().getDescriptor().getUniqueIdentifier(), IDebugUIConstants.INTERNAL_ERROR, "Internal message logged from Debug UI: " + message, null));  //$NON-NLS-1$		

 		}

 	}

 	

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DefaultLabelProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DefaultLabelProvider.java
index f9913331e..ed8c0ec8f 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DefaultLabelProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DefaultLabelProvider.java
@@ -166,7 +166,7 @@ public class DefaultLabelProvider implements ILabelProvider {
 				}
 			}
 		} catch (DebugException e) {
-			DebugUIPlugin.logError(e);
+			DebugUIPlugin.log(e.getStatus());
 			label.append(DebugUIMessages.getString("DefaultLabelProvider.<unknown>_1")); //$NON-NLS-1$
 		}
 		return label.toString();
@@ -201,8 +201,7 @@ public class DefaultLabelProvider implements ILabelProvider {
 			try {
 				buff.append(config.getType().getName());
 			} catch (CoreException e) {
-				//XXX: unknown configuration type
-				DebugUIPlugin.logError(e);
+				DebugUIPlugin.log(e.getStatus());
 			}
 			buff.append("]"); //$NON-NLS-1$
 			return buff.toString();			
@@ -217,7 +216,7 @@ public class DefaultLabelProvider implements ILabelProvider {
 			try {
 				valueString= value.getValueString();
 			} catch (DebugException de) {
-				DebugUIPlugin.logError(de);
+				DebugUIPlugin.log(de.getStatus());
 			}
 		}
 		if (valueString != null && valueString.length() > 0) {
@@ -231,12 +230,11 @@ public class DefaultLabelProvider implements ILabelProvider {
 		StringBuffer buffer= new StringBuffer();
 		try {
 			IValue value = variable.getValue();
-			
 			buffer.append(variable.getName());
 			buffer.append(" = "); //$NON-NLS-1$
 			buffer.append(value.getValueString());
 		} catch (DebugException de) {
-			DebugUIPlugin.logError(de);
+			DebugUIPlugin.log(de.getStatus());
 		}
 		return buffer.toString();
 	}
@@ -247,7 +245,7 @@ public class DefaultLabelProvider implements ILabelProvider {
 				return DebugUIMessages.getString("DefaultLabelProvider.Breakpoint_1"); //$NON-NLS-1$
 			}
 		} catch (CoreException e) {
-			DebugUIPlugin.logError(e);
+			DebugUIPlugin.log(e.getStatus());
 		}
 		return ""; //$NON-NLS-1$
 	}
@@ -263,7 +261,7 @@ public class DefaultLabelProvider implements ILabelProvider {
 				}
 			}
 		} catch (CoreException e) {
-			DebugUIPlugin.logError(e);
+			DebugUIPlugin.log(e.getStatus());
 		}
 		return null;
 	}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DelegatingModelPresentation.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DelegatingModelPresentation.java
index 5b35083ff..88d348324 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DelegatingModelPresentation.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DelegatingModelPresentation.java
@@ -9,37 +9,25 @@ import java.util.HashMap;
 import java.util.Iterator;

 

 import org.eclipse.core.resources.IMarker;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IAdaptable;

 import org.eclipse.core.runtime.IConfigurationElement;

 import org.eclipse.core.runtime.IExtension;

 import org.eclipse.core.runtime.IExtensionPoint;

 import org.eclipse.core.runtime.IPluginDescriptor;

 import org.eclipse.debug.core.DebugException;

 import org.eclipse.debug.core.DebugPlugin;

-import org.eclipse.debug.core.ILaunch;

-import org.eclipse.debug.core.ILaunchConfiguration;

-import org.eclipse.debug.core.ILaunchConfigurationType;

-import org.eclipse.debug.core.ILaunchManager;

-import org.eclipse.debug.core.ILauncher;

 import org.eclipse.debug.core.model.IBreakpoint;

 import org.eclipse.debug.core.model.IDebugElement;

 import org.eclipse.debug.core.model.IExpression;

-import org.eclipse.debug.core.model.IProcess;

-import org.eclipse.debug.core.model.ITerminate;

 import org.eclipse.debug.core.model.IValue;

 import org.eclipse.debug.core.model.IVariable;

 import org.eclipse.debug.ui.DebugUITools;

 import org.eclipse.debug.ui.IDebugModelPresentation;

 import org.eclipse.debug.ui.IDebugUIConstants;

 import org.eclipse.debug.ui.IValueDetailListener;

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.jface.resource.ImageRegistry;

 import org.eclipse.jface.viewers.ILabelProvider;

 import org.eclipse.jface.viewers.ILabelProviderListener;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.model.IWorkbenchAdapter;

 

 /**

  * A model presentation that delegates to the appropriate extension. This

@@ -145,7 +133,7 @@ public class DelegatingModelPresentation implements IDebugModelPresentation {
 					return new StringBuffer(((IVariable)item).getValue().getReferenceTypeName()).append(' ').append(getDefaultText(item)).toString(); //$NON-NLS-1$

 				}

 			} catch (DebugException de) {

-				DebugUIPlugin.logError(de);

+				DebugUIPlugin.log(de.getStatus());

 			}

 		}

 		return getDefaultText(item);

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LaunchWizard.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LaunchWizard.java
index b45b62954..9ac6f6002 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LaunchWizard.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LaunchWizard.java
@@ -138,7 +138,7 @@ public class LaunchWizard extends Wizard {
 					DebugPlugin.getDefault().getLaunchManager().setDefaultLauncher(project, launcher);

 					setDefaultLauncherSet(true);

 				} catch (CoreException e) {

-					DebugUIPlugin.logError(e);

+					DebugUIPlugin.log(e.getStatus());

 				}

 			}

 		}

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LaunchWizardNode.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LaunchWizardNode.java
index 45e1a4f6d..c92b37944 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LaunchWizardNode.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LaunchWizardNode.java
@@ -62,8 +62,7 @@ public class LaunchWizardNode implements IWizardNode {
 		}

 		try {

 			fWizard= createWizard(); // create instance of target wizard

-		} catch (CoreException e) {

-			DebugUIPlugin.logError(e);		

+		} catch (CoreException e) {	

 			DebugUIPlugin.errorDialog(fParentWizardPage.getControl().getShell(), DebugUIMessages.getString("LaunchWizardNode.Problem_Opening_Wizard_4"),DebugUIMessages.getString("LaunchWizardNode.The_selected_wizard_could_not_be_started._5") , e.getStatus()); //$NON-NLS-2$ //$NON-NLS-1$

 			return null;

 		}

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LauncherPropertyPage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LauncherPropertyPage.java
index a13fc1eb8..c07b0d932 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LauncherPropertyPage.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LauncherPropertyPage.java
@@ -217,7 +217,7 @@ public class LauncherPropertyPage extends PropertyPage implements IWorkbenchPref
 				}

 			} catch (CoreException ce) {

 				fCombo.select(0);

-				DebugUIPlugin.logError(ce);

+				DebugUIPlugin.log(ce.getStatus());

 			}

 		}

 	}

@@ -237,7 +237,6 @@ public class LauncherPropertyPage extends PropertyPage implements IWorkbenchPref
 			}

 			getLaunchManager().setDefaultLauncher(project, null);

 		} catch (CoreException e) {

-			DebugUIPlugin.logError(e);

 			DebugUIPlugin.errorDialog(DebugUIPlugin.getActiveWorkbenchWindow().getShell(), DebugUIMessages.getString("LauncherPropertyPage.Launcher_property_page_5"), DebugUIMessages.getString("LauncherPropertyPage.Exceptions_occurred_saving_the_launcher_preferences_6"), e.getStatus()); //$NON-NLS-1$ //$NON-NLS-2$

 			return false;

 		}

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LazyModelPresentation.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LazyModelPresentation.java
index f4b1f5c6f..6b42617a6 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LazyModelPresentation.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LazyModelPresentation.java
@@ -164,7 +164,7 @@ public class LazyModelPresentation implements IDebugModelPresentation {
 					fPresentation.setAttribute(key, fAttributes.get(key));

 				}

 			} catch (CoreException e) {

-				DebugUIPlugin.logError(e);

+				DebugUIPlugin.log(e.getStatus());

 			}

 		}

 		return fPresentation;

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ChangeVariableValueAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ChangeVariableValueAction.java
index 4941764fb..dd461148b 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ChangeVariableValueAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ChangeVariableValueAction.java
@@ -97,7 +97,6 @@ public class ChangeVariableValueAction extends SelectionProviderAction {
 			valueString= fVariable.getValue().getValueString();

 		} catch (DebugException de) {

 			DebugUIPlugin.errorDialog(activeShell,ActionMessages.getString("ChangeVariableValue.errorDialogTitle"),ActionMessages.getString("ChangeVariableValue.errorDialogMessage"), de.getStatus());	 //$NON-NLS-1$ //$NON-NLS-2$

-			DebugUIPlugin.logError(de);

 		}

 		TreeItem[] selectedItems = fTree.getSelection();

 		fTreeEditor.horizontalAlignment = SWT.LEFT;

@@ -110,7 +109,7 @@ public class ChangeVariableValueAction extends SelectionProviderAction {
 		try {

 			varName = fVariable.getName();

 		} catch (DebugException de) {

-			DebugUIPlugin.logError(de);

+			DebugUIPlugin.errorDialog(activeShell,ActionMessages.getString("ChangeVariableValue.errorDialogTitle"),ActionMessages.getString("ChangeVariableValue.errorDialogMessage"), de.getStatus());	 //$NON-NLS-1$ //$NON-NLS-2$

 		}

 		fEditorLabel.setText(varName + "="); //$NON-NLS-1$

 

@@ -166,7 +165,6 @@ public class ChangeVariableValueAction extends SelectionProviderAction {
 			variable.setValue(newValue);

 		} catch (DebugException de) {

 			DebugUIPlugin.errorDialog(shell, ActionMessages.getString("ChangeVariableValue.errorDialogTitle"),ActionMessages.getString("ChangeVariableValue.errorDialogMessage"), de.getStatus());	//$NON-NLS-2$ //$NON-NLS-1$

-			DebugUIPlugin.logError(de);

 		}

 		cleanup();		

 	}

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/OpenBreakpointMarkerAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/OpenBreakpointMarkerAction.java
index 074ce5bae..08815b9d2 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/OpenBreakpointMarkerAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/OpenBreakpointMarkerAction.java
@@ -19,9 +19,10 @@ import org.eclipse.ui.ISharedImages;
 import org.eclipse.ui.IWorkbenchPage;

 import org.eclipse.ui.IWorkbenchWindow;

 import org.eclipse.ui.PartInitException;

+import org.eclipse.ui.actions.SelectionProviderAction;

 import org.eclipse.ui.help.WorkbenchHelp;

 

-public class OpenBreakpointMarkerAction extends OpenMarkerAction {

+public class OpenBreakpointMarkerAction extends SelectionProviderAction {

 

 	protected static DelegatingModelPresentation fgPresentation = new DelegatingModelPresentation();

 	

@@ -36,7 +37,7 @@ public class OpenBreakpointMarkerAction extends OpenMarkerAction {
 	}

 

 	/**

-	 * @see IAction

+	 * @see IAction#run()

 	 */

 	public void run() {

 		IWorkbenchWindow dwindow= DebugUIPlugin.getActiveWorkbenchWindow();

@@ -45,9 +46,7 @@ public class OpenBreakpointMarkerAction extends OpenMarkerAction {
 			return;

 		}

 		IEditorPart part= null;

-		// Get the resource.

 		IStructuredSelection selection= (IStructuredSelection)getStructuredSelection();

-		//Get the selected marker

 		Iterator enum= selection.iterator();

 		IBreakpoint breakpoint= (IBreakpoint)enum.next();

 		IEditorInput input= fgPresentation.getEditorInput(breakpoint);

@@ -56,16 +55,24 @@ public class OpenBreakpointMarkerAction extends OpenMarkerAction {
 			try {

 				part= page.openEditor(input, editorId);

 			} catch (PartInitException e) {

-				DebugUIPlugin.logError(e);

+				DebugUIPlugin.errorDialog(dwindow.getShell(), "Go to Breakpoint", "Exceptions occurred attempting to open the editor for the breakpoint resource", e);

 			}

 		}

 		if (part != null) {

-			// Bring editor to front.

 			part.setFocus();

-

-			// Goto the bookmark.

 			part.gotoMarker(breakpoint.getMarker());

 		}

 	}

+	

+	/**

+	 * @see SelectionProviderAction

+	 */

+	public void selectionChanged(IStructuredSelection sel) {

+		if (sel.size() == 1) {

+			setEnabled(true);

+		} else {

+			setEnabled(false);

+		}

+	}

 }

 

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/OpenMarkerAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/OpenMarkerAction.java
deleted file mode 100644
index 3acbfc293..000000000
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/OpenMarkerAction.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.eclipse.debug.internal.ui.actions;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

- 

-import org.eclipse.core.resources.IMarker;

-import org.eclipse.debug.internal.ui.DebugUIPlugin;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.SelectionProviderAction;

-

-/**

- * Open a marker 

- */

-public class OpenMarkerAction extends SelectionProviderAction {

-

-	public OpenMarkerAction(ISelectionProvider selectionProvider, String label) {

-		super(selectionProvider, label);

-		setEnabled(getStructuredSelection().size() == 1);

-	}

-

-	/**

-	 * @see IAction

-	 */

-	public void run() {

-		IStructuredSelection selection= (IStructuredSelection) getStructuredSelection();

-		//Get the selected marker

-		if (selection.size() != 1) {

-			return; //Single selection only

-		}

-		Object object= selection.getFirstElement();

-		IWorkbenchWindow dwindow= DebugUIPlugin.getActiveWorkbenchWindow();

-		IWorkbenchPage page= dwindow.getActivePage();

-		if (page == null) {

-			return;

-		}

-		try {

-			page.openEditor((IMarker)object);

-		} catch (PartInitException e) {

-			DebugUIPlugin.logError(e);

-		}

-	}

-

-	/**

-	 * @see SelectionProviderAction

-	 */

-	public void selectionChanged(IStructuredSelection sel) {

-		if (sel.size() == 1) {

-			setEnabled(true);

-		} else {

-			setEnabled(false);

-		}

-	}

-}

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/TextViewerGotoLineAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/TextViewerGotoLineAction.java
index c95ece4bd..1646a3e72 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/TextViewerGotoLineAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/TextViewerGotoLineAction.java
@@ -72,7 +72,7 @@ public class TextViewerGotoLineAction extends TextViewerAction {
 			fTextViewer.getTextWidget().setSelection(start, start + length);

 			fTextViewer.revealRange(start, length);

 		} catch (BadLocationException x) {

-			DebugUIPlugin.logError(x);

+			DebugUIPlugin.errorDialog(fTextViewer.getTextWidget().getShell(), "Go To Line", "Exceptions occurred attempt to go to line", x);

 		}

 	}

 

@@ -88,7 +88,7 @@ public class TextViewerGotoLineAction extends TextViewerAction {
 			String title= ActionMessages.getString("TextViewerGotoLineAction.Go_to_Line_5"); //$NON-NLS-1$

 			String message= MessageFormat.format(ActionMessages.getString("TextViewerGotoLineAction.Enter_line_number__8"), new Object[] {new Integer(fLastLine)}); //$NON-NLS-1$

 			String value= Integer.toString(startLine);

-			Shell activeShell= DebugUIPlugin.getActiveWorkbenchWindow().getShell();

+			Shell activeShell= fTextViewer.getTextWidget().getShell();

 			InputDialog d= new InputDialog(activeShell, title, message, value, new NumberValidator());

 			d.open();

 

@@ -96,10 +96,10 @@ public class TextViewerGotoLineAction extends TextViewerAction {
 				int line= Integer.parseInt(d.getValue());

 				gotoLine(line - 1);

 			} catch (NumberFormatException x) {

-				DebugUIPlugin.logError(x);

+				DebugUIPlugin.errorDialog(activeShell, "Go To Line", "Exceptions occurred attempt to go to line", x);

 			}

 		} catch (BadLocationException x) {

-			DebugUIPlugin.logError(x);

+			DebugUIPlugin.errorDialog(fTextViewer.getTextWidget().getShell(), "Go To Line", "Exceptions occurred attempt to go to line", x);

 			return;

 		}

 	}

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationDialog.java
index 7cda52309..9e781f49c 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationDialog.java
@@ -347,7 +347,7 @@ public class LaunchConfigurationDialog extends TitleAreaDialog
 				setIgnoreSelectionChanges(false);

 				setLaunchConfiguration(fFirstConfig, false);

 			} catch (CoreException ce) {

-				DebugUIPlugin.logError(ce);

+				DebugUIPlugin.log(ce.getStatus());

 			}

 		} else if (fFirstConfig instanceof ILaunchConfiguration) {

 			selection = new StructuredSelection(fFirstConfig);			

@@ -507,7 +507,7 @@ public class LaunchConfigurationDialog extends TitleAreaDialog
 		try {

 			workingCopy = configType.newInstance(null, DEFAULT_NEW_CONFIG_NAME);

 		} catch (CoreException ce) {

-			DebugUIPlugin.logError(ce);

+			DebugUIPlugin.log(ce.getStatus());

 			return null;

 		}

 

@@ -528,7 +528,7 @@ public class LaunchConfigurationDialog extends TitleAreaDialog
 	 		}

 	 		config = workingCopy.doSave();

 		} catch (CoreException e) {

-			DebugUIPlugin.logError(e);

+			DebugUIPlugin.log(e.getStatus());

 			return null;

 		}

 		

@@ -905,7 +905,6 @@ public class LaunchConfigurationDialog extends TitleAreaDialog
 					return filteredConfigs.toArray();

 				} catch (CoreException e) {

 					DebugUIPlugin.errorDialog(getShell(), "Error", "An exception occurred while retrieving launch configurations.", e.getStatus());

-					DebugUIPlugin.logError(e);

 				}

 			} else {

 				return getLaunchManager().getLaunchConfigurationTypes();

@@ -925,7 +924,6 @@ public class LaunchConfigurationDialog extends TitleAreaDialog
 					return ((ILaunchConfiguration)element).getType();

 				} catch (CoreException e) {

 					DebugUIPlugin.errorDialog(getShell(), "Error", "An exception occurred while retrieving launch configurations.", e.getStatus());

-					DebugUIPlugin.logError(e);

 				}

 			} else if (element instanceof ILaunchConfigurationType) {

 				return ResourcesPlugin.getWorkspace().getRoot();

@@ -1202,7 +1200,6 @@ public class LaunchConfigurationDialog extends TitleAreaDialog
 	 		

 		} catch (CoreException ce) {

  			DebugUIPlugin.errorDialog(getShell(), "Error", "Exception occurred setting launch configuration", ce.getStatus());

- 			DebugUIPlugin.logError(ce);

  			clearLaunchConfiguration();

  			return;					

 		}

@@ -1240,7 +1237,6 @@ public class LaunchConfigurationDialog extends TitleAreaDialog
  		try {

 	 		group = createGroup(configType);

  		} catch (CoreException ce) {

- 			DebugUIPlugin.logError(ce);

  			DebugUIPlugin.errorDialog(getShell(), "Error", "Exception occurred creating launch configuration tabs.",ce.getStatus());

  			return;

  		}

@@ -1422,7 +1418,7 @@ public class LaunchConfigurationDialog extends TitleAreaDialog
 			fUnderlyingConfig = configuration;

 			setSelectedTreeObject(configuration);

 		} catch (CoreException e) {

-			DebugUIPlugin.logError(e);

+			DebugUIPlugin.log(e.getStatus());

 		}

 		getTreeViewer().refresh();	

 		getTreeViewer().setSelection(new StructuredSelection(configuration));

@@ -1543,7 +1539,6 @@ public class LaunchConfigurationDialog extends TitleAreaDialog
 			setLaunchConfiguration(wc, true);

 			doSave();

 		} catch (CoreException ce) {

-			DebugUIPlugin.logError(ce);

 			DebugUIPlugin.errorDialog(getShell(), "Error", "Exception creating new launch configuration.", ce.getStatus());

  			clearLaunchConfiguration();

  			return;			

@@ -1563,7 +1558,7 @@ public class LaunchConfigurationDialog extends TitleAreaDialog
 				try {

 					((ILaunchConfiguration)selectedElement).delete();

 				} catch (CoreException ce) {

-					DebugUIPlugin.logError(ce);				

+					DebugUIPlugin.log(ce.getStatus());				

 				}

 			}

 		}

@@ -1582,7 +1577,7 @@ public class LaunchConfigurationDialog extends TitleAreaDialog
 				setLaunchConfiguration(newWorkingCopy, false);

 				doSave();

 			} catch (CoreException ce) {

-				DebugUIPlugin.logError(ce);			

+				DebugUIPlugin.log(ce.getStatus());			

 			}			

 		}

 	}	

@@ -1626,10 +1621,8 @@ public class LaunchConfigurationDialog extends TitleAreaDialog
 			// trim name

 			Text widget = getNameTextWidget();

 			widget.setText(widget.getText().trim());

-			

 			doSave();

 		} catch (CoreException e) {

-			DebugUIPlugin.logError(e);

 			DebugUIPlugin.errorDialog(getShell(), "Launch Configuration Error", "Exception occurred while saving launch configuration.", e.getStatus());

 			return;

 		}

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationHistoryElement.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationHistoryElement.java
index 44e0bcc69..e70af5909 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationHistoryElement.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationHistoryElement.java
@@ -6,11 +6,11 @@ package org.eclipse.debug.internal.ui.launchConfigurations;
  */

  

 import org.eclipse.core.runtime.CoreException;

-import org.eclipse.debug.internal.ui.DebugUIPlugin;

 import org.eclipse.debug.core.DebugPlugin;

 import org.eclipse.debug.core.ILaunchConfiguration;

 import org.eclipse.debug.core.ILaunchManager;

 import org.eclipse.debug.core.ILauncher;

+import org.eclipse.debug.internal.ui.DebugUIPlugin;

 import org.eclipse.debug.ui.IDebugUIConstants;

 

 /********************************************************************************

@@ -158,7 +158,7 @@ public class LaunchConfigurationHistoryElement {
 					return getLaunchConfiguration().getAttribute(IDebugUIConstants.ATTR_RUN_FAVORITE, false);

 				}

 			} catch (CoreException e) {

-				DebugUIPlugin.logError(e);

+				DebugUIPlugin.log(e.getStatus());

 			}

 		}

 		return false;

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPresentationManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPresentationManager.java
index 78d6b1778..1f2f9e303 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPresentationManager.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPresentationManager.java
@@ -10,6 +10,7 @@ import java.util.ArrayList;
 import java.util.Hashtable;

 import java.util.Iterator;

 import java.util.List;

+

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.core.runtime.IConfigurationElement;

 import org.eclipse.core.runtime.IExtension;

@@ -20,9 +21,7 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.debug.core.DebugPlugin;

 import org.eclipse.debug.core.ILaunchConfigurationType;

 import org.eclipse.debug.internal.ui.DebugUIPlugin;

-import org.eclipse.debug.ui.DebugUITools;

 import org.eclipse.debug.ui.IDebugUIConstants;

-import org.eclipse.debug.ui.ILaunchConfigurationTab;

 import org.eclipse.debug.ui.ILaunchConfigurationTabGroup;

 

 /**

@@ -142,7 +141,7 @@ public class LaunchConfigurationPresentationManager {
 					IExtension ext = tabs[i].getDeclaringExtension();

 					IStatus status = new Status(IStatus.ERROR, IDebugUIConstants.PLUGIN_ID, IDebugUIConstants.STATUS_INVALID_EXTENSION_DEFINITION,

 					 MessageFormat.format("Launch configuration tab extension {0} refers to non-existant launch configuration type {1}", (new String[] {ext.getUniqueIdentifier(), typeId})), null);

-					DebugUIPlugin.logError(new CoreException(status));

+					DebugUIPlugin.log(status);

 				}

 			}

 			if (typeId != null) {

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchHistoryPreferencePage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchHistoryPreferencePage.java
index 195edcace..ba853c4cd 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchHistoryPreferencePage.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchHistoryPreferencePage.java
@@ -20,23 +20,13 @@ import org.eclipse.debug.internal.ui.DebugUIPlugin;
 import org.eclipse.debug.ui.DebugUITools;
 import org.eclipse.debug.ui.IDebugUIConstants;
 import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.TabFolder;
 import org.eclipse.swt.widgets.TabItem;
-import org.eclipse.swt.widgets.Table;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
 
@@ -200,7 +190,7 @@ public class LaunchHistoryPreferencePage
 				wc.doSave();
 			}				
 		} catch (CoreException e) {
-			DebugUIPlugin.logError(e);
+			DebugUIPlugin.log(e.getStatus());
 		}
 	}
 	
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/PerspectiveManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/PerspectiveManager.java
index e325277e7..4704e20d3 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/PerspectiveManager.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/PerspectiveManager.java
@@ -7,7 +7,6 @@ package org.eclipse.debug.internal.ui.launchConfigurations;
 

 import java.text.MessageFormat;

 

-import org.eclipse.core.resources.ResourcesPlugin;

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.core.runtime.IStatus;

 import org.eclipse.debug.core.DebugEvent;

@@ -115,7 +114,6 @@ public class PerspectiveManager implements ILaunchListener, IDebugEventListener
 			try {

 				perspectiveId = getPerspectiveId(launch);

 			} catch (CoreException e) {

-				DebugUIPlugin.log(e.getStatus());

 				String name = DebugUIPlugin.getDefault().getModelPresentation().getText(launch);

 				switchFailed(e.getStatus(), name);

 			}

@@ -139,7 +137,6 @@ public class PerspectiveManager implements ILaunchListener, IDebugEventListener
 					try {

 						window.getWorkbench().showPerspective(id, window);

 					} catch (WorkbenchException e) {

-						DebugUIPlugin.logError(e);

 						DebugUIPlugin.errorDialog(DebugUIPlugin.getShell(),

 						"Error", 

 						MessageFormat.format("Unable to switch to perspective: {0}", new String[]{id}),

@@ -211,12 +208,11 @@ public class PerspectiveManager implements ILaunchListener, IDebugEventListener
 			try {

 				perspectiveId = getPerspectiveId(launch);

 			} catch (CoreException e) {

-				DebugUIPlugin.logError(e);

+				DebugUIPlugin.log(e.getStatus());

 			}

 			// if no perspective specified, always switch to debug

-			// perspective (unless the current perspective has a 

-			// debug view open)

-			

+			// perspective 

+

 			// this has to be done in an asynch, such that the workbench

 			// window can be accessed

 			final String id = perspectiveId;

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/BreakpointsView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/BreakpointsView.java
index 7f281d9fa..2870136f2 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/BreakpointsView.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/BreakpointsView.java
@@ -82,12 +82,12 @@ public class BreakpointsView extends AbstractDebugView {
 			try {

 				type1= b1.getMarker().getType();

 			} catch (CoreException ce) {

-				DebugUIPlugin.logError(ce);

+				DebugUIPlugin.log(ce.getStatus());

 			}

 			try {

 				type2= b2.getMarker().getType();	

 			} catch (CoreException e) {

-				DebugUIPlugin.logError(e);

+				DebugUIPlugin.log(e.getStatus());

 			}

 		

 			result= type1.compareTo(type2);

@@ -104,7 +104,7 @@ public class BreakpointsView extends AbstractDebugView {
 			try {

 				lineBreakpoint= b1.getMarker().isSubtypeOf(IBreakpoint.LINE_BREAKPOINT_MARKER);

 			} catch (CoreException ce) {

-				DebugUIPlugin.logError(ce);

+				DebugUIPlugin.log(ce.getStatus());

 			}

 			if (lineBreakpoint) {

 				return compareLineBreakpoints(b1, b2, name1,name2);

@@ -125,12 +125,12 @@ public class BreakpointsView extends AbstractDebugView {
 						try {

 							l1= ((ILineBreakpoint)b1).getLineNumber();	

 						} catch (CoreException e) {

-							DebugUIPlugin.logError(e);

+							DebugUIPlugin.log(e.getStatus());

 						}

 						try {

 							l2= ((ILineBreakpoint)b2).getLineNumber();	

 						} catch (CoreException e) {

-							DebugUIPlugin.logError(e);

+							DebugUIPlugin.log(e.getStatus());

 						}

 						return l1 - l2;

 					}

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ConsoleDocument.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ConsoleDocument.java
index ff0292497..dd9724644 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ConsoleDocument.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ConsoleDocument.java
@@ -110,7 +110,7 @@ public class ConsoleDocument extends AbstractDocument implements IDebugEventList
 					return;

 				} catch (IOException ioe) {

 					if (!isClosed()) {

-						DebugUIPlugin.logError(ioe);

+						DebugUIPlugin.log(ioe);

 					}

 				}

 			}

@@ -149,7 +149,7 @@ public class ConsoleDocument extends AbstractDocument implements IDebugEventList
 		try {		

 			super.replace(pos, replaceLength, text);

 		} catch (BadLocationException ble) {

-			DebugUIPlugin.logError(ble);

+			DebugUIPlugin.log(ble);

 		}

 	}

 

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ExpressionViewContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ExpressionViewContentProvider.java
index 424ea535d..404f7ee0f 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ExpressionViewContentProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ExpressionViewContentProvider.java
@@ -41,7 +41,7 @@ public class ExpressionViewContentProvider extends VariablesViewContentProvider
 				return children;

 			}

 		} catch (DebugException e) {

-			DebugUIPlugin.logError(e);

+			DebugUIPlugin.log(e.getStatus());

 		}

 		return new Object[0];

 	}

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/LaunchView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/LaunchView.java
index ac55fdc7f..5c6af909f 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/LaunchView.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/LaunchView.java
@@ -100,7 +100,7 @@ public class LaunchView extends AbstractDebugEventHandlerView implements ISelect
 		try {

 			fInstructionPointer = ResourcesPlugin.getWorkspace().getRoot().createMarker(IInternalDebugUIConstants.INSTRUCTION_POINTER);

 		} catch (CoreException e) {

-			DebugUIPlugin.logError(e);

+			DebugUIPlugin.log(e.getStatus());

 		}

 	}

 	

@@ -190,7 +190,7 @@ public class LaunchView extends AbstractDebugEventHandlerView implements ISelect
 					}

 				}

 			} catch (DebugException e) {

-				DebugUIPlugin.logError(e);

+				DebugUIPlugin.log(e.getStatus());

 			}

 		}

 		return null;

@@ -364,21 +364,21 @@ public class LaunchView extends AbstractDebugEventHandlerView implements ISelect
 		

 		IWorkspace workspace= ResourcesPlugin.getWorkspace();

 		IWorkspaceRunnable runnable= new IWorkspaceRunnable() {

-				public void run(IProgressMonitor monitor) throws CoreException {

-					if (lineNumber == -1) {

-						fInstructionPointer.setAttributes(fgStartEnd, 

-							new Object[] {new Integer(charStart), new Integer(charEnd)});

-					} else {

-						fInstructionPointer.setAttributes(fgLineStartEnd, 

-							new Object[] {new Integer(lineNumber), new Integer(charStart), new Integer(charEnd)});

-					}

+			public void run(IProgressMonitor monitor) throws CoreException {

+				if (lineNumber == -1) {

+					fInstructionPointer.setAttributes(fgStartEnd, 

+						new Object[] {new Integer(charStart), new Integer(charEnd)});

+				} else {

+					fInstructionPointer.setAttributes(fgLineStartEnd, 

+						new Object[] {new Integer(lineNumber), new Integer(charStart), new Integer(charEnd)});

 				}

-			};

+			}

+		};

 		

 		try {

 			workspace.run(runnable, null);

 		} catch (CoreException ce) {

-			DebugUIPlugin.logError(ce);

+			DebugUIPlugin.log(ce.getStatus());

 		}

 		

 		return fInstructionPointer;

@@ -421,7 +421,7 @@ public class LaunchView extends AbstractDebugEventHandlerView implements ISelect
 						start= stackFrame.getCharStart();

 						end= stackFrame.getCharEnd();

 					} catch (DebugException de) {

-						DebugUIPlugin.logError(de);

+						DebugUIPlugin.log(de.getStatus());

 					}

 					openEditorAndSetMarker(getEditorInput(), getEditorId(), lineNumber, start, end);

 				}

@@ -497,7 +497,6 @@ public class LaunchView extends AbstractDebugEventHandlerView implements ISelect
 				DebugUIViewsMessages.getString("LaunchView.Error_1"),  //$NON-NLS-1$

 				DebugUIViewsMessages.getString("LaunchView.Exception_occurred_opening_editor_for_debugger._2"),  //$NON-NLS-1$

 				e.getStatus());

-			DebugUIPlugin.logError(e);

 		}		

 		

 		if (editor != null && (lineNumber >= 0 || charStart >= 0)) {

@@ -626,7 +625,7 @@ public class LaunchView extends AbstractDebugEventHandlerView implements ISelect
 					try {

 						children= dt.getThreads();

 					} catch (DebugException de) {

-						DebugUIPlugin.logError(de);

+						DebugUIPlugin.log(de.getStatus());

 					}

 				}

 		}

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/LaunchViewContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/LaunchViewContentProvider.java
index e3812ebaf..a0424d6be 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/LaunchViewContentProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/LaunchViewContentProvider.java
@@ -35,7 +35,7 @@ public class LaunchViewContentProvider implements ITreeContentProvider {
 				return ((IThread)parent).getStackFrames();

 			}			

 		} catch (DebugException e) {

-			DebugUIPlugin.logError(e);

+			DebugUIPlugin.log(e.getStatus());

 		}

 		if (parent instanceof ILaunch) {

 			return ((ILaunch)parent).getChildren();

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/LaunchViewEventHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/LaunchViewEventHandler.java
index a1ff0a4b7..0b513863a 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/LaunchViewEventHandler.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/LaunchViewEventHandler.java
@@ -145,7 +145,7 @@ public class LaunchViewEventHandler extends AbstractDebugEventHandler implements
 		try {

 			stackFrames = thread.getStackFrames();

 		} catch (DebugException de) {

-			DebugUIPlugin.logError(de);

+			DebugUIPlugin.log(de.getStatus());

 			return;

 		}

 		

@@ -214,7 +214,7 @@ public class LaunchViewEventHandler extends AbstractDebugEventHandler implements
 								}

 							}						

 						} catch (DebugException de) {

-							DebugUIPlugin.logError(de);

+							DebugUIPlugin.log(de.getStatus());

 						}

 						

 						getLaunchView().autoExpand(target.getLaunch(), false, true);

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/VariablesView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/VariablesView.java
index af908622d..1496ad0e5 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/VariablesView.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/VariablesView.java
@@ -246,7 +246,6 @@ public class VariablesView extends AbstractDebugEventHandlerView implements ISel
 			try {

 				svc = mp.newDetailsViewerConfiguration();

 			} catch (CoreException e) {

-				DebugUIPlugin.logError(e);

 				DebugUIPlugin.errorDialog(getSite().getShell(), DebugUIViewsMessages.getString("VariablesView.Error_1"), DebugUIViewsMessages.getString("VariablesView.Unable_to_configure_variable_details_area._2"), e.getStatus()); //$NON-NLS-1$ //$NON-NLS-2$

 			}

 		}

@@ -604,7 +603,8 @@ public class VariablesView extends AbstractDebugEventHandlerView implements ISel
 				getDetailDocument().set(""); //$NON-NLS-1$

 			}

 		} catch (DebugException de) {

-			DebugUIPlugin.logError(de);

+			DebugUIPlugin.log(de.getStatus());

+			getDetailDocument().set("<error occurred retrieving value>");

 		}				

 	}

 	

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/VariablesViewContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/VariablesViewContentProvider.java
index e2c3cb02a..eae662214 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/VariablesViewContentProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/VariablesViewContentProvider.java
@@ -64,7 +64,7 @@ public class VariablesViewContentProvider implements ITreeContentProvider {
 			if (getExceptionHandler() != null) {

 				getExceptionHandler().handleException(e);

 			} else {

-				DebugUIPlugin.logError(e);

+				DebugUIPlugin.log(e);

 			}

 		}

 		return new Object[0];

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/VariablesViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/VariablesViewer.java
index c7dfeb97b..257272a7e 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/VariablesViewer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/VariablesViewer.java
@@ -191,7 +191,7 @@ public class VariablesViewer extends TreeViewer {
 							treeItem.setImage(getDisabledImage(image));

 						}

 					} catch (DebugException e) {

-						DebugUIPlugin.logError(e);

+						DebugUIPlugin.log(e.getStatus());

 					}

 				}

 			}