Skip to main content
summaryrefslogtreecommitdiffstats
path: root/debug
diff options
context:
space:
mode:
authorSergey Prigogin2010-12-06 15:31:37 -0500
committerSergey Prigogin2010-12-06 15:31:37 -0500
commitb9c7e81375bbc699a3a270a6992ef847e9832c0f (patch)
tree354d95a74bd808be774f9cf6458e2c19424e7cae /debug
parent95ba23d13acc2e543564cd2543af192458381ee3 (diff)
downloadorg.eclipse.cdt-b9c7e81375bbc699a3a270a6992ef847e9832c0f.tar.gz
org.eclipse.cdt-b9c7e81375bbc699a3a270a6992ef847e9832c0f.tar.xz
org.eclipse.cdt-b9c7e81375bbc699a3a270a6992ef847e9832c0f.zip
Fixed compiler warnings.
Diffstat (limited to 'debug')
-rw-r--r--debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CProjectSourceLocation.java254
1 files changed, 121 insertions, 133 deletions
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CProjectSourceLocation.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CProjectSourceLocation.java
index 0b33d398a2..3c99554bcd 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CProjectSourceLocation.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CProjectSourceLocation.java
@@ -13,7 +13,6 @@ package org.eclipse.cdt.debug.internal.core.sourcelookup;
import java.io.File;
import java.io.IOException;
import java.io.StringReader;
-import com.ibm.icu.text.MessageFormat;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
@@ -27,6 +26,7 @@ import org.eclipse.cdt.debug.core.CDebugCorePlugin;
import org.eclipse.cdt.debug.core.CDebugUtils;
import org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocation;
import org.eclipse.cdt.debug.core.sourcelookup.IProjectSourceLocation;
+import org.eclipse.cdt.internal.core.resources.ResourceLookup;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
@@ -38,14 +38,14 @@ import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
+import org.eclipse.osgi.util.NLS;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
/**
- *
- * Locates source elements in a Java project. Returns instances of <code>IFile</code>.
+ * Locates source elements in a C/C++ project. Returns instances of <code>IFile</code>.
*
* @since Sep 23, 2002
*/
@@ -59,40 +59,39 @@ public class CProjectSourceLocation implements IProjectSourceLocation {
*/
private IProject fProject;
private IResource[] fFolders;
- private HashMap fCache = new HashMap( 20 );
- private HashSet fNotFoundCache = new HashSet( 20 );
+ private HashMap<String, Object> fCache = new HashMap<String, Object>(20);
+ private HashSet<String> fNotFoundCache = new HashSet<String>(20);
private boolean fGenerated = true;
private boolean fSearchForDuplicateFiles = false;
public CProjectSourceLocation() {
}
- public CProjectSourceLocation( IProject project ) {
- setProject( project );
+ public CProjectSourceLocation(IProject project) {
+ setProject(project);
fGenerated = true;
}
- public CProjectSourceLocation( IProject project, boolean generated ) {
- setProject( project );
+ public CProjectSourceLocation(IProject project, boolean generated) {
+ setProject(project);
fGenerated = generated;
}
/* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocation#findSourceElement(String)
*/
- public Object findSourceElement( String name ) throws CoreException
- {
+ public Object findSourceElement(String name) throws CoreException {
Object result = null;
- if ( !isEmpty( name ) && getProject() != null && !notFoundCacheLookup( name ) ) {
- result = cacheLookup( name );
- if ( result == null ) {
- result = doFindSourceElement( name );
- if ( result != null ) {
- cacheSourceElement( name, result );
+ if (!isEmpty(name) && getProject() != null && !notFoundCacheLookup(name)) {
+ result = cacheLookup(name);
+ if (result == null) {
+ result = doFindSourceElement(name);
+ if (result != null) {
+ cacheSourceElement(name, result);
}
}
- if ( result == null ) {
- cacheNotFound( name );
+ if (result == null) {
+ cacheNotFound(name);
}
}
return result;
@@ -101,12 +100,12 @@ public class CProjectSourceLocation implements IProjectSourceLocation {
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(Class)
*/
- public Object getAdapter( Class adapter ) {
- if ( adapter.equals( ICSourceLocation.class ) )
+ public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {
+ if (adapter.equals(ICSourceLocation.class))
return this;
- if ( adapter.equals( CProjectSourceLocation.class ) )
+ if (adapter.equals(CProjectSourceLocation.class))
return this;
- if ( adapter.equals( IProject.class ) )
+ if (adapter.equals(IProject.class))
return getProject();
return null;
}
@@ -116,7 +115,7 @@ public class CProjectSourceLocation implements IProjectSourceLocation {
*
* @param project the project
*/
- private void setProject( IProject project ) {
+ private void setProject(IProject project) {
fProject = project;
}
@@ -129,64 +128,66 @@ public class CProjectSourceLocation implements IProjectSourceLocation {
return fProject;
}
- private Object doFindSourceElement( String name ) {
- File file = new File( name );
- return ( file.isAbsolute() ) ? findFileByAbsolutePath( file ) : findFileByRelativePath( name );
+ private Object doFindSourceElement(String name) {
+ File file = new File(name);
+ return file.isAbsolute() ? findFileByAbsolutePath(file) : findFileByRelativePath(name);
}
- private Object findFileByAbsolutePath( File file ) {
- LinkedList list = new LinkedList();
- if ( file.exists() ) {
- IPath path = new Path( file.getAbsolutePath() );
- IFile[] wsFiles = CDebugCorePlugin.getWorkspace().getRoot().findFilesForLocation( path );
- for ( int i = 0; i < wsFiles.length; ++i )
- if ( wsFiles[i].getProject().equals( getProject() ) && wsFiles[i].exists() ) {
- if ( !searchForDuplicateFiles() )
+ private Object findFileByAbsolutePath(File file) {
+ LinkedList<IFile> list = new LinkedList<IFile>();
+ if (file.exists()) {
+ IPath path = new Path(file.getAbsolutePath());
+ IFile[] wsFiles = ResourceLookup.findFilesForLocation(path);
+ for (int i = 0; i < wsFiles.length; ++i) {
+ if (wsFiles[i].getProject().equals(getProject()) && wsFiles[i].exists()) {
+ if (!searchForDuplicateFiles())
return wsFiles[i];
- list.add( wsFiles[i] );
+ list.add(wsFiles[i]);
}
+ }
}
- return ( list.size() > 0 ) ? ( ( list.size() == 1 ) ? list.getFirst() : list ) : null;
+ return (list.size() > 0) ? ((list.size() == 1) ? list.getFirst() : list) : null;
}
- private Object findFileByRelativePath( String fileName ) {
+ private Object findFileByRelativePath(String fileName) {
IResource[] folders = getFolders();
- LinkedList list = new LinkedList();
- for ( int i = 0; i < folders.length; ++i ) {
- if ( list.size() > 0 && !searchForDuplicateFiles() )
+ LinkedList<IFile> list = new LinkedList<IFile>();
+ for (int i = 0; i < folders.length; ++i) {
+ if (list.size() > 0 && !searchForDuplicateFiles())
break;
IPath path = folders[i].getLocation();
- if ( path != null ) {
- path = path.append( fileName );
- File file = new File( path.toOSString() );
- if ( file.exists() ) {
- IFile[] wsFiles = CDebugCorePlugin.getWorkspace().getRoot().findFilesForLocation( path );
- for ( int j = 0; j < wsFiles.length; ++j )
- if ( wsFiles[j].exists() ) {
- if ( !searchForDuplicateFiles() )
+ if (path != null) {
+ path = path.append(fileName);
+ File file = new File(path.toOSString());
+ if (file.exists()) {
+ IFile[] wsFiles = ResourceLookup.findFilesForLocation(path);
+ for (int j = 0; j < wsFiles.length; ++j) {
+ if (wsFiles[j].exists()) {
+ if (!searchForDuplicateFiles())
return wsFiles[j];
- list.add( wsFiles[j] );
+ list.add(wsFiles[j]);
}
+ }
}
}
}
- return ( list.size() > 0 ) ? ( ( list.size() == 1 ) ? list.getFirst() : list ) : null;
+ return list.size() > 0 ? (list.size() == 1 ? list.getFirst() : list) : null;
}
- private Object cacheLookup( String name ) {
- return fCache.get( name );
+ private Object cacheLookup(String name) {
+ return fCache.get(name);
}
- private boolean notFoundCacheLookup( String name ) {
- return fNotFoundCache.contains( name );
+ private boolean notFoundCacheLookup(String name) {
+ return fNotFoundCache.contains(name);
}
- private void cacheSourceElement( String name, Object element ) {
- fCache.put( name, element );
+ private void cacheSourceElement(String name, Object element) {
+ fCache.put(name, element);
}
- private void cacheNotFound( String name ) {
- fNotFoundCache.add( name );
+ private void cacheNotFound(String name) {
+ fNotFoundCache.add(name);
}
public void dispose() {
@@ -197,27 +198,25 @@ public class CProjectSourceLocation implements IProjectSourceLocation {
/* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocation#getMemento()
*/
- public String getMemento() throws CoreException
- {
+ public String getMemento() throws CoreException {
Document document = null;
Throwable ex = null;
- try
- {
+ try {
document = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
- Element node = document.createElement( ELEMENT_NAME );
- document.appendChild( node );
- node.setAttribute( ATTR_PROJECT, getProject().getName() );
- node.setAttribute( ATTR_GENERIC, Boolean.valueOf( isGeneric() ).toString() );
- return CDebugUtils.serializeDocument( document );
- } catch( ParserConfigurationException e )
- {
+ Element node = document.createElement(ELEMENT_NAME);
+ document.appendChild(node);
+ node.setAttribute(ATTR_PROJECT, getProject().getName());
+ node.setAttribute(ATTR_GENERIC, Boolean.valueOf(isGeneric()).toString());
+ return CDebugUtils.serializeDocument(document);
+ } catch (ParserConfigurationException e) {
ex = e;
- } catch( IOException e ) {
+ } catch (IOException e) {
ex = e;
- } catch( TransformerException e ) {
+ } catch (TransformerException e) {
ex = e;
}
- abort( MessageFormat.format( InternalSourceLookupMessages.CProjectSourceLocation_0, new String[] { getProject().getName() } ), ex ); //$NON-NLS-1$
+ abort(NLS.bind(InternalSourceLookupMessages.CProjectSourceLocation_0,
+ getProject().getName()), ex);
// execution will not reach here
return null;
}
@@ -225,55 +224,47 @@ public class CProjectSourceLocation implements IProjectSourceLocation {
/* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocation#initializeFrom(java.lang.String)
*/
- public void initializeFrom( String memento ) throws CoreException
- {
+ public void initializeFrom(String memento) throws CoreException {
Exception ex = null;
- try
- {
+ try {
Element root = null;
DocumentBuilder parser = DocumentBuilderFactory.newInstance().newDocumentBuilder();
- StringReader reader = new StringReader( memento );
- InputSource source = new InputSource( reader );
- root = parser.parse( source ).getDocumentElement();
+ StringReader reader = new StringReader(memento);
+ InputSource source = new InputSource(reader);
+ root = parser.parse(source).getDocumentElement();
- String name = root.getAttribute( ATTR_PROJECT );
- if ( isEmpty( name ) ) {
- abort( InternalSourceLookupMessages.CProjectSourceLocation_1, null ); //$NON-NLS-1$
+ String name = root.getAttribute(ATTR_PROJECT);
+ if (isEmpty(name)) {
+ abort(InternalSourceLookupMessages.CProjectSourceLocation_1, null);
+ } else {
+ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
+ setProject(project);
}
- else
- {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject( name );
- setProject( project );
- }
- String isGeneric = root.getAttribute( ATTR_GENERIC );
- if ( isGeneric == null || isGeneric.trim().length() == 0 )
+ String isGeneric = root.getAttribute(ATTR_GENERIC);
+ if (isGeneric == null || isGeneric.trim().length() == 0)
isGeneric = Boolean.FALSE.toString();
- setGenerated( isGeneric.equals( Boolean.TRUE.toString() ) );
+ setGenerated(isGeneric.equals(Boolean.TRUE.toString()));
return;
- } catch( ParserConfigurationException e ) {
+ } catch (ParserConfigurationException e) {
ex = e;
- } catch( SAXException e ) {
+ } catch (SAXException e) {
ex = e;
- } catch( IOException e ) {
+ } catch (IOException e) {
ex = e;
}
- abort( InternalSourceLookupMessages.CProjectSourceLocation_2, ex ); //$NON-NLS-1$
+ abort(InternalSourceLookupMessages.CProjectSourceLocation_2, ex);
}
/**
* Throws an internal error exception
*/
- private void abort( String message, Throwable e ) throws CoreException
- {
- IStatus s = new Status( IStatus.ERROR,
- CDebugCorePlugin.getUniqueIdentifier(),
- CDebugCorePlugin.INTERNAL_ERROR,
- message,
- e );
- throw new CoreException( s );
+ private void abort(String message, Throwable e) throws CoreException {
+ IStatus s = new Status(IStatus.ERROR, CDebugCorePlugin.getUniqueIdentifier(),
+ CDebugCorePlugin.INTERNAL_ERROR, message, e);
+ throw new CoreException(s);
}
- private boolean isEmpty( String string ) {
+ private boolean isEmpty(String string) {
return string == null || string.length() == 0;
}
@@ -284,53 +275,50 @@ public class CProjectSourceLocation implements IProjectSourceLocation {
return fGenerated;
}
- public void setGenerated( boolean b ) {
+ public void setGenerated(boolean b) {
fGenerated = b;
}
/* (non-Javadoc)
* @see java.lang.Object#equals(java.lang.Object)
*/
- public boolean equals( Object obj ) {
- if ( obj instanceof IProjectSourceLocation && getProject() != null )
- return getProject().equals( ((IProjectSourceLocation)obj).getProject() );
+ public boolean equals(Object obj) {
+ if (obj instanceof IProjectSourceLocation && getProject() != null)
+ return getProject().equals(((IProjectSourceLocation) obj).getProject());
return false;
}
private void initializeFolders() {
- final LinkedList list = new LinkedList();
- if ( getProject() != null && getProject().exists() ) {
- list.add( getProject() );
+ final LinkedList<IResource> list = new LinkedList<IResource>();
+ if (getProject() != null && getProject().exists()) {
+ list.add(getProject());
try {
- getProject().accept(
+ getProject().accept(
new IResourceProxyVisitor() {
- public boolean visit( IResourceProxy proxy ) throws CoreException
- {
- switch( proxy.getType() ) {
- case IResource.FILE:
- return false;
- case IResource.FOLDER:
- list.addLast( proxy.requestResource() );
- return true;
- }
- return true;
+ public boolean visit(IResourceProxy proxy) throws CoreException {
+ switch (proxy.getType()) {
+ case IResource.FILE:
+ return false;
+ case IResource.FOLDER:
+ list.addLast(proxy.requestResource());
+ return true;
}
-
- },
- IResource.NONE );
- } catch( CoreException e ) {
+ return true;
+ }
+ },
+ IResource.NONE);
+ } catch (CoreException e) {
}
}
- synchronized( this ) {
- if ( fFolders == null )
- {
- fFolders = (IResource[])list.toArray( new IResource[list.size()] );
+ synchronized (this) {
+ if (fFolders == null) {
+ fFolders = list.toArray(new IResource[list.size()]);
}
}
}
protected IResource[] getFolders() {
- if ( fFolders == null )
+ if (fFolders == null)
initializeFolders();
return fFolders;
}
@@ -345,13 +333,13 @@ public class CProjectSourceLocation implements IProjectSourceLocation {
/* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocation#setSearchForDuplicateFiles(boolean)
*/
- public void setSearchForDuplicateFiles( boolean search ) {
+ public void setSearchForDuplicateFiles(boolean search) {
fCache.clear();
fNotFoundCache.clear();
fSearchForDuplicateFiles = search;
}
public String toString() {
- return ( getProject() != null ) ? fProject.toString() : ""; //$NON-NLS-1$
+ return getProject() != null ? fProject.toString() : ""; //$NON-NLS-1$
}
}

Back to the top