patch without 'if' statement
Index: src/com/jmex/audio/openal/OpenALMemoryAudioPlayer.java
===================================================================
--- src/com/jmex/audio/openal/OpenALMemoryAudioPlayer.java (revision 4291)
+++ src/com/jmex/audio/openal/OpenALMemoryAudioPlayer.java (working copy)
@@ -32,6 +32,7 @@
package com.jmex.audio.openal;
+import java.util.logging.Level;
import java.util.logging.Logger;
import org.lwjgl.openal.AL10;
@@ -138,7 +139,7 @@
protected void check() {
int error = AL10.alGetError();
if (error != AL10.AL_NO_ERROR) {
- logger.info("OpenAL error was raised. errorCode=" + error);
+ logger.log(Level.INFO, "OpenAL error was raised. errorCode={0}", error);
}
}
Index: src/com/jmex/audio/openal/OpenALSystem.java
===================================================================
--- src/com/jmex/audio/openal/OpenALSystem.java (revision 4291)
+++ src/com/jmex/audio/openal/OpenALSystem.java (working copy)
@@ -95,7 +95,7 @@
} catch (OpenALException e) {
MAX_SOURCES = sourcePool.size();
}
- logger.info("max source channels: " + MAX_SOURCES);
+ logger.log(Level.INFO, "max source channels: {0}", MAX_SOURCES);
}
@Override
@@ -210,7 +210,7 @@
public OpenALAudioTrack createAudioTrack(String resourceStr, boolean stream) {
URL resource = ResourceLocatorTool.locateResource(ResourceLocatorTool.TYPE_AUDIO, resourceStr);
if (resource == null) {
- logger.warning("Could not locate audio file: "+resourceStr);
+ logger.log(Level.WARNING, "Could not locate audio file: {0}", resourceStr);
return null;
}
return createAudioTrack(resource, stream);
Index: src/com/jmex/audio/RangedAudioTracker.java
===================================================================
--- src/com/jmex/audio/RangedAudioTracker.java (revision 4291)
+++ src/com/jmex/audio/RangedAudioTracker.java (working copy)
@@ -32,6 +32,7 @@
package com.jmex.audio;
+import java.util.logging.Level;
import java.util.logging.Logger;
import com.jme.math.FastMath;
@@ -115,15 +116,15 @@
q.addTrack(getAudioTrack());
if (shouldPlay && !(q.isPlaying() && q.getCurrentTrack() == getAudioTrack())) {
- logger.info("I should start playing music: "
- + getAudioTrack().getResource());
+ logger.log(Level.INFO, "I should start playing music: {0}",
+ getAudioTrack().getResource());
q.setCurrentTrack(getAudioTrack());
} else if (shouldStop) {
// already fading! Probably coming in or out. Ignore.
if (getAudioTrack().getTargetVolume() != getAudioTrack().getVolume()) break;
- logger.info("I should stop playing music: "
- + getAudioTrack().getResource());
+ logger.log(Level.INFO, "I should stop playing music: {0}",
+ getAudioTrack().getResource());
if (q.getCurrentTrack() == getAudioTrack())
q.setCurrentTrack(-1);
else
Index: src/com/jme/renderer/lwjgl/LWJGLRenderer.java
===================================================================
--- src/com/jme/renderer/lwjgl/LWJGLRenderer.java (revision 4291)
+++ src/com/jme/renderer/lwjgl/LWJGLRenderer.java (working copy)
@@ -40,6 +40,7 @@
import java.nio.FloatBuffer;
import java.nio.IntBuffer;
import java.util.Arrays;
+import java.util.logging.Level;
import java.util.logging.Logger;
import javax.imageio.ImageIO;
@@ -186,8 +187,8 @@
this.width = width;
this.height = height;
- logger.info( "LWJGLRenderer created. W: " + width + "H: " + height +
- "tVersion: " + org.lwjgl.Sys.getVersion() );
+ logger.log(Level.INFO, "LWJGLRenderer created. W: {0} H: {1}tVersion: {2}"
+ , new Object[] {width, height, org.lwjgl.Sys.getVersion()} );
capabilities = GLContext.getCapabilities();
@@ -628,7 +629,7 @@
throw new JmeException("Screenshot filename cannot be null");
}
File out = new File(filename + ".png");
- logger.info("Taking screenshot: " + out.getAbsolutePath() );
+ logger.log(Level.INFO, "Taking screenshot: {0}", out.getAbsolutePath());
// Create a pointer to the image info and create a buffered image to
// hold it.
@@ -997,8 +998,8 @@
// cards.
IntBuffer indices = tris.getIndexBuffer();
if (indices == null) {
- logger.severe("missing indices on geometry object: "
- + tris.toString());
+ logger.log(Level.SEVERE, "missing indices on geometry object: {0}",
+ tris.toString());
} else {
indices.rewind();
indices.limit(tris.getMaxIndex());
Index: src/com/jme/renderer/lwjgl/LWJGLTextureRenderer.java
===================================================================
--- src/com/jme/renderer/lwjgl/LWJGLTextureRenderer.java (revision 4291)
+++ src/com/jme/renderer/lwjgl/LWJGLTextureRenderer.java (working copy)
@@ -147,14 +147,14 @@
}
}
- logger.fine("Creating FBO sized: "+width+" x "+height);
+ logger.log(Level.FINE, "Creating FBO sized: {0} x {1}", new Integer[] {width, height});
IntBuffer buffer = BufferUtils.createIntBuffer(1);
EXTFramebufferObject.glGenFramebuffersEXT(buffer); // generate id
fboID = buffer.get(0);
if (fboID <= 0) {
- logger.severe("Invalid FBO id returned! " + fboID);
+ logger.log(Level.SEVERE, "Invalid FBO id returned! {0}", fboID);
isSupported = false;
return;
}
@@ -485,8 +485,8 @@
LWJGLTextureState.applyFilter(tex, texRecord, 0, record);
LWJGLTextureState.applyWrap(tex, texRecord, 0, record);
- logger.info("setup fbo tex with id " + tex.getTextureId() + ": " + width
- + "," + height);
+ logger.log(Level.INFO, "setup fbo tex with id {0}: {1},{2}",
+ new Integer[] {tex.getTextureId(), width, height});
}
/**
Index: src/com/jme/util/stat/StatCollector.java
===================================================================
--- src/com/jme/util/stat/StatCollector.java (revision 4291)
+++ src/com/jme/util/stat/StatCollector.java (working copy)
@@ -41,6 +41,7 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Stack;
+import java.util.logging.Level;
import java.util.logging.Logger;
import com.jme.util.NanoTimer;
@@ -179,7 +180,7 @@
// Pop until we find our stat type
while (!top.equals(type)) {
- logger.warning("Mismatched endStat, found "+top+". Expected '"+type+"'");
+ logger.log(Level.WARNING, "Mismatched endStat, found {0}. Expected '{1}'", new StatType[] {top, type});
top = timeStatStack.pop();
}
}
Index: src/com/jme/util/resource/ResourceLocatorTool.java
===================================================================
--- src/com/jme/util/resource/ResourceLocatorTool.java (revision 4291)
+++ src/com/jme/util/resource/ResourceLocatorTool.java (working copy)
@@ -83,7 +83,7 @@
"locateResource(String, String)", e.getMessage(), e);
}
- logger.warning("Unable to locate: "+resourceName);
+ logger.log(Level.WARNING, "Unable to locate: {0}", resourceName);
return null;
}
}
Index: src/com/jme/animation/TextureKeyframeController.java
===================================================================
--- src/com/jme/animation/TextureKeyframeController.java (revision 4291)
+++ src/com/jme/animation/TextureKeyframeController.java (working copy)
@@ -32,6 +32,7 @@
package com.jme.animation;
import java.io.IOException;
+import java.util.logging.Level;
import java.util.logging.Logger;
import com.jme.image.Texture;
@@ -83,9 +84,9 @@
public void addData(float[] times, Matrix4f[] transforms, int[] interp) {
if(times.length != transforms.length) {
- logger.warning("Invalid texture keyframe information."
+ logger.log(Level.WARNING, "Invalid texture keyframe information."
+ " Times and transforms are not of same length."
- + " [" + times.length + " != " + transforms.length);
+ + " [{0} != {1}", new Integer[] {times.length, transforms.length});
return;
}
Index: src/com/jme/animation/BoneAnimation.java
===================================================================
--- src/com/jme/animation/BoneAnimation.java (revision 4291)
+++ src/com/jme/animation/BoneAnimation.java (working copy)
@@ -39,6 +39,7 @@
import java.util.Arrays;
import java.util.HashMap;
import java.util.Set;
+import java.util.logging.Level;
import java.util.logging.Logger;
import com.jme.scene.Controller;
@@ -281,9 +282,9 @@
}
if (keyframeTime != null) {
if (frame >= keyframeTime.length + 1 || frame < 0) {
- logger.severe(name + ": Invalid frame index (" + frame
- + "). Intialized to only " + "have: "
- + keyframeTime.length + " keyframes.");
+ logger.log(Level.SEVERE, "{0}: Invalid frame index ({1}). "
+ + "Intialized to only " + "have: {2} keyframes."
+ , new Object[] {name, frame, keyframeTime.length});
return;
}
// because we interpolate we are working towards the current frame.
@@ -708,9 +709,9 @@
*/
public void setEndFrame(int endFrame) {
if (endFrame >= keyframeTime.length || endFrame < 0) {
- logger.severe("Invalid endframe index (" + endFrame
- + "). Intialized to only " + "have: " + keyframeTime.length
- + " keyframes.");
+ logger.log(Level.SEVERE, "Invalid endframe index ({0}"
+ + "). Intialized to only " + "have: {1}"
+ + " keyframes.", new Integer[]{endFrame,keyframeTime.length} );
return;
}
this.endFrame = endFrame;
@@ -740,9 +741,9 @@
*/
public void setStartFrame(int startFrame) {
if (startFrame >= keyframeTime.length || startFrame < 0) {
- logger.severe("Invalid endframe index (" + startFrame
- + "). Intialized to only " + "have: " + keyframeTime.length
- + " keyframes.");
+ logger.log(Level.SEVERE, "Invalid endframe index ({0}"
+ + "). Intialized to only " + "have: {1}"
+ + " keyframes.", new Integer[]{startFrame, keyframeTime.length});
return;
}
this.startFrame = startFrame;
@@ -1051,9 +1052,8 @@
}
}
if (iType != BoneAnimation.LINEAR) {
- logger.warning("Unsupported interpolation type specified for "
- + "at " + "least one frame: " + iType
- + ". Continuing with specified type.");
+ logger.log(Level.WARNING, "Unsupported interpolation type specified for "
+ + "at least one frame: {0}. Continuing with specified type.", iType);
}
}
}