This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 153173
Collapse All | Expand All

(-)a/utilities/src/org/netbeans/modules/search/Bundle.properties (+2 lines)
Lines 104-109 Link Here
104 
TEXT_MSG_LIMIT_REACHED_FILES_COUNT=The search was stopped because the limit for number of matching files ({0,number}) was reached.
 104 
TEXT_MSG_LIMIT_REACHED_FILES_COUNT=The search was stopped because the limit for number of matching files ({0,number}) was reached.
105 
TEXT_MSG_LIMIT_REACHED_MATCHES_COUNT=The search was stopped because the limit for number of matching occurences ({0,number}) was reached or exceeded.
 105 
TEXT_MSG_LIMIT_REACHED_MATCHES_COUNT=The search was stopped because the limit for number of matching occurences ({0,number}) was reached or exceeded.
106 
TEXT_SEARCHING___=Searching...
 106 
TEXT_SEARCHING___=Searching...
107 
# {0} - file path
108 
MSG_searching_file=Searching in {0}
107 
TEXT_FINISHING_PREV_SEARCH=Finishing the previous search...
 109 
TEXT_FINISHING_PREV_SEARCH=Finishing the previous search...
108 
TEXT_CLEANING_RESULT=Cleaning the previous results...
 110 
TEXT_CLEANING_RESULT=Cleaning the previous results...
109 
TEXT_PRINTING_DETAILS=Printing details of the previous results...
 111 
TEXT_PRINTING_DETAILS=Printing details of the previous results...
(-)a/utilities/src/org/netbeans/modules/search/SearchTask.java (-1 / +11 lines)
Lines 46-51 Link Here
46 
import org.netbeans.api.progress.ProgressHandle;
 46 
import org.netbeans.api.progress.ProgressHandle;
47 
import org.netbeans.api.progress.ProgressHandleFactory;
 47 
import org.netbeans.api.progress.ProgressHandleFactory;
48 
import org.openide.LifecycleManager;
 48 
import org.openide.LifecycleManager;
49 
import org.openide.filesystems.FileUtil;
50 
import org.openide.loaders.DataObject;
49 
import org.openide.util.Cancellable;
 51 
import org.openide.util.Cancellable;
50 
import org.openide.util.NbBundle;
 52 
import org.openide.util.NbBundle;
51 
import org.openidex.search.SearchType;
 53 
import org.openidex.search.SearchType;
Lines 76-81 Link Here
76 
    private volatile boolean finished = false;
 78 
    private volatile boolean finished = false;
77 
    /** */
 79 
    /** */
78 
    private final String replaceString;
 80 
    private final String replaceString;
81 
    private ProgressHandle progressHandle;
79
82
80
83
81 
    /**
 84 
    /**
Lines 96-101 Link Here
96 
                             ? basicSearchCriteria.getReplaceExpr()
 99 
                             ? basicSearchCriteria.getReplaceExpr()
97 
                             : null;
 100 
                             : null;
98 
    }
 101 
    }
102 

            

            

              103
              
    void searching(DataObject d) {

            

            

              104
              
        if (progressHandle != null) {

            

            

              105
              
            progressHandle.progress(NbBundle.getMessage(SearchTask.class, "MSG_searching_file", FileUtil.getFileDisplayName(d.getPrimaryFile())));

            

            

              106
              
        }

            

            

              107
              
    }

            

        

          99
          
    

          108
          
    

        

        

          100
          
    /**

          109
          
    /**

        

        

          101
          
     */

          110
          
     */

        

  

    
      
            Lines 109-115
          
      
      
        Link Here
      
    
  

        

          109
          
            LifecycleManager.getDefault().saveAll();

          118
          
            LifecycleManager.getDefault().saveAll();

        

        

          110
          
        }

          119
          
        }

        

        

          111
          
        

          120
          
        

        

          
            

              112
              
        ProgressHandle progressHandle = ProgressHandleFactory.createHandle(


              121
              
        progressHandle = ProgressHandleFactory.createHandle(

            

        

          113
          
                NbBundle.getMessage(ResultView.class,"TEXT_SEARCHING___"), this);

          122
          
                NbBundle.getMessage(ResultView.class,"TEXT_SEARCHING___"), this);

        

        

          114
          
        progressHandle.start();

          123
          
        progressHandle.start();

        

        

          115
          
        

          124
          
        

        

  

    
      
            Lines 129-134
          
      
      
        Link Here
      
    
  

        

          129
          
            searchGroup.setListeningSearchTask(null);

          138
          
            searchGroup.setListeningSearchTask(null);

        

        

          130
          
            finished = true;

          139
          
            finished = true;

        

        

          131
          
            progressHandle.finish();

          140
          
            progressHandle.finish();

        

            

              
              
              141
              
            progressHandle = null;

            

        

          132
          
        }

          142
          
        }

        

        

          133
          
    }

          143
          
    }

        

        

          134
          
    

          144
          
    

        



(-)a/utilities/src/org/netbeans/modules/search/SpecialSearchGroup.java
      (-2 / +4 lines)




  

    
      
            Lines 81-91
          
      
      
        Link Here
      
    
  

        

          81
          
    

          81
          
    

        

        

          82
          
    @Override

          82
          
    @Override

        

        

          83
          
    public void doSearch() {

          83
          
    public void doSearch() {

        

          
            

              84
              
        for (Iterator j = searchScope.getSearchInfo().objectsToSearch(); j.hasNext(); ) {


              84
              
        for (Iterator<DataObject> j = searchScope.getSearchInfo().objectsToSearch(); j.hasNext(); ) {

            

        

          85
          
            if (stopped) {

          85
          
            if (stopped) {

        

        

          86
          
                return;

          86
          
                return;

        

        

          87
          
            }

          87
          
            }

        

          
            

              88
              
            processSearchObject(/*DataObject*/ j.next());


              88
              
            DataObject d = j.next();

            

            

              
              

              89
              
            listeningSearchTask.searching(d);

            

            


              90
              
            processSearchObject(d);

            

        

          89
          
        }

          91
          
        }

        

        

          90
          
    }

          92
          
    }

        

        

          91
          

          93
          

        






  

  Return to bug 153173