diff --git a/.gitignore b/.gitignore index 782b60710..819063d61 100644 --- a/.gitignore +++ b/.gitignore @@ -71,4 +71,8 @@ /jme3-android-native/openal-soft/ /jme3-android-native/OpenALSoft.zip /jme3-android-native/stb_image/ -/jme3-bullet-native-android/build/ \ No newline at end of file +/jme3-bullet-native-android/build/ +/sdk/nbproject/private/ +/sdk/jme3-gui/nbproject/private/ +/sdk/jme3-core/nbproject/private/ +/sdk/jme3-materialeditor/nbproject/private/ \ No newline at end of file diff --git a/OpenAL32.dll b/OpenAL32.dll new file mode 100644 index 000000000..1f69e9454 Binary files /dev/null and b/OpenAL32.dll differ diff --git a/lwjgl.dll b/lwjgl.dll new file mode 100644 index 000000000..f095831db Binary files /dev/null and b/lwjgl.dll differ diff --git a/sdk/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties b/sdk/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties index b0843778e..f81543207 100644 --- a/sdk/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties +++ b/sdk/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties @@ -1,6 +1,6 @@ #Updated by build script #Sat, 27 Aug 2011 22:46:29 +0200 -currentVersion=jMonkeyEngine SDK 3.0 +currentVersion=jMonkeyEngine SDK 3.1-pre-alpha-svn LBL_splash_window_title=Starting jMonkeyEngine SDK SPLASH_HEIGHT=350 SPLASH_WIDTH=500 diff --git a/sdk/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties b/sdk/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties index 93e3aacc2..f3029a159 100644 --- a/sdk/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties +++ b/sdk/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties @@ -1,4 +1,4 @@ #Updated by build script #Sat, 27 Aug 2011 22:46:29 +0200 -CTL_MainWindow_Title=jMonkeyEngine SDK 3.0 -CTL_MainWindow_Title_No_Project=jMonkeyEngine SDK 3.0 +CTL_MainWindow_Title=jMonkeyEngine SDK 3.1-pre-alpha-svn +CTL_MainWindow_Title_No_Project=jMonkeyEngine SDK 3.1-pre-alpha-svn diff --git a/sdk/jme3-android/nbproject/genfiles.properties b/sdk/jme3-android/nbproject/genfiles.properties index cff2e2756..ea74c0903 100644 --- a/sdk/jme3-android/nbproject/genfiles.properties +++ b/sdk/jme3-android/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=daa2838d +build.xml.data.CRC32=0a0da872 build.xml.script.CRC32=6461359b build.xml.stylesheet.CRC32=a56c6a5b@2.56.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=daa2838d +nbproject/build-impl.xml.data.CRC32=0a0da872 nbproject/build-impl.xml.script.CRC32=abd1e01a nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.56.1 diff --git a/sdk/jme3-android/nbproject/project.properties b/sdk/jme3-android/nbproject/project.properties index b55e7b41a..831e268e8 100644 --- a/sdk/jme3-android/nbproject/project.properties +++ b/sdk/jme3-android/nbproject/project.properties @@ -6,4 +6,4 @@ license.file=../license-jme.txt nbm.homepage=http://www.jmonkeyengine.com nbm.module.author=Normen Hansen nbm.needs.restart=true -spec.version.base=3.0.0 +spec.version.base=3.0.10 diff --git a/sdk/jme3-android/nbproject/project.xml b/sdk/jme3-android/nbproject/project.xml index 5ce56de1f..c42cce339 100644 --- a/sdk/jme3-android/nbproject/project.xml +++ b/sdk/jme3-android/nbproject/project.xml @@ -12,7 +12,7 @@ 1 - 3.0.0 + 3.0.10 diff --git a/sdk/jme3-angelfont/nbproject/genfiles.properties b/sdk/jme3-angelfont/nbproject/genfiles.properties index e96aeda08..4fe22b923 100644 --- a/sdk/jme3-angelfont/nbproject/genfiles.properties +++ b/sdk/jme3-angelfont/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=4bef7409 +build.xml.data.CRC32=c6ea5c9c build.xml.script.CRC32=03444ead build.xml.stylesheet.CRC32=a56c6a5b@2.56.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=4bef7409 +nbproject/build-impl.xml.data.CRC32=c6ea5c9c nbproject/build-impl.xml.script.CRC32=8812c775 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.56.1 diff --git a/sdk/jme3-angelfont/nbproject/project.properties b/sdk/jme3-angelfont/nbproject/project.properties index 3d19f4a47..90a580ad7 100644 --- a/sdk/jme3-angelfont/nbproject/project.properties +++ b/sdk/jme3-angelfont/nbproject/project.properties @@ -1,4 +1,4 @@ #Thu, 25 Aug 2011 20:26:50 +0200 javac.source=1.5 javac.compilerargs=-Xlint -Xlint\:-serial -spec.version.base=3.0.0 +spec.version.base=3.0.10 diff --git a/sdk/jme3-angelfont/nbproject/project.xml b/sdk/jme3-angelfont/nbproject/project.xml index d0fa00daa..a8afcbf9e 100644 --- a/sdk/jme3-angelfont/nbproject/project.xml +++ b/sdk/jme3-angelfont/nbproject/project.xml @@ -12,7 +12,7 @@ 1 - 3.0.0 + 3.0.10 @@ -21,7 +21,7 @@ 1 - 3.0.0 + 3.0.10 diff --git a/sdk/jme3-assetpack-support/nbproject/genfiles.properties b/sdk/jme3-assetpack-support/nbproject/genfiles.properties index a6681fec4..164bede2b 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=f4e70226 +nbproject/build-impl.xml.data.CRC32=5bc60898 nbproject/build-impl.xml.script.CRC32=4d376df0 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.56.1 diff --git a/sdk/jme3-assetpack-support/nbproject/project.properties b/sdk/jme3-assetpack-support/nbproject/project.properties index 50bdbe1fd..03cd56133 100644 --- a/sdk/jme3-assetpack-support/nbproject/project.properties +++ b/sdk/jme3-assetpack-support/nbproject/project.properties @@ -5,4 +5,4 @@ license.file=../license-jme.txt nbm.homepage=http\://www.jmonkeyengine.com nbm.module.author=Normen Hansen nbm.needs.restart=true -spec.version.base=3.0.0 +spec.version.base=3.0.10 diff --git a/sdk/jme3-assetpack-support/nbproject/project.xml b/sdk/jme3-assetpack-support/nbproject/project.xml index c87deb31e..9deed20b3 100644 --- a/sdk/jme3-assetpack-support/nbproject/project.xml +++ b/sdk/jme3-assetpack-support/nbproject/project.xml @@ -12,7 +12,7 @@ 1 - 3.0.0 + 3.0.10 @@ -21,7 +21,7 @@ 1 - 3.0.0 + 3.0.10 @@ -30,7 +30,7 @@ 1 - 3.0.0 + 3.0.10 @@ -39,7 +39,7 @@ 1 - 3.0.0 + 3.0.10 diff --git a/sdk/jme3-blender/nbproject/genfiles.properties b/sdk/jme3-blender/nbproject/genfiles.properties index 01ef60897..0828a18c3 100644 --- a/sdk/jme3-blender/nbproject/genfiles.properties +++ b/sdk/jme3-blender/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=33d82a49 +build.xml.data.CRC32=64dcecda build.xml.script.CRC32=0f77a514 build.xml.stylesheet.CRC32=a56c6a5b@2.56.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=33d82a49 +nbproject/build-impl.xml.data.CRC32=64dcecda nbproject/build-impl.xml.script.CRC32=5c5042d6 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.56.1 diff --git a/sdk/jme3-blender/nbproject/project.properties b/sdk/jme3-blender/nbproject/project.properties index a57a62e36..07a209615 100644 --- a/sdk/jme3-blender/nbproject/project.properties +++ b/sdk/jme3-blender/nbproject/project.properties @@ -4,4 +4,4 @@ javac.compilerargs=-Xlint -Xlint\:-serial nbm.homepage=http\://www.jmonkeyengine.com nbm.module.author=Kaelthas nbm.needs.restart=true -spec.version.base=3.0.0 +spec.version.base=3.0.10 diff --git a/sdk/jme3-blender/nbproject/project.xml b/sdk/jme3-blender/nbproject/project.xml index 09b0c2ce9..4fa10b2b0 100644 --- a/sdk/jme3-blender/nbproject/project.xml +++ b/sdk/jme3-blender/nbproject/project.xml @@ -12,7 +12,7 @@ 1 - 3.0.0 + 3.0.10 @@ -21,7 +21,7 @@ 1 - 3.0.0 + 3.0.10 diff --git a/sdk/jme3-cinematics/nbproject/genfiles.properties b/sdk/jme3-cinematics/nbproject/genfiles.properties index 0ed1becd6..7a8890355 100644 --- a/sdk/jme3-cinematics/nbproject/genfiles.properties +++ b/sdk/jme3-cinematics/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=40119967 +build.xml.data.CRC32=c706130d build.xml.script.CRC32=d8082083 build.xml.stylesheet.CRC32=a56c6a5b@2.56.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=40119967 +nbproject/build-impl.xml.data.CRC32=c706130d nbproject/build-impl.xml.script.CRC32=a2681ce5 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.56.1 diff --git a/sdk/jme3-cinematics/nbproject/project.properties b/sdk/jme3-cinematics/nbproject/project.properties index 4aadc709d..73e7a18ba 100644 --- a/sdk/jme3-cinematics/nbproject/project.properties +++ b/sdk/jme3-cinematics/nbproject/project.properties @@ -5,4 +5,4 @@ license.file=../license-jme.txt nbm.homepage=http\://www.jmonkeyengine.com nbm.module.author=R\u00e9my Bouquet nbm.needs.restart=true -spec.version.base=3.0.0 +spec.version.base=3.0.10 diff --git a/sdk/jme3-cinematics/nbproject/project.xml b/sdk/jme3-cinematics/nbproject/project.xml index c73221679..85ae58fae 100644 --- a/sdk/jme3-cinematics/nbproject/project.xml +++ b/sdk/jme3-cinematics/nbproject/project.xml @@ -12,7 +12,7 @@ 1 - 3.0.0 + 3.0.10 @@ -21,7 +21,7 @@ 1 - 3.0.0 + 3.0.10 @@ -30,7 +30,7 @@ 1 - 3.0.0 + 3.0.10 diff --git a/sdk/jme3-code-check/nbproject/genfiles.properties b/sdk/jme3-code-check/nbproject/genfiles.properties index 3d5f9158f..6281cd77d 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=e5661c7c +build.xml.data.CRC32=fbaa73ae build.xml.script.CRC32=a481f885 build.xml.stylesheet.CRC32=a56c6a5b@2.56.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=e5661c7c +nbproject/build-impl.xml.data.CRC32=fbaa73ae nbproject/build-impl.xml.script.CRC32=0691bb76 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.56.1 diff --git a/sdk/jme3-code-check/nbproject/project.properties b/sdk/jme3-code-check/nbproject/project.properties index c05bd3a9b..b8eef2db4 100644 --- a/sdk/jme3-code-check/nbproject/project.properties +++ b/sdk/jme3-code-check/nbproject/project.properties @@ -1,4 +1,4 @@ #Thu, 25 Aug 2011 20:26:50 +0200 javac.source=1.6 javac.compilerargs=-Xlint -Xlint\:-serial -spec.version.base=3.0.0 +spec.version.base=3.0.10 diff --git a/sdk/jme3-code-check/nbproject/project.xml b/sdk/jme3-code-check/nbproject/project.xml index fa2625622..607cb60c0 100644 --- a/sdk/jme3-code-check/nbproject/project.xml +++ b/sdk/jme3-code-check/nbproject/project.xml @@ -12,7 +12,7 @@ 1 - 3.0.0 + 3.0.10 diff --git a/sdk/jme3-codepalette/nbproject/project.properties b/sdk/jme3-codepalette/nbproject/project.properties index 50bdbe1fd..03cd56133 100644 --- a/sdk/jme3-codepalette/nbproject/project.properties +++ b/sdk/jme3-codepalette/nbproject/project.properties @@ -5,4 +5,4 @@ license.file=../license-jme.txt nbm.homepage=http\://www.jmonkeyengine.com nbm.module.author=Normen Hansen nbm.needs.restart=true -spec.version.base=3.0.0 +spec.version.base=3.0.10 diff --git a/sdk/jme3-core-baselibs/nbproject/genfiles.properties b/sdk/jme3-core-baselibs/nbproject/genfiles.properties index b693eee13..be87a8d63 100644 --- a/sdk/jme3-core-baselibs/nbproject/genfiles.properties +++ b/sdk/jme3-core-baselibs/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=b51e7ec4 +build.xml.data.CRC32=dc0131d1 build.xml.script.CRC32=cdae6a36 -build.xml.stylesheet.CRC32=a56c6a5b@2.50.1 +build.xml.stylesheet.CRC32=a56c6a5b@2.56.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=b51e7ec4 +nbproject/build-impl.xml.data.CRC32=dc0131d1 nbproject/build-impl.xml.script.CRC32=246f9b81 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.50.1 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.56.1 diff --git a/sdk/jme3-core-baselibs/nbproject/project.properties b/sdk/jme3-core-baselibs/nbproject/project.properties index 7f1988fd0..67136fbda 100644 --- a/sdk/jme3-core-baselibs/nbproject/project.properties +++ b/sdk/jme3-core-baselibs/nbproject/project.properties @@ -4,4 +4,4 @@ license.file=../license-jme.txt nbm.homepage=http\://www.jmonkeyengine.com nbm.module.author=jMonkeyEngine nbm.needs.restart=true -spec.version.base=3.0.0 +spec.version.base=3.0.10 diff --git a/sdk/jme3-core-baselibs/nbproject/project.xml b/sdk/jme3-core-baselibs/nbproject/project.xml index dc9559d4b..16d374b77 100644 --- a/sdk/jme3-core-baselibs/nbproject/project.xml +++ b/sdk/jme3-core-baselibs/nbproject/project.xml @@ -1,18 +1,18 @@ - - + + org.netbeans.modules.apisupport.project - + com.jme3.gde.core.baselibs - + com.jme3.gde.core.libraries - - + + 1 - 3.0.0 + 3.0.10 @@ -187,4 +187,4 @@ - \ No newline at end of file + diff --git a/sdk/jme3-core-updatecenters/nbproject/project.properties b/sdk/jme3-core-updatecenters/nbproject/project.properties index 25a0353d6..869ff7158 100644 --- a/sdk/jme3-core-updatecenters/nbproject/project.properties +++ b/sdk/jme3-core-updatecenters/nbproject/project.properties @@ -1,4 +1,4 @@ #Thu, 25 Aug 2011 20:26:49 +0200 javac.source=1.5 javac.compilerargs=-Xlint -Xlint\:-serial -spec.version.base=3.0.0 +spec.version.base=3.0.10 diff --git a/sdk/jme3-core/nbproject/project.properties b/sdk/jme3-core/nbproject/project.properties index 3bf3f9bf2..662af9ddf 100644 --- a/sdk/jme3-core/nbproject/project.properties +++ b/sdk/jme3-core/nbproject/project.properties @@ -8,4 +8,4 @@ nbm.homepage=http\://www.jmonkeyengine.com nbm.module.author=Normen Hansen nbm.needs.restart=true project.license=jme -spec.version.base=3.0.0 +spec.version.base=3.0.10 diff --git a/sdk/jme3-core/nbproject/project.xml b/sdk/jme3-core/nbproject/project.xml index ec7e5dc64..774f33fc1 100644 --- a/sdk/jme3-core/nbproject/project.xml +++ b/sdk/jme3-core/nbproject/project.xml @@ -12,7 +12,7 @@ 1 - 3.0.0 + 3.0.10 @@ -21,13 +21,13 @@ 1 - 3.0.0 + 3.0.10 com.jme3.gde.core.updatecenters - 3.0.0 + 3.0.10 @@ -35,7 +35,7 @@ - 3.0.0 + 3.0.10 diff --git a/sdk/jme3-desktop-executables/nbproject/project.properties b/sdk/jme3-desktop-executables/nbproject/project.properties index 50bdbe1fd..03cd56133 100644 --- a/sdk/jme3-desktop-executables/nbproject/project.properties +++ b/sdk/jme3-desktop-executables/nbproject/project.properties @@ -5,4 +5,4 @@ license.file=../license-jme.txt nbm.homepage=http\://www.jmonkeyengine.com nbm.module.author=Normen Hansen nbm.needs.restart=true -spec.version.base=3.0.0 +spec.version.base=3.0.10 diff --git a/sdk/jme3-desktop-executables/nbproject/project.xml b/sdk/jme3-desktop-executables/nbproject/project.xml index c636c6295..d672b90ac 100644 --- a/sdk/jme3-desktop-executables/nbproject/project.xml +++ b/sdk/jme3-desktop-executables/nbproject/project.xml @@ -12,7 +12,7 @@ 1 - 3.0.0 + 3.0.10 diff --git a/sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/macapp-data.zip b/sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/macapp-data.zip index 547aef979..502272e50 100644 Binary files a/sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/macapp-data.zip and b/sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/macapp-data.zip differ diff --git a/sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/winapp-data.zip b/sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/winapp-data.zip index a300dba3a..b409baa20 100644 Binary files a/sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/winapp-data.zip and b/sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/winapp-data.zip differ diff --git a/sdk/jme3-documentation/nbproject/project.properties b/sdk/jme3-documentation/nbproject/project.properties index 0db107241..a8eff505e 100644 --- a/sdk/jme3-documentation/nbproject/project.properties +++ b/sdk/jme3-documentation/nbproject/project.properties @@ -3,4 +3,4 @@ javac.compilerargs=-Xlint -Xlint:-serial license.file=../license-jme.txt nbm.homepage=http://www.jmonkeyengine.com nbm.module.author=Normen Hansen, Ruth Kusterer, many others -spec.version.base=3.0.0 +spec.version.base=3.0.10 diff --git a/sdk/jme3-glsl-support/nbproject/project.properties b/sdk/jme3-glsl-support/nbproject/project.properties index 9fe5d8b43..f46befcc0 100644 --- a/sdk/jme3-glsl-support/nbproject/project.properties +++ b/sdk/jme3-glsl-support/nbproject/project.properties @@ -3,4 +3,4 @@ javac.source=1.5 license.file=license.txt nbm.homepage=http://kenai.com/projects/netbeans-opengl-pack nbm.module.author=Mathias Henze, Michael Bien, Dany Rioux -spec.version.base=3.0.0 +spec.version.base=3.0.10 diff --git a/sdk/jme3-gui/manifest.mf b/sdk/jme3-gui/manifest.mf index 9070e170d..b5e5ac7b3 100644 --- a/sdk/jme3-gui/manifest.mf +++ b/sdk/jme3-gui/manifest.mf @@ -1,5 +1,6 @@ Manifest-Version: 1.0 OpenIDE-Module: com.jme3.gde.gui/1 OpenIDE-Module-Implementation-Version: 0 +OpenIDE-Module-Layer: com/jme3/gde/gui/layer.xml OpenIDE-Module-Localizing-Bundle: com/jme3/gde/gui/Bundle.properties diff --git a/sdk/jme3-gui/nbproject/genfiles.properties b/sdk/jme3-gui/nbproject/genfiles.properties index 22871f064..3ad8512e5 100644 --- a/sdk/jme3-gui/nbproject/genfiles.properties +++ b/sdk/jme3-gui/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=7857ced2 +build.xml.data.CRC32=d998e9a1 build.xml.script.CRC32=a0136781 build.xml.stylesheet.CRC32=a56c6a5b@2.56.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=7857ced2 +nbproject/build-impl.xml.data.CRC32=d998e9a1 nbproject/build-impl.xml.script.CRC32=55a34aaf nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.56.1 diff --git a/sdk/jme3-gui/nbproject/project.properties b/sdk/jme3-gui/nbproject/project.properties index ef4ce81f9..f82a1a43d 100644 --- a/sdk/jme3-gui/nbproject/project.properties +++ b/sdk/jme3-gui/nbproject/project.properties @@ -1,9 +1,9 @@ file.reference.swingtonifty.jar=release/modules/ext/swingtonifty.jar #Thu, 25 Aug 2011 20:26:49 +0200 -javac.source=1.5 -javac.compilerargs=-Xlint -Xlint\:-serial +javac.source=1.6 +javac.compilerargs=-Xlint -Xlint:-serial license.file=../license-jme.txt -nbm.homepage=http\://www.jmonkeyengine.com -nbm.module.author=Normen Hansen +nbm.homepage=http://www.jmonkeyengine.com +nbm.module.author=Normen Hansen,Cristiano Aguzzi nbm.needs.restart=true -spec.version.base=3.0.0 +spec.version.base=3.1.5 diff --git a/sdk/jme3-gui/nbproject/project.xml b/sdk/jme3-gui/nbproject/project.xml index 8dfafbc80..aaa58e736 100644 --- a/sdk/jme3-gui/nbproject/project.xml +++ b/sdk/jme3-gui/nbproject/project.xml @@ -33,6 +33,15 @@ 1.36.1 + + org.netbeans.api.progress + + + + 1 + 1.32.1 + + org.netbeans.core.multiview @@ -42,6 +51,15 @@ 1.32.1 + + org.netbeans.modules.editor.mimelookup + + + + 1 + 1.29.1 + + org.netbeans.modules.java.project @@ -69,6 +87,15 @@ + + org.netbeans.spi.navigator + + + + 1 + 1.27.1 + + org.netbeans.spi.palette @@ -167,8 +194,8 @@ release/modules/ext/swingtonifty.jar - ext/Nifty-Editor0.5.7.jar - release/modules/ext/Nifty-Editor0.5.7.jar + ext/Nifty-Editor0.5.9.jar + release/modules/ext/Nifty-Editor0.5.9.jar diff --git a/sdk/jme3-gui/release/modules/ext/Nifty-Editor0.5.9.jar b/sdk/jme3-gui/release/modules/ext/Nifty-Editor0.5.9.jar new file mode 100644 index 000000000..dde003d51 Binary files /dev/null and b/sdk/jme3-gui/release/modules/ext/Nifty-Editor0.5.9.jar differ 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 91fe01a5b..c7b878ef7 100644 --- a/sdk/jme3-gui/src/com/jme3/gde/gui/Bundle.properties +++ b/sdk/jme3-gui/src/com/jme3/gde/gui/Bundle.properties @@ -1,7 +1,7 @@ LBL_NiftyGui_loader_name=NiftyGui Files OpenIDE-Module-Display-Category=jMonkeyEngine OpenIDE-Module-Long-Description=\ - This plugin adds NiftyGUI XML file support + This plugin adds NiftyGUI XML file support , with and easy visual desing interface . OpenIDE-Module-Name=NiftyGUI Support OpenIDE-Module-Short-Description=Provides NiftyGUI Support Services/MIMEResolver/NiftyGuiResolver.xml=NiftyGui Files diff --git a/sdk/jme3-gui/src/com/jme3/gde/gui/EmptyNiftyGui.xml b/sdk/jme3-gui/src/com/jme3/gde/gui/EmptyNiftyGui.xml index c608723c0..1a2083b11 100644 --- a/sdk/jme3-gui/src/com/jme3/gde/gui/EmptyNiftyGui.xml +++ b/sdk/jme3-gui/src/com/jme3/gde/gui/EmptyNiftyGui.xml @@ -1,10 +1,10 @@ - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/sdk/jme3-gui/src/com/jme3/gde/gui/Navigator.form b/sdk/jme3-gui/src/com/jme3/gde/gui/Navigator.form new file mode 100644 index 000000000..b3657640a --- /dev/null +++ b/sdk/jme3-gui/src/com/jme3/gde/gui/Navigator.form @@ -0,0 +1,28 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/sdk/jme3-gui/src/com/jme3/gde/gui/Navigator.java b/sdk/jme3-gui/src/com/jme3/gde/gui/Navigator.java new file mode 100644 index 000000000..a136c4e14 --- /dev/null +++ b/sdk/jme3-gui/src/com/jme3/gde/gui/Navigator.java @@ -0,0 +1,191 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.jme3.gde.gui; + +import com.jme3.gde.gui.nodes.GElementNode; +import com.jme3.gde.gui.nodes.ScreenChildFactory; +import jada.ngeditor.controller.GUIEditor; +import jada.ngeditor.model.elements.GElement; +import java.awt.BorderLayout; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.beans.PropertyVetoException; +import java.util.ArrayList; +import java.util.Observable; +import java.util.Observer; +import javax.swing.JComponent; +import org.netbeans.spi.navigator.NavigatorPanel; +import org.openide.explorer.ExplorerManager; +import org.openide.explorer.ExplorerUtils; +import org.openide.explorer.view.BeanTreeView; +import org.openide.nodes.AbstractNode; +import org.openide.nodes.Children; +import org.openide.nodes.Node; +import org.openide.util.Exceptions; +import org.openide.util.Lookup; +import org.openide.util.LookupEvent; +import org.openide.util.LookupListener; +import org.openide.util.Utilities; +import org.openide.util.lookup.ProxyLookup; +import org.openide.windows.TopComponent; + +/** + * + * @author cris + */ +@NavigatorPanel.Registration(mimeType = "text/x-niftygui+xml", displayName="Gui View") +public class Navigator extends javax.swing.JPanel implements NavigatorPanel,ExplorerManager.Provider , Observer, PropertyChangeListener, LookupListener{ + private Lookup lookup; + private ExplorerManager mgr = new ExplorerManager(); + private final BeanTreeView beanTreeView; + private GUIEditor editor; + private Lookup context; + private boolean lock; + /** + * Creates new form Navigator + */ + public Navigator() { + initComponents(); + setLayout(new BorderLayout()); + beanTreeView = new BeanTreeView(); + add(beanTreeView, BorderLayout.CENTER); + + } + + /** + * This method is called from within the constructor to initialize the form. + * WARNING: Do NOT modify this code. The content of this method is always + * regenerated by the Form Editor. + */ + @SuppressWarnings("unchecked") + // //GEN-BEGIN:initComponents + private void initComponents() { + + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); + this.setLayout(layout); + layout.setHorizontalGroup( + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 244, Short.MAX_VALUE) + ); + layout.setVerticalGroup( + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 274, Short.MAX_VALUE) + ); + }// //GEN-END:initComponents + // Variables declaration - do not modify//GEN-BEGIN:variables + // End of variables declaration//GEN-END:variables + + @Override + public String getDisplayName() { + return "GuiView"; + } + + @Override + public String getDisplayHint() { + return "Easy view for your gui"; + } + + @Override + public JComponent getComponent() { + return this; + } + + @Override + public void panelActivated(Lookup context) { + try { + this.context = context; + context.lookupResult(NiftyGuiDataObject.class).addLookupListener(this); + intNavigator(context); + } catch (PropertyVetoException ex) { + Exceptions.printStackTrace(ex); + } + } + + @Override + public void panelDeactivated() { + ExplorerUtils.activateActions(mgr, false); + } + + @Override + public Lookup getLookup() { + return lookup; + } + + @Override + public ExplorerManager getExplorerManager() { + return mgr; + } + + @Override + public void update(Observable o, Object arg) { + + jada.ngeditor.listeners.actions.Action act = ( jada.ngeditor.listeners.actions.Action) arg; + if(act.getType() == jada.ngeditor.listeners.actions.Action.SEL){ + ArrayList path = new ArrayList(); + GElement parent = act.getGUIElement(); + while(parent!=null){ + path.add(parent.getID()); + parent = parent.getParent(); + } + Node result = mgr.getRootContext(); + for(int i=path.size()-1;i>=0;i--){ + result = result.getChildren().findChild(path.get(i)); + } + try { + mgr.setSelectedNodes(new Node[]{result}); + } catch (PropertyVetoException ex) { + Exceptions.printStackTrace(ex); + } + }else if(act.getType() == jada.ngeditor.listeners.actions.Action.NEW){ + try { + this.intNavigator(context); + } catch (PropertyVetoException ex) { + Exceptions.printStackTrace(ex); + } + } + beanTreeView.updateUI(); + } + + @Override + public void propertyChange(PropertyChangeEvent evt) { + if (evt.getPropertyName().equals(ExplorerManager.PROP_SELECTED_NODES)) { + Node[] newValue = (Node[]) evt.getNewValue(); + if (newValue.length > 0) { + AbstractNode firstSelected = (AbstractNode) newValue[0]; + if (firstSelected instanceof GElementNode) { + GElement element = ((GElementNode) firstSelected).getGelement(); + + editor.selectElement(element); + + } + } + } + } + + @Override + public void resultChanged(LookupEvent ev) { + try { + intNavigator(context); + } catch (PropertyVetoException ex) { + Exceptions.printStackTrace(ex); + } + } + + private void intNavigator(Lookup context) throws PropertyVetoException { + + NiftyGuiDataObject man = context.lookup(NiftyGuiDataObject.class); + ExplorerUtils.activateActions(mgr, true); + editor = man.getLookup().lookup(GUIEditor.class); + AbstractNode guiRoot = new AbstractNode(Children.create(new ScreenChildFactory(editor.getGui()), true)); + guiRoot.setName("Gui"); + this.mgr.setRootContext(guiRoot); + this.beanTreeView.updateUI(); + mgr.addPropertyChangeListener(this); + this.mgr.setSelectedNodes(new Node[]{guiRoot}); + Lookup lookup1 = ExplorerUtils.createLookup(mgr, getActionMap()); + lookup = new ProxyLookup(lookup1); + editor.addObserver(this); + } +} diff --git a/sdk/jme3-gui/src/com/jme3/gde/gui/NiftyGuiDataObject.java b/sdk/jme3-gui/src/com/jme3/gde/gui/NiftyGuiDataObject.java index 1b733c83b..55a8ad448 100644 --- a/sdk/jme3-gui/src/com/jme3/gde/gui/NiftyGuiDataObject.java +++ b/sdk/jme3-gui/src/com/jme3/gde/gui/NiftyGuiDataObject.java @@ -5,6 +5,7 @@ package com.jme3.gde.gui; import com.jme3.gde.core.assets.ProjectAssetManager; +import jada.ngeditor.controller.GUIEditor; import java.io.IOException; import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectManager; @@ -95,6 +96,7 @@ public class NiftyGuiDataObject extends MultiDataObject { super(pf, loader); registerEditor("text/x-niftygui+xml", true); findAssetManager(); + this.getCookieSet().assign(GUIEditor.class,new GUIEditor()); } protected final void findAssetManager() { @@ -140,6 +142,7 @@ public class NiftyGuiDataObject extends MultiDataObject { position = 1000) @Messages("LBL_NiftyGui_EDITOR=XML") public static MultiViewEditorElement createEditor(Lookup lkp) { - return new MultiViewEditorElement(lkp); + final MultiViewEditorElement multiViewEditorElement = new MultiViewEditorElement(lkp); + return multiViewEditorElement; } } diff --git a/sdk/jme3-gui/src/com/jme3/gde/gui/NiftyGuiVisualElement.java b/sdk/jme3-gui/src/com/jme3/gde/gui/NiftyGuiVisualElement.java index e779b8ee7..a1ff4ef20 100644 --- a/sdk/jme3-gui/src/com/jme3/gde/gui/NiftyGuiVisualElement.java +++ b/sdk/jme3-gui/src/com/jme3/gde/gui/NiftyGuiVisualElement.java @@ -6,36 +6,60 @@ package com.jme3.gde.gui; import com.jme3.gde.core.assets.ProjectAssetManager; import com.jme3.gde.core.scene.SceneApplication; +import com.jme3.gde.gui.nodes.GUINode; +import com.jme3.gde.gui.palette.NiftyGUIPaletteFactory; import de.lessvoid.nifty.Nifty; import jada.ngeditor.controller.GUIEditor; import jada.ngeditor.guiviews.DND.PaletteDropTarget; import jada.ngeditor.guiviews.DND.TrasferHandling; import jada.ngeditor.guiviews.J2DNiftyView; +import jada.ngeditor.model.elements.GElement; import jada.ngeditor.model.elements.GLayer; import jada.ngeditor.model.exception.NoProductException; import java.awt.Dimension; +import java.awt.dnd.DropTarget; +import java.awt.dnd.DropTargetDragEvent; +import java.awt.dnd.DropTargetDropEvent; +import java.awt.dnd.DropTargetEvent; +import java.awt.dnd.DropTargetListener; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; +import java.beans.PropertyVetoException; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; +import java.util.ArrayList; import java.util.Collection; +import java.util.Observable; +import java.util.Observer; import java.util.concurrent.Callable; import javax.swing.Action; +import javax.swing.ActionMap; import javax.swing.DefaultComboBoxModel; import javax.swing.JComboBox; import javax.swing.JComponent; import javax.swing.JPanel; import javax.swing.JToolBar; +import javax.swing.text.AbstractDocument; import javax.xml.bind.JAXBException; import javax.xml.parsers.ParserConfigurationException; +import org.netbeans.api.progress.ProgressHandle; +import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.core.spi.multiview.CloseOperationState; import org.netbeans.core.spi.multiview.MultiViewElement; import org.netbeans.core.spi.multiview.MultiViewElementCallback; +import org.openide.DialogDisplayer; +import org.openide.NotifyDescriptor; import org.openide.awt.UndoRedo; +import org.openide.explorer.ExplorerManager; +import org.openide.explorer.ExplorerUtils; +import org.openide.nodes.Node; import org.openide.util.Exceptions; import org.openide.util.Lookup; import org.openide.util.NbBundle.Messages; +import org.openide.util.lookup.AbstractLookup; +import org.openide.util.lookup.InstanceContent; +import org.openide.util.lookup.ProxyLookup; import org.openide.windows.TopComponent; import org.xml.sax.SAXException; @@ -47,7 +71,7 @@ import org.xml.sax.SAXException; preferredID = "NiftyGuiVisual", position = 2000) @Messages("LBL_NiftyGui_VISUAL=Visual") -public final class NiftyGuiVisualElement extends JPanel implements MultiViewElement { +public final class NiftyGuiVisualElement extends JPanel implements MultiViewElement , ExplorerManager.Provider,Observer { private NiftyGuiDataObject obj; private JToolBar toolbar = new JToolBar(); @@ -56,6 +80,8 @@ public final class NiftyGuiVisualElement extends JPanel implements MultiViewElem private final Nifty nifty; private final J2DNiftyView view; private final JComboBox layers = new JComboBox(); + private final ExplorerManager nodesManager; + public NiftyGuiVisualElement(Lookup lkp) { obj = lkp.lookup(NiftyGuiDataObject.class); @@ -67,7 +93,9 @@ public final class NiftyGuiVisualElement extends JPanel implements MultiViewElem this.scrollArea.setViewportView(view); TrasferHandling tranf = new TrasferHandling(); PaletteDropTarget tmp = new PaletteDropTarget(); - editor = new GUIEditor(); + editor = obj.getLookup().lookup(GUIEditor.class); + editor.addObserver(this); + nodesManager = new ExplorerManager(); nifty = view.getNifty(); view.setTransferHandler(tranf); view.setDropTarget(tmp); @@ -156,7 +184,7 @@ public final class NiftyGuiVisualElement extends JPanel implements MultiViewElem @Override public Lookup getLookup() { - return obj.getLookup(); + return ExplorerUtils.createLookup(nodesManager, new ActionMap()); } /** * Raw implementation , just to prototype the editor @@ -164,14 +192,20 @@ public final class NiftyGuiVisualElement extends JPanel implements MultiViewElem @Override public void componentOpened() { try { + ProgressHandle handle = ProgressHandleFactory.createHandle("Loading the gui file"); String path = this.obj.getPrimaryFile().getPath(); - ProjectAssetManager mgr = this.getLookup().lookup(ProjectAssetManager.class); + ProjectAssetManager mgr = obj.getLookup().lookup(ProjectAssetManager.class); String assetPath = mgr.getAssetFolder().getPath(); + handle.progress(50); this.editor.createNewGui(nifty,new File(path),new File(assetPath)); + nodesManager.setRootContext(new GUINode(this.editor.getGui())); Collection layers1 = this.editor.getGui().getLayers(); DefaultComboBoxModel model = new DefaultComboBoxModel(layers1.toArray(new GLayer[0])); layers.setModel(model); layers.setSelectedItem(this.editor.getCurrentLayer()); + + handle.finish(); + } catch (ParserConfigurationException ex) { Exceptions.printStackTrace(ex); } catch (JAXBException ex) { @@ -198,14 +232,18 @@ public final class NiftyGuiVisualElement extends JPanel implements MultiViewElem @Override public void componentShowing() { try { + ProgressHandle handle = ProgressHandleFactory.createHandle("Loading the gui file"); String path = this.obj.getPrimaryFile().getPath(); - ProjectAssetManager mgr = this.getLookup().lookup(ProjectAssetManager.class); + ProjectAssetManager mgr = this.obj.getLookup().lookup(ProjectAssetManager.class); String assetPath = mgr.getAssetFolder().getPath(); this.editor.createNewGui(nifty,new File(path),new File(assetPath)); + nodesManager.setRootContext(new GUINode(this.editor.getGui())); Collection layers1 = this.editor.getGui().getLayers(); DefaultComboBoxModel model = new DefaultComboBoxModel(layers1.toArray(new GLayer[0])); layers.setModel(model); layers.setSelectedItem(this.editor.getCurrentLayer()); + + handle.finish(); } catch (ParserConfigurationException ex) { Exceptions.printStackTrace(ex); } catch (JAXBException ex) { @@ -260,4 +298,35 @@ public final class NiftyGuiVisualElement extends JPanel implements MultiViewElem public CloseOperationState canCloseElement() { return CloseOperationState.STATE_OK; } + + @Override + public ExplorerManager getExplorerManager() { + return nodesManager; + } + + @Override + public void update(Observable o, Object arg) { + jada.ngeditor.listeners.actions.Action act = ( jada.ngeditor.listeners.actions.Action) arg; + if(act.getType() == jada.ngeditor.listeners.actions.Action.SEL){ + ArrayList path = new ArrayList(); + GElement parent = act.getGUIElement(); + while(parent!=null){ + path.add(parent.getID()); + parent = parent.getParent(); + } + + Node result = nodesManager.getRootContext(); + + for(int i=path.size()-1;i>=0 && result!=null;i--){ + result = result.getChildren().findChild(path.get(i)); + } + try { + if(result!=null){ + nodesManager.setSelectedNodes(new Node[]{result}); + } + } catch (PropertyVetoException ex) { + Exceptions.printStackTrace(ex); + } + } + } } diff --git a/sdk/jme3-gui/src/com/jme3/gde/gui/layer.xml b/sdk/jme3-gui/src/com/jme3/gde/gui/layer.xml new file mode 100644 index 000000000..6c29c21a6 --- /dev/null +++ b/sdk/jme3-gui/src/com/jme3/gde/gui/layer.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/sdk/jme3-gui/src/com/jme3/gde/gui/nodes/GElementChildFactory.java b/sdk/jme3-gui/src/com/jme3/gde/gui/nodes/GElementChildFactory.java new file mode 100644 index 000000000..608d7e15d --- /dev/null +++ b/sdk/jme3-gui/src/com/jme3/gde/gui/nodes/GElementChildFactory.java @@ -0,0 +1,34 @@ +package com.jme3.gde.gui.nodes; + + +import jada.ngeditor.model.elements.GElement; +import java.util.List; +import java.util.Observable; +import java.util.Observer; +import org.openide.nodes.ChildFactory; +import org.openide.nodes.Node; + +public class GElementChildFactory extends ChildFactory implements Observer{ + private final GElement parent; + + public GElementChildFactory(GElement parent) { + this.parent = parent; + this.parent.addObserver(this); + + } + @Override + protected boolean createKeys(List list) { + list.addAll(parent.getElements()); + return true; + } + + @Override + protected Node createNodeForKey(GElement element) { + return new GElementNode(element); + } + + @Override + public void update(Observable o, Object arg) { + this.refresh(true); + } +} \ No newline at end of file diff --git a/sdk/jme3-gui/src/com/jme3/gde/gui/nodes/GElementNode.java b/sdk/jme3-gui/src/com/jme3/gde/gui/nodes/GElementNode.java new file mode 100644 index 000000000..9af3ef4af --- /dev/null +++ b/sdk/jme3-gui/src/com/jme3/gde/gui/nodes/GElementNode.java @@ -0,0 +1,97 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.jme3.gde.gui.nodes; + +import jada.ngeditor.model.elements.GElement; +import java.beans.PropertyEditor; +import java.lang.reflect.InvocationTargetException; +import java.util.Map.Entry; +import org.openide.nodes.AbstractNode; +import org.openide.nodes.Children; +import org.openide.nodes.Node; +import org.openide.nodes.Sheet; + +/** + * + * @author cris + */ +public class GElementNode extends AbstractNode{ + private final GElement element; + + public GElementNode(GElement element) { + super(Children.create(new GElementChildFactory(element), false)); + + this.element = element; + this.setName(element.getID()); + + } + + public GElement getGelement(){ + return element; + } + + public void updateChildren(){ + + } + @Override + protected Sheet createSheet() { + Sheet s = super.createSheet(); + Sheet.Set set = s.get(Sheet.PROPERTIES); + if (set == null) { + set = Sheet.createPropertiesSet(); + s.put(set); + } + set.setName("Element Properties"); + set.setShortDescription("You can set element properties"); + for(Entry pair : this.element.listAttributes().entrySet()){ + set.put(new ElementAttributeProperty(element,pair.getKey())); + } + s.put(set); + return s; + } + + public class ElementAttributeProperty extends Node.Property { + + private String attributeName; + private GElement element; + + public ElementAttributeProperty(GElement element, String attributeName) { + super(String.class); + this.element = element; + this.attributeName = attributeName; + this.setName(attributeName); + this.setDisplayName(attributeName); + + } + + @Override + public boolean canRead() { + return true; + } + + @Override + public String getValue() throws IllegalAccessException, InvocationTargetException{ + return element.getAttribute(attributeName); + } + + @Override + public boolean canWrite() { + return true; + } + + @Override + public PropertyEditor getPropertyEditor() { + return super.getPropertyEditor(); //To change body of generated methods, choose Tools | Templates. + } + + + + @Override + public void setValue(Object val) throws IllegalAccessException, IllegalArgumentException { + element.addAttribute(attributeName, val.toString()); + element.refresh(); + } + }; +} diff --git a/sdk/jme3-gui/src/com/jme3/gde/gui/nodes/GUINode.java b/sdk/jme3-gui/src/com/jme3/gde/gui/nodes/GUINode.java new file mode 100644 index 000000000..15da0e1d5 --- /dev/null +++ b/sdk/jme3-gui/src/com/jme3/gde/gui/nodes/GUINode.java @@ -0,0 +1,36 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.jme3.gde.gui.nodes; + +import jada.ngeditor.model.GUI; +import org.openide.nodes.AbstractNode; +import org.openide.nodes.Children; + +/** + * + * @author cris + */ +public class GUINode extends AbstractNode{ + private final GUI gui; + public GUINode(GUI gui) { + super(Children.create(new ScreenChildFactory(gui),false)); + this.gui = gui; + + } + + /** + * @return the gui + */ + public GUI getGui() { + return gui; + } + + @Override + public String getName() { + return super.getName()+" "+this.gui; //To change body of generated methods, choose Tools | Templates. + } + + +} diff --git a/sdk/jme3-gui/src/com/jme3/gde/gui/nodes/ScreenChildFactory.java b/sdk/jme3-gui/src/com/jme3/gde/gui/nodes/ScreenChildFactory.java new file mode 100644 index 000000000..81ce30221 --- /dev/null +++ b/sdk/jme3-gui/src/com/jme3/gde/gui/nodes/ScreenChildFactory.java @@ -0,0 +1,31 @@ +package com.jme3.gde.gui.nodes; + + +import com.google.common.base.Predicate; +import jada.ngeditor.model.GUI; +import jada.ngeditor.model.elements.GControl; +import jada.ngeditor.model.elements.GElement; +import java.util.List; +import org.openide.nodes.AbstractNode; +import org.openide.nodes.ChildFactory; +import org.openide.nodes.Children; +import org.openide.nodes.Node; + +public class ScreenChildFactory extends ChildFactory { + private final GUI gui; + + public ScreenChildFactory(GUI gui){ + this.gui = gui; + + } + @Override + protected boolean createKeys(List list) { + list.addAll(gui.getScreens()); + return true; + } + + @Override + protected Node createNodeForKey(GElement screen) { + return new GElementNode(screen); + } +} \ No newline at end of file diff --git a/sdk/jme3-gui/src/com/jme3/gde/gui/palette/CategoryChildFactory.java b/sdk/jme3-gui/src/com/jme3/gde/gui/palette/CategoryChildFactory.java new file mode 100644 index 000000000..61dda2d50 --- /dev/null +++ b/sdk/jme3-gui/src/com/jme3/gde/gui/palette/CategoryChildFactory.java @@ -0,0 +1,48 @@ +package com.jme3.gde.gui.palette; + + +import com.google.common.base.Predicate; +import jada.ngeditor.model.elements.GControl; +import jada.ngeditor.model.elements.GElement; +import java.util.List; +import org.openide.nodes.AbstractNode; +import org.openide.nodes.ChildFactory; +import org.openide.nodes.Children; +import org.openide.nodes.Node; + +public class CategoryChildFactory extends ChildFactory { + + @Override + protected boolean createKeys(List list) { + ElementFilter elements = new ElementFilter("Elements") { + @Override + public boolean apply(Class t) { + return t.getGenericSuperclass().equals(GElement.class); + } + }; + list.add(elements); + ElementFilter controls = new ElementFilter("Controls") { + @Override + public boolean apply(Class t) { + return t.getGenericSuperclass().equals(GControl.class); + //To change body of generated methods, choose Tools | Templates. + } + }; + list.add(controls); + return true; + } + + @Override + protected Node createNodeForKey(ElementFilter category) { + return new CategoryNode(category); + } + + public class CategoryNode extends AbstractNode { + public CategoryNode(ElementFilter category) { + super(Children.create(new WidgetChildFactory(category), true)); + setDisplayName(category.getName()); + } + } + + +} \ No newline at end of file diff --git a/sdk/jme3-gui/src/com/jme3/gde/gui/palette/ElementFilter.java b/sdk/jme3-gui/src/com/jme3/gde/gui/palette/ElementFilter.java new file mode 100644 index 000000000..dfb06b790 --- /dev/null +++ b/sdk/jme3-gui/src/com/jme3/gde/gui/palette/ElementFilter.java @@ -0,0 +1,28 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.jme3.gde.gui.palette; + +import com.google.common.base.Predicate; + +/** + * + * @author cris + */ +abstract class ElementFilter implements Predicate{ + private final String name; + + public ElementFilter(String name) { + this.name = name; + } + + /** + * @return the name + */ + public String getName() { + return name; + } + + +} diff --git a/sdk/jme3-gui/src/com/jme3/gde/gui/palette/NiftyGUIPaletteFactory.java b/sdk/jme3-gui/src/com/jme3/gde/gui/palette/NiftyGUIPaletteFactory.java index 9a8d5f170..340fbf0ce 100644 --- a/sdk/jme3-gui/src/com/jme3/gde/gui/palette/NiftyGUIPaletteFactory.java +++ b/sdk/jme3-gui/src/com/jme3/gde/gui/palette/NiftyGUIPaletteFactory.java @@ -9,13 +9,19 @@ package com.jme3.gde.gui.palette; +import jada.ngeditor.guiviews.DND.WidgetData; import java.io.IOException; import javax.swing.Action; +import org.netbeans.api.editor.mimelookup.MimeRegistration; +import org.netbeans.spi.palette.DragAndDropHandler; import org.netbeans.spi.palette.PaletteActions; import org.netbeans.spi.palette.PaletteController; import org.netbeans.spi.palette.PaletteFactory; +import org.openide.nodes.AbstractNode; +import org.openide.nodes.Children; import org.openide.util.Exceptions; import org.openide.util.Lookup; +import org.openide.util.datatransfer.ExTransferable; /** * @@ -26,21 +32,21 @@ public class NiftyGUIPaletteFactory { //http://blogs.sun.com/geertjan/entry/convert_your_topcomponent_to_a //http://www.javanb.com/netbeans/1/19785.html - public static final String PALETTE_FOLDER = "NiftyGUIPalette"; + public static final String PALETTE_FOLDER = "NiftyPalette"; private static PaletteController palette = null; public NiftyGUIPaletteFactory() { } - + @MimeRegistration(mimeType = "text/x-niftygui+xml", service = PaletteController.class) public static PaletteController createPalette() { - try { - if (null == palette) - palette = PaletteFactory.createPalette(PALETTE_FOLDER, new MyActions()); + + if (null == palette){ + AbstractNode paletteRoot = new AbstractNode(Children.create(new CategoryChildFactory(), true)); + paletteRoot.setName("Palette Root"); + palette = PaletteFactory.createPalette( paletteRoot,new MyActions(),null,new MyHandler()); + } + return palette; - } catch (IOException ex) { - Exceptions.printStackTrace(ex); - } - return null; } private static class MyActions extends PaletteActions { @@ -71,5 +77,16 @@ public class NiftyGUIPaletteFactory { } } + + private static class MyHandler extends DragAndDropHandler { + + public MyHandler() { + } + + @Override + public void customize(ExTransferable t, Lookup item) { + t.remove(WidgetData.POINTFLAVOR); + } + } } diff --git a/sdk/jme3-gui/src/com/jme3/gde/gui/palette/Screen.xml b/sdk/jme3-gui/src/com/jme3/gde/gui/palette/Screen.xml index 842a60646..1445bab56 100644 --- a/sdk/jme3-gui/src/com/jme3/gde/gui/palette/Screen.xml +++ b/sdk/jme3-gui/src/com/jme3/gde/gui/palette/Screen.xml @@ -11,7 +11,6 @@ Screen - light source (ambient) + Nifty-gui Screen - \ No newline at end of file diff --git a/sdk/jme3-gui/src/com/jme3/gde/gui/palette/WidgetChildFactory.java b/sdk/jme3-gui/src/com/jme3/gde/gui/palette/WidgetChildFactory.java new file mode 100644 index 000000000..2da997500 --- /dev/null +++ b/sdk/jme3-gui/src/com/jme3/gde/gui/palette/WidgetChildFactory.java @@ -0,0 +1,55 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.jme3.gde.gui.palette; + +import jada.ngeditor.guiviews.palettecomponents.NWidget; +import jada.ngeditor.model.elements.GControl; +import jada.ngeditor.model.elements.GElement; +import jada.ngeditor.model.utils.ClassUtils; +import java.lang.reflect.Modifier; +import java.util.List; +import java.util.Set; +import org.openide.nodes.ChildFactory; +import org.openide.nodes.Node; + +/** + * + * @author cris + */ +public class WidgetChildFactory extends ChildFactory{ + private final ElementFilter category; + + WidgetChildFactory(ElementFilter category) { + this.category = category; + + } + + @Override + protected boolean createKeys(List toPopulate) { + Set> classes = ClassUtils.findAllGElements(); + for(Class c : classes){ + if(this.isConcreteClass(c) && category.apply(c)){ + toPopulate.add(c); + + } + } + return true; + } + + private boolean isConcreteClass(Class object){ + boolean abs = Modifier.isAbstract( object.getModifiers() ); + return !abs && !object.isAnonymousClass() && GElement.class.isAssignableFrom(object); + } + + @Override + protected Node createNodeForKey(Class key) { + return new WidgetNode(key); + } + + + + + +} diff --git a/sdk/jme3-gui/src/com/jme3/gde/gui/palette/WidgetNode.java b/sdk/jme3-gui/src/com/jme3/gde/gui/palette/WidgetNode.java new file mode 100644 index 000000000..c4faa274e --- /dev/null +++ b/sdk/jme3-gui/src/com/jme3/gde/gui/palette/WidgetNode.java @@ -0,0 +1,65 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.jme3.gde.gui.palette; + +import jada.ngeditor.guiviews.DND.DragHandler; +import jada.ngeditor.guiviews.DND.TrasferHandling; +import jada.ngeditor.guiviews.DND.WidgetData; +import jada.ngeditor.guiviews.palettecomponents.NWidget; +import jada.ngeditor.model.GUIFactory; +import jada.ngeditor.model.elements.GElement; +import jada.ngeditor.model.exception.NoProductException; +import java.awt.Image; +import java.awt.datatransfer.Transferable; +import java.awt.image.BufferedImage; +import java.io.IOException; +import java.io.InputStream; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.imageio.ImageIO; +import javax.swing.ImageIcon; +import org.openide.nodes.AbstractNode; +import org.openide.nodes.Children; +import org.openide.util.Exceptions; + +/** + * + * @author cris + */ +public class WidgetNode extends AbstractNode{ + private final Class clazz; + private static final String basePath="jada/ngeditor/resources"; + + public WidgetNode(Class wrappedClass) { + super(Children.LEAF); + this.clazz = wrappedClass; + String name = wrappedClass.getSimpleName(); + this.setName(name); + + this.setIconBaseWithExtension(basePath+"/"+name+".png"); + + + + } + + @Override + public Image getIcon(int type) { + return super.getIcon(type); //To change body of generated methods, choose Tools | Templates. + } + + @Override + public Transferable drag() throws IOException { + try { + final GElement gElement = GUIFactory.getInstance().newGElement(clazz); + return new WidgetData(gElement); + } catch (NoProductException ex) { + throw new IOException(ex); + } + } + + + + +} diff --git a/sdk/jme3-lwjgl-applet/nbproject/genfiles.properties b/sdk/jme3-lwjgl-applet/nbproject/genfiles.properties index d024b7875..2b4eb3387 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=e7813b82 +nbproject/build-impl.xml.data.CRC32=2cac032a nbproject/build-impl.xml.script.CRC32=a70d83dd nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.56.1 diff --git a/sdk/jme3-lwjgl-applet/nbproject/project.properties b/sdk/jme3-lwjgl-applet/nbproject/project.properties index 50bdbe1fd..03cd56133 100644 --- a/sdk/jme3-lwjgl-applet/nbproject/project.properties +++ b/sdk/jme3-lwjgl-applet/nbproject/project.properties @@ -5,4 +5,4 @@ license.file=../license-jme.txt nbm.homepage=http\://www.jmonkeyengine.com nbm.module.author=Normen Hansen nbm.needs.restart=true -spec.version.base=3.0.0 +spec.version.base=3.0.10 diff --git a/sdk/jme3-lwjgl-applet/nbproject/project.xml b/sdk/jme3-lwjgl-applet/nbproject/project.xml index 758eb977f..304c358be 100644 --- a/sdk/jme3-lwjgl-applet/nbproject/project.xml +++ b/sdk/jme3-lwjgl-applet/nbproject/project.xml @@ -12,7 +12,7 @@ 1 - 3.0.0 + 3.0.10 diff --git a/sdk/jme3-lwjgl-applet/release/libs/applet-loader.zip b/sdk/jme3-lwjgl-applet/release/libs/applet-loader.zip index bc248c08a..803a94b98 100644 Binary files a/sdk/jme3-lwjgl-applet/release/libs/applet-loader.zip and b/sdk/jme3-lwjgl-applet/release/libs/applet-loader.zip differ diff --git a/sdk/jme3-materialeditor/nbproject/genfiles.properties b/sdk/jme3-materialeditor/nbproject/genfiles.properties index 6c3b9c09c..999e3ba0d 100644 --- a/sdk/jme3-materialeditor/nbproject/genfiles.properties +++ b/sdk/jme3-materialeditor/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=661a7580 +build.xml.data.CRC32=7e92080c build.xml.script.CRC32=f284e28d build.xml.stylesheet.CRC32=a56c6a5b@2.56.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=661a7580 +nbproject/build-impl.xml.data.CRC32=7e92080c nbproject/build-impl.xml.script.CRC32=56cee44d nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.56.1 diff --git a/sdk/jme3-materialeditor/nbproject/project.properties b/sdk/jme3-materialeditor/nbproject/project.properties index 50bdbe1fd..03cd56133 100644 --- a/sdk/jme3-materialeditor/nbproject/project.properties +++ b/sdk/jme3-materialeditor/nbproject/project.properties @@ -5,4 +5,4 @@ license.file=../license-jme.txt nbm.homepage=http\://www.jmonkeyengine.com nbm.module.author=Normen Hansen nbm.needs.restart=true -spec.version.base=3.0.0 +spec.version.base=3.0.10 diff --git a/sdk/jme3-materialeditor/nbproject/project.xml b/sdk/jme3-materialeditor/nbproject/project.xml index ca4b74e6a..fd6b10032 100644 --- a/sdk/jme3-materialeditor/nbproject/project.xml +++ b/sdk/jme3-materialeditor/nbproject/project.xml @@ -12,7 +12,7 @@ 1 - 3.0.0 + 3.0.10 @@ -21,7 +21,7 @@ 1 - 3.0.0 + 3.0.10 @@ -30,7 +30,7 @@ 1 - 3.0.0 + 3.0.10 diff --git a/sdk/jme3-model-importer/nbproject/genfiles.properties b/sdk/jme3-model-importer/nbproject/genfiles.properties index 795c0c0eb..9e6ced5b0 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=96495c39 +build.xml.data.CRC32=10dbe817 build.xml.script.CRC32=b6310686 build.xml.stylesheet.CRC32=a56c6a5b@2.56.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=96495c39 +nbproject/build-impl.xml.data.CRC32=10dbe817 nbproject/build-impl.xml.script.CRC32=4db64ed5 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.56.1 diff --git a/sdk/jme3-model-importer/nbproject/project.properties b/sdk/jme3-model-importer/nbproject/project.properties index 50bdbe1fd..03cd56133 100644 --- a/sdk/jme3-model-importer/nbproject/project.properties +++ b/sdk/jme3-model-importer/nbproject/project.properties @@ -5,4 +5,4 @@ license.file=../license-jme.txt nbm.homepage=http\://www.jmonkeyengine.com nbm.module.author=Normen Hansen nbm.needs.restart=true -spec.version.base=3.0.0 +spec.version.base=3.0.10 diff --git a/sdk/jme3-model-importer/nbproject/project.xml b/sdk/jme3-model-importer/nbproject/project.xml index 4dd277e0b..263c2034b 100644 --- a/sdk/jme3-model-importer/nbproject/project.xml +++ b/sdk/jme3-model-importer/nbproject/project.xml @@ -11,7 +11,7 @@ - 3.0.0 + 3.0.10 @@ -20,7 +20,7 @@ 1 - 3.0.0 + 3.0.10 @@ -29,7 +29,7 @@ 1 - 3.0.0 + 3.0.10 diff --git a/sdk/jme3-navmesh-gen/nbproject/project.properties b/sdk/jme3-navmesh-gen/nbproject/project.properties index 9d2630806..3bfb1548a 100644 --- a/sdk/jme3-navmesh-gen/nbproject/project.properties +++ b/sdk/jme3-navmesh-gen/nbproject/project.properties @@ -3,4 +3,4 @@ javac.compilerargs=-Xlint -Xlint:-serial license.file=../license-jme.txt nbm.homepage=http://www.jmonkeyengine.com nbm.module.author=Brent Owens -spec.version.base=3.0.0 +spec.version.base=3.0.10 diff --git a/sdk/jme3-navmesh-gen/nbproject/project.xml b/sdk/jme3-navmesh-gen/nbproject/project.xml index e46d196b4..bff67379e 100644 --- a/sdk/jme3-navmesh-gen/nbproject/project.xml +++ b/sdk/jme3-navmesh-gen/nbproject/project.xml @@ -12,7 +12,7 @@ 1 - 3.0.0 + 3.0.10 @@ -21,7 +21,7 @@ 1 - 3.0.0 + 3.0.10 diff --git a/sdk/jme3-obfuscate/nbproject/genfiles.properties b/sdk/jme3-obfuscate/nbproject/genfiles.properties index d7780ddd9..6c2e8c145 100644 --- a/sdk/jme3-obfuscate/nbproject/genfiles.properties +++ b/sdk/jme3-obfuscate/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=cc81893f +build.xml.data.CRC32=d31ab367 build.xml.script.CRC32=69663b9b build.xml.stylesheet.CRC32=a56c6a5b@2.56.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=cc81893f +nbproject/build-impl.xml.data.CRC32=d31ab367 nbproject/build-impl.xml.script.CRC32=c9f3ae73 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.56.1 diff --git a/sdk/jme3-obfuscate/nbproject/project.properties b/sdk/jme3-obfuscate/nbproject/project.properties index 639f16f60..3f2aa0dfc 100644 --- a/sdk/jme3-obfuscate/nbproject/project.properties +++ b/sdk/jme3-obfuscate/nbproject/project.properties @@ -4,4 +4,4 @@ javac.compilerargs=-Xlint -Xlint\:-serial nbm.homepage=http\://proguard.sourceforge.net/ nbm.module.author=Normen Hansen nbm.needs.restart=true -spec.version.base=3.0.0 +spec.version.base=3.0.10 diff --git a/sdk/jme3-obfuscate/nbproject/project.xml b/sdk/jme3-obfuscate/nbproject/project.xml index 532318b20..ab277c64c 100644 --- a/sdk/jme3-obfuscate/nbproject/project.xml +++ b/sdk/jme3-obfuscate/nbproject/project.xml @@ -12,7 +12,7 @@ 1 - 3.0.0 + 3.0.10 diff --git a/sdk/jme3-ogretools/nbproject/genfiles.properties b/sdk/jme3-ogretools/nbproject/genfiles.properties index 17378a4bc..e92ab3cdf 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=1f013e3c +nbproject/build-impl.xml.data.CRC32=3ade7155 nbproject/build-impl.xml.script.CRC32=4a050ba2 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.56.1 diff --git a/sdk/jme3-ogretools/nbproject/project.properties b/sdk/jme3-ogretools/nbproject/project.properties index 50bdbe1fd..03cd56133 100644 --- a/sdk/jme3-ogretools/nbproject/project.properties +++ b/sdk/jme3-ogretools/nbproject/project.properties @@ -5,4 +5,4 @@ license.file=../license-jme.txt nbm.homepage=http\://www.jmonkeyengine.com nbm.module.author=Normen Hansen nbm.needs.restart=true -spec.version.base=3.0.0 +spec.version.base=3.0.10 diff --git a/sdk/jme3-ogretools/nbproject/project.xml b/sdk/jme3-ogretools/nbproject/project.xml index 1baeb5e85..f3641256c 100644 --- a/sdk/jme3-ogretools/nbproject/project.xml +++ b/sdk/jme3-ogretools/nbproject/project.xml @@ -12,7 +12,7 @@ 1 - 3.0.0 + 3.0.10 @@ -21,7 +21,7 @@ 1 - 3.0.0 + 3.0.10 @@ -30,14 +30,14 @@ 1 - 3.0.0 + 3.0.10 com.jme3.gde.ogrexml 1 - 3.0.0 + 3.0.10 diff --git a/sdk/jme3-ogretools/src/com/jme3/gde/ogretools/blender/scripts.zip b/sdk/jme3-ogretools/src/com/jme3/gde/ogretools/blender/scripts.zip index 2b31d1eb6..2393661df 100644 Binary files a/sdk/jme3-ogretools/src/com/jme3/gde/ogretools/blender/scripts.zip and b/sdk/jme3-ogretools/src/com/jme3/gde/ogretools/blender/scripts.zip differ diff --git a/sdk/jme3-ogrexml/nbproject/genfiles.properties b/sdk/jme3-ogrexml/nbproject/genfiles.properties index 888b9963c..ecd837ccb 100644 --- a/sdk/jme3-ogrexml/nbproject/genfiles.properties +++ b/sdk/jme3-ogrexml/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=52dcfd71 +build.xml.data.CRC32=fb143d7c build.xml.script.CRC32=a910387a build.xml.stylesheet.CRC32=a56c6a5b@2.56.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=52dcfd71 +nbproject/build-impl.xml.data.CRC32=fb143d7c nbproject/build-impl.xml.script.CRC32=2abbef60 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.56.1 diff --git a/sdk/jme3-ogrexml/nbproject/project.properties b/sdk/jme3-ogrexml/nbproject/project.properties index bf4d6b117..286eaeb29 100644 --- a/sdk/jme3-ogrexml/nbproject/project.properties +++ b/sdk/jme3-ogrexml/nbproject/project.properties @@ -5,4 +5,4 @@ license.file=../license-jme.txt nbm.homepage=http\://www.jmonkeyengine.com nbm.module.author=Normen Hansen nbm.needs.restart=true -spec.version.base=3.0.0 +spec.version.base=3.0.10 diff --git a/sdk/jme3-ogrexml/nbproject/project.xml b/sdk/jme3-ogrexml/nbproject/project.xml index 19841c71f..9dea43100 100644 --- a/sdk/jme3-ogrexml/nbproject/project.xml +++ b/sdk/jme3-ogrexml/nbproject/project.xml @@ -12,7 +12,7 @@ 1 - 3.0.0 + 3.0.10 @@ -21,7 +21,7 @@ 1 - 3.0.0 + 3.0.10 @@ -30,7 +30,7 @@ 1 - 3.0.0 + 3.0.10 diff --git a/sdk/jme3-project-baselibs/nbproject/project.properties b/sdk/jme3-project-baselibs/nbproject/project.properties index 7122203c6..cdc4eaded 100644 --- a/sdk/jme3-project-baselibs/nbproject/project.properties +++ b/sdk/jme3-project-baselibs/nbproject/project.properties @@ -5,4 +5,4 @@ license.file=../license-jme.txt nbm.homepage=http\://www.jmonkeyengine.com nbm.module.author=jMonkeyEngine nbm.needs.restart=true -spec.version.base=3.0.0 +spec.version.base=3.0.10 diff --git a/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-android.xml b/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-android.xml new file mode 100644 index 000000000..218eef92b --- /dev/null +++ b/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-android.xml @@ -0,0 +1,27 @@ + + + + jme3-android + j2se + com.jme3.gde.project.baselibs.Bundle + + classpath + jar:nbinst://com.jme3.gde.project.baselibs/libs/jme3-android-3.0.10-pre-alpha-svn.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/android-4.1.1.4.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/commons-logging-1.1.1.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/httpclient-4.0.1.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/opengl-api-gl1.1-android-2.1_r1.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/xmlParserAPIs-2.6.2.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/xpp3-1.1.4c.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/json-20080701.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/httpcore-4.0.1.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/commons-codec-1.3.jar!/ + + + src + jar:nbinst://com.jme3.gde.project.baselibs/libs/jme3-android-3.0.10-pre-alpha-svn-sources.jar!/ + + + javadoc + + \ No newline at end of file diff --git a/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-bullet.xml b/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-bullet.xml new file mode 100644 index 000000000..05cc8a3bc --- /dev/null +++ b/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-bullet.xml @@ -0,0 +1,18 @@ + + + + jme3-bullet + j2se + com.jme3.gde.project.baselibs.Bundle + + classpath + jar:nbinst://com.jme3.gde.project.baselibs/libs/jme3-bullet-3.0.10-pre-alpha-svn.jar!/ + + + src + jar:nbinst://com.jme3.gde.project.baselibs/libs/jme3-bullet-3.0.10-pre-alpha-svn-sources.jar!/ + + + javadoc + + \ No newline at end of file diff --git a/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-ios.xml b/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-ios.xml new file mode 100644 index 000000000..f7cd12ebe --- /dev/null +++ b/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-ios.xml @@ -0,0 +1,18 @@ + + + + jme3-ios + j2se + com.jme3.gde.project.baselibs.Bundle + + classpath + jar:nbinst://com.jme3.gde.project.baselibs/libs/jme3-ios-3.0.10-pre-alpha-svn.jar!/ + + + src + jar:nbinst://com.jme3.gde.project.baselibs/libs/jme3-ios-3.0.10-pre-alpha-svn-sources.jar!/ + + + javadoc + + \ No newline at end of file diff --git a/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-jogl.xml b/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-jogl.xml new file mode 100644 index 000000000..8727aa85e --- /dev/null +++ b/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-jogl.xml @@ -0,0 +1,54 @@ + + + + jme3-jogl + j2se + com.jme3.gde.project.baselibs.Bundle + + classpath + jar:nbinst://com.jme3.gde.project.baselibs/libs/jme3-jogl-3.0.10-pre-alpha-svn.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-main-2.1.4.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-main-2.1.4.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/joal-main-2.1.4.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4-natives-android-armv6.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4-natives-linux-amd64.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4-natives-linux-armv6.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4-natives-linux-armv6hf.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4-natives-linux-i586.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4-natives-macosx-universal.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4-natives-solaris-amd64.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4-natives-solaris-i586.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4-natives-windows-amd64.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4-natives-windows-i586.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4-natives-android-armv6.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4-natives-linux-amd64.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4-natives-linux-armv6.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4-natives-linux-armv6hf.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4-natives-linux-i586.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4-natives-macosx-universal.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4-natives-solaris-amd64.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4-natives-solaris-i586.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4-natives-windows-amd64.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4-natives-windows-i586.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4-natives-android-armv6.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4-natives-linux-amd64.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4-natives-linux-armv6.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4-natives-linux-armv6hf.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4-natives-linux-i586.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4-natives-macosx-universal.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4-natives-solaris-amd64.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4-natives-solaris-i586.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4-natives-windows-amd64.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4-natives-windows-i586.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4.jar!/ + + + src + jar:nbinst://com.jme3.gde.project.baselibs/libs/jme3-jogl-3.0.10-pre-alpha-svn-sources.jar!/ + + + javadoc + + \ No newline at end of file diff --git a/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/layer.xml b/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/layer.xml index de4723b40..118220e12 100644 --- a/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/layer.xml +++ b/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/layer.xml @@ -14,6 +14,10 @@ + + + + \ No newline at end of file diff --git a/sdk/jme3-project-libraries/nbproject/project.properties b/sdk/jme3-project-libraries/nbproject/project.properties index 7122203c6..cdc4eaded 100644 --- a/sdk/jme3-project-libraries/nbproject/project.properties +++ b/sdk/jme3-project-libraries/nbproject/project.properties @@ -5,4 +5,4 @@ license.file=../license-jme.txt nbm.homepage=http\://www.jmonkeyengine.com nbm.module.author=jMonkeyEngine nbm.needs.restart=true -spec.version.base=3.0.0 +spec.version.base=3.0.10 diff --git a/sdk/jme3-project-testdata/nbproject/project.properties b/sdk/jme3-project-testdata/nbproject/project.properties index 7122203c6..cdc4eaded 100644 --- a/sdk/jme3-project-testdata/nbproject/project.properties +++ b/sdk/jme3-project-testdata/nbproject/project.properties @@ -5,4 +5,4 @@ license.file=../license-jme.txt nbm.homepage=http\://www.jmonkeyengine.com nbm.module.author=jMonkeyEngine nbm.needs.restart=true -spec.version.base=3.0.0 +spec.version.base=3.0.10 diff --git a/sdk/jme3-scenecomposer/nbproject/genfiles.properties b/sdk/jme3-scenecomposer/nbproject/genfiles.properties index 03c65c111..ee03969a0 100644 --- a/sdk/jme3-scenecomposer/nbproject/genfiles.properties +++ b/sdk/jme3-scenecomposer/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=b19d829b +build.xml.data.CRC32=0b7aa49f build.xml.script.CRC32=866b78de build.xml.stylesheet.CRC32=a56c6a5b@2.56.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=b19d829b +nbproject/build-impl.xml.data.CRC32=0b7aa49f nbproject/build-impl.xml.script.CRC32=a6bab88d nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.56.1 diff --git a/sdk/jme3-scenecomposer/nbproject/project.properties b/sdk/jme3-scenecomposer/nbproject/project.properties index 50bdbe1fd..03cd56133 100644 --- a/sdk/jme3-scenecomposer/nbproject/project.properties +++ b/sdk/jme3-scenecomposer/nbproject/project.properties @@ -5,4 +5,4 @@ license.file=../license-jme.txt nbm.homepage=http\://www.jmonkeyengine.com nbm.module.author=Normen Hansen nbm.needs.restart=true -spec.version.base=3.0.0 +spec.version.base=3.0.10 diff --git a/sdk/jme3-scenecomposer/nbproject/project.xml b/sdk/jme3-scenecomposer/nbproject/project.xml index 360995257..90df90aa5 100644 --- a/sdk/jme3-scenecomposer/nbproject/project.xml +++ b/sdk/jme3-scenecomposer/nbproject/project.xml @@ -12,7 +12,7 @@ 1 - 3.0.0 + 3.0.10 @@ -21,7 +21,7 @@ 1 - 3.0.0 + 3.0.10 @@ -30,7 +30,7 @@ 1 - 3.0.0 + 3.0.10 @@ -39,7 +39,7 @@ 1 - 3.0.0 + 3.0.10 diff --git a/sdk/jme3-templates/nbproject/project.properties b/sdk/jme3-templates/nbproject/project.properties index 7122203c6..cdc4eaded 100644 --- a/sdk/jme3-templates/nbproject/project.properties +++ b/sdk/jme3-templates/nbproject/project.properties @@ -5,4 +5,4 @@ license.file=../license-jme.txt nbm.homepage=http\://www.jmonkeyengine.com nbm.module.author=jMonkeyEngine nbm.needs.restart=true -spec.version.base=3.0.0 +spec.version.base=3.0.10 diff --git a/sdk/jme3-templates/nbproject/project.xml b/sdk/jme3-templates/nbproject/project.xml index 01eecce89..91c25ffea 100644 --- a/sdk/jme3-templates/nbproject/project.xml +++ b/sdk/jme3-templates/nbproject/project.xml @@ -10,14 +10,14 @@ com.jme3.gde.project.baselibs 1 - 3.0.0 + 3.0.10 com.jme3.gde.project.libraries 1 - 3.0.0 + 3.0.10 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 063f5461f..4edc0afea 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-terrain-editor/nbproject/genfiles.properties b/sdk/jme3-terrain-editor/nbproject/genfiles.properties index 9647aea72..65e2cdd85 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=8e5b42d0 +build.xml.data.CRC32=3499ba98 build.xml.script.CRC32=5fb89d93 build.xml.stylesheet.CRC32=a56c6a5b@2.56.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=8e5b42d0 +nbproject/build-impl.xml.data.CRC32=3499ba98 nbproject/build-impl.xml.script.CRC32=fe2b940f nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.56.1 diff --git a/sdk/jme3-terrain-editor/nbproject/project.properties b/sdk/jme3-terrain-editor/nbproject/project.properties index bfcbcd55b..1ccea909c 100644 --- a/sdk/jme3-terrain-editor/nbproject/project.properties +++ b/sdk/jme3-terrain-editor/nbproject/project.properties @@ -4,4 +4,4 @@ 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 +spec.version.base=3.0.10 diff --git a/sdk/jme3-terrain-editor/nbproject/project.xml b/sdk/jme3-terrain-editor/nbproject/project.xml index 03d2acb91..e121e9dd5 100644 --- a/sdk/jme3-terrain-editor/nbproject/project.xml +++ b/sdk/jme3-terrain-editor/nbproject/project.xml @@ -12,7 +12,7 @@ 1 - 3.0.0 + 3.0.10 @@ -21,7 +21,7 @@ 1 - 3.0.0 + 3.0.10 diff --git a/sdk/jme3-tests-template/nbproject/project.properties b/sdk/jme3-tests-template/nbproject/project.properties index 7122203c6..cdc4eaded 100644 --- a/sdk/jme3-tests-template/nbproject/project.properties +++ b/sdk/jme3-tests-template/nbproject/project.properties @@ -5,4 +5,4 @@ license.file=../license-jme.txt nbm.homepage=http\://www.jmonkeyengine.com nbm.module.author=jMonkeyEngine nbm.needs.restart=true -spec.version.base=3.0.0 +spec.version.base=3.0.10 diff --git a/sdk/jme3-tests-template/nbproject/project.xml b/sdk/jme3-tests-template/nbproject/project.xml index 7fc72344e..97fc0b6cb 100644 --- a/sdk/jme3-tests-template/nbproject/project.xml +++ b/sdk/jme3-tests-template/nbproject/project.xml @@ -10,7 +10,7 @@ com.jme3.gde.project.testdata 1 - 3.0.0 + 3.0.10 diff --git a/sdk/jme3-texture-editor/nbproject/project.properties b/sdk/jme3-texture-editor/nbproject/project.properties index c92576e8c..d7b6753e3 100644 --- a/sdk/jme3-texture-editor/nbproject/project.properties +++ b/sdk/jme3-texture-editor/nbproject/project.properties @@ -5,4 +5,4 @@ license.file=../license-jme.txt nbm.homepage=http\://www.jmonkeyengine.com nbm.module.author=pgi nbm.needs.restart=true -spec.version.base=3.0.0 +spec.version.base=3.0.10 diff --git a/sdk/jme3-upgrader/nbproject/project.properties b/sdk/jme3-upgrader/nbproject/project.properties index f7e2314bf..376eda2a5 100644 --- a/sdk/jme3-upgrader/nbproject/project.properties +++ b/sdk/jme3-upgrader/nbproject/project.properties @@ -1,3 +1,3 @@ javac.source=1.6 javac.compilerargs=-Xlint -Xlint:-serial -spec.version.base=3.0.0 +spec.version.base=3.0.10 diff --git a/sdk/jme3-vehicle-creator/nbproject/genfiles.properties b/sdk/jme3-vehicle-creator/nbproject/genfiles.properties index 70b4705f7..fee99adce 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=32a1c923 +build.xml.data.CRC32=fa2e0813 build.xml.script.CRC32=39e31f0c build.xml.stylesheet.CRC32=a56c6a5b@2.56.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=32a1c923 +nbproject/build-impl.xml.data.CRC32=fa2e0813 nbproject/build-impl.xml.script.CRC32=90c55096 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.56.1 diff --git a/sdk/jme3-vehicle-creator/nbproject/project.properties b/sdk/jme3-vehicle-creator/nbproject/project.properties index 3d19f4a47..90a580ad7 100644 --- a/sdk/jme3-vehicle-creator/nbproject/project.properties +++ b/sdk/jme3-vehicle-creator/nbproject/project.properties @@ -1,4 +1,4 @@ #Thu, 25 Aug 2011 20:26:50 +0200 javac.source=1.5 javac.compilerargs=-Xlint -Xlint\:-serial -spec.version.base=3.0.0 +spec.version.base=3.0.10 diff --git a/sdk/jme3-vehicle-creator/nbproject/project.xml b/sdk/jme3-vehicle-creator/nbproject/project.xml index b4c1d6d7a..ddbe65904 100644 --- a/sdk/jme3-vehicle-creator/nbproject/project.xml +++ b/sdk/jme3-vehicle-creator/nbproject/project.xml @@ -12,7 +12,7 @@ 1 - 3.0.0 + 3.0.10 @@ -21,7 +21,7 @@ 1 - 3.0.0 + 3.0.10 diff --git a/sdk/jme3-wavefront/nbproject/genfiles.properties b/sdk/jme3-wavefront/nbproject/genfiles.properties index 04e07ed07..2d95abb90 100644 --- a/sdk/jme3-wavefront/nbproject/genfiles.properties +++ b/sdk/jme3-wavefront/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=96c4d606 +build.xml.data.CRC32=f45ac22f build.xml.script.CRC32=fa305471 build.xml.stylesheet.CRC32=a56c6a5b@2.56.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=96c4d606 +nbproject/build-impl.xml.data.CRC32=f45ac22f nbproject/build-impl.xml.script.CRC32=8239585b nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.56.1 diff --git a/sdk/jme3-wavefront/nbproject/project.properties b/sdk/jme3-wavefront/nbproject/project.properties index 25a0353d6..869ff7158 100644 --- a/sdk/jme3-wavefront/nbproject/project.properties +++ b/sdk/jme3-wavefront/nbproject/project.properties @@ -1,4 +1,4 @@ #Thu, 25 Aug 2011 20:26:49 +0200 javac.source=1.5 javac.compilerargs=-Xlint -Xlint\:-serial -spec.version.base=3.0.0 +spec.version.base=3.0.10 diff --git a/sdk/jme3-wavefront/nbproject/project.xml b/sdk/jme3-wavefront/nbproject/project.xml index 15b6d9932..3d47daace 100644 --- a/sdk/jme3-wavefront/nbproject/project.xml +++ b/sdk/jme3-wavefront/nbproject/project.xml @@ -12,7 +12,7 @@ 1 - 3.0.0 + 3.0.10 @@ -21,7 +21,7 @@ 1 - 3.0.0 + 3.0.10 diff --git a/sdk/jme3-welcome-screen/nbproject/genfiles.properties b/sdk/jme3-welcome-screen/nbproject/genfiles.properties index 2ac5e72bf..9fd9e6929 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=91da4478 +build.xml.data.CRC32=46663c7a build.xml.script.CRC32=e68af6b0 build.xml.stylesheet.CRC32=a56c6a5b@2.56.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=91da4478 +nbproject/build-impl.xml.data.CRC32=46663c7a nbproject/build-impl.xml.script.CRC32=5d3b3399 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.56.1 diff --git a/sdk/jme3-welcome-screen/nbproject/project.properties b/sdk/jme3-welcome-screen/nbproject/project.properties index bfb1d4a39..bae33ecdd 100644 --- a/sdk/jme3-welcome-screen/nbproject/project.properties +++ b/sdk/jme3-welcome-screen/nbproject/project.properties @@ -4,4 +4,4 @@ license.file=../license-jme.txt nbm.homepage=http\://www.jmonkeyengine.com nbm.module.author=Normen Hansen, jiyarza nbm.needs.restart=true -spec.version.base=3.0.0 +spec.version.base=3.0.10 diff --git a/sdk/jme3-welcome-screen/nbproject/project.xml b/sdk/jme3-welcome-screen/nbproject/project.xml index c4f2eafcb..c940ad572 100644 --- a/sdk/jme3-welcome-screen/nbproject/project.xml +++ b/sdk/jme3-welcome-screen/nbproject/project.xml @@ -12,7 +12,7 @@ 1 - 3.0.0 + 3.0.10 @@ -21,7 +21,7 @@ 1 - 3.0.0 + 3.0.10 @@ -30,7 +30,7 @@ 1 - 3.0.0 + 3.0.10 diff --git a/sdk/nbproject/project.properties b/sdk/nbproject/project.properties index 620346231..0ec19187b 100644 --- a/sdk/nbproject/project.properties +++ b/sdk/nbproject/project.properties @@ -1,3 +1,4 @@ +#Tue, 29 Apr 2014 15:43:20 +0200 app.icon=branding/core/core.jar/org/netbeans/core/startup/frame48.gif #same as ${branding.token} app.name=jmonkeyplatform @@ -6,50 +7,16 @@ app.icon.icns=jmonkeyplatform.icns #version name used for application and settings folder, no spaces! app.version=3.1-pre-alpha-svn #version number used for plugins, only 3 numbers (e.g. 3.1.3) -plugins.version=3.1.0 +plugins.version=3.0.10 #command line args -run.args.extra=-J-Xmx512m -J-XX:PermSize=128m -J-XX:MaxDirectMemorySize=2048m -J-Dsun.zip.disableMemoryMapping=true -J-Dapple.awt.graphics.UseQuartz=true -J-Dsun.java2d.noddraw=true +run.args.extra=-J-Xmx512m -J-XX\:PermSize\=128m -J-XX\:MaxDirectMemorySize\=2048m -J-Dsun.zip.disableMemoryMapping\=true -J-Dapple.awt.graphics.UseQuartz\=true -J-Dsun.java2d.noddraw\=true auxiliary.org-netbeans-modules-apisupport-installer.license-file=license-jme.txt auxiliary.org-netbeans-modules-apisupport-installer.os-linux=true auxiliary.org-netbeans-modules-apisupport-installer.os-macosx=true auxiliary.org-netbeans-modules-apisupport-installer.os-solaris=false auxiliary.org-netbeans-modules-apisupport-installer.os-windows=true auxiliary.org-netbeans-modules-apisupport-installer.pack200-enabled=true -modules=\ - ${project.com.jme3.gde.upgrader}:\ - ${project.com.jme3.gde.core}:\ - ${project.com.jme3.gde.core.baselibs}:\ - ${project.com.jme3.gde.core.libraries}:\ - ${project.com.jme3.gde.templates}:\ - ${project.com.jme3.gde.project.baselibs}:\ - ${project.com.jme3.gde.project.libraries}:\ - ${project.com.jme3.gde.tests}:\ - ${project.com.jme3.gde.project.testdata}:\ - ${project.com.jme3.gde.ogrexml}:\ - ${project.com.jme3.gde.scenecomposer}:\ - ${project.com.jme3.gde.materials}:\ - ${project.com.jme3.gde.gui}:\ - ${project.com.jme3.gde.ogretools}:\ - ${project.com.jme3.gde.codepalette}:\ - ${project.com.jme3.gde.textureeditor}:\ - ${project.com.jme3.gde.core.updatecenters}:\ - ${project.com.jme3.gde.wavefront}:\ - ${project.com.jme3.gde.terraineditor}:\ - ${project.com.jme3.gde.assetpack}:\ - ${project.com.jme3.gde.modelimporter}:\ - ${project.com.jme3.gde.lwjgl.applet}:\ - ${project.com.jme3.gde.desktop.executables}:\ - ${project.com.jme3.gde.cinematics}:\ - ${project.com.jme3.gde.vehiclecreator}:\ - ${project.com.jme3.gde.welcome}:\ - ${project.com.jme3.gde.codecheck}:\ - ${project.com.jme3.gde.obfuscate}:\ - ${project.com.jme3.gde.blender}:\ - ${project.com.jme3.gde.angelfont}:\ - ${project.net.java.nboglpack.glsleditor}:\ - ${project.com.jme3.gde.android}:\ - ${project.com.jme3.gde.nmgen}:\ - ${project.com.jme3.gde.docs} +modules=${project.com.jme3.gde.upgrader}\:${project.com.jme3.gde.core}\:${project.com.jme3.gde.core.baselibs}\:${project.com.jme3.gde.core.libraries}\:${project.com.jme3.gde.templates}\:${project.com.jme3.gde.project.baselibs}\:${project.com.jme3.gde.project.libraries}\:${project.com.jme3.gde.tests}\:${project.com.jme3.gde.project.testdata}\:${project.com.jme3.gde.ogrexml}\:${project.com.jme3.gde.scenecomposer}\:${project.com.jme3.gde.materials}\:${project.com.jme3.gde.gui}\:${project.com.jme3.gde.ogretools}\:${project.com.jme3.gde.codepalette}\:${project.com.jme3.gde.textureeditor}\:${project.com.jme3.gde.core.updatecenters}\:${project.com.jme3.gde.wavefront}\:${project.com.jme3.gde.terraineditor}\:${project.com.jme3.gde.assetpack}\:${project.com.jme3.gde.modelimporter}\:${project.com.jme3.gde.lwjgl.applet}\:${project.com.jme3.gde.desktop.executables}\:${project.com.jme3.gde.cinematics}\:${project.com.jme3.gde.vehiclecreator}\:${project.com.jme3.gde.welcome}\:${project.com.jme3.gde.codecheck}\:${project.com.jme3.gde.obfuscate}\:${project.com.jme3.gde.blender}\:${project.com.jme3.gde.angelfont}\:${project.net.java.nboglpack.glsleditor}\:${project.com.jme3.gde.android}\:${project.com.jme3.gde.nmgen}\:${project.com.jme3.gde.docs} project.com.jme3.gde.android=jme3-android project.com.jme3.gde.angelfont=jme3-angelfont project.com.jme3.gde.blender=jme3-blender