mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-08-08 16:55:38 +02:00
Fixed compiler warnings.
This commit is contained in:
Sergey Prigogin
parent
95ba23d13a
commit
b9c7e81375
1 changed files with 134 additions and 146 deletions
|
|
@ -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,8 +59,8 @@ 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;
|
||||
|
||||
|
|
@ -80,8 +80,7 @@ public class CProjectSourceLocation implements IProjectSourceLocation {
|
|||
/* (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);
|
||||
|
|
@ -101,7 +100,7 @@ public class CProjectSourceLocation implements IProjectSourceLocation {
|
|||
/* (non-Javadoc)
|
||||
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(Class)
|
||||
*/
|
||||
public Object getAdapter( Class adapter ) {
|
||||
public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {
|
||||
if (adapter.equals(ICSourceLocation.class))
|
||||
return this;
|
||||
if (adapter.equals(CProjectSourceLocation.class))
|
||||
|
|
@ -131,27 +130,28 @@ public class CProjectSourceLocation implements IProjectSourceLocation {
|
|||
|
||||
private Object doFindSourceElement(String name) {
|
||||
File file = new File(name);
|
||||
return ( file.isAbsolute() ) ? findFileByAbsolutePath( file ) : findFileByRelativePath( name );
|
||||
return file.isAbsolute() ? findFileByAbsolutePath(file) : findFileByRelativePath(name);
|
||||
}
|
||||
|
||||
private Object findFileByAbsolutePath(File file) {
|
||||
LinkedList list = new LinkedList();
|
||||
LinkedList<IFile> list = new LinkedList<IFile>();
|
||||
if (file.exists()) {
|
||||
IPath path = new Path(file.getAbsolutePath());
|
||||
IFile[] wsFiles = CDebugCorePlugin.getWorkspace().getRoot().findFilesForLocation( path );
|
||||
for ( int i = 0; i < wsFiles.length; ++i )
|
||||
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]);
|
||||
}
|
||||
}
|
||||
}
|
||||
return (list.size() > 0) ? ((list.size() == 1) ? list.getFirst() : list) : null;
|
||||
}
|
||||
|
||||
private Object findFileByRelativePath(String fileName) {
|
||||
IResource[] folders = getFolders();
|
||||
LinkedList list = new LinkedList();
|
||||
LinkedList<IFile> list = new LinkedList<IFile>();
|
||||
for (int i = 0; i < folders.length; ++i) {
|
||||
if (list.size() > 0 && !searchForDuplicateFiles())
|
||||
break;
|
||||
|
|
@ -160,8 +160,8 @@ public class CProjectSourceLocation implements IProjectSourceLocation {
|
|||
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 )
|
||||
IFile[] wsFiles = ResourceLookup.findFilesForLocation(path);
|
||||
for (int j = 0; j < wsFiles.length; ++j) {
|
||||
if (wsFiles[j].exists()) {
|
||||
if (!searchForDuplicateFiles())
|
||||
return wsFiles[j];
|
||||
|
|
@ -170,7 +170,8 @@ public class CProjectSourceLocation implements IProjectSourceLocation {
|
|||
}
|
||||
}
|
||||
}
|
||||
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) {
|
||||
|
|
@ -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 )
|
||||
{
|
||||
} catch (ParserConfigurationException e) {
|
||||
ex = e;
|
||||
} catch (IOException e) {
|
||||
ex = 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,11 +224,9 @@ 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);
|
||||
|
|
@ -238,10 +235,8 @@ public class CProjectSourceLocation implements IProjectSourceLocation {
|
|||
|
||||
String name = root.getAttribute(ATTR_PROJECT);
|
||||
if (isEmpty(name)) {
|
||||
abort( InternalSourceLookupMessages.CProjectSourceLocation_1, null ); //$NON-NLS-1$
|
||||
}
|
||||
else
|
||||
{
|
||||
abort(InternalSourceLookupMessages.CProjectSourceLocation_1, null);
|
||||
} else {
|
||||
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
|
||||
setProject(project);
|
||||
}
|
||||
|
|
@ -257,19 +252,15 @@ public class CProjectSourceLocation implements IProjectSourceLocation {
|
|||
} 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 );
|
||||
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);
|
||||
}
|
||||
|
||||
|
|
@ -298,14 +289,13 @@ public class CProjectSourceLocation implements IProjectSourceLocation {
|
|||
}
|
||||
|
||||
private void initializeFolders() {
|
||||
final LinkedList list = new LinkedList();
|
||||
final LinkedList<IResource> list = new LinkedList<IResource>();
|
||||
if (getProject() != null && getProject().exists()) {
|
||||
list.add(getProject());
|
||||
try {
|
||||
getProject().accept(
|
||||
new IResourceProxyVisitor() {
|
||||
public boolean visit( IResourceProxy proxy ) throws CoreException
|
||||
{
|
||||
public boolean visit(IResourceProxy proxy) throws CoreException {
|
||||
switch (proxy.getType()) {
|
||||
case IResource.FILE:
|
||||
return false;
|
||||
|
|
@ -315,16 +305,14 @@ public class CProjectSourceLocation implements IProjectSourceLocation {
|
|||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
},
|
||||
IResource.NONE);
|
||||
} catch (CoreException e) {
|
||||
}
|
||||
}
|
||||
synchronized (this) {
|
||||
if ( fFolders == null )
|
||||
{
|
||||
fFolders = (IResource[])list.toArray( new IResource[list.size()] );
|
||||
if (fFolders == null) {
|
||||
fFolders = list.toArray(new IResource[list.size()]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -352,6 +340,6 @@ public class CProjectSourceLocation implements IProjectSourceLocation {
|
|||
}
|
||||
|
||||
public String toString() {
|
||||
return ( getProject() != null ) ? fProject.toString() : ""; //$NON-NLS-1$
|
||||
return getProject() != null ? fProject.toString() : ""; //$NON-NLS-1$
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue