This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 250268
Collapse All | Expand All

(-)a/project.ant/manifest.mf (-1 / +1 lines)
Lines 1-5 Link Here
1 
Manifest-Version: 1.0
 1 
Manifest-Version: 1.0
2 
OpenIDE-Module: org.netbeans.modules.project.ant/1
 2 
OpenIDE-Module: org.netbeans.modules.project.ant/1
3 
OpenIDE-Module-Specification-Version: 1.63
 3 
OpenIDE-Module-Specification-Version: 1.64
4 
OpenIDE-Module-Layer: org/netbeans/modules/project/ant/resources/mf-layer.xml
 4 
OpenIDE-Module-Layer: org/netbeans/modules/project/ant/resources/mf-layer.xml
5 
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/project/ant/Bundle.properties
 5 
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/project/ant/Bundle.properties
(-)a/project.ant/nbproject/project.xml (-9 / +9 lines)
Lines 90-96 Link Here
90 
                    <compile-dependency/>
 90 
                    <compile-dependency/>
91 
                    <run-dependency>
 91 
                    <run-dependency>
92 
                        <release-version>1</release-version>
 92 
                        <release-version>1</release-version>
93 
                        <specification-version>1.78</specification-version>
 93 
                        <specification-version>1.80</specification-version>
94 
                    </run-dependency>
 94 
                    </run-dependency>
95 
                </dependency>
 95 
                </dependency>
96 
                <dependency>
 96 
                <dependency>
Lines 128-141 Link Here
128 
                    </run-dependency>
 128 
                    </run-dependency>
129 
                </dependency>
 129 
                </dependency>
130 
                <dependency>
 130 
                <dependency>
131 
                    <code-name-base>org.openide.util.ui</code-name-base>
132 
                    <build-prerequisite/>
133 
                    <compile-dependency/>
134 
                    <run-dependency>
135 
                        <specification-version>9.3</specification-version>
136 
                    </run-dependency>
137 
                </dependency>
138 
                <dependency>
139 
                    <code-name-base>org.openide.util</code-name-base>
 131 
                    <code-name-base>org.openide.util</code-name-base>
140 
                    <build-prerequisite/>
 132 
                    <build-prerequisite/>
141 
                    <compile-dependency/>
 133 
                    <compile-dependency/>
Lines 151-156 Link Here
151 
                        <specification-version>8.0</specification-version>
 143 
                        <specification-version>8.0</specification-version>
152 
                    </run-dependency>
 144 
                    </run-dependency>
153 
                </dependency>
 145 
                </dependency>
146 
                <dependency>
147 
                    <code-name-base>org.openide.util.ui</code-name-base>
148 
                    <build-prerequisite/>
149 
                    <compile-dependency/>
150 
                    <run-dependency>
151 
                        <specification-version>9.3</specification-version>
152 
                    </run-dependency>
153 
                </dependency>
154 
            </module-dependencies>
 154 
            </module-dependencies>
155 
            <test-dependencies>
 155 
            <test-dependencies>
156 
                <test-type>
 156 
                <test-type>
(-)a/project.ant/src/org/netbeans/spi/project/support/ant/ProjectGenerator.java (-1 / +3 lines)
Lines 57-62 Link Here
57 
import org.netbeans.api.project.ProjectManager;
 57 
import org.netbeans.api.project.ProjectManager;
58 
import org.netbeans.modules.project.ant.AntBasedProjectFactorySingleton;
 58 
import org.netbeans.modules.project.ant.AntBasedProjectFactorySingleton;
59 
import org.netbeans.modules.project.ant.ProjectLibraryProvider;
 59 
import org.netbeans.modules.project.ant.ProjectLibraryProvider;
60 
import org.netbeans.spi.project.ui.support.ProjectConvertors;
60 
import org.openide.filesystems.FileObject;
 61 
import org.openide.filesystems.FileObject;
61 
import org.openide.filesystems.FileUtil;
 62 
import org.openide.filesystems.FileUtil;
62 
import org.openide.util.Lookup;
 63 
import org.openide.util.Lookup;
Lines 135-141 Link Here
135 
                            prj = ProjectManager.getDefault().findProject(directory);
 136 
                            prj = ProjectManager.getDefault().findProject(directory);
136 
                        }
 137 
                        }
137 
                    }
 138 
                    }
138 
                    if (prj != null) {
 139 
                    if (prj != null
140 
                            && !ProjectConvertors.isConvertorProject(prj)) {
139 
                        throw new IllegalArgumentException("Already a " + prj.getClass().getName() + " in " + directory); // NOI18N
 141 
                        throw new IllegalArgumentException("Already a " + prj.getClass().getName() + " in " + directory); // NOI18N
140 
                    }
 142 
                    }
141 
                    projectXml = FileUtil.createData(directory, AntProjectHelper.PROJECT_XML_PATH);
 143 
                    projectXml = FileUtil.createData(directory, AntProjectHelper.PROJECT_XML_PATH);

Return to bug 250268