From eed0a864f0d2df818e6704add2e0d16473fa1d77 Mon Sep 17 00:00:00 2001 From: "sha..rd" Date: Sat, 11 Jun 2011 02:32:32 +0000 Subject: [PATCH] * Fixed crash in TestNiftyGui by moving hellojme.xml to test-data git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7573 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- .../plugins/ogre}/MeshAnimationLoader.java | 2 +- .../test/jme3test/niftygui/TestNiftyGui.java | 7 ++++--- engine/src/test/jme3test/niftygui/hellojme.xml | 18 ------------------ 3 files changed, 5 insertions(+), 22 deletions(-) rename engine/src/{core/com/jme3/animation => ogre/com/jme3/scene/plugins/ogre}/MeshAnimationLoader.java (99%) delete mode 100644 engine/src/test/jme3test/niftygui/hellojme.xml diff --git a/engine/src/core/com/jme3/animation/MeshAnimationLoader.java b/engine/src/ogre/com/jme3/scene/plugins/ogre/MeshAnimationLoader.java similarity index 99% rename from engine/src/core/com/jme3/animation/MeshAnimationLoader.java rename to engine/src/ogre/com/jme3/scene/plugins/ogre/MeshAnimationLoader.java index 354430d04..75ff86579 100644 --- a/engine/src/core/com/jme3/animation/MeshAnimationLoader.java +++ b/engine/src/ogre/com/jme3/scene/plugins/ogre/MeshAnimationLoader.java @@ -30,7 +30,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package com.jme3.animation; +package com.jme3.scene.plugins.ogre; //import static com.jmex.model.XMLUtil.getAttribute; //import static com.jmex.model.XMLUtil.getIntAttribute; diff --git a/engine/src/test/jme3test/niftygui/TestNiftyGui.java b/engine/src/test/jme3test/niftygui/TestNiftyGui.java index c9ce879b7..f024a8cae 100644 --- a/engine/src/test/jme3test/niftygui/TestNiftyGui.java +++ b/engine/src/test/jme3test/niftygui/TestNiftyGui.java @@ -41,8 +41,7 @@ import com.jme3.scene.shape.Box; import de.lessvoid.nifty.Nifty; import de.lessvoid.nifty.screen.Screen; import de.lessvoid.nifty.screen.ScreenController; -import java.util.logging.Level; -import java.util.logging.Logger; +import java.net.URL; public class TestNiftyGui extends SimpleApplication implements ScreenController { @@ -68,7 +67,9 @@ public class TestNiftyGui extends SimpleApplication implements ScreenController guiViewPort); nifty = niftyDisplay.getNifty(); - nifty.fromXml("Tests/hellojme.xml", "start", this); + URL url = Thread.currentThread().getContextClassLoader().getResource("jme3test/niftygui/hellojme.xml"); + + nifty.fromXml("Interface/Nifty/HelloJme.xml", "start", this); // attach the nifty display to the gui view port as a processor guiViewPort.addProcessor(niftyDisplay); diff --git a/engine/src/test/jme3test/niftygui/hellojme.xml b/engine/src/test/jme3test/niftygui/hellojme.xml deleted file mode 100644 index c945de6e2..000000000 --- a/engine/src/test/jme3test/niftygui/hellojme.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - -