diff --git a/project.ant/manifest.mf b/project.ant/manifest.mf --- a/project.ant/manifest.mf +++ b/project.ant/manifest.mf @@ -1,5 +1,5 @@ Manifest-Version: 1.0 OpenIDE-Module: org.netbeans.modules.project.ant/1 -OpenIDE-Module-Specification-Version: 1.63 +OpenIDE-Module-Specification-Version: 1.64 OpenIDE-Module-Layer: org/netbeans/modules/project/ant/resources/mf-layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/project/ant/Bundle.properties diff --git a/project.ant/nbproject/project.xml b/project.ant/nbproject/project.xml --- a/project.ant/nbproject/project.xml +++ b/project.ant/nbproject/project.xml @@ -90,7 +90,7 @@ 1 - 1.78 + 1.80 @@ -128,14 +128,6 @@ - org.openide.util.ui - - - - 9.3 - - - org.openide.util @@ -151,6 +143,14 @@ 8.0 + + org.openide.util.ui + + + + 9.3 + + diff --git a/project.ant/src/org/netbeans/spi/project/support/ant/ProjectGenerator.java b/project.ant/src/org/netbeans/spi/project/support/ant/ProjectGenerator.java --- a/project.ant/src/org/netbeans/spi/project/support/ant/ProjectGenerator.java +++ b/project.ant/src/org/netbeans/spi/project/support/ant/ProjectGenerator.java @@ -57,6 +57,7 @@ import org.netbeans.api.project.ProjectManager; import org.netbeans.modules.project.ant.AntBasedProjectFactorySingleton; import org.netbeans.modules.project.ant.ProjectLibraryProvider; +import org.netbeans.spi.project.ui.support.ProjectConvertors; import org.openide.filesystems.FileObject; import org.openide.filesystems.FileUtil; import org.openide.util.Lookup; @@ -135,7 +136,8 @@ prj = ProjectManager.getDefault().findProject(directory); } } - if (prj != null) { + if (prj != null + && !ProjectConvertors.isConvertorProject(prj)) { throw new IllegalArgumentException("Already a " + prj.getClass().getName() + " in " + directory); // NOI18N } projectXml = FileUtil.createData(directory, AntProjectHelper.PROJECT_XML_PATH);