Updating to recent changes in NetBeans proper
authorJan Lahoda <jlahoda@netbeans.org>
Tue, 15 Nov 2011 12:23:46 +0100
changeset 711e4c53fe73f0f
parent 710 bc922e24e58c
child 712 ba9977cbc901
Updating to recent changes in NetBeans proper
api/src/org/netbeans/modules/jackpot30/impl/batch/EnhancedScopes.java
api/src/org/netbeans/modules/jackpot30/impl/refactoring/AbstractApplyHintsRefactoringPlugin.java
     1.1 --- a/api/src/org/netbeans/modules/jackpot30/impl/batch/EnhancedScopes.java	Tue Nov 15 12:19:49 2011 +0100
     1.2 +++ b/api/src/org/netbeans/modules/jackpot30/impl/batch/EnhancedScopes.java	Tue Nov 15 12:23:46 2011 +0100
     1.3 @@ -75,6 +75,7 @@
     1.4  import java.util.Map.Entry;
     1.5  import java.util.Properties;
     1.6  import java.util.Set;
     1.7 +import java.util.concurrent.atomic.AtomicBoolean;
     1.8  import java.util.logging.Level;
     1.9  import java.util.logging.Logger;
    1.10  import org.codeviation.pojson.Pojson;
    1.11 @@ -92,6 +93,7 @@
    1.12  import org.openide.filesystems.URLMapper;
    1.13  import org.openide.util.Exceptions;
    1.14  import static org.netbeans.modules.jackpot30.remoting.api.WebUtilities.escapeForQuery;
    1.15 +import org.netbeans.modules.java.hints.jackpot.impl.batch.BatchSearch.VerifiedSpansCallBack;
    1.16  
    1.17  /**
    1.18   *
    1.19 @@ -379,7 +381,7 @@
    1.20          }
    1.21  
    1.22          @Override
    1.23 -        public void validateResource(Collection<? extends Resource> resources, ProgressHandleWrapper phw, BatchSearch.VerifiedSpansCallBack callback, boolean bln, Collection<? super MessageImpl> clctn1) {
    1.24 +        public void validateResource(Collection<? extends Resource> resources, ProgressHandleWrapper progress, VerifiedSpansCallBack callback, boolean doNotRegisterClassPath, Collection<? super MessageImpl> problems, AtomicBoolean cancel) {
    1.25              for (Resource r : resources) {
    1.26                  try {
    1.27                      URI spanURI = new URI(remoteIndex.remote.toExternalForm() + "/findSpans?path=" + escapeForQuery(remoteIndex.remoteSegment) + "&relativePath=" + escapeForQuery(r.getRelativePath()) + "&pattern=" + escapeForQuery(textualHintRepresentation));
     2.1 --- a/api/src/org/netbeans/modules/jackpot30/impl/refactoring/AbstractApplyHintsRefactoringPlugin.java	Tue Nov 15 12:19:49 2011 +0100
     2.2 +++ b/api/src/org/netbeans/modules/jackpot30/impl/refactoring/AbstractApplyHintsRefactoringPlugin.java	Tue Nov 15 12:23:46 2011 +0100
     2.3 @@ -140,7 +140,7 @@
     2.4                  public void cannotVerifySpan(Resource r) {
     2.5                      refactoringElements.addAll(refactoring, Utilities.createRefactoringElementImplementation(r.getResolvedFile(), prepareSpansFor(r), verify));
     2.6                  }
     2.7 -            }, problems);
     2.8 +            }, problems, cancel);
     2.9          } else {
    2.10              int[] parts = new int[candidates.getResources().size()];
    2.11              int   index = 0;