1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 14:42:11 +02:00

Compiler warnings.

This commit is contained in:
Markus Schorn 2010-06-17 14:00:24 +00:00
parent a7397911f1
commit 222046596e
3 changed files with 11 additions and 13 deletions

View file

@ -10,18 +10,17 @@
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.core.internal.efsextension.tests; package org.eclipse.cdt.core.internal.efsextension.tests;
import java.io.File;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import org.eclipse.cdt.utils.EFSExtensionManager;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import junit.framework.Test; import junit.framework.Test;
import junit.framework.TestCase; import junit.framework.TestCase;
import junit.framework.TestSuite; import junit.framework.TestSuite;
import org.eclipse.cdt.utils.EFSExtensionManager;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
/** /**
* Tests the EFSExtensionManager and EFSExtensionProvider classes, as well as the EFSExtensionProvider extension point. * Tests the EFSExtensionManager and EFSExtensionProvider classes, as well as the EFSExtensionProvider extension point.
* *

View file

@ -455,7 +455,7 @@ outer:
URI uri; URI uri;
if (!path.isAbsolute()) { if (!path.isAbsolute()) {
URI workingDirectoryURI = getWorkingDirectoryURI(); URI workingDirectoryURI = getWorkingDirectoryURI();
uri = EFSExtensionManager.getDefault().append(getWorkingDirectoryURI(), path.toString()); uri = EFSExtensionManager.getDefault().append(workingDirectoryURI, path.toString());
} }
else { else {
uri = toURI(path); uri = toURI(path);

View file

@ -16,7 +16,6 @@ import java.util.Map;
import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.EFSExtensionProvider; import org.eclipse.cdt.core.EFSExtensionProvider;
import org.eclipse.core.filesystem.URIUtil;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtension; import org.eclipse.core.runtime.IExtension;
@ -64,16 +63,16 @@ public class EFSExtensionManager {
EXTENSION_ID); EXTENSION_ID);
if (extension != null) { if (extension != null) {
IExtension[] extensions = extension.getExtensions(); IExtension[] extensions = extension.getExtensions();
for (int i = 0; i < extensions.length; i++) { for (IExtension extension2 : extensions) {
IConfigurationElement[] configElements = extensions[i].getConfigurationElements(); IConfigurationElement[] configElements = extension2.getConfigurationElements();
for (int j = 0; j < configElements.length; j++) { for (IConfigurationElement configElement : configElements) {
String scheme = configElements[j].getAttribute("scheme"); //$NON-NLS-1$ String scheme = configElement.getAttribute("scheme"); //$NON-NLS-1$
String utility = configElements[j].getAttribute("class"); //$NON-NLS-1$ String utility = configElement.getAttribute("class"); //$NON-NLS-1$
if (utility != null) { if (utility != null) {
try { try {
Object execExt = configElements[j].createExecutableExtension("class"); //$NON-NLS-1$ Object execExt = configElement.createExecutableExtension("class"); //$NON-NLS-1$
if (execExt instanceof EFSExtensionProvider) { if (execExt instanceof EFSExtensionProvider) {
fSchemeToExtensionProviderMap.put(scheme, fSchemeToExtensionProviderMap.put(scheme,
(EFSExtensionProvider) execExt); (EFSExtensionProvider) execExt);