1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00

Fixed compiler warnings.

This commit is contained in:
Sergey Prigogin 2014-04-08 15:03:57 -07:00
parent 8b64594a96
commit e333b0030e
2 changed files with 8 additions and 18 deletions

View file

@ -12,17 +12,18 @@ package org.eclipse.cdt.debug.internal.core.sourcelookup;
import java.io.IOException; import java.io.IOException;
import java.io.StringReader; import java.io.StringReader;
import com.ibm.icu.text.MessageFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerException;
import org.eclipse.cdt.debug.core.CDebugCorePlugin; import org.eclipse.cdt.debug.core.CDebugCorePlugin;
import org.eclipse.cdt.debug.core.CDebugUtils; import org.eclipse.cdt.debug.core.CDebugUtils;
import org.eclipse.cdt.debug.core.model.ICStackFrame; import org.eclipse.cdt.debug.core.model.ICStackFrame;
@ -52,6 +53,8 @@ import org.w3c.dom.NodeList;
import org.xml.sax.InputSource; import org.xml.sax.InputSource;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
import com.ibm.icu.text.MessageFormat;
/** /**
* Default source locator. * Default source locator.
*/ */
@ -384,7 +387,7 @@ public class CSourceLocator implements ICSourceLocator, IPersistableSourceLocato
try { try {
clazz = bundle.loadClass(className); clazz = bundle.loadClass(className);
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {
CDebugCorePlugin.log(MessageFormat.format("Unable to restore source location - class not found {0}", new String[]{ className })); //$NON-NLS-1$ CDebugCorePlugin.log(MessageFormat.format("Unable to restore source location - class not found {0}", new Object[]{ className })); //$NON-NLS-1$
continue; continue;
} }
ICSourceLocation location = null; ICSourceLocation location = null;
@ -430,7 +433,7 @@ public class CSourceLocator implements ICSourceLocator, IPersistableSourceLocato
try { try {
clazz = bundle.loadClass(className); clazz = bundle.loadClass(className);
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {
CDebugCorePlugin.log(MessageFormat.format("Unable to restore source location - class not found {0}", new String[]{ className })); //$NON-NLS-1$ CDebugCorePlugin.log(MessageFormat.format("Unable to restore source location - class not found {0}", new Object[]{ className })); //$NON-NLS-1$
continue; continue;
} }
ICSourceLocation location = null; ICSourceLocation location = null;

View file

@ -43,7 +43,6 @@ public class MapEntrySourceContainer extends AbstractSourceContainer {
public static final String TYPE_ID = CDebugCorePlugin.getUniqueIdentifier() + ".containerType.mapEntry"; //$NON-NLS-1$ public static final String TYPE_ID = CDebugCorePlugin.getUniqueIdentifier() + ".containerType.mapEntry"; //$NON-NLS-1$
private IPath fLocalPath; private IPath fLocalPath;
private IPath fBackendPath; private IPath fBackendPath;
/** /**
@ -63,7 +62,7 @@ public class MapEntrySourceContainer extends AbstractSourceContainer {
} }
/** /**
* Create an IPath from a string which may be a Win32 path. <p> * Creates an IPath from a string which may be a Win32 path. <p>
* <p> * <p>
* ("new Path(...)" won't work in Unix when using a Win32 path: the backslash * ("new Path(...)" won't work in Unix when using a Win32 path: the backslash
* separator and the device notation are completely munged.) * separator and the device notation are completely munged.)
@ -106,9 +105,6 @@ public class MapEntrySourceContainer extends AbstractSourceContainer {
return new Path(path); return new Path(path);
} }
/* (non-Javadoc)
* @see org.eclipse.debug.core.sourcelookup.ISourceContainer#findSourceElements(java.lang.String)
*/
@Override @Override
public Object[] findSourceElements(String name) throws CoreException { public Object[] findSourceElements(String name) throws CoreException {
IPath path = createPath(name); IPath path = createPath(name);
@ -159,17 +155,11 @@ public class MapEntrySourceContainer extends AbstractSourceContainer {
return EMPTY; return EMPTY;
} }
/* (non-Javadoc)
* @see org.eclipse.debug.core.sourcelookup.ISourceContainer#getName()
*/
@Override @Override
public String getName() { public String getName() {
return MessageFormat.format("{0} - {1}", new String[] { getBackendPath().toOSString(), getLocalPath().toOSString() }); //$NON-NLS-1$ return MessageFormat.format("{0} - {1}", new Object[] { getBackendPath().toOSString(), getLocalPath().toOSString() }); //$NON-NLS-1$
} }
/* (non-Javadoc)
* @see org.eclipse.debug.core.sourcelookup.ISourceContainer#getType()
*/
@Override @Override
public ISourceContainerType getType() { public ISourceContainerType getType() {
return getSourceContainerType(TYPE_ID); return getSourceContainerType(TYPE_ID);
@ -191,9 +181,6 @@ public class MapEntrySourceContainer extends AbstractSourceContainer {
fBackendPath = backend; fBackendPath = backend;
} }
/* (non-Javadoc)
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (!(o instanceof MapEntrySourceContainer)) if (!(o instanceof MapEntrySourceContainer))