You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by jt...@apache.org on 2020/09/09 18:55:15 UTC
[netbeans] branch master updated: [NETBEANS-4696] html parser dont
wait for projects open
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new c29e77b [NETBEANS-4696] html parser dont wait for projects open
new 6f66a12 Merge pull request #2341 from errael/ParserNoWaitProjectOpen
c29e77b is described below
commit c29e77bb9b4224c22580bdedca1894d969440621
Author: Ernie Rael <er...@raelity.com>
AuthorDate: Wed Sep 2 22:35:44 2020 +0100
[NETBEANS-4696] html parser dont wait for projects open
---
webcommon/javascript2.knockout/nbproject/project.xml | 9 ---------
.../javascript2/knockout/index/KnockoutIndex.java | 17 -----------------
2 files changed, 26 deletions(-)
diff --git a/webcommon/javascript2.knockout/nbproject/project.xml b/webcommon/javascript2.knockout/nbproject/project.xml
index 3f6fae4..47a191a 100644
--- a/webcommon/javascript2.knockout/nbproject/project.xml
+++ b/webcommon/javascript2.knockout/nbproject/project.xml
@@ -97,15 +97,6 @@
</run-dependency>
</dependency>
<dependency>
- <code-name-base>org.netbeans.modules.projectuiapi.base</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.78</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
<code-name-base>org.openide.filesystems</code-name-base>
<build-prerequisite/>
<compile-dependency/>
diff --git a/webcommon/javascript2.knockout/src/org/netbeans/modules/javascript2/knockout/index/KnockoutIndex.java b/webcommon/javascript2.knockout/src/org/netbeans/modules/javascript2/knockout/index/KnockoutIndex.java
index eec45ef..42676c1 100644
--- a/webcommon/javascript2.knockout/src/org/netbeans/modules/javascript2/knockout/index/KnockoutIndex.java
+++ b/webcommon/javascript2.knockout/src/org/netbeans/modules/javascript2/knockout/index/KnockoutIndex.java
@@ -26,10 +26,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.WeakHashMap;
-import java.util.concurrent.ExecutionException;
-import java.util.logging.Logger;
import org.netbeans.api.project.Project;
-import org.netbeans.api.project.ui.OpenProjects;
import org.netbeans.modules.parsing.spi.indexing.support.IndexResult;
import org.netbeans.modules.parsing.spi.indexing.support.QuerySupport;
import org.openide.filesystems.FileObject;
@@ -40,12 +37,8 @@ import org.openide.util.Exceptions;
* @author Roman Svitanic
*/
public class KnockoutIndex {
-
- private static final Logger LOGGER = Logger.getLogger(KnockoutIndex.class.getSimpleName());
-
private static final Map<Project, KnockoutIndex> INDEXES = new WeakHashMap<>();
private final QuerySupport querySupport;
- private static boolean areProjectsOpen = false;
public static KnockoutIndex get(Project project) throws IOException {
if (project == null) {
@@ -54,16 +47,6 @@ public class KnockoutIndex {
synchronized (INDEXES) {
KnockoutIndex index = INDEXES.get(project);
if (index == null) {
- if (!areProjectsOpen) {
- try {
- // just be sure that the projects are open
- OpenProjects.getDefault().openProjects().get();
- } catch (InterruptedException | ExecutionException ex) {
- Exceptions.printStackTrace(ex);
- } finally {
- areProjectsOpen = true;
- }
- }
Collection<FileObject> sourceRoots = QuerySupport.findRoots(project,
null /* all source roots */,
Collections.<String>emptyList(),
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists