relu91 11 lat temu
rodzic
commit
865980291a
100 zmienionych plików z 1013 dodań i 149 usunięć
  1. 5 1
      .gitignore
  2. BIN
      OpenAL32.dll
  3. BIN
      lwjgl.dll
  4. 1 1
      sdk/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
  5. 2 2
      sdk/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
  6. 2 2
      sdk/jme3-android/nbproject/genfiles.properties
  7. 1 1
      sdk/jme3-android/nbproject/project.properties
  8. 1 1
      sdk/jme3-android/nbproject/project.xml
  9. 2 2
      sdk/jme3-angelfont/nbproject/genfiles.properties
  10. 1 1
      sdk/jme3-angelfont/nbproject/project.properties
  11. 2 2
      sdk/jme3-angelfont/nbproject/project.xml
  12. 1 1
      sdk/jme3-assetpack-support/nbproject/genfiles.properties
  13. 1 1
      sdk/jme3-assetpack-support/nbproject/project.properties
  14. 4 4
      sdk/jme3-assetpack-support/nbproject/project.xml
  15. 2 2
      sdk/jme3-blender/nbproject/genfiles.properties
  16. 1 1
      sdk/jme3-blender/nbproject/project.properties
  17. 2 2
      sdk/jme3-blender/nbproject/project.xml
  18. 2 2
      sdk/jme3-cinematics/nbproject/genfiles.properties
  19. 1 1
      sdk/jme3-cinematics/nbproject/project.properties
  20. 3 3
      sdk/jme3-cinematics/nbproject/project.xml
  21. 2 2
      sdk/jme3-code-check/nbproject/genfiles.properties
  22. 1 1
      sdk/jme3-code-check/nbproject/project.properties
  23. 1 1
      sdk/jme3-code-check/nbproject/project.xml
  24. 1 1
      sdk/jme3-codepalette/nbproject/project.properties
  25. 4 4
      sdk/jme3-core-baselibs/nbproject/genfiles.properties
  26. 1 1
      sdk/jme3-core-baselibs/nbproject/project.properties
  27. 8 8
      sdk/jme3-core-baselibs/nbproject/project.xml
  28. 1 1
      sdk/jme3-core-updatecenters/nbproject/project.properties
  29. 1 1
      sdk/jme3-core/nbproject/project.properties
  30. 4 4
      sdk/jme3-core/nbproject/project.xml
  31. 1 1
      sdk/jme3-desktop-executables/nbproject/project.properties
  32. 1 1
      sdk/jme3-desktop-executables/nbproject/project.xml
  33. BIN
      sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/macapp-data.zip
  34. BIN
      sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/winapp-data.zip
  35. 1 1
      sdk/jme3-documentation/nbproject/project.properties
  36. 1 1
      sdk/jme3-glsl-support/nbproject/project.properties
  37. 1 0
      sdk/jme3-gui/manifest.mf
  38. 2 2
      sdk/jme3-gui/nbproject/genfiles.properties
  39. 5 5
      sdk/jme3-gui/nbproject/project.properties
  40. 29 2
      sdk/jme3-gui/nbproject/project.xml
  41. BIN
      sdk/jme3-gui/release/modules/ext/Nifty-Editor0.5.9.jar
  42. 1 1
      sdk/jme3-gui/src/com/jme3/gde/gui/Bundle.properties
  43. 9 9
      sdk/jme3-gui/src/com/jme3/gde/gui/EmptyNiftyGui.xml
  44. 28 0
      sdk/jme3-gui/src/com/jme3/gde/gui/Navigator.form
  45. 191 0
      sdk/jme3-gui/src/com/jme3/gde/gui/Navigator.java
  46. 4 1
      sdk/jme3-gui/src/com/jme3/gde/gui/NiftyGuiDataObject.java
  47. 74 5
      sdk/jme3-gui/src/com/jme3/gde/gui/NiftyGuiVisualElement.java
  48. 10 0
      sdk/jme3-gui/src/com/jme3/gde/gui/layer.xml
  49. 34 0
      sdk/jme3-gui/src/com/jme3/gde/gui/nodes/GElementChildFactory.java
  50. 97 0
      sdk/jme3-gui/src/com/jme3/gde/gui/nodes/GElementNode.java
  51. 36 0
      sdk/jme3-gui/src/com/jme3/gde/gui/nodes/GUINode.java
  52. 31 0
      sdk/jme3-gui/src/com/jme3/gde/gui/nodes/ScreenChildFactory.java
  53. 48 0
      sdk/jme3-gui/src/com/jme3/gde/gui/palette/CategoryChildFactory.java
  54. 28 0
      sdk/jme3-gui/src/com/jme3/gde/gui/palette/ElementFilter.java
  55. 26 9
      sdk/jme3-gui/src/com/jme3/gde/gui/palette/NiftyGUIPaletteFactory.java
  56. 1 2
      sdk/jme3-gui/src/com/jme3/gde/gui/palette/Screen.xml
  57. 55 0
      sdk/jme3-gui/src/com/jme3/gde/gui/palette/WidgetChildFactory.java
  58. 65 0
      sdk/jme3-gui/src/com/jme3/gde/gui/palette/WidgetNode.java
  59. 1 1
      sdk/jme3-lwjgl-applet/nbproject/genfiles.properties
  60. 1 1
      sdk/jme3-lwjgl-applet/nbproject/project.properties
  61. 1 1
      sdk/jme3-lwjgl-applet/nbproject/project.xml
  62. BIN
      sdk/jme3-lwjgl-applet/release/libs/applet-loader.zip
  63. 2 2
      sdk/jme3-materialeditor/nbproject/genfiles.properties
  64. 1 1
      sdk/jme3-materialeditor/nbproject/project.properties
  65. 3 3
      sdk/jme3-materialeditor/nbproject/project.xml
  66. 2 2
      sdk/jme3-model-importer/nbproject/genfiles.properties
  67. 1 1
      sdk/jme3-model-importer/nbproject/project.properties
  68. 3 3
      sdk/jme3-model-importer/nbproject/project.xml
  69. 1 1
      sdk/jme3-navmesh-gen/nbproject/project.properties
  70. 2 2
      sdk/jme3-navmesh-gen/nbproject/project.xml
  71. 2 2
      sdk/jme3-obfuscate/nbproject/genfiles.properties
  72. 1 1
      sdk/jme3-obfuscate/nbproject/project.properties
  73. 1 1
      sdk/jme3-obfuscate/nbproject/project.xml
  74. 1 1
      sdk/jme3-ogretools/nbproject/genfiles.properties
  75. 1 1
      sdk/jme3-ogretools/nbproject/project.properties
  76. 4 4
      sdk/jme3-ogretools/nbproject/project.xml
  77. BIN
      sdk/jme3-ogretools/src/com/jme3/gde/ogretools/blender/scripts.zip
  78. 2 2
      sdk/jme3-ogrexml/nbproject/genfiles.properties
  79. 1 1
      sdk/jme3-ogrexml/nbproject/project.properties
  80. 3 3
      sdk/jme3-ogrexml/nbproject/project.xml
  81. 1 1
      sdk/jme3-project-baselibs/nbproject/project.properties
  82. 27 0
      sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-android.xml
  83. 18 0
      sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-bullet.xml
  84. 18 0
      sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-ios.xml
  85. 54 0
      sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-jogl.xml
  86. 4 0
      sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/layer.xml
  87. 1 1
      sdk/jme3-project-libraries/nbproject/project.properties
  88. 1 1
      sdk/jme3-project-testdata/nbproject/project.properties
  89. 2 2
      sdk/jme3-scenecomposer/nbproject/genfiles.properties
  90. 1 1
      sdk/jme3-scenecomposer/nbproject/project.properties
  91. 4 4
      sdk/jme3-scenecomposer/nbproject/project.xml
  92. 1 1
      sdk/jme3-templates/nbproject/project.properties
  93. 2 2
      sdk/jme3-templates/nbproject/project.xml
  94. BIN
      sdk/jme3-templates/src/com/jme3/gde/templates/BasicGameProject.zip
  95. 2 2
      sdk/jme3-terrain-editor/nbproject/genfiles.properties
  96. 1 1
      sdk/jme3-terrain-editor/nbproject/project.properties
  97. 2 2
      sdk/jme3-terrain-editor/nbproject/project.xml
  98. 1 1
      sdk/jme3-tests-template/nbproject/project.properties
  99. 1 1
      sdk/jme3-tests-template/nbproject/project.xml
  100. 1 1
      sdk/jme3-texture-editor/nbproject/project.properties

