From 75112201db3267b43a4a446b935e61dd3954fb5c Mon Sep 17 00:00:00 2001 From: Stephen Gold Date: Sat, 9 Mar 2019 12:04:43 -0800 Subject: [PATCH] more corrections in diagnostic messages --- jme3-core/src/main/java/com/jme3/audio/AudioNode.java | 2 +- .../java/com/jme3/export/binary/BinaryInputCapsule.java | 4 ++-- .../java/com/jme3/system/lwjgl/LwjglAbstractDisplay.java | 2 +- .../main/java/com/jme3/network/base/KernelAdapter.java | 4 ++-- .../com/jme3/network/util/AbstractMessageDelegator.java | 8 ++++---- .../gltf/java/com/jme3/scene/plugins/gltf/GltfLoader.java | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/jme3-core/src/main/java/com/jme3/audio/AudioNode.java b/jme3-core/src/main/java/com/jme3/audio/AudioNode.java index 393d1ff1e..becc7fa19 100644 --- a/jme3-core/src/main/java/com/jme3/audio/AudioNode.java +++ b/jme3-core/src/main/java/com/jme3/audio/AudioNode.java @@ -299,7 +299,7 @@ public class AudioNode extends Node implements AudioSource { */ public void setAudioData(AudioData audioData, AudioKey audioKey) { if (data != null) { - throw new IllegalStateException("Cannot change data once its set"); + throw new IllegalStateException("Cannot change data once it's set"); } data = audioData; diff --git a/jme3-core/src/plugins/java/com/jme3/export/binary/BinaryInputCapsule.java b/jme3-core/src/plugins/java/com/jme3/export/binary/BinaryInputCapsule.java index cca304a3b..121688714 100644 --- a/jme3-core/src/plugins/java/com/jme3/export/binary/BinaryInputCapsule.java +++ b/jme3-core/src/plugins/java/com/jme3/export/binary/BinaryInputCapsule.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2019 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -1073,7 +1073,7 @@ final class BinaryInputCapsule implements InputCapsule { else { logger.log( Level.WARNING, - "Your export has been saved with an incorrect encoding for it's String fields which means it might not load correctly " + + "Your export has been saved with an incorrect encoding for its String fields which means it might not load correctly " + "due to encoding issues. You should probably re-export your work. See ISSUE 276 in the jME issue tracker." ); // We use ISO8859_1 to be consistent across platforms. We could default to native encoding, but this would lead to inconsistent diff --git a/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglAbstractDisplay.java b/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglAbstractDisplay.java index 9dda062ba..528c788ea 100644 --- a/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglAbstractDisplay.java +++ b/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglAbstractDisplay.java @@ -203,7 +203,7 @@ public abstract class LwjglAbstractDisplay extends LwjglContext implements Runna public void run(){ if (listener == null) { throw new IllegalStateException("SystemListener is not set on context!" - + "Must set with JmeContext.setSystemListner()."); + + "Must set with JmeContext.setSystemListener()."); } loadNatives(); diff --git a/jme3-networking/src/main/java/com/jme3/network/base/KernelAdapter.java b/jme3-networking/src/main/java/com/jme3/network/base/KernelAdapter.java index 0cddbdd24..f3a9965e2 100644 --- a/jme3-networking/src/main/java/com/jme3/network/base/KernelAdapter.java +++ b/jme3-networking/src/main/java/com/jme3/network/base/KernelAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2019 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -180,7 +180,7 @@ public class KernelAdapter extends Thread if( reliable ) { // If it's a reliable connection then it's slightly more // concerning but this can happen all the time for a UDP endpoint. - log.log( Level.WARNING, "Recieved message from unconnected endpoint:" + p + " message:" + m ); + log.log( Level.WARNING, "Received message from unconnected endpoint:" + p + " message:" + m ); } return; } diff --git a/jme3-networking/src/main/java/com/jme3/network/util/AbstractMessageDelegator.java b/jme3-networking/src/main/java/com/jme3/network/util/AbstractMessageDelegator.java index f8b1be2f5..b5d7a9efe 100644 --- a/jme3-networking/src/main/java/com/jme3/network/util/AbstractMessageDelegator.java +++ b/jme3-networking/src/main/java/com/jme3/network/util/AbstractMessageDelegator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2018 jMonkeyEngine + * Copyright (c) 2015-2019 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -111,17 +111,17 @@ public abstract class AbstractMessageDelegator if( MessageConnection.class.isAssignableFrom(parms[0]) ) { messageIndex++; } else { - log.finest("First paramter is not a MessageConnection or subclass."); + log.finest("First parameter is not a MessageConnection or subclass."); return false; } } if( messageType == null && !Message.class.isAssignableFrom(parms[messageIndex]) ) { - log.finest("Second paramter is not a Message or subclass."); + log.finest("Second parameter is not a Message or subclass."); return false; } if( messageType != null && !parms[messageIndex].isAssignableFrom(messageType) ) { - log.log(Level.FINEST, "Second paramter is not a {0}", messageType); + log.log(Level.FINEST, "Second parameter is not a {0}", messageType); return false; } return true; diff --git a/jme3-plugins/src/gltf/java/com/jme3/scene/plugins/gltf/GltfLoader.java b/jme3-plugins/src/gltf/java/com/jme3/scene/plugins/gltf/GltfLoader.java index 1fe895a29..6c7372b6a 100644 --- a/jme3-plugins/src/gltf/java/com/jme3/scene/plugins/gltf/GltfLoader.java +++ b/jme3-plugins/src/gltf/java/com/jme3/scene/plugins/gltf/GltfLoader.java @@ -625,12 +625,12 @@ public class GltfLoader implements AssetLoader { for (int i = 0; i < cameras.size(); i++) { //Can't access resolution here... actually it's a shame we can't access settings from anywhere. - //users will have to call resize ont he camera. + //users will have to call resize on the camera. Camera cam = new Camera(1, 1); JsonObject camObj = cameras.get(i).getAsJsonObject(); String type = getAsString(camObj, "type"); - assertNotNull(type, "No type defined ofr camera"); + assertNotNull(type, "No type defined for camera"); JsonObject camData = camObj.getAsJsonObject(type); if (type.equals("perspective")) { float aspectRatio = getAsFloat(camData, "aspectRation", 1f); @@ -673,7 +673,7 @@ public class GltfLoader implements AssetLoader { return null; } Integer textureIndex = getAsInteger(texture, "index"); - assertNotNull(textureIndex, "Texture as no index"); + assertNotNull(textureIndex, "Texture has no index"); assertNotNull(textures, "There are no textures, yet one is referenced by a material"); JsonObject textureData = textures.get(textureIndex).getAsJsonObject();