SDK:

- Add AssetKey properties to Model Import dialog
- Improve ProjectAssetManager path handling
- Allow setting AssetKey data in AssetDataObject (Uses apache BeanUtils to copy data from other AssetKey)
- Set version number and dependency to 3.0.0 for all plugins
- Change some plugin names
- Set "jMonkeyEngine" as plugin group name

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8093 75d07b2b-3a1a-0410-a2c5-0572b91ccdca

sdk/jme3-angelfont/nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=3d57892f
+build.xml.data.CRC32=ce596b22
 build.xml.script.CRC32=03444ead
-build.xml.stylesheet.CRC32=a56c6a5b@1.42.2
+build.xml.stylesheet.CRC32=a56c6a5b@1.46.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=3d57892f
+nbproject/build-impl.xml.data.CRC32=ce596b22
 nbproject/build-impl.xml.script.CRC32=8812c775
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.42.2
+nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.1

sdk/jme3-angelfont/nbproject/project.properties

@@ -1,3 +1,4 @@
+#Thu, 25 Aug 2011 20:26:50 +0200
 javac.source=1.5
-javac.compilerargs=-Xlint -Xlint:-serial
+javac.compilerargs=-Xlint -Xlint\:-serial
-spec.version.base=0.6.0
+spec.version.base=3.0.0

sdk/jme3-angelfont/nbproject/project.xml

@@ -12,7 +12,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>0.12</specification-version>
+                        <specification-version>3.0.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -21,7 +21,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>0.8.1</specification-version>
+                        <specification-version>3.0.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

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

@@ -1,6 +1,6 @@
-OpenIDE-Module-Display-Category=jMonkeyPlatform
+OpenIDE-Module-Display-Category=jMonkeyEngine
 OpenIDE-Module-Long-Description=\
-    Font Support for jMonkeyPlatform, create AngelFont files from system fonts
+    Font Support for jMonkeyEngine GDE, create AngelFont files from system fonts
 OpenIDE-Module-Name=Font Creator
 OpenIDE-Module-Short-Description=Create AngelFont files from system fonts
 Templates/GUI/angelFont=Font

sdk/jme3-assetpack-support/nbproject/genfiles.properties

@@ -3,6 +3,6 @@ build.xml.script.CRC32=c0969383
 build.xml.stylesheet.CRC32=a56c6a5b@1.42.2
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=0fd46426
+nbproject/build-impl.xml.data.CRC32=c12b0188
 nbproject/build-impl.xml.script.CRC32=4d376df0
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45.1
+nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.1

sdk/jme3-assetpack-support/nbproject/project.properties

@@ -1,7 +1,8 @@
+#Thu, 25 Aug 2011 20:26:49 +0200
 javac.source=1.5
-javac.compilerargs=-Xlint -Xlint:-serial
+javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
-nbm.homepage=http://www.jmonkeyengine.com
+nbm.homepage=http\://www.jmonkeyengine.com
 nbm.module.author=Normen Hansen
 nbm.needs.restart=true
-spec.version.base=0.7.0
+spec.version.base=3.0.0

sdk/jme3-assetpack-support/nbproject/project.xml

@@ -12,7 +12,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>0.9</specification-version>
+                        <specification-version>3.0.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -21,7 +21,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>0.7</specification-version>
+                        <specification-version>3.0.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -30,7 +30,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>0.6.1</specification-version>
+                        <specification-version>3.0.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -39,7 +39,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>0.6.1</specification-version>
+                        <specification-version>3.0.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/Bundle.properties

@@ -1,4 +1,4 @@
-OpenIDE-Module-Display-Category=jMonkeyPlatform
+OpenIDE-Module-Display-Category=jMonkeyEngine
 OpenIDE-Module-Long-Description=\
     AssetPack Support
 OpenIDE-Module-Name=AssetPack Support

sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/browser/AssetPackLibrary.java

