From 7d09cafa7198b7f3187b04b91864c7fc7670e394 Mon Sep 17 00:00:00 2001 From: "nor..67" Date: Mon, 11 Apr 2011 23:43:15 +0000 Subject: [PATCH] - fix dependency issues git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7233 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- sdk/jme3-code-check/nbproject/genfiles.properties | 4 ++-- sdk/jme3-code-check/nbproject/project.xml | 6 +++--- sdk/jme3-core-baselibs/nbproject/genfiles.properties | 4 ++-- sdk/jme3-core-baselibs/nbproject/project.xml | 7 ++++++- sdk/jme3-core-libraries/nbproject/project.xml | 6 ++++++ .../com/jme3/gde/materials/EditableMaterialFile.java | 11 ++++++----- 6 files changed, 25 insertions(+), 13 deletions(-) diff --git a/sdk/jme3-code-check/nbproject/genfiles.properties b/sdk/jme3-code-check/nbproject/genfiles.properties index b0278d135..ed4b9c0cd 100644 --- a/sdk/jme3-code-check/nbproject/genfiles.properties +++ b/sdk/jme3-code-check/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=9d32300f +build.xml.data.CRC32=6f1a60ee build.xml.script.CRC32=a481f885 build.xml.stylesheet.CRC32=a56c6a5b@1.42.2 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=9d32300f +nbproject/build-impl.xml.data.CRC32=6f1a60ee nbproject/build-impl.xml.script.CRC32=0691bb76 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.42.2 diff --git a/sdk/jme3-code-check/nbproject/project.xml b/sdk/jme3-code-check/nbproject/project.xml index 4a1b7770a..44daf8669 100644 --- a/sdk/jme3-code-check/nbproject/project.xml +++ b/sdk/jme3-code-check/nbproject/project.xml @@ -38,7 +38,7 @@ 3 - 1.50.1.3.10.2 + 1.56.0.5.13.8 @@ -72,8 +72,8 @@ - 0 - + 0-1 + 1.17.0.7.8 diff --git a/sdk/jme3-core-baselibs/nbproject/genfiles.properties b/sdk/jme3-core-baselibs/nbproject/genfiles.properties index 7a951c614..eb167e31a 100644 --- a/sdk/jme3-core-baselibs/nbproject/genfiles.properties +++ b/sdk/jme3-core-baselibs/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=f8e0e6a8 +build.xml.data.CRC32=e2184cca build.xml.script.CRC32=cdae6a36 build.xml.stylesheet.CRC32=a56c6a5b@1.42.2 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=f8e0e6a8 +nbproject/build-impl.xml.data.CRC32=e2184cca nbproject/build-impl.xml.script.CRC32=246f9b81 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.42.2 diff --git a/sdk/jme3-core-baselibs/nbproject/project.xml b/sdk/jme3-core-baselibs/nbproject/project.xml index 79694c2d3..ad2a0b67d 100644 --- a/sdk/jme3-core-baselibs/nbproject/project.xml +++ b/sdk/jme3-core-baselibs/nbproject/project.xml @@ -17,6 +17,7 @@ + checkers.quals com.jme3.animation com.jme3.app com.jme3.app.state @@ -34,7 +35,6 @@ com.jme3.bullet.control com.jme3.bullet.joints com.jme3.bullet.joints.motors - com.jme3.bullet.nodes com.jme3.bullet.objects com.jme3.bullet.objects.infos com.jme3.bullet.util @@ -58,8 +58,13 @@ com.jme3.material com.jme3.material.plugins com.jme3.math + com.jme3.network + com.jme3.network.base com.jme3.network.connection com.jme3.network.events + com.jme3.network.kernel + com.jme3.network.kernel.tcp + com.jme3.network.kernel.udp com.jme3.network.message com.jme3.network.queue com.jme3.network.rmi diff --git a/sdk/jme3-core-libraries/nbproject/project.xml b/sdk/jme3-core-libraries/nbproject/project.xml index d091dd3ca..7d82d7229 100644 --- a/sdk/jme3-core-libraries/nbproject/project.xml +++ b/sdk/jme3-core-libraries/nbproject/project.xml @@ -60,6 +60,7 @@ de.lessvoid.nifty.effects de.lessvoid.nifty.effects.impl de.lessvoid.nifty.elements + de.lessvoid.nifty.elements.events de.lessvoid.nifty.elements.render de.lessvoid.nifty.elements.tools de.lessvoid.nifty.input @@ -77,6 +78,9 @@ de.lessvoid.nifty.loaderv2.types.resolver.style de.lessvoid.nifty.nulldevice de.lessvoid.nifty.render + de.lessvoid.nifty.render.image + de.lessvoid.nifty.render.image.areaprovider + de.lessvoid.nifty.render.image.renderstrategy de.lessvoid.nifty.screen de.lessvoid.nifty.sound de.lessvoid.nifty.spi.input @@ -105,6 +109,8 @@ org.lwjgl org.lwjgl.input org.lwjgl.openal + org.lwjgl.opencl + org.lwjgl.opencl.api org.lwjgl.opengl org.xmlpull.mxp1 org.xmlpull.mxp1_serializer diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/EditableMaterialFile.java b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/EditableMaterialFile.java index c743d10d8..a5bca208a 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/EditableMaterialFile.java +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/EditableMaterialFile.java @@ -140,7 +140,7 @@ public class EditableMaterialFile { } } } - parseMatDef(); + checkWithMatDef(); } catch (IOException ex) { Exceptions.printStackTrace(ex); } @@ -189,10 +189,11 @@ public class EditableMaterialFile { } /** - * finds and loads the matdef file either from project or from base jme + * Finds and loads the matdef file either from project or from base jme, + * then applies the parameter values to the material parameter entries. * @param line */ - private void parseMatDef() { + private void checkWithMatDef() { //load matdef matDefEntries.clear(); boolean params = false; @@ -480,7 +481,7 @@ public class EditableMaterialFile { additionalRenderStates.put("Blend", new MaterialProperty("BlendMode", "Blend", mat.getAdditionalRenderState().getBlendMode().name())); additionalRenderStates.put("AlphaTestFalloff", new MaterialProperty("Float", "AlphaTestFalloff", mat.getAdditionalRenderState().getAlphaFallOff() + "")); additionalRenderStates.put("PolyOffset", new MaterialProperty("Float,Float", "PolyOffset", mat.getAdditionalRenderState().getPolyOffsetUnits() + " " + mat.getAdditionalRenderState().getPolyOffsetFactor())); - parseMatDef(); + checkWithMatDef(); setAsText(getUpdatedContent()); } @@ -498,7 +499,7 @@ public class EditableMaterialFile { this.matDefName = matDefName; assert (matDefName != null); initMatDef(); - parseMatDef(); + checkWithMatDef(); } public String getMaterialPath() {