[jbosstools-commits] JBoss Tools SVN: r6997 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search.

[jbosstools-commits at lists.jboss.org]

Author: vrubezhny
Date: 2008-03-18 16:22:52 -0400 (Tue, 18 Mar 2008)
New Revision: 6997

Modified:
   trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchVisitor.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1881 Progress report for Find seam references is wrong

issue is fixed

Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchVisitor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchVisitor.java	2008-03-18 19:13:19 UTC (rev 6996)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchVisitor.java	2008-03-18 20:22:52 UTC (rev 6997)
@@ -167,10 +167,15 @@
 		return Status.OK_STATUS;
     }
 
+	private int calculateFiles() {
+		IFile[] files = fCurrentScope.evaluateFilesInScope(fStatus);
+		return (files == null ? 0 : files.length);
+	}
+	
 	public IStatus searchForDeclarations(ISeamProject[] projects, IProgressMonitor monitor) {
 		fProgressMonitor= monitor == null ? new NullProgressMonitor() : monitor;
         fNumberOfScannedFiles= 0;
-        fNumberOfFilesToScan= projects.length;
+        fNumberOfFilesToScan= calculateFiles();
         fCurrentSeamProject= null;
         
         Job monitorUpdateJob= new MonitorUpdateJob();
@@ -205,10 +210,8 @@
 	private ElVarSearcher fELVarSearcher;
 	public boolean processSeamReferencesInProject(ISeamProject project) {
 		IFile[] files = fCurrentScope == null ? null :
-					fCurrentScope.evaluateFilesInScope(fStatus);
+				evaluateProjectFilesInScope(project.getProject(), fStatus);
 		
-		
-		
 		fELVarSearcher = new ElVarSearcher(project, fCompletionEngine);
 		fDocumentsInEditors= evalNonFileBufferDocuments();
 		boolean res= true;
@@ -705,7 +708,7 @@
 	public IStatus searchForReferences(ISeamProject[] projects, IProgressMonitor monitor) {
 		fProgressMonitor= monitor == null ? new NullProgressMonitor() : monitor;
         fNumberOfScannedFiles= 0;
-        fNumberOfFilesToScan= projects.length;
+        fNumberOfFilesToScan= calculateFiles();
         fCurrentSeamProject= null;
         
         Job monitorUpdateJob= new MonitorUpdateJob();