You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2022/10/21 10:56:58 UTC
[groovy] branch master updated: Polish org.codehaus.groovy.runtime package documentation
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/master by this push:
new 904841373d Polish org.codehaus.groovy.runtime package documentation
904841373d is described below
commit 904841373d4a4be04e2a1c675bde4b21baaef6b6
Author: Marc Wrobel <ma...@gmail.com>
AuthorDate: Tue Oct 18 13:37:51 2022 +0200
Polish org.codehaus.groovy.runtime package documentation
Fix typos and improve documentation (javadoc, comments) in the org.codehaus.groovy.runtime package.
Note that the following words / expressions were preferred :
- all of the -> all the (when possible because it is easier to read),
- whether or not -> whether (when possible because it is easier to read),
- sub-directory -> subdirectory (more common, see https://www.merriam-webster.com/dictionary/subdirectory),
- meta class -> metaclass (incorrect, see https://en.wikipedia.org/wiki/Metaclass).
A bunch of @return has been converted to method summary to fix the following sonatype-lift warnings: https://google.github.io/styleguide/javaguide.html#s7.2-summary-fragment.
Trailing whitespaces were also removed in the process.
---
.../codehaus/groovy/runtime/ConversionHandler.java | 2 +-
.../groovy/runtime/DefaultGroovyMethods.java | 106 ++++++++--------
.../groovy/runtime/EncodingGroovyMethods.java | 8 +-
.../org/codehaus/groovy/runtime/FormatHelper.java | 2 +-
.../org/codehaus/groovy/runtime/GStringImpl.java | 2 +-
.../codehaus/groovy/runtime/HandleMetaClass.java | 4 +-
.../codehaus/groovy/runtime/IOGroovyMethods.java | 2 +-
.../org/codehaus/groovy/runtime/InvokerHelper.java | 4 +-
.../codehaus/groovy/runtime/MetaClassHelper.java | 26 ++--
.../org/codehaus/groovy/runtime/MethodKey.java | 6 +-
.../codehaus/groovy/runtime/MethodRankHelper.java | 32 +++--
.../org/codehaus/groovy/runtime/NullObject.java | 4 +-
.../groovy/runtime/ProxyGeneratorAdapter.java | 2 +-
.../groovy/runtime/ResourceGroovyMethods.java | 28 ++---
.../groovy/runtime/ScriptBytecodeAdapter.java | 2 +-
.../groovy/runtime/StringGroovyMethods.java | 14 +--
.../groovy/runtime/callsite/CallSiteArray.java | 2 +-
.../callsite/ConstructorMetaMethodSite.java | 6 +-
.../groovy/runtime/callsite/ConstructorSite.java | 2 +-
.../runtime/callsite/MetaClassConstructorSite.java | 2 +-
.../groovy/runtime/callsite/MetaClassSite.java | 2 +-
.../callsite/PlainObjectMetaMethodSite.java | 2 +-
.../runtime/callsite/PogoMetaMethodSite.java | 2 +-
.../groovy/runtime/callsite/PojoMetaClassSite.java | 2 +-
.../runtime/callsite/PojoMetaMethodSite.java | 14 +--
.../runtime/callsite/StaticMetaClassSite.java | 2 +-
.../runtime/callsite/StaticMetaMethodSite.java | 14 +--
.../groovy/runtime/m12n/ExtensionModule.java | 2 +-
.../groovy/runtime/memoize/CommonCache.java | 4 +-
.../runtime/memoize/ConcurrentCommonCache.java | 4 +-
.../runtime/memoize/ConcurrentSoftCache.java | 4 +-
.../groovy/runtime/memoize/EvictableCache.java | 2 +-
.../groovy/runtime/memoize/StampedCommonCache.java | 4 +-
.../groovy/runtime/metaclass/ClosureMetaClass.java | 2 +-
.../runtime/metaclass/ConcurrentReaderHashMap.java | 134 ++++++++++-----------
.../runtime/metaclass/DefaultMetaClassInfo.java | 86 ++++++-------
.../runtime/metaclass/MetaClassRegistryImpl.java | 20 +--
.../runtime/metaclass/MultipleSetterProperty.java | 2 +-
.../runtime/metaclass/NewInstanceMetaMethod.java | 2 +-
.../typehandling/DefaultTypeTransformation.java | 2 +-
40 files changed, 280 insertions(+), 282 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/runtime/ConversionHandler.java b/src/main/java/org/codehaus/groovy/runtime/ConversionHandler.java
index 479e9cd38e..3babe01e46 100644
--- a/src/main/java/org/codehaus/groovy/runtime/ConversionHandler.java
+++ b/src/main/java/org/codehaus/groovy/runtime/ConversionHandler.java
@@ -45,7 +45,7 @@ public abstract class ConversionHandler implements InvocationHandler, Serializab
private MetaClass metaClass;
/**
- * Creates a ConversionHandler with an delegate.
+ * Creates a ConversionHandler with a delegate.
*
* @param delegate the delegate
* @throws IllegalArgumentException if the given delegate is null
diff --git a/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java b/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
index 08dc16de7d..ca9000e5b4 100644
--- a/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
+++ b/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
@@ -370,7 +370,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
/**
* Allows the closure to be called for the object reference self (similar
- * to <code>with</code> and always returns self.
+ * to <code>with</code>) and always returns self.
* <p>
* Any method invoked inside the closure will first be invoked on the
* self reference. For instance, the following method calls to the append()
@@ -3404,7 +3404,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
}
/**
- * Collates this array into into sub-lists.
+ * Collates this array into sub-lists.
*
* @param self an array
* @param size the length of each sub-list in the returned list
@@ -4007,7 +4007,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
/**
* Iterates through this Iterable transforming each item using the closure
- * as a transformer into a map entry, returning the supplied map with all of the transformed entries added to it.
+ * as a transformer into a map entry, returning the supplied map with all the transformed entries added to it.
* <pre class="groovyTestCase">
* def letters = "abc"
* // collect letters with index
@@ -4815,12 +4815,12 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
}
/**
- * Returns <tt>true</tt> if this iterable contains all of the elements
+ * Returns <tt>true</tt> if this iterable contains all the elements
* in the specified array.
*
* @param self an Iterable to be checked for containment
* @param items array to be checked for containment in this iterable
- * @return <tt>true</tt> if this collection contains all of the elements
+ * @return <tt>true</tt> if this collection contains all the elements
* in the specified array
* @see Collection#containsAll(Collection)
* @since 2.4.0
@@ -4979,7 +4979,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
}
/**
- * Modifies the collection by adding all of the elements in the specified array to the collection.
+ * Modifies the collection by adding all the elements in the specified array to the collection.
* The behavior of this operation is undefined if
* the specified array is modified while the operation is in progress.
*
@@ -4997,7 +4997,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
}
/**
- * Modifies this list by inserting all of the elements in the specified array into the
+ * Modifies this list by inserting all the elements in the specified array into the
* list at the specified position. Shifts the
* element currently at that position (if any) and any subsequent
* elements to the right (increases their indices). The new elements
@@ -5151,7 +5151,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
*
* @param self a Collection of lists
* @param function a closure to be called on each combination
- * @return a List of the results of applying the closure to each combinations found
+ * @return a List of the results of applying the closure to each combination found
* @see groovy.util.GroovyCollections#combinations(Iterable)
* @since 2.2.0
*/
@@ -5996,7 +5996,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
* <pre class="groovyTestCase">assert 1+2+3+4 == [1,2,3,4].sum()</pre>
*
* @param self Iterable of values to add together
- * @return The sum of all of the items
+ * @return The sum of all the items
* @see #sum(Iterator)
* @since 2.2.0
*/
@@ -6009,7 +6009,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
* "plus" method on all items in the array.
*
* @param self The array of values to add together
- * @return The sum of all of the items
+ * @return The sum of all the items
* @see #sum(java.util.Iterator)
* @since 1.7.1
*/
@@ -6023,7 +6023,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
* exhausted of elements after determining the sum value.
*
* @param self an Iterator for the values to add together
- * @return The sum of all of the items
+ * @return The sum of all the items
* @since 1.5.5
*/
public static Object sum(Iterator<Object> self) {
@@ -6073,7 +6073,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
*
* @param self an Iterable of values to sum
* @param initialValue the items in the collection will be summed to this initial value
- * @return The sum of all of the items.
+ * @return The sum of all the items.
* @see #sum(Iterator, Object)
* @since 2.2.0
*/
@@ -6086,7 +6086,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
*
* @param self an array of values to sum
* @param initialValue the items in the array will be summed to this initial value
- * @return The sum of all of the items.
+ * @return The sum of all the items.
* @since 1.7.1
*/
public static Object sum(Object[] self, Object initialValue) {
@@ -6100,7 +6100,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
*
* @param self an Iterator for the values to add together
* @param initialValue the items in the collection will be summed to this initial value
- * @return The sum of all of the items
+ * @return The sum of all the items
* @since 1.5.5
*/
public static Object sum(Iterator<?> self, Object initialValue) {
@@ -6283,7 +6283,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
* </pre>
*
* @param self Iterable of values to average
- * @return The average of all of the items
+ * @return The average of all the items
* @see #average(Iterator)
* @since 3.0.0
*/
@@ -6300,7 +6300,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
* </pre>
*
* @param self The array of values to average
- * @return The average of all of the items
+ * @return The average of all the items
* @see #sum(java.lang.Object[])
* @since 3.0.0
*/
@@ -6339,7 +6339,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
* </pre>
*
* @param self an Iterator for the values to average
- * @return The average of all of the items
+ * @return The average of all the items
* @since 3.0.0
*/
public static Object average(Iterator<?> self) {
@@ -6507,7 +6507,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
/**
* Concatenates the <code>toString()</code> representation of each
- * items in this array, with the given String as a separator between each
+ * item in this array, with the given String as a separator between each
* item.
*
* @param self an array of Object
@@ -7519,7 +7519,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
* or with more options {@link #withDefault(Map, boolean, boolean, Closure)}.
*
* @param map a Map
- * @param key the key to lookup the value of
+ * @param key the key to look up the value
* @param defaultValue the value to return and add to the map for this key if
* there is no entry for the given key
* @return the value of the given key or the default value, added to the map if the
@@ -9977,7 +9977,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
}
/**
- * Returns an Iterator containing all of the items from this iterator except the last one.
+ * Returns an Iterator containing all the items from this iterator except the last one.
* <pre class="groovyTestCase">
* def iter = [3, 4, 2].listIterator()
* def result = iter.init()
@@ -10064,7 +10064,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
* @param self the original List
* @param num the number of elements to take from this List
* @return a List consisting of the first <code>num</code> elements from this List,
- * or else all the elements from the List if it has less then <code>num</code> elements.
+ * or else all the elements from the List if it has less than <code>num</code> elements.
* @since 1.8.1
*/
public static <T> List<T> take(List<T> self, int num) {
@@ -10083,7 +10083,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
* @param self the original SortedSet
* @param num the number of elements to take from this SortedSet
* @return a SortedSet consisting of the first <code>num</code> elements from this List,
- * or else all the elements from the SortedSet if it has less then <code>num</code> elements.
+ * or else all the elements from the SortedSet if it has less than <code>num</code> elements.
* @since 2.4.0
*/
public static <T> SortedSet<T> take(SortedSet<T> self, int num) {
@@ -10102,7 +10102,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
* @param self the original array
* @param num the number of elements to take from this array
* @return an array consisting of the first <code>num</code> elements of this array,
- * or else the whole array if it has less then <code>num</code> elements.
+ * or else the whole array if it has less than <code>num</code> elements.
* @since 1.8.1
*/
public static <T> T[] take(T[] self, int num) {
@@ -10142,7 +10142,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
* @param self the original Iterable
* @param num the number of elements to take from this Iterable
* @return a Collection consisting of the first <code>num</code> elements from this Iterable,
- * or else all the elements from the Iterable if it has less then <code>num</code> elements.
+ * or else all the elements from the Iterable if it has less than <code>num</code> elements.
* @since 1.8.7
*/
public static <T> Collection<T> take(Iterable<T> self, int num) {
@@ -10196,7 +10196,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
* @param self the original map
* @param num the number of elements to take from this map
* @return a new map consisting of the first <code>num</code> elements of this map,
- * or else the whole map if it has less then <code>num</code> elements.
+ * or else the whole map if it has less than <code>num</code> elements.
* @since 1.8.1
*/
public static <K, V> Map<K, V> take(Map<K, V> self, int num) {
@@ -10278,7 +10278,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
* @param self the original array
* @param num the number of elements to take from this array
* @return an array consisting of the last <code>num</code> elements of this array,
- * or else the whole array if it has less then <code>num</code> elements.
+ * or else the whole array if it has less than <code>num</code> elements.
* @since 2.4.0
*/
public static <T> T[] takeRight(T[] self, int num) {
@@ -10318,7 +10318,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
* @param self the original Iterable
* @param num the number of elements to take from this Iterable
* @return a Collection consisting of the last <code>num</code> elements from this Iterable,
- * or else all the elements from the Iterable if it has less then <code>num</code> elements.
+ * or else all the elements from the Iterable if it has less than <code>num</code> elements.
* @since 2.4.0
*/
public static <T> Collection<T> takeRight(Iterable<T> self, int num) {
@@ -10348,7 +10348,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
* @param self the original List
* @param num the number of elements to take from this List
* @return a List consisting of the last <code>num</code> elements from this List,
- * or else all the elements from the List if it has less then <code>num</code> elements.
+ * or else all the elements from the List if it has less than <code>num</code> elements.
* @since 2.4.0
*/
public static <T> List<T> takeRight(List<T> self, int num) {
@@ -10367,7 +10367,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
* @param self the original SortedSet
* @param num the number of elements to take from this SortedSet
* @return a SortedSet consisting of the last <code>num</code> elements from this SortedSet,
- * or else all the elements from the SortedSet if it has less then <code>num</code> elements.
+ * or else all the elements from the SortedSet if it has less than <code>num</code> elements.
* @since 2.4.0
*/
public static <T> SortedSet<T> takeRight(SortedSet<T> self, int num) {
@@ -10386,7 +10386,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
* @param self the original SortedSet
* @param num the number of elements to drop from this Iterable
* @return a SortedSet consisting of all the elements of this Iterable minus the first <code>num</code> elements,
- * or an empty list if it has less then <code>num</code> elements.
+ * or an empty list if it has less than <code>num</code> elements.
* @since 2.4.0
*/
public static <T> SortedSet<T> drop(SortedSet<T> self, int num) {
@@ -10405,7 +10405,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
* @param self the original List
* @param num the number of elements to drop from this Iterable
* @return a List consisting of all the elements of this Iterable minus the first <code>num</code> elements,
- * or an empty list if it has less then <code>num</code> elements.
+ * or an empty list if it has less than <code>num</code> elements.
* @since 1.8.1
*/
public static <T> List<T> drop(List<T> self, int num) {
@@ -10433,7 +10433,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
* @param self the original Iterable
* @param num the number of elements to drop from this Iterable
* @return a Collection consisting of all the elements of this Iterable minus the first <code>num</code> elements,
- * or an empty list if it has less then <code>num</code> elements.
+ * or an empty list if it has less than <code>num</code> elements.
* @since 1.8.7
*/
public static <T> Collection<T> drop(Iterable<T> self, int num) {
@@ -10550,7 +10550,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
* @param self the original SortedSet
* @param num the number of elements to drop from this SortedSet
* @return a List consisting of all the elements of this SortedSet minus the last <code>num</code> elements,
- * or an empty SortedSet if it has less then <code>num</code> elements.
+ * or an empty SortedSet if it has less than <code>num</code> elements.
* @since 2.4.0
*/
public static <T> SortedSet<T> dropRight(SortedSet<T> self, int num) {
@@ -10569,7 +10569,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
* @param self the original List
* @param num the number of elements to drop from this List
* @return a List consisting of all the elements of this List minus the last <code>num</code> elements,
- * or an empty List if it has less then <code>num</code> elements.
+ * or an empty List if it has less than <code>num</code> elements.
* @since 2.4.0
*/
public static <T> List<T> dropRight(List<T> self, int num) {
@@ -10597,7 +10597,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
* @param self the original Iterable
* @param num the number of elements to drop from this Iterable
* @return a Collection consisting of all the elements of this Iterable minus the last <code>num</code> elements,
- * or an empty list if it has less then <code>num</code> elements.
+ * or an empty list if it has less than <code>num</code> elements.
* @since 2.4.0
*/
public static <T> Collection<T> dropRight(Iterable<T> self, int num) {
@@ -10631,7 +10631,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
* @param self the original Iterator
* @param num the number of elements to drop
* @return an Iterator consisting of all the elements of this Iterator minus the last <code>num</code> elements,
- * or an empty Iterator if it has less then <code>num</code> elements.
+ * or an empty Iterator if it has less than <code>num</code> elements.
* @since 2.4.0
*/
public static <T> Iterator<T> dropRight(Iterator<T> self, int num) {
@@ -11389,7 +11389,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
/**
* Converts the given iterable to another type.
*
- * @param iterable a Iterable
+ * @param iterable an Iterable
* @param clazz the desired class
* @return the object resulting from this type conversion
* @see #asType(Collection, Class)
@@ -12211,7 +12211,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
}
/**
- * Creates a new List by inserting all of the elements in the specified array
+ * Creates a new List by inserting all the elements in the specified array
* to the elements from the original List at the specified index.
* Shifts the element currently at that index (if any) and any subsequent
* elements to the right (increasing their indices).
@@ -12243,7 +12243,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
}
/**
- * Creates a new List by inserting all of the elements in the given additions List
+ * Creates a new List by inserting all the elements in the given additions List
* to the elements from the original List at the specified index.
* Shifts the element currently at that index (if any) and any subsequent
* elements to the right (increasing their indices). The new elements
@@ -12274,7 +12274,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
}
/**
- * Creates a new List by inserting all of the elements in the given Iterable
+ * Creates a new List by inserting all the elements in the given Iterable
* to the elements from this List at the specified index.
*
* @param self an original list
@@ -13725,7 +13725,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
}
/**
- * Implementation of the left shift operator for integral types. Non integral
+ * Implementation of the left shift operator for integral types. Non-integral
* Number types throw UnsupportedOperationException.
*
* @param self a Number object
@@ -13738,7 +13738,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
}
/**
- * Implementation of the right shift operator for integral types. Non integral
+ * Implementation of the right shift operator for integral types. Non-integral
* Number types throw UnsupportedOperationException.
*
* @param self a Number object
@@ -13751,7 +13751,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
}
/**
- * Implementation of the right shift (unsigned) operator for integral types. Non integral
+ * Implementation of the right shift (unsigned) operator for integral types. Non-integral
* Number types throw UnsupportedOperationException.
*
* @param self a Number object
@@ -15366,7 +15366,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
*
* @param self a BigDecimal
* @param exponent an Integer exponent
- * @return a Number to the power of a the exponent
+ * @return a Number to the power of the exponent
*/
public static Number power(BigDecimal self, Integer exponent) {
if (exponent >= 0) {
@@ -15383,7 +15383,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
*
* @param self a BigInteger
* @param exponent an Integer exponent
- * @return a Number to the power of a the exponent
+ * @return a Number to the power of the exponent
*/
public static Number power(BigInteger self, Integer exponent) {
if (exponent >= 0) {
@@ -15401,7 +15401,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
*
* @param self an Integer
* @param exponent an Integer exponent
- * @return a Number to the power of a the exponent
+ * @return a Number to the power of the exponent
*/
public static Number power(Integer self, Integer exponent) {
if (exponent >= 0) {
@@ -15424,7 +15424,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
*
* @param self a Long
* @param exponent an Integer exponent
- * @return a Number to the power of a the exponent
+ * @return a Number to the power of the exponent
*/
public static Number power(Long self, Integer exponent) {
if (exponent >= 0) {
@@ -15444,7 +15444,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
*
* @param self a BigInteger
* @param exponent a BigInteger exponent
- * @return a BigInteger to the power of a the exponent
+ * @return a BigInteger to the power of the exponent
* @since 2.3.8
*/
public static BigInteger power(BigInteger self, BigInteger exponent) {
@@ -15647,7 +15647,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
* Bitwise XOR together two Numbers. Called when the '^' operator is used.
*
* @param left a Number
- * @param right another Number to bitwse XOR
+ * @param right another Number to bitwise XOR
* @return the bitwise XOR of both Numbers
* @since 1.0
*/
@@ -15668,7 +15668,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
}
/**
- * Negates the number. Equivalent to the '-' operator when it preceeds
+ * Negates the number. Equivalent to the '-' operator when it precedes
* a single operand, i.e. <code>-10</code>
*
* @param left a Number
@@ -15681,7 +15681,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
/**
* Returns the number, effectively being a noop for numbers.
- * Operator overloaded form of the '+' operator when it preceeds
+ * Operator overloaded form of the '+' operator when it precedes
* a single operand, i.e. <code>+10</code>
*
* @param left a Number
@@ -16430,7 +16430,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
* <p>
* Note that this method differs from {@link java.math.BigDecimal#round(java.math.MathContext)}
* which specifies the digits to retain starting from the leftmost nonzero
- * digit. This methods rounds the integral part to the nearest whole number.
+ * digit. This method rounds the integral part to the nearest whole number.
*
* @param number a BigDecimal
* @return the rounded value of that BigDecimal
@@ -16668,7 +16668,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
}
/**
- * Transform this number to a the given type, using the 'as' operator. The
+ * Transform this number to the given type, using the 'as' operator. The
* following types are supported in addition to the default
* {@link #asType(java.lang.Object, java.lang.Class)}:
* <ul>
diff --git a/src/main/java/org/codehaus/groovy/runtime/EncodingGroovyMethods.java b/src/main/java/org/codehaus/groovy/runtime/EncodingGroovyMethods.java
index a0991e8742..5f8d53e217 100644
--- a/src/main/java/org/codehaus/groovy/runtime/EncodingGroovyMethods.java
+++ b/src/main/java/org/codehaus/groovy/runtime/EncodingGroovyMethods.java
@@ -52,7 +52,7 @@ public class EncodingGroovyMethods {
* information on Base64 encoding and chunking see <code>RFC 4648</code>.
*
* @param data Byte array to be encoded
- * @param chunked whether or not the Base64 encoded data should be MIME chunked
+ * @param chunked whether the Base64 encoded data should be MIME chunked
* @return object which will write the Base64 encoding of the byte array
* @since 1.5.1
*/
@@ -79,7 +79,7 @@ public class EncodingGroovyMethods {
* information on Base64 encoding and chunking see <code>RFC 4648</code>.
*
* @param data byte array to be encoded
- * @param chunked whether or not the Base64 encoded data should be MIME chunked
+ * @param chunked whether the Base64 encoded data should be MIME chunked
* @return object which will write the Base64 encoding of the byte array
* @since 1.5.7
*/
@@ -187,7 +187,7 @@ public class EncodingGroovyMethods {
* Base 64 Encoding with URL and Filename Safe Alphabet</code>.
*
* @param data Byte array to be encoded
- * @param pad whether or not the encoded data should be padded
+ * @param pad whether the encoded data should be padded
* @return object which will write the Base64 URL and Filename Safe encoding of the byte array
* @since 2.5.0
*/
@@ -221,7 +221,7 @@ public class EncodingGroovyMethods {
* Base 64 Encoding with URL and Filename Safe Alphabet</code>.
*
* @param data Byte array to be encoded
- * @param pad whether or not the encoded data should be padded
+ * @param pad whether the encoded data should be padded
* @return object which will write the Base64 URL and Filename Safe encoding of the byte array
* @since 2.5.0
*/
diff --git a/src/main/java/org/codehaus/groovy/runtime/FormatHelper.java b/src/main/java/org/codehaus/groovy/runtime/FormatHelper.java
index 66127320e6..0e0b93f597 100644
--- a/src/main/java/org/codehaus/groovy/runtime/FormatHelper.java
+++ b/src/main/java/org/codehaus/groovy/runtime/FormatHelper.java
@@ -112,7 +112,7 @@ public class FormatHelper {
* </pre>
*
* @param options a map of configuration options
- * @param arguments the argument(s) to calulate the {@code toString} for
+ * @param arguments the argument(s) to calculate the {@code toString} for
* @return the string rendering of the argument(s)
* @see DefaultGroovyMethods#inspect(Object)
*/
diff --git a/src/main/java/org/codehaus/groovy/runtime/GStringImpl.java b/src/main/java/org/codehaus/groovy/runtime/GStringImpl.java
index e63475d43f..9d7fc95192 100644
--- a/src/main/java/org/codehaus/groovy/runtime/GStringImpl.java
+++ b/src/main/java/org/codehaus/groovy/runtime/GStringImpl.java
@@ -119,7 +119,7 @@ public class GStringImpl extends GString {
/**
* Get the strings of this GString.
* <p>
- * This methods returns the same array as used in the constructor.
+ * This method returns the same array as used in the constructor.
* Changing the values will result in changes of the GString.
* It is generally not recommended to do so.
*/
diff --git a/src/main/java/org/codehaus/groovy/runtime/HandleMetaClass.java b/src/main/java/org/codehaus/groovy/runtime/HandleMetaClass.java
index 09c659d828..a5ef820bbb 100644
--- a/src/main/java/org/codehaus/groovy/runtime/HandleMetaClass.java
+++ b/src/main/java/org/codehaus/groovy/runtime/HandleMetaClass.java
@@ -39,9 +39,9 @@ public class HandleMetaClass extends DelegatingMetaClass {
super(mc);
if (obj != null) {
if (InvokerHelper.getMetaClass(obj.getClass()) == mc || !(mc instanceof ExpandoMetaClass))
- object = obj; // object has default meta class, so we need to replace it on demand
+ object = obj; // object has default metaclass, so we need to replace it on demand
else
- object = NONE; // object already has per instance meta class
+ object = NONE; // object already has per instance metaclass
}
}
diff --git a/src/main/java/org/codehaus/groovy/runtime/IOGroovyMethods.java b/src/main/java/org/codehaus/groovy/runtime/IOGroovyMethods.java
index 4f7633fed6..e104966b6d 100644
--- a/src/main/java/org/codehaus/groovy/runtime/IOGroovyMethods.java
+++ b/src/main/java/org/codehaus/groovy/runtime/IOGroovyMethods.java
@@ -989,7 +989,7 @@ public class IOGroovyMethods extends DefaultGroovyMethodsSupport {
}
/**
- * Standard iterator for a input stream which iterates through the stream
+ * Standard iterator for an input stream which iterates through the stream
* content in a byte-based fashion.
*
* @param self an InputStream object
diff --git a/src/main/java/org/codehaus/groovy/runtime/InvokerHelper.java b/src/main/java/org/codehaus/groovy/runtime/InvokerHelper.java
index a83fbbaced..b6fa036b7d 100644
--- a/src/main/java/org/codehaus/groovy/runtime/InvokerHelper.java
+++ b/src/main/java/org/codehaus/groovy/runtime/InvokerHelper.java
@@ -125,7 +125,7 @@ public class InvokerHelper {
}
return answer;
}
- // let's assume its a collection of 1
+ // let's assume it's a collection of 1
return Collections.singletonList(value);
}
@@ -652,7 +652,7 @@ public class InvokerHelper {
}
/**
- * Converts the given object into an array; if its an array then just
+ * Converts the given object into an array; if it's an array then just
* cast otherwise wrap it in an array
*/
public static Object[] asArray(Object arguments) {
diff --git a/src/main/java/org/codehaus/groovy/runtime/MetaClassHelper.java b/src/main/java/org/codehaus/groovy/runtime/MetaClassHelper.java
index d567f76210..df51723ea2 100644
--- a/src/main/java/org/codehaus/groovy/runtime/MetaClassHelper.java
+++ b/src/main/java/org/codehaus/groovy/runtime/MetaClassHelper.java
@@ -378,7 +378,7 @@ public class MetaClassHelper {
long ret = 0;
int noVargsLength = parametersLength - 1;
- // if the number of parameters does not match we have
+ // if the number of parameters does not match we have
// a vargs usage
//
// case A: arguments.length<parameters.length
@@ -392,13 +392,13 @@ public class MetaClassHelper {
// case B: arguments.length>parameters.length
//
// In this case all arguments with a index bigger than
- // paramMinus1 are part of the vargs, so a
- // distance calculation needs to be done against
+ // paramMinus1 are part of the vargs, so a
+ // distance calculation needs to be done against
// parameters[noVargsLength].getComponentType()
//
// VArgs penalty: 2l+arguments.length-parameters.length
//
- // case C: arguments.length==parameters.length &&
+ // case C: arguments.length==parameters.length &&
// isAssignableFrom( parameters[noVargsLength],
// arguments[noVargsLength] )
//
@@ -406,11 +406,11 @@ public class MetaClassHelper {
//
// VArgs penalty: 0l
//
- // case D: arguments.length==parameters.length &&
+ // case D: arguments.length==parameters.length &&
// !isAssignableFrom( parameters[noVargsLength],
// arguments[noVargsLength] )
//
- // In this case we have a vargs case again, we need
+ // In this case we have a vargs case again, we need
// to calculate arguments[noVargsLength] against
// parameters[noVargsLength].getComponentType
//
@@ -458,7 +458,7 @@ public class MetaClassHelper {
* assert foo(new Object(),new Object()) == 2
* --> D preferred over B
*
- * This gives C<A<D<B
+ * This gives C<A<D<B
*/
// first we calculate all arguments, that are for sure not part
@@ -597,7 +597,7 @@ public class MetaClassHelper {
return answer;
}
- //
+ //
/**
* @param list a list of MetaMethods
@@ -663,7 +663,7 @@ public class MetaClassHelper {
baseClass = fallback;
}
/*
- * If no specific super class has been found and type fallback is an interface, check if all arg classes
+ * If no specific super class has been found and type fallback is an interface, check if all arg classes
* implement it. If yes, then that interface is the common type across arguments.
*/
if (baseClass == Object.class && fallback.isInterface()) {
@@ -723,7 +723,7 @@ public class MetaClassHelper {
/**
* Returns a callable object for the given method name on the object.
* The object acts like a Closure in that it can be called, like a closure
- * and passed around - though really its a method pointer, not a closure per se.
+ * and passed around - though really it's a method pointer, not a closure per se.
*
* @param object the object containing the method
* @param methodName the method of interest
@@ -1004,14 +1004,14 @@ public class MetaClassHelper {
}
/**
- * Sets the meta class for an object, by delegating to the appropriate
+ * Sets the metaclass for an object, by delegating to the appropriate
* {@link DefaultGroovyMethods} helper method. This method was introduced as
* a breaking change in 2.0 to solve rare cases of stack overflow. See GROOVY-5285.
*
- * The method is named doSetMetaClass in order to prevent misusages. Do not use
+ * The method is named doSetMetaClass in order to prevent misuses. Do not use
* this method directly unless you know what you do.
*
- * @param self the object for which to set the meta class
+ * @param self the object for which to set the metaclass
* @param mc the metaclass
*/
public static void doSetMetaClass(Object self, MetaClass mc) {
diff --git a/src/main/java/org/codehaus/groovy/runtime/MethodKey.java b/src/main/java/org/codehaus/groovy/runtime/MethodKey.java
index 1dc93b55be..e0afed21cd 100644
--- a/src/main/java/org/codehaus/groovy/runtime/MethodKey.java
+++ b/src/main/java/org/codehaus/groovy/runtime/MethodKey.java
@@ -24,7 +24,7 @@ import java.util.List;
/**
- * An abstract base class for a key used for comparators and Map keys to lookup a method by
+ * An abstract base class for a key used for comparators and Map keys to look up a method by
* name and parameter types
*/
public abstract class MethodKey {
@@ -41,7 +41,7 @@ public abstract class MethodKey {
}
/**
- * Creates an immutable copy that we can cache.
+ * Creates an immutable copy that we can cache.
*/
public MethodKey createCopy() {
int size = getParameterCount();
@@ -120,7 +120,7 @@ public abstract class MethodKey {
/** @todo we should use the real Josh Bloch algorithm here */
// can't remember the exact Josh Bloch algorithm and I've not got the book handy
- // but its something like this IIRC
+ // but it's something like this IIRC
for (int i = 0; i < size; i++) {
answer *= 37;
answer += 1 + getParameterType(i).hashCode();
diff --git a/src/main/java/org/codehaus/groovy/runtime/MethodRankHelper.java b/src/main/java/org/codehaus/groovy/runtime/MethodRankHelper.java
index 5f7b92c043..d013826a28 100644
--- a/src/main/java/org/codehaus/groovy/runtime/MethodRankHelper.java
+++ b/src/main/java/org/codehaus/groovy/runtime/MethodRankHelper.java
@@ -35,13 +35,13 @@ import java.util.Set;
/**
* Utility class for MissingMethodException, MissingPropertyException etc.
* This class contains methods assisting in ranking and listing probable intended
- * methods/fields when a exception is thrown.
+ * methods/fields when an exception is thrown.
*/
public class MethodRankHelper{
//These are the costs for the various edit operations
//they are used by the two DamerauLevenshtein implementations
public static final int DL_SUBSTITUTION = 10;
- public static final int DL_DELETE = 10; //This is also the cost for a insert
+ public static final int DL_DELETE = 10; //This is also the cost for an insert
public static final int DL_TRANSPOSITION = 5;
public static final int DL_CASE = 5;
@@ -62,7 +62,7 @@ public class MethodRankHelper{
/**
* Returns a string detailing possible solutions to a missing method
- * if no good solutions can be found a empty string is returned.
+ * if no good solutions can be found an empty string is returned.
*
* @param methodName the name of the method that doesn't exist
* @param type the class on which the method is invoked
@@ -140,7 +140,7 @@ public class MethodRankHelper{
/**
* Returns a string detailing possible solutions to a missing constructor
- * if no good solutions can be found a empty string is returned.
+ * if no good solutions can be found an empty string is returned.
*
* @param arguments the arguments passed to the constructor
* @param type the class on which the constructor is invoked
@@ -165,7 +165,7 @@ public class MethodRankHelper{
/**
* Returns a string detailing possible solutions to a missing field or property
- * if no good solutions can be found a empty string is returned.
+ * if no good solutions can be found an empty string is returned.
*
* @param fieldName the missing field
* @param type the class on which the field is sought
@@ -252,9 +252,8 @@ public class MethodRankHelper{
}
/**
- * This class wraps a method object and a score variable so methods
- * Can easily be ranked by their likeness to a another method
- *
+ * This class wraps a method object and a score variable so methods
+ * can easily be ranked by their likeness to another method
*/
private static final class RankableMethod implements Comparable {
final MetaMethod m;
@@ -313,9 +312,8 @@ public class MethodRankHelper{
}
/**
- * This class wraps a method object and a score variable so methods
- * Can easily be ranked by their likeness to a another method
- *
+ * This class wraps a method object and a score variable so methods
+ * can easily be ranked by their likeness to another method
*/
private static final class RankableConstructor implements Comparable {
final Constructor c;
@@ -341,8 +339,8 @@ public class MethodRankHelper{
}
/**
- * This class wraps a method object and a score variable so methods
- * Can easily be ranked by their likeness to a another method
+ * This class wraps a method object and a score variable so methods
+ * can easily be ranked by their likeness to another method
*
*/
private static final class RankableField implements Comparable {
@@ -398,7 +396,7 @@ public class MethodRankHelper{
/**
* This is a slightly modified version of the Damerau Levenshtein distance
- * algorithm. It has a additional test to see if a character has switched case,
+ * algorithm. It has an additional test to see if a character has switched case,
* in the original algorithm this counts as a substitution.
* The "cost" for a substitution is given as 10 instead of 1 in this version,
* this enables transpositions and case modifications to have a lower cost than
@@ -406,7 +404,7 @@ public class MethodRankHelper{
*
* Currently the lowercase versions of t_j and s_i isn't cached, its probable
* that some speed could be gained from this.
- *
+ *
* This version is based on Chas Emerick's implementation of Levenshtein Distance
* for jakarta commons.
* @param s a CharSequence
@@ -452,7 +450,7 @@ public class MethodRankHelper{
for (i = 1; i <= n; i++) {
s_i = s.charAt(i - 1);
if (Character.isLowerCase(s_i) ^ Character.isLowerCase(t_j)) {
- //if s_i and t_i don't have have the same case
+ //if s_i and t_i don't have the same case
cost = caselessCompare(s_i, t_j) ? DL_CASE : DL_SUBSTITUTION;
} else {
//if they share case check for substitution
@@ -496,7 +494,7 @@ public class MethodRankHelper{
}
/**
- * This is a implementation of DL distance between two Object arrays instead
+ * This is an implementation of DL distance between two Object arrays instead
* of character streams. The objects are compared using their equals method.
* No objects may be null.
* This implementation is based on Chas Emerick's implementation of Levenshtein Distance
diff --git a/src/main/java/org/codehaus/groovy/runtime/NullObject.java b/src/main/java/org/codehaus/groovy/runtime/NullObject.java
index c4703e24f9..6e68e40b6e 100644
--- a/src/main/java/org/codehaus/groovy/runtime/NullObject.java
+++ b/src/main/java/org/codehaus/groovy/runtime/NullObject.java
@@ -75,7 +75,7 @@ public class NullObject extends GroovyObjectSupport {
/**
* Tries to set a property on null, which will always fail
*
- * @param property - the proprty to set
+ * @param property - the property to set
* @param newValue - the new value of the property
*/
@Override
@@ -131,7 +131,7 @@ public class NullObject extends GroovyObjectSupport {
/**
* Fallback for null+null.
* The result is always a NPE. The plus(String) version will catch
- * the case of adding a non null String to null.
+ * the case of adding a non-null String to null.
*
* @param o - the Object
* @return nothing
diff --git a/src/main/java/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java b/src/main/java/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java
index d08ca291f5..5451b25adf 100644
--- a/src/main/java/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java
+++ b/src/main/java/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java
@@ -382,7 +382,7 @@ public class ProxyGeneratorAdapter extends ClassVisitor {
* Visit every class/interface this proxy should implement, and generate the appropriate
* bytecode for delegation if available.
*
- * @param clazz an class for which to generate bytecode
+ * @param clazz a class for which to generate bytecode
*/
private void visitClass(final Class<?> clazz) {
Method[] methods = clazz.getDeclaredMethods();
diff --git a/src/main/java/org/codehaus/groovy/runtime/ResourceGroovyMethods.java b/src/main/java/org/codehaus/groovy/runtime/ResourceGroovyMethods.java
index 9a25ed154c..25d434eec4 100644
--- a/src/main/java/org/codehaus/groovy/runtime/ResourceGroovyMethods.java
+++ b/src/main/java/org/codehaus/groovy/runtime/ResourceGroovyMethods.java
@@ -1259,7 +1259,7 @@ public class ResourceGroovyMethods extends DefaultGroovyMethodsSupport {
}
/**
- * Processes each descendant file in this directory and any sub-directories.
+ * Processes each descendant file in this directory and any subdirectories.
* Processing consists of potentially calling <code>closure</code> passing it the current
* file (which may be a normal file or subdirectory) and then if a subdirectory was encountered,
* recursively processing the subdirectory. Whether the closure is called is determined by whether
@@ -1289,7 +1289,7 @@ public class ResourceGroovyMethods extends DefaultGroovyMethodsSupport {
}
/**
- * Processes each descendant file in this directory and any sub-directories.
+ * Processes each descendant file in this directory and any subdirectories.
* Processing consists of potentially calling <code>closure</code> passing it the current
* file (which may be a normal file or subdirectory) and then if a subdirectory was encountered,
* recursively processing the subdirectory.
@@ -1439,7 +1439,7 @@ public class ResourceGroovyMethods extends DefaultGroovyMethodsSupport {
}
/**
- * Processes each descendant file in this directory and any sub-directories.
+ * Processes each descendant file in this directory and any subdirectories.
* Convenience method for {@link #traverse(java.io.File, java.util.Map, groovy.lang.Closure)} when
* no options to alter the traversal behavior are required.
*
@@ -1545,7 +1545,7 @@ public class ResourceGroovyMethods extends DefaultGroovyMethodsSupport {
}
/**
- * Processes each descendant file in this directory and any sub-directories.
+ * Processes each descendant file in this directory and any subdirectories.
* Processing consists of calling <code>closure</code> passing it the current
* file (which may be a normal file or subdirectory) and then if a subdirectory was encountered,
* recursively processing the subdirectory.
@@ -2144,7 +2144,7 @@ public class ResourceGroovyMethods extends DefaultGroovyMethodsSupport {
/**
* Create a new PrintWriter for this file which is then
- * passed it into the given closure. This method ensures its the writer
+ * passed it into the given closure. This method ensures the writer
* is closed after the closure returns.
*
* @param file a File
@@ -2307,7 +2307,7 @@ public class ResourceGroovyMethods extends DefaultGroovyMethodsSupport {
*
* @param url a URL
* @return a BufferedReader for the URL
- * @throws MalformedURLException is thrown if the URL is not well formed
+ * @throws MalformedURLException is thrown if the URL is not well-formed
* @throws IOException if an I/O error occurs while creating the input stream
* @since 1.5.5
*/
@@ -2330,7 +2330,7 @@ public class ResourceGroovyMethods extends DefaultGroovyMethodsSupport {
* @param url a URL
* @param parameters connection parameters
* @return a BufferedReader for the URL
- * @throws MalformedURLException is thrown if the URL is not well formed
+ * @throws MalformedURLException is thrown if the URL is not well-formed
* @throws IOException if an I/O error occurs while creating the input stream
* @since 1.8.1
*/
@@ -2352,7 +2352,7 @@ public class ResourceGroovyMethods extends DefaultGroovyMethodsSupport {
* @param url a URL
* @param charset opens the stream with a specified charset
* @return a BufferedReader for the URL
- * @throws MalformedURLException is thrown if the URL is not well formed
+ * @throws MalformedURLException is thrown if the URL is not well-formed
* @throws IOException if an I/O error occurs while creating the input stream
* @since 1.5.5
*/
@@ -2367,7 +2367,7 @@ public class ResourceGroovyMethods extends DefaultGroovyMethodsSupport {
* @param parameters connection parameters
* @param charset opens the stream with a specified charset
* @return a BufferedReader for the URL
- * @throws MalformedURLException is thrown if the URL is not well formed
+ * @throws MalformedURLException is thrown if the URL is not well-formed
* @throws IOException if an I/O error occurs while creating the input stream
* @since 1.8.1
*/
@@ -2618,7 +2618,7 @@ public class ResourceGroovyMethods extends DefaultGroovyMethodsSupport {
*
* @param self the CharSequence representing a URI
* @return a URI
- * @throws java.net.URISyntaxException is thrown if the URI is not well formed.
+ * @throws java.net.URISyntaxException is thrown if the URI is not well-formed.
* @since 1.8.2
*/
public static URI toURI(CharSequence self) throws URISyntaxException {
@@ -2630,7 +2630,7 @@ public class ResourceGroovyMethods extends DefaultGroovyMethodsSupport {
*
* @param self the String representing a URI
* @return a URI
- * @throws java.net.URISyntaxException is thrown if the URI is not well formed.
+ * @throws java.net.URISyntaxException is thrown if the URI is not well-formed.
* @since 1.0
*/
public static URI toURI(String self) throws URISyntaxException {
@@ -2642,7 +2642,7 @@ public class ResourceGroovyMethods extends DefaultGroovyMethodsSupport {
*
* @param self the CharSequence representing a URL
* @return a URL
- * @throws java.net.MalformedURLException is thrown if the URL is not well formed.
+ * @throws java.net.MalformedURLException is thrown if the URL is not well-formed.
* @since 1.8.2
*/
public static URL toURL(CharSequence self) throws MalformedURLException {
@@ -2654,7 +2654,7 @@ public class ResourceGroovyMethods extends DefaultGroovyMethodsSupport {
*
* @param self the String representing a URL
* @return a URL
- * @throws java.net.MalformedURLException is thrown if the URL is not well formed.
+ * @throws java.net.MalformedURLException is thrown if the URL is not well-formed.
* @since 1.0
*/
public static URL toURL(String self) throws MalformedURLException {
@@ -2687,7 +2687,7 @@ public class ResourceGroovyMethods extends DefaultGroovyMethodsSupport {
/**
* Gets path from a <code>List</code> of <code>String</code>s.
*
- * @param pathStack <code>List</code> of <code>String</code>s to be concated as a path.
+ * @param pathStack <code>List</code> of <code>String</code>s to be concatenated as a path.
* @param separatorChar <code>char</code> to be used as separator between names in path
* @return <code>String</code>, never <code>null</code>
*/
diff --git a/src/main/java/org/codehaus/groovy/runtime/ScriptBytecodeAdapter.java b/src/main/java/org/codehaus/groovy/runtime/ScriptBytecodeAdapter.java
index 9204565307..599f6d2a49 100644
--- a/src/main/java/org/codehaus/groovy/runtime/ScriptBytecodeAdapter.java
+++ b/src/main/java/org/codehaus/groovy/runtime/ScriptBytecodeAdapter.java
@@ -668,7 +668,7 @@ public class ScriptBytecodeAdapter {
}
if (from instanceof Integer && to instanceof Integer) {
// Currently, empty ranges where from != to, the range is full exclusive (e.g. 0<..<-1) and from and to
- // have a different sign are constructed as IntRanges. This is because t3hese ranges can still be used to
+ // have a different sign are constructed as IntRanges. This is because these ranges can still be used to
// index into lists.
return new IntRange(!exclusiveLeft, !exclusiveRight, (Integer) from, (Integer) to);
}
diff --git a/src/main/java/org/codehaus/groovy/runtime/StringGroovyMethods.java b/src/main/java/org/codehaus/groovy/runtime/StringGroovyMethods.java
index 9cbd80ce1e..f8ef4d20a4 100644
--- a/src/main/java/org/codehaus/groovy/runtime/StringGroovyMethods.java
+++ b/src/main/java/org/codehaus/groovy/runtime/StringGroovyMethods.java
@@ -760,7 +760,7 @@ public class StringGroovyMethods extends DefaultGroovyMethodsSupport {
*
* @param self the source CharSequence
* @param regex a Regex CharSequence
- * @param closure a closure with one parameter or as much parameters as groups
+ * @param closure a closure with one parameter or as many parameters as groups
* @return the source CharSequence
*
* @since 1.8.2
@@ -780,7 +780,7 @@ public class StringGroovyMethods extends DefaultGroovyMethodsSupport {
*
* @param self the source CharSequence
* @param pattern a regex Pattern
- * @param closure a closure with one parameter or as much parameters as groups
+ * @param closure a closure with one parameter or as many parameters as groups
* @return the source CharSequence
*
* @since 1.8.2
@@ -800,7 +800,7 @@ public class StringGroovyMethods extends DefaultGroovyMethodsSupport {
*
* @param self the source string
* @param pattern a regex Pattern
- * @param closure a closure with one parameter or as much parameters as groups
+ * @param closure a closure with one parameter or as many parameters as groups
* @return the source string
*
* @since 1.6.1
@@ -819,7 +819,7 @@ public class StringGroovyMethods extends DefaultGroovyMethodsSupport {
*
* @param self the source string
* @param regex a Regex string
- * @param closure a closure with one parameter or as much parameters as groups
+ * @param closure a closure with one parameter or as many parameters as groups
* @return the source string
*
* @since 1.6.0
@@ -2979,7 +2979,7 @@ public class StringGroovyMethods extends DefaultGroovyMethodsSupport {
* @param self the original CharSequence
* @param num the number of chars to take from this CharSequence
* @return a CharSequence consisting of the first {@code num} chars,
- * or else the whole CharSequence if it has less then {@code num} elements.
+ * or else the whole CharSequence if it has less than {@code num} elements.
*
* @since 1.8.1
*/
@@ -2999,7 +2999,7 @@ public class StringGroovyMethods extends DefaultGroovyMethodsSupport {
* @param self the original GString
* @param num the number of chars to take from this GString
* @return a String consisting of the first {@code num} chars,
- * or else the whole GString if it has less then {@code num} elements.
+ * or else the whole GString if it has less than {@code num} elements.
*
* @since 2.3.7
*/
@@ -3013,7 +3013,7 @@ public class StringGroovyMethods extends DefaultGroovyMethodsSupport {
* @param self the original String
* @param num the number of chars to take from this String
* @return a String consisting of the first {@code num} chars,
- * or else the whole String if it has less then {@code num} elements.
+ * or else the whole String if it has less than {@code num} elements.
*
* @since 2.5.5
*/
diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/CallSiteArray.java b/src/main/java/org/codehaus/groovy/runtime/callsite/CallSiteArray.java
index 04c2e0865f..cecdac3785 100644
--- a/src/main/java/org/codehaus/groovy/runtime/callsite/CallSiteArray.java
+++ b/src/main/java/org/codehaus/groovy/runtime/callsite/CallSiteArray.java
@@ -113,7 +113,7 @@ public final class CallSiteArray {
}
// for MetaClassImpl we try to pick meta method,
- // otherwise or if method doesn't exist we make call via POJO meta class
+ // otherwise or if method doesn't exist we make call via POJO metaclass
private static CallSite createPojoSite(CallSite callSite, Object receiver, Object[] args) {
final Class klazz = receiver.getClass();
MetaClass metaClass = InvokerHelper.getMetaClass(receiver);
diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/ConstructorMetaMethodSite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/ConstructorMetaMethodSite.java
index 8c3b950c2f..0dda86c555 100644
--- a/src/main/java/org/codehaus/groovy/runtime/callsite/ConstructorMetaMethodSite.java
+++ b/src/main/java/org/codehaus/groovy/runtime/callsite/ConstructorMetaMethodSite.java
@@ -26,7 +26,7 @@ import org.codehaus.groovy.runtime.ScriptBytecodeAdapter;
/**
* Call site for invoking static methods
-* meta class - cached
+* metaclass - cached
* method - not cached
*/
public class ConstructorMetaMethodSite extends MetaMethodSite {
@@ -49,9 +49,9 @@ public class ConstructorMetaMethodSite extends MetaMethodSite {
@Override
public final Object callConstructor(Object receiver, Object[] args) throws Throwable {
- if (receiver == metaClass.getTheClass() // meta class match receiver
+ if (receiver == metaClass.getTheClass() // metaclass match receiver
&& ((MetaClassImpl)metaClass).getVersion() == version // metaClass still be valid
- && MetaClassHelper.sameClasses(params, args) )
+ && MetaClassHelper.sameClasses(params, args) )
{
MetaClassHelper.unwrap(args);
try {
diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/ConstructorSite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/ConstructorSite.java
index dbe1f7413e..7e9a5be5d9 100644
--- a/src/main/java/org/codehaus/groovy/runtime/callsite/ConstructorSite.java
+++ b/src/main/java/org/codehaus/groovy/runtime/callsite/ConstructorSite.java
@@ -52,7 +52,7 @@ public class ConstructorSite extends MetaClassSite {
}
protected final boolean checkCall(Object receiver, Object[] args) {
- return receiver == metaClass.getTheClass() // meta class match receiver
+ return receiver == metaClass.getTheClass() // metaclass match receiver
&& ((MetaClassImpl) metaClass).getVersion() == version // metaClass still be valid
&& MetaClassHelper.sameClasses(params, args);
}
diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/MetaClassConstructorSite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/MetaClassConstructorSite.java
index e76399aa31..d6535957ab 100644
--- a/src/main/java/org/codehaus/groovy/runtime/callsite/MetaClassConstructorSite.java
+++ b/src/main/java/org/codehaus/groovy/runtime/callsite/MetaClassConstructorSite.java
@@ -25,7 +25,7 @@ import org.codehaus.groovy.runtime.ScriptBytecodeAdapter;
/**
* Call site for constructor
- * meta class - cached
+ * metaclass - cached
* method - not cached
*/
public class MetaClassConstructorSite extends MetaClassSite {
diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/MetaClassSite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/MetaClassSite.java
index e275510735..480ce305e3 100644
--- a/src/main/java/org/codehaus/groovy/runtime/callsite/MetaClassSite.java
+++ b/src/main/java/org/codehaus/groovy/runtime/callsite/MetaClassSite.java
@@ -21,7 +21,7 @@ package org.codehaus.groovy.runtime.callsite;
import groovy.lang.MetaClass;
/**
- * Call site which holds reference to meta class.
+ * Call site which holds reference to metaclass.
*/
public abstract class MetaClassSite extends AbstractCallSite {
diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/PlainObjectMetaMethodSite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/PlainObjectMetaMethodSite.java
index b396e26381..3a8ffd04e2 100644
--- a/src/main/java/org/codehaus/groovy/runtime/callsite/PlainObjectMetaMethodSite.java
+++ b/src/main/java/org/codehaus/groovy/runtime/callsite/PlainObjectMetaMethodSite.java
@@ -29,7 +29,7 @@ import java.lang.reflect.Method;
/**
* Plain ordinary object call site
- * meta class - cached
+ * metaclass - cached
* method - cached
*
*/
diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/PogoMetaMethodSite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/PogoMetaMethodSite.java
index 3ed328dffe..04ca90d804 100644
--- a/src/main/java/org/codehaus/groovy/runtime/callsite/PogoMetaMethodSite.java
+++ b/src/main/java/org/codehaus/groovy/runtime/callsite/PogoMetaMethodSite.java
@@ -33,7 +33,7 @@ import java.lang.reflect.Method;
/**
* POGO call site
- * meta class - cached
+ * metaclass - cached
* method - cached
*/
public class PogoMetaMethodSite extends PlainObjectMetaMethodSite {
diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/PojoMetaClassSite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/PojoMetaClassSite.java
index 846ee9b5ae..7acfca411c 100644
--- a/src/main/java/org/codehaus/groovy/runtime/callsite/PojoMetaClassSite.java
+++ b/src/main/java/org/codehaus/groovy/runtime/callsite/PojoMetaClassSite.java
@@ -25,7 +25,7 @@ import org.codehaus.groovy.runtime.ScriptBytecodeAdapter;
/**
* POJO call site
- * meta class - cached
+ * metaclass - cached
* method - not cached
*/
public class PojoMetaClassSite extends MetaClassSite{
diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/PojoMetaMethodSite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/PojoMetaMethodSite.java
index 6d203f4fea..3bf972f957 100644
--- a/src/main/java/org/codehaus/groovy/runtime/callsite/PojoMetaMethodSite.java
+++ b/src/main/java/org/codehaus/groovy/runtime/callsite/PojoMetaMethodSite.java
@@ -33,7 +33,7 @@ import java.lang.reflect.Method;
/**
* POJO call site
- * meta class - cached
+ * metaclass - cached
* method - cached
*/
public class PojoMetaMethodSite extends PlainObjectMetaMethodSite {
@@ -66,7 +66,7 @@ public class PojoMetaMethodSite extends PlainObjectMetaMethodSite {
protected final boolean checkCall(Object receiver, Object[] args) {
try {
- return receiver.getClass() == metaClass.getTheClass() // meta class match receiver
+ return receiver.getClass() == metaClass.getTheClass() // metaclass match receiver
&& checkPojoMetaClass()
&& MetaClassHelper.sameClasses(params, args);
}
@@ -80,7 +80,7 @@ public class PojoMetaMethodSite extends PlainObjectMetaMethodSite {
protected final boolean checkCall(Object receiver) {
try {
- return receiver.getClass() == metaClass.getTheClass() // meta class match receiver
+ return receiver.getClass() == metaClass.getTheClass() // metaclass match receiver
&& checkPojoMetaClass()
&& MetaClassHelper.sameClasses(params);
} catch (NullPointerException e) {
@@ -93,7 +93,7 @@ public class PojoMetaMethodSite extends PlainObjectMetaMethodSite {
protected final boolean checkCall(Object receiver, Object arg1) {
try {
- return receiver.getClass() == metaClass.getTheClass() // meta class match receiver
+ return receiver.getClass() == metaClass.getTheClass() // metaclass match receiver
&& checkPojoMetaClass()
&& MetaClassHelper.sameClasses(params, arg1);
} catch (NullPointerException e) {
@@ -106,7 +106,7 @@ public class PojoMetaMethodSite extends PlainObjectMetaMethodSite {
protected final boolean checkCall(Object receiver, Object arg1, Object arg2) {
try {
- return receiver.getClass() == metaClass.getTheClass() // meta class match receiver
+ return receiver.getClass() == metaClass.getTheClass() // metaclass match receiver
&& checkPojoMetaClass()
&& MetaClassHelper.sameClasses(params, arg1, arg2);
} catch (NullPointerException e) {
@@ -119,7 +119,7 @@ public class PojoMetaMethodSite extends PlainObjectMetaMethodSite {
protected final boolean checkCall(Object receiver, Object arg1, Object arg2, Object arg3) {
try {
- return receiver.getClass() == metaClass.getTheClass() // meta class match receiver
+ return receiver.getClass() == metaClass.getTheClass() // metaclass match receiver
&& checkPojoMetaClass()
&& MetaClassHelper.sameClasses(params, arg1, arg2, arg3);
} catch (NullPointerException e) {
@@ -132,7 +132,7 @@ public class PojoMetaMethodSite extends PlainObjectMetaMethodSite {
protected final boolean checkCall(Object receiver, Object arg1, Object arg2, Object arg3, Object arg4) {
try {
- return receiver.getClass() == metaClass.getTheClass() // meta class match receiver
+ return receiver.getClass() == metaClass.getTheClass() // metaclass match receiver
&& checkPojoMetaClass()
&& MetaClassHelper.sameClasses(params, arg1, arg2, arg3, arg4);
} catch (NullPointerException e) {
diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/StaticMetaClassSite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/StaticMetaClassSite.java
index 0681204a63..59f2678d32 100644
--- a/src/main/java/org/codehaus/groovy/runtime/callsite/StaticMetaClassSite.java
+++ b/src/main/java/org/codehaus/groovy/runtime/callsite/StaticMetaClassSite.java
@@ -25,7 +25,7 @@ import org.codehaus.groovy.runtime.ScriptBytecodeAdapter;
/**
* Call site for invoking static methods
- * meta class - cached
+ * metaclass - cached
* method - not cached
*/
public class StaticMetaClassSite extends MetaClassSite {
diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/StaticMetaMethodSite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/StaticMetaMethodSite.java
index c9e6676be9..2af8e69d3b 100644
--- a/src/main/java/org/codehaus/groovy/runtime/callsite/StaticMetaMethodSite.java
+++ b/src/main/java/org/codehaus/groovy/runtime/callsite/StaticMetaMethodSite.java
@@ -27,7 +27,7 @@ import org.codehaus.groovy.runtime.ScriptBytecodeAdapter;
/**
* POJO call site
- * meta class - cached
+ * metaclass - cached
* method - cached
*/
public class StaticMetaMethodSite extends MetaMethodSite {
@@ -48,37 +48,37 @@ public class StaticMetaMethodSite extends MetaMethodSite {
}
protected final boolean checkCall(Object receiver, Object[] args) {
- return receiver == metaClass.getTheClass() // meta class match receiver
+ return receiver == metaClass.getTheClass() // metaclass match receiver
&& ((MetaClassImpl)metaClass).getVersion() == version // metaClass still be valid
&& MetaClassHelper.sameClasses(params, args);
}
protected final boolean checkCall(Object receiver) {
- return receiver == metaClass.getTheClass() // meta class match receiver
+ return receiver == metaClass.getTheClass() // metaclass match receiver
&& ((MetaClassImpl)metaClass).getVersion() == version // metaClass still be valid
&& MetaClassHelper.sameClasses(params);
}
protected final boolean checkCall(Object receiver, Object arg1) {
- return receiver == metaClass.getTheClass() // meta class match receiver
+ return receiver == metaClass.getTheClass() // metaclass match receiver
&& ((MetaClassImpl)metaClass).getVersion() == version // metaClass still be valid
&& MetaClassHelper.sameClasses(params, arg1);
}
protected final boolean checkCall(Object receiver, Object arg1, Object arg2) {
- return receiver == metaClass.getTheClass() // meta class match receiver
+ return receiver == metaClass.getTheClass() // metaclass match receiver
&& ((MetaClassImpl)metaClass).getVersion() == version // metaClass still be valid
&& MetaClassHelper.sameClasses(params, arg1, arg2);
}
protected final boolean checkCall(Object receiver, Object arg1, Object arg2, Object arg3) {
- return receiver == metaClass.getTheClass() // meta class match receiver
+ return receiver == metaClass.getTheClass() // metaclass match receiver
&& ((MetaClassImpl)metaClass).getVersion() == version // metaClass still be valid
&& MetaClassHelper.sameClasses(params, arg1, arg2, arg3);
}
protected final boolean checkCall(Object receiver, Object arg1, Object arg2, Object arg3, Object arg4) {
- return receiver == metaClass.getTheClass() // meta class match receiver
+ return receiver == metaClass.getTheClass() // metaclass match receiver
&& ((MetaClassImpl)metaClass).getVersion() == version // metaClass still be valid
&& MetaClassHelper.sameClasses(params, arg1, arg2, arg3, arg4);
}
diff --git a/src/main/java/org/codehaus/groovy/runtime/m12n/ExtensionModule.java b/src/main/java/org/codehaus/groovy/runtime/m12n/ExtensionModule.java
index 887ba30b16..e8dd0e145a 100644
--- a/src/main/java/org/codehaus/groovy/runtime/m12n/ExtensionModule.java
+++ b/src/main/java/org/codehaus/groovy/runtime/m12n/ExtensionModule.java
@@ -24,7 +24,7 @@ import java.util.List;
/**
* An extension module is a class responsible for providing a list of {@link MetaMethod meta methods} to the Groovy
- * compiler and runtime. Those methods are use to "dynamically extend" existing classes by adding methods to
+ * compiler and runtime. Those methods are used to "dynamically extend" existing classes by adding methods to
* existing classes.
*
* @since 2.0.0
diff --git a/src/main/java/org/codehaus/groovy/runtime/memoize/CommonCache.java b/src/main/java/org/codehaus/groovy/runtime/memoize/CommonCache.java
index 0f7fb751d8..cf231a4614 100644
--- a/src/main/java/org/codehaus/groovy/runtime/memoize/CommonCache.java
+++ b/src/main/java/org/codehaus/groovy/runtime/memoize/CommonCache.java
@@ -75,7 +75,7 @@ public class CommonCache<K, V> implements EvictableCache<K, V>, ValueConvertable
}
/**
- * Constructs a LRU cache with the specified initial capacity and max size.
+ * Constructs an LRU cache with the specified initial capacity and max size.
* The LRU cache is slower than {@link LRUCache}
*
* @param initialCapacity initial capacity of the LRU cache
@@ -86,7 +86,7 @@ public class CommonCache<K, V> implements EvictableCache<K, V>, ValueConvertable
}
/**
- * Constructs a LRU cache with the default initial capacity
+ * Constructs an LRU cache with the default initial capacity
*
* @param maxSize max size of the LRU cache
* @see #CommonCache(int, int)
diff --git a/src/main/java/org/codehaus/groovy/runtime/memoize/ConcurrentCommonCache.java b/src/main/java/org/codehaus/groovy/runtime/memoize/ConcurrentCommonCache.java
index ace4ae6af0..2f31c62ff2 100644
--- a/src/main/java/org/codehaus/groovy/runtime/memoize/ConcurrentCommonCache.java
+++ b/src/main/java/org/codehaus/groovy/runtime/memoize/ConcurrentCommonCache.java
@@ -60,7 +60,7 @@ public class ConcurrentCommonCache<K, V> implements EvictableCache<K, V>, ValueC
}
/**
- * Constructs a LRU cache with the specified initial capacity and max size.
+ * Constructs an LRU cache with the specified initial capacity and max size.
* The LRU cache is slower than {@link LRUCache}
*
* @param initialCapacity initial capacity of the LRU cache
@@ -71,7 +71,7 @@ public class ConcurrentCommonCache<K, V> implements EvictableCache<K, V>, ValueC
}
/**
- * Constructs a LRU cache with the default initial capacity(16)
+ * Constructs an LRU cache with the default initial capacity(16)
*
* @param maxSize max size of the LRU cache
* @see #ConcurrentCommonCache(int, int)
diff --git a/src/main/java/org/codehaus/groovy/runtime/memoize/ConcurrentSoftCache.java b/src/main/java/org/codehaus/groovy/runtime/memoize/ConcurrentSoftCache.java
index a265810496..85c7a9cc92 100644
--- a/src/main/java/org/codehaus/groovy/runtime/memoize/ConcurrentSoftCache.java
+++ b/src/main/java/org/codehaus/groovy/runtime/memoize/ConcurrentSoftCache.java
@@ -51,7 +51,7 @@ public class ConcurrentSoftCache<K, V> extends ConcurrentCommonCache<K, SoftRefe
}
/**
- * Constructs a LRU cache with the specified initial capacity and max size.
+ * Constructs an LRU cache with the specified initial capacity and max size.
* The LRU cache is slower than {@link LRUCache}
*
* @param initialCapacity initial capacity of the LRU cache
@@ -62,7 +62,7 @@ public class ConcurrentSoftCache<K, V> extends ConcurrentCommonCache<K, SoftRefe
}
/**
- * Constructs a LRU cache with the default initial capacity(16)
+ * Constructs an LRU cache with the default initial capacity(16)
*
* @param maxSize max size of the LRU cache
* @see #ConcurrentSoftCache(int, int)
diff --git a/src/main/java/org/codehaus/groovy/runtime/memoize/EvictableCache.java b/src/main/java/org/codehaus/groovy/runtime/memoize/EvictableCache.java
index 90c125eabb..5b0789c3cb 100644
--- a/src/main/java/org/codehaus/groovy/runtime/memoize/EvictableCache.java
+++ b/src/main/java/org/codehaus/groovy/runtime/memoize/EvictableCache.java
@@ -82,7 +82,7 @@ public interface EvictableCache<K, V> extends MemoizeCache<K, V>, Map<K, V>/* */
int size();
/**
- * Represents a eviction strategy for the cache with limited size
+ * Represents an eviction strategy for the cache with limited size
*/
enum EvictionStrategy {
/**
diff --git a/src/main/java/org/codehaus/groovy/runtime/memoize/StampedCommonCache.java b/src/main/java/org/codehaus/groovy/runtime/memoize/StampedCommonCache.java
index 1b1da7ab13..f084321d75 100644
--- a/src/main/java/org/codehaus/groovy/runtime/memoize/StampedCommonCache.java
+++ b/src/main/java/org/codehaus/groovy/runtime/memoize/StampedCommonCache.java
@@ -62,7 +62,7 @@ public class StampedCommonCache<K, V> implements EvictableCache<K, V>, ValueConv
}
/**
- * Constructs a LRU cache with the specified initial capacity and max size.
+ * Constructs an LRU cache with the specified initial capacity and max size.
* The LRU cache is slower than {@link LRUCache}
*
* @param initialCapacity initial capacity of the LRU cache
@@ -73,7 +73,7 @@ public class StampedCommonCache<K, V> implements EvictableCache<K, V>, ValueConv
}
/**
- * Constructs a LRU cache with the default initial capacity(16)
+ * Constructs an LRU cache with the default initial capacity(16)
*
* @param maxSize max size of the LRU cache
* @see #StampedCommonCache(int, int)
diff --git a/src/main/java/org/codehaus/groovy/runtime/metaclass/ClosureMetaClass.java b/src/main/java/org/codehaus/groovy/runtime/metaclass/ClosureMetaClass.java
index b8ed7f4330..fc17726f63 100644
--- a/src/main/java/org/codehaus/groovy/runtime/metaclass/ClosureMetaClass.java
+++ b/src/main/java/org/codehaus/groovy/runtime/metaclass/ClosureMetaClass.java
@@ -52,7 +52,7 @@ import java.util.List;
import java.util.Map;
/**
- * A meta class for closures generated by the Groovy compiler. These classes
+ * A metaclass for closures generated by the Groovy compiler. These classes
* have special characteristics this MetaClass uses. One of these is that a
* generated Closure has only additional doCall methods, all other methods
* are in the Closure class as well. To use this fact this MetaClass uses
diff --git a/src/main/java/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java b/src/main/java/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java
index a4d2f706a8..91fdea6236 100644
--- a/src/main/java/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java
+++ b/src/main/java/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java
@@ -67,7 +67,7 @@ import java.util.Set;
*
* This class also supports optional guaranteed
* exclusive reads, simply by surrounding a call within a synchronized
- * block, as in <br>
+ * block, as in <br>
* <code>ConcurrentReaderHashMap t; ... Object v; <br>
* synchronized(t) { v = t.get(k); } </code> <br>
*
@@ -78,7 +78,7 @@ import java.util.Set;
* ConcurrentReaderHashMap t; ... // Inefficient version
* Object key; ...
* Object value; ...
- * synchronized(t) {
+ * synchronized(t) {
* if (!t.containsKey(key))
* t.put(key, value);
* // other code if not previously present
@@ -123,7 +123,7 @@ import java.util.Set;
* during updates. Like Hashtable but unlike java.util.HashMap,
* this class does NOT allow <tt>null</tt> to be used as a key or
* value. This class is also typically faster than ConcurrentHashMap
- * when there is usually only one thread updating the table, but
+ * when there is usually only one thread updating the table, but
* possibly many retrieving values from it.
* <p>
*
@@ -136,8 +136,8 @@ import java.util.Set;
* @author Adapted from ConcurrentHashMap (Doug Lea)
* @author adapted by the Groovy community
*/
-public class ConcurrentReaderHashMap
- extends AbstractMap
+public class ConcurrentReaderHashMap
+ extends AbstractMap
implements Cloneable, Serializable {
private static final long serialVersionUID = -3225682440765612861L;
@@ -176,7 +176,7 @@ public class ConcurrentReaderHashMap
protected final BarrierLock barrierLock = new BarrierLock();
/**
- * field written to only to guarantee lock ordering.
+ * field written only to guarantee lock ordering.
**/
protected transient Object lastWrite;
@@ -185,7 +185,7 @@ public class ConcurrentReaderHashMap
* all readers to see table. Call only when already
* holding main sync lock.
**/
- protected final void recordModification(Object x) {
+ protected final void recordModification(Object x) {
synchronized(barrierLock) {
lastWrite = x;
}
@@ -196,9 +196,9 @@ public class ConcurrentReaderHashMap
* accesses will be at least as fresh as from last
* use of barrierLock
**/
- protected final Entry[] getTableForReading() {
+ protected final Entry[] getTableForReading() {
synchronized(barrierLock) {
- return table;
+ return table;
}
}
@@ -207,12 +207,12 @@ public class ConcurrentReaderHashMap
* The default initial number of table slots for this table (32).
* Used when not otherwise specified in constructor.
**/
- public static final int DEFAULT_INITIAL_CAPACITY = 32;
+ public static final int DEFAULT_INITIAL_CAPACITY = 32;
/**
* The minimum capacity, used if a lower value is implicitly specified
- * by either of the constructors with arguments.
+ * by either of the constructors with arguments.
* MUST be a power of two.
*/
private static final int MINIMUM_CAPACITY = 4;
@@ -229,7 +229,7 @@ public class ConcurrentReaderHashMap
* Used when not otherwise specified in constructor.
**/
- public static final float DEFAULT_LOAD_FACTOR = 0.75f;
+ public static final float DEFAULT_LOAD_FACTOR = 0.75f;
/**
@@ -258,7 +258,7 @@ public class ConcurrentReaderHashMap
protected float loadFactor;
/**
- * Returns the appropriate capacity (power of two) for the specified
+ * Returns the appropriate capacity (power of two) for the specified
* initial capacity argument.
*/
private static int p2capacity(int initialCapacity) {
@@ -289,21 +289,21 @@ public class ConcurrentReaderHashMap
return ((h << 7) - h + (h >>> 9) + (h >>> 17));
}
- /**
- * Check for equality of non-null references x and y.
+ /**
+ * Check for equality of non-null references x and y.
**/
protected boolean eq(Object x, Object y) {
return x == y || x.equals(y);
}
/**
- * Constructs a new, empty map with the specified initial
- * capacity and the specified load factor.
+ * Constructs a new, empty map with the specified initial
+ * capacity and the specified load factor.
*
* @param initialCapacity the initial capacity
* The actual initial capacity is rounded to the nearest power of two.
* @param loadFactor the load factor of the ConcurrentReaderHashMap
- * @throws IllegalArgumentException if the initial maximum number
+ * @throws IllegalArgumentException if the initial maximum number
* of elements is less
* than zero, or if the load factor is non-positive.
*/
@@ -320,12 +320,12 @@ public class ConcurrentReaderHashMap
}
/**
- * Constructs a new, empty map with the specified initial
+ * Constructs a new, empty map with the specified initial
* capacity and default load factor.
*
- * @param initialCapacity the initial capacity of the
+ * @param initialCapacity the initial capacity of the
* ConcurrentReaderHashMap.
- * @throws IllegalArgumentException if the initial maximum number
+ * @throws IllegalArgumentException if the initial maximum number
* of elements is less than zero.
*/
public ConcurrentReaderHashMap(int initialCapacity) {
@@ -389,7 +389,7 @@ public class ConcurrentReaderHashMap
// throw null pointer exception if key null
int hash = hash(key);
- /*
+ /*
Start off at the apparently correct bin. If entry is found, we
need to check after a barrier anyway. If not found, we need a
barrier to check if we are actually in right bin. So either
@@ -422,7 +422,7 @@ public class ConcurrentReaderHashMap
else if (e.hash == hash && eq(key, e.key)) {
Object value = e.value;
- if (value != null)
+ if (value != null)
return value;
// Entry was invalidated during deletion. But it could
@@ -444,10 +444,10 @@ public class ConcurrentReaderHashMap
/**
* Tests if the specified object is a key in this table.
- *
+ *
* @param key possible key.
- * @return <code>true</code> if and only if the specified object
- * is a key in this table, as determined by the
+ * @return <code>true</code> if and only if the specified object
+ * is a key in this table, as determined by the
* <tt>equals</tt> method; <code>false</code> otherwise.
* @exception NullPointerException if the key is <code>null</code>.
* @see #contains(Object)
@@ -458,12 +458,12 @@ public class ConcurrentReaderHashMap
}
/**
- * Maps the specified <code>key</code> to the specified
- * <code>value</code> in this table. Neither the key nor the
+ * Maps the specified <code>key</code> to the specified
+ * <code>value</code> in this table. Neither the key nor the
* value can be <code>null</code>. <p>
*
- * The value can be retrieved by calling the <code>get</code> method
- * with a key that is equal to the original key.
+ * The value can be retrieved by calling the <code>get</code> method
+ * with a key that is equal to the original key.
*
* @param key the table key.
* @param value the value.
@@ -475,7 +475,7 @@ public class ConcurrentReaderHashMap
*/
@Override
public Object put(Object key, Object value) {
- if (value == null)
+ if (value == null)
throw new NullPointerException();
int hash = hash(key);
@@ -502,7 +502,7 @@ public class ConcurrentReaderHashMap
}
}
else {
- Object oldValue = e.value;
+ Object oldValue = e.value;
if (first == tab[index] && oldValue != null) {
e.value = value;
return oldValue;
@@ -520,7 +520,7 @@ public class ConcurrentReaderHashMap
* Continuation of put(), called only when sync lock is
* held and interference has been detected.
**/
- protected Object sput(Object key, Object value, int hash) {
+ protected Object sput(Object key, Object value, int hash) {
Entry[] tab = table;
int index = hash & (tab.length-1);
@@ -536,7 +536,7 @@ public class ConcurrentReaderHashMap
return null;
}
else if (e.hash == hash && eq(key, e.key)) {
- Object oldValue = e.value;
+ Object oldValue = e.value;
e.value = value;
return oldValue;
}
@@ -551,7 +551,7 @@ public class ConcurrentReaderHashMap
* with a larger capacity. This method is called automatically when the
* number of keys in this map exceeds its capacity and load factor.
*/
- protected void rehash() {
+ protected void rehash() {
Entry[] oldTable = table;
int oldCapacity = oldTable.length;
if (oldCapacity >= MAXIMUM_CAPACITY) {
@@ -617,7 +617,7 @@ public class ConcurrentReaderHashMap
}
/**
- * Removes the key (and its corresponding value) from this
+ * Removes the key (and its corresponding value) from this
* table. This method does nothing if the key is not in the table.
*
* @param key the key that needs to be removed.
@@ -629,7 +629,7 @@ public class ConcurrentReaderHashMap
@Override
public Object remove(Object key) {
/*
- Find the entry, then
+ Find the entry, then
1. Set value field to null, to force get() to retry
2. Rebuild the list without this entry.
All entries following removed node can stay in list, but
@@ -645,8 +645,8 @@ public class ConcurrentReaderHashMap
Entry first = tab[index];
Entry e = first;
- for (e = first; e != null; e = e.next)
- if (e.hash == hash && eq(key, e.key))
+ for (e = first; e != null; e = e.next)
+ if (e.hash == hash && eq(key, e.key))
break;
@@ -713,7 +713,7 @@ public class ConcurrentReaderHashMap
*
* @param value value whose presence in this map is to be tested.
* @return <tt>true</tt> if this map maps one or more keys to the
- * specified value.
+ * specified value.
* @exception NullPointerException if the value is <code>null</code>.
*/
@Override
@@ -738,10 +738,10 @@ public class ConcurrentReaderHashMap
*
* Note that this method is identical in functionality to containsValue,
* (which is part of the Map interface in the collections framework).
- *
+ *
* @param value a value to search for.
* @return <code>true</code> if and only if some key maps to the
- * <code>value</code> argument in this table as
+ * <code>value</code> argument in this table as
* determined by the <tt>equals</tt> method;
* <code>false</code> otherwise.
* @exception NullPointerException if the value is <code>null</code>.
@@ -755,8 +755,8 @@ public class ConcurrentReaderHashMap
/**
- * Copies all of the mappings from the specified map to this one.
- *
+ * Copies all the mappings from the specified map to this one.
+ *
* These mappings replace any mappings that this map had for any of the
* keys currently in the specified Map.
*
@@ -790,11 +790,11 @@ public class ConcurrentReaderHashMap
@Override
public synchronized void clear() {
Entry[] tab = table;
- for (int i = 0; i < tab.length ; ++i) {
+ for (int i = 0; i < tab.length ; ++i) {
// must invalidate all to force concurrent get's to wait and then retry
- for (Entry e = tab[i]; e != null; e = e.next)
- e.value = null;
+ for (Entry e = tab[i]; e != null; e = e.next)
+ e.value = null;
tab[i] = null;
}
@@ -803,7 +803,7 @@ public class ConcurrentReaderHashMap
}
/**
- * Returns a shallow copy of this
+ * Returns a shallow copy of this
* <tt>ConcurrentReaderHashMap</tt> instance: the keys and
* values themselves are not cloned.
*
@@ -811,7 +811,7 @@ public class ConcurrentReaderHashMap
*/
@Override
public synchronized Object clone() {
- try {
+ try {
ConcurrentReaderHashMap t = (ConcurrentReaderHashMap)super.clone();
t.keySet = null;
@@ -824,14 +824,14 @@ public class ConcurrentReaderHashMap
for (int i = 0; i < tab.length; ++i) {
Entry first = null;
- for (Entry e = tab[i]; e != null; e = e.next)
+ for (Entry e = tab[i]; e != null; e = e.next)
first = new Entry(e.hash, e.key, e.value, first);
ttab[i] = first;
}
return t;
- }
- catch (CloneNotSupportedException e) {
+ }
+ catch (CloneNotSupportedException e) {
// this shouldn't happen, since we are Cloneable
throw new InternalError();
}
@@ -1044,11 +1044,11 @@ public class ConcurrentReaderHashMap
*/
protected static class Entry implements Map.Entry {
- /*
+ /*
The use of volatile for value field ensures that
we can detect status changes without synchronization.
The other fields are never changed, and are
- marked as final.
+ marked as final.
*/
protected final int hash;
protected final Object key;
@@ -1062,7 +1062,7 @@ public class ConcurrentReaderHashMap
this.value = value;
}
- // Map.Entry Ops
+ // Map.Entry Ops
@Override
public Object getKey() {
@@ -1077,23 +1077,23 @@ public class ConcurrentReaderHashMap
* return null, reflecting the fact that the entry has been
* concurrently removed. However, there are no assurances that
* concurrent removals will be reflected using this method.
- *
- * @return the current value, or null if the entry has been
+ *
+ * @return the current value, or null if the entry has been
* detectably removed.
**/
@Override
public Object getValue() {
- return value;
+ return value;
}
/**
- * Set the value of this entry. Note: In an entrySet or
+ * Set the value of this entry (Note: In an entrySet or
* entrySet.iterator), unless the set or iterator is used under
* synchronization of the table as a whole (or you can otherwise
* guarantee lack of concurrent modification), <tt>setValue</tt>
* is not strictly guaranteed to actually replace the value field
* obtained via the <tt>get</tt> operation of the underlying hash
- * table in multi-threaded applications. If iterator-wide
+ * table in multithreaded applications. If iterator-wide
* synchronization is not used, and any other concurrent
* <tt>put</tt> or <tt>remove</tt> operations occur, sometimes
* even to <em>other</em> entries, then this change is not
@@ -1104,7 +1104,7 @@ public class ConcurrentReaderHashMap
* @return the previous value, or null if entry has been detectably
* removed.
* @exception NullPointerException if the value is <code>null</code>.
- *
+ *
**/
@Override
public Object setValue(Object value) {
@@ -1137,7 +1137,7 @@ public class ConcurrentReaderHashMap
protected class HashIterator implements Iterator, Enumeration {
protected final Entry[] tab; // snapshot of table
- protected int index; // current slot
+ protected int index; // current slot
protected Entry entry = null; // current node of slot
protected Object currentKey; // key for current node
protected Object currentValue; // value for current node
@@ -1162,7 +1162,7 @@ public class ConcurrentReaderHashMap
returns normally if hasNext() returns true. This avoids
surprises especially when final element is removed during
traversal -- instead, we just ignore the removal during
- current traversal.
+ current traversal.
*/
for (;;) {
@@ -1225,7 +1225,7 @@ public class ConcurrentReaderHashMap
/**
- * Save the state of the <tt>ConcurrentReaderHashMap</tt>
+ * Save the state of the <tt>ConcurrentReaderHashMap</tt>
* instance to a stream (i.e.,
* serialize it).
*
@@ -1262,7 +1262,7 @@ public class ConcurrentReaderHashMap
}
/**
- * Reconstitute the <tt>ConcurrentReaderHashMap</tt>
+ * Reconstitute the <tt>ConcurrentReaderHashMap</tt>
* instance from a stream (i.e.,
* deserialize it).
*
@@ -1288,14 +1288,14 @@ public class ConcurrentReaderHashMap
}
}
- /**
+ /**
* @return the number of slots in this table
**/
public synchronized int capacity() {
return table.length;
}
- /**
+ /**
* @return the load factor
**/
public float loadFactor() {
diff --git a/src/main/java/org/codehaus/groovy/runtime/metaclass/DefaultMetaClassInfo.java b/src/main/java/org/codehaus/groovy/runtime/metaclass/DefaultMetaClassInfo.java
index 12a01bebcc..bac00a9eae 100644
--- a/src/main/java/org/codehaus/groovy/runtime/metaclass/DefaultMetaClassInfo.java
+++ b/src/main/java/org/codehaus/groovy/runtime/metaclass/DefaultMetaClassInfo.java
@@ -29,21 +29,21 @@ public class DefaultMetaClassInfo {
// boolean
//---------------------------------------------
- // if original boolean meta class
+ // if original boolean metaclass
private static boolean origBoolean = true;
// if origBoolean and withoutCustomHandle
private static boolean origBooleanRes = true;
/**
- * @return true if no meta class creation handle is set and if
- * the original boolean meta class is used.
+ * Returns true if no metaclass creation handle is set and if
+ * the original boolean metaclass is used.
*/
public static boolean isOrigBool() {
return origBooleanRes;
}
/**
- * sets if the original boolean meta class is used
+ * Sets if the original boolean metaclass is used.
*/
public static void setOrigBool(boolean v) {
origBoolean = v;
@@ -54,21 +54,21 @@ public class DefaultMetaClassInfo {
// byte
//---------------------------------------------
- // if original Byte meta class
+ // if original Byte metaclass
private static boolean origByte = true;
// if origByte and withoutCustomHandle
private static boolean origByteRes = true;
/**
- * @return true if no meta class creation handle is set and if
- * the original byte meta class is used.
+ * Returns true if no metaclass creation handle is set and if
+ * the original byte metaclass is used.
*/
public static boolean isOrigByte() {
return origByteRes;
}
/**
- * sets if the original byte meta class is used
+ * Sets if the original byte metaclass is used.
*/
public static void setOrigByte(boolean v) {
origByte = v;
@@ -79,21 +79,21 @@ public class DefaultMetaClassInfo {
// char
//---------------------------------------------
- // if original char meta class
+ // if original char metaclass
private static boolean origChar = true;
// if origChar and withoutCustomHandle
private static boolean origCharRes = true;
/**
- * @return true if no meta class creation handle is set and if
- * the original char meta class is used.
+ * Returns true if no metaclass creation handle is set and if
+ * the original char metaclass is used.
*/
public static boolean isOrigChar() {
return origCharRes;
}
/**
- * sets if the original char meta class is used
+ * Sets if the original char metaclass is used.
*/
public static void setOrigChar(boolean v) {
origChar = v;
@@ -104,21 +104,21 @@ public class DefaultMetaClassInfo {
// short
//---------------------------------------------
- // if original short meta class
+ // if original short metaclass
private static boolean origShort = true;
// if origShort and withoutCustomHandle
private static boolean origShortRes = true;
/**
- * @return true if no meta class creation handle is set and if
- * the original short meta class is used.
+ * Returns true if no metaclass creation handle is set and if
+ * the original short metaclass is used.
*/
public static boolean isOrigShort() {
return origShortRes;
}
/**
- * sets if the original short meta class is used
+ * Sets if the original short metaclass is used.
*/
public static void setOrigShort(boolean v) {
origShort = v;
@@ -129,21 +129,21 @@ public class DefaultMetaClassInfo {
// int
//---------------------------------------------
- // if original Integer meta class
+ // if original Integer metaclass
private static boolean origInt = true;
// if origInt and withoutCustomHandle
private static boolean origIntRes = true;
/**
- * @return true if no meta class creation handle is set and if
- * the original integer meta class is used.
+ * Returns true if no metaclass creation handle is set and if
+ * the original integer metaclass is used.
*/
public static boolean isOrigInt() {
return origIntRes;
}
/**
- * sets if the original int meta class is used
+ * Sets if the original int metaclass is used.
*/
public static void setOrigInt(boolean v) {
origInt = v;
@@ -154,21 +154,21 @@ public class DefaultMetaClassInfo {
// int[]
//---------------------------------------------
- // if original Integer[] meta class
+ // if original Integer[] metaclass
private static boolean origIntArray = true;
// if origInt and withoutCustomHandle
private static boolean origIntArrayWCH = true;
/**
- * @return true if no meta class creation handle is set and if
- * the original integer array meta class is used.
+ * Returns true if no metaclass creation handle is set and if
+ * the original integer array metaclass is used.
*/
public static boolean isOrigIntArray() {
return origIntArrayWCH;
}
/**
- * sets if the original int array meta class is used
+ * Sets if the original int array metaclass is used.
*/
public static void setOrigIntArray(boolean v) {
origIntArray = v;
@@ -179,21 +179,21 @@ public class DefaultMetaClassInfo {
// long
//---------------------------------------------
- // if original long meta class
+ // if original long metaclass
private static boolean origLong = true;
// if origLong and withoutCustomHandle
private static boolean origLongRes = true;
/**
- * @return true if no meta class creation handle is set and if
- * the original long meta class is used.
+ * Returns true if no metaclass creation handle is set and if
+ * the original long metaclass is used.
*/
public static boolean isOrigLong() {
return origLongRes;
}
/**
- * sets if the original long meta class is used
+ * Sets if the original long metaclass is used.
*/
public static void setOrigLong(boolean v) {
origLong = v;
@@ -204,21 +204,21 @@ public class DefaultMetaClassInfo {
// float
//---------------------------------------------
- // if original float meta class
+ // if original float metaclass
private static boolean origFloat = true;
// if origFloat and withoutCustomHandle
private static boolean origFloatRes = true;
/**
- * @return true if no meta class creation handle is set and if
- * the original float meta class is used.
+ * Returns true if no metaclass creation handle is set and if
+ * the original float metaclass is used.
*/
public static boolean isOrigFloat() {
return origFloatRes;
}
/**
- * sets if the original float meta class is used
+ * Sets if the original float metaclass is used.
*/
public static void setOrigFloat(boolean v) {
origFloat = v;
@@ -229,21 +229,21 @@ public class DefaultMetaClassInfo {
// double
//---------------------------------------------
- // if original double meta class
+ // if original double metaclass
private static boolean origDouble = true;
// if origFloat and withoutCustomHandle
private static boolean origDoubleRes = true;
/**
- * @return true if no meta class creation handle is set and if
- * the original double meta class is used.
+ * Returns true if no metaclass creation handle is set and if
+ * the original double metaclass is used.
*/
public static boolean isOrigDouble() {
return origDoubleRes;
}
/**
- * sets if the original double meta class is used
+ * Sets if the original double metaclass is used.
*/
public static void setOrigDouble(boolean v) {
origDouble = v;
@@ -251,14 +251,14 @@ public class DefaultMetaClassInfo {
}
//---------------------------------------------
- // custom meta class creation handle
+ // custom metaclass creation handle
//---------------------------------------------
- // if a custom meta class creation handle is set
+ // if a custom metaclass creation handle is set
private static boolean withoutCustomHandle = true;
/**
- * sets if the system uses a custom meta class creation handle
+ * Sets if the system uses a custom metaclass creation handle.
*/
public static void setWithoutCustomMetaclassCreationHandle(boolean mch) {
withoutCustomHandle = mch;
@@ -278,7 +278,7 @@ public class DefaultMetaClassInfo {
public static boolean disabledStandardMetaClass() {
return disabledStandardMC;
- }
+ }
private static void changeFlags(boolean mch) {
@@ -293,7 +293,7 @@ public class DefaultMetaClassInfo {
origByteRes = origByte; origCharRes = origChar;
origBooleanRes = origBoolean; origShortRes = origShort;
origIntRes = origInt; origLongRes = origLong;
- origFloatRes = origFloat; origDoubleRes = origDouble;
+ origFloatRes = origFloat; origDoubleRes = origDouble;
origIntArrayWCH = origIntArray;
}
}
@@ -309,7 +309,7 @@ public class DefaultMetaClassInfo {
setOrigInt(orig);
} else if (c.getComponentType()==Integer.class) {
setOrigIntArray(orig);
- } else if (c==Long.class) {
+ } else if (c==Long.class) {
setOrigLong(orig);
} else if (c==Float.class) {
setOrigFloat(orig);
@@ -323,7 +323,7 @@ public class DefaultMetaClassInfo {
// GlobalMetaClassVersioning
//---------------------------------------------
public static class ConstantMetaClassVersioning {
- private boolean valid = true;
+ private boolean valid = true;
public boolean isValid(){return valid;}
}
private static ConstantMetaClassVersioning constantMetaClassVersioning = new ConstantMetaClassVersioning();
diff --git a/src/main/java/org/codehaus/groovy/runtime/metaclass/MetaClassRegistryImpl.java b/src/main/java/org/codehaus/groovy/runtime/metaclass/MetaClassRegistryImpl.java
index 59cb1ace1e..8b33af99b7 100644
--- a/src/main/java/org/codehaus/groovy/runtime/metaclass/MetaClassRegistryImpl.java
+++ b/src/main/java/org/codehaus/groovy/runtime/metaclass/MetaClassRegistryImpl.java
@@ -99,7 +99,7 @@ public class MetaClassRegistryImpl implements MetaClassRegistry{
}
/**
- * @param useAccessible defines whether or not the {@link java.lang.reflect.AccessibleObject#setAccessible(boolean)}
+ * @param useAccessible defines whether the {@link java.lang.reflect.AccessibleObject#setAccessible(boolean)}
* method will be called to enable access to all methods when using reflection
*/
public MetaClassRegistryImpl(boolean useAccessible) {
@@ -146,7 +146,7 @@ public class MetaClassRegistryImpl implements MetaClassRegistry{
addNonRemovableMetaClassRegistryChangeEventListener(cmcu -> {
// The calls to DefaultMetaClassInfo.setPrimitiveMeta and sdyn.setBoolean need to be
// ordered. Even though metaClassInfo is thread-safe, it is included in the block
- // so the meta classes are added to the queue in the same order.
+ // so the metaclasses are added to the queue in the same order.
synchronized (metaClassInfo) {
metaClassInfo.add(cmcu.getNewMetaClass());
DefaultMetaClassInfo.getNewConstantMetaClassVersioning();
@@ -274,7 +274,7 @@ public class MetaClassRegistryImpl implements MetaClassRegistry{
}
/**
- * if oldMc is null, newMc will replace whatever meta class was used before.
+ * if oldMc is null, newMc will replace whatever metaclass was used before.
* if oldMc is not null, then newMc will be used only if the stored mc is
* the same as oldMc
*/
@@ -361,7 +361,7 @@ public class MetaClassRegistryImpl implements MetaClassRegistry{
}
/**
- * Adds a listener for constant meta classes.
+ * Adds a listener for constant metaclasses.
* @param listener the listener
*/
@Override
@@ -373,7 +373,7 @@ public class MetaClassRegistryImpl implements MetaClassRegistry{
/**
- * Adds a listener for constant meta classes. This listener cannot be removed!
+ * Adds a listener for constant metaclasses. This listener cannot be removed!
* @param listener the listener
*/
@Override
@@ -384,7 +384,7 @@ public class MetaClassRegistryImpl implements MetaClassRegistry{
}
/**
- * Removes a constant meta class listener.
+ * Removes a constant metaclass listener.
* @param listener the listener
*/
@Override
@@ -455,10 +455,10 @@ public class MetaClassRegistryImpl implements MetaClassRegistry{
}
/**
- * Returns an iterator to iterate over all constant meta classes.
+ * Returns an iterator to iterate over all constant metaclasses.
* This iterator can be seen as making a snapshot of the current state
- * of the registry. The snapshot will include all meta classes that has
- * been used unless they are already collected. Collected meta classes
+ * of the registry. The snapshot will include all metaclasses that has
+ * been used unless they are already collected. Collected metaclasses
* will be skipped automatically, so you can expect that each element
* of the iteration is not null. Calling this method is thread safe, the
* usage of the iterator is not.
@@ -472,7 +472,7 @@ public class MetaClassRegistryImpl implements MetaClassRegistry{
return new Iterator() {
// index in the ref array
private int index = 0;
- // the current meta class
+ // the current metaclass
private MetaClass currentMeta;
// used to ensure that hasNext has been called
private boolean hasNextCalled = false;
diff --git a/src/main/java/org/codehaus/groovy/runtime/metaclass/MultipleSetterProperty.java b/src/main/java/org/codehaus/groovy/runtime/metaclass/MultipleSetterProperty.java
index 7d03e3f3ce..436fa13832 100644
--- a/src/main/java/org/codehaus/groovy/runtime/metaclass/MultipleSetterProperty.java
+++ b/src/main/java/org/codehaus/groovy/runtime/metaclass/MultipleSetterProperty.java
@@ -27,7 +27,7 @@ import org.codehaus.groovy.runtime.MetaClassHelper;
/**
* This class represents a property with multiple setters. Unlike a MetaBeanProperty you cannot get the setter
- * in this case. Instead invocation is done through the meta class of the property recevier.
+ * in this case. Instead invocation is done through the metaclass of the property receiver.
*/
public class MultipleSetterProperty extends MetaProperty {
private MetaMethod getter;
diff --git a/src/main/java/org/codehaus/groovy/runtime/metaclass/NewInstanceMetaMethod.java b/src/main/java/org/codehaus/groovy/runtime/metaclass/NewInstanceMetaMethod.java
index 4b2dd97319..03e83be815 100644
--- a/src/main/java/org/codehaus/groovy/runtime/metaclass/NewInstanceMetaMethod.java
+++ b/src/main/java/org/codehaus/groovy/runtime/metaclass/NewInstanceMetaMethod.java
@@ -43,7 +43,7 @@ public class NewInstanceMetaMethod extends NewMetaMethod {
@Override
public int getModifiers() {
- // lets clear the static bit
+ // let's clear the static bit
return Modifier.PUBLIC;
}
diff --git a/src/main/java/org/codehaus/groovy/runtime/typehandling/DefaultTypeTransformation.java b/src/main/java/org/codehaus/groovy/runtime/typehandling/DefaultTypeTransformation.java
index 3727c16047..e017835781 100644
--- a/src/main/java/org/codehaus/groovy/runtime/typehandling/DefaultTypeTransformation.java
+++ b/src/main/java/org/codehaus/groovy/runtime/typehandling/DefaultTypeTransformation.java
@@ -374,7 +374,7 @@ public class DefaultTypeTransformation {
Object[] args = null;
if (object instanceof Collection) {
- // let's try invoke the constructor with the list as arguments
+ // let's try to invoke the constructor with the list as arguments
// such as for creating a Dimension, Point, Color etc.
Collection collection = (Collection) object;
args = collection.toArray();