You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2022/07/12 20:36:18 UTC
[jspwiki] branch master updated: Fix annoying typos.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
The following commit(s) were added to refs/heads/master by this push:
new 18d294108 Fix annoying typos.
18d294108 is described below
commit 18d294108683aa8caa6693b6c558e574b2d8b0c8
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Wed Jun 22 22:42:38 2022 +0200
Fix annoying typos.
---
jspwiki-api/src/main/java/org/apache/wiki/api/core/Acl.java | 6 +++---
jspwiki-api/src/main/java/org/apache/wiki/api/core/Command.java | 2 +-
jspwiki-api/src/main/java/org/apache/wiki/api/core/Session.java | 6 +++---
.../org/apache/wiki/api/exceptions/NoRequiredPropertyException.java | 2 +-
.../src/main/java/org/apache/wiki/event/WikiSecurityEvent.java | 4 ++--
jspwiki-main/src/main/java/org/apache/wiki/auth/acl/Acl.java | 2 +-
jspwiki-main/src/main/java/org/apache/wiki/auth/acl/AclEntry.java | 2 +-
.../src/main/java/org/apache/wiki/auth/acl/UnresolvedPrincipal.java | 2 +-
.../src/main/java/org/apache/wiki/auth/authorize/Group.java | 2 +-
.../src/main/java/org/apache/wiki/auth/authorize/WebAuthorizer.java | 2 +-
.../java/org/apache/wiki/auth/permissions/PermissionChecks.java | 2 +-
.../src/main/java/org/apache/wiki/auth/user/UserDatabase.java | 2 +-
jspwiki-main/src/main/java/org/apache/wiki/tags/CalendarTag.java | 2 +-
jspwiki-main/src/main/java/org/apache/wiki/tags/MessagesTag.java | 4 ++--
jspwiki-main/src/main/java/org/apache/wiki/workflow/Step.java | 2 +-
.../src/main/java/org/apache/wiki/workflow/SystemPrincipal.java | 2 +-
jspwiki-util/src/main/java/org/apache/wiki/util/MailUtil.java | 2 +-
.../main/java/org/apache/wiki/util/comparators/HumanComparator.java | 2 +-
jspwiki-war/src/main/styles/jspwiki_print.css | 2 +-
.../src/main/java/org/apache/wiki/htmltowiki/SyntaxDecorator.java | 2 +-
20 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/jspwiki-api/src/main/java/org/apache/wiki/api/core/Acl.java b/jspwiki-api/src/main/java/org/apache/wiki/api/core/Acl.java
index 71f798fec..d7c9d914f 100644
--- a/jspwiki-api/src/main/java/org/apache/wiki/api/core/Acl.java
+++ b/jspwiki-api/src/main/java/org/apache/wiki/api/core/Acl.java
@@ -39,7 +39,7 @@ import java.util.Enumeration;
* This interface is a highly stripped-down derivation of the java.security.acl.Acl interface. In particular, the notion of an Acl "owner"
* has been eliminated, since JSPWiki pages do not have owners. An additional simplification compared to the standard Java package is that
* negative permissions have been eliminated. Instead, JSPWiki assumes a "default-deny" security stance: principals are granted no
- * permissions by default, and posesses only those that have been explicitly granted to them. And finally, the getPermissions() and
+ * permissions by default, and possesses only those that have been explicitly granted to them. And finally, the getPermissions() and
* checkPermission() methods have been eliminated due to the complexities associated with resolving Role principal membership.
* </p>
* @since 2.3
@@ -73,12 +73,12 @@ public interface Acl {
boolean isEmpty();
/**
- * Returns all Principal objects assigned a given Permission in the access control list. The Princiapls returned are those that
+ * Returns all Principal objects assigned a given Permission in the access control list. The Principals returned are those that
* have been granted either the supplied permission, or a permission implied by the supplied permission. Principals are not
* "expanded" if they are a role or group.
*
* @param permission the permission to search for
- * @return an array of Principals posessing the permission
+ * @return an array of Principals possessing the permission
*/
Principal[] findPrincipals( Permission permission );
diff --git a/jspwiki-api/src/main/java/org/apache/wiki/api/core/Command.java b/jspwiki-api/src/main/java/org/apache/wiki/api/core/Command.java
index dfbd0cebb..f9cdfd736 100644
--- a/jspwiki-api/src/main/java/org/apache/wiki/api/core/Command.java
+++ b/jspwiki-api/src/main/java/org/apache/wiki/api/core/Command.java
@@ -102,7 +102,7 @@ public interface Command {
String getRequestContext();
/**
- * Returns the Permission required to successfully execute this Command. If no Permission is requred, this method returns
+ * Returns the Permission required to successfully execute this Command. If no Permission is required, this method returns
* <code>null</code>. For example, the static command {@code org.apache.wiki.ui.PageCommand#VIEW} doesn't require a permission because
* it isn't referring to a particular WikiPage. However, if this command targets a WikiPage called <code>Main</code>(via
* {@code org.apache.wiki.ui.PageCommand#targetedCommand(Object)}, the resulting Command would require the permission
diff --git a/jspwiki-api/src/main/java/org/apache/wiki/api/core/Session.java b/jspwiki-api/src/main/java/org/apache/wiki/api/core/Session.java
index f2704e7ef..8a608609a 100644
--- a/jspwiki-api/src/main/java/org/apache/wiki/api/core/Session.java
+++ b/jspwiki-api/src/main/java/org/apache/wiki/api/core/Session.java
@@ -28,7 +28,7 @@ import java.util.Locale;
/**
- * <p>Represents a long-running wiki session, with an associated user Principal, user Subject, and authentication status. The sesion
+ * <p>Represents a long-running wiki session, with an associated user Principal, user Subject, and authentication status. The session
* is initialized with minimal, default-deny values: authentication is set to <code>false</code>, and the user principal is set to
* <code>null</code>.</p>
* <p>The Session allows callers to:</p>
@@ -42,7 +42,7 @@ import java.util.Locale;
* {@link #addMessage(String)}, {@link #getMessages(String)}
* and {@link #clearMessages(String)}</li>
* </ul>
- * <p>To keep track of the Principals each user posseses, each Session stores a JAAS Subject. Various login processes add or
+ * <p>To keep track of the Principals each user possesses, each Session stores a JAAS Subject. Various login processes add or
* remove Principals when users authenticate or log out.</p>
* <p>Session extends the {@link org.apache.wiki.event.WikiEventListener} interface and listens for group add/change/delete
* events fired by event sources the Session is registered with: {@link org.apache.wiki.auth.AuthenticationManager},
@@ -233,7 +233,7 @@ public interface Session extends WikiEventListener {
/**
* Wrapper for {@link Subject#doAsPrivileged(Subject, PrivilegedAction, java.security.AccessControlContext)}
- * that executes an action with the privileges posssessed by a Session's Subject. The action executes with a <code>null</code>
+ * that executes an action with the privileges possessed by a Session's Subject. The action executes with a <code>null</code>
* AccessControlContext, which has the effect of running it "cleanly" without the AccessControlContexts of the caller.
*
* @param session the wiki session
diff --git a/jspwiki-api/src/main/java/org/apache/wiki/api/exceptions/NoRequiredPropertyException.java b/jspwiki-api/src/main/java/org/apache/wiki/api/exceptions/NoRequiredPropertyException.java
index 0bcf30f0b..b9d717e6e 100644
--- a/jspwiki-api/src/main/java/org/apache/wiki/api/exceptions/NoRequiredPropertyException.java
+++ b/jspwiki-api/src/main/java/org/apache/wiki/api/exceptions/NoRequiredPropertyException.java
@@ -21,7 +21,7 @@ package org.apache.wiki.api.exceptions;
/**
- * Marks an erroneus jspwiki.properties file. Certain properties have been marked as "required", and if you
+ * Marks an erroneous jspwiki.properties file. Certain properties have been marked as "required", and if you
* do not provide a good value for a property, you'll see this exception.
* <P>
* Check <TT>jspwiki.properties</TT> for the required properties.
diff --git a/jspwiki-event/src/main/java/org/apache/wiki/event/WikiSecurityEvent.java b/jspwiki-event/src/main/java/org/apache/wiki/event/WikiSecurityEvent.java
index e3000a7fe..100b805db 100644
--- a/jspwiki-event/src/main/java/org/apache/wiki/event/WikiSecurityEvent.java
+++ b/jspwiki-event/src/main/java/org/apache/wiki/event/WikiSecurityEvent.java
@@ -164,7 +164,7 @@ public final class WikiSecurityEvent extends WikiEvent {
}
/**
- * Returns the principal to whom the opeation applied, if supplied. This method may return <code>null</code>
+ * Returns the principal to whom the operation applied, if supplied. This method may return <code>null</code>
* <em>— and calling methods should check for this condition</em>.
*
* @return the changed object
@@ -196,7 +196,7 @@ public final class WikiSecurityEvent extends WikiEvent {
final Object obj = getSrc(); // cfr. https://forums.oracle.com/forums/thread.jspa?threadID=1184115
msg.append( " [source=" ).append( obj.toString() );
if( m_principal != null ) {
- msg.append( ", princpal=" ).append( m_principal.getClass().getName() );
+ msg.append( ", principal=" ).append( m_principal.getClass().getName() );
msg.append( " " ).append( m_principal.getName() );
}
msg.append( ", target=" ).append( m_target );
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/acl/Acl.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/acl/Acl.java
index 5237bccd3..b14156f90 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/acl/Acl.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/acl/Acl.java
@@ -32,7 +32,7 @@ import java.util.stream.Collectors;
* </p>
* {@inheritDoc}
* @since 2.3
- * @deprecated use {@link org.apache.wiki.api.core.Acl} insteaad
+ * @deprecated use {@link org.apache.wiki.api.core.Acl} instead
* @see org.apache.wiki.api.core.Acl
*/
@Deprecated
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/acl/AclEntry.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/acl/AclEntry.java
index f46d2b476..eb71b7bf3 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/acl/AclEntry.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/acl/AclEntry.java
@@ -28,7 +28,7 @@ package org.apache.wiki.auth.acl;
*
* @see Acl
* @since 2.3
- * @deprecated use {@link org.apache.wiki.api.core.AclEntry} insteaad
+ * @deprecated use {@link org.apache.wiki.api.core.AclEntry} instead
* @see org.apache.wiki.api.core.AclEntry
*/
@Deprecated
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/acl/UnresolvedPrincipal.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/acl/UnresolvedPrincipal.java
index 964fa359e..97c87885e 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/acl/UnresolvedPrincipal.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/acl/UnresolvedPrincipal.java
@@ -27,7 +27,7 @@ import java.security.Principal;
* manager, and built-in role definitions.
* Creating a principal marked "unresolved" allows
* delayed resolution, which enables principals to be resolved
- * lazily during a later access control check. Conceptuallly,
+ * lazily during a later access control check. Conceptually,
* UnresolvedPrincipal performs a function similar to
* {@link java.security.UnresolvedPermission}.
*
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/Group.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/Group.java
index 2fd053d1d..cba072f15 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/Group.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/Group.java
@@ -228,7 +228,7 @@ public class Group {
* Returns <code>true</code> if a Principal is a member of the group. Specifically, the Principal's <code>getName()</code> method must
* return the same value as one of the Principals in the group member list. The Principal's type does <em>not</em> need to match.
*
- * @param principal the principal about whom membeship status is sought
+ * @param principal the principal about whom membership status is sought
* @return the result of the operation
*/
public boolean isMember( final Principal principal ) {
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/WebAuthorizer.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/WebAuthorizer.java
index dd6cf0856..ea9ec291a 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/WebAuthorizer.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/WebAuthorizer.java
@@ -25,7 +25,7 @@ import java.security.Principal;
/**
- * Extends the {@link org.apache.wiki.auth.Authorizer} interface by including a delgate method for
+ * Extends the {@link org.apache.wiki.auth.Authorizer} interface by including a delegate method for
* {@link javax.servlet.http.HttpServletRequest#isUserInRole(String)}.
*/
public interface WebAuthorizer extends Authorizer {
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/PermissionChecks.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/PermissionChecks.java
index 7eceb967f..caf0efe61 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/PermissionChecks.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/PermissionChecks.java
@@ -22,7 +22,7 @@ import java.security.Permission;
/**
- * Ususal permission checks
+ * Usual permission checks
*/
class PermissionChecks {
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/user/UserDatabase.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/user/UserDatabase.java
index cf649b2f1..f604e5024 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/user/UserDatabase.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/user/UserDatabase.java
@@ -50,7 +50,7 @@ public interface UserDatabase {
* a user with the supplied identifier, throws a {@link NoSuchPrincipalException}.
* </p>
* <p>
- * Note that if an implememtation wishes to mark one of the returned Principals as representing the user's common name, it should
+ * Note that if an implementation wishes to mark one of the returned Principals as representing the user's common name, it should
* instantiate this Principal using {@link org.apache.wiki.auth.WikiPrincipal#WikiPrincipal(String, String)} with the <code>type</code>
* parameter set to {@link org.apache.wiki.auth.WikiPrincipal#WIKI_NAME}. The method
* {@link org.apache.wiki.api.core.Session#getUserPrincipal()} will return this principal as the "primary" principal. Note that this method
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/CalendarTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/CalendarTag.java
index 7c334ca42..8feadddaa 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/CalendarTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/CalendarTag.java
@@ -90,7 +90,7 @@ public class CalendarTag extends WikiTagBase {
* Sets the page format. If a page corresponding to the format is found when
* the calendar is being rendered, a link to that page is created. E.g. if the
* format is set to <tt>'Main_blogentry_'ddMMyy</tt>, it works nicely in
- * conjuction to the WeblogPlugin.
+ * conjunction to the WeblogPlugin.
*
* @param format The format in the SimpleDateFormat fashion.
*
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/MessagesTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/MessagesTag.java
index dc428323b..cf1590850 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/MessagesTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/MessagesTag.java
@@ -26,13 +26,13 @@ import java.io.IOException;
/**
* Returns or clears the current messages associated with the user's wiki
* session. This tag accepts four attributes: <ul> <li><code>action</code> -
- * if "clear", the messsages will be cleared. Otherwise, this tag will always
+ * if "clear", the messages will be cleared. Otherwise, this tag will always
* print the set of current messages as either a single <p> tag (if there
* is only one message) or a bulleted list (if there is more than one).</li>
* <li><code>prefix</code> - the string to prepend to the list of errors, if
* there are any; default is empty string</li> <li><code>topic</code> - a
* collection for messages, for example those associated with a particular web
- * form. If not suppled, defaults to a generic (non-specific) collection</li>
+ * form. If not supplied, defaults to a generic (non-specific) collection</li>
* <li><code>div</code> - the <code>div</code> class to wrap the
* messages in; if not supplied, <code>information</code> is assumed</li></ul>
* @since 2.3.54
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/workflow/Step.java b/jspwiki-main/src/main/java/org/apache/wiki/workflow/Step.java
index 82d6fe1e7..084203b1d 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/workflow/Step.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/workflow/Step.java
@@ -166,7 +166,7 @@ public interface Step extends Serializable {
void start() throws WikiException;
/**
- * Sets the current Outcome for the step. If the Outcome is a "completion" Outcome, it should also sets the completon time and mark the
+ * Sets the current Outcome for the step. If the Outcome is a "completion" Outcome, it should also sets the completion time and mark the
* Step as complete. Once a Step has been marked complete, this method cannot be called again. If the supplied Outcome is not in the
* set returned by {@link #getAvailableOutcomes()}, or is not {@link Outcome#STEP_CONTINUE} or {@link Outcome#STEP_ABORT}, this method
* returns an IllegalArgumentException. If the caller attempts to set an Outcome and the Step has already completed, this method throws
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/workflow/SystemPrincipal.java b/jspwiki-main/src/main/java/org/apache/wiki/workflow/SystemPrincipal.java
index 192c41b7d..4de73ae41 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/workflow/SystemPrincipal.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/workflow/SystemPrincipal.java
@@ -22,7 +22,7 @@ import java.security.Principal;
/**
- * System users asociated with workflow Task steps.
+ * System users associated with workflow Task steps.
*/
public final class SystemPrincipal implements Principal {
diff --git a/jspwiki-util/src/main/java/org/apache/wiki/util/MailUtil.java b/jspwiki-util/src/main/java/org/apache/wiki/util/MailUtil.java
index 8b95639fd..efcf69b56 100644
--- a/jspwiki-util/src/main/java/org/apache/wiki/util/MailUtil.java
+++ b/jspwiki-util/src/main/java/org/apache/wiki/util/MailUtil.java
@@ -44,7 +44,7 @@ import java.util.Properties;
* <code>jspwiki.properties</code>.</p>
* <p>To enable e-mail functions within JSPWiki, administrators must do three things:
* ensure that the required JavaMail JARs are on the runtime classpath, configure
- * JavaMail appropriately, and (recommdended) configure the JNDI JavaMail session factory.</p>
+ * JavaMail appropriately, and (recommended) configure the JNDI JavaMail session factory.</p>
* <strong>JavaMail runtime JARs</strong>
* <p>The first step is easy: JSPWiki bundles
* recent versions of the required JavaMail <code>mail.jar</code> and
diff --git a/jspwiki-util/src/main/java/org/apache/wiki/util/comparators/HumanComparator.java b/jspwiki-util/src/main/java/org/apache/wiki/util/comparators/HumanComparator.java
index 2fe72fe6f..efbaa6e26 100644
--- a/jspwiki-util/src/main/java/org/apache/wiki/util/comparators/HumanComparator.java
+++ b/jspwiki-util/src/main/java/org/apache/wiki/util/comparators/HumanComparator.java
@@ -25,7 +25,7 @@ import java.util.Comparator;
/**
* A comparator that sorts Strings using "human" ordering, including decimal
- * ordering. Only works for languages where every character is lexigraphically
+ * ordering. Only works for languages where every character is lexicographically
* distinct and correctly unicode ordered (e.g. English). Other languages should use
* <code>CollatedHumanComparator</code>. Pretty efficient but still slower than
* String.compareTo().
diff --git a/jspwiki-war/src/main/styles/jspwiki_print.css b/jspwiki-war/src/main/styles/jspwiki_print.css
index d68ca3d09..e649d7163 100644
--- a/jspwiki-war/src/main/styles/jspwiki_print.css
+++ b/jspwiki-war/src/main/styles/jspwiki_print.css
@@ -20,7 +20,7 @@
*/
/*
- * CSS intended specificaly for print media
+ * CSS intended specifically for print media
*
*/
.applicationlogo, .companylogo, .titlebox, .userbox,
diff --git a/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/SyntaxDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/SyntaxDecorator.java
index 150336bfc..09a9d532d 100644
--- a/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/SyntaxDecorator.java
+++ b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/SyntaxDecorator.java
@@ -40,7 +40,7 @@ public interface SyntaxDecorator {
* @param preStack stack containing the amount of nested {@code pre}s.
* @param outTrimmer writer capable of trimming whitespaces and of checking if it's currently writing a line start.
* @param config xhtml to wiki configuration object.
- * @param chain chain (in the chain of responsabilities pattern) that is expected to be called by the different xhtml decorations.
+ * @param chain chain (in the chain of responsibilities patterns) that is expected to be called by the different xhtml decorations.
*/
void init( PrintWriter out, Deque< String > liStack, Deque< String > preStack, WhitespaceTrimWriter outTrimmer, XHtmlToWikiConfig config, XHtmlElementToWikiTranslator chain );