Description: fixing spelling errors Author: Pierre Gruet Forwarded: sgothel@jausoft.com Last-Update: 2023-04-17 --- a/src/jogl/classes/com/jogamp/graph/curve/opengl/RenderState.java +++ b/src/jogl/classes/com/jogamp/graph/curve/opengl/RenderState.java @@ -328,7 +328,7 @@ * @param updateLocation * @param data * @param throwOnError TODO - * @return true if no error occured, i.e. all locations found, otherwise false. + * @return true if no error occurred, i.e. all locations found, otherwise false. */ public final boolean updateUniformLoc(final GL2ES2 gl, final boolean updateLocation, final GLUniformData data, final boolean throwOnError) { if( updateLocation || 0 > data.getLocation() ) { @@ -350,7 +350,7 @@ * @param updateData TODO * @param data * @param throwOnError TODO - * @return true if no error occured, i.e. all locations found, otherwise false. + * @return true if no error occurred, i.e. all locations found, otherwise false. */ public final boolean updateUniformDataLoc(final GL2ES2 gl, boolean updateLocation, boolean updateData, final GLUniformData data, final boolean throwOnError) { updateLocation = updateLocation || 0 > data.getLocation(); @@ -373,7 +373,7 @@ * @param gl * @param data * @param throwOnError TODO - * @return true if no error occured, i.e. all locations found, otherwise false. + * @return true if no error occurred, i.e. all locations found, otherwise false. */ public final boolean updateAttributeLoc(final GL2ES2 gl, final boolean updateLocation, final GLArrayDataWrapper data, final boolean throwOnError) { if( updateLocation || 0 > data.getLocation() ) { --- a/src/jogl/classes/com/jogamp/opengl/util/av/GLMediaPlayer.java +++ b/src/jogl/classes/com/jogamp/opengl/util/av/GLMediaPlayer.java @@ -600,7 +600,7 @@ public void switchStream(final int vid, final int aid, final int sid) throws IllegalStateException, IllegalArgumentException; /** - * Returns the {@link StreamException} caught in the decoder thread, or null if none occured. + * Returns the {@link StreamException} caught in the decoder thread, or null if none occurred. *

* Method clears the cached {@link StreamException}, hence an immediate subsequent call will return null. *

--- a/src/newt/classes/jogamp/newt/DefaultEDTUtil.java +++ b/src/newt/classes/jogamp/newt/DefaultEDTUtil.java @@ -383,7 +383,7 @@ } if(!task.hasWaiter() && null != task.getThrowable()) { // at least dump stack-trace in case nobody waits for result - System.err.println("DefaultEDT.run(): Caught exception occured on thread "+java.lang.Thread.currentThread().getName()+": "+task.toString()); + System.err.println("DefaultEDT.run(): Caught exception occurred on thread "+java.lang.Thread.currentThread().getName()+": "+task.toString()); task.getThrowable().printStackTrace(); } } --- a/src/newt/classes/jogamp/newt/WindowImpl.java +++ b/src/newt/classes/jogamp/newt/WindowImpl.java @@ -2981,7 +2981,7 @@ * See {@link MonitorDevice#getOrientationTo(MonitorDevice, int[])} to produce a proper move_diff pair. * @param newPixelScale the new pixel scale * @param setNativeWindow pass true to set the native window pos-size, otherwise only change stored values - * @return true if a pixel scale change occured, otherwise false. + * @return true if a pixel scale change occurred, otherwise false. */ protected boolean applySoftPixelScale(final int[] move_diff, final float[] newPixelScale, final boolean setNativeWindow) { boolean res = false; --- a/src/newt/native/X11Display.c +++ b/src/newt/native/X11Display.c @@ -341,7 +341,7 @@ (*env)->CallVoidMethod(env, obj, displayCompletedID, javaObjectAtom, windowDeleteAtom /*, kbdHandle*/, // XKB disabled for now randr_event_base, randr_error_base, xi_opcode); - NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Display.CompleteDisplay0: Exception occured at displayCompleted(..)"); + NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Display.CompleteDisplay0: Exception occurred at displayCompleted(..)"); } /* @@ -451,7 +451,7 @@ jboolean res = (*env)->CallBooleanMethod(env, jw->jwindow, sendTouchScreenEventID, (jshort)eventType, (jint)modifiers, (jint)actionIdx, jNames, jX, jY, jPressure, (jfloat)1.0f); - NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Display.DispatchMessages0: XI: Exception occured at sendTouchScreenEvent(..)"); + NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Display.DispatchMessages0: XI: Exception occurred at sendTouchScreenEvent(..)"); return res; } @@ -504,7 +504,7 @@ DBG_PRINT( "X11: DispatchMessages 0x%X - Leave 2, closed DisplayDriver %p\n", dpy, obj); return; } - NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Display.DispatchMessages0: Exception occured at isNativeValid()"); + NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Display.DispatchMessages0: Exception occurred at isNativeValid()"); #endif // XEventsQueued(dpy, X): @@ -531,7 +531,7 @@ DBG_PRINT( "X11: DispatchMessages 0x%X - Leave J, RRScreen\n", dpy); num_events = 0; // end loop in case of destroyed display } - NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Display.DispatchMessages0: RR: Exception occured at sendRRScreenChangeNotify(..)"); + NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Display.DispatchMessages0: RR: Exception occurred at sendRRScreenChangeNotify(..)"); continue; // next event } @@ -731,7 +731,7 @@ DBG_PRINT( "X11: DispatchMessages 0x%X - Leave J, press-mouseEvent\n", dpy); num_events = 0; // end loop in case of destroyed display } - NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Display.DispatchMessages0: ButtonPress: Exception occured at sendMouseEventRequestFocus(..)"); + NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Display.DispatchMessages0: ButtonPress: Exception occurred at sendMouseEventRequestFocus(..)"); break; case ButtonRelease: if( JNI_FALSE == (*env)->CallBooleanMethod(env, jw->jwindow, sendMouseEventID, (jshort) EVENT_MOUSE_RELEASED, @@ -740,7 +740,7 @@ DBG_PRINT( "X11: DispatchMessages 0x%X - Leave J, release-mouseEvent\n", dpy); num_events = 0; // end loop in case of destroyed display } - NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Display.DispatchMessages0: ButtonRelease: Exception occured at sendMouseEvent(..)"); + NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Display.DispatchMessages0: ButtonRelease: Exception occurred at sendMouseEvent(..)"); break; case MotionNotify: if( JNI_FALSE == (*env)->CallBooleanMethod(env, jw->jwindow, sendMouseEventID, (jshort) EVENT_MOUSE_MOVED, @@ -749,7 +749,7 @@ DBG_PRINT( "X11: DispatchMessages 0x%X - Leave J, motion-mouseEvent\n", dpy); num_events = 0; // end loop in case of destroyed display } - NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Display.DispatchMessages0: MotionNotify: Exception occured at sendMouseEvent(..)"); + NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Display.DispatchMessages0: MotionNotify: Exception occurred at sendMouseEvent(..)"); break; case EnterNotify: DBG_PRINT( "X11: event . EnterNotify call %p %d/%d\n", (void*)evt.xcrossing.window, evt.xcrossing.x, evt.xcrossing.y); @@ -762,7 +762,7 @@ DBG_PRINT( "X11: DispatchMessages 0x%X - Leave J, enter-mouseEvent\n", dpy); num_events = 0; // end loop in case of destroyed display } - NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Display.DispatchMessages0: EnterNotify: Exception occured at visibleChangedSendMouseEvent(..)"); + NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Display.DispatchMessages0: EnterNotify: Exception occurred at visibleChangedSendMouseEvent(..)"); } break; case LeaveNotify: @@ -776,7 +776,7 @@ DBG_PRINT( "X11: DispatchMessages 0x%X - Leave J, leave-mouseEvent\n", dpy); num_events = 0; // end loop in case of destroyed display } - NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Display.DispatchMessages0: LeaveNotify: Exception occured at visibleChangedSendMouseEvent(..)"); + NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Display.DispatchMessages0: LeaveNotify: Exception occurred at visibleChangedSendMouseEvent(..)"); } break; case MappingNotify: @@ -789,7 +789,7 @@ DBG_PRINT( "X11: DispatchMessages 0x%X - Leave J, press-keyEvent\n", dpy); num_events = 0; // end loop in case of destroyed display } - NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Display.DispatchMessages0: KeyPress: Exception occured at sendKeyEvent(..)"); + NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Display.DispatchMessages0: KeyPress: Exception occurred at sendKeyEvent(..)"); break; case KeyRelease: if( JNI_FALSE == (*env)->CallBooleanMethod(env, jw->jwindow, sendKeyEventID, (jshort) EVENT_KEY_RELEASED, @@ -797,7 +797,7 @@ DBG_PRINT( "X11: DispatchMessages 0x%X - Leave J, release-keyEvent\n", dpy); num_events = 0; // end loop in case of destroyed display } - NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Display.DispatchMessages0: KeyRelease: Exception occured at sendKeyEvent(..)"); + NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Display.DispatchMessages0: KeyRelease: Exception occurred at sendKeyEvent(..)"); break; case DestroyNotify: DBG_PRINT( "X11: event . DestroyNotify call %p, parent %p, child-event: %d\n", @@ -858,7 +858,7 @@ DBG_PRINT( "X11: DispatchMessages 0x%X - Leave J, sizePosMaxInsetsVis\n", dpy); num_events = 0; // end loop in case of destroyed display } - NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Display.DispatchMessages0: ConfigureNotify: Exception occured at sizePosMaxInsetsVisibleChanged(..)"); + NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Display.DispatchMessages0: ConfigureNotify: Exception occurred at sizePosMaxInsetsVisibleChanged(..)"); } break; case ClientMessage: @@ -886,7 +886,7 @@ DBG_PRINT( "X11: DispatchMessages 0x%X - Leave J, focus-in\n", dpy); num_events = 0; // end loop in case of destroyed display } - NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Display.DispatchMessages0: FocusIn: Exception occured at focusVisibleChanged(..)"); + NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Display.DispatchMessages0: FocusIn: Exception occurred at focusVisibleChanged(..)"); } break; @@ -899,7 +899,7 @@ DBG_PRINT( "X11: DispatchMessages 0x%X - Leave J, focus-out\n", dpy); num_events = 0; // end loop in case of destroyed display } - NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Display.DispatchMessages0: FocusOut: Exception occured at focusVisibleChanged(..)"); + NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Display.DispatchMessages0: FocusOut: Exception occurred at focusVisibleChanged(..)"); } break; @@ -914,7 +914,7 @@ DBG_PRINT( "X11: DispatchMessages 0x%X - Leave J, vis-notify\n", dpy); num_events = 0; // end loop in case of destroyed display } - NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Display.DispatchMessages0: VisibilityNotify: Exception occured at visibleChanged(..)"); + NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Display.DispatchMessages0: VisibilityNotify: Exception occurred at visibleChanged(..)"); } #endif } @@ -930,7 +930,7 @@ DBG_PRINT( "X11: DispatchMessages 0x%X - Leave J, expose\n", dpy); num_events = 0; // end loop in case of destroyed display } - NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Display.DispatchMessages0: Expose: Exception occured at windowRepaint(..)"); + NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Display.DispatchMessages0: Expose: Exception occurred at windowRepaint(..)"); #if 0 uint32_t netWMState = NewtWindows_getNET_WM_STATE(dpy, jw); int visibleChange = NewtWindows_updateVisibility(env, dpy, jw, netWMState, "Expose"); @@ -957,13 +957,13 @@ DBG_PRINT( "X11: DispatchMessages 0x%X - Leave J, map-insets\n", dpy); num_events = 0; // end loop in case of destroyed display } - NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Display.DispatchMessages0: MapNotify: Exception occured at insetsVisibleChanged(..)"); + NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Display.DispatchMessages0: MapNotify: Exception occurred at insetsVisibleChanged(..)"); } else { if( JNI_FALSE == (*env)->CallBooleanMethod(env, jw->jwindow, visibleChangedID, JNI_TRUE) ) { DBG_PRINT( "X11: DispatchMessages 0x%X - Leave J, map\n", dpy); num_events = 0; // end loop in case of destroyed display } - NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Display.DispatchMessages0: MapNotify: Exception occured at visibleChanged(..)"); + NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Display.DispatchMessages0: MapNotify: Exception occurred at visibleChanged(..)"); } } break; @@ -979,7 +979,7 @@ DBG_PRINT( "X11: DispatchMessages 0x%X - Leave J, unmap\n", dpy); num_events = 0; // end loop in case of destroyed display } - NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Display.DispatchMessages0: UnmapNotify: Exception occured at visibleChanged(..)"); + NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Display.DispatchMessages0: UnmapNotify: Exception occurred at visibleChanged(..)"); } break; @@ -1016,7 +1016,7 @@ DBG_PRINT( "X11: DispatchMessages 0x%X - Leave J, reparent-notify\n", dpy); num_events = 0; // end loop in case of destroyed display } - NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Display.DispatchMessages0: ReparentNotify: Exception occured at reparentNotify(..)"); + NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Display.DispatchMessages0: ReparentNotify: Exception occurred at reparentNotify(..)"); } break; --- a/src/newt/native/X11Window.c +++ b/src/newt/native/X11Window.c @@ -968,10 +968,10 @@ XSync(dpy, False); if( NewtWindows_updateInsets(dpy, javaWindow, True /* wait */, &left, &right, &top, &bottom) ) { (*env)->CallVoidMethod(env, javaWindow->jwindow, insetsVisibleChangedID, JNI_FALSE, left, right, top, bottom, 1); - NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Window.CreateWindow: Exception occured at insetsVisibleChanged(..)"); + NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Window.CreateWindow: Exception occurred at insetsVisibleChanged(..)"); } else { (*env)->CallVoidMethod(env, javaWindow->jwindow, visibleChangedID, JNI_TRUE); - NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Window.CreateWindow: Exception occured at visibleChanged(..)"); + NewtCommon_ExceptionCheck1_throwNewRuntimeException(env, "X11Window.CreateWindow: Exception occurred at visibleChanged(..)"); left=0; right=0; top=0; bottom=0; } --- a/src/test-native/bug1398/Bug1398Launcher.c +++ b/src/test-native/bug1398/Bug1398Launcher.c @@ -111,7 +111,7 @@ destroy: if ((*env)->ExceptionOccurred(env)) { // handle exception - TRACE("Exception occured...%s", ""); + TRACE("Exception occurred...%s", ""); } if (err) --- a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestGLJPanelTextureStateAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestGLJPanelTextureStateAWT.java @@ -287,7 +287,7 @@ throwable.printStackTrace(); Assume.assumeNoException( throwable ); } - Assume.assumeFalse("Error occured in GLEL .. see log file above", glelError[0]); + Assume.assumeFalse("Error occurred in GLEL .. see log file above", glelError[0]); } @Test --- a/src/test/com/jogamp/opengl/test/junit/newt/TestBug1211IRQ00NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/TestBug1211IRQ00NEWT.java @@ -197,9 +197,9 @@ interrupt2 = true; } Assert.assertEquals("interruptCounter not zero", 0, t.getInterruptCounter(false)); - Assert.assertFalse("interrupt() occured!", t.isInterrupted()); - Assert.assertFalse("Interrupt-1 occured!", interrupt1); - Assert.assertFalse("Interrupt-2 occured!", interrupt2); + Assert.assertFalse("interrupt() occurred!", t.isInterrupted()); + Assert.assertFalse("Interrupt-1 occurred!", interrupt1); + Assert.assertFalse("Interrupt-2 occurred!", interrupt2); } /** @@ -238,9 +238,9 @@ interrupt2 = true; } Assert.assertEquals("interruptCounter not zero", 0, t.getInterruptCounter(false)); - Assert.assertFalse("interrupt() occured!", t.isInterrupted()); - Assert.assertFalse("Interrupt-1 occured!", interrupt1); - Assert.assertFalse("Interrupt-2 occured!", interrupt2); + Assert.assertFalse("interrupt() occurred!", t.isInterrupted()); + Assert.assertFalse("Interrupt-1 occurred!", interrupt1); + Assert.assertFalse("Interrupt-2 occurred!", interrupt2); } @Test @@ -287,8 +287,8 @@ ExceptionUtils.dumpThrowable("InterruptedException-All", e); interrupted = true; } - Assert.assertFalse("Thread Interrupt-All occured!", interrupted); - Assert.assertFalse("Interrupt-Init0 occured!", interruptInit0); + Assert.assertFalse("Thread Interrupt-All occurred!", interrupted); + Assert.assertFalse("Interrupt-Init0 occurred!", interruptInit0); } static int atoi(final String a) {