From f33252f4d05f70adff70681f3236d8116e85a239 Mon Sep 17 00:00:00 2001 From: Stephen Gold Date: Sat, 2 Mar 2019 17:41:21 -0800 Subject: [PATCH] spelling corrections in diagnostic messages --- .../java/com/jme3/scene/plugins/blender/BlenderLoader.java | 4 ++-- .../jme3/scene/plugins/blender/file/BlenderInputStream.java | 6 +++--- .../java/com/jme3/scene/plugins/blender/meshes/Face.java | 2 +- jme3-core/src/main/java/com/jme3/anim/Armature.java | 2 +- .../src/main/java/com/jme3/asset/DesktopAssetManager.java | 6 +++--- .../src/main/java/com/jme3/renderer/opengl/GLRenderer.java | 2 +- .../src/main/java/com/jme3/renderer/opengl/TextureUtil.java | 4 ++-- .../plugins/java/com/jme3/export/binary/BinaryImporter.java | 4 ++-- jme3-desktop/src/main/java/com/jme3/app/AppletHarness.java | 4 ++-- .../java/com/jme3/system/lwjgl/LwjglAbstractDisplay.java | 4 ++-- .../java/com/jme3/system/lwjgl/LwjglOffscreenBuffer.java | 4 ++-- .../main/java/com/jme3/terrain/geomipmap/TerrainPatch.java | 4 ++-- 12 files changed, 23 insertions(+), 23 deletions(-) diff --git a/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/BlenderLoader.java b/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/BlenderLoader.java index 51df79d29..b7d9df841 100644 --- a/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/BlenderLoader.java +++ b/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/BlenderLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2019 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -220,7 +220,7 @@ public class BlenderLoader implements AssetLoader { } catch (BlenderFileException e) { throw new IOException(e.getLocalizedMessage(), e); } catch (Exception e) { - throw new IOException("Unexpected importer exception occured: " + e.getLocalizedMessage(), e); + throw new IOException("Unexpected importer exception occurred: " + e.getLocalizedMessage(), e); } finally { this.clear(assetInfo); } diff --git a/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/file/BlenderInputStream.java b/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/file/BlenderInputStream.java index 94a84cd5e..01d103753 100644 --- a/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/file/BlenderInputStream.java +++ b/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/file/BlenderInputStream.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2019 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -93,7 +93,7 @@ public class BlenderInputStream extends InputStream { try { this.readStreamToCache(bufferedInputStream); } catch (IOException e) { - throw new BlenderFileException("Problems occured while caching the file!", e); + throw new BlenderFileException("Problems occurred while caching the file!", e); } finally { try { inputStream.close(); @@ -144,7 +144,7 @@ public class BlenderInputStream extends InputStream { gis = new GZIPInputStream(new ByteArrayInputStream(cachedBuffer)); this.readStreamToCache(gis); } catch (IOException e) { - throw new IllegalStateException("IO errors occured where they should NOT! " + "The data is already buffered at this point!", e); + throw new IllegalStateException("IO errors occurred where they should NOT! " + "The data is already buffered at this point!", e); } finally { try { if (gis != null) { diff --git a/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/meshes/Face.java b/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/meshes/Face.java index 5890ad234..009e3c908 100644 --- a/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/meshes/Face.java +++ b/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/meshes/Face.java @@ -306,7 +306,7 @@ public class Face implements Comparator { } } } catch (BlenderFileException e) { - LOGGER.log(Level.WARNING, "Errors occured during face triangulation: {0}. The face will be triangulated with the most direct algorithm, but the results might not be identical to blender.", e.getLocalizedMessage()); + LOGGER.log(Level.WARNING, "Errors occurred during face triangulation: {0}. The face will be triangulated with the most direct algorithm, but the results might not be identical to blender.", e.getLocalizedMessage()); warning = TriangulationWarning.UNKNOWN; } if(warning != TriangulationWarning.NONE) { diff --git a/jme3-core/src/main/java/com/jme3/anim/Armature.java b/jme3-core/src/main/java/com/jme3/anim/Armature.java index 2424e9d34..ef73b8c26 100644 --- a/jme3-core/src/main/java/com/jme3/anim/Armature.java +++ b/jme3-core/src/main/java/com/jme3/anim/Armature.java @@ -276,7 +276,7 @@ public class Armature implements JmeCloneable, Savable { try { modelTransformClass = (Class) Class.forName(className); } catch (ClassNotFoundException e) { - throw new AssetLoadException("Cannnot find class for name " + className); + throw new AssetLoadException("Cannot find class for name " + className); } int i = 0; diff --git a/jme3-core/src/main/java/com/jme3/asset/DesktopAssetManager.java b/jme3-core/src/main/java/com/jme3/asset/DesktopAssetManager.java index 94ee68ceb..bf6b41b7a 100644 --- a/jme3-core/src/main/java/com/jme3/asset/DesktopAssetManager.java +++ b/jme3-core/src/main/java/com/jme3/asset/DesktopAssetManager.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2019 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -258,12 +258,12 @@ public class DesktopAssetManager implements AssetManager { handler.establishParentKey(key); obj = loader.load(info); } catch (IOException ex) { - throw new AssetLoadException("An exception has occured while loading asset: " + key, ex); + throw new AssetLoadException("An exception has occurred while loading asset: " + key, ex); } finally { handler.releaseParentKey(key); } if (obj == null) { - throw new AssetLoadException("Error occured while loading asset \"" + throw new AssetLoadException("Error occurred while loading asset \"" + key + "\" using " + loader.getClass().getSimpleName()); } else { if (logger.isLoggable(Level.FINER)) { diff --git a/jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java b/jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java index 402c8a3bb..2eb55a777 100644 --- a/jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java +++ b/jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java @@ -1641,7 +1641,7 @@ public final class GLRenderer implements Renderer { default: //Programming error; will fail on all hardware throw new IllegalStateException("Some video driver error " - + "or programming error occured. " + + "or programming error occurred. " + "Framebuffer object status is invalid. "); } } diff --git a/jme3-core/src/main/java/com/jme3/renderer/opengl/TextureUtil.java b/jme3-core/src/main/java/com/jme3/renderer/opengl/TextureUtil.java index 114ac09d1..db5331e11 100644 --- a/jme3-core/src/main/java/com/jme3/renderer/opengl/TextureUtil.java +++ b/jme3-core/src/main/java/com/jme3/renderer/opengl/TextureUtil.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 @@ -304,7 +304,7 @@ final class TextureUtil { } if (image.getMipMapSizes() != null) { - throw new UnsupportedOperationException("Updating mip-mappped images is not supported"); + throw new UnsupportedOperationException("Updating mip-mapped images is not supported"); } if (image.getMultiSamples() > 1) { diff --git a/jme3-core/src/plugins/java/com/jme3/export/binary/BinaryImporter.java b/jme3-core/src/plugins/java/com/jme3/export/binary/BinaryImporter.java index b34adbca6..d4c24054d 100644 --- a/jme3-core/src/plugins/java/com/jme3/export/binary/BinaryImporter.java +++ b/jme3-core/src/plugins/java/com/jme3/export/binary/BinaryImporter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2019 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -110,7 +110,7 @@ public final class BinaryImporter implements JmeImporter { return s; } catch (IOException ex) { - logger.log(Level.SEVERE, "An error occured while loading jME binary object", ex); + logger.log(Level.SEVERE, "An error occurred while loading jME binary object", ex); } finally { if (is != null){ try { diff --git a/jme3-desktop/src/main/java/com/jme3/app/AppletHarness.java b/jme3-desktop/src/main/java/com/jme3/app/AppletHarness.java index 159bd95ac..3765c1f80 100644 --- a/jme3-desktop/src/main/java/com/jme3/app/AppletHarness.java +++ b/jme3-desktop/src/main/java/com/jme3/app/AppletHarness.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2019 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -78,7 +78,7 @@ public class AppletHarness extends Applet { } catch (IOException ex){ // Called before application has been created .... // Display error message through AWT - JOptionPane.showMessageDialog(this, "An error has occured while " + JOptionPane.showMessageDialog(this, "An error has occurred while " + "loading applet configuration" + ex.getMessage(), "jME3 Applet", 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 e019008f2..9dda062ba 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 @@ -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 @@ -135,7 +135,7 @@ public abstract class LwjglAbstractDisplay extends LwjglContext implements Runna try { Util.checkGLError(); } catch (OpenGLException ex){ - listener.handleError("An OpenGL error has occured!", ex); + listener.handleError("An OpenGL error has occurred!", ex); } // NOTE: Always return true since this is used in an "assert" statement return true; diff --git a/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglOffscreenBuffer.java b/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglOffscreenBuffer.java index afd2c7508..d4c86a780 100644 --- a/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglOffscreenBuffer.java +++ b/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglOffscreenBuffer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2019 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -97,7 +97,7 @@ public class LwjglOffscreenBuffer extends LwjglContext implements Runnable { try { Util.checkGLError(); } catch (OpenGLException ex){ - listener.handleError("An OpenGL error has occured!", ex); + listener.handleError("An OpenGL error has occurred!", ex); } // NOTE: Always return true since this is used in an "assert" statement return true; diff --git a/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/TerrainPatch.java b/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/TerrainPatch.java index eb3263960..36c44ea46 100644 --- a/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/TerrainPatch.java +++ b/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/TerrainPatch.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 @@ -821,7 +821,7 @@ public class TerrainPatch extends Geometry { else if (other instanceof BoundingVolume) return collideWithBoundingVolume((BoundingVolume)other, results); else { - throw new UnsupportedCollisionException("TerrainPatch cannnot collide with "+other.getClass().getName()); + throw new UnsupportedCollisionException("TerrainPatch cannot collide with "+other.getClass().getName()); } }