@@ -101,7 +101,7 @@ public class AssetPackLibrary implements Project {
                         projectAssetManager = new ProjectAssetManager(this, fileObject.getNameExt() + "/assets/");
                         content.add(projectAssetManager);
                     } else {
-                        projectAssetManager.addFileLocator(fileObject.getNameExt() + "/assets/");
+                        projectAssetManager.addFolderLocator(fileObject.getNameExt() + "/assets/");
                     }
                 } else {
                     Logger.getLogger(this.getClass().getName()).log(Level.SEVERE, "Error in assetpack, could not load assetpack.xml!");

sdk/jme3-blender/nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=919b4fec
+build.xml.data.CRC32=6f271b27
 build.xml.script.CRC32=0f77a514
-build.xml.stylesheet.CRC32=a56c6a5b@1.45.1
+build.xml.stylesheet.CRC32=a56c6a5b@1.46.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=919b4fec
+nbproject/build-impl.xml.data.CRC32=6f271b27
 nbproject/build-impl.xml.script.CRC32=5c5042d6
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45.1
+nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.1

sdk/jme3-blender/nbproject/project.properties

@@ -1,6 +1,7 @@
+#Thu, 25 Aug 2011 20:26:50 +0200
 javac.source=1.5
-javac.compilerargs=-Xlint -Xlint:-serial
+javac.compilerargs=-Xlint -Xlint\:-serial
-nbm.homepage=http://www.jmonkeyengine.com
+nbm.homepage=http\://www.jmonkeyengine.com
 nbm.module.author=Kaelthas
 nbm.needs.restart=true
-spec.version.base=0.8.0
+spec.version.base=3.0.0

sdk/jme3-blender/nbproject/project.xml

@@ -12,7 +12,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>0.11</specification-version>
+                        <specification-version>3.0.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -21,7 +21,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>0.6</specification-version>
+                        <specification-version>3.0.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

sdk/jme3-blender/src/com/jme3/gde/blender/BlenderDataObject.java

@@ -20,7 +20,11 @@ public class BlenderDataObject extends SpatialAssetDataObject {
 
     @Override
     public ModelKey getAssetKey() {
-        return new BlenderKey(super.getAssetKey().getName());
+        if(super.getAssetKey() instanceof BlenderKey){
+            return (BlenderKey)assetKey;
+        }
+        assetKey = new BlenderKey(super.getAssetKey().getName());
+        return (BlenderKey)assetKey;
     }
     
 }

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

@@ -1,8 +1,8 @@
 LBL_Blender_loader_name=Blender Files
-OpenIDE-Module-Display-Category=jMP User Contributions
+OpenIDE-Module-Display-Category=jMonkeyEngine
 OpenIDE-Module-Long-Description=\
-    This plugin adds support for Blender .blend files to jMP
+    This plugin adds support for Blender .blend files
 OpenIDE-Module-Name=Blender Support
-OpenIDE-Module-Short-Description=Adds support for Blender .blend files to jMP
+OpenIDE-Module-Short-Description=Adds support for Blender .blend files
 Services/MIMEResolver/BlenderResolver.xml=Blender Files
 Templates/Other/BlenderTemplate.blend=Empty Blender file

sdk/jme3-cinematics/nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=50d0728b
+build.xml.data.CRC32=ff3b8f2f
 build.xml.script.CRC32=d8082083
-build.xml.stylesheet.CRC32=a56c6a5b@1.42.2
+build.xml.stylesheet.CRC32=a56c6a5b@1.46.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=50d0728b
+nbproject/build-impl.xml.data.CRC32=ff3b8f2f
 nbproject/build-impl.xml.script.CRC32=a2681ce5
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.42.2
+nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.1

sdk/jme3-cinematics/nbproject/project.properties

@@ -1,7 +1,8 @@
+#Thu, 25 Aug 2011 20:26:50 +0200
 javac.source=1.5
-javac.compilerargs=-Xlint -Xlint:-serial
+javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
-nbm.homepage=http://www.jmonkeyengine.com
+nbm.homepage=http\://www.jmonkeyengine.com
 nbm.module.author=R\u00e9my Bouquet
 nbm.needs.restart=true
-spec.version.base=0.1.0
+spec.version.base=3.0.0

sdk/jme3-cinematics/nbproject/project.xml

@@ -12,7 +12,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>0.1</specification-version>
+                        <specification-version>3.0.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -21,7 +21,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>0.5</specification-version>
+                        <specification-version>3.0.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -30,7 +30,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>0.5</specification-version>
+                        <specification-version>3.0.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

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

@@ -4,10 +4,10 @@ CTL_TimelineAction=Timeline
 CTL_TimelineTopComponent=Timeline Window
 HINT_CinematicsTopComponent=This is a Cinematics window
 HINT_TimelineTopComponent=This is a Timeline window
-OpenIDE-Module-Display-Category=jMonkeyPlatform
+OpenIDE-Module-Display-Category=jMonkeyEngine
 OpenIDE-Module-Long-Description=\
-    This plugin provides a cinematics editor for jMonkeyPlatform (WIP).
+    This plugin provides a cinematics editor for jMonkeyEngine GDE (WIP).
 OpenIDE-Module-Name=Cinematics Editor
-OpenIDE-Module-Short-Description=Provides Cinematics Editor for jMP
+OpenIDE-Module-Short-Description=Provides Cinematics Editor
 Services/MIMEResolver/SequenceResolver.xml=Sequence Files
 Templates/Other/SequenceTemplate.mcs=Empty Sequence file

sdk/jme3-code-check/nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=6f1a60ee
+build.xml.data.CRC32=3c86f494
 build.xml.script.CRC32=a481f885
-build.xml.stylesheet.CRC32=a56c6a5b@1.42.2
+build.xml.stylesheet.CRC32=a56c6a5b@1.46.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=6f1a60ee
+nbproject/build-impl.xml.data.CRC32=3c86f494
 nbproject/build-impl.xml.script.CRC32=0691bb76
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.42.2
+nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.1

sdk/jme3-code-check/nbproject/project.properties

@@ -1,3 +1,4 @@
+#Thu, 25 Aug 2011 20:26:50 +0200
 javac.source=1.6
-javac.compilerargs=-Xlint -Xlint:-serial
+javac.compilerargs=-Xlint -Xlint\:-serial
-spec.version.base=0.1.0
+spec.version.base=3.0.0

sdk/jme3-code-check/nbproject/project.xml

@@ -12,7 +12,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>0.8</specification-version>
+                        <specification-version>3.0.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

sdk/jme3-code-check/src/com/jme3/gde/codecheck/Bundle.properties

@@ -1,4 +1,4 @@
-OpenIDE-Module-Display-Category=jMonkeyPlatform
+OpenIDE-Module-Display-Category=jMonkeyEngine
 OpenIDE-Module-Long-Description=\
     Gives code hints and performs checks on code during compile
 OpenIDE-Module-Name=jME3 Code Checks

sdk/jme3-codepalette/nbproject/project.properties

@@ -1,7 +1,8 @@
+#Thu, 25 Aug 2011 20:26:49 +0200
 javac.source=1.5
-javac.compilerargs=-Xlint -Xlint:-serial
+javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
-nbm.homepage=http://www.jmonkeyengine.com
+nbm.homepage=http\://www.jmonkeyengine.com
 nbm.module.author=Normen Hansen
 nbm.needs.restart=true
-spec.version.base=0.1.0
+spec.version.base=3.0.0

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

@@ -1,4 +1,4 @@
-OpenIDE-Module-Display-Category=jMonkeyPlatform
+OpenIDE-Module-Display-Category=jMonkeyEngine
 OpenIDE-Module-Long-Description=\
     The code palette gives you quick access to code snippets of the most commonly used jME3 objects.
 OpenIDE-Module-Name=jME3 Code Palette

sdk/jme3-core-baselibs/nbproject/project.properties

@@ -1,10 +1,11 @@
+#Thu, 25 Aug 2011 20:26:48 +0200
 file.reference.jME3-jbullet.jar=release/modules/ext/jME3-jbullet.jar
 file.reference.jME3-lwjgl-natives.jar=release/modules/ext/jME3-lwjgl-natives.jar
 file.reference.jMonkeyEngine3.jar=release/modules/ext/jMonkeyEngine3.jar
 javac.source=1.5
-javac.compilerargs=-Xlint -Xlint:-serial
+javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
-nbm.homepage=http://www.jmonkeyengine.com
+nbm.homepage=http\://www.jmonkeyengine.com
 nbm.module.author=jMonkeyEngine
 nbm.needs.restart=true
-spec.version.base=0.8.1
+spec.version.base=3.0.0

sdk/jme3-core-baselibs/src/com/jme3/gde/core/baselibs/Bundle.properties

@@ -1,5 +1,5 @@
-OpenIDE-Module-Display-Category=jMonkeyPlatform
+OpenIDE-Module-Display-Category=jMonkeyEngine
 OpenIDE-Module-Long-Description=\
-    This plugin provides the core jME3 libraries for jMonkeyPlatform
+    This plugin provides the core engine libraries for jMonkeyEngine GDE.
-OpenIDE-Module-Name=jMonkeyPlatform Core jME3
+OpenIDE-Module-Name=GDE Engine
-OpenIDE-Module-Short-Description=Provides the Core jME3 Libraries for jMP
+OpenIDE-Module-Short-Description=Provides the Core Engine Libraries

sdk/jme3-core-libraries/nbproject/project.properties

@@ -1,3 +1,4 @@
+#Thu, 25 Aug 2011 20:26:48 +0200
 file.reference.eventbus-1.4.jar=release/modules/ext/eventbus-1.4.jar
 file.reference.j-ogg-oggd.jar=release/modules/ext/j-ogg-oggd.jar
 file.reference.j-ogg-vorbisd.jar=release/modules/ext/j-ogg-vorbisd.jar
@@ -10,9 +11,9 @@ file.reference.stack-alloc.jar=release/modules/ext/stack-alloc.jar
 file.reference.vecmath.jar=release/modules/ext/vecmath.jar
 file.reference.xmlpull-xpp3-1.1.4c.jar=release/modules/ext/xmlpull-xpp3-1.1.4c.jar
 javac.source=1.5
-javac.compilerargs=-Xlint -Xlint:-serial
+javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
-nbm.homepage=http://www.jmonkeyengine.com
+nbm.homepage=http\://www.jmonkeyengine.com
 nbm.module.author=jMonkeyEngine
 nbm.needs.restart=true
-spec.version.base=0.8.0
+spec.version.base=3.0.0

sdk/jme3-core-libraries/src/com/jme3/gde/core/libraries/Bundle.properties

@@ -1,5 +1,5 @@
-OpenIDE-Module-Display-Category=jMonkeyPlatform
+OpenIDE-Module-Display-Category=jMonkeyEngine
 OpenIDE-Module-Long-Description=\
     This plugin provides the external libraries for jME3.
-OpenIDE-Module-Name=jMonkeyPlatform Core Libraries
+OpenIDE-Module-Name=GDE Engine Libraries
 OpenIDE-Module-Short-Description=Provides the External Libraries for jME3

sdk/jme3-core-updatecenters/nbproject/project.properties

@@ -1,3 +1,4 @@
+#Thu, 25 Aug 2011 20:26:49 +0200
 javac.source=1.5
-javac.compilerargs=-Xlint -Xlint:-serial
+javac.compilerargs=-Xlint -Xlint\:-serial
-spec.version.base=0.6.0
+spec.version.base=3.0.0

sdk/jme3-core-updatecenters/src/com/jme3/gde/core/updatecenters/Bundle.properties

@@ -20,8 +20,8 @@ Services/AutoupdateType/com_jme3_gde_core_netbeans_update_center.instance=NetBea
 Services/AutoupdateType/com_jme3_gde_core_thirdparty_update_center.instance=NB 3rd Party Plugins
 Services/AutoupdateType/com_jme3_gde_core_plugin_portal_update_center.instance=NB Plugin Portal
 
-OpenIDE-Module-Display-Category=jMonkeyPlatform
+OpenIDE-Module-Display-Category=jMonkeyEngine
 OpenIDE-Module-Long-Description=\
-    jMonkeyPlatform Core Update Center list
+    jMonkeyEngine Core Update Center list
-OpenIDE-Module-Name=jMonkeyPlatform Core Update Centers
+OpenIDE-Module-Name=jMonkeyEngine Update Centers
-OpenIDE-Module-Short-Description=jMonkeyPlatform Core Update Centers
+OpenIDE-Module-Short-Description=jMonkeyEngine Update Centers

sdk/jme3-core/javahelp/com/jme3/gde/core/docs/core-updating.html

@@ -37,12 +37,13 @@
     </head>
     <body>
         <h2>Automatically Updating jMonkeyEngine SDK</h2>
-        The jMonkeyPlatform software includes an automatic web update feature.
+        The jMonkeyEngine Game Development Environment includes an automatic web update feature.
+        You will automatically be notified about updates to the engine and editors.
         To have your complete SDK being updated to the most current nightly version of jME3 and jMP do the following:
         <ul>
             <li>Go to Tools→Plugins</li>
             <li>Select the “Settings” tab</li>
-            <li>Select the checkbox for “jMonkeyPlatform nightly svn”</li>
+            <li>Select the checkbox for “jMonkeyEngine Nightly”</li>
             <li>Select the “Updates” tab</li>
             <li>Press “Reload Catalog”</li>
             <li>Press “Update”</li>

sdk/jme3-core/nbproject/project.properties

@@ -1,9 +1,12 @@
+#Thu, 25 Aug 2011 20:26:48 +0200
+file.reference.DDSUtils.jar=release/modules/ext/DDSUtils.jar
+#Thu, 25 Aug 2011 19:32:54 +0200
 javac.source=1.5
-javac.compilerargs=-Xlint -Xlint:-serial
+javac.compilerargs=-Xlint -Xlint\:-serial
 javahelp.hs=core-hs.xml
 license.file=../license-jme.txt
-nbm.homepage=http://www.jmonkeyengine.com
+nbm.homepage=http\://www.jmonkeyengine.com
 nbm.module.author=Normen Hansen
 nbm.needs.restart=true
 project.license=jme
-spec.version.base=0.12.1
+spec.version.base=3.0.0

sdk/jme3-core/nbproject/project.xml

@@ -12,7 +12,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>0.6</specification-version>
+                        <specification-version>3.0.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -21,13 +21,13 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>0.5</specification-version>
+                        <specification-version>3.0.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
                     <code-name-base>com.jme3.gde.core.updatecenters</code-name-base>
                     <run-dependency>
-                        <specification-version>0.6</specification-version>
+                        <specification-version>3.0.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -39,6 +39,15 @@
                         <specification-version>1.16.1.1</specification-version>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.netbeans.libs.commons_logging</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <specification-version>1.18.0.11</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.libs.javacapi</code-name-base>
                     <build-prerequisite/>
@@ -269,6 +278,10 @@
                 <runtime-relative-path>ext/DDSUtils.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/DDSUtils.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/commons-beanutils-1.8.3.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-beanutils-1.8.3.jar</binary-origin>
+            </class-path-extension>
         </data>
     </configuration>
 </project>

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

@@ -1,8 +1,8 @@
-OpenIDE-Module-Display-Category=jMonkeyPlatform
+OpenIDE-Module-Display-Category=jMonkeyEngine
 OpenIDE-Module-Long-Description=\
-    This plugin provides the core functions of jMonkeyPlatform.
+    This plugin provides the core functions of jMonkeyEngine GDE.
-OpenIDE-Module-Name=jMonkeyPlatform Core
+OpenIDE-Module-Name=GDE Core
-OpenIDE-Module-Short-Description=The jMonkeyPlatform Core Plugin
+OpenIDE-Module-Short-Description=The jMonkeyEngine GDE Core Plugin
 Services/MIMEResolver/FilterPostProcessorResolver.xml=FilterPostProcessor Files
 Services/MIMEResolver/JMEBinaryModelResolver.xml=JMEBinaryModel Files
 Menu/Help/jmewiki.url=Browse Help online

sdk/jme3-core/src/com/jme3/gde/core/assets/AssetData.java

@@ -65,6 +65,10 @@ public class AssetData extends Properties {
         return file.getAssetKey();
     }
     
+    public void setAssetKey(AssetKey key){
+        file.setAssetKeyData(key);
+    }
+
     public Object loadAsset() {
         return file.loadAsset();
     }

sdk/jme3-core/src/com/jme3/gde/core/assets/AssetDataObject.java

@@ -37,9 +37,11 @@ import com.jme3.export.binary.BinaryExporter;
 import com.jme3.gde.core.scene.SceneApplication;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.lang.reflect.InvocationTargetException;
 import java.util.concurrent.Callable;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import org.apache.commons.beanutils.BeanUtils;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandleFactory;
 import org.netbeans.api.project.Project;
@@ -48,7 +50,6 @@ import org.openide.awt.StatusDisplayer;
 import org.openide.cookies.SaveCookie;
 import org.openide.filesystems.FileLock;
 import org.openide.filesystems.FileObject;
-import org.openide.filesystems.FileUtil;
 import org.openide.loaders.DataNode;
 import org.openide.loaders.DataObjectExistsException;
 import org.openide.loaders.MultiDataObject;
@@ -85,6 +86,7 @@ public class AssetDataObject extends MultiDataObject {
         }
     };
     protected DataNode dataNode;
+    protected AssetKey assetKey;
     protected Savable savable;
     protected String saveExtension;
 
@@ -115,6 +117,7 @@ public class AssetDataObject extends MultiDataObject {
             }
             file = file.getParent();
         }
+//        getLookupContents().add(new ProjectAssetManager(file.getParent()));
     }
 
     @Override
@@ -149,7 +152,6 @@ public class AssetDataObject extends MultiDataObject {
         setModified(false);
     }
 
