- move android tests to jme3-tests-template

.gitignore

@@ -61,4 +61,6 @@
 /sdk/jme3-vehicle-creator/build/
 /sdk/jme3-welcome-screen/build/
 /sdk/jme3-glsl-support/build/
-/netbeans/
+/netbeans/
+/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/JmeTestsProject.zip
+/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/JME3TestsAndroidProject.zip

sdk/build.xml

@@ -60,7 +60,7 @@
             <exclude name="**/dist/"/>
             <exclude name="**/nbproject/private/"/>
         </zip>
-        <zip basedir="JME3TestsTemplateAndroid/" destfile="jme3-templates/src/com/jme3/gde/templates/JME3TestsAndroidProject.zip">
+        <zip basedir="JME3TestsTemplateAndroid/" destfile="jme3-tests-template/src/com/jme3/gde/templates/tests/JME3TestsAndroidProject.zip">
             <exclude name="**/build/"/>
             <exclude name="**/dist/"/>
             <exclude name="**/mobile/assets/"/>

sdk/jme3-templates/src/com/jme3/gde/templates/Bundle.properties

@@ -5,4 +5,3 @@ OpenIDE-Module-Long-Description=\
 OpenIDE-Module-Name=Project Templates
 OpenIDE-Module-Short-Description=Provides Project Templates
 Templates/Project/JME3/BasicGameProject.zip=BasicGame
-Templates/Project/JME3/JME3TestsAndroidProject.zip=JME3 Tests Android

sdk/jme3-templates/src/com/jme3/gde/templates/layer.xml

@@ -12,13 +12,6 @@
                     <attr name="instantiatingWizardURL" urlvalue="nbresloc:/com/jme3/gde/templates/basic/BasicGameDescription.html"/>
                     <attr name="template" boolvalue="true"/>
                 </file>
-                <file name="JME3TestsAndroidProject.zip" url="JME3TestsAndroidProject.zip">
-                    <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/com/jme3/gde/templates/phone16.png"/>
-                    <attr name="displayName" bundlevalue="com.jme3.gde.templates.Bundle#Templates/Project/JME3/JME3TestsAndroidProject.zip"/>
-                    <attr name="instantiatingIterator" methodvalue="com.jme3.gde.templates.testsandroid.JME3TestsAndroidWizardIterator.createIterator"/>
-                    <attr name="instantiatingWizardURL" urlvalue="nbresloc:/com/jme3/gde/templates/testsandroid/JME3TestsAndroidDescription.html"/>
-                    <attr name="template" boolvalue="true"/>
-                </file>
             </folder>
         </folder>
         <folder name="JME3 Classes">

sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/Bundle.properties

@@ -5,8 +5,4 @@ OpenIDE-Module-Long-Description=\
 OpenIDE-Module-Name=Tests Template
 OpenIDE-Module-Short-Description=Provides Project Template with jME3 Tests
 Templates/Project/JME3/JmeTestsProject.zip=JME3 Tests
-JmeTestsPanelVisual.browseButton.text=Br&owse...
-JmeTestsPanelVisual.createdFolderLabel.text=Project &Folder:
-JmeTestsPanelVisual.projectLocationLabel.text=Project &Location:
-JmeTestsPanelVisual.projectNameLabel.text=Project &Name:
-JmeTestsPanelVisual.browseButton.actionCommand=BROWSE
+Templates/Project/JME3/JME3TestsAndroidProject.zip=JME3 Tests Android

sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/layer.xml

@@ -6,8 +6,15 @@
             <folder name="JME3">
                 <file name="JmeTestsProject.zip" url="JmeTestsProject.zip">
                     <attr name="displayName" bundlevalue="com.jme3.gde.templates.tests.Bundle#Templates/Project/JME3/JmeTestsProject.zip"/>
-                    <attr name="instantiatingIterator" methodvalue="com.jme3.gde.templates.tests.JmeTestsWizardIterator.createIterator"/>
-                    <attr name="instantiatingWizardURL" urlvalue="nbresloc:/com/jme3/gde/templates/tests/JmeTestsDescription.html"/>
+                    <attr name="instantiatingIterator" methodvalue="com.jme3.gde.templates.tests.testsdesktop.JmeTestsWizardIterator.createIterator"/>
+                    <attr name="instantiatingWizardURL" urlvalue="nbresloc:/com/jme3/gde/templates/tests/testsdesktop/JmeTestsDescription.html"/>
+                    <attr name="template" boolvalue="true"/>
+                </file>
+                <file name="JME3TestsAndroidProject.zip" url="JME3TestsAndroidProject.zip">
+                    <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/com/jme3/gde/templates/tests/testsandroid/phone16.png"/>
+                    <attr name="displayName" bundlevalue="com.jme3.gde.templates.tests.Bundle#Templates/Project/JME3/JME3TestsAndroidProject.zip"/>
+                    <attr name="instantiatingIterator" methodvalue="com.jme3.gde.templates.tests.testsandroid.JME3TestsAndroidWizardIterator.createIterator"/>
+                    <attr name="instantiatingWizardURL" urlvalue="nbresloc:/com/jme3/gde/templates/tests/testsandroid/JME3TestsAndroidDescription.html"/>
                     <attr name="template" boolvalue="true"/>
                 </file>
             </folder>

sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsandroid/JME3TestsAndroidPanelVisual.java

@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package com.jme3.gde.templates.testsandroid;
+package com.jme3.gde.templates.tests.testsandroid;
 
 import java.io.File;
 import javax.swing.JFileChooser;

sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsandroid/JME3TestsAndroidWizardIterator.java

@@ -29,7 +29,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package com.jme3.gde.templates.testsandroid;
+package com.jme3.gde.templates.tests.testsandroid;
 
 import java.awt.Component;
 import java.io.ByteArrayInputStream;

sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsandroid/JME3TestsAndroidWizardPanel.java

@@ -29,7 +29,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package com.jme3.gde.templates.testsandroid;
+package com.jme3.gde.templates.tests.testsandroid;
 
 import java.awt.Component;
 import java.util.HashSet;

sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsdesktop/Bundle.properties

@@ -0,0 +1,9 @@
+# To change this license header, choose License Headers in Project Properties.
+# To change this template file, choose Tools | Templates
+# and open the template in the editor.
+
+JmeTestsPanelVisual.projectNameLabel.text=Project &Name:
+JmeTestsPanelVisual.projectLocationLabel.text=Project &Location:
+JmeTestsPanelVisual.browseButton.actionCommand=BROWSE
+JmeTestsPanelVisual.browseButton.text=Br&owse...
+JmeTestsPanelVisual.createdFolderLabel.text=Project &Folder:

sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsdesktop/JmeTestsPanelVisual.form

@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 
 <Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
   <AuxValues>
@@ -66,7 +66,7 @@
           <ComponentRef name="projectNameTextField"/>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="com/jme3/gde/templates/tests/Bundle.properties" key="JmeTestsPanelVisual.projectNameLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="com/jme3/gde/templates/tests/testsdesktop/Bundle.properties" key="JmeTestsPanelVisual.projectNameLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <AuxValues>
@@ -81,7 +81,7 @@
           <ComponentRef name="projectLocationTextField"/>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="com/jme3/gde/templates/tests/Bundle.properties" key="JmeTestsPanelVisual.projectLocationLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="com/jme3/gde/templates/tests/testsdesktop/Bundle.properties" key="JmeTestsPanelVisual.projectLocationLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <AuxValues>
@@ -93,10 +93,10 @@
     <Component class="javax.swing.JButton" name="browseButton">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="com/jme3/gde/templates/tests/Bundle.properties" key="JmeTestsPanelVisual.browseButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="com/jme3/gde/templates/tests/testsdesktop/Bundle.properties" key="JmeTestsPanelVisual.browseButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
         <Property name="actionCommand" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="com/jme3/gde/templates/tests/Bundle.properties" key="JmeTestsPanelVisual.browseButton.actionCommand" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="com/jme3/gde/templates/tests/testsdesktop/Bundle.properties" key="JmeTestsPanelVisual.browseButton.actionCommand" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -109,7 +109,7 @@
           <ComponentRef name="createdFolderTextField"/>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="com/jme3/gde/templates/tests/Bundle.properties" key="JmeTestsPanelVisual.createdFolderLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="com/jme3/gde/templates/tests/testsdesktop/Bundle.properties" key="JmeTestsPanelVisual.createdFolderLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>

sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsdesktop/JmeTestsPanelVisual.java

@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package com.jme3.gde.templates.tests;
+package com.jme3.gde.templates.tests.testsdesktop;
 
 import java.io.File;
 import javax.swing.JFileChooser;

sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsdesktop/JmeTestsWizardIterator.java

@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package com.jme3.gde.templates.tests;
+package com.jme3.gde.templates.tests.testsdesktop;
 
 import java.awt.Component;
 import java.io.ByteArrayInputStream;

sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsdesktop/JmeTestsWizardPanel.java

@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package com.jme3.gde.templates.tests;
+package com.jme3.gde.templates.tests.testsdesktop;
 
 import java.awt.Component;
 import java.util.HashSet;