+ 5 - 1
.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/
+/jme3-bullet-native-android/build/
+/sdk/nbproject/private/
+/sdk/jme3-gui/nbproject/private/
+/sdk/jme3-core/nbproject/private/
+/sdk/jme3-materialeditor/nbproject/private/

BIN
OpenAL32.dll


BIN
lwjgl.dll


+ 1 - 1
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

+ 2 - 2
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

+ 2 - 2
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
 [email protected]
 # 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/[email protected]

+ 1 - 1
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

+ 1 - 1
sdk/jme3-android/nbproject/project.xml

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

+ 2 - 2
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
 [email protected]
 # 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/[email protected]

+ 1 - 1
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

+ 2 - 2
sdk/jme3-angelfont/nbproject/project.xml

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

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

@@ -3,6 +3,6 @@ build.xml.script.CRC32=c0969383
 [email protected]
 # 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/[email protected]

+ 1 - 1
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

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

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

+ 2 - 2
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
 [email protected]
 # 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/[email protected]

+ 1 - 1
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

+ 2 - 2
sdk/jme3-blender/nbproject/project.xml

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

+ 2 - 2
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
 [email protected]
 # 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/[email protected]

+ 1 - 1
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

+ 3 - 3
sdk/jme3-cinematics/nbproject/project.xml

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

