merged from HEAD: fix for 294696
diff --git a/plugins/org.eclipse.dltk.ruby.testing/src/org/eclipse/dltk/ruby/testing/internal/AbstractRubyTestingEngine.java b/plugins/org.eclipse.dltk.ruby.testing/src/org/eclipse/dltk/ruby/testing/internal/AbstractRubyTestingEngine.java
index 113ae13..5c1f286 100644
--- a/plugins/org.eclipse.dltk.ruby.testing/src/org/eclipse/dltk/ruby/testing/internal/AbstractRubyTestingEngine.java
+++ b/plugins/org.eclipse.dltk.ruby.testing/src/org/eclipse/dltk/ruby/testing/internal/AbstractRubyTestingEngine.java
@@ -14,14 +14,12 @@
import java.io.File;
import java.io.IOException;
import java.net.ServerSocket;
-import java.net.URI;
-import java.net.URISyntaxException;
import java.net.URL;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
+import org.eclipse.dltk.compiler.util.Util;
import org.eclipse.dltk.launching.InterpreterConfig;
import org.eclipse.dltk.launching.ScriptLaunchConfigurationConstants;
import org.eclipse.dltk.testing.AbstractTestingEngine;
@@ -53,28 +51,13 @@
RubyTestingPlugin.PLUGIN_ID, msg, null));
}
try {
- runnerScript = FileLocator.toFileURL(runnerScript);
+ return Util.toFile(runnerScript);
} catch (IOException e) {
final String msg = NLS.bind(
Messages.Delegate_errorExtractingRunner, runnerName);
throw new CoreException(new Status(IStatus.ERROR,
RubyTestingPlugin.PLUGIN_ID, msg, e));
}
- try {
- return new File(new URI(runnerScript.toString()));
- } catch (IllegalArgumentException e) {
- final String msg = NLS
- .bind(Messages.Delegate_internalErrorExtractingRunner,
- runnerName);
- throw new CoreException(new Status(IStatus.ERROR,
- RubyTestingPlugin.PLUGIN_ID, msg, e));
- } catch (URISyntaxException e) {
- final String msg = NLS
- .bind(Messages.Delegate_internalErrorExtractingRunner,
- runnerName);
- throw new CoreException(new Status(IStatus.ERROR,
- RubyTestingPlugin.PLUGIN_ID, msg, e));
- }
}
protected boolean isDevelopmentMode(InterpreterConfig config,
@@ -161,13 +144,6 @@
return display;
}
- /*
- * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
- */
- public Object getAdapter(Class adapter) {
- return null;
- }
-
/**
* @param info
* @param string
