From a818aff733e1dc6dbcf8d50032d7844dd49d31c4 Mon Sep 17 00:00:00 2001 From: Jimmy Date: Sat, 16 Oct 2021 19:27:05 +0300 Subject: [PATCH 1/7] GUACAMOLE-1446: Fixed a typo mistake ("the the") in some java files. --- .../auth/jdbc/base/RelatedObjectSet.java | 4 ++-- .../apache/guacamole/totp/TOTPGenerator.java | 3 +-- .../src/main/webapp/modules/Layer.js | 4 ++-- .../protocol/FilteredGuacamoleReader.java | 3 +-- .../guacamole/environment/Environment.java | 3 +-- .../app/navigation/types/PageDefinition.js | 2 +- .../guacamole/extension/ExtensionModule.java | 4 ++-- .../rest/auth/DecoratedUserContext.java | 21 +++++++++---------- .../rest/auth/DecorationService.java | 12 +++++------ 9 files changed, 26 insertions(+), 30 deletions(-) diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/RelatedObjectSet.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/RelatedObjectSet.java index 810e9a5f1..add954c5a 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/RelatedObjectSet.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/RelatedObjectSet.java @@ -76,11 +76,11 @@ public abstract class RelatedObjectSet authProviders; /** - * Creates a new DecoratedUserContext, invoking the the decorate() function + * Creates a new DecoratedUserContext, invoking the decorate() function * of all AuthenticationProviders to decorate the provided UserContext. * Decoration by each AuthenticationProvider will occur in the order that * the AuthenticationProviders were loaded. Only AuthenticationProviders @@ -94,11 +94,11 @@ public class DecorationService { } /** - * Creates a new DecoratedUserContext, invoking the the redecorate() - * function of all AuthenticationProviders to reapply decoration. Decoration - * by each AuthenticationProvider will occur in the order that the - * AuthenticationProviders were loaded. Only AuthenticationProviders which - * did not originate the given UserContext will be used. + * Creates a new DecoratedUserContext, invoking the redecorate() function + * of all AuthenticationProviders to reapply decoration. Decoration by each + * AuthenticationProvider will occur in the order that the AuthenticationProviders + * were loaded. Only AuthenticationProviders which did not originate the given + * UserContext will be used. * * @param decorated * The DecoratedUserContext associated with an older version of the From 8b365c6da67d90d6ffffacbcc1b169f730ad35f3 Mon Sep 17 00:00:00 2001 From: Jimmy Date: Mon, 18 Oct 2021 08:56:08 +0300 Subject: [PATCH 2/7] GUACAMOLE-1446: Fixed a typo mistake ("accomodate"). --- guacamole-common-js/src/main/webapp/modules/Layer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guacamole-common-js/src/main/webapp/modules/Layer.js b/guacamole-common-js/src/main/webapp/modules/Layer.js index 56af8474d..4d534b093 100644 --- a/guacamole-common-js/src/main/webapp/modules/Layer.js +++ b/guacamole-common-js/src/main/webapp/modules/Layer.js @@ -234,7 +234,7 @@ Guacamole.Layer = function(width, height) { } /** - * Set to true if this Layer should resize itself to accomodate the + * Set to true if this Layer should resize itself to accommodate the * dimensions of any drawing operation, and false (the default) otherwise. * * Note that setting this property takes effect immediately, and thus may From cc3f3813b864190aad9d2d427dff4283e8e659f2 Mon Sep 17 00:00:00 2001 From: Jimmy Date: Mon, 18 Oct 2021 09:03:45 +0300 Subject: [PATCH 3/7] GUACAMOLE-1446: Fixed a typo mistake ("destionation"). --- guacamole-common-js/src/main/webapp/modules/Layer.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/guacamole-common-js/src/main/webapp/modules/Layer.js b/guacamole-common-js/src/main/webapp/modules/Layer.js index 4d534b093..3848beafa 100644 --- a/guacamole-common-js/src/main/webapp/modules/Layer.js +++ b/guacamole-common-js/src/main/webapp/modules/Layer.js @@ -904,7 +904,7 @@ Guacamole.Layer.PLUS = 0xF; /** * Channel mask for the composite operation "rin". - * Beware that WebKit-based browsers may leave the contents of the destionation + * Beware that WebKit-based browsers may leave the contents of the destination * layer where the source layer is transparent, despite the definition of this * operation. */ @@ -912,7 +912,7 @@ Guacamole.Layer.RIN = 0x1; /** * Channel mask for the composite operation "in". - * Beware that WebKit-based browsers may leave the contents of the destionation + * Beware that WebKit-based browsers may leave the contents of the destination * layer where the source layer is transparent, despite the definition of this * operation. */ @@ -920,7 +920,7 @@ Guacamole.Layer.IN = 0x4; /** * Channel mask for the composite operation "out". - * Beware that WebKit-based browsers may leave the contents of the destionation + * Beware that WebKit-based browsers may leave the contents of the destination * layer where the source layer is transparent, despite the definition of this * operation. */ @@ -928,7 +928,7 @@ Guacamole.Layer.OUT = 0x8; /** * Channel mask for the composite operation "ratop". - * Beware that WebKit-based browsers may leave the contents of the destionation + * Beware that WebKit-based browsers may leave the contents of the destination * layer where the source layer is transparent, despite the definition of this * operation. */ @@ -936,7 +936,7 @@ Guacamole.Layer.RATOP = 0x9; /** * Channel mask for the composite operation "src". - * Beware that WebKit-based browsers may leave the contents of the destionation + * Beware that WebKit-based browsers may leave the contents of the destination * layer where the source layer is transparent, despite the definition of this * operation. */ From 4e19e37bfba1ad7353088ad8188f47750e0cb43c Mon Sep 17 00:00:00 2001 From: Jimmy Date: Mon, 18 Oct 2021 09:06:45 +0300 Subject: [PATCH 4/7] GUACAMOLE-1446: Fixed a typo mistake ("approriate"). --- guacamole-common-js/src/main/webapp/modules/Display.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guacamole-common-js/src/main/webapp/modules/Display.js b/guacamole-common-js/src/main/webapp/modules/Display.js index 31c22aaa5..29ad5cd53 100644 --- a/guacamole-common-js/src/main/webapp/modules/Display.js +++ b/guacamole-common-js/src/main/webapp/modules/Display.js @@ -602,7 +602,7 @@ Guacamole.Display = function() { * Draws the image within the given stream at the given coordinates. The * image will be loaded automatically, and this and any future operations * will wait for the image to finish loading. This function will - * automatically choose an approriate method for reading and decoding the + * automatically choose an appropriate method for reading and decoding the * given image stream, and should be preferred for received streams except * where manual decoding of the stream is unavoidable. * From 40d85352815db0a4b2bf58d635b0b7571001b245 Mon Sep 17 00:00:00 2001 From: Jimmy Date: Mon, 18 Oct 2021 09:11:11 +0300 Subject: [PATCH 5/7] GUACAMOLE-1446: Fixed a typo mistake ("Conneccting", "otherise"). --- .../src/main/frontend/src/app/client/types/ManagedClient.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guacamole/src/main/frontend/src/app/client/types/ManagedClient.js b/guacamole/src/main/frontend/src/app/client/types/ManagedClient.js index 8a06deaee..fb7c8474e 100644 --- a/guacamole/src/main/frontend/src/app/client/types/ManagedClient.js +++ b/guacamole/src/main/frontend/src/app/client/types/ManagedClient.js @@ -432,7 +432,7 @@ angular.module('client').factory('ManagedClient', ['$rootScope', '$injector', ManagedClientState.ConnectionState.IDLE); break; - // Conneccting + // Connecting case 1: ManagedClientState.setConnectionState(managedClient.clientState, ManagedClientState.ConnectionState.CONNECTING); @@ -899,7 +899,7 @@ angular.module('client').factory('ManagedClient', ['$rootScope', '$injector', * * @returns {boolean} * true if there are any file transfers associated with the - * given client, false otherise. + * given client, false otherwise. */ ManagedClient.hasTransfers = function hasTransfers(client) { return !!(client && client.uploads && client.uploads.length); From 67a8fae8b0149729745566b3eae27a77e3239ffe Mon Sep 17 00:00:00 2001 From: Jimmy Date: Mon, 18 Oct 2021 09:18:35 +0300 Subject: [PATCH 6/7] GUACAMOLE-1446: Fixed a typo mistake ("propogation"). --- .../main/frontend/src/app/client/directives/guacClient.js | 4 ++-- .../frontend/src/app/clipboard/services/clipboardService.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/guacamole/src/main/frontend/src/app/client/directives/guacClient.js b/guacamole/src/main/frontend/src/app/client/directives/guacClient.js index 717bf6e7b..fb88f99f5 100644 --- a/guacamole/src/main/frontend/src/app/client/directives/guacClient.js +++ b/guacamole/src/main/frontend/src/app/client/directives/guacClient.js @@ -558,7 +558,7 @@ angular.module('client').directive('guacClient', [function guacClient() { /** * Displays a visual indication that dropping the file currently - * being dragged is possible. Further propogation and default behavior + * being dragged is possible. Further propagation and default behavior * of the given event is automatically prevented. * * @param {Event} e @@ -577,7 +577,7 @@ angular.module('client').directive('guacClient', [function guacClient() { /** * Removes the visual indication that dropping the file currently - * being dragged is possible. Further propogation and default behavior + * being dragged is possible. Further propagation and default behavior * of the given event is automatically prevented. * * @param {Event} e diff --git a/guacamole/src/main/frontend/src/app/clipboard/services/clipboardService.js b/guacamole/src/main/frontend/src/app/clipboard/services/clipboardService.js index 0c8409b54..8e8c95b71 100644 --- a/guacamole/src/main/frontend/src/app/clipboard/services/clipboardService.js +++ b/guacamole/src/main/frontend/src/app/clipboard/services/clipboardService.js @@ -88,12 +88,12 @@ angular.module('clipboard').factory('clipboardService', ['$injector', document.body.appendChild(clipboardContent); /** - * Stops the propogation of the given event through the DOM tree. This is - * identical to invoking stopPropogation() on the event directly, except + * Stops the propagation of the given event through the DOM tree. This is + * identical to invoking stopPropagation() on the event directly, except * that this function is usable as an event handler itself. * * @param {Event} e - * The event whose propogation through the DOM tree should be stopped. + * The event whose propagation through the DOM tree should be stopped. */ var stopEventPropagation = function stopEventPropagation(e) { e.stopPropagation(); From 24ae073aa8f61b72f55ca1b485917afd474488b5 Mon Sep 17 00:00:00 2001 From: Jimmy Date: Mon, 18 Oct 2021 09:44:30 +0300 Subject: [PATCH 7/7] GUACAMOLE-1446: Fixed a typo mistake ("ssociate", "initialied", "assocaited"). --- guacamole-common-js/src/main/webapp/modules/Client.js | 6 +++--- .../main/frontend/src/app/element/directives/guacClick.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/guacamole-common-js/src/main/webapp/modules/Client.js b/guacamole-common-js/src/main/webapp/modules/Client.js index 7aee174c4..ba40fae34 100644 --- a/guacamole-common-js/src/main/webapp/modules/Client.js +++ b/guacamole-common-js/src/main/webapp/modules/Client.js @@ -541,7 +541,7 @@ Guacamole.Client = function(tunnel) { */ this.createObjectOutputStream = function createObjectOutputStream(index, mimetype, name) { - // Allocate and ssociate stream with object metadata + // Allocate and associate stream with object metadata var stream = guac_client.createOutputStream(); tunnel.sendMessage("put", index, stream.index, mimetype, name); return stream; @@ -666,7 +666,7 @@ Guacamole.Client = function(tunnel) { * * @return {Guacamole.AudioPlayer} * An object which implements the Guacamole.AudioPlayer interface and - * has been initialied to play the data in the provided stream, or null + * has been initialized to play the data in the provided stream, or null * if the built-in audio players of the Guacamole client should be * used. */ @@ -690,7 +690,7 @@ Guacamole.Client = function(tunnel) { * * @return {Guacamole.VideoPlayer} * An object which implements the Guacamole.VideoPlayer interface and - * has been initialied to play the data in the provided stream, or null + * has been initialized to play the data in the provided stream, or null * if the built-in video players of the Guacamole client should be * used. */ diff --git a/guacamole/src/main/frontend/src/app/element/directives/guacClick.js b/guacamole/src/main/frontend/src/app/element/directives/guacClick.js index 230b18c6c..0847d3c53 100644 --- a/guacamole/src/main/frontend/src/app/element/directives/guacClick.js +++ b/guacamole/src/main/frontend/src/app/element/directives/guacClick.js @@ -44,7 +44,7 @@ angular.module('element').directive('guacClick', [function guacClick() { /** * The callback to invoke when a click or click-like event is - * received on the assocaited element. + * received on the associated element. * * @type guacClick~callback */