+ 2 - 2
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
 [email protected]
 # 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/[email protected]

+ 1 - 1
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

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

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

+ 1 - 1
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

+ 4 - 4
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
[email protected]0.1
[email protected]6.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/[email protected]0.1
+nbproject/[email protected]6.1

+ 1 - 1
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

+ 8 - 8
sdk/jme3-core-baselibs/nbproject/project.xml

@@ -1,18 +1,18 @@
-<?xml version='1.0'?>
-<project xmlns='http://www.netbeans.org/ns/project/1'>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
   <type>org.netbeans.modules.apisupport.project</type>
   <configuration>
-    <data xmlns='http://www.netbeans.org/ns/nb-module-project/3'>
+    <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
       <code-name-base>com.jme3.gde.core.baselibs</code-name-base>
-      <suite-component />
+      <suite-component/>
       <module-dependencies>
         <dependency>
           <code-name-base>com.jme3.gde.core.libraries</code-name-base>
-          <build-prerequisite />
-          <compile-dependency />
+          <build-prerequisite/>
+          <compile-dependency/>
           <run-dependency>
             <release-version>1</release-version>
-            <specification-version>3.0.0</specification-version>
+            <specification-version>3.0.10</specification-version>
           </run-dependency>
         </dependency>
       </module-dependencies>
@@ -187,4 +187,4 @@
       </class-path-extension>
     </data>
   </configuration>
-</project>
+</project>

+ 1 - 1
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

+ 1 - 1
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

+ 4 - 4
sdk/jme3-core/nbproject/project.xml

@@ -12,7 +12,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>3.0.0</specification-version>
+                        <specification-version>3.0.10</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -21,13 +21,13 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>3.0.0</specification-version>
+                        <specification-version>3.0.10</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
                     <code-name-base>com.jme3.gde.core.updatecenters</code-name-base>
                     <run-dependency>
