1.1 --- a/html.angular/src/org/netbeans/modules/html/angular/index/AngularJsIndexer.java Wed Nov 06 16:50:26 2013 +0100
1.2 +++ b/html.angular/src/org/netbeans/modules/html/angular/index/AngularJsIndexer.java Wed Nov 06 16:53:54 2013 +0100
1.3 @@ -48,7 +48,6 @@
1.4 import java.util.Collection;
1.5 import java.util.HashMap;
1.6 import java.util.LinkedList;
1.7 -import java.util.List;
1.8 import java.util.Map;
1.9 import java.util.logging.Level;
1.10 import java.util.logging.Logger;
1.11 @@ -62,7 +61,6 @@
1.12 import org.netbeans.modules.parsing.spi.indexing.Indexable;
1.13 import org.netbeans.modules.parsing.spi.indexing.support.IndexDocument;
1.14 import org.netbeans.modules.parsing.spi.indexing.support.IndexingSupport;
1.15 -import org.openide.util.Exceptions;
1.16 import org.openide.util.Parameters;
1.17
1.18 /**
1.19 @@ -75,24 +73,22 @@
1.20
1.21 private static final Logger LOG = Logger.getLogger(AngularJsIndexer.class.getName());
1.22
1.23 - private static final ThreadLocal<Map<URI, Collection<AngularJsController>>> controllers = new ThreadLocal<Map<URI, Collection<AngularJsController>>>();
1.24 + private static final ThreadLocal<Map<URI, Collection<AngularJsController>>> controllers = new ThreadLocal<>();
1.25
1.26 public static void addController(@NonNull final URI uri, @NonNull final AngularJsController controller) {
1.27 - System.out.println("adding controller into AngularJsIndex");
1.28 final Map<URI, Collection<AngularJsController>> map = controllers.get();
1.29
1.30 if (map == null) {
1.31 throw new IllegalStateException("AngularJsIndexer.addControllers can be called only from scanner thread."); //NOI18N
1.32 }
1.33 - Collection<AngularJsController> controllers = map.get(uri);
1.34 - if (controllers == null) {
1.35 - controllers = new ArrayList<AngularJsController>();
1.36 - controllers.add(controller);
1.37 - map.put(uri, controllers);
1.38 + Collection<AngularJsController> cons = map.get(uri);
1.39 + if (cons == null) {
1.40 + cons = new ArrayList<AngularJsController>();
1.41 + cons.add(controller);
1.42 + map.put(uri, cons);
1.43 } else {
1.44 - controllers.add(controller);
1.45 + cons.add(controller);
1.46 }
1.47 - System.out.println("celkem ontrolleru: " + controllers.size());
1.48
1.49 }
1.50
1.51 @@ -119,8 +115,7 @@
1.52
1.53 @Override
1.54 protected void index(Indexable indexable, Parser.Result parserResult, Context context) {
1.55 - System.out.println("&&&&&&&&&&&&&&&&&&&Angular Js Indexer called");
1.56 - Collection<AngularJsController> controllers = null;
1.57 + Collection<AngularJsController> cons = null;
1.58 URI uri = null;
1.59 try {
1.60 uri = indexable.getURL().toURI();
1.61 @@ -128,8 +123,8 @@
1.62 LOG.log(Level.WARNING, null, ex);
1.63 }
1.64 if (uri != null) {
1.65 - controllers = getControllers(uri);
1.66 - if (controllers != null) {
1.67 + cons = getControllers(uri);
1.68 + if (cons != null) {
1.69 IndexingSupport support;
1.70 try {
1.71 support = IndexingSupport.getInstance(context);
1.72 @@ -138,9 +133,8 @@
1.73 return;
1.74 }
1.75 IndexDocument elementDocument = support.createDocument(indexable);
1.76 - for (AngularJsController controller : controllers) {
1.77 + for (AngularJsController controller : cons) {
1.78 elementDocument.addPair(FIELD_CONTROLLER, controller.getName()+":"+controller.getFqn(), true, true);
1.79 - System.out.println("################## stored controller tto the index: " + controller.getName()+":"+controller.getFqn());
1.80 }
1.81 support.addDocument(elementDocument);
1.82 // remove the cache
1.83 @@ -202,14 +196,10 @@
1.84 return super.scanStarted(context);
1.85 }
1.86
1.87 - private int counter = 0;
1.88 @Override
1.89 public void scanFinished(Context context) {
1.90 try {
1.91 - counter ++;
1.92 - System.out.println("##################postScanTask is runned. " + counter + " root: " + context.getRoot().getPath());
1.93 - for (Runnable task : postScanTasks.get()) {
1.94 -
1.95 + for (Runnable task : postScanTasks.get()) {
1.96 task.run();
1.97 }
1.98 } finally {