diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog index e46091863cc..e0351adf869 100644 --- a/debug/org.eclipse.cdt.debug.ui/ChangeLog +++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog @@ -1,3 +1,10 @@ +2003-04-23 Mikhail Khodjaiants + If error occurs when acquiring the signal information from gdb + the error message should be displayed in the 'Signals' view. + * SignalsView.java + * SignalsViewer.java + * SignalsViewEventHandler.java + 2003-04-21 Mikhail Khodjaiants Fix for bug 36682. * CDTDebugModelPresentation.java diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/signals/SignalsView.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/signals/SignalsView.java index 45b28246db2..182c6411ecd 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/signals/SignalsView.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/signals/SignalsView.java @@ -19,7 +19,6 @@ import org.eclipse.debug.ui.IDebugUIConstants; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.IToolBarManager; import org.eclipse.jface.action.Separator; -import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.jface.viewers.IContentProvider; @@ -96,7 +95,7 @@ public class SignalsView extends AbstractDebugEventHandlerView // add tree viewer final SignalsViewer vv = new SignalsViewer( parent, SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL ); - vv.setContentProvider( new SignalsViewContentProvider() ); + vv.setContentProvider( createContentProvider() ); vv.setLabelProvider( new SignalsViewLabelProvider() ); vv.setUseHashlookup( true ); vv.setExceptionHandler( this ); @@ -163,7 +162,7 @@ public class SignalsView extends AbstractDebugEventHandlerView */ public void handleException( DebugException e ) { - ErrorDialog.openError( getSite().getShell(), "Error", e.getMessage(), null ); + showMessage( e.getMessage() ); } protected void setViewerInput( IStructuredSelection ssel ) diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/signals/SignalsViewEventHandler.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/signals/SignalsViewEventHandler.java index 4edb068e3ee..bd8b092eea0 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/signals/SignalsViewEventHandler.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/signals/SignalsViewEventHandler.java @@ -43,6 +43,9 @@ public class SignalsViewEventHandler extends AbstractDebugEventHandler event.getSource() instanceof ICSignal ) refresh(); break; + case DebugEvent.SUSPEND : + refresh(); + break; case DebugEvent.CHANGE : if ( event.getSource() instanceof ICSignal ) refresh( event.getSource() ); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/signals/SignalsViewer.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/signals/SignalsViewer.java index 11f5bc7ec29..530a43a5ffe 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/signals/SignalsViewer.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/signals/SignalsViewer.java @@ -17,6 +17,7 @@ import org.eclipse.jface.viewers.TableViewer; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; @@ -130,8 +131,7 @@ public class SignalsViewer extends TableViewer } catch( DebugException e ) { - if ( getExceptionHandler() != null ) - getExceptionHandler().handleException( e ); + Display.getCurrent().beep(); } } }