-                        <specification-version>3.0.0</specification-version>
+                        <specification-version>3.0.10</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -35,7 +35,7 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>3.0.0</specification-version>
+                        <specification-version>3.0.10</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

+ 1 - 1
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

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

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

BIN
sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/macapp-data.zip


BIN
sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/winapp-data.zip


+ 1 - 1
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

+ 1 - 1
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

+ 1 - 0
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
 

+ 2 - 2
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
 [email protected]
 # 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/[email protected]

+ 5 - 5
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

+ 29 - 2
sdk/jme3-gui/nbproject/project.xml

@@ -33,6 +33,15 @@
                         <specification-version>1.36.1</specification-version>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.netbeans.api.progress</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <specification-version>1.32.1</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.core.multiview</code-name-base>
                     <build-prerequisite/>
@@ -42,6 +51,15 @@
                         <specification-version>1.32.1</specification-version>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <specification-version>1.29.1</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.modules.java.project</code-name-base>
                     <build-prerequisite/>
@@ -69,6 +87,15 @@
                         <implementation-version/>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.netbeans.spi.navigator</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <specification-version>1.27.1</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.spi.palette</code-name-base>
                     <build-prerequisite/>
@@ -167,8 +194,8 @@
                 <binary-origin>release/modules/ext/swingtonifty.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/Nifty-Editor0.5.7.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/Nifty-Editor0.5.7.jar</binary-origin>
+                <runtime-relative-path>ext/Nifty-Editor0.5.9.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/Nifty-Editor0.5.9.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>

BIN
sdk/jme3-gui/release/modules/ext/Nifty-Editor0.5.9.jar


+ 1 - 1
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

+ 9 - 9
sdk/jme3-gui/src/com/jme3/gde/gui/EmptyNiftyGui.xml

@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<nifty xmlns="http://nifty-gui.sourceforge.net/nifty-1.3.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://nifty-gui.sourceforge.net/nifty-1.3.xsd http://nifty-gui.sourceforge.net/nifty-1.3.xsd">
-  <!-- +++++++++++++++++++++++++++++++++++++++ -->
-  <!-- start screen -->
-  <!-- +++++++++++++++++++++++++++++++++++++++ -->
-  <screen id="GScreen0" controller="mygame.Main">
-    <layer id="GLayer0" childLayout="absolute">
-    </layer>
-  </screen>
+<?xml version="1.0" encoding="UTF-8"?>
+<nifty xmlns="http://nifty-gui.sourceforge.net/nifty-1.3.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://nifty-gui.sourceforge.net/nifty-1.3.xsd http://nifty-gui.sourceforge.net/nifty-1.3.xsd">
+  <!-- +++++++++++++++++++++++++++++++++++++++ -->
+  <!-- start screen -->
+  <!-- +++++++++++++++++++++++++++++++++++++++ -->
+  <screen id="GScreen0" controller="mygame.Main">
+    <layer id="GLayer0" childLayout="absolute">
+    </layer>
+  </screen>
 </nifty>

+ 28 - 0
sdk/jme3-gui/src/com/jme3/gde/gui/Navigator.form

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<Form version="1.3" maxVersion="1.8" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
+  <AuxValues>
+    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
+    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
+    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
+    <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
+    <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
+  </AuxValues>
+
+  <Layout>
+    <DimensionLayout dim="0">
+      <Group type="103" groupAlignment="0" attributes="0">
+          <EmptySpace min="0" pref="244" max="32767" attributes="0"/>
+      </Group>
+    </DimensionLayout>
+    <DimensionLayout dim="1">
+      <Group type="103" groupAlignment="0" attributes="0">
+          <EmptySpace min="0" pref="274" max="32767" attributes="0"/>
+      </Group>
+    </DimensionLayout>
+  </Layout>
+</Form>

+ 191 - 0
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
+ */
[email protected](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")
+    // <editor-fold defaultstate="collapsed" desc="Generated Code">//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)
+        );
+    }// </editor-fold>//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<String> path = new ArrayList<String>();
+           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);
+    }
+}

