diff --git a/javascript.nodejs/src/org/netbeans/modules/javascript/nodejs/ui/resources/ExistingNodeJsProjectDescription.html b/javascript.nodejs/src/org/netbeans/modules/javascript/nodejs/ui/resources/ExistingNodeJsProjectDescription.html --- a/javascript.nodejs/src/org/netbeans/modules/javascript/nodejs/ui/resources/ExistingNodeJsProjectDescription.html +++ b/javascript.nodejs/src/org/netbeans/modules/javascript/nodejs/ui/resources/ExistingNodeJsProjectDescription.html @@ -47,6 +47,5 @@ Imports an existing Node.js application into a standard IDE project. Such project can be easily run and debugged.
- Note: Projects with package.json are already NetBeans projects, open them via File > Open Project. diff --git a/web.clientproject/manifest.mf b/web.clientproject/manifest.mf --- a/web.clientproject/manifest.mf +++ b/web.clientproject/manifest.mf @@ -3,5 +3,5 @@ OpenIDE-Module: org.netbeans.modules.web.clientproject OpenIDE-Module-Layer: org/netbeans/modules/web/clientproject/resources/layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/clientproject/Bundle.properties -OpenIDE-Module-Specification-Version: 1.81 +OpenIDE-Module-Specification-Version: 1.82 OpenIDE-Module-Provides: org.netbeans.modules.web.clientproject diff --git a/web.clientproject/nbproject/project.xml b/web.clientproject/nbproject/project.xml --- a/web.clientproject/nbproject/project.xml +++ b/web.clientproject/nbproject/project.xml @@ -168,7 +168,7 @@

1 - 1.79 + 1.80

diff --git a/web.clientproject/src/org/netbeans/modules/web/clientproject/util/ClientSideProjectUtilities.java b/web.clientproject/src/org/netbeans/modules/web/clientproject/util/ClientSideProjectUtilities.java --- a/web.clientproject/src/org/netbeans/modules/web/clientproject/util/ClientSideProjectUtilities.java +++ b/web.clientproject/src/org/netbeans/modules/web/clientproject/util/ClientSideProjectUtilities.java @@ -75,6 +75,7 @@ import org.netbeans.modules.web.clientproject.spi.SiteTemplateImplementation; import org.netbeans.modules.web.clientproject.ui.customizer.ClientSideProjectProperties; import org.netbeans.spi.project.ui.ProjectProblemsProvider; +import org.netbeans.spi.project.ui.support.ProjectConvertors; import org.openide.filesystems.FileObject; import org.openide.filesystems.FileUtil; import org.openide.util.NbBundle; @@ -102,6 +103,8 @@ /** * Check whether the given folder is already a project. + *

+ * This method ignores ProjectConvertor projects. * @param folder folder to be checked * @return {@code true} if the given folder is already a project, {@code false} otherwise */ @@ -115,7 +118,11 @@ } catch (IllegalArgumentException ex) { // noop } - return prj != null || foundButBroken; + if (prj != null + && !ProjectConvertors.isConvertorProject(prj)) { + return true; + } + return foundButBroken; } // XXX