diff --git a/sdk/jme3-angelfont/nbproject/genfiles.properties b/sdk/jme3-angelfont/nbproject/genfiles.properties
index 85fc18b44..731d5d139 100644
--- a/sdk/jme3-angelfont/nbproject/genfiles.properties
+++ b/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
diff --git a/sdk/jme3-angelfont/nbproject/project.properties b/sdk/jme3-angelfont/nbproject/project.properties
index df192b859..3d19f4a47 100644
--- a/sdk/jme3-angelfont/nbproject/project.properties
+++ b/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
-spec.version.base=0.6.0
+javac.compilerargs=-Xlint -Xlint\:-serial
+spec.version.base=3.0.0
diff --git a/sdk/jme3-angelfont/nbproject/project.xml b/sdk/jme3-angelfont/nbproject/project.xml
index 30369a261..5b2930c69 100644
--- a/sdk/jme3-angelfont/nbproject/project.xml
+++ b/sdk/jme3-angelfont/nbproject/project.xml
@@ -12,7 +12,7 @@
1
- 0.12
+ 3.0.0
@@ -21,7 +21,7 @@
1
- 0.8.1
+ 3.0.0
diff --git a/sdk/jme3-angelfont/src/com/jme3/gde/angelfont/Bundle.properties b/sdk/jme3-angelfont/src/com/jme3/gde/angelfont/Bundle.properties
index f2b63de34..74825dbc8 100644
--- a/sdk/jme3-angelfont/src/com/jme3/gde/angelfont/Bundle.properties
+++ b/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
diff --git a/sdk/jme3-assetpack-support/nbproject/genfiles.properties b/sdk/jme3-assetpack-support/nbproject/genfiles.properties
index 21e363861..1496ece20 100644
--- a/sdk/jme3-assetpack-support/nbproject/genfiles.properties
+++ b/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
diff --git a/sdk/jme3-assetpack-support/nbproject/project.properties b/sdk/jme3-assetpack-support/nbproject/project.properties
index 00311e62a..50bdbe1fd 100644
--- a/sdk/jme3-assetpack-support/nbproject/project.properties
+++ b/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
diff --git a/sdk/jme3-assetpack-support/nbproject/project.xml b/sdk/jme3-assetpack-support/nbproject/project.xml
index 11b14ecef..264809243 100644
--- a/sdk/jme3-assetpack-support/nbproject/project.xml
+++ b/sdk/jme3-assetpack-support/nbproject/project.xml
@@ -12,7 +12,7 @@
1
- 0.9
+ 3.0.0
@@ -21,7 +21,7 @@
1
- 0.7
+ 3.0.0
@@ -30,7 +30,7 @@
1
- 0.6.1
+ 3.0.0
@@ -39,7 +39,7 @@
1
- 0.6.1
+ 3.0.0
diff --git a/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/Bundle.properties b/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/Bundle.properties
index efb841e2f..ccc1b50a1 100644
--- a/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/Bundle.properties
+++ b/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
diff --git a/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/browser/AssetPackLibrary.java b/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/browser/AssetPackLibrary.java
index dc75b62e8..95617dead 100644
--- a/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/browser/AssetPackLibrary.java
+++ b/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!");
diff --git a/sdk/jme3-blender/nbproject/genfiles.properties b/sdk/jme3-blender/nbproject/genfiles.properties
index 287ff270f..cbd37a056 100644
--- a/sdk/jme3-blender/nbproject/genfiles.properties
+++ b/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
diff --git a/sdk/jme3-blender/nbproject/project.properties b/sdk/jme3-blender/nbproject/project.properties
index 475cb6b5f..a57a62e36 100644
--- a/sdk/jme3-blender/nbproject/project.properties
+++ b/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
-nbm.homepage=http://www.jmonkeyengine.com
+javac.compilerargs=-Xlint -Xlint\:-serial
+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
diff --git a/sdk/jme3-blender/nbproject/project.xml b/sdk/jme3-blender/nbproject/project.xml
index b8e7a2f9e..769fb02c8 100644
--- a/sdk/jme3-blender/nbproject/project.xml
+++ b/sdk/jme3-blender/nbproject/project.xml
@@ -12,7 +12,7 @@
1
- 0.11
+ 3.0.0
@@ -21,7 +21,7 @@
1
- 0.6
+ 3.0.0
diff --git a/sdk/jme3-blender/src/com/jme3/gde/blender/BlenderDataObject.java b/sdk/jme3-blender/src/com/jme3/gde/blender/BlenderDataObject.java
index 55739bae3..e4b933726 100644
--- a/sdk/jme3-blender/src/com/jme3/gde/blender/BlenderDataObject.java
+++ b/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;
}
}
diff --git a/sdk/jme3-blender/src/com/jme3/gde/blender/Bundle.properties b/sdk/jme3-blender/src/com/jme3/gde/blender/Bundle.properties
index 04673588b..177d85515 100644
--- a/sdk/jme3-blender/src/com/jme3/gde/blender/Bundle.properties
+++ b/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
diff --git a/sdk/jme3-cinematics/nbproject/genfiles.properties b/sdk/jme3-cinematics/nbproject/genfiles.properties
index af5574724..07d762d98 100644
--- a/sdk/jme3-cinematics/nbproject/genfiles.properties
+++ b/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
diff --git a/sdk/jme3-cinematics/nbproject/project.properties b/sdk/jme3-cinematics/nbproject/project.properties
index 03f070ffb..4aadc709d 100644
--- a/sdk/jme3-cinematics/nbproject/project.properties
+++ b/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
diff --git a/sdk/jme3-cinematics/nbproject/project.xml b/sdk/jme3-cinematics/nbproject/project.xml
index fc1320911..415e8a4dd 100644
--- a/sdk/jme3-cinematics/nbproject/project.xml
+++ b/sdk/jme3-cinematics/nbproject/project.xml
@@ -12,7 +12,7 @@
1
- 0.1
+ 3.0.0
@@ -21,7 +21,7 @@
1
- 0.5
+ 3.0.0
@@ -30,7 +30,7 @@
1
- 0.5
+ 3.0.0
diff --git a/sdk/jme3-cinematics/src/com/jme3/gde/cinematics/Bundle.properties b/sdk/jme3-cinematics/src/com/jme3/gde/cinematics/Bundle.properties
index 30f2e4a5e..250527041 100644
--- a/sdk/jme3-cinematics/src/com/jme3/gde/cinematics/Bundle.properties
+++ b/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
diff --git a/sdk/jme3-code-check/nbproject/genfiles.properties b/sdk/jme3-code-check/nbproject/genfiles.properties
index ed4b9c0cd..b18d4620d 100644
--- a/sdk/jme3-code-check/nbproject/genfiles.properties
+++ b/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
diff --git a/sdk/jme3-code-check/nbproject/project.properties b/sdk/jme3-code-check/nbproject/project.properties
index 8a2d04126..c05bd3a9b 100644
--- a/sdk/jme3-code-check/nbproject/project.properties
+++ b/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
-spec.version.base=0.1.0
+javac.compilerargs=-Xlint -Xlint\:-serial
+spec.version.base=3.0.0
diff --git a/sdk/jme3-code-check/nbproject/project.xml b/sdk/jme3-code-check/nbproject/project.xml
index 44daf8669..774f2866b 100644
--- a/sdk/jme3-code-check/nbproject/project.xml
+++ b/sdk/jme3-code-check/nbproject/project.xml
@@ -12,7 +12,7 @@
1
- 0.8
+ 3.0.0
diff --git a/sdk/jme3-code-check/src/com/jme3/gde/codecheck/Bundle.properties b/sdk/jme3-code-check/src/com/jme3/gde/codecheck/Bundle.properties
index 638b0cee6..77ffb1bd6 100644
--- a/sdk/jme3-code-check/src/com/jme3/gde/codecheck/Bundle.properties
+++ b/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
diff --git a/sdk/jme3-codepalette/nbproject/project.properties b/sdk/jme3-codepalette/nbproject/project.properties
index dbaf5c9f4..50bdbe1fd 100644
--- a/sdk/jme3-codepalette/nbproject/project.properties
+++ b/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
diff --git a/sdk/jme3-codepalette/src/com/jme3/gde/codepalette/Bundle.properties b/sdk/jme3-codepalette/src/com/jme3/gde/codepalette/Bundle.properties
index 05ed4cbf5..b9beea144 100644
--- a/sdk/jme3-codepalette/src/com/jme3/gde/codepalette/Bundle.properties
+++ b/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
diff --git a/sdk/jme3-core-baselibs/nbproject/project.properties b/sdk/jme3-core-baselibs/nbproject/project.properties
index 4eac5a1a2..4dde667f1 100644
--- a/sdk/jme3-core-baselibs/nbproject/project.properties
+++ b/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
diff --git a/sdk/jme3-core-baselibs/src/com/jme3/gde/core/baselibs/Bundle.properties b/sdk/jme3-core-baselibs/src/com/jme3/gde/core/baselibs/Bundle.properties
index 2ad2cbba1..4abf4f082 100644
--- a/sdk/jme3-core-baselibs/src/com/jme3/gde/core/baselibs/Bundle.properties
+++ b/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
-OpenIDE-Module-Name=jMonkeyPlatform Core jME3
-OpenIDE-Module-Short-Description=Provides the Core jME3 Libraries for jMP
+ This plugin provides the core engine libraries for jMonkeyEngine GDE.
+OpenIDE-Module-Name=GDE Engine
+OpenIDE-Module-Short-Description=Provides the Core Engine Libraries
diff --git a/sdk/jme3-core-libraries/nbproject/project.properties b/sdk/jme3-core-libraries/nbproject/project.properties
index 54e883cbe..e5723557e 100644
--- a/sdk/jme3-core-libraries/nbproject/project.properties
+++ b/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
diff --git a/sdk/jme3-core-libraries/src/com/jme3/gde/core/libraries/Bundle.properties b/sdk/jme3-core-libraries/src/com/jme3/gde/core/libraries/Bundle.properties
index 49c80f5b2..9fe3f7899 100644
--- a/sdk/jme3-core-libraries/src/com/jme3/gde/core/libraries/Bundle.properties
+++ b/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
diff --git a/sdk/jme3-core-updatecenters/nbproject/project.properties b/sdk/jme3-core-updatecenters/nbproject/project.properties
index df192b859..25a0353d6 100644
--- a/sdk/jme3-core-updatecenters/nbproject/project.properties
+++ b/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
-spec.version.base=0.6.0
+javac.compilerargs=-Xlint -Xlint\:-serial
+spec.version.base=3.0.0
diff --git a/sdk/jme3-core-updatecenters/src/com/jme3/gde/core/updatecenters/Bundle.properties b/sdk/jme3-core-updatecenters/src/com/jme3/gde/core/updatecenters/Bundle.properties
index ec3c29182..cdbf37486 100644
--- a/sdk/jme3-core-updatecenters/src/com/jme3/gde/core/updatecenters/Bundle.properties
+++ b/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
-OpenIDE-Module-Name=jMonkeyPlatform Core Update Centers
-OpenIDE-Module-Short-Description=jMonkeyPlatform Core Update Centers
+ jMonkeyEngine Core Update Center list
+OpenIDE-Module-Name=jMonkeyEngine Update Centers
+OpenIDE-Module-Short-Description=jMonkeyEngine Update Centers
diff --git a/sdk/jme3-core/javahelp/com/jme3/gde/core/docs/core-updating.html b/sdk/jme3-core/javahelp/com/jme3/gde/core/docs/core-updating.html
index 5d3477237..23ab9e47f 100644
--- a/sdk/jme3-core/javahelp/com/jme3/gde/core/docs/core-updating.html
+++ b/sdk/jme3-core/javahelp/com/jme3/gde/core/docs/core-updating.html
@@ -37,12 +37,13 @@
Automatically Updating jMonkeyEngine SDK
- 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:
Go to Tools→Plugins
Select the “Settings” tab
- Select the checkbox for “jMonkeyPlatform nightly svn”
+ Select the checkbox for “jMonkeyEngine Nightly”
Select the “Updates” tab
Press “Reload Catalog”
Press “Update”
diff --git a/sdk/jme3-core/manifest.mf b/sdk/jme3-core/manifest.mf
index 691281ff9..d1a2d12e2 100644
--- a/sdk/jme3-core/manifest.mf
+++ b/sdk/jme3-core/manifest.mf
@@ -1,8 +1,8 @@
-Manifest-Version: 1.0
-OpenIDE-Module: com.jme3.gde.core/1
-OpenIDE-Module-Implementation-Version: 0
-OpenIDE-Module-Install: com/jme3/gde/core/Installer.class
-OpenIDE-Module-Layer: com/jme3/gde/core/layer.xml
-OpenIDE-Module-Localizing-Bundle: com/jme3/gde/core/Bundle.properties
-OpenIDE-Module-Requires: org.netbeans.api.javahelp.Help, org.openide.windows.WindowManager
-
+Manifest-Version: 1.0
+OpenIDE-Module: com.jme3.gde.core/1
+OpenIDE-Module-Implementation-Version: 0
+OpenIDE-Module-Install: com/jme3/gde/core/Installer.class
+OpenIDE-Module-Layer: com/jme3/gde/core/layer.xml
+OpenIDE-Module-Localizing-Bundle: com/jme3/gde/core/Bundle.properties
+OpenIDE-Module-Requires: org.netbeans.api.javahelp.Help, org.openide.windows.WindowManager
+
diff --git a/sdk/jme3-core/nbproject/project.properties b/sdk/jme3-core/nbproject/project.properties
index b010f823c..9dba5a849 100644
--- a/sdk/jme3-core/nbproject/project.properties
+++ b/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
diff --git a/sdk/jme3-core/nbproject/project.xml b/sdk/jme3-core/nbproject/project.xml
index e3f04e03c..87f34cfa2 100644
--- a/sdk/jme3-core/nbproject/project.xml
+++ b/sdk/jme3-core/nbproject/project.xml
@@ -1,274 +1,287 @@
-
-
- org.netbeans.modules.apisupport.project
-
-
- com.jme3.gde.core
-
-
-
- com.jme3.gde.core.baselibs
-
-
-
- 1
- 0.6
-
-
-
- com.jme3.gde.core.libraries
-
-
-
- 1
- 0.5
-
-
-
- com.jme3.gde.core.updatecenters
-
- 0.6
-
-
-
- org.netbeans.api.progress
-
-
-
- 1
- 1.16.1.1
-
-
-
- org.netbeans.libs.javacapi
-
-
-
- 0.11.1.1
-
-
-
- org.netbeans.modules.autoupdate.services
-
- 1.16.1
-
-
-
- org.netbeans.modules.editor.lib2
-
-
-
- 1
- 1.18.1.2
-
-
-
- org.netbeans.modules.java.j2seproject
-
-
-
- 1
-
-
-
-
- org.netbeans.modules.java.source
-
-
-
- 0.52.2.8.8.2
-
-
-
- org.netbeans.modules.project.ant
-
-
-
- 1
- 1.37
-
-
-
- org.netbeans.modules.project.libraries
-
-
-
- 1
- 1.25.1
-
-
-
- org.netbeans.modules.projectapi
-
-
-
- 1
- 1.28.1
-
-
-
- org.netbeans.modules.projectuiapi
-
-
-
- 1
- 1.40.1.6
-
-
-
- org.netbeans.modules.settings
-
-
-
- 1
- 1.22.1.1
-
-
-
- org.netbeans.spi.palette
-
-
-
- 1
- 1.20.1
-
-
-
- org.openide.actions
-
-
-
- 6.12.1.1
-
-
-
- org.openide.awt
-
-
-
- 7.19.1.1
-
-
-
- org.openide.dialogs
-
-
-
- 7.13.1
-
-
-
- org.openide.explorer
-
-
-
- 6.22.2.1
-
-
-
- org.openide.filesystems
-
-
-
- 7.32.1.1.1
-
-
-
- org.openide.io
-
-
-
- 1.20.1
-
-
-
- org.openide.loaders
-
-
-
- 7.10.1
-
-
-
- org.openide.modules
-
-
-
- 7.13.1
-
-
-
- org.openide.nodes
-
-
-
- 7.12.1.1
-
-
-
- org.openide.text
-
-
-
- 6.27.1
-
-
-
- org.openide.util
-
-
-
- 7.31.1.1
-
-
-
- org.openide.util.lookup
-
-
-
- 8.3.1
-
-
-
- org.openide.windows
-
-
-
- 6.30.1
-
-
-
-
- com.jme3.gde.core
- com.jme3.gde.core.assets
- com.jme3.gde.core.assets.actions
- com.jme3.gde.core.assets.nodes
- com.jme3.gde.core.codeless
- com.jme3.gde.core.errorreport
- com.jme3.gde.core.filters
- com.jme3.gde.core.filters.actions
- com.jme3.gde.core.filters.impl
- com.jme3.gde.core.filters.impl.bloom
- com.jme3.gde.core.j2seproject
- com.jme3.gde.core.properties
- com.jme3.gde.core.properties.preview
- com.jme3.gde.core.scene
- com.jme3.gde.core.scene.controller
- com.jme3.gde.core.scene.controller.toolbars
- com.jme3.gde.core.scene.processors
- com.jme3.gde.core.sceneexplorer
- com.jme3.gde.core.sceneexplorer.nodes
- com.jme3.gde.core.sceneexplorer.nodes.actions
- com.jme3.gde.core.sceneexplorer.nodes.actions.impl
- com.jme3.gde.core.sceneviewer
- com.jme3.gde.core.sceneviewer.actions
- com.jme3.gde.core.undoredo
- com.jme3.gde.core.util
-
-
- ext/DDSUtils.jar
- release/modules/ext/DDSUtils.jar
-
-
-
-
+
+
+ org.netbeans.modules.apisupport.project
+
+
+ com.jme3.gde.core
+
+
+
+ com.jme3.gde.core.baselibs
+
+
+
+ 1
+ 3.0.0
+
+
+
+ com.jme3.gde.core.libraries
+
+
+
+ 1
+ 3.0.0
+
+
+
+ com.jme3.gde.core.updatecenters
+
+ 3.0.0
+
+
+
+ org.netbeans.api.progress
+
+
+
+ 1
+ 1.16.1.1
+
+
+
+ org.netbeans.libs.commons_logging
+
+
+
+ 1
+ 1.18.0.11
+
+
+
+ org.netbeans.libs.javacapi
+
+
+
+ 0.11.1.1
+
+
+
+ org.netbeans.modules.autoupdate.services
+
+ 1.16.1
+
+
+
+ org.netbeans.modules.editor.lib2
+
+
+
+ 1
+ 1.18.1.2
+
+
+
+ org.netbeans.modules.java.j2seproject
+
+
+
+ 1
+
+
+
+
+ org.netbeans.modules.java.source
+
+
+
+ 0.52.2.8.8.2
+
+
+
+ org.netbeans.modules.project.ant
+
+
+
+ 1
+ 1.37
+
+
+
+ org.netbeans.modules.project.libraries
+
+
+
+ 1
+ 1.25.1
+
+
+
+ org.netbeans.modules.projectapi
+
+
+
+ 1
+ 1.28.1
+
+
+
+ org.netbeans.modules.projectuiapi
+
+
+
+ 1
+ 1.40.1.6
+
+
+
+ org.netbeans.modules.settings
+
+
+
+ 1
+ 1.22.1.1
+
+
+
+ org.netbeans.spi.palette
+
+
+
+ 1
+ 1.20.1
+
+
+
+ org.openide.actions
+
+
+
+ 6.12.1.1
+
+
+
+ org.openide.awt
+
+
+
+ 7.19.1.1
+
+
+
+ org.openide.dialogs
+
+
+
+ 7.13.1
+
+
+
+ org.openide.explorer
+
+
+
+ 6.22.2.1
+
+
+
+ org.openide.filesystems
+
+
+
+ 7.32.1.1.1
+
+
+
+ org.openide.io
+
+
+
+ 1.20.1
+
+
+
+ org.openide.loaders
+
+
+
+ 7.10.1
+
+
+
+ org.openide.modules
+
+
+
+ 7.13.1
+
+
+
+ org.openide.nodes
+
+
+
+ 7.12.1.1
+
+
+
+ org.openide.text
+
+
+
+ 6.27.1
+
+
+
+ org.openide.util
+
+
+
+ 7.31.1.1
+
+
+
+ org.openide.util.lookup
+
+
+
+ 8.3.1
+
+
+
+ org.openide.windows
+
+
+
+ 6.30.1
+
+
+
+
+ com.jme3.gde.core
+ com.jme3.gde.core.assets
+ com.jme3.gde.core.assets.actions
+ com.jme3.gde.core.assets.nodes
+ com.jme3.gde.core.codeless
+ com.jme3.gde.core.errorreport
+ com.jme3.gde.core.filters
+ com.jme3.gde.core.filters.actions
+ com.jme3.gde.core.filters.impl
+ com.jme3.gde.core.filters.impl.bloom
+ com.jme3.gde.core.j2seproject
+ com.jme3.gde.core.properties
+ com.jme3.gde.core.properties.preview
+ com.jme3.gde.core.scene
+ com.jme3.gde.core.scene.controller
+ com.jme3.gde.core.scene.controller.toolbars
+ com.jme3.gde.core.scene.processors
+ com.jme3.gde.core.sceneexplorer
+ com.jme3.gde.core.sceneexplorer.nodes
+ com.jme3.gde.core.sceneexplorer.nodes.actions
+ com.jme3.gde.core.sceneexplorer.nodes.actions.impl
+ com.jme3.gde.core.sceneviewer
+ com.jme3.gde.core.sceneviewer.actions
+ com.jme3.gde.core.undoredo
+ com.jme3.gde.core.util
+
+
+ ext/DDSUtils.jar
+ release/modules/ext/DDSUtils.jar
+
+
+ ext/commons-beanutils-1.8.3.jar
+ release/modules/ext/commons-beanutils-1.8.3.jar
+
+
+
+
diff --git a/sdk/jme3-core/release/modules/ext/commons-beanutils-1.8.3.jar b/sdk/jme3-core/release/modules/ext/commons-beanutils-1.8.3.jar
new file mode 100644
index 000000000..218510bc5
Binary files /dev/null and b/sdk/jme3-core/release/modules/ext/commons-beanutils-1.8.3.jar differ
diff --git a/sdk/jme3-core/src/com/jme3/gde/core/Bundle.properties b/sdk/jme3-core/src/com/jme3/gde/core/Bundle.properties
index a8a0d9a7a..a5db6ae47 100644
--- a/sdk/jme3-core/src/com/jme3/gde/core/Bundle.properties
+++ b/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.
-OpenIDE-Module-Name=jMonkeyPlatform Core
-OpenIDE-Module-Short-Description=The jMonkeyPlatform Core Plugin
+ This plugin provides the core functions of jMonkeyEngine GDE.
+OpenIDE-Module-Name=GDE Core
+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
diff --git a/sdk/jme3-core/src/com/jme3/gde/core/assets/AssetData.java b/sdk/jme3-core/src/com/jme3/gde/core/assets/AssetData.java
index 4282b0759..f42474bfe 100644
--- a/sdk/jme3-core/src/com/jme3/gde/core/assets/AssetData.java
+++ b/sdk/jme3-core/src/com/jme3/gde/core/assets/AssetData.java
@@ -64,6 +64,10 @@ public class AssetData extends Properties {
public AssetKey> getAssetKey() {
return file.getAssetKey();
}
+
+ public void setAssetKey(AssetKey key){
+ file.setAssetKeyData(key);
+ }
public Object loadAsset() {
return file.loadAsset();
diff --git a/sdk/jme3-core/src/com/jme3/gde/core/assets/AssetDataObject.java b/sdk/jme3-core/src/com/jme3/gde/core/assets/AssetDataObject.java
index 06a3e452c..38dd7d35d 100644
--- a/sdk/jme3-core/src/com/jme3/gde/core/assets/AssetDataObject.java
+++ b/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 (mgr == null) {
- return null;
+ if (assetKey == null) {
+ ProjectAssetManager mgr = getLookup().lookup(ProjectAssetManager.class);
+ if (mgr == null) {
+ return null;
+ }
+ String assetKey = mgr.getRelativeAssetPath(getPrimaryFile().getPath());
+ this.assetKey = new AssetKey(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(assetKey);
}
}
diff --git a/sdk/jme3-core/src/com/jme3/gde/core/assets/ProjectAssetManager.java b/sdk/jme3-core/src/com/jme3/gde/core/assets/ProjectAssetManager.java
index f630431dc..decda7311 100644
--- a/sdk/jme3-core/src/com/jme3/gde/core/assets/ProjectAssetManager.java
+++ b/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 folderName = new LinkedList();
+ private List folderNames = new LinkedList();
public ProjectAssetManager(Project prj, String folderName) {
- this(prj);
- addFileLocator(folderName);
+ super(true);
+ 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() {
- return folderName.get(0);
+ private String getFolderName() {
+ 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(){
- return project.getProjectDirectory().getFileObject(getFolderName());
+ public FileObject getAssetFolder() {
+ if (folderNames.isEmpty()) {
+ return project.getProjectDirectory();
+ } else {
+ return project.getProjectDirectory().getFileObject(getFolderName());
+ }
}
public String getAbsoluteAssetPath(String path) {
- for (Iterator it = folderName.iterator(); it.hasNext();) {
- String string = project.getProjectDirectory().getPath() + "/" + it.next() + "/" + path;
- Logger.getLogger(this.getClass().getName()).log(Level.SEVERE, "Check {0}", string);
- File file = new File(string);
- if (file.exists()) {
- return file.getAbsolutePath();
+ if (folderNames.isEmpty()) {
+ } else {
+ for (Iterator it = folderNames.iterator(); it.hasNext();) {
+ FileObject string = project.getProjectDirectory().getFileObject(it.next() + "/" + path);
+ if (string != null) {
+ 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) {
- this.folderName.remove(0);
+ if (folderNames.size() > 0) {
+ this.folderNames.remove(0);
}
- this.folderName.add(0, folderName);
+ this.folderNames.add(0, folderName);
}
/**
diff --git a/sdk/jme3-core/src/com/jme3/gde/core/assets/ProjectAssetsNodeFactory.java b/sdk/jme3-core/src/com/jme3/gde/core/assets/ProjectAssetsNodeFactory.java
index 7495cf19e..d8242c456 100644
--- a/sdk/jme3-core/src/com/jme3/gde/core/assets/ProjectAssetsNodeFactory.java
+++ b/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);
- return NodeFactorySupport.fixedNodeList(nd);
- } catch (DataObjectNotFoundException ex) {
- Exceptions.printStackTrace(ex);
- }
+ ProjectAssetsNode nd = new ProjectAssetsNode(item, proj, node);
+// return NodeFactorySupport.createCompositeChildren(project, item.getAssetFolderName());//fixedNodeList(nd);
+ return NodeFactorySupport.fixedNodeList(nd);
}
} catch (Exception ex) {
Exceptions.printStackTrace(ex);
diff --git a/sdk/jme3-core/src/com/jme3/gde/core/assets/SpatialAssetDataObject.java b/sdk/jme3-core/src/com/jme3/gde/core/assets/SpatialAssetDataObject.java
index 99c85475d..b9d150084 100644
--- a/sdk/jme3-core/src/com/jme3/gde/core/assets/SpatialAssetDataObject.java
+++ b/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);
- if (mgr == null) {
- return null;
+ AssetKey superKey = super.getAssetKey();
+ if (superKey instanceof ModelKey) {
+ 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));
- Spatial spatial = mgr.loadModel(assetKey);
+ mgr.deleteFromCache(getAssetKey());
+ 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;
}
diff --git a/sdk/jme3-core/src/com/jme3/gde/core/codeless/CodelessProjectLogicalView.java b/sdk/jme3-core/src/com/jme3/gde/core/codeless/CodelessProjectLogicalView.java
index 2f1bc1bb5..b82c4660e 100644
--- a/sdk/jme3-core/src/com/jme3/gde/core/codeless/CodelessProjectLogicalView.java
+++ b/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);
diff --git a/sdk/jme3-desktop-executables/nbproject/project.properties b/sdk/jme3-desktop-executables/nbproject/project.properties
index 110121761..50bdbe1fd 100644
--- a/sdk/jme3-desktop-executables/nbproject/project.properties
+++ b/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
diff --git a/sdk/jme3-desktop-executables/nbproject/project.xml b/sdk/jme3-desktop-executables/nbproject/project.xml
index a28e9ced4..4d2c23d19 100644
--- a/sdk/jme3-desktop-executables/nbproject/project.xml
+++ b/sdk/jme3-desktop-executables/nbproject/project.xml
@@ -12,7 +12,7 @@
1
- 0.9
+ 3.0.0
diff --git a/sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/Bundle.properties b/sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/Bundle.properties
index d965727a2..8b6194243 100644
--- a/sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/Bundle.properties
+++ b/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
diff --git a/sdk/jme3-gui/nbproject/genfiles.properties b/sdk/jme3-gui/nbproject/genfiles.properties
index 14b13ec2a..cafa7546b 100644
--- a/sdk/jme3-gui/nbproject/genfiles.properties
+++ b/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
diff --git a/sdk/jme3-gui/nbproject/project.properties b/sdk/jme3-gui/nbproject/project.properties
index 802caef86..50bdbe1fd 100644
--- a/sdk/jme3-gui/nbproject/project.properties
+++ b/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
diff --git a/sdk/jme3-gui/nbproject/project.xml b/sdk/jme3-gui/nbproject/project.xml
index 566e497a5..2289cf577 100644
--- a/sdk/jme3-gui/nbproject/project.xml
+++ b/sdk/jme3-gui/nbproject/project.xml
@@ -12,7 +12,7 @@
1
- 0.9.1
+ 3.0.0
@@ -21,7 +21,7 @@
1
- 0.5
+ 3.0.0
@@ -30,7 +30,7 @@
1
- 0.8
+ 3.0.0
diff --git a/sdk/jme3-gui/src/com/jme3/gde/gui/Bundle.properties b/sdk/jme3-gui/src/com/jme3/gde/gui/Bundle.properties
index 8f3bb4286..91fe01a5b 100644
--- a/sdk/jme3-gui/src/com/jme3/gde/gui/Bundle.properties
+++ b/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
diff --git a/sdk/jme3-lwjgl-applet/nbproject/genfiles.properties b/sdk/jme3-lwjgl-applet/nbproject/genfiles.properties
index 4d76076e1..546dd6d5c 100644
--- a/sdk/jme3-lwjgl-applet/nbproject/genfiles.properties
+++ b/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
diff --git a/sdk/jme3-lwjgl-applet/nbproject/project.properties b/sdk/jme3-lwjgl-applet/nbproject/project.properties
index 00311e62a..50bdbe1fd 100644
--- a/sdk/jme3-lwjgl-applet/nbproject/project.properties
+++ b/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
diff --git a/sdk/jme3-lwjgl-applet/nbproject/project.xml b/sdk/jme3-lwjgl-applet/nbproject/project.xml
index 5debc0c64..738dbc07a 100644
--- a/sdk/jme3-lwjgl-applet/nbproject/project.xml
+++ b/sdk/jme3-lwjgl-applet/nbproject/project.xml
@@ -12,7 +12,7 @@
1
- 0.9
+ 3.0.0
diff --git a/sdk/jme3-lwjgl-applet/src/com/jme3/gde/lwjgl/applet/Bundle.properties b/sdk/jme3-lwjgl-applet/src/com/jme3/gde/lwjgl/applet/Bundle.properties
index 5525a594f..febec4389 100644
--- a/sdk/jme3-lwjgl-applet/src/com/jme3/gde/lwjgl/applet/Bundle.properties
+++ b/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
diff --git a/sdk/jme3-materialeditor/build.xml b/sdk/jme3-materialeditor/build.xml
index dfada4e51..c2947deab 100644
--- a/sdk/jme3-materialeditor/build.xml
+++ b/sdk/jme3-materialeditor/build.xml
@@ -1,8 +1,8 @@
-
-
-
-
-
- Builds, tests, and runs the project com.jme3.gde.materials.
-
-
+
+
+
+
+
+ Builds, tests, and runs the project com.jme3.gde.materials.
+
+
diff --git a/sdk/jme3-materialeditor/nbproject/build-impl.xml b/sdk/jme3-materialeditor/nbproject/build-impl.xml
index ffa7a6f1d..3d3016e62 100644
--- a/sdk/jme3-materialeditor/nbproject/build-impl.xml
+++ b/sdk/jme3-materialeditor/nbproject/build-impl.xml
@@ -1,45 +1,45 @@
-
-
-
-
-
-
-
-
-
-
-
-
- You must set 'suite.dir' to point to your containing module suite
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ You must set 'suite.dir' to point to your containing module suite
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sdk/jme3-materialeditor/nbproject/genfiles.properties b/sdk/jme3-materialeditor/nbproject/genfiles.properties
index c7e417d2d..41bb9b85d 100644
--- a/sdk/jme3-materialeditor/nbproject/genfiles.properties
+++ b/sdk/jme3-materialeditor/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=6e7dc984
-build.xml.script.CRC32=f284e28d
-build.xml.stylesheet.CRC32=a56c6a5b@2.45
-# 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.script.CRC32=56cee44d
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.45
+build.xml.data.CRC32=3c35bd02
+build.xml.script.CRC32=f284e28d
+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=3c35bd02
+nbproject/build-impl.xml.script.CRC32=56cee44d
+nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.1
diff --git a/sdk/jme3-materialeditor/nbproject/project.properties b/sdk/jme3-materialeditor/nbproject/project.properties
index 00311e62a..50bdbe1fd 100644
--- a/sdk/jme3-materialeditor/nbproject/project.properties
+++ b/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
diff --git a/sdk/jme3-materialeditor/nbproject/project.xml b/sdk/jme3-materialeditor/nbproject/project.xml
index c17524c74..4a106fcf4 100644
--- a/sdk/jme3-materialeditor/nbproject/project.xml
+++ b/sdk/jme3-materialeditor/nbproject/project.xml
@@ -12,7 +12,7 @@
1
- 0.12.1
+ 3.0.0
@@ -21,7 +21,7 @@
1
- 0.5
+ 3.0.0
@@ -30,7 +30,7 @@
1
- 0.5
+ 3.0.0
diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/Bundle.properties b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/Bundle.properties
index f204299e1..3c1f7ca69 100644
--- a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/Bundle.properties
+++ b/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
diff --git a/sdk/jme3-model-importer/nbproject/genfiles.properties b/sdk/jme3-model-importer/nbproject/genfiles.properties
index 735fdcf6b..6471d1219 100644
--- a/sdk/jme3-model-importer/nbproject/genfiles.properties
+++ b/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
diff --git a/sdk/jme3-model-importer/nbproject/project.properties b/sdk/jme3-model-importer/nbproject/project.properties
index 833863ee2..50bdbe1fd 100644
--- a/sdk/jme3-model-importer/nbproject/project.properties
+++ b/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
diff --git a/sdk/jme3-model-importer/nbproject/project.xml b/sdk/jme3-model-importer/nbproject/project.xml
index 8a3cbdfe4..3604a9dcc 100644
--- a/sdk/jme3-model-importer/nbproject/project.xml
+++ b/sdk/jme3-model-importer/nbproject/project.xml
@@ -12,7 +12,7 @@
1
- 0.9
+ 3.0.0
@@ -21,7 +21,7 @@
1
- 0.7
+ 3.0.0
@@ -58,6 +58,14 @@
7.14
+
+ org.openide.explorer
+
+
+
+ 6.38
+
+
org.openide.filesystems
@@ -98,6 +106,14 @@
8.2
+
+ org.openide.windows
+
+
+
+ 6.45
+
+
diff --git a/sdk/jme3-model-importer/src/com/jme3/gde/modelimporter/Bundle.properties b/sdk/jme3-model-importer/src/com/jme3/gde/modelimporter/Bundle.properties
index e53c9d183..94d602cd7 100644
--- a/sdk/jme3-model-importer/src/com/jme3/gde/modelimporter/Bundle.properties
+++ b/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
diff --git a/sdk/jme3-model-importer/src/com/jme3/gde/modelimporter/ImportModel.java b/sdk/jme3-model-importer/src/com/jme3/gde/modelimporter/ImportModel.java
index 84a9b4b44..f6fe19c8e 100644
--- a/sdk/jme3-model-importer/src/com/jme3/gde/modelimporter/ImportModel.java
+++ b/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();
- exp.save(spat, outFile);
+ data.saveAsset();
+// 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 ModelImporterWizardPanel2()
- };
+ new ModelImporterWizardPanel1(),
+ new ModelImporterWizardPanel2()
+ };
String[] steps = new String[panels.length];
for (int i = 0; i < panels.length; i++) {
Component c = panels[i].getComponent();
diff --git a/sdk/jme3-model-importer/src/com/jme3/gde/modelimporter/ModelImporterVisualPanel1.form b/sdk/jme3-model-importer/src/com/jme3/gde/modelimporter/ModelImporterVisualPanel1.form
index 8c2ac7165..a032c04bf 100644
--- a/sdk/jme3-model-importer/src/com/jme3/gde/modelimporter/ModelImporterVisualPanel1.form
+++ b/sdk/jme3-model-importer/src/com/jme3/gde/modelimporter/ModelImporterVisualPanel1.form
@@ -23,34 +23,23 @@
-
-
-
-
+
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -72,28 +61,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -165,6 +134,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -184,47 +181,5 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sdk/jme3-model-importer/src/com/jme3/gde/modelimporter/ModelImporterVisualPanel1.java b/sdk/jme3-model-importer/src/com/jme3/gde/modelimporter/ModelImporterVisualPanel1.java
index c4576a0e7..4ca3bb1e5 100644
--- a/sdk/jme3-model-importer/src/com/jme3/gde/modelimporter/ModelImporterVisualPanel1.java
+++ b/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;
-
-@SuppressWarnings("unchecked")
+import org.openide.filesystems.FileUtil;
+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 requestedAssets = new LinkedList();
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.setAssetEventListener(this);
+// manager = (ProjectAssetManager) wiz.getProperty("manager");
}
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);
- mainKey = new ModelKey(path.getName());
+ currentModelPath = path.getPath();
+ 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
-
- 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)
- );
+ jPanel2.setLayout(new javax.swing.BoxLayout(jPanel2, javax.swing.BoxLayout.LINE_AXIS));
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(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))
+ .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, 331, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(jPanel2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(jPanel3, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
+ .addComponent(jPanel2, javax.swing.GroupLayout.PREFERRED_SIZE, 228, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addComponent(jToolBar1, javax.swing.GroupLayout.DEFAULT_SIZE, 559, 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(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
- .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, 320, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .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)))
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(jPanel2, javax.swing.GroupLayout.DEFAULT_SIZE, 340, Short.MAX_VALUE)
+ .addComponent(jPanel1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 340, Short.MAX_VALUE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(jToolBar1, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE)
.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;
diff --git a/sdk/jme3-model-importer/src/com/jme3/gde/modelimporter/ModelImporterVisualPanel2.form b/sdk/jme3-model-importer/src/com/jme3/gde/modelimporter/ModelImporterVisualPanel2.form
index af3611238..0c2c4b9d2 100644
--- a/sdk/jme3-model-importer/src/com/jme3/gde/modelimporter/ModelImporterVisualPanel2.form
+++ b/sdk/jme3-model-importer/src/com/jme3/gde/modelimporter/ModelImporterVisualPanel2.form
@@ -18,11 +18,15 @@
-
+
+
+
+
+
+
+
+
-
-
-
@@ -34,7 +38,10 @@
-
+
+
+
+
@@ -82,5 +89,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sdk/jme3-model-importer/src/com/jme3/gde/modelimporter/ModelImporterVisualPanel2.java b/sdk/jme3-model-importer/src/com/jme3/gde/modelimporter/ModelImporterVisualPanel2.java
index 75c7e613a..fb0e72737 100644
--- a/sdk/jme3-model-importer/src/com/jme3/gde/modelimporter/ModelImporterVisualPanel2.java
+++ b/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)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))
- .addComponent(jTextField1, javax.swing.GroupLayout.DEFAULT_SIZE, 400, Short.MAX_VALUE)
- .addComponent(jCheckBox1, javax.swing.GroupLayout.DEFAULT_SIZE, 400, Short.MAX_VALUE)
- .addComponent(jScrollPane1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 400, Short.MAX_VALUE)
+ .addContainerGap(323, Short.MAX_VALUE))
+ .addComponent(jTextField1, javax.swing.GroupLayout.DEFAULT_SIZE, 418, Short.MAX_VALUE)
+ .addComponent(jCheckBox1, javax.swing.GroupLayout.DEFAULT_SIZE, 418, 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)))
);
}// //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
diff --git a/sdk/jme3-obfuscate/nbproject/genfiles.properties b/sdk/jme3-obfuscate/nbproject/genfiles.properties
index e094c1c1b..c4de0078e 100644
--- a/sdk/jme3-obfuscate/nbproject/genfiles.properties
+++ b/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
diff --git a/sdk/jme3-obfuscate/nbproject/project.properties b/sdk/jme3-obfuscate/nbproject/project.properties
index 6780df9a4..639f16f60 100644
--- a/sdk/jme3-obfuscate/nbproject/project.properties
+++ b/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
-nbm.homepage=http://proguard.sourceforge.net/
+javac.compilerargs=-Xlint -Xlint\:-serial
+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
diff --git a/sdk/jme3-obfuscate/nbproject/project.xml b/sdk/jme3-obfuscate/nbproject/project.xml
index 9e38e99ba..a7c6375e8 100644
--- a/sdk/jme3-obfuscate/nbproject/project.xml
+++ b/sdk/jme3-obfuscate/nbproject/project.xml
@@ -12,7 +12,7 @@
1
- 0.12
+ 3.0.0
diff --git a/sdk/jme3-obfuscate/src/com/jme3/gde/obfuscate/Bundle.properties b/sdk/jme3-obfuscate/src/com/jme3/gde/obfuscate/Bundle.properties
index 9d412a0fe..4e90126cc 100644
--- a/sdk/jme3-obfuscate/src/com/jme3/gde/obfuscate/Bundle.properties
+++ b/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
diff --git a/sdk/jme3-ogretools/nbproject/genfiles.properties b/sdk/jme3-ogretools/nbproject/genfiles.properties
index d3fe71373..9e987a6d4 100644
--- a/sdk/jme3-ogretools/nbproject/genfiles.properties
+++ b/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
diff --git a/sdk/jme3-ogretools/nbproject/project.properties b/sdk/jme3-ogretools/nbproject/project.properties
index c6ff638f1..50bdbe1fd 100644
--- a/sdk/jme3-ogretools/nbproject/project.properties
+++ b/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
diff --git a/sdk/jme3-ogretools/nbproject/project.xml b/sdk/jme3-ogretools/nbproject/project.xml
index a4e06e7de..022fbde03 100644
--- a/sdk/jme3-ogretools/nbproject/project.xml
+++ b/sdk/jme3-ogretools/nbproject/project.xml
@@ -12,7 +12,7 @@
1
- 0.7
+ 3.0.0
@@ -21,7 +21,7 @@
1
- 0.5
+ 3.0.0
@@ -30,14 +30,14 @@
1
- 0.5
+ 3.0.0
com.jme3.gde.ogrexml
1
- 0.1
+ 3.0.0
diff --git a/sdk/jme3-ogretools/src/com/jme3/gde/ogretools/Bundle.properties b/sdk/jme3-ogretools/src/com/jme3/gde/ogretools/Bundle.properties
index 22fc96a9b..f437ea604 100644
--- a/sdk/jme3-ogretools/src/com/jme3/gde/ogretools/Bundle.properties
+++ b/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
diff --git a/sdk/jme3-ogrexml/nbproject/genfiles.properties b/sdk/jme3-ogrexml/nbproject/genfiles.properties
index 6c39f955e..f83a062fc 100644
--- a/sdk/jme3-ogrexml/nbproject/genfiles.properties
+++ b/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
diff --git a/sdk/jme3-ogrexml/nbproject/project.properties b/sdk/jme3-ogrexml/nbproject/project.properties
index 833863ee2..bf4d6b117 100644
--- a/sdk/jme3-ogrexml/nbproject/project.properties
+++ b/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
diff --git a/sdk/jme3-ogrexml/nbproject/project.xml b/sdk/jme3-ogrexml/nbproject/project.xml
index b2beb64d4..532ba8bbe 100644
--- a/sdk/jme3-ogrexml/nbproject/project.xml
+++ b/sdk/jme3-ogrexml/nbproject/project.xml
@@ -12,7 +12,7 @@
1
- 0.1
+ 3.0.0
@@ -21,7 +21,7 @@
1
- 0.5
+ 3.0.0
@@ -30,7 +30,7 @@
1
- 0.5
+ 3.0.0
diff --git a/sdk/jme3-ogrexml/src/com/jme3/gde/ogrexml/Bundle.properties b/sdk/jme3-ogrexml/src/com/jme3/gde/ogrexml/Bundle.properties
index e9f83928d..ced4fd100 100644
--- a/sdk/jme3-ogrexml/src/com/jme3/gde/ogrexml/Bundle.properties
+++ b/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
diff --git a/sdk/jme3-project-baselibs/nbproject/project.properties b/sdk/jme3-project-baselibs/nbproject/project.properties
index 652f2a3b4..7122203c6 100644
--- a/sdk/jme3-project-baselibs/nbproject/project.properties
+++ b/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
diff --git a/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/Bundle.properties b/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/Bundle.properties
index 090311157..fe40259c9 100644
--- a/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/Bundle.properties
+++ b/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.
-OpenIDE-Module-Name=Project jME3
-OpenIDE-Module-Short-Description=Provides jME3 Base Libraries for jMP Projects
+ This plugin contains the jMonkeyEngine3 version used to run and distribute your jMonkeyEngine applications.
+OpenIDE-Module-Name=Project Engine
+OpenIDE-Module-Short-Description=Provides jME3 Base Libraries for jME Projects
diff --git a/sdk/jme3-project-libraries/nbproject/project.properties b/sdk/jme3-project-libraries/nbproject/project.properties
index 7a33d7a9d..7122203c6 100644
--- a/sdk/jme3-project-libraries/nbproject/project.properties
+++ b/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
diff --git a/sdk/jme3-project-libraries/src/com/jme3/gde/project/libraries/Bundle.properties b/sdk/jme3-project-libraries/src/com/jme3/gde/project/libraries/Bundle.properties
index 0769c47d8..3acf3ddc0 100644
--- a/sdk/jme3-project-libraries/src/com/jme3/gde/project/libraries/Bundle.properties
+++ b/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
diff --git a/sdk/jme3-project-testdata/nbproject/project.properties b/sdk/jme3-project-testdata/nbproject/project.properties
index ea6e9234e..7122203c6 100644
--- a/sdk/jme3-project-testdata/nbproject/project.properties
+++ b/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
diff --git a/sdk/jme3-project-testdata/src/com/jme3/gde/project/testdata/Bundle.properties b/sdk/jme3-project-testdata/src/com/jme3/gde/project/testdata/Bundle.properties
index cc7c70d01..74014e436 100644
--- a/sdk/jme3-project-testdata/src/com/jme3/gde/project/testdata/Bundle.properties
+++ b/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
diff --git a/sdk/jme3-scenecomposer/nbproject/genfiles.properties b/sdk/jme3-scenecomposer/nbproject/genfiles.properties
index 6a7a8030a..fe864ff95 100644
--- a/sdk/jme3-scenecomposer/nbproject/genfiles.properties
+++ b/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
diff --git a/sdk/jme3-scenecomposer/nbproject/project.properties b/sdk/jme3-scenecomposer/nbproject/project.properties
index c6ff638f1..50bdbe1fd 100644
--- a/sdk/jme3-scenecomposer/nbproject/project.properties
+++ b/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
diff --git a/sdk/jme3-scenecomposer/nbproject/project.xml b/sdk/jme3-scenecomposer/nbproject/project.xml
index adeb3671d..949af52bd 100644
--- a/sdk/jme3-scenecomposer/nbproject/project.xml
+++ b/sdk/jme3-scenecomposer/nbproject/project.xml
@@ -12,7 +12,7 @@
1
- 0.11
+ 3.0.0
@@ -21,7 +21,7 @@
1
- 0.5
+ 3.0.0
@@ -30,7 +30,7 @@
1
- 0.5
+ 3.0.0
@@ -39,7 +39,7 @@
1
- 0.8
+ 3.0.0
diff --git a/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/Bundle.properties b/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/Bundle.properties
index 45ee49c55..25a6d1bcc 100644
--- a/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/Bundle.properties
+++ b/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.
-OpenIDE-Module-Name=Simple SceneComposer
-OpenIDE-Module-Short-Description=Provides Simple Scene Composing for jMP
+ This plugin provides simple scene composing and general editing of j3o files.
+OpenIDE-Module-Name=SceneComposer
+OpenIDE-Module-Short-Description=Provides Scene Composing
SceneComposerTopComponent.jLabel1.text=
SceneComposerTopComponent.jLabel2.text=
SceneComposerTopComponent.sceneInfoLabel3.text=jLabel3
diff --git a/sdk/jme3-templates/nbproject/project.properties b/sdk/jme3-templates/nbproject/project.properties
index bbafbfd2c..7122203c6 100644
--- a/sdk/jme3-templates/nbproject/project.properties
+++ b/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
diff --git a/sdk/jme3-templates/src/com/jme3/gde/templates/BasicGameProject.zip b/sdk/jme3-templates/src/com/jme3/gde/templates/BasicGameProject.zip
index 595402d0d..82049acf7 100644
Binary files a/sdk/jme3-templates/src/com/jme3/gde/templates/BasicGameProject.zip and b/sdk/jme3-templates/src/com/jme3/gde/templates/BasicGameProject.zip differ
diff --git a/sdk/jme3-templates/src/com/jme3/gde/templates/Bundle.properties b/sdk/jme3-templates/src/com/jme3/gde/templates/Bundle.properties
index 7abf938ff..7e30db593 100644
--- a/sdk/jme3-templates/src/com/jme3/gde/templates/Bundle.properties
+++ b/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
diff --git a/sdk/jme3-terrain-editor/nbproject/genfiles.properties b/sdk/jme3-terrain-editor/nbproject/genfiles.properties
index 001a90d69..90bac169e 100644
--- a/sdk/jme3-terrain-editor/nbproject/genfiles.properties
+++ b/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
diff --git a/sdk/jme3-terrain-editor/nbproject/project.properties b/sdk/jme3-terrain-editor/nbproject/project.properties
index 3f2734c81..bfcbcd55b 100644
--- a/sdk/jme3-terrain-editor/nbproject/project.properties
+++ b/sdk/jme3-terrain-editor/nbproject/project.properties
@@ -1,6 +1,7 @@
-javac.source=1.5
-javac.compilerargs=-Xlint -Xlint:-serial
-license.file=../license-jme.txt
-nbm.homepage=http://www.jmonkeyengine.com
-nbm.module.author=Normen Hansen, Brent Owens
-spec.version.base=0.1
+#Thu, 25 Aug 2011 20:26:49 +0200
+javac.source=1.5
+javac.compilerargs=-Xlint -Xlint\:-serial
+license.file=../license-jme.txt
+nbm.homepage=http\://www.jmonkeyengine.com
+nbm.module.author=Brent Owens, Normen Hansen
+spec.version.base=3.0.0
diff --git a/sdk/jme3-terrain-editor/nbproject/project.xml b/sdk/jme3-terrain-editor/nbproject/project.xml
index f669aec1d..30c1b1335 100644
--- a/sdk/jme3-terrain-editor/nbproject/project.xml
+++ b/sdk/jme3-terrain-editor/nbproject/project.xml
@@ -12,7 +12,7 @@
1
- 0.8
+ 3.0.0
@@ -21,7 +21,7 @@
1
- 0.6
+ 3.0.0
diff --git a/sdk/jme3-terrain-editor/src/com/jme3/gde/terraineditor/Bundle.properties b/sdk/jme3-terrain-editor/src/com/jme3/gde/terraineditor/Bundle.properties
index 07b2c49bd..6576f0956 100644
--- a/sdk/jme3-terrain-editor/src/com/jme3/gde/terraineditor/Bundle.properties
+++ b/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=
diff --git a/sdk/jme3-texture-editor/nbproject/project.properties b/sdk/jme3-texture-editor/nbproject/project.properties
index ee1321688..c92576e8c 100644
--- a/sdk/jme3-texture-editor/nbproject/project.properties
+++ b/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
diff --git a/sdk/jme3-texture-editor/src/com/jme3/gde/textureeditor/Bundle.properties b/sdk/jme3-texture-editor/src/com/jme3/gde/textureeditor/Bundle.properties
index da5888f17..8a31ef16a 100644
--- a/sdk/jme3-texture-editor/src/com/jme3/gde/textureeditor/Bundle.properties
+++ b/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
diff --git a/sdk/jme3-vehicle-creator/nbproject/genfiles.properties b/sdk/jme3-vehicle-creator/nbproject/genfiles.properties
index fb0e629e5..774fde876 100644
--- a/sdk/jme3-vehicle-creator/nbproject/genfiles.properties
+++ b/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
diff --git a/sdk/jme3-vehicle-creator/nbproject/project.properties b/sdk/jme3-vehicle-creator/nbproject/project.properties
index 4ecd09668..3d19f4a47 100644
--- a/sdk/jme3-vehicle-creator/nbproject/project.properties
+++ b/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
-spec.version.base=0.1
+javac.compilerargs=-Xlint -Xlint\:-serial
+spec.version.base=3.0.0
diff --git a/sdk/jme3-vehicle-creator/nbproject/project.xml b/sdk/jme3-vehicle-creator/nbproject/project.xml
index 3d8db1b4a..2849f282a 100644
--- a/sdk/jme3-vehicle-creator/nbproject/project.xml
+++ b/sdk/jme3-vehicle-creator/nbproject/project.xml
@@ -12,7 +12,7 @@
1
- 0.1
+ 3.0.0
@@ -21,7 +21,7 @@
1
- 0.6
+ 3.0.0
diff --git a/sdk/jme3-vehicle-creator/src/com/jme3/gde/vehiclecreator/Bundle.properties b/sdk/jme3-vehicle-creator/src/com/jme3/gde/vehiclecreator/Bundle.properties
index f4b3fefd6..41d860825 100644
--- a/sdk/jme3-vehicle-creator/src/com/jme3/gde/vehiclecreator/Bundle.properties
+++ b/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
diff --git a/sdk/jme3-wavefront/nbproject/genfiles.properties b/sdk/jme3-wavefront/nbproject/genfiles.properties
index a5d15d1d1..9fa8ad702 100644
--- a/sdk/jme3-wavefront/nbproject/genfiles.properties
+++ b/sdk/jme3-wavefront/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=45685247
+build.xml.data.CRC32=b3df996f
build.xml.script.CRC32=fa305471
-build.xml.stylesheet.CRC32=a56c6a5b@1.42.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=45685247
+nbproject/build-impl.xml.data.CRC32=b3df996f
nbproject/build-impl.xml.script.CRC32=8239585b
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.42.1
+nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.1
diff --git a/sdk/jme3-wavefront/nbproject/project.properties b/sdk/jme3-wavefront/nbproject/project.properties
index 570e13467..25a0353d6 100644
--- a/sdk/jme3-wavefront/nbproject/project.properties
+++ b/sdk/jme3-wavefront/nbproject/project.properties
@@ -1,3 +1,4 @@
+#Thu, 25 Aug 2011 20:26:49 +0200
javac.source=1.5
-javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=0.8.0
+javac.compilerargs=-Xlint -Xlint\:-serial
+spec.version.base=3.0.0
diff --git a/sdk/jme3-wavefront/nbproject/project.xml b/sdk/jme3-wavefront/nbproject/project.xml
index ccd8e6465..7e6d651af 100644
--- a/sdk/jme3-wavefront/nbproject/project.xml
+++ b/sdk/jme3-wavefront/nbproject/project.xml
@@ -12,7 +12,7 @@
1
- 0.7
+ 3.0.0
@@ -21,7 +21,7 @@
1
- 0.6
+ 3.0.0
diff --git a/sdk/jme3-wavefront/src/com/jme3/gde/wavefront/Bundle.properties b/sdk/jme3-wavefront/src/com/jme3/gde/wavefront/Bundle.properties
index 1b6b64cc3..590c8d9a0 100644
--- a/sdk/jme3-wavefront/src/com/jme3/gde/wavefront/Bundle.properties
+++ b/sdk/jme3-wavefront/src/com/jme3/gde/wavefront/Bundle.properties
@@ -1,9 +1,9 @@
LBL_WaveFrontMaterial_loader_name=WaveFrontMaterial Files
LBL_WaveFrontOBJ_loader_name=WaveFrontOBJ Files
-OpenIDE-Module-Display-Category=jMonkeyPlatform
+OpenIDE-Module-Display-Category=jMonkeyEngine
OpenIDE-Module-Long-Description=\
- This plugin adds Wavefront OBJ support to jMonkeyPlatform.
+ This plugin adds Wavefront OBJ support
OpenIDE-Module-Name=Wavefront OBJ Support
-OpenIDE-Module-Short-Description=Adds Wavefront OBJ support to jMonkeyPlatform
+OpenIDE-Module-Short-Description=Adds Wavefront OBJ support
Services/MIMEResolver/WaveFrontMaterialResolver.xml=WaveFrontMaterial Files
Services/MIMEResolver/WaveFrontOBJResolver.xml=WaveFrontOBJ Files
diff --git a/sdk/jme3-welcome-screen/nbproject/genfiles.properties b/sdk/jme3-welcome-screen/nbproject/genfiles.properties
index 2bf22d544..628d0b9f3 100644
--- a/sdk/jme3-welcome-screen/nbproject/genfiles.properties
+++ b/sdk/jme3-welcome-screen/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=d333c959
+build.xml.data.CRC32=19fe52b1
build.xml.script.CRC32=e68af6b0
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=d333c959
+nbproject/build-impl.xml.data.CRC32=19fe52b1
nbproject/build-impl.xml.script.CRC32=5d3b3399
nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.1
diff --git a/sdk/jme3-welcome-screen/nbproject/project.properties b/sdk/jme3-welcome-screen/nbproject/project.properties
index 614f31204..99049dde0 100644
--- a/sdk/jme3-welcome-screen/nbproject/project.properties
+++ b/sdk/jme3-welcome-screen/nbproject/project.properties
@@ -1,9 +1,10 @@
+#Thu, 25 Aug 2011 20:26:50 +0200
file.reference.nifty-default-controls-1.2.jar=release/modules/ext/nifty-default-controls-1.2.jar
file.reference.nifty-style-black-1.2.jar=release/modules/ext/nifty-style-black-1.2.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=Normen Hansen, jiyarza
nbm.needs.restart=true
-spec.version.base=0.6.0
+spec.version.base=3.0.0
diff --git a/sdk/jme3-welcome-screen/nbproject/project.xml b/sdk/jme3-welcome-screen/nbproject/project.xml
index 1445a4298..5fe6d3d47 100644
--- a/sdk/jme3-welcome-screen/nbproject/project.xml
+++ b/sdk/jme3-welcome-screen/nbproject/project.xml
@@ -12,7 +12,7 @@
1
- 0.10
+ 3.0.0
@@ -21,7 +21,7 @@
1
- 0.7
+ 3.0.0
@@ -30,7 +30,7 @@
1
- 0.8
+ 3.0.0
diff --git a/sdk/jme3-welcome-screen/src/com/jme3/gde/welcome/Bundle.properties b/sdk/jme3-welcome-screen/src/com/jme3/gde/welcome/Bundle.properties
index f7f12515d..05b5f2b0d 100644
--- a/sdk/jme3-welcome-screen/src/com/jme3/gde/welcome/Bundle.properties
+++ b/sdk/jme3-welcome-screen/src/com/jme3/gde/welcome/Bundle.properties
@@ -1,5 +1,5 @@
-OpenIDE-Module-Display-Category=jMonkeyPlatform
+OpenIDE-Module-Display-Category=jMonkeyEngine
OpenIDE-Module-Long-Description=\
- The jMonkeyPlatform Welcome Screen
+ The jMonkeyEngine GDE Welcome Screen
OpenIDE-Module-Name=Welcome Screen
-OpenIDE-Module-Short-Description=The jMonkeyPlatform Welcome Screen
+OpenIDE-Module-Short-Description=The jMonkeyEngine GDE Welcome Screen
diff --git a/sdk/jme3-welcome-screen/src/com/jme3/gde/welcome/WelcomeScreen.java b/sdk/jme3-welcome-screen/src/com/jme3/gde/welcome/WelcomeScreen.java
index a85467789..8db9289bf 100644
--- a/sdk/jme3-welcome-screen/src/com/jme3/gde/welcome/WelcomeScreen.java
+++ b/sdk/jme3-welcome-screen/src/com/jme3/gde/welcome/WelcomeScreen.java
@@ -54,9 +54,9 @@ public class WelcomeScreen implements ScreenController {
public void startScreen() {
final Node rootNode = new Node("Welcome Screen");
- request = new SceneRequest(this, NodeUtility.createNode(rootNode), new ProjectAssetManager(null));
+ request = new SceneRequest(this, NodeUtility.createNode(rootNode), new ProjectAssetManager());
request.setHelpCtx(new HelpCtx("com.jme3.gde.core.about"));
- request.setWindowTitle("Welcome to jMonkeyPlatform");
+ request.setWindowTitle("Welcome to jMonkeyEngine");
final WelcomeScreen welcomeScreen = this;
final DirectionalLight dirLight = new DirectionalLight();
dirLight.setDirection(new Vector3f(.1f, 1, .1f).normalizeLocal());