Fixed F3 bug: 19261: Text search should not use TEXT from team

Reviewed with AK

2 files changed, 2 insertions, 7 deletions

diff --git a/org.eclipse.search/plugin.xml b/org.eclipse.search/plugin.xml
index 176df3b1e..b7d4b5995 100644
--- a/org.eclipse.search/plugin.xml
+++ b/org.eclipse.search/plugin.xml
@@ -13,7 +13,6 @@
 <requires>

   <import plugin="org.apache.xerces"/>

   <import plugin="org.eclipse.core.resources"/>

-  <import plugin="org.eclipse.team.core"/>

   <import plugin="org.eclipse.ui"/>

 </requires>

 

diff --git a/org.eclipse.search/search/org/eclipse/search/internal/core/text/TextSearchVisitor.java b/org.eclipse.search/search/org/eclipse/search/internal/core/text/TextSearchVisitor.java
index d2ead07a0..d9216947e 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/core/text/TextSearchVisitor.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/core/text/TextSearchVisitor.java
@@ -126,8 +126,8 @@ public class TextSearchVisitor extends TypedResourceVisitor {
 		if (! fScope.encloses(file))

 			return false;

 

-		// Exclude to be ignored files

-		if (Team.isIgnoredHint(file))

+		// Exclude to derived resources

+		if (file.isDerived())

 			return false;

 

 		if (fPattern.length() == 0) {

@@ -135,10 +135,6 @@ public class TextSearchVisitor extends TypedResourceVisitor {
 			return true;

 		}

 

-		// Exclude binary files from text search

-		if (Team.getType(file) == Team.BINARY)

-			return false;

-			

 		try {

 			BufferedReader reader= null;

 			ITextEditor editor= findDirtyEditorFor(file);