aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwgalanciak2013-11-04 12:28:07 (EST)
committerwgalanciak2013-11-04 12:28:07 (EST)
commit604ae7f74515079f77ff46efcb429146257c350a (patch)
treef50feae2e420c7835f074411d7d39d031cb0ff06
parentf6c29bce2aed75eeb0f978bdbea1bca287f92e7e (diff)
downloadorg.eclipse.pdt-604ae7f74515079f77ff46efcb429146257c350a.zip
org.eclipse.pdt-604ae7f74515079f77ff46efcb429146257c350a.tar.gz
org.eclipse.pdt-604ae7f74515079f77ff46efcb429146257c350a.tar.bz2
Bug 420994 - Remove org.eclipse.dltk.ui dependency fromrefs/changes/38/18038/1
org.eclipse.php.debug.core Change-Id: Id7a31ec16cc224f9b4bbbd73f6daaa5b6e1abff9 Signed-off-by: wgalanciak <wojtek.g@zend.com>
-rw-r--r--plugins/org.eclipse.php.debug.core/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.php.debug.core/src/org/eclipse/php/internal/debug/core/sourcelookup/PHPSourceLookupParticipant.java7
2 files changed, 3 insertions, 5 deletions
diff --git a/plugins/org.eclipse.php.debug.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.php.debug.core/META-INF/MANIFEST.MF
index d18e2ec..99243ec 100644
--- a/plugins/org.eclipse.php.debug.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.php.debug.core/META-INF/MANIFEST.MF
@@ -16,7 +16,6 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui.ide,
org.eclipse.ui.workbench,
org.eclipse.dltk.core,
- org.eclipse.dltk.ui,
org.eclipse.php.core,
org.eclipse.php.ui,
org.eclipse.php.server.core,
diff --git a/plugins/org.eclipse.php.debug.core/src/org/eclipse/php/internal/debug/core/sourcelookup/PHPSourceLookupParticipant.java b/plugins/org.eclipse.php.debug.core/src/org/eclipse/php/internal/debug/core/sourcelookup/PHPSourceLookupParticipant.java
index 4f58bb6..c094d3f 100644
--- a/plugins/org.eclipse.php.debug.core/src/org/eclipse/php/internal/debug/core/sourcelookup/PHPSourceLookupParticipant.java
+++ b/plugins/org.eclipse.php.debug.core/src/org/eclipse/php/internal/debug/core/sourcelookup/PHPSourceLookupParticipant.java
@@ -28,9 +28,9 @@ import org.eclipse.dltk.core.ModelException;
import org.eclipse.dltk.core.environment.EnvironmentPathUtils;
import org.eclipse.dltk.core.internal.environment.LocalEnvironment;
import org.eclipse.dltk.core.search.IDLTKSearchScope;
+import org.eclipse.dltk.core.search.SearchEngine;
import org.eclipse.dltk.internal.core.Openable;
import org.eclipse.dltk.internal.core.util.HandleFactory;
-import org.eclipse.dltk.internal.ui.search.DLTKSearchScopeFactory;
import org.eclipse.php.internal.core.PHPLanguageToolkit;
import org.eclipse.php.internal.core.phar.PharArchiveFile;
import org.eclipse.php.internal.core.phar.PharPath;
@@ -86,9 +86,8 @@ public class PHPSourceLookupParticipant extends AbstractSourceLookupParticipant
if (fileName != null) {
HandleFactory fac = new HandleFactory();
- IDLTKSearchScope scope = DLTKSearchScopeFactory.getInstance()
- .createWorkspaceScope(true,
- PHPLanguageToolkit.getDefault());
+ IDLTKSearchScope scope = SearchEngine
+ .createWorkspaceScope(PHPLanguageToolkit.getDefault());
IPath localPath = EnvironmentPathUtils.getFile(
LocalEnvironment.getInstance(), new Path(fileName))
.getFullPath();