-    //TODO: make save as j3o
     public Savable loadAsset() {
         if (isModified() && savable != null) {
             return savable;
@@ -158,11 +160,10 @@ public class AssetDataObject extends MultiDataObject {
         if (mgr == null) {
             return null;
         }
-        String assetKey = mgr.getRelativeAssetPath(getPrimaryFile().getPath());
         FileLock lock = null;
         try {
             lock = getPrimaryFile().lock();
-            Savable spatial = (Savable) mgr.loadAsset(new AssetKey(assetKey));
+            Savable spatial = (Savable) mgr.loadAsset(getAssetKey());
             savable = spatial;
             lock.releaseLock();
         } catch (Exception ex) {
@@ -212,11 +213,24 @@ public class AssetDataObject extends MultiDataObject {
     }
 
     public AssetKey<?> getAssetKey() {
-        ProjectAssetManager mgr = getLookup().lookup(ProjectAssetManager.class);
+        if (assetKey == null) {
-        if (mgr == null) {
+            ProjectAssetManager mgr = getLookup().lookup(ProjectAssetManager.class);
-            return null;
+            if (mgr == null) {
+                return null;
+            }
+            String assetKey = mgr.getRelativeAssetPath(getPrimaryFile().getPath());
+            this.assetKey = new AssetKey<Object>(assetKey);
+        }
+        return assetKey;
+    }
+
+    public void setAssetKeyData(AssetKey key) {
+        try {
+            BeanUtils.copyProperties(getAssetKey(), key);
+        } catch (IllegalAccessException ex) {
+            Exceptions.printStackTrace(ex);
+        } catch (InvocationTargetException ex) {
+            Exceptions.printStackTrace(ex);
         }
-        String assetKey = mgr.getRelativeAssetPath(getPrimaryFile().getPath());
-        return new AssetKey<Object>(assetKey);
     }
 }

sdk/jme3-core/src/com/jme3/gde/core/assets/ProjectAssetManager.java

@@ -33,7 +33,6 @@ package com.jme3.gde.core.assets;
 
 import com.jme3.asset.AssetManager;
 import com.jme3.asset.DesktopAssetManager;
-import java.io.File;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.Iterator;
@@ -55,24 +54,30 @@ import org.openide.util.lookup.Lookups;
 public class ProjectAssetManager extends DesktopAssetManager {
 
     private Project project;
-    private List<String> folderName = new LinkedList<String>();
+    private List<String> folderNames = new LinkedList<String>();
 
     public ProjectAssetManager(Project prj, String folderName) {
-        this(prj);
+        super(true);
-        addFileLocator(folderName);
+        this.project = prj;
+        for (AssetManagerConfigurator di : Lookup.getDefault().lookupAll(AssetManagerConfigurator.class)) {
+            di.prepareManager(this);
+        }
+        addFolderLocator(folderName);
     }
 
-    public ProjectAssetManager(Project prj) {
+    public ProjectAssetManager(FileObject path) {
         super(true);
-        if (prj == null) {
+        if (path == null) {
             this.project = new DummyProject(this);
-            folderName.add("assets");
         } else {
-            this.project = prj;
+            this.project = new DummyProject(this, path);
         }
-        AssetManager manager = getManager();
+        String string = project.getProjectDirectory().getPath();
+        Logger.getLogger(this.getClass().getName()).log(Level.INFO, "Add locator:{0}", string);
+        registerLocator(string,
+                "com.jme3.asset.plugins.FileLocator");
         for (AssetManagerConfigurator di : Lookup.getDefault().lookupAll(AssetManagerConfigurator.class)) {
-            di.prepareManager(manager);
+            di.prepareManager(this);
         }
     }
 
@@ -80,12 +85,15 @@ public class ProjectAssetManager extends DesktopAssetManager {
         this(null);
     }
 
-    public void addFileLocator(String relativePath) {
+    /**
+     * Adds a locator to a folder within the main project directory
+     */
+    public void addFolderLocator(String relativePath) {
         String string = project.getProjectDirectory().getPath() + "/" + relativePath + "/";
         Logger.getLogger(this.getClass().getName()).log(Level.INFO, "Add locator:{0}", string);
         registerLocator(string,
                 "com.jme3.asset.plugins.FileLocator");
-        folderName.add(relativePath);
+        folderNames.add(relativePath);
     }
 
     public Project getProject() {
@@ -93,9 +101,10 @@ public class ProjectAssetManager extends DesktopAssetManager {
     }
 
     public String getRelativeAssetPath(String absolutePath) {
-        String prefix = project.getProjectDirectory().getFileObject(getFolderName() + "/").getPath();
+        String prefix = getAssetFolderName();
         int idx = absolutePath.indexOf(prefix);
         if (idx == 0) {
+            System.out.println("absolute/prefix:"+absolutePath+" / "+prefix);
             return absolutePath.substring(prefix.length() + 1);
         }
         return absolutePath;
@@ -107,7 +116,7 @@ public class ProjectAssetManager extends DesktopAssetManager {
     }
 
     public String[] getMaterials() {
-        FileObject assetsFolder = project.getProjectDirectory().getFileObject(getFolderName() + "/");
+        FileObject assetsFolder = getAssetFolder();
         if (assetsFolder == null) {
             return new String[]{};
         }
@@ -123,7 +132,7 @@ public class ProjectAssetManager extends DesktopAssetManager {
     }
 
     public String[] getSounds() {
-        FileObject assetsFolder = project.getProjectDirectory().getFileObject(getFolderName() + "/");
+        FileObject assetsFolder = getAssetFolder();
         if (assetsFolder == null) {
             return new String[]{};
         }
@@ -139,7 +148,7 @@ public class ProjectAssetManager extends DesktopAssetManager {
     }
 
     public String[] getTextures() {
-        FileObject assetsFolder = project.getProjectDirectory().getFileObject(getFolderName() + "/");
+        FileObject assetsFolder = getAssetFolder();
         if (assetsFolder == null) {
             return new String[]{};
         }
@@ -155,7 +164,7 @@ public class ProjectAssetManager extends DesktopAssetManager {
     }
 
     public String[] getMatDefs() {
-        FileObject assetsFolder = project.getProjectDirectory().getFileObject(getFolderName() + "/");
+        FileObject assetsFolder = getAssetFolder();
         if (assetsFolder == null) {
             return new String[]{};
         }
@@ -173,28 +182,41 @@ public class ProjectAssetManager extends DesktopAssetManager {
     /**
      * @return the folderName
      */
-    public String getFolderName() {
+    private String getFolderName() {
-        return folderName.get(0);
+        if (folderNames.isEmpty()) {
+            return "";
+        } else {
+            return folderNames.get(0);
+        }
     }
 
     /**
      * @return the folderName
      */
     public String getAssetFolderName() {
-        return project.getProjectDirectory().getPath() + "/" + getFolderName();
+        if (folderNames.isEmpty()) {
+            return project.getProjectDirectory().getPath();
+        } else {
+            return project.getProjectDirectory().getFileObject(getFolderName()).getPath();
+        }
     }
 
-    public FileObject getAssetFolder(){
+    public FileObject getAssetFolder() {
-        return project.getProjectDirectory().getFileObject(getFolderName());
+        if (folderNames.isEmpty()) {
+            return project.getProjectDirectory();
+        } else {
+            return project.getProjectDirectory().getFileObject(getFolderName());
+        }
     }
 
     public String getAbsoluteAssetPath(String path) {
-        for (Iterator<String> it = folderName.iterator(); it.hasNext();) {
+        if (folderNames.isEmpty()) {
-            String string = project.getProjectDirectory().getPath() + "/" + it.next() + "/" + path;
+        } else {
-            Logger.getLogger(this.getClass().getName()).log(Level.SEVERE, "Check {0}", string);
+            for (Iterator<String> it = folderNames.iterator(); it.hasNext();) {
-            File file = new File(string);
+                FileObject string = project.getProjectDirectory().getFileObject(it.next() + "/" + path);
-            if (file.exists()) {
+                if (string != null) {
-                return file.getAbsolutePath();
+                    return string.getPath();
+                }
             }
         }
         return null;
@@ -204,10 +226,10 @@ public class ProjectAssetManager extends DesktopAssetManager {
      * @param folderName the folderName to set
      */
     public void setFolderName(String folderName) {
-        if (folderName.length() > 0) {
+        if (folderNames.size() > 0) {
-            this.folderName.remove(0);
+            this.folderNames.remove(0);
         }
-        this.folderName.add(0, folderName);
+        this.folderNames.add(0, folderName);
     }
 
     /**

sdk/jme3-core/src/com/jme3/gde/core/assets/ProjectAssetsNodeFactory.java

@@ -37,7 +37,6 @@ import org.netbeans.spi.project.ui.support.NodeFactory;
 import org.netbeans.spi.project.ui.support.NodeFactorySupport;
 import org.netbeans.spi.project.ui.support.NodeList;
 import org.openide.loaders.DataObject;
-import org.openide.loaders.DataObjectNotFoundException;
 import org.openide.nodes.Node;
 import org.openide.util.Exceptions;
 
@@ -58,15 +57,12 @@ public class ProjectAssetsNodeFactory implements NodeFactory {
             //return a new node for the project view if theres an assets folder:
             ProjectAssetManager item = project.getLookup().lookup(ProjectAssetManager.class);
             if (item != null) {
-                assetsFolder = DataObject.find(project.getProjectDirectory().getFileObject(item.getFolderName()));
+                assetsFolder = DataObject.find(item.getAssetFolder());
                 Node node = assetsFolder.getNodeDelegate();
 //                return NodeFactorySupport.fixedNodeList(node);
-                try {
+                ProjectAssetsNode nd = new ProjectAssetsNode(item, proj, node);
-                    ProjectAssetsNode nd = new ProjectAssetsNode(item, proj, node);
+//                return NodeFactorySupport.createCompositeChildren(project, item.getAssetFolderName());//fixedNodeList(nd);
-                    return NodeFactorySupport.fixedNodeList(nd);
+                return NodeFactorySupport.fixedNodeList(nd);
-                } catch (DataObjectNotFoundException ex) {
-                    Exceptions.printStackTrace(ex);
-                }
             }
         } catch (Exception ex) {
             Exceptions.printStackTrace(ex);

sdk/jme3-core/src/com/jme3/gde/core/assets/SpatialAssetDataObject.java

@@ -31,6 +31,7 @@
  */
 package com.jme3.gde.core.assets;
 
+import com.jme3.asset.AssetKey;
 import com.jme3.asset.ModelKey;
 import com.jme3.scene.Spatial;
 import java.io.IOException;
@@ -56,12 +57,17 @@ public class SpatialAssetDataObject extends AssetDataObject {
 
     @Override
     public ModelKey getAssetKey() {
-        ProjectAssetManager mgr = getLookup().lookup(ProjectAssetManager.class);
+        AssetKey superKey = super.getAssetKey();
-        if (mgr == null) {
+        if (superKey instanceof ModelKey) {
-            return null;
+            return (ModelKey)superKey;
+        } else {
+            ProjectAssetManager mgr = getLookup().lookup(ProjectAssetManager.class);
+            if (mgr == null) {
+                return null;
+            }
+            String assetKey = mgr.getRelativeAssetPath(getPrimaryFile().getPath());
+            return new ModelKey(assetKey);
         }
-        String assetKey = mgr.getRelativeAssetPath(getPrimaryFile().getPath());
-        return new ModelKey(assetKey);
     }
 
     @Override
@@ -73,12 +79,11 @@ public class SpatialAssetDataObject extends AssetDataObject {
         if (mgr == null) {
             return null;
         }
-        String assetKey = mgr.getRelativeAssetPath(getPrimaryFile().getPath());
         FileLock lock = null;
         try {
             lock = getPrimaryFile().lock();
-            mgr.deleteFromCache(new ModelKey(assetKey));
+            mgr.deleteFromCache(getAssetKey());
-            Spatial spatial = mgr.loadModel(assetKey);
+            Spatial spatial = mgr.loadModel(getAssetKey());
             savable = spatial;
             lock.releaseLock();
             return spatial;
@@ -104,7 +109,6 @@ public class SpatialAssetDataObject extends AssetDataObject {
         } else {
             outFile = getPrimaryFile().getParent().getFileObject(getPrimaryFile().getName(), saveExtension);
             if (outFile == null) {
-                //ERROR
                 Logger.getLogger(SpatialAssetDataObject.class.getName()).log(Level.SEVERE, "Could not locate saved file.");
                 return;
             }

sdk/jme3-core/src/com/jme3/gde/core/codeless/CodelessProjectLogicalView.java

@@ -1,7 +1,6 @@
 package com.jme3.gde.core.codeless;
 
 import com.jme3.gde.core.assets.ProjectAssetManager;
-import com.jme3.gde.core.assets.nodes.ProjectAssetsNode;
 import java.awt.Image;
 import java.util.LinkedList;
 import java.util.List;
@@ -124,7 +123,8 @@ class CodelessProjectLogicalView implements LogicalViewProvider {
                 try {
                     ProjectAssetManager manager = project.getProjectAssetManager();
                     FileObject assets = project.getAssetsFolder();
-                    node = new ProjectAssetsNode(manager, project, DataFolder.find(assets).getNodeDelegate());
+                    node = DataFolder.find(assets).getNodeDelegate();
+                    node.setDisplayName("Project Assets");
                 } catch (DataObjectNotFoundException ex) {
                     Exceptions.printStackTrace(ex);
                     node = new AbstractNode(Children.LEAF);

sdk/jme3-desktop-executables/nbproject/project.properties

@@ -1,7 +1,8 @@
+#Thu, 25 Aug 2011 20:26:49 +0200
 javac.source=1.5
-javac.compilerargs=-Xlint -Xlint:-serial
+javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
-nbm.homepage=http://www.jmonkeyengine.com
+nbm.homepage=http\://www.jmonkeyengine.com
 nbm.module.author=Normen Hansen
 nbm.needs.restart=true
-spec.version.base=1.0.0
+spec.version.base=3.0.0

sdk/jme3-desktop-executables/nbproject/project.xml

@@ -12,7 +12,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>0.9</specification-version>
+                        <specification-version>3.0.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/Bundle.properties

@@ -1,5 +1,5 @@
 launch4j=launch4j
-OpenIDE-Module-Display-Category=jMonkeyPlatform
+OpenIDE-Module-Display-Category=jMonkeyEngine
 OpenIDE-Module-Long-Description=\
     This plugin adds support for creating executables of your jMonkeyEngine3 projects that work on various desktop systems including MacOSX, Linux and Windows.
 OpenIDE-Module-Name=Desktop Executables Support

sdk/jme3-gui/nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=66303b96
+build.xml.data.CRC32=746774e7
 build.xml.script.CRC32=a0136781
-build.xml.stylesheet.CRC32=a56c6a5b@1.42.2
+build.xml.stylesheet.CRC32=a56c6a5b@1.46.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=66303b96
+nbproject/build-impl.xml.data.CRC32=746774e7
 nbproject/build-impl.xml.script.CRC32=55a34aaf
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.42.2
+nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.1

sdk/jme3-gui/nbproject/project.properties

@@ -1,7 +1,8 @@
+#Thu, 25 Aug 2011 20:26:49 +0200
 javac.source=1.5
-javac.compilerargs=-Xlint -Xlint:-serial
+javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
-nbm.homepage=http://www.jmonkeyengine.com
+nbm.homepage=http\://www.jmonkeyengine.com
 nbm.module.author=Normen Hansen
 nbm.needs.restart=true
-spec.version.base=0.5.0
+spec.version.base=3.0.0

sdk/jme3-gui/nbproject/project.xml

@@ -12,7 +12,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>0.9.1</specification-version>
+                        <specification-version>3.0.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -21,7 +21,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>0.5</specification-version>
+                        <specification-version>3.0.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -30,7 +30,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>0.8</specification-version>
+                        <specification-version>3.0.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

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

@@ -1,8 +1,8 @@
 LBL_NiftyGui_loader_name=NiftyGui Files
-OpenIDE-Module-Display-Category=jMonkeyPlatform
+OpenIDE-Module-Display-Category=jMonkeyEngine
 OpenIDE-Module-Long-Description=\
-    This plugin adds NiftyGUI XML file support to jMP.
+    This plugin adds NiftyGUI XML file support
 OpenIDE-Module-Name=NiftyGUI Support
-OpenIDE-Module-Short-Description=Provides NiftyGUI Support in jMP
+OpenIDE-Module-Short-Description=Provides NiftyGUI Support
 Services/MIMEResolver/NiftyGuiResolver.xml=NiftyGui Files
 Templates/Other/NiftyGuiTemplate.xml=Empty NiftyGui file

sdk/jme3-lwjgl-applet/nbproject/genfiles.properties

@@ -3,6 +3,6 @@ build.xml.script.CRC32=1ed5abd5
 build.xml.stylesheet.CRC32=a56c6a5b@1.42.2
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=c8f4ce4e
+nbproject/build-impl.xml.data.CRC32=380a204b
 nbproject/build-impl.xml.script.CRC32=a70d83dd
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.42.2
+nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.1

sdk/jme3-lwjgl-applet/nbproject/project.properties

@@ -1,7 +1,8 @@
+#Thu, 25 Aug 2011 20:26:49 +0200
 javac.source=1.5
-javac.compilerargs=-Xlint -Xlint:-serial
+javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
-nbm.homepage=http://www.jmonkeyengine.com
+nbm.homepage=http\://www.jmonkeyengine.com
 nbm.module.author=Normen Hansen
 nbm.needs.restart=true
-spec.version.base=0.7.0
+spec.version.base=3.0.0

sdk/jme3-lwjgl-applet/nbproject/project.xml

@@ -12,7 +12,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>0.9</specification-version>
+                        <specification-version>3.0.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

sdk/jme3-lwjgl-applet/src/com/jme3/gde/lwjgl/applet/Bundle.properties

@@ -1,13 +1,13 @@
 lwjgl-applet=lwjgl-applet
-OpenIDE-Module-Display-Category=jMonkeyPlatform
+OpenIDE-Module-Display-Category=jMonkeyEngine
 OpenIDE-Module-Long-Description=\
-    This plugin provides LWJGL Applet creation support for jMonkeyPlatform. \
+    This plugin provides LWJGL Applet creation support for jMonkeyEngine GDE. \
     It uses the lwjgl applet method to create applets.
 OpenIDE-Module-Name=LWJGL Applet Support
 LwjglAppletCustomizerPanel.jCheckBox1.text=Create Applet
 LwjglAppletCustomizerPanel.jLabel1.text=Width/Height:
 LBL_Category_LWJGL_Applet=Applet
-OpenIDE-Module-Short-Description=Provides LWJGL Applet creation support for jMP
+OpenIDE-Module-Short-Description=Provides LWJGL Applet creation support
 LwjglAppletCustomizerPanel.jTextField1.text=640
 LwjglAppletCustomizerPanel.jLabel2.text=An applet can be launched in any browser supporting Java.
 LwjglAppletCustomizerPanel.jTextField2.text=480

sdk/jme3-materialeditor/nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=6e7dc984
+build.xml.data.CRC32=3c35bd02
 build.xml.script.CRC32=f284e28d
-build.xml.stylesheet.CRC32=a56c6a5b@2.45
+build.xml.stylesheet.CRC32=a56c6a5b@1.46.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=6e7dc984
+nbproject/build-impl.xml.data.CRC32=3c35bd02
 nbproject/build-impl.xml.script.CRC32=56cee44d
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.45
+nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.1

sdk/jme3-materialeditor/nbproject/project.properties

@@ -1,7 +1,8 @@
+#Thu, 25 Aug 2011 20:26:49 +0200
 javac.source=1.5
-javac.compilerargs=-Xlint -Xlint:-serial
+javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
-nbm.homepage=http://www.jmonkeyengine.com
+nbm.homepage=http\://www.jmonkeyengine.com
 nbm.module.author=Normen Hansen
 nbm.needs.restart=true
-spec.version.base=0.7.0
+spec.version.base=3.0.0

sdk/jme3-materialeditor/nbproject/project.xml

@@ -12,7 +12,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>0.12.1</specification-version>
+                        <specification-version>3.0.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -21,7 +21,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>0.5</specification-version>
+                        <specification-version>3.0.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -30,7 +30,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>0.5</specification-version>
+                        <specification-version>3.0.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

sdk/jme3-materialeditor/src/com/jme3/gde/materials/Bundle.properties

@@ -1,4 +1,4 @@
-OpenIDE-Module-Display-Category=jMonkeyPlatform
+OpenIDE-Module-Display-Category=jMonkeyEngine
 OpenIDE-Module-Long-Description=\
     Provides support for editing jME3 material files
 OpenIDE-Module-Name=Material Support

sdk/jme3-model-importer/nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=61a6f3dc
+build.xml.data.CRC32=18eccd47
 build.xml.script.CRC32=b6310686
-build.xml.stylesheet.CRC32=a56c6a5b@1.42.2
+build.xml.stylesheet.CRC32=a56c6a5b@1.46.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=61a6f3dc
+nbproject/build-impl.xml.data.CRC32=18eccd47
 nbproject/build-impl.xml.script.CRC32=4db64ed5
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.42.2
+nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.1

sdk/jme3-model-importer/nbproject/project.properties

@@ -1,7 +1,8 @@
+#Thu, 25 Aug 2011 20:26:49 +0200
 javac.source=1.5
-javac.compilerargs=-Xlint -Xlint:-serial
+javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
-nbm.homepage=http://www.jmonkeyengine.com
+nbm.homepage=http\://www.jmonkeyengine.com
 nbm.module.author=Normen Hansen
 nbm.needs.restart=true
-spec.version.base=0.8.0
+spec.version.base=3.0.0

sdk/jme3-model-importer/nbproject/project.xml

@@ -12,7 +12,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>0.9</specification-version>
+                        <specification-version>3.0.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -21,7 +21,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>0.7</specification-version>
+                        <specification-version>3.0.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -58,6 +58,14 @@
                         <specification-version>7.14</specification-version>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.openide.explorer</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.38</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.openide.filesystems</code-name-base>
                     <build-prerequisite/>
@@ -98,6 +106,14 @@
                         <specification-version>8.2</specification-version>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.openide.windows</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.45</specification-version>
+                    </run-dependency>
+                </dependency>
             </module-dependencies>
             <public-packages/>
         </data>

sdk/jme3-model-importer/src/com/jme3/gde/modelimporter/Bundle.properties

@@ -1,12 +1,11 @@
 CTL_ImportModel=Import Model
-OpenIDE-Module-Display-Category=jMonkeyPlatform
+OpenIDE-Module-Display-Category=jMonkeyEngine
 OpenIDE-Module-Long-Description=\
     This plugin allows importing models to a project using a Wizard.
 OpenIDE-Module-Name=Model Import Tool
 ModelImporterVisualPanel2.jLabel1.text=Import to path:
 ModelImporterVisualPanel2.jTextField1.text=/Models/MyModel
 ModelImporterVisualPanel2.jCheckBox1.text=copy original model file(s) to project folder
-ModelImporterVisualPanel1.jPanel2.border.title=Properties
 ModelImporterVisualPanel1.jTextField1.text=
 ModelImporterVisualPanel1.jButton1.text=+
 ModelImporterVisualPanel1.jButton2.text=-
@@ -15,5 +14,5 @@ ModelImporterVisualPanel1.jButton4.text=>
 ModelImporterVisualPanel1.jButton5.text=open model..
 ModelImporterVisualPanel1.jLabel1.text=Imported Model Path:
 ModelImporterVisualPanel2.jTextArea1.text=The model will be converted to j3o binary format and copied \nto the project folder including associated texture etc. files.\nThe given path will be used as the root folder for the model.\n\nIf you copy the original model files to the project folder you can re-convert the model at any time by double-clicking it.
-ModelImporterVisualPanel1.jPanel3.border.title=Files
 OpenIDE-Module-Short-Description=Allows importing models to a project using a Wizard
+ModelImporterVisualPanel1.jButton6.text=reload with these settings

sdk/jme3-model-importer/src/com/jme3/gde/modelimporter/ImportModel.java

@@ -5,10 +5,9 @@
 package com.jme3.gde.modelimporter;
 
 import com.jme3.asset.AssetKey;
-import com.jme3.asset.DesktopAssetManager;
 import com.jme3.asset.TextureKey;
 import com.jme3.export.binary.BinaryExporter;
-import com.jme3.gde.core.assets.AssetManagerConfigurator;
+import com.jme3.gde.core.assets.AssetData;
 import com.jme3.gde.core.assets.ProjectAssetManager;
 import com.jme3.gde.core.assets.SpatialAssetDataObject;
 import com.jme3.scene.Spatial;
@@ -32,7 +31,6 @@ import org.openide.filesystems.FileObject;
 import org.openide.filesystems.FileUtil;
 import org.openide.loaders.DataObject;
 import org.openide.util.Exceptions;
-import org.openide.util.Lookup;
 
 @SuppressWarnings("unchecked")
 public final class ImportModel implements ActionListener {
@@ -50,11 +48,6 @@ public final class ImportModel implements ActionListener {
         wiz.setTitleFormat(new MessageFormat("{0}"));
         wiz.setTitle("Import Model to Project");
         wiz.putProperty("project", context);
-        DesktopAssetManager manager = new DesktopAssetManager(true);
-        for (AssetManagerConfigurator di : Lookup.getDefault().lookupAll(AssetManagerConfigurator.class)) {
-            di.prepareManager(manager);
-        }
-        wiz.putProperty("manager", manager);
         Dialog dialog = DialogDisplayer.getDefault().createDialog(wiz);
         dialog.setVisible(true);
         dialog.toFront();
@@ -107,20 +100,23 @@ public final class ImportModel implements ActionListener {
             }
         }
         File file = new File(manager.getAssetFolderName() + "/" + importPath + "/" + key.getName());
-        File outFile = new File(manager.getAssetFolderName() + "/" + importPath + "/" + key.getName().replaceAll(key.getExtension(), "j3o"));
+//        File outFile = new File(manager.getAssetFolderName() + "/" + importPath + "/" + key.getName().replaceAll(key.getExtension(), "j3o"));
         DataObject targetModel;
         try {
             targetModel = DataObject.find(FileUtil.toFileObject(file));
             if (targetModel instanceof SpatialAssetDataObject) {
                 //TODO: wtf? why do i have to add the assetmanager?
                 ((SpatialAssetDataObject) targetModel).getLookupContents().add(manager);
-                Spatial spat = ((SpatialAssetDataObject) targetModel).loadAsset();
+                AssetData data = targetModel.getLookup().lookup(AssetData.class);
+                data.setAssetKey(key);
+                Spatial spat = (Spatial) data.loadAsset();
                 if (spat == null) {
                     throw new IllegalStateException("Cannot load model after copying!");
 
                 }
-                BinaryExporter exp = BinaryExporter.getInstance();
+                data.saveAsset();
-                exp.save(spat, outFile);
+//                BinaryExporter exp = BinaryExporter.getInstance();
+//                exp.save(spat, outFile);
             }
         } catch (Exception ex) {
             Exceptions.printStackTrace(ex);
@@ -148,9 +144,9 @@ public final class ImportModel implements ActionListener {
     private WizardDescriptor.Panel[] getPanels() {
         if (panels == null) {
             panels = new WizardDescriptor.Panel[]{
-                        new ModelImporterWizardPanel1(),
+                new ModelImporterWizardPanel1(),
-                        new ModelImporterWizardPanel2()
+                new ModelImporterWizardPanel2()
-                    };
+            };
             String[] steps = new String[panels.length];
             for (int i = 0; i < panels.length; i++) {
                 Component c = panels[i].getComponent();

sdk/jme3-model-importer/src/com/jme3/gde/modelimporter/ModelImporterVisualPanel1.form

@@ -23,34 +23,23 @@
           </Group>
           <Component id="jLabel1" alignment="0" pref="559" max="32767" attributes="0"/>
           <Group type="102" alignment="0" attributes="0">
-              <Group type="103" groupAlignment="0" max="-2" attributes="0">
+              <Component id="jPanel1" pref="331" max="32767" attributes="1"/>
-                  <Component id="jToolBar1" max="32767" attributes="1"/>
-                  <Component id="jPanel1" alignment="0" min="-2" pref="320" max="-2" attributes="1"/>
-              </Group>
               <EmptySpace max="-2" attributes="0"/>
-              <Group type="103" groupAlignment="0" attributes="0">
+              <Component id="jPanel2" min="-2" pref="228" max="-2" attributes="0"/>
-                  <Component id="jPanel2" max="32767" attributes="0"/>
-                  <Component id="jPanel3" alignment="0" max="32767" attributes="0"/>
-              </Group>
           </Group>
+          <Component id="jToolBar1" alignment="0" pref="559" max="32767" attributes="1"/>
       </Group>
     </DimensionLayout>
     <DimensionLayout dim="1">
       <Group type="103" groupAlignment="0" attributes="0">
           <Group type="102" alignment="1" attributes="0">
-              <Group type="103" groupAlignment="1" attributes="0">
+              <Group type="103" groupAlignment="0" attributes="0">
-                  <Group type="102" alignment="0" attributes="0">
+                  <Component id="jPanel2" pref="340" max="32767" attributes="1"/>
-                      <Component id="jPanel1" min="-2" pref="320" max="-2" attributes="1"/>
+                  <Component id="jPanel1" alignment="1" pref="340" max="32767" attributes="1"/>
-                      <EmptySpace max="-2" attributes="0"/>
-                      <Component id="jToolBar1" min="-2" pref="25" max="-2" attributes="0"/>
-                  </Group>
-                  <Group type="102" alignment="0" attributes="0">
-                      <Component id="jPanel3" max="32767" attributes="0"/>
-                      <EmptySpace max="-2" attributes="0"/>
-                      <Component id="jPanel2" max="32767" attributes="1"/>
-                  </Group>
               </Group>
               <EmptySpace max="-2" attributes="0"/>
+              <Component id="jToolBar1" min="-2" pref="25" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
               <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
               <Group type="103" groupAlignment="3" attributes="0">
@@ -72,28 +61,8 @@
       <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBoxLayout"/>
     </Container>
     <Container class="javax.swing.JPanel" name="jPanel2">
-      <Properties>
-        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
-          <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
-            <TitledBorder title="Properties">
-              <ResourceString PropertyName="titleX" bundle="com/jme3/gde/modelimporter/Bundle.properties" key="ModelImporterVisualPanel1.jPanel2.border.title" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-            </TitledBorder>
-          </Border>
-        </Property>
-      </Properties>
 
-      <Layout>
+      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBoxLayout"/>
-        <DimensionLayout dim="0">
-          <Group type="103" groupAlignment="0" attributes="0">
-              <EmptySpace min="0" pref="227" max="32767" attributes="0"/>
-          </Group>
-        </DimensionLayout>
-        <DimensionLayout dim="1">
-          <Group type="103" groupAlignment="0" attributes="0">
-              <EmptySpace min="0" pref="131" max="32767" attributes="0"/>
-          </Group>
-        </DimensionLayout>
-      </Layout>
     </Container>
     <Component class="javax.swing.JTextField" name="jTextField1">
       <Properties>
@@ -165,6 +134,34 @@
             <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton4ActionPerformed"/>
           </Events>
         </Component>
+        <Container class="javax.swing.JPanel" name="jPanel3">
+
+          <Layout>
+            <DimensionLayout dim="0">
+              <Group type="103" groupAlignment="0" attributes="0">
+                  <EmptySpace min="0" pref="310" max="32767" attributes="0"/>
+              </Group>
+            </DimensionLayout>
+            <DimensionLayout dim="1">
+              <Group type="103" groupAlignment="0" attributes="0">
+                  <EmptySpace min="0" pref="21" max="32767" attributes="0"/>
+              </Group>
+            </DimensionLayout>
+          </Layout>
+        </Container>
+        <Component class="javax.swing.JButton" name="jButton6">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="com/jme3/gde/modelimporter/Bundle.properties" key="ModelImporterVisualPanel1.jButton6.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </Property>
+            <Property name="focusable" type="boolean" value="false"/>
+            <Property name="horizontalTextPosition" type="int" value="0"/>
+            <Property name="verticalTextPosition" type="int" value="3"/>
+          </Properties>
+          <Events>
+            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton6ActionPerformed"/>
+          </Events>
+        </Component>
       </SubComponents>
     </Container>
     <Component class="javax.swing.JButton" name="jButton5">
@@ -184,47 +181,5 @@
         </Property>
       </Properties>
     </Component>
-    <Container class="javax.swing.JPanel" name="jPanel3">
-      <Properties>
-        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
-          <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
-            <TitledBorder title="Files">
-              <ResourceString PropertyName="titleX" bundle="com/jme3/gde/modelimporter/Bundle.properties" key="ModelImporterVisualPanel1.jPanel3.border.title" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-            </TitledBorder>
-          </Border>
-        </Property>
-      </Properties>
-
-      <Layout>
-        <DimensionLayout dim="0">
-          <Group type="103" groupAlignment="0" attributes="0">
-              <Component id="jScrollPane1" alignment="1" pref="227" max="32767" attributes="0"/>
-          </Group>
-        </DimensionLayout>
-        <DimensionLayout dim="1">
-          <Group type="103" groupAlignment="0" attributes="0">
-              <Component id="jScrollPane1" alignment="0" pref="158" max="32767" attributes="0"/>
-          </Group>
-        </DimensionLayout>
-      </Layout>
-      <SubComponents>
-        <Container class="javax.swing.JScrollPane" name="jScrollPane1">
-          <AuxValues>
-            <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
-          </AuxValues>
-
-          <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
-          <SubComponents>
-            <Component class="javax.swing.JList" name="jList1">
-              <Properties>
-                <Property name="model" type="javax.swing.ListModel" editor="org.netbeans.modules.form.editors2.ListModelEditor">
-                  <StringArray count="0"/>
-                </Property>
-              </Properties>
-            </Component>
-          </SubComponents>
-        </Container>
-      </SubComponents>
-    </Container>
   </SubComponents>
 </Form>

sdk/jme3-model-importer/src/com/jme3/gde/modelimporter/ModelImporterVisualPanel1.java

@@ -6,12 +6,14 @@ package com.jme3.gde.modelimporter;
 
 import com.jme3.asset.AssetEventListener;
 import com.jme3.asset.AssetKey;
-import com.jme3.asset.DesktopAssetManager;
 import com.jme3.asset.ModelKey;
-import com.jme3.asset.plugins.FileLocator;
+import com.jme3.gde.core.assets.AssetData;
+import com.jme3.gde.core.assets.AssetDataObject;
+import com.jme3.gde.core.assets.ProjectAssetManager;
 import com.jme3.gde.core.scene.OffScenePanel;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Spatial;
+import java.beans.IntrospectionException;
 import java.io.File;
 import java.util.LinkedList;
 import java.util.List;
@@ -22,17 +24,25 @@ import org.openide.DialogDisplayer;
 import org.openide.NotifyDescriptor;
 import org.openide.NotifyDescriptor.Message;
 import org.openide.WizardDescriptor;
+import org.openide.explorer.propertysheet.PropertySheet;
 import org.openide.filesystems.FileChooserBuilder;
-
+import org.openide.filesystems.FileUtil;
-@SuppressWarnings("unchecked")
+import org.openide.loaders.DataObject;
+import org.openide.loaders.DataObjectNotFoundException;
+import org.openide.nodes.BeanNode;
+import org.openide.nodes.Node;
+import org.openide.util.Exceptions;
+
+@SuppressWarnings({"unchecked", "serial"})
 public final class ModelImporterVisualPanel1 extends JPanel implements AssetEventListener {
 
     private OffScenePanel offPanel;
-    private DesktopAssetManager manager;
     private String currentPath;
+    private String currentModelPath;
     private Spatial currentModel;
     private List<AssetKey> requestedAssets = new LinkedList<AssetKey>();
     private AssetKey mainKey;
+    private PropertySheet ps;
 
     /** Creates new form ModelImporterVisualPanel1 */
     public ModelImporterVisualPanel1() {
@@ -40,6 +50,9 @@ public final class ModelImporterVisualPanel1 extends JPanel implements AssetEven
         offPanel = new OffScenePanel(320, 320);
         offPanel.startPreview();
         jPanel1.add(offPanel);
+        ps = new PropertySheet();
+        ps.setNodes(new Node[]{});
+        jPanel2.add(ps);
     }
 
     @Override
@@ -48,8 +61,7 @@ public final class ModelImporterVisualPanel1 extends JPanel implements AssetEven
     }
 
     public void loadSettings(WizardDescriptor wiz) {
-        manager = (DesktopAssetManager) wiz.getProperty("manager");
+//        manager = (ProjectAssetManager) wiz.getProperty("manager");
-        manager.setAssetEventListener(this);
     }
 
     public void applySettings(WizardDescriptor wiz) {
@@ -62,45 +74,76 @@ public final class ModelImporterVisualPanel1 extends JPanel implements AssetEven
     }
 
     public synchronized void loadModel(File path) {
+        loadModel(path, null);
+    }
+
+    public synchronized void loadModel(File path, AssetKey modelKey) {
         try {
+            mainKey = modelKey;
+            ProjectAssetManager manager = new ProjectAssetManager(FileUtil.toFileObject(path).getParent());
+            manager.setAssetEventListener(this);
             if (currentPath != null) {
-                manager.unregisterLocator(currentPath, FileLocator.class);
-                manager.clearCache();
                 requestedAssets.clear();
-                mainKey = null;
+                currentPath = null;
+                updateProperties(null);
             }
             if (currentModel != null) {
                 offPanel.detach(currentModel);
+                currentModel = null;
             }
             currentPath = path.getParent();
-            manager.registerLocator(currentPath, FileLocator.class);
+            currentModelPath = path.getPath();
-            mainKey = new ModelKey(path.getName());
+            if (mainKey == null) {
+                try {
+                    DataObject obj = DataObject.find(FileUtil.toFileObject(path));
+                    AssetData data = obj.getLookup().lookup(AssetData.class);
+                    if (data != null) {
+                        ((AssetDataObject) obj).getLookupContents().add(manager);
+                        mainKey = data.getAssetKey();
+                    }
+                } catch (DataObjectNotFoundException ex) {
+                    Exceptions.printStackTrace(ex);
+                    mainKey = new ModelKey(path.getName());
+                }
+            }
             currentModel = (Spatial) manager.loadAsset(mainKey);
             if (currentModel != null) {
                 offPanel.attach(currentModel);
+                updateProperties(mainKey);
             } else {
                 Message msg = new NotifyDescriptor.Message(
                         "Cannot import this file!",
                         NotifyDescriptor.ERROR_MESSAGE);
                 DialogDisplayer.getDefault().notifyLater(msg);
             }
+            manager.setAssetEventListener(null);
+            manager.clearCache();
         } catch (Exception e) {
             Message msg = new NotifyDescriptor.Message(
                     "Error importing file!\n"
                     + "(" + e + ")",
                     NotifyDescriptor.ERROR_MESSAGE);
             DialogDisplayer.getDefault().notifyLater(msg);
+            Exceptions.printStackTrace(e);
         }
+    }
+
+    private void updateProperties(final AssetKey key) {
         java.awt.EventQueue.invokeLater(new Runnable() {
 
             public void run() {
-                updateList();
+                try {
+                    if (key == null) {
+                        ps.setNodes(new Node[]{});
+                    } else {
+                        ps.setNodes(new Node[]{new BeanNode(key)});
+                    }
+                } catch (IntrospectionException ex) {
+                    Exceptions.printStackTrace(ex);
+                }
             }
         });
-    }
 
-    private synchronized void updateList() {
-        jList1.setListData(requestedAssets.toArray());
     }
 
     public void assetRequested(AssetKey ak) {
@@ -136,27 +179,15 @@ public final class ModelImporterVisualPanel1 extends JPanel implements AssetEven
         jSeparator1 = new javax.swing.JToolBar.Separator();
         jButton3 = new javax.swing.JButton();
         jButton4 = new javax.swing.JButton();
+        jPanel3 = new javax.swing.JPanel();
+        jButton6 = new javax.swing.JButton();
         jButton5 = new javax.swing.JButton();
         jLabel1 = new javax.swing.JLabel();
-        jPanel3 = new javax.swing.JPanel();
-        jScrollPane1 = new javax.swing.JScrollPane();
-        jList1 = new javax.swing.JList();
 
         jPanel1.setPreferredSize(new java.awt.Dimension(320, 320));
         jPanel1.setLayout(new javax.swing.BoxLayout(jPanel1, javax.swing.BoxLayout.LINE_AXIS));
 
-        jPanel2.setBorder(javax.swing.BorderFactory.createTitledBorder(org.openide.util.NbBundle.getMessage(ModelImporterVisualPanel1.class, "ModelImporterVisualPanel1.jPanel2.border.title"))); // NOI18N
+        jPanel2.setLayout(new javax.swing.BoxLayout(jPanel2, javax.swing.BoxLayout.LINE_AXIS));
-
-        javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2);
-        jPanel2.setLayout(jPanel2Layout);
-        jPanel2Layout.setHorizontalGroup(
-            jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGap(0, 227, Short.MAX_VALUE)
-        );
-        jPanel2Layout.setVerticalGroup(
-            jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGap(0, 131, Short.MAX_VALUE)
-        );
 
         jTextField1.setEditable(false);
         jTextField1.setText(org.openide.util.NbBundle.getMessage(ModelImporterVisualPanel1.class, "ModelImporterVisualPanel1.jTextField1.text")); // NOI18N
@@ -209,30 +240,39 @@ public final class ModelImporterVisualPanel1 extends JPanel implements AssetEven
         });
         jToolBar1.add(jButton4);
 
-        org.openide.awt.Mnemonics.setLocalizedText(jButton5, org.openide.util.NbBundle.getMessage(ModelImporterVisualPanel1.class, "ModelImporterVisualPanel1.jButton5.text")); // NOI18N
-        jButton5.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                jButton5ActionPerformed(evt);
-            }
-        });
-
-        org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(ModelImporterVisualPanel1.class, "ModelImporterVisualPanel1.jLabel1.text")); // NOI18N
-
-        jPanel3.setBorder(javax.swing.BorderFactory.createTitledBorder(org.openide.util.NbBundle.getMessage(ModelImporterVisualPanel1.class, "ModelImporterVisualPanel1.jPanel3.border.title"))); // NOI18N
-
-        jScrollPane1.setViewportView(jList1);
-
         javax.swing.GroupLayout jPanel3Layout = new javax.swing.GroupLayout(jPanel3);
         jPanel3.setLayout(jPanel3Layout);
         jPanel3Layout.setHorizontalGroup(
             jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(jScrollPane1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 227, Short.MAX_VALUE)
+            .addGap(0, 310, Short.MAX_VALUE)
         );
         jPanel3Layout.setVerticalGroup(
             jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 158, Short.MAX_VALUE)
+            .addGap(0, 21, Short.MAX_VALUE)
         );
 
+        jToolBar1.add(jPanel3);
+
+        org.openide.awt.Mnemonics.setLocalizedText(jButton6, org.openide.util.NbBundle.getMessage(ModelImporterVisualPanel1.class, "ModelImporterVisualPanel1.jButton6.text")); // NOI18N
+        jButton6.setFocusable(false);
+        jButton6.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+        jButton6.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+        jButton6.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                jButton6ActionPerformed(evt);
+            }
+        });
+        jToolBar1.add(jButton6);
+
+        org.openide.awt.Mnemonics.setLocalizedText(jButton5, org.openide.util.NbBundle.getMessage(ModelImporterVisualPanel1.class, "ModelImporterVisualPanel1.jButton5.text")); // NOI18N
+        jButton5.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                jButton5ActionPerformed(evt);
+            }
+        });
+
+        org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(ModelImporterVisualPanel1.class, "ModelImporterVisualPanel1.jLabel1.text")); // NOI18N
+
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
@@ -243,26 +283,19 @@ public final class ModelImporterVisualPanel1 extends JPanel implements AssetEven
                 .addComponent(jButton5))
             .addComponent(jLabel1, javax.swing.GroupLayout.DEFAULT_SIZE, 559, Short.MAX_VALUE)
             .addGroup(layout.createSequentialGroup()
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+                .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, 331, Short.MAX_VALUE)
-                    .addComponent(jToolBar1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                    .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, 320, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                .addComponent(jPanel2, javax.swing.GroupLayout.PREFERRED_SIZE, 228, javax.swing.GroupLayout.PREFERRED_SIZE))
-                    .addComponent(jPanel2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+            .addComponent(jToolBar1, javax.swing.GroupLayout.DEFAULT_SIZE, 559, Short.MAX_VALUE)
-                    .addComponent(jPanel3, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
         );
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
+                    .addComponent(jPanel2, javax.swing.GroupLayout.DEFAULT_SIZE, 340, Short.MAX_VALUE)
-                        .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, 320, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jPanel1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 340, Short.MAX_VALUE))
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(jToolBar1, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addComponent(jToolBar1, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
-                        .addComponent(jPanel3, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(jPanel2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(jLabel1)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
@@ -305,18 +338,23 @@ public final class ModelImporterVisualPanel1 extends JPanel implements AssetEven
     private void jButton4ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton4ActionPerformed
         offPanel.rotateCamera(Vector3f.UNIT_Y, -.1f);
     }//GEN-LAST:event_jButton4ActionPerformed
+
+private void jButton6ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton6ActionPerformed
+    if (currentModelPath != null) {
+        loadModel(new File(currentModelPath), mainKey);
+    }
+}//GEN-LAST:event_jButton6ActionPerformed
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JButton jButton1;
     private javax.swing.JButton jButton2;
     private javax.swing.JButton jButton3;
     private javax.swing.JButton jButton4;
     private javax.swing.JButton jButton5;
+    private javax.swing.JButton jButton6;
     private javax.swing.JLabel jLabel1;
-    private javax.swing.JList jList1;
     private javax.swing.JPanel jPanel1;
     private javax.swing.JPanel jPanel2;
     private javax.swing.JPanel jPanel3;
-    private javax.swing.JScrollPane jScrollPane1;
     private javax.swing.JToolBar.Separator jSeparator1;
     private javax.swing.JTextField jTextField1;
     private javax.swing.JToolBar jToolBar1;

sdk/jme3-model-importer/src/com/jme3/gde/modelimporter/ModelImporterVisualPanel2.form

@@ -18,11 +18,15 @@
       <Group type="103" groupAlignment="0" attributes="0">
           <Group type="102" alignment="0" attributes="0">
               <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
-              <EmptySpace pref="305" max="32767" attributes="0"/>
+              <EmptySpace pref="323" max="32767" attributes="0"/>
+          </Group>
+          <Component id="jTextField1" alignment="0" pref="418" max="32767" attributes="0"/>
+          <Component id="jCheckBox1" alignment="0" pref="418" max="32767" attributes="0"/>
+          <Group type="102" alignment="0" attributes="0">
+              <Component id="jScrollPane2" pref="196" max="32767" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="jScrollPane1" min="-2" pref="212" max="-2" attributes="0"/>
           </Group>
-          <Component id="jTextField1" alignment="0" pref="400" max="32767" attributes="0"/>
-          <Component id="jCheckBox1" alignment="0" pref="400" max="32767" attributes="0"/>
-          <Component id="jScrollPane1" alignment="1" pref="400" max="32767" attributes="0"/>
       </Group>
     </DimensionLayout>
     <DimensionLayout dim="1">
@@ -34,7 +38,10 @@
               <EmptySpace type="unrelated" max="-2" attributes="0"/>
               <Component id="jCheckBox1" min="-2" max="-2" attributes="0"/>
               <EmptySpace type="unrelated" max="-2" attributes="0"/>
-              <Component id="jScrollPane1" pref="204" max="32767" attributes="0"/>
+              <Group type="103" groupAlignment="0" attributes="0">
+                  <Component id="jScrollPane2" pref="204" max="32767" attributes="0"/>
+                  <Component id="jScrollPane1" alignment="0" pref="204" max="32767" attributes="0"/>
+              </Group>
           </Group>
       </Group>
     </DimensionLayout>
@@ -82,5 +89,24 @@
         </Component>
       </SubComponents>
     </Container>
+    <Container class="javax.swing.JScrollPane" name="jScrollPane2">
+
+      <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
+      <SubComponents>
+        <Component class="javax.swing.JList" name="jList1">
+          <Properties>
+            <Property name="model" type="javax.swing.ListModel" editor="org.netbeans.modules.form.editors2.ListModelEditor">
+              <StringArray count="5">
+                <StringItem index="0" value="Item 1"/>
+                <StringItem index="1" value="Item 2"/>
+                <StringItem index="2" value="Item 3"/>
+                <StringItem index="3" value="Item 4"/>
+                <StringItem index="4" value="Item 5"/>
+              </StringArray>
+            </Property>
+          </Properties>
+        </Component>
+      </SubComponents>
+    </Container>
   </SubComponents>
 </Form>

sdk/jme3-model-importer/src/com/jme3/gde/modelimporter/ModelImporterVisualPanel2.java

@@ -4,6 +4,8 @@
  */
 package com.jme3.gde.modelimporter;
 
+import com.jme3.asset.AssetKey;
+import java.util.List;
 import javax.swing.JPanel;
 import org.openide.WizardDescriptor;
 
@@ -21,6 +23,7 @@ public final class ModelImporterVisualPanel2 extends JPanel {
 
     public void loadSettings(WizardDescriptor wiz) {
         jTextField1.setText((String)wiz.getProperty("destpath"));
+        jList1.setListData(((List<AssetKey>)wiz.getProperty("assetlist")).toArray());
     }
 
     public void applySettings(WizardDescriptor wiz) {
@@ -41,6 +44,8 @@ public final class ModelImporterVisualPanel2 extends JPanel {
         jCheckBox1 = new javax.swing.JCheckBox();
         jScrollPane1 = new javax.swing.JScrollPane();
         jTextArea1 = new javax.swing.JTextArea();
+        jScrollPane2 = new javax.swing.JScrollPane();
+        jList1 = new javax.swing.JList();
 
         org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(ModelImporterVisualPanel2.class, "ModelImporterVisualPanel2.jLabel1.text")); // NOI18N
 
@@ -56,16 +61,26 @@ public final class ModelImporterVisualPanel2 extends JPanel {
         jTextArea1.setWrapStyleWord(true);
         jScrollPane1.setViewportView(jTextArea1);
 
+        jList1.setModel(new javax.swing.AbstractListModel() {
+            String[] strings = { "Item 1", "Item 2", "Item 3", "Item 4", "Item 5" };
+            public int getSize() { return strings.length; }
+            public Object getElementAt(int i) { return strings[i]; }
+        });
+        jScrollPane2.setViewportView(jList1);
+
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(layout.createSequentialGroup()
                 .addComponent(jLabel1)
-                .addContainerGap(305, Short.MAX_VALUE))
+                .addContainerGap(323, Short.MAX_VALUE))
-            .addComponent(jTextField1, javax.swing.GroupLayout.DEFAULT_SIZE, 400, Short.MAX_VALUE)
+            .addComponent(jTextField1, javax.swing.GroupLayout.DEFAULT_SIZE, 418, Short.MAX_VALUE)
-            .addComponent(jCheckBox1, javax.swing.GroupLayout.DEFAULT_SIZE, 400, Short.MAX_VALUE)
+            .addComponent(jCheckBox1, javax.swing.GroupLayout.DEFAULT_SIZE, 418, Short.MAX_VALUE)
-            .addComponent(jScrollPane1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 400, Short.MAX_VALUE)
+            .addGroup(layout.createSequentialGroup()
+                .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 196, Short.MAX_VALUE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 212, javax.swing.GroupLayout.PREFERRED_SIZE))
         );
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -76,13 +91,17 @@ public final class ModelImporterVisualPanel2 extends JPanel {
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                 .addComponent(jCheckBox1)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 204, Short.MAX_VALUE))
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 204, Short.MAX_VALUE)
+                    .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 204, Short.MAX_VALUE)))
         );
     }// </editor-fold>//GEN-END:initComponents
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JCheckBox jCheckBox1;
     private javax.swing.JLabel jLabel1;
+    private javax.swing.JList jList1;
     private javax.swing.JScrollPane jScrollPane1;
+    private javax.swing.JScrollPane jScrollPane2;
     private javax.swing.JTextArea jTextArea1;
     private javax.swing.JTextField jTextField1;
     // End of variables declaration//GEN-END:variables

sdk/jme3-obfuscate/nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=db46de11
+build.xml.data.CRC32=e3e4e731
 build.xml.script.CRC32=69663b9b
-build.xml.stylesheet.CRC32=a56c6a5b@1.42.2
+build.xml.stylesheet.CRC32=a56c6a5b@1.46.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=db46de11
+nbproject/build-impl.xml.data.CRC32=e3e4e731
 nbproject/build-impl.xml.script.CRC32=c9f3ae73
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.42.2
+nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.1

sdk/jme3-obfuscate/nbproject/project.properties

@@ -1,6 +1,7 @@
+#Thu, 25 Aug 2011 20:26:50 +0200
 javac.source=1.5
-javac.compilerargs=-Xlint -Xlint:-serial
+javac.compilerargs=-Xlint -Xlint\:-serial
-nbm.homepage=http://proguard.sourceforge.net/
+nbm.homepage=http\://proguard.sourceforge.net/
 nbm.module.author=Normen Hansen
 nbm.needs.restart=true
-spec.version.base=0.8.0
+spec.version.base=3.0.0

sdk/jme3-obfuscate/nbproject/project.xml

@@ -12,7 +12,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>0.12</specification-version>
+                        <specification-version>3.0.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

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

@@ -1,4 +1,4 @@
-OpenIDE-Module-Display-Category=jMonkeyPlatform
+OpenIDE-Module-Display-Category=jMonkeyEngine
 OpenIDE-Module-Long-Description=\
     Support for obfuscating distributions using ProGuard
 OpenIDE-Module-Name=Obfuscation Support

sdk/jme3-ogretools/nbproject/genfiles.properties

@@ -3,6 +3,6 @@ build.xml.script.CRC32=6423eb2c
 build.xml.stylesheet.CRC32=79c3b980@1.31.2.7
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=34ba26c9
+nbproject/build-impl.xml.data.CRC32=c8f2a0b1
 nbproject/build-impl.xml.script.CRC32=4a050ba2
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.42.2
+nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.1

sdk/jme3-ogretools/nbproject/project.properties

@@ -1,7 +1,8 @@
+#Thu, 25 Aug 2011 20:26:49 +0200
 javac.source=1.5
-javac.compilerargs=-Xlint -Xlint:-serial
+javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
-nbm.homepage=http://www.jmonkeyengine.com
+nbm.homepage=http\://www.jmonkeyengine.com
 nbm.module.author=Normen Hansen
 nbm.needs.restart=true
-spec.version.base=0.6.1
+spec.version.base=3.0.0

sdk/jme3-ogretools/nbproject/project.xml

@@ -12,7 +12,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>0.7</specification-version>
+                        <specification-version>3.0.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -21,7 +21,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>0.5</specification-version>
+                        <specification-version>3.0.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -30,14 +30,14 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>0.5</specification-version>
+                        <specification-version>3.0.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
                     <code-name-base>com.jme3.gde.ogrexml</code-name-base>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>0.1</specification-version>
+                        <specification-version>3.0.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

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

@@ -1,5 +1,5 @@
 LBL_OgreBinaryMesh_loader_name=OgreBinaryMesh Files
-OpenIDE-Module-Display-Category=jMonkeyPlatform
+OpenIDE-Module-Display-Category=jMonkeyEngine
 OpenIDE-Module-Long-Description=\
     This plugin provides additional tools for OgreXML e.g. blender export scripts.
 OpenIDE-Module-Name=OgreXML Tools

sdk/jme3-ogrexml/nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=06ce291e
+build.xml.data.CRC32=91ef3cf9
 build.xml.script.CRC32=a910387a
-build.xml.stylesheet.CRC32=a56c6a5b@1.42.2
+build.xml.stylesheet.CRC32=a56c6a5b@1.46.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=06ce291e
+nbproject/build-impl.xml.data.CRC32=91ef3cf9
 nbproject/build-impl.xml.script.CRC32=2abbef60
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.42.2
+nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.1

sdk/jme3-ogrexml/nbproject/project.properties

@@ -1,7 +1,8 @@
+#Thu, 25 Aug 2011 20:26:48 +0200
 javac.source=1.5
-javac.compilerargs=-Xlint -Xlint:-serial
+javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
-nbm.homepage=http://www.jmonkeyengine.com
+nbm.homepage=http\://www.jmonkeyengine.com
 nbm.module.author=Normen Hansen
 nbm.needs.restart=true
-spec.version.base=0.8.0
+spec.version.base=3.0.0

sdk/jme3-ogrexml/nbproject/project.xml

@@ -12,7 +12,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>0.1</specification-version>
+                        <specification-version>3.0.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -21,7 +21,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>0.5</specification-version>
+                        <specification-version>3.0.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -30,7 +30,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>0.5</specification-version>
+                        <specification-version>3.0.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

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

@@ -1,8 +1,8 @@
 LBL_OgreScene_loader_name=OgreScene Files
-OpenIDE-Module-Display-Category=jMonkeyPlatform
+OpenIDE-Module-Display-Category=jMonkeyEngine
 OpenIDE-Module-Long-Description=\
-    This plugin provides OgreXML importing and file type support in jMP.
+    This plugin provides OgreXML importing and file type support
 OpenIDE-Module-Name=OgreXML Support
-OpenIDE-Module-Short-Description=Provides OgreXML Importing and File Type Support in jMP
+OpenIDE-Module-Short-Description=Provides OgreXML Importing and File Type Support
 Services/MIMEResolver/OgreSceneResolver.xml=OgreScene Files
 Templates/Other/OgreSceneTemplate.scene=Empty OgreScene file

sdk/jme3-project-baselibs/nbproject/project.properties

@@ -1,7 +1,8 @@
+#Thu, 25 Aug 2011 20:26:48 +0200
 javac.source=1.5
-javac.compilerargs=-Xlint -Xlint:-serial
+javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
-nbm.homepage=http://www.jmonkeyengine.com
+nbm.homepage=http\://www.jmonkeyengine.com
 nbm.module.author=jMonkeyEngine
 nbm.needs.restart=true
-spec.version.base=0.8.1
+spec.version.base=3.0.0

sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/Bundle.properties

@@ -1,6 +1,6 @@
 jme3=jme3
-OpenIDE-Module-Display-Category=jMonkeyPlatform
+OpenIDE-Module-Display-Category=jMonkeyEngine
 OpenIDE-Module-Long-Description=\
-    This plugin contains the jMonkeyEngine3 version used to run and distribute your jMonkeyPlatform applications.
+    This plugin contains the jMonkeyEngine3 version used to run and distribute your jMonkeyEngine applications.
-OpenIDE-Module-Name=Project jME3
+OpenIDE-Module-Name=Project Engine
-OpenIDE-Module-Short-Description=Provides jME3 Base Libraries for jMP Projects
+OpenIDE-Module-Short-Description=Provides jME3 Base Libraries for jME Projects

sdk/jme3-project-libraries/nbproject/project.properties

@@ -1,7 +1,8 @@
+#Thu, 25 Aug 2011 20:26:48 +0200
 javac.source=1.5
-javac.compilerargs=-Xlint -Xlint:-serial
+javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
-nbm.homepage=http://www.jmonkeyengine.com
+nbm.homepage=http\://www.jmonkeyengine.com
 nbm.module.author=jMonkeyEngine
 nbm.needs.restart=true
-spec.version.base=0.8.0
+spec.version.base=3.0.0

sdk/jme3-project-libraries/src/com/jme3/gde/project/libraries/Bundle.properties

@@ -1,6 +1,6 @@
 jme3-libraries=jme3-libraries
-OpenIDE-Module-Display-Category=jMonkeyPlatform
+OpenIDE-Module-Display-Category=jMonkeyEngine
 OpenIDE-Module-Long-Description=\
-    This plugin contains the external libraries needed by jMonkeyEngine3 that are used to run and distribute your jMonkeyPlatform applications.
+    This plugin contains the external libraries needed by jMonkeyEngine3 that are used to run and distribute your jMonkeyEngine applications.
 OpenIDE-Module-Name=Project Libraries
-OpenIDE-Module-Short-Description=Provides jME3 External Libraries for jMP Projects
+OpenIDE-Module-Short-Description=Provides jME3 External Libraries for Projects

sdk/jme3-project-testdata/nbproject/project.properties

@@ -1,7 +1,8 @@
+#Thu, 25 Aug 2011 20:26:48 +0200
 javac.source=1.5
-javac.compilerargs=-Xlint -Xlint:-serial
+javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
-nbm.homepage=http://www.jmonkeyengine.com
+nbm.homepage=http\://www.jmonkeyengine.com
 nbm.module.author=jMonkeyEngine
 nbm.needs.restart=true
-spec.version.base=0.5.0
+spec.version.base=3.0.0

sdk/jme3-project-testdata/src/com/jme3/gde/project/testdata/Bundle.properties

@@ -1,5 +1,5 @@
 jme3-test-data=jme3-test-data
-OpenIDE-Module-Display-Category=jMonkeyPlatform
+OpenIDE-Module-Display-Category=jMonkeyEngine
 OpenIDE-Module-Long-Description=\
     This plugin contains the test data needed for the jme3 test classes.
 OpenIDE-Module-Name=Project Test Data

sdk/jme3-scenecomposer/nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=d9817bc3
+build.xml.data.CRC32=bbbcfbe5
 build.xml.script.CRC32=866b78de
-build.xml.stylesheet.CRC32=a56c6a5b@1.42.2
+build.xml.stylesheet.CRC32=a56c6a5b@1.46.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=d9817bc3
+nbproject/build-impl.xml.data.CRC32=bbbcfbe5
 nbproject/build-impl.xml.script.CRC32=a6bab88d
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.42.2
+nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.1

sdk/jme3-scenecomposer/nbproject/project.properties

@@ -1,7 +1,8 @@
+#Thu, 25 Aug 2011 20:26:49 +0200
 javac.source=1.5
-javac.compilerargs=-Xlint -Xlint:-serial
+javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
-nbm.homepage=http://www.jmonkeyengine.com
+nbm.homepage=http\://www.jmonkeyengine.com
 nbm.module.author=Normen Hansen
 nbm.needs.restart=true
-spec.version.base=0.6.1
+spec.version.base=3.0.0

sdk/jme3-scenecomposer/nbproject/project.xml

@@ -12,7 +12,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>0.11</specification-version>
+                        <specification-version>3.0.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -21,7 +21,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>0.5</specification-version>
+                        <specification-version>3.0.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -30,7 +30,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>0.5</specification-version>
+                        <specification-version>3.0.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -39,7 +39,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>0.8</specification-version>
+                        <specification-version>3.0.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

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

@@ -5,11 +5,11 @@ CTL_SceneComposerAction=SceneComposer
 CTL_SceneComposerTopComponent=SceneComposer Window
 CTL_SomeAction=SomeAction
 HINT_SceneComposerTopComponent=This is a SceneComposer window
-OpenIDE-Module-Display-Category=jMonkeyPlatform
+OpenIDE-Module-Display-Category=jMonkeyEngine
 OpenIDE-Module-Long-Description=\
-    This plugin provides simple scene composing for jMonkeyPlatform.
+    This plugin provides simple scene composing and general editing of j3o files.
-OpenIDE-Module-Name=Simple SceneComposer
+OpenIDE-Module-Name=SceneComposer
-OpenIDE-Module-Short-Description=Provides Simple Scene Composing for jMP
+OpenIDE-Module-Short-Description=Provides Scene Composing
 SceneComposerTopComponent.jLabel1.text=
 SceneComposerTopComponent.jLabel2.text=
 SceneComposerTopComponent.sceneInfoLabel3.text=jLabel3

sdk/jme3-templates/nbproject/project.properties

@@ -1,7 +1,8 @@
+#Thu, 25 Aug 2011 20:26:48 +0200
 javac.source=1.5
-javac.compilerargs=-Xlint -Xlint:-serial
+javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
-nbm.homepage=http://www.jmonkeyengine.com
+nbm.homepage=http\://www.jmonkeyengine.com
 nbm.module.author=jMonkeyEngine
 nbm.needs.restart=true
-spec.version.base=0.1.0
+spec.version.base=3.0.0

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

@@ -1,7 +1,7 @@
 LBL_CreateProjectStep=Name and Location
-OpenIDE-Module-Display-Category=jMonkeyPlatform
+OpenIDE-Module-Display-Category=jMonkeyEngine
 OpenIDE-Module-Long-Description=\
-    This plugin contains the basic project templates for jMonkeyPlatform.
+    This plugin contains the basic project templates
 OpenIDE-Module-Name=Project Templates
-OpenIDE-Module-Short-Description=Provides Project Templates for jMP
+OpenIDE-Module-Short-Description=Provides Project Templates
 Templates/Project/JME3/BasicGameProject.zip=BasicGame

sdk/jme3-terrain-editor/nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=ac4681b3
+build.xml.data.CRC32=22931240
 build.xml.script.CRC32=5fb89d93
-build.xml.stylesheet.CRC32=a56c6a5b@1.45.1
+build.xml.stylesheet.CRC32=a56c6a5b@1.46.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=ac4681b3
+nbproject/build-impl.xml.data.CRC32=22931240
 nbproject/build-impl.xml.script.CRC32=fe2b940f
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45.1
+nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.1

sdk/jme3-terrain-editor/nbproject/project.properties

@@ -1,6 +1,7 @@
+#Thu, 25 Aug 2011 20:26:49 +0200
 javac.source=1.5
-javac.compilerargs=-Xlint -Xlint:-serial
+javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
-nbm.homepage=http://www.jmonkeyengine.com
+nbm.homepage=http\://www.jmonkeyengine.com
-nbm.module.author=Normen Hansen, Brent Owens
+nbm.module.author=Brent Owens, Normen Hansen
-spec.version.base=0.1
+spec.version.base=3.0.0

sdk/jme3-terrain-editor/nbproject/project.xml

@@ -12,7 +12,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>0.8</specification-version>
+                        <specification-version>3.0.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -21,7 +21,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>0.6</specification-version>
+                        <specification-version>3.0.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

sdk/jme3-terrain-editor/src/com/jme3/gde/terraineditor/Bundle.properties

@@ -2,11 +2,11 @@ CTL_EditTerrainAction=Edit Terrain
 CTL_TerrainEditorAction=TerrainEditor
 CTL_TerrainEditorTopComponent=TerrainEditor Window
 HINT_TerrainEditorTopComponent=This is a TerrainEditor window
-OpenIDE-Module-Display-Category=jMonkeyPlatform
+OpenIDE-Module-Display-Category=jMonkeyEngine
 OpenIDE-Module-Long-Description=\
-   Terrain Editor for jMonkeyPlatform
+    Terrain Editor
 OpenIDE-Module-Name=Terrain Editor
-OpenIDE-Module-Short-Description=Terrain Editor for jMonkeyPlatform
+OpenIDE-Module-Short-Description=Terrain Editor
 TerrainEditorTopComponent.createTerrainButton.text=
 TerrainEditorTopComponent.raiseTerrainButton.text=
 TerrainEditorTopComponent.lowerTerrainButton.text=

sdk/jme3-texture-editor/nbproject/project.properties

@@ -1,7 +1,8 @@
+#Thu, 25 Aug 2011 20:26:49 +0200
 javac.source=1.5
-javac.compilerargs=-Xlint -Xlint:-serial
+javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
-nbm.homepage=http://www.jmonkeyengine.com
+nbm.homepage=http\://www.jmonkeyengine.com
 nbm.module.author=pgi
 nbm.needs.restart=true
-spec.version.base=0.8.0
+spec.version.base=3.0.0

sdk/jme3-texture-editor/src/com/jme3/gde/textureeditor/Bundle.properties

@@ -4,7 +4,7 @@ CTL_OpenTexture=Edit Texture
 CTL_SomeAction=sfefe
 HINT_ImageEditorTopComponent=This is a ImageEditor window
 LBL_JmeTexture_loader_name=JmeTexture Files
-OpenIDE-Module-Display-Category=jMonkeyPlatform
+OpenIDE-Module-Display-Category=jMonkeyEngine
 OpenIDE-Module-Long-Description=\
     This plugin combines commonly needed image operations for textures.
 OpenIDE-Module-Name=Texture Editor

sdk/jme3-vehicle-creator/nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=63c53212
+build.xml.data.CRC32=ab69c3b7
 build.xml.script.CRC32=39e31f0c
-build.xml.stylesheet.CRC32=a56c6a5b@1.42.2
+build.xml.stylesheet.CRC32=a56c6a5b@1.46.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=63c53212
+nbproject/build-impl.xml.data.CRC32=ab69c3b7
 nbproject/build-impl.xml.script.CRC32=90c55096
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.42.2
+nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.1

sdk/jme3-vehicle-creator/nbproject/project.properties

@@ -1,3 +1,4 @@
+#Thu, 25 Aug 2011 20:26:50 +0200
 javac.source=1.5
-javac.compilerargs=-Xlint -Xlint:-serial
+javac.compilerargs=-Xlint -Xlint\:-serial
-spec.version.base=0.1
+spec.version.base=3.0.0

sdk/jme3-vehicle-creator/nbproject/project.xml

@@ -12,7 +12,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>0.1</specification-version>
+                        <specification-version>3.0.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -21,7 +21,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>0.6</specification-version>
+                        <specification-version>3.0.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

sdk/jme3-vehicle-creator/src/com/jme3/gde/vehiclecreator/Bundle.properties

@@ -3,7 +3,7 @@ CTL_EditVehicleAction=Edit Vehicle
 CTL_VehicleCreatorAction=VehicleCreator
 CTL_VehicleCreatorTopComponent=VehicleCreator Window
 HINT_VehicleCreatorTopComponent=This is a VehicleCreator window
-OpenIDE-Module-Display-Category=jMonkeyPlatform
+OpenIDE-Module-Display-Category=jMonkeyEngine
 OpenIDE-Module-Long-Description=\
     This plugin lets you create and tune bullet-based raycast vehicles for jme3
 OpenIDE-Module-Name=Vehicle Creator