This is an automated email from the ASF dual-hosted git repository.
geertjan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 9b3eed2 [NETBEANS-2040] Maven first in New Project dialog
new 7815789 Merge pull request #1115 from
geertjanw/NETBEANS-2040]-maven-first
9b3eed2 is described below
commit 9b3eed220c3988b68634794e234c58a5126cda02
Author: Geertjan Wielenga <geert...@apache.org>
AuthorDate: Fri Feb 1 15:34:51 2019 +0100
[NETBEANS-2040] Maven first in New Project dialog
---
.../modules/apisupport/project/resources/layer.xml | 8 +++++---
.../project/ui/wizard/NewNbModuleWizardIterator.java | 2 +-
.../netbeans/modules/cloud/amazon/resources/empty.war | Bin 0 -> 2002 bytes
.../modules/j2ee/clientproject/ui/resources/layer.xml | 2 ++
.../j2ee/clientproject/ui/wizards/Bundle.properties | 4 ++--
.../modules/j2ee/earproject/ui/resources/layer.xml | 3 ++-
.../modules/j2ee/earproject/ui/wizards/Bundle.properties | 12 ++++++------
.../modules/j2ee/ejbjarproject/ui/resources/layer.xml | 2 ++
.../j2ee/ejbjarproject/ui/wizards/Bundle.properties | 4 ++--
.../netbeans/modules/web/freeform/resources/layer.xml | 3 ++-
.../netbeans/modules/web/project/ui/resources/layer.xml | 3 ++-
.../modules/web/project/ui/wizards/Bundle.properties | 6 +++---
.../src/org/netbeans/modules/gradle/Bundle.properties | 1 +
groovy/gradle/src/org/netbeans/modules/gradle/layer.xml | 3 ++-
.../modules/java/freeform/resources/Bundle.properties | 2 +-
.../netbeans/modules/java/freeform/resources/layer.xml | 4 ++--
.../ui/wizards/NewJ2SEModularProjectWizardIterator.java | 2 +-
.../modules/java/j2seproject/ui/resources/desktop.html | 2 +-
.../modules/java/j2seproject/ui/resources/layer.xml | 6 +++---
.../java/j2seproject/ui/wizards/Bundle.properties | 2 +-
.../ui/wizards/NewJ2SEProjectWizardIterator.java | 6 +++---
.../netbeans/modules/maven/htmlui/DukeScriptWizard.java | 4 ++--
java/maven/src/org/netbeans/modules/maven/layer.xml | 2 +-
.../netbeans/modules/maven/newproject/Bundle.properties | 2 +-
.../modules/maven/newproject/MavenWizardIterator.java | 2 +-
.../src/org/netbeans/modules/javafx2/project/layer.xml | 2 ++
26 files changed, 51 insertions(+), 38 deletions(-)
diff --git
a/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/layer.xml
b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/layer.xml
index 2b0ad2d..0557608 100644
---
a/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/layer.xml
+++
b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/layer.xml
@@ -263,9 +263,11 @@
</file>
</folder>
<folder name="Project">
- <folder name="APISupport">
- <attr name="displayName"
bundlevalue="org.netbeans.modules.apisupport.project.ui.wizard.Bundle#Templates/Project/APISupport"/>
- <attr name="position" intvalue="900"/>
+ <folder name="AntJava">
+ <folder name="APISupport">
+ <attr name="displayName"
bundlevalue="org.netbeans.modules.apisupport.project.ui.wizard.Bundle#Templates/Project/APISupport"/>
+ <attr name="position" intvalue="900"/>
+ </folder>
</folder>
</folder>
</folder>
diff --git
a/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/NewNbModuleWizardIterator.java
b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/NewNbModuleWizardIterator.java
index 2043983..cc6239f 100644
---
a/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/NewNbModuleWizardIterator.java
+++
b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/NewNbModuleWizardIterator.java
@@ -52,7 +52,7 @@ import org.openide.util.NbBundle.Messages;
*/
public class NewNbModuleWizardIterator implements
WizardDescriptor.AsynchronousInstantiatingIterator<WizardDescriptor> {
- private static final String FOLDER = "Project/APISupport";
+ private static final String FOLDER = "Project/AntJava/APISupport";
private static final String MODULE_ICON =
"org/netbeans/modules/apisupport/project/resources/module.png";
private static final String SUITE_ICON =
"org/netbeans/modules/apisupport/project/suite/resources/suite.png";
diff --git
a/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/resources/empty.war
b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/resources/empty.war
new file mode 100644
index 0000000..719f01f
Binary files /dev/null and
b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/resources/empty.war
differ
diff --git
a/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/layer.xml
b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/layer.xml
index c12293f..fb27e53 100644
---
a/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/layer.xml
+++
b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/layer.xml
@@ -24,6 +24,7 @@
<folder name="Templates">
<folder name="Project">
+ <folder name="AntJava">
<folder name="J2EE">
<attr name="position" intvalue="400"/>
<file name="emptyCar.xml">
@@ -44,6 +45,7 @@
<attr name="instantiatingWizardURL"
urlvalue="nbresloc:/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-importProject.html"/>
</file>
</folder>
+ </folder>
</folder>
</folder>
diff --git
a/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/Bundle.properties
b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/Bundle.properties
index 1e5b8d0..cc097c2 100644
---
a/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/Bundle.properties
+++
b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/Bundle.properties
@@ -16,8 +16,8 @@
# under the License.
#System file system
-Templates/Project/J2EE/emptyCar.xml=Enterprise Application Client
-Templates/Project/J2EE/importCar.xml=Enterprise Application Client with
Existing Sources
+Templates/Project/AntJava/J2EE/emptyCar.xml=Enterprise Application Client
+Templates/Project/AntJava/J2EE/importCar.xml=Enterprise Application Client
with Existing Sources
#FolderList
CTL_AddFolder=Add Folder...
diff --git
a/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/layer.xml
b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/layer.xml
index 66f62e6..2eff909 100644
---
a/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/layer.xml
+++
b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/layer.xml
@@ -23,7 +23,7 @@
<filesystem>
<folder name="Templates">
<folder name="Project">
-
+ <folder name="AntJava">
<folder name="J2EE">
<attr name="SystemFileSystem.localizingBundle"
stringvalue="org.netbeans.modules.j2ee.earproject.ui.wizards.Bundle"/>
<attr name="instantiatingWizardURL"
urlvalue="nbresloc:/org/netbeans/modules/j2ee/earproject/ui/resources/ear.html"/>
@@ -45,6 +45,7 @@
<attr name="templateWizardURL"
urlvalue="nbresloc:/org/netbeans/modules/j2ee/earproject/ui/resources/ear-importProject.html"/>
</file>
</folder>
+ </folder>
</folder>
</folder>
<folder name="org-netbeans-modules-j2ee-earproject">
diff --git
a/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/Bundle.properties
b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/Bundle.properties
index a0f7194..a501f84 100644
---
a/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/Bundle.properties
+++
b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/Bundle.properties
@@ -18,12 +18,12 @@
#
TXT_DefaultProjectName=EnterpriseApplication{0}
#System file system
-Templates/Project/J2EE=Java EE
-Templates/Project/J2EE/emptyEar.xml=Enterprise Application
-Templates/Project/J2EE/completeEar.xml=Populated Enterprise Application
-Templates/Project/J2EE/importBlueprintEar.xml=Enterprise Application with
Existing Sources
-Templates/Project/J2EE/emptyEjbJar.xml=EJB Module
-Templates/Project/J2EE/importEjbJar.xml=EJB Module with Existing Sources
+Templates/Project/AntJava/J2EE=Java Enterprise
+Templates/Project/AntJava/J2EE/emptyEar.xml=Enterprise Application
+Templates/Project/AntJava/J2EE/completeEar.xml=Populated Enterprise Application
+Templates/Project/AntJava/J2EE/importBlueprintEar.xml=Enterprise Application
with Existing Sources
+Templates/Project/AntJava/J2EE/emptyEjbJar.xml=EJB Module
+Templates/Project/AntJava/J2EE/importEjbJar.xml=EJB Module with Existing
Sources
#NewWebProjectWizardIterator
LBL_WizardStepsCount={0} of {1}
diff --git
a/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/resources/layer.xml
b/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/resources/layer.xml
index 3a6b2f3..ae80049 100644
---
a/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/resources/layer.xml
+++
b/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/resources/layer.xml
@@ -23,6 +23,7 @@
<filesystem>
<folder name="Templates">
<folder name="Project">
+ <folder name="AntJava">
<folder name="J2EE">
<!-- Add template for the J2SE project -->
<file name="emptyEjbJar.xml">
@@ -42,6 +43,7 @@
<attr name="templateWizardURL"
urlvalue="nbresloc:/org/netbeans/modules/j2ee/ejbjarproject/ui/resources/ejb-importProject.html"/>
</file>
</folder>
+ </folder>
</folder>
</folder>
diff --git
a/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/Bundle.properties
b/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/Bundle.properties
index 1eae575..ac1a5c2 100644
---
a/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/Bundle.properties
+++
b/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/Bundle.properties
@@ -18,8 +18,8 @@
#
#System file system
-Templates/Project/J2EE/emptyEjbJar.xml=EJB Module
-Templates/Project/J2EE/importEjbJar.xml=EJB Module with Existing Sources
+Templates/Project/AntJava/J2EE/emptyEjbJar.xml=EJB Module
+Templates/Project/AntJava/J2EE/importEjbJar.xml=EJB Module with Existing
Sources
#NewEjbJarProjectWizardIterator
LBL_WizardStepsCount={0} of {1}
diff --git
a/enterprise/web.freeform/src/org/netbeans/modules/web/freeform/resources/layer.xml
b/enterprise/web.freeform/src/org/netbeans/modules/web/freeform/resources/layer.xml
index 3b83452..4ee092e 100644
---
a/enterprise/web.freeform/src/org/netbeans/modules/web/freeform/resources/layer.xml
+++
b/enterprise/web.freeform/src/org/netbeans/modules/web/freeform/resources/layer.xml
@@ -23,6 +23,7 @@
<filesystem>
<folder name="Templates">
<folder name="Project">
+ <folder name="AntJava">
<folder name="Web">
<file name="webfreeform.xml">
<attr name="position" intvalue="300"/>
@@ -34,7 +35,7 @@
<attr name="instantiatingWizardURL"
urlvalue="nbresloc:/org/netbeans/modules/web/freeform/resources/freeform-project-web.html"/>
</file>
</folder>
-
+ </folder>
</folder>
</folder>
<folder name="ProjectXMLCatalog">
diff --git
a/enterprise/web.project/src/org/netbeans/modules/web/project/ui/resources/layer.xml
b/enterprise/web.project/src/org/netbeans/modules/web/project/ui/resources/layer.xml
index fad85d7..f955dd9 100644
---
a/enterprise/web.project/src/org/netbeans/modules/web/project/ui/resources/layer.xml
+++
b/enterprise/web.project/src/org/netbeans/modules/web/project/ui/resources/layer.xml
@@ -23,7 +23,7 @@
<filesystem>
<folder name="Templates">
<folder name="Project">
-
+ <folder name="AntJava">
<folder name="Web">
<attr name="SystemFileSystem.localizingBundle"
stringvalue="org.netbeans.modules.web.project.ui.wizards.Bundle"/>
<attr name="instantiatingWizardURL"
urlvalue="nbresloc:/org/netbeans/modules/web/project/ui/resources/web.html"/>
@@ -49,6 +49,7 @@
<attr name="templateWizardURL"
urlvalue="nbresloc:/org/netbeans/modules/web/project/ui/resources/web-importProject.html"/>
</file>
</folder>
+ </folder>
</folder>
</folder>
<folder name="Loaders">
diff --git
a/enterprise/web.project/src/org/netbeans/modules/web/project/ui/wizards/Bundle.properties
b/enterprise/web.project/src/org/netbeans/modules/web/project/ui/wizards/Bundle.properties
index e3ea188..4fa7fb2 100644
---
a/enterprise/web.project/src/org/netbeans/modules/web/project/ui/wizards/Bundle.properties
+++
b/enterprise/web.project/src/org/netbeans/modules/web/project/ui/wizards/Bundle.properties
@@ -18,9 +18,9 @@
#
#System file system
-Templates/Project/Web=Java Web
-Templates/Project/Web/emptyWeb.xml=Web Application
-Templates/Project/Web/importWeb.xml=Web Application with Existing Sources
+Templates/Project/AntJava/Web=Java Web
+Templates/Project/AntJava/Web/emptyWeb.xml=Web Application
+Templates/Project/AntJava/Web/importWeb.xml=Web Application with Existing
Sources
#NewWebProjectWizardIterator
LBL_WizardStepsCount={0} of {1}
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/Bundle.properties
b/groovy/gradle/src/org/netbeans/modules/gradle/Bundle.properties
index ea14012..b63c660 100644
--- a/groovy/gradle/src/org/netbeans/modules/gradle/Bundle.properties
+++ b/groovy/gradle/src/org/netbeans/modules/gradle/Bundle.properties
@@ -18,3 +18,4 @@
OpenIDE-Module-Display-Category=Gradle
OpenIDE-Module-Name=Gradle Projects
OpenIDE-Module-Short-Description=Provides basic infrastructure binding between
NetBeans and Gradle
+Templates/Project/Gradle=Java with Gradle
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/layer.xml
b/groovy/gradle/src/org/netbeans/modules/gradle/layer.xml
index a545da1..90cd2e4 100644
--- a/groovy/gradle/src/org/netbeans/modules/gradle/layer.xml
+++ b/groovy/gradle/src/org/netbeans/modules/gradle/layer.xml
@@ -24,7 +24,8 @@
<folder name="Templates">
<folder name="Project">
<folder name="Gradle">
- <attr name="position" intvalue="500"/>
+ <attr name="displayName"
bundlevalue="org.netbeans.modules.gradle.Bundle#Templates/Project/Gradle"/>
+ <attr name="position" intvalue="150"/>
</folder>
</folder>
</folder>
diff --git
a/java/java.freeform/src/org/netbeans/modules/java/freeform/resources/Bundle.properties
b/java/java.freeform/src/org/netbeans/modules/java/freeform/resources/Bundle.properties
index b7e439f..e95e1e0 100644
---
a/java/java.freeform/src/org/netbeans/modules/java/freeform/resources/Bundle.properties
+++
b/java/java.freeform/src/org/netbeans/modules/java/freeform/resources/Bundle.properties
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-Templates/Project/Standard/j2sefreeform.xml=Java Free-Form Project
+Templates/Project/AntJava/j2sefreeform.xml=Java Free-Form Project
diff --git
a/java/java.freeform/src/org/netbeans/modules/java/freeform/resources/layer.xml
b/java/java.freeform/src/org/netbeans/modules/java/freeform/resources/layer.xml
index a7526c2..5cb32f6 100644
---
a/java/java.freeform/src/org/netbeans/modules/java/freeform/resources/layer.xml
+++
b/java/java.freeform/src/org/netbeans/modules/java/freeform/resources/layer.xml
@@ -23,9 +23,9 @@
<filesystem>
<folder name="Templates">
<folder name="Project">
- <folder name="Standard">
+ <folder name="AntJava">
<file name="j2sefreeform.xml">
- <attr name="displayName"
bundlevalue="org.netbeans.modules.java.freeform.resources.Bundle#Templates/Project/Standard/j2sefreeform.xml"/>
+ <attr name="displayName"
bundlevalue="org.netbeans.modules.java.freeform.resources.Bundle#Templates/Project/AntJava/j2sefreeform.xml"/>
<attr name="iconBase"
stringvalue="org/netbeans/modules/ant/freeform/resources/freeform-project.png"/>
<attr name="position" intvalue="400"/>
<attr name="template" boolvalue="true"/>
diff --git
a/java/java.j2semodule/src/org/netbeans/modules/java/j2semodule/ui/wizards/NewJ2SEModularProjectWizardIterator.java
b/java/java.j2semodule/src/org/netbeans/modules/java/j2semodule/ui/wizards/NewJ2SEModularProjectWizardIterator.java
index 245325d..7c7e960 100644
---
a/java/java.j2semodule/src/org/netbeans/modules/java/j2semodule/ui/wizards/NewJ2SEModularProjectWizardIterator.java
+++
b/java/java.j2semodule/src/org/netbeans/modules/java/j2semodule/ui/wizards/NewJ2SEModularProjectWizardIterator.java
@@ -59,7 +59,7 @@ public class NewJ2SEModularProjectWizardIterator implements
WizardDescriptor.Pro
private NewJ2SEModularProjectWizardIterator() {
}
- @TemplateRegistration(folder="Project/Standard", position=350,
displayName="#template_multimodule",
iconBase="org/netbeans/modules/java/j2semodule/ui/resources/j2seModuleProject.png",
description="../resources/emptyModuleProject.html")
+ @TemplateRegistration(folder="Project/AntJava", position=350,
displayName="#template_multimodule",
iconBase="org/netbeans/modules/java/j2semodule/ui/resources/j2seModuleProject.png",
description="../resources/emptyModuleProject.html")
@Messages("template_multimodule=Java Modular Project")
public static NewJ2SEModularProjectWizardIterator multiModule() {
return new NewJ2SEModularProjectWizardIterator();
diff --git
a/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/resources/desktop.html
b/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/resources/desktop.html
index ef3d03b..20f3d6a 100644
---
a/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/resources/desktop.html
+++
b/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/resources/desktop.html
@@ -24,6 +24,6 @@
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
</head>
<BODY>
- The Java Desktop Application Projects.
+ Ant-based Java SE applications.
</BODY>
</HTML>
diff --git
a/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/resources/layer.xml
b/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/resources/layer.xml
index 70b7896..9cbdcc5 100644
---
a/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/resources/layer.xml
+++
b/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/resources/layer.xml
@@ -24,10 +24,10 @@
<folder name="Templates">
<folder name="Project">
- <folder name="Standard">
- <attr name="displayName"
bundlevalue="org.netbeans.modules.java.j2seproject.ui.wizards.Bundle#Templates/Project/Standard"/>
+ <folder name="AntJava">
+ <attr name="displayName"
bundlevalue="org.netbeans.modules.java.j2seproject.ui.wizards.Bundle#Templates/Project/AntJava"/>
<attr name="instantiatingWizardURL"
urlvalue="nbresloc:/org/netbeans/modules/java/j2seproject/ui/resources/desktop.html"/>
- <attr name="position" intvalue="100"/>
+ <attr name="position" intvalue="170"/>
</folder>
</folder>
</folder>
diff --git
a/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/wizards/Bundle.properties
b/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/wizards/Bundle.properties
index 5a79798..86e40e4 100644
---
a/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/wizards/Bundle.properties
+++
b/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/wizards/Bundle.properties
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-Templates/Project/Standard=Java
+Templates/Project/AntJava=Java with Ant
#New project wizard
TXT_DefaultPackageName=mypkg
diff --git
a/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/wizards/NewJ2SEProjectWizardIterator.java
b/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/wizards/NewJ2SEProjectWizardIterator.java
index a4b5cf9..c32ec95 100644
---
a/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/wizards/NewJ2SEProjectWizardIterator.java
+++
b/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/wizards/NewJ2SEProjectWizardIterator.java
@@ -68,19 +68,19 @@ public class NewJ2SEProjectWizardIterator implements
WizardDescriptor.ProgressIn
this.type = type;
}
- @TemplateRegistration(folder="Project/Standard", position=100,
displayName="#template_app",
iconBase="org/netbeans/modules/java/j2seproject/ui/resources/j2seProject.png",
description="../resources/emptyProject.html")
+ @TemplateRegistration(folder="Project/AntJava", position=100,
displayName="#template_app",
iconBase="org/netbeans/modules/java/j2seproject/ui/resources/j2seProject.png",
description="../resources/emptyProject.html")
@Messages("template_app=Java Application")
public static NewJ2SEProjectWizardIterator app() {
return new NewJ2SEProjectWizardIterator(WizardType.APP);
}
- @TemplateRegistration(folder="Project/Standard", position=200,
displayName="#template_library",
iconBase="org/netbeans/modules/java/j2seproject/ui/resources/j2seProject.png",
description="../resources/emptyLibrary.html")
+ @TemplateRegistration(folder="Project/AntJava", position=200,
displayName="#template_library",
iconBase="org/netbeans/modules/java/j2seproject/ui/resources/j2seProject.png",
description="../resources/emptyLibrary.html")
@Messages("template_library=Java Class Library")
public static NewJ2SEProjectWizardIterator library() {
return new NewJ2SEProjectWizardIterator(WizardType.LIB);
}
- @TemplateRegistration(folder="Project/Standard", position=300,
displayName="#template_existing",
iconBase="org/netbeans/modules/java/j2seproject/ui/resources/j2seProject.png",
description="../resources/existingProject.html")
+ @TemplateRegistration(folder="Project/AntJava", position=300,
displayName="#template_existing",
iconBase="org/netbeans/modules/java/j2seproject/ui/resources/j2seProject.png",
description="../resources/existingProject.html")
@Messages("template_existing=Java Project with Existing Sources")
public static NewJ2SEProjectWizardIterator existing() {
return new NewJ2SEProjectWizardIterator(WizardType.EXT);
diff --git
a/java/maven.htmlui/src/org/netbeans/modules/maven/htmlui/DukeScriptWizard.java
b/java/maven.htmlui/src/org/netbeans/modules/maven/htmlui/DukeScriptWizard.java
index 7b3fdea..e8d0c4b 100644
---
a/java/maven.htmlui/src/org/netbeans/modules/maven/htmlui/DukeScriptWizard.java
+++
b/java/maven.htmlui/src/org/netbeans/modules/maven/htmlui/DukeScriptWizard.java
@@ -56,10 +56,10 @@ import org.openide.util.RequestProcessor;
})
public class DukeScriptWizard {
@TemplateRegistration(
- position = 133,
+ position = 120,
page = "dukeScriptWizard.html",
content = "dukescript.archetype",
- folder = "Project/Standard",
+ folder = "Project/Maven2",
displayName = "#DukeScriptWizard_displayName",
iconBase = "org/netbeans/modules/maven/htmlui/DukeHTML.png",
description = "description.html"
diff --git a/java/maven/src/org/netbeans/modules/maven/layer.xml
b/java/maven/src/org/netbeans/modules/maven/layer.xml
index addf77b..0010522 100644
--- a/java/maven/src/org/netbeans/modules/maven/layer.xml
+++ b/java/maven/src/org/netbeans/modules/maven/layer.xml
@@ -32,7 +32,7 @@
<folder name="Project">
<folder name="Maven2">
<attr name="displayName"
bundlevalue="org.netbeans.modules.maven.newproject.Bundle#Templates/Project/Maven2"/>
- <attr name="position" intvalue="513"/>
+ <attr name="position" intvalue="100"/>
</folder>
</folder>
</folder>
diff --git
a/java/maven/src/org/netbeans/modules/maven/newproject/Bundle.properties
b/java/maven/src/org/netbeans/modules/maven/newproject/Bundle.properties
index 2e949c7..43f4ca6 100644
--- a/java/maven/src/org/netbeans/modules/maven/newproject/Bundle.properties
+++ b/java/maven/src/org/netbeans/modules/maven/newproject/Bundle.properties
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-Templates/Project/Maven2=Maven
+Templates/Project/Maven2=Java with Maven
UseOpenPanel.jTextArea1.text=Any Maven-based project can be opened and used
within the IDE without any import procedure.\n\nClick Finish to open a project
using the Open Project dialog.\n\n
LBL_Description=&Description\:
LBL_ProjectName=Project &Name\:
diff --git
a/java/maven/src/org/netbeans/modules/maven/newproject/MavenWizardIterator.java
b/java/maven/src/org/netbeans/modules/maven/newproject/MavenWizardIterator.java
index 898c662..e7c9b5a 100644
---
a/java/maven/src/org/netbeans/modules/maven/newproject/MavenWizardIterator.java
+++
b/java/maven/src/org/netbeans/modules/maven/newproject/MavenWizardIterator.java
@@ -73,7 +73,7 @@ public class MavenWizardIterator implements
WizardDescriptor.BackgroundInstantia
// return
ArchetypeWizards.definedArchetype("org.apache.maven.archetypes",
"maven-archetype-quickstart", "1.1", null, LBL_Maven_Quickstart_Archetype());
// }
- @TemplateRegistration(folder=ArchetypeWizards.TEMPLATE_FOLDER,
position=120, displayName="#LBL_Maven_JavaFx_Archetype",
iconBase="org/netbeans/modules/maven/resources/jaricon.png",
description="javafx.html")
+ @TemplateRegistration(folder=ArchetypeWizards.TEMPLATE_FOLDER,
position=920, displayName="#LBL_Maven_JavaFx_Archetype",
iconBase="org/netbeans/modules/maven/resources/jaricon.png",
description="javafx.html")
@Messages("LBL_Maven_JavaFx_Archetype=JavaFX Application")
public static WizardDescriptor.InstantiatingIterator<?> javafx() {
return
ArchetypeWizards.definedArchetype("org.codehaus.mojo.archetypes", "javafx",
"0.6", null, LBL_Maven_JavaFx_Archetype());
diff --git
a/javafx/javafx2.project/src/org/netbeans/modules/javafx2/project/layer.xml
b/javafx/javafx2.project/src/org/netbeans/modules/javafx2/project/layer.xml
index 11a6ef1..13f37a2 100644
--- a/javafx/javafx2.project/src/org/netbeans/modules/javafx2/project/layer.xml
+++ b/javafx/javafx2.project/src/org/netbeans/modules/javafx2/project/layer.xml
@@ -39,6 +39,7 @@
</folder>
<folder name="Project">
+ <folder name="AntJava">
<folder name="JavaFX">
<attr name="displayName"
bundlevalue="org.netbeans.modules.javafx2.project.Bundle#Templates/Project/JavaFX"/>
<attr name="position" intvalue="195"/>
@@ -88,6 +89,7 @@
<attr name="instantiatingIterator"
methodvalue="org.netbeans.modules.javafx2.project.JavaFXProjectWizardIterator.existing"/>
</file>
</folder>
+ </folder>
</folder>
<folder name="javafx">
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