+ 4 - 1
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;
     }
 }

+ 74 - 5
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<GLayer> layers1 = this.editor.getGui().getLayers();
             DefaultComboBoxModel<GLayer> model = new DefaultComboBoxModel<GLayer>(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<GLayer> layers1 = this.editor.getGui().getLayers();
             DefaultComboBoxModel<GLayer> model = new DefaultComboBoxModel<GLayer>(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<String> path = new ArrayList<String>();
+           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);
+            }
+       }
+    }
 }

+ 10 - 0
sdk/jme3-gui/src/com/jme3/gde/gui/layer.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
+<filesystem>
+<folder name="NiftyPalette">
+    <folder name="Items">
+         <file name="Screen" url="com/jme3/gde/gui/palette/Screen.xml">
+        </file>
+    </folder>
+</folder>
+</filesystem>

+ 34 - 0
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<GElement> implements Observer{
+    private final GElement parent;
+     
+    public GElementChildFactory(GElement parent) {
+        this.parent = parent;
+        this.parent.addObserver(this);
+    
+    }
+    @Override
+    protected boolean createKeys(List<GElement> 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);
+    }
+}

+ 97 - 0
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<String,String> 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();
+        }
+    };
+}

+ 36 - 0
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.
+    }
+    
+    
+}

+ 31 - 0
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<GElement> {
+    private final GUI gui;
+    
+    public ScreenChildFactory(GUI gui){
+        this.gui = gui;
+        
+    }
+    @Override
+    protected boolean createKeys(List<GElement> list) {
+        list.addAll(gui.getScreens());
+        return true;
+    }
+
+    @Override
+    protected Node createNodeForKey(GElement screen) {
+        return new GElementNode(screen);
+    }
+}

+ 48 - 0
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<ElementFilter> {
+
+    @Override
+    protected boolean createKeys(List<ElementFilter> 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());
+        }
+    }
+    
+    
+}

+ 28 - 0
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<Class>{
+    private final String name;
+
+    public ElementFilter(String name) {
+        this.name = name;
+    }
+
+    /**
+     * @return the name
+     */
+    public String getName() {
+        return name;
+    }
+    
+    
+}

+ 26 - 9
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);
+        }
+    }
     
 }

+ 1 - 2
sdk/jme3-gui/src/com/jme3/gde/gui/palette/Screen.xml

@@ -11,7 +11,6 @@
 
     <inline-description>
        <display-name>Screen</display-name>
-       <tooltip>light source (ambient)</tooltip>
+       <tooltip>Nifty-gui Screen</tooltip>
     </inline-description>
-
 </editor_palette_item>

+ 55 - 0
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<Class>{
+    private final ElementFilter category;
+
+    WidgetChildFactory(ElementFilter category) {
+        this.category = category;
+       
+    }
+
+    @Override
+    protected boolean createKeys(List<Class> toPopulate) {
+        Set<Class<? extends GElement>> 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);
+    }
+   
+   
+
+   
+    
+}

+ 65 - 0
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<?extends GElement> clazz;
+    private static final String basePath="jada/ngeditor/resources";
+
+    public WidgetNode(Class<?extends GElement> 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);
+        }
+    }
+    
+    
+    
+    
+}

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

@@ -3,6 +3,6 @@ build.xml.script.CRC32=1ed5abd5
 [email protected]
 # 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/[email protected]

+ 1 - 1
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

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

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

BIN
sdk/jme3-lwjgl-applet/release/libs/applet-loader.zip


+ 2 - 2
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
 [email protected]
 # 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/[email protected]

+ 1 - 1
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

+ 3 - 3
sdk/jme3-materialeditor/nbproject/project.xml

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

+ 2 - 2
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
 [email protected]
 # 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/[email protected]

+ 1 - 1
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

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

