[stp-commits] r3335 - org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.comm

[genie@xxxxxxxxxxx]

Author: sdrapeau
Date: 2009-09-17 10:57:21 -0400 (Thu, 17 Sep 2009)
New Revision: 3335

Modified:
   org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.common/src/org/eclipse/stp/sca/common/utils/ResourceUtils.java
Log:
Fix. Do not search composite files in binary folders during "Open with..." action.

Modified: org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.common/src/org/eclipse/stp/sca/common/utils/ResourceUtils.java
===================================================================
--- org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.common/src/org/eclipse/stp/sca/common/utils/ResourceUtils.java	2009-09-16 10:55:22 UTC (rev 3334)
+++ org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.common/src/org/eclipse/stp/sca/common/utils/ResourceUtils.java	2009-09-17 14:57:21 UTC (rev 3335)
@@ -31,6 +31,7 @@
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.stp.sca.common.ScaCommonPlugin;
+import org.eclipse.stp.sca.common.internal.provisional.filters.ScaResourceFiltersEPManager;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.part.FileEditorInput;
@@ -281,8 +282,9 @@
 
 		// First search in the current project
 		IProject project = currentCompositeFile.getProject();
-		Iterator<IFile> composites = ResourceUtils.getFiles(project,
-				"composite").iterator();
+		List<IFile> compo = ResourceUtils.getFiles(project, "composite");
+		Iterator<IFile> composites = ScaResourceFiltersEPManager.getInstance()
+				.filterAllowedFiles(compo).iterator();
 		while (result == null && composites.hasNext()) {
 			IFile compositeFile = composites.next();
 			if (compositeName.equals(compositeFile.getName())) {
@@ -297,8 +299,11 @@
 				IProject[] projects = project.getReferencedProjects();
 				int i = 0;
 				while (result == null && i < projects.length) {
-					Iterator<IFile> compositesIt = ResourceUtils.getFiles(
-							projects[i], "composite").iterator();
+					List<IFile> compo2 = ResourceUtils.getFiles(projects[i],
+							"composite");
+					Iterator<IFile> compositesIt = ScaResourceFiltersEPManager
+							.getInstance().filterAllowedFiles(compo2)
+							.iterator();
 					while (result == null && compositesIt.hasNext()) {
 						IFile compositeFile = compositesIt.next();
 						if (compositeName.equals(compositeFile.getName())) {