[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
[cdt-patch] Applied: CDT_1_1 Debug fixes NPE, PR 36909, and shortcuts
|
Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.ui/ChangeLog,v
retrieving revision 1.135
diff -u -r1.135 ChangeLog
--- ChangeLog 23 Apr 2003 18:01:38 -0000 1.135
+++ ChangeLog 29 Apr 2003 20:42:27 -0000
@@ -1,3 +1,36 @@
+2003-04-29 Alain Magloire
+
+ * src/org/eclipse/cdt/debug/internal/ui/editor/CDebugDocumentProvider.java (doSetInput):
+ Disconnect the old input from the working manager.
+
+2003-04-27 Alain Magloire
+
+ Bug PR 36759, the outliner was not updated, when using
+ the CDebugEditor.
+
+ * src/org/eclipse/cdt/debug/internal/ui/editor/CDebugDocumentProvider.java (getBufferFactory):
+ New method overload getBufferFactory() to return the factory of
+ CUIPlugin.getDefault().getDocumentProvider().getBufferFactory().
+
+2003-04-25 Mikhail Khodjaiants
+ Fix for bug 36909.
+ * NoSymbolOrSourceElement.java: new file.
+ * CDTDebugModelPresentation.java
+ * CUISourceLocator.java
+
+2003-04-24 Mikhail Khodjaiants
+ Display error messages in the 'Registers' view.
+ * RegistersView.java
+
+2003-04-24 Mikhail Khodjaiants
+ Added shortcuts for the C/C++ Debug specific views.
+ * plugin.xml
+
+2003-04-24 Mikhail Khodjaiants
+ Update the actions of the 'Shared Libraries' view even if the viewer's input
+ is the same as before.
+ * SharedLibrariesView.java
+
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.
Index: plugin.xml
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.ui/plugin.xml,v
retrieving revision 1.64
diff -u -r1.64 plugin.xml
--- plugin.xml 23 Apr 2003 15:03:25 -0000 1.64
+++ plugin.xml 29 Apr 2003 20:42:27 -0000
@@ -72,21 +72,33 @@
relationship="stack"
id="org.eclipse.cdt.debug.ui.RegistersView">
</view>
+ <viewShortcut
+ id="org.eclipse.cdt.debug.ui.RegistersView">
+ </viewShortcut>
<view
relative="org.eclipse.debug.ui.VariableView"
relationship="stack"
id="org.eclipse.cdt.debug.ui.MemoryView">
</view>
+ <viewShortcut
+ id="org.eclipse.cdt.debug.ui.MemoryView">
+ </viewShortcut>
<view
relative="org.eclipse.debug.ui.VariableView"
relationship="stack"
id="org.eclipse.cdt.debug.ui.SharedLibrariesView">
</view>
+ <viewShortcut
+ id="org.eclipse.cdt.debug.ui.SharedLibrariesView">
+ </viewShortcut>
<view
relative="org.eclipse.debug.ui.VariableView"
relationship="stack"
id="org.eclipse.cdt.debug.ui.SignalsView">
</view>
+ <viewShortcut
+ id="org.eclipse.cdt.debug.ui.SignalsView">
+ </viewShortcut>
<actionSet
id="org.eclipse.cdt.debug.ui.debugActionSet">
</actionSet>
Index: src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java,v
retrieving revision 1.50
diff -u -r1.50 CDTDebugModelPresentation.java
--- src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java 21 Apr 2003 14:36:25 -0000 1.50
+++ src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java 29 Apr 2003 20:42:28 -0000
@@ -457,17 +457,22 @@
{
String label = new String();
label += info.getLevel() + " ";
- if ( info.getFunction() != null )
- label += info.getFunction() + "() ";
-
- if ( info.getFile() != null )
+ if ( info.getFunction() != null && info.getFunction().trim().length() > 0 )
{
- IPath path = new Path( info.getFile() );
- if ( !path.isEmpty() )
- label += "at " + ( qualified ? path.toOSString() : path.lastSegment() ) + ":";
+ label += info.getFunction() + "() ";
+ if ( info.getFile() != null )
+ {
+ IPath path = new Path( info.getFile() );
+ if ( !path.isEmpty() )
+ {
+ label += "at " + ( qualified ? path.toOSString() : path.lastSegment() ) + ":";
+ if ( info.getFrameLineNumber() != 0 )
+ label += info.getFrameLineNumber();
+ }
+ }
}
- if ( info.getFrameLineNumber() != 0 )
- label += info.getFrameLineNumber();
+ else
+ label += "<symbol not available>";
return label;
}
IDummyStackFrame dummy = (IDummyStackFrame)stackFrame.getAdapter( IDummyStackFrame.class );
Index: src/org/eclipse/cdt/debug/internal/ui/editors/CDebugDocumentProvider.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/editors/CDebugDocumentProvider.java,v
retrieving revision 1.1
diff -u -r1.1 CDebugDocumentProvider.java
--- src/org/eclipse/cdt/debug/internal/ui/editors/CDebugDocumentProvider.java 6 Mar 2003 00:13:36 -0000 1.1
+++ src/org/eclipse/cdt/debug/internal/ui/editors/CDebugDocumentProvider.java 29 Apr 2003 20:42:28 -0000
@@ -6,6 +6,7 @@
package org.eclipse.cdt.debug.internal.ui.editors;
import org.eclipse.cdt.debug.ui.CDebugUIPlugin;
+import org.eclipse.cdt.internal.core.model.IBufferFactory;
import org.eclipse.cdt.internal.ui.editor.CDocumentProvider;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.core.resources.IStorage;
@@ -90,4 +91,18 @@
return super.createAnnotationModel( ((EditorInputDelegate)element).getDelegate() );
return super.createAnnotationModel( element );
}
+
+ /* (non-Javadoc)
+ * This hack is important for the the outliner to work correctly.
+ * The outliner looks at the working copy and it is maintain by
+ * CUIPlugin.getDefault().getWorkingCopyManager()
+ * CUIPlugin.getDefault().getDocumentProvider();
+ * They are singletons.
+ *
+ * @see org.eclipse.cdt.internal.ui.editor.CDocumentProvider#getBufferFactory()
+ */
+ public IBufferFactory getBufferFactory() {
+ return CUIPlugin.getDefault().getDocumentProvider().getBufferFactory();
+ }
+
}
Index: src/org/eclipse/cdt/debug/internal/ui/editors/CDebugEditor.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/editors/CDebugEditor.java,v
retrieving revision 1.3
diff -u -r1.3 CDebugEditor.java
--- src/org/eclipse/cdt/debug/internal/ui/editors/CDebugEditor.java 8 Apr 2003 21:06:50 -0000 1.3
+++ src/org/eclipse/cdt/debug/internal/ui/editors/CDebugEditor.java 29 Apr 2003 20:42:28 -0000
@@ -390,8 +390,18 @@
{
newInput = ((EditorInputDelegate)input).getDelegate();
}
+ IEditorInput oldInput = getEditorInput();
+ if ( oldInput instanceof EditorInputDelegate )
+ {
+ oldInput = ((EditorInputDelegate)oldInput).getDelegate();
+ }
+ if (oldInput != null)
+ {
+ CUIPlugin.getDefault().getWorkingCopyManager().disconnect(oldInput);
+ }
super.doSetInput( newInput );
- CUIPlugin.getDefault().getWorkingCopyManager().connect(input);
+ // This hack should be after the super.doSetInput();
+ CUIPlugin.getDefault().getWorkingCopyManager().connect(newInput);
}
protected void attachSourceLocation()
Index: src/org/eclipse/cdt/debug/internal/ui/editors/NoSymbolOrSourceElement.java
===================================================================
RCS file: src/org/eclipse/cdt/debug/internal/ui/editors/NoSymbolOrSourceElement.java
diff -N src/org/eclipse/cdt/debug/internal/ui/editors/NoSymbolOrSourceElement.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/cdt/debug/internal/ui/editors/NoSymbolOrSourceElement.java 29 Apr 2003 20:42:28 -0000
@@ -0,0 +1,29 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ *
+ */
+
+package org.eclipse.cdt.debug.internal.ui.editors;
+
+import org.eclipse.debug.core.model.IStackFrame;
+
+/**
+ * Enter type comment.
+ *
+ * @since Apr 25, 2003
+ */
+public class NoSymbolOrSourceElement
+{
+ private IStackFrame fStackFrame;
+
+ public NoSymbolOrSourceElement( IStackFrame frame )
+ {
+ fStackFrame = frame;
+ }
+
+ public IStackFrame getStackFrame()
+ {
+ return fStackFrame;
+ }
+}
Index: src/org/eclipse/cdt/debug/internal/ui/views/registers/RegistersView.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/registers/RegistersView.java,v
retrieving revision 1.13
diff -u -r1.13 RegistersView.java
--- src/org/eclipse/cdt/debug/internal/ui/views/registers/RegistersView.java 8 Apr 2003 18:15:28 -0000 1.13
+++ src/org/eclipse/cdt/debug/internal/ui/views/registers/RegistersView.java 29 Apr 2003 20:42:28 -0000
@@ -201,6 +201,7 @@
*/
public void handleException( DebugException e )
{
+ showMessage( e.getMessage() );
}
/**
Index: src/org/eclipse/cdt/debug/internal/ui/views/sharedlibs/SharedLibrariesView.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/sharedlibs/SharedLibrariesView.java,v
retrieving revision 1.9
diff -u -r1.9 SharedLibrariesView.java
--- src/org/eclipse/cdt/debug/internal/ui/views/sharedlibs/SharedLibrariesView.java 1 Apr 2003 22:29:16 -0000 1.9
+++ src/org/eclipse/cdt/debug/internal/ui/views/sharedlibs/SharedLibrariesView.java 29 Apr 2003 20:42:28 -0000
@@ -254,6 +254,7 @@
Object current = getViewer().getInput();
if ( current != null && current.equals( slm ) )
{
+ updateObjects();
return;
}
showViewer();
Index: src/org/eclipse/cdt/debug/ui/sourcelookup/CUISourceLocator.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/CUISourceLocator.java,v
retrieving revision 1.8
diff -u -r1.8 CUISourceLocator.java
--- src/org/eclipse/cdt/debug/ui/sourcelookup/CUISourceLocator.java 1 Apr 2003 16:50:35 -0000 1.8
+++ src/org/eclipse/cdt/debug/ui/sourcelookup/CUISourceLocator.java 29 Apr 2003 20:42:28 -0000
@@ -11,6 +11,7 @@
import org.eclipse.cdt.debug.internal.core.sourcelookup.CSourceLocator;
import org.eclipse.cdt.debug.internal.core.sourcelookup.CSourceManager;
import org.eclipse.cdt.debug.internal.ui.editors.FileNotFoundElement;
+import org.eclipse.cdt.debug.internal.ui.editors.NoSymbolOrSourceElement;
import org.eclipse.cdt.debug.internal.ui.wizards.AddDirectorySourceLocationWizard;
import org.eclipse.cdt.debug.internal.ui.wizards.AddSourceLocationWizard;
import org.eclipse.cdt.debug.ui.CDebugUIPlugin;
@@ -76,6 +77,10 @@
if ( frameInfo != null && frameInfo.getFile() != null && frameInfo.getFile().length() > 0 )
{
res = new FileNotFoundElement( stackFrame );
+ }
+ else // don't show in editor
+ {
+ res = new NoSymbolOrSourceElement( stackFrame );
}
}
return res;