@@ -11,7 +11,7 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>3.0.0</specification-version>
+                        <specification-version>3.0.10</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -20,7 +20,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>3.0.0</specification-version>
+                        <specification-version>3.0.10</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -29,7 +29,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>3.0.0</specification-version>
+                        <specification-version>3.0.10</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

+ 1 - 1
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

+ 2 - 2
sdk/jme3-navmesh-gen/nbproject/project.xml

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

+ 2 - 2
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
 [email protected]
 # 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/[email protected]

+ 1 - 1
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

+ 1 - 1
sdk/jme3-obfuscate/nbproject/project.xml

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

+ 1 - 1
sdk/jme3-ogretools/nbproject/genfiles.properties

@@ -3,6 +3,6 @@ build.xml.script.CRC32=6423eb2c
 [email protected]
 # 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/[email protected]

+ 1 - 1
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

+ 4 - 4
sdk/jme3-ogretools/nbproject/project.xml

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

BIN
sdk/jme3-ogretools/src/com/jme3/gde/ogretools/blender/scripts.zip


+ 2 - 2
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
 [email protected]
 # 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/[email protected]

+ 1 - 1
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

+ 3 - 3
sdk/jme3-ogrexml/nbproject/project.xml

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

+ 1 - 1
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

+ 27 - 0
sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-android.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE library PUBLIC "-//NetBeans//DTD Library Declaration 1.0//EN" "http://www.netbeans.org/dtds/library-declaration-1_0.dtd">
+<library version='1.0' encoding='UTF-8'>
+  <name>jme3-android</name>
+  <type>j2se</type>
+  <localizing-bundle>com.jme3.gde.project.baselibs.Bundle</localizing-bundle>
+  <volume>
+    <type>classpath</type>
+    <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jme3-android-3.0.10-pre-alpha-svn.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/android-4.1.1.4.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/commons-logging-1.1.1.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/httpclient-4.0.1.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/opengl-api-gl1.1-android-2.1_r1.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/xmlParserAPIs-2.6.2.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/xpp3-1.1.4c.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/json-20080701.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/httpcore-4.0.1.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/commons-codec-1.3.jar!/</resource>
+  </volume>
+  <volume>
+    <type>src</type>
+    <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jme3-android-3.0.10-pre-alpha-svn-sources.jar!/</resource>
+  </volume>
+  <volume>
+    <type>javadoc</type>
+  </volume>
+</library>

+ 18 - 0
sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-bullet.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE library PUBLIC "-//NetBeans//DTD Library Declaration 1.0//EN" "http://www.netbeans.org/dtds/library-declaration-1_0.dtd">
+<library version='1.0' encoding='UTF-8'>
+  <name>jme3-bullet</name>
+  <type>j2se</type>
+  <localizing-bundle>com.jme3.gde.project.baselibs.Bundle</localizing-bundle>
+  <volume>
+    <type>classpath</type>
+    <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jme3-bullet-3.0.10-pre-alpha-svn.jar!/</resource>
+  </volume>
+  <volume>
+    <type>src</type>
+    <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jme3-bullet-3.0.10-pre-alpha-svn-sources.jar!/</resource>
+  </volume>
+  <volume>
+    <type>javadoc</type>
+  </volume>
+</library>

+ 18 - 0
sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-ios.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE library PUBLIC "-//NetBeans//DTD Library Declaration 1.0//EN" "http://www.netbeans.org/dtds/library-declaration-1_0.dtd">
+<library version='1.0' encoding='UTF-8'>
+  <name>jme3-ios</name>
+  <type>j2se</type>
+  <localizing-bundle>com.jme3.gde.project.baselibs.Bundle</localizing-bundle>
+  <volume>
+    <type>classpath</type>
+    <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jme3-ios-3.0.10-pre-alpha-svn.jar!/</resource>
+  </volume>
+  <volume>
+    <type>src</type>
+    <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jme3-ios-3.0.10-pre-alpha-svn-sources.jar!/</resource>
+  </volume>
+  <volume>
+    <type>javadoc</type>
+  </volume>
+</library>

