mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-04 06:45:43 +02:00
Code Issues Wiki Activity

Fixed compiler warnings.

Browse source
This commit is contained in:
Sergey Prigogin 2010-12-06 20:21:54 +00:00
parent 14d28761a1
commit 95ba23d13a
1 changed files with 43 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

102
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceManager.java
View file

@ -6,7 +6,7 @@
* http://www.eclipse.org/legal/epl-v10.html * http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* QNX Software Systems - Initial API and implementation * QNX Software Systems - Initial API and implementation
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.debug.internal.core.sourcelookup; package org.eclipse.cdt.debug.internal.core.sourcelookup;
@ -31,18 +31,15 @@ import org.eclipse.debug.core.model.IStackFrame;
* Locates sources for a C/C++ debug session. * Locates sources for a C/C++ debug session.
*/ */
public class CSourceManager implements ICSourceLocator, IPersistableSourceLocator, IAdaptable { public class CSourceManager implements ICSourceLocator, IPersistableSourceLocator, IAdaptable {
private ISourceLocator fSourceLocator = null; private ISourceLocator fSourceLocator = null;
private ILaunch fLaunch = null; private ILaunch fLaunch = null;
private CDebugTarget fDebugTarget = null; private CDebugTarget fDebugTarget = null;
/** /**
* Constructor for CSourceManager. * Constructor for CSourceManager.
*/ */
public CSourceManager( ISourceLocator sourceLocator ) { public CSourceManager(ISourceLocator sourceLocator) {
setSourceLocator( sourceLocator ); setSourceLocator(sourceLocator);
} }
/* /*
@ -50,11 +47,11 @@ public class CSourceManager implements ICSourceLocator, IPersistableSourceLocato
* *
* @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator#getLineNumber(IStackFrameInfo) * @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator#getLineNumber(IStackFrameInfo)
*/ */
public int getLineNumber( IStackFrame frame ) { public int getLineNumber(IStackFrame frame) {
if ( getCSourceLocator() != null ) { if (getCSourceLocator() != null) {
return getCSourceLocator().getLineNumber( frame ); return getCSourceLocator().getLineNumber(frame);
} }
if ( frame instanceof ICStackFrame ) { if (frame instanceof ICStackFrame) {
return ((ICStackFrame)frame).getFrameLineNumber(); return ((ICStackFrame)frame).getFrameLineNumber();
} }
return 0; return 0;
@ -62,7 +59,6 @@ public class CSourceManager implements ICSourceLocator, IPersistableSourceLocato
/* /*
* (non-Javadoc) * (non-Javadoc)
*
* @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator#getSourceLocations() * @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator#getSourceLocations()
*/ */
public ICSourceLocation[] getSourceLocations() { public ICSourceLocation[] getSourceLocations() {
@ -71,21 +67,19 @@ public class CSourceManager implements ICSourceLocator, IPersistableSourceLocato
/* /*
* (non-Javadoc) * (non-Javadoc)
*
* @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator#setSourceLocations(ICSourceLocation[]) * @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator#setSourceLocations(ICSourceLocation[])
*/ */
public void setSourceLocations( ICSourceLocation[] locations ) { public void setSourceLocations(ICSourceLocation[] locations) {
if ( getCSourceLocator() != null ) { if (getCSourceLocator() != null) {
getCSourceLocator().setSourceLocations( locations ); getCSourceLocator().setSourceLocations(locations);
CDebugTarget target = getDebugTarget(); CDebugTarget target = getDebugTarget();
if ( target != null ) { if (target != null) {
Disassembly d = null; Disassembly d = null;
try { try {
d = (Disassembly)target.getDisassembly(); d = (Disassembly)target.getDisassembly();
} catch (DebugException e) {
} }
catch( DebugException e ) { if (d != null) {
}
if ( d != null ) {
d.reset(); d.reset();
} }
} }
@ -94,119 +88,111 @@ public class CSourceManager implements ICSourceLocator, IPersistableSourceLocato
/* /*
* (non-Javadoc) * (non-Javadoc)
*
* @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator#contains(IResource) * @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator#contains(IResource)
*/ */
public boolean contains( IResource resource ) { public boolean contains(IResource resource) {
return (getCSourceLocator() != null) ? getCSourceLocator().contains( resource ) : false; return (getCSourceLocator() != null) ? getCSourceLocator().contains(resource) : false;
} }
/* /*
* (non-Javadoc) * (non-Javadoc)
*
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(Class) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(Class)
*/ */
public Object getAdapter( Class adapter ) { public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {
if ( adapter.equals( CSourceManager.class ) ) if (adapter.equals(CSourceManager.class))
return this; return this;
if ( adapter.equals( ICSourceLocator.class ) ) if (adapter.equals(ICSourceLocator.class))
return this; return this;
if ( adapter.equals( IPersistableSourceLocator.class ) ) if (adapter.equals(IPersistableSourceLocator.class))
return this; return this;
if ( adapter.equals( IResourceChangeListener.class ) && fSourceLocator instanceof IResourceChangeListener ) if (adapter.equals(IResourceChangeListener.class) && fSourceLocator instanceof IResourceChangeListener)
return fSourceLocator; return fSourceLocator;
return null; return null;
} }
/* /*
* (non-Javadoc) * (non-Javadoc)
*
* @see org.eclipse.debug.core.model.ISourceLocator#getSourceElement(IStackFrame) * @see org.eclipse.debug.core.model.ISourceLocator#getSourceElement(IStackFrame)
*/ */
public Object getSourceElement( IStackFrame stackFrame ) { public Object getSourceElement(IStackFrame stackFrame) {
Object result = null; Object result = null;
if ( getSourceLocator() != null ) if (getSourceLocator() != null)
result = getSourceLocator().getSourceElement( stackFrame ); result = getSourceLocator().getSourceElement(stackFrame);
return result; return result;
} }
protected ICSourceLocator getCSourceLocator() { protected ICSourceLocator getCSourceLocator() {
if ( getSourceLocator() instanceof ICSourceLocator ) if (getSourceLocator() instanceof ICSourceLocator)
return (ICSourceLocator)getSourceLocator(); return (ICSourceLocator)getSourceLocator();
return null; return null;
} }
protected ISourceLocator getSourceLocator() { protected ISourceLocator getSourceLocator() {
if ( fSourceLocator != null ) if (fSourceLocator != null)
return fSourceLocator; return fSourceLocator;
else if ( fLaunch != null ) else if (fLaunch != null)
return fLaunch.getSourceLocator(); return fLaunch.getSourceLocator();
return null; return null;
} }
private void setSourceLocator( ISourceLocator sl ) { private void setSourceLocator(ISourceLocator sl) {
fSourceLocator = sl; fSourceLocator = sl;
} }
/* /*
* (non-Javadoc) * (non-Javadoc)
*
* @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator#findSourceElement(String) * @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator#findSourceElement(String)
*/ */
public Object findSourceElement( String fileName ) { public Object findSourceElement(String fileName) {
if ( getCSourceLocator() != null ) { if (getCSourceLocator() != null) {
return getCSourceLocator().findSourceElement( fileName ); return getCSourceLocator().findSourceElement(fileName);
} }
return null; return null;
} }
/* /*
* (non-Javadoc) * (non-Javadoc)
*
* @see org.eclipse.debug.core.model.IPersistableSourceLocator#getMemento() * @see org.eclipse.debug.core.model.IPersistableSourceLocator#getMemento()
*/ */
public String getMemento() throws CoreException { public String getMemento() throws CoreException {
if ( getPersistableSourceLocator() != null ) if (getPersistableSourceLocator() != null)
return getPersistableSourceLocator().getMemento(); return getPersistableSourceLocator().getMemento();
return null; return null;
} }
/* /*
* (non-Javadoc) * (non-Javadoc)
*
* @see org.eclipse.debug.core.model.IPersistableSourceLocator#initializeDefaults(org.eclipse.debug.core.ILaunchConfiguration) * @see org.eclipse.debug.core.model.IPersistableSourceLocator#initializeDefaults(org.eclipse.debug.core.ILaunchConfiguration)
*/ */
public void initializeDefaults( ILaunchConfiguration configuration ) throws CoreException { public void initializeDefaults(ILaunchConfiguration configuration) throws CoreException {
if ( getPersistableSourceLocator() != null ) if (getPersistableSourceLocator() != null)
getPersistableSourceLocator().initializeDefaults( configuration ); getPersistableSourceLocator().initializeDefaults(configuration);
} }
/* /*
* (non-Javadoc) * (non-Javadoc)
*
* @see org.eclipse.debug.core.model.IPersistableSourceLocator#initializeFromMemento(java.lang.String) * @see org.eclipse.debug.core.model.IPersistableSourceLocator#initializeFromMemento(java.lang.String)
*/ */
public void initializeFromMemento( String memento ) throws CoreException { public void initializeFromMemento(String memento) throws CoreException {
if ( getPersistableSourceLocator() != null ) if (getPersistableSourceLocator() != null)
getPersistableSourceLocator().initializeFromMemento( memento ); getPersistableSourceLocator().initializeFromMemento(memento);
} }
private IPersistableSourceLocator getPersistableSourceLocator() { private IPersistableSourceLocator getPersistableSourceLocator() {
if ( fSourceLocator instanceof IPersistableSourceLocator ) if (fSourceLocator instanceof IPersistableSourceLocator)
return (IPersistableSourceLocator)fSourceLocator; return (IPersistableSourceLocator)fSourceLocator;
return null; return null;
} }
/* /*
* (non-Javadoc) * (non-Javadoc)
*
* @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator#getProject() * @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator#getProject()
*/ */
public IProject getProject() { public IProject getProject() {
return (getCSourceLocator() != null) ? getCSourceLocator().getProject() : null; return (getCSourceLocator() != null) ? getCSourceLocator().getProject() : null;
} }
public void setDebugTarget( CDebugTarget target ) { public void setDebugTarget(CDebugTarget target) {
fDebugTarget = target; fDebugTarget = target;
} }
@ -216,20 +202,18 @@ public class CSourceManager implements ICSourceLocator, IPersistableSourceLocato
/* /*
* (non-Javadoc) * (non-Javadoc)
*
* @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator#setSearchForDuplicateFiles(boolean) * @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator#setSearchForDuplicateFiles(boolean)
*/ */
public void setSearchForDuplicateFiles( boolean search ) { public void setSearchForDuplicateFiles(boolean search) {
if ( getCSourceLocator() != null ) if (getCSourceLocator() != null)
getCSourceLocator().setSearchForDuplicateFiles( search ); getCSourceLocator().setSearchForDuplicateFiles(search);
} }
/* /*
* (non-Javadoc) * (non-Javadoc)
*
* @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator#searchForDuplicateFiles() * @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator#searchForDuplicateFiles()
*/ */
public boolean searchForDuplicateFiles() { public boolean searchForDuplicateFiles() {
return (getCSourceLocator() != null) ? getCSourceLocator().searchForDuplicateFiles() : false; return getCSourceLocator() != null && getCSourceLocator().searchForDuplicateFiles();
} }
} }