mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-10 17:55:39 +02:00
Code Issues Wiki Activity

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2010-12-04 00:57:04 +00:00
parent 793940eb5e
commit 0391ede740
2 changed files with 27 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CDirectorySourceContainerType.java
View file

@ -50,7 +50,7 @@ public class CDirectorySourceContainerType extends AbstractSourceContainerTypeDe
* @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerType#getMemento(org.eclipse.debug.internal.core.sourcelookup.ISourceContainer) * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerType#getMemento(org.eclipse.debug.internal.core.sourcelookup.ISourceContainer)
*/ */
public String getMemento(ISourceContainer container) throws CoreException { public String getMemento(ISourceContainer container) throws CoreException {
DirectorySourceContainer folder = (DirectorySourceContainer)container; DirectorySourceContainer folder = (DirectorySourceContainer) container;
Document document = newDocument(); Document document = newDocument();
Element element = document.createElement("directory"); //$NON-NLS-1$ Element element = document.createElement("directory"); //$NON-NLS-1$
element.setAttribute("path", folder.getDirectory().getAbsolutePath()); //$NON-NLS-1$ element.setAttribute("path", folder.getDirectory().getAbsolutePath()); //$NON-NLS-1$

54
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceLookupParticipant.java
View file

@ -7,10 +7,10 @@
* *
* Contributors: * Contributors:
* QNX Software Systems - Initial API and implementation * QNX Software Systems - Initial API and implementation
* Ken Ryall (Nokia) - Added support for AbsoluteSourceContainer( 159833 ) * Ken Ryall (Nokia) - Added support for AbsoluteSourceContainer(159833)
* Ken Ryall (Nokia) - Added support for CSourceNotFoundElement ( 167305 ) * Ken Ryall (Nokia) - Added support for CSourceNotFoundElement (167305)
* Ken Ryall (Nokia) - Option to open disassembly view when no source ( 81353 ) * Ken Ryall (Nokia) - Option to open disassembly view when no source (81353)
* James Blackburn (Broadcom Corp.) - Linked Resources / Nested Projects ( 247948 ) * James Blackburn (Broadcom Corp.) - Linked Resources / Nested Projects (247948)
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.debug.internal.core.sourcelookup; package org.eclipse.cdt.debug.internal.core.sourcelookup;
@ -53,21 +53,21 @@ public class CSourceLookupParticipant extends AbstractSourceLookupParticipant {
*/ */
public CSourceLookupParticipant() { public CSourceLookupParticipant() {
super(); super();
fListeners = new ListenerList( 1 ); fListeners = new ListenerList(1);
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.sourcelookup.ISourceLookupParticipant#getSourceName(java.lang.Object) * @see org.eclipse.debug.core.sourcelookup.ISourceLookupParticipant#getSourceName(java.lang.Object)
*/ */
public String getSourceName( Object object ) throws CoreException { public String getSourceName(Object object) throws CoreException {
if ( object instanceof String ) { if (object instanceof String) {
return (String)object; return (String)object;
} }
if ( object instanceof IAdaptable ) { if (object instanceof IAdaptable) {
ICStackFrame frame = (ICStackFrame)((IAdaptable)object).getAdapter( ICStackFrame.class ); ICStackFrame frame = (ICStackFrame)((IAdaptable)object).getAdapter(ICStackFrame.class);
if ( frame != null ) { if (frame != null) {
String name = frame.getFile(); String name = frame.getFile();
return ( name != null && name.trim().length() > 0 ) ? name : null; return (name != null && name.trim().length() > 0) ? name : null;
} }
} }
return null; return null;
@ -77,8 +77,7 @@ public class CSourceLookupParticipant extends AbstractSourceLookupParticipant {
* @see org.eclipse.debug.core.sourcelookup.AbstractSourceLookupParticipant#findSourceElements(java.lang.Object) * @see org.eclipse.debug.core.sourcelookup.AbstractSourceLookupParticipant#findSourceElements(java.lang.Object)
*/ */
@Override @Override
public Object[] findSourceElements( Object object ) throws CoreException { public Object[] findSourceElements(Object object) throws CoreException {
// Check the cache // Check the cache
Object[] results = fCachedResults.get(object); Object[] results = fCachedResults.get(object);
if (results != null) if (results != null)
@ -87,11 +86,11 @@ public class CSourceLookupParticipant extends AbstractSourceLookupParticipant {
// Workaround for cases when the stack frame doesn't contain the source file name // Workaround for cases when the stack frame doesn't contain the source file name
String name = null; String name = null;
IBreakpoint breakpoint = null; IBreakpoint breakpoint = null;
if ( object instanceof IAdaptable ) { if (object instanceof IAdaptable) {
ICStackFrame frame = (ICStackFrame)((IAdaptable)object).getAdapter( ICStackFrame.class ); ICStackFrame frame = (ICStackFrame)((IAdaptable)object).getAdapter(ICStackFrame.class);
if ( frame != null ) { if (frame != null) {
name = frame.getFile().trim(); name = frame.getFile().trim();
if ( name == null || name.length() == 0 ) if (name == null || name.length() == 0)
{ {
if (object instanceof IDebugElement) if (object instanceof IDebugElement)
results = new Object[] { new CSourceNotFoundElement((IDebugElement) object, ((IDebugElement) object).getLaunch().getLaunchConfiguration(), name) }; results = new Object[] { new CSourceNotFoundElement((IDebugElement) object, ((IDebugElement) object).getLaunch().getLaunchConfiguration(), name) };
@ -102,7 +101,7 @@ public class CSourceLookupParticipant extends AbstractSourceLookupParticipant {
} }
} }
// See if findSourceElements(...) is the result of a Breakpoint Hit Event // See if findSourceElements(...) is the result of a Breakpoint Hit Event
ICDebugTarget target = (ICDebugTarget)((IAdaptable)object).getAdapter( ICDebugTarget.class ); ICDebugTarget target = (ICDebugTarget)((IAdaptable)object).getAdapter(ICDebugTarget.class);
if (target != null) { if (target != null) {
CBreakpointManager bmanager = (CBreakpointManager)target.getAdapter(CBreakpointManager.class); CBreakpointManager bmanager = (CBreakpointManager)target.getAdapter(CBreakpointManager.class);
Object stateInfo = target.getCurrentStateInfo(); Object stateInfo = target.getCurrentStateInfo();
@ -110,7 +109,7 @@ public class CSourceLookupParticipant extends AbstractSourceLookupParticipant {
breakpoint = bmanager.getBreakpoint(((ICDIBreakpointHit)stateInfo).getBreakpoint()); breakpoint = bmanager.getBreakpoint(((ICDIBreakpointHit)stateInfo).getBreakpoint());
} }
} }
} else if ( object instanceof String ) { } else if (object instanceof String) {
name = (String)object; name = (String)object;
} }
@ -154,26 +153,25 @@ public class CSourceLookupParticipant extends AbstractSourceLookupParticipant {
super.dispose(); super.dispose();
} }
public void addSourceLookupChangeListener( ISourceLookupChangeListener listener ) { public void addSourceLookupChangeListener(ISourceLookupChangeListener listener) {
fListeners.add( listener ); fListeners.add(listener);
} }
public void removeSourceLookupChangeListener( ISourceLookupChangeListener listener ) { public void removeSourceLookupChangeListener(ISourceLookupChangeListener listener) {
fListeners.remove( listener ); fListeners.remove(listener);
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.sourcelookup.AbstractSourceLookupParticipant#sourceContainersChanged(org.eclipse.debug.core.sourcelookup.ISourceLookupDirector) * @see org.eclipse.debug.core.sourcelookup.AbstractSourceLookupParticipant#sourceContainersChanged(org.eclipse.debug.core.sourcelookup.ISourceLookupDirector)
*/ */
@Override @Override
public void sourceContainersChanged( ISourceLookupDirector director ) { public void sourceContainersChanged(ISourceLookupDirector director) {
// clear the cache // clear the cache
fCachedResults.clear(); fCachedResults.clear();
Object[] listeners = fListeners.getListeners(); Object[] listeners = fListeners.getListeners();
for ( int i = 0; i < listeners.length; ++i ) for (int i = 0; i < listeners.length; ++i)
((ISourceLookupChangeListener)listeners[i]).sourceContainersChanged( director ); ((ISourceLookupChangeListener)listeners[i]).sourceContainersChanged(director);
super.sourceContainersChanged( director ); super.sourceContainersChanged(director);
} }
} }