+ 54 - 0
sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-jogl.xml

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE library PUBLIC "-//NetBeans//DTD Library Declaration 1.0//EN" "http://www.netbeans.org/dtds/library-declaration-1_0.dtd">
+<library version='1.0' encoding='UTF-8'>
+  <name>jme3-jogl</name>
+  <type>j2se</type>
+  <localizing-bundle>com.jme3.gde.project.baselibs.Bundle</localizing-bundle>
+  <volume>
+    <type>classpath</type>
+    <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jme3-jogl-3.0.10-pre-alpha-svn.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-main-2.1.4.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-main-2.1.4.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/joal-main-2.1.4.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4-natives-android-armv6.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4-natives-linux-amd64.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4-natives-linux-armv6.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4-natives-linux-armv6hf.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4-natives-linux-i586.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4-natives-macosx-universal.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4-natives-solaris-amd64.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4-natives-solaris-i586.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4-natives-windows-amd64.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4-natives-windows-i586.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4-natives-android-armv6.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4-natives-linux-amd64.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4-natives-linux-armv6.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4-natives-linux-armv6hf.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4-natives-linux-i586.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4-natives-macosx-universal.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4-natives-solaris-amd64.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4-natives-solaris-i586.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4-natives-windows-amd64.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4-natives-windows-i586.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4-natives-android-armv6.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4-natives-linux-amd64.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4-natives-linux-armv6.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4-natives-linux-armv6hf.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4-natives-linux-i586.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4-natives-macosx-universal.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4-natives-solaris-amd64.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4-natives-solaris-i586.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4-natives-windows-amd64.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4-natives-windows-i586.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4.jar!/</resource>
+  </volume>
+  <volume>
+    <type>src</type>
+    <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jme3-jogl-3.0.10-pre-alpha-svn-sources.jar!/</resource>
+  </volume>
+  <volume>
+    <type>javadoc</type>
+  </volume>
+</library>

+ 4 - 0
sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/layer.xml

@@ -14,6 +14,10 @@
       <file name='jme3-niftygui.xml' url='jme3-niftygui.xml' />
       <file name='jme3-plugins.xml' url='jme3-plugins.xml' />
       <file name='jme3-terrain.xml' url='jme3-terrain.xml' />
+      <file name='jme3-bullet.xml' url='jme3-bullet.xml' />
+      <file name='jme3-jogl.xml' url='jme3-jogl.xml' />
+      <file name='jme3-android.xml' url='jme3-android.xml' />
+      <file name='jme3-ios.xml' url='jme3-ios.xml' />
     </folder>
   </folder>
 </filesystem>

+ 1 - 1
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

+ 1 - 1
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

+ 2 - 2
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
 [email protected]
 # 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/[email protected]

+ 1 - 1
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

+ 4 - 4
sdk/jme3-scenecomposer/nbproject/project.xml

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

+ 1 - 1
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

+ 2 - 2
sdk/jme3-templates/nbproject/project.xml

@@ -10,14 +10,14 @@
                     <code-name-base>com.jme3.gde.project.baselibs</code-name-base>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>3.0.0</specification-version>
+                        <specification-version>3.0.10</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
                     <code-name-base>com.jme3.gde.project.libraries</code-name-base>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>3.0.0</specification-version>
+                        <specification-version>3.0.10</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

BIN
sdk/jme3-templates/src/com/jme3/gde/templates/BasicGameProject.zip


+ 2 - 2
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
 [email protected]
 # 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/[email protected]

+ 1 - 1
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

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

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

+ 1 - 1
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

+ 1 - 1
sdk/jme3-tests-template/nbproject/project.xml

@@ -10,7 +10,7 @@
                     <code-name-base>com.jme3.gde.project.testdata</code-name-base>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>3.0.0</specification-version>
+                        <specification-version>3.0.10</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

+ 1 - 1
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

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików