1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-16 04:35:45 +02:00

Clean up warnings.

This commit is contained in:
Ken Ryall 2010-04-20 18:29:16 +00:00
parent c6035901f5
commit 5098922069

View file

@ -14,6 +14,7 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import org.eclipse.cdt.debug.core.CDebugCorePlugin; import org.eclipse.cdt.debug.core.CDebugCorePlugin;
import org.eclipse.cdt.debug.internal.core.sourcelookup.MapEntrySourceContainer; import org.eclipse.cdt.debug.internal.core.sourcelookup.MapEntrySourceContainer;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
@ -38,14 +39,14 @@ public class MappingSourceContainer extends AbstractSourceContainer {
public static final String TYPE_ID = CDebugCorePlugin.getUniqueIdentifier() + ".containerType.mapping"; //$NON-NLS-1$ public static final String TYPE_ID = CDebugCorePlugin.getUniqueIdentifier() + ".containerType.mapping"; //$NON-NLS-1$
private String fName; private String fName;
private ArrayList fContainers; private ArrayList<MapEntrySourceContainer> fContainers;
/** /**
* Constructor for MappingSourceContainer. * Constructor for MappingSourceContainer.
*/ */
public MappingSourceContainer( String name ) { public MappingSourceContainer( String name ) {
fName = name; fName = name;
fContainers = new ArrayList(); fContainers = new ArrayList<MapEntrySourceContainer>();
} }
/* (non-Javadoc) /* (non-Javadoc)
@ -77,11 +78,11 @@ public class MappingSourceContainer extends AbstractSourceContainer {
} }
protected Object[] findSourceElements( String name, ISourceContainer[] containers ) throws CoreException { protected Object[] findSourceElements( String name, ISourceContainer[] containers ) throws CoreException {
List results = null; List<Object> results = null;
CoreException single = null; CoreException single = null;
MultiStatus multiStatus = null; MultiStatus multiStatus = null;
if ( isFindDuplicates() ) { if ( isFindDuplicates() ) {
results = new ArrayList(); results = new ArrayList<Object>();
} }
for( int i = 0; i < containers.length; i++ ) { for( int i = 0; i < containers.length; i++ ) {
ISourceContainer container = containers[i]; ISourceContainer container = containers[i];
@ -131,7 +132,7 @@ public class MappingSourceContainer extends AbstractSourceContainer {
* @see org.eclipse.debug.core.sourcelookup.containers.AbstractSourceContainer#getSourceContainers() * @see org.eclipse.debug.core.sourcelookup.containers.AbstractSourceContainer#getSourceContainers()
*/ */
public ISourceContainer[] getSourceContainers() throws CoreException { public ISourceContainer[] getSourceContainers() throws CoreException {
return (MapEntrySourceContainer[])fContainers.toArray( new MapEntrySourceContainer[fContainers.size()] ); return fContainers.toArray( new MapEntrySourceContainer[fContainers.size()] );
} }
public void addMapEntry( MapEntrySourceContainer entry ) { public void addMapEntry( MapEntrySourceContainer entry ) {
@ -151,7 +152,7 @@ public class MappingSourceContainer extends AbstractSourceContainer {
} }
public void clear() { public void clear() {
Iterator it = fContainers.iterator(); Iterator<MapEntrySourceContainer> it = fContainers.iterator();
while( it.hasNext() ) { while( it.hasNext() ) {
((ISourceContainer)it.next()).dispose(); ((ISourceContainer)it.next()).dispose();
} }
@ -163,7 +164,7 @@ public class MappingSourceContainer extends AbstractSourceContainer {
*/ */
public void dispose() { public void dispose() {
super.dispose(); super.dispose();
Iterator it = fContainers.iterator(); Iterator<MapEntrySourceContainer> it = fContainers.iterator();
while( it.hasNext() ) { while( it.hasNext() ) {
((ISourceContainer)it.next()).dispose(); ((ISourceContainer)it.next()).dispose();
} }
@ -174,7 +175,7 @@ public class MappingSourceContainer extends AbstractSourceContainer {
MappingSourceContainer copy = new MappingSourceContainer( fName ); MappingSourceContainer copy = new MappingSourceContainer( fName );
MapEntrySourceContainer[] entries = new MapEntrySourceContainer[fContainers.size()]; MapEntrySourceContainer[] entries = new MapEntrySourceContainer[fContainers.size()];
for ( int i = 0; i < entries.length; ++i ) { for ( int i = 0; i < entries.length; ++i ) {
copy.addMapEntry( ((MapEntrySourceContainer)fContainers.get( i )).copy() ); copy.addMapEntry( fContainers.get( i ).copy() );
} }
return copy; return copy;
} }