diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceLocator.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceLocator.java index 6e52bb9b1d1..755ce37e0c8 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceLocator.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceLocator.java @@ -12,17 +12,18 @@ package org.eclipse.cdt.debug.internal.core.sourcelookup; import java.io.IOException; import java.io.StringReader; -import com.ibm.icu.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; import java.util.Iterator; import java.util.LinkedList; import java.util.List; + import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.TransformerException; + import org.eclipse.cdt.debug.core.CDebugCorePlugin; import org.eclipse.cdt.debug.core.CDebugUtils; 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.SAXException; +import com.ibm.icu.text.MessageFormat; + /** * Default source locator. */ @@ -384,7 +387,7 @@ public class CSourceLocator implements ICSourceLocator, IPersistableSourceLocato try { clazz = bundle.loadClass(className); } 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; } ICSourceLocation location = null; @@ -430,7 +433,7 @@ public class CSourceLocator implements ICSourceLocator, IPersistableSourceLocato try { clazz = bundle.loadClass(className); } 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; } ICSourceLocation location = null; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/MapEntrySourceContainer.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/MapEntrySourceContainer.java index 751c3ed9636..45352b727f9 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/MapEntrySourceContainer.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/MapEntrySourceContainer.java @@ -43,7 +43,6 @@ public class MapEntrySourceContainer extends AbstractSourceContainer { public static final String TYPE_ID = CDebugCorePlugin.getUniqueIdentifier() + ".containerType.mapEntry"; //$NON-NLS-1$ private IPath fLocalPath; - private IPath fBackendPath; /** @@ -63,7 +62,7 @@ public class MapEntrySourceContainer extends AbstractSourceContainer { } /** - * Create an IPath from a string which may be a Win32 path.
+ * Creates an IPath from a string which may be a Win32 path.
*
* ("new Path(...)" won't work in Unix when using a Win32 path: the backslash * separator and the device notation are completely munged.) @@ -106,9 +105,6 @@ public class MapEntrySourceContainer extends AbstractSourceContainer { return new Path(path); } - /* (non-Javadoc) - * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#findSourceElements(java.lang.String) - */ @Override public Object[] findSourceElements(String name) throws CoreException { IPath path = createPath(name); @@ -159,17 +155,11 @@ public class MapEntrySourceContainer extends AbstractSourceContainer { return EMPTY; } - /* (non-Javadoc) - * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#getName() - */ @Override 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 public ISourceContainerType getType() { return getSourceContainerType(TYPE_ID); @@ -191,9 +181,6 @@ public class MapEntrySourceContainer extends AbstractSourceContainer { fBackendPath = backend; } - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { if (!(o instanceof MapEntrySourceContainer))