diff --git a/utilities/src/org/netbeans/modules/search/Bundle.properties b/utilities/src/org/netbeans/modules/search/Bundle.properties --- a/utilities/src/org/netbeans/modules/search/Bundle.properties +++ b/utilities/src/org/netbeans/modules/search/Bundle.properties @@ -104,6 +104,8 @@ TEXT_MSG_LIMIT_REACHED_FILES_COUNT=The search was stopped because the limit for number of matching files ({0,number}) was reached. TEXT_MSG_LIMIT_REACHED_MATCHES_COUNT=The search was stopped because the limit for number of matching occurences ({0,number}) was reached or exceeded. TEXT_SEARCHING___=Searching... +# {0} - file path +MSG_searching_file=Searching in {0} TEXT_FINISHING_PREV_SEARCH=Finishing the previous search... TEXT_CLEANING_RESULT=Cleaning the previous results... TEXT_PRINTING_DETAILS=Printing details of the previous results... diff --git a/utilities/src/org/netbeans/modules/search/SearchTask.java b/utilities/src/org/netbeans/modules/search/SearchTask.java --- a/utilities/src/org/netbeans/modules/search/SearchTask.java +++ b/utilities/src/org/netbeans/modules/search/SearchTask.java @@ -46,6 +46,8 @@ import org.netbeans.api.progress.ProgressHandle; import org.netbeans.api.progress.ProgressHandleFactory; import org.openide.LifecycleManager; +import org.openide.filesystems.FileUtil; +import org.openide.loaders.DataObject; import org.openide.util.Cancellable; import org.openide.util.NbBundle; import org.openidex.search.SearchType; @@ -76,6 +78,7 @@ private volatile boolean finished = false; /** */ private final String replaceString; + private ProgressHandle progressHandle; /** @@ -96,6 +99,12 @@ ? basicSearchCriteria.getReplaceExpr() : null; } + + void searching(DataObject d) { + if (progressHandle != null) { + progressHandle.progress(NbBundle.getMessage(SearchTask.class, "MSG_searching_file", FileUtil.getFileDisplayName(d.getPrimaryFile()))); + } + } /** */ @@ -109,7 +118,7 @@ LifecycleManager.getDefault().saveAll(); } - ProgressHandle progressHandle = ProgressHandleFactory.createHandle( + progressHandle = ProgressHandleFactory.createHandle( NbBundle.getMessage(ResultView.class,"TEXT_SEARCHING___"), this); progressHandle.start(); @@ -129,6 +138,7 @@ searchGroup.setListeningSearchTask(null); finished = true; progressHandle.finish(); + progressHandle = null; } } diff --git a/utilities/src/org/netbeans/modules/search/SpecialSearchGroup.java b/utilities/src/org/netbeans/modules/search/SpecialSearchGroup.java --- a/utilities/src/org/netbeans/modules/search/SpecialSearchGroup.java +++ b/utilities/src/org/netbeans/modules/search/SpecialSearchGroup.java @@ -81,11 +81,13 @@ @Override public void doSearch() { - for (Iterator j = searchScope.getSearchInfo().objectsToSearch(); j.hasNext(); ) { + for (Iterator j = searchScope.getSearchInfo().objectsToSearch(); j.hasNext(); ) { if (stopped) { return; } - processSearchObject(/*DataObject*/ j.next()); + DataObject d = j.next(); + listeningSearchTask.searching(d); + processSearchObject(d); } }