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 2020/09/27 02:08:49 UTC
[groovy] branch GROOVY_3_0_X updated: some it's -> its typo fixes
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/GROOVY_3_0_X by this push:
new 3d6e126 some it's -> its typo fixes
3d6e126 is described below
commit 3d6e1262d6309cf88c728a396c9dd40d35cd8e9c
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sun Sep 27 12:06:43 2020 +1000
some it's -> its typo fixes
---
.../java/groovy/grape/GrabAnnotationTransformation.java | 2 +-
src/main/java/groovy/io/LineColumnReader.java | 2 +-
src/main/java/groovy/util/Factory.java | 2 +-
src/main/java/org/codehaus/groovy/ast/ModuleNode.java | 2 +-
.../org/codehaus/groovy/runtime/DefaultGroovyMethods.java | 4 ++--
src/main/java/org/codehaus/groovy/syntax/CSTNode.java | 14 +++++++-------
src/main/java/org/codehaus/groovy/syntax/Reduction.java | 4 ++--
src/main/java/org/codehaus/groovy/syntax/Token.java | 2 +-
.../org/codehaus/groovy/tools/LoaderConfiguration.java | 2 +-
src/main/java/org/codehaus/groovy/tools/RootLoader.java | 4 ++--
src/spec/doc/core-semantics.adoc | 2 +-
src/spec/doc/core-traits.adoc | 2 +-
src/spec/doc/grape.adoc | 6 +++---
src/test/groovy/ProcessTest.groovy | 2 +-
.../groovy/transform/stc/FieldsAndPropertiesSTCTest.groovy | 2 +-
src/test/groovy/ui/GroovyMainTest.groovy | 2 +-
.../groovy/macro/transform/MacroClassTransformation.java | 2 +-
.../groovy/groovy/swing/SwingBuilderBindingsTest.groovy | 8 ++++----
.../src/test/groovy/groovy/swing/SwingBuilderTest.groovy | 2 +-
19 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/src/main/java/groovy/grape/GrabAnnotationTransformation.java b/src/main/java/groovy/grape/GrabAnnotationTransformation.java
index c4689a8..089e125 100644
--- a/src/main/java/groovy/grape/GrabAnnotationTransformation.java
+++ b/src/main/java/groovy/grape/GrabAnnotationTransformation.java
@@ -292,7 +292,7 @@ public class GrabAnnotationTransformation extends ClassCodeVisitorSupport implem
} catch (URISyntaxException e) {
// We'll be silent here.
// If the URI scheme is unknown or not hierarchical, then we just can't help them and shouldn't cause any trouble either.
- // addError("Attribute \"root\" has value '" + root + "' which can't be turned into a valid URI relative to it's source '" + getSourceUnit().getName() + "' @" + node.getClassNode().getNameWithoutPackage() + " annotations", node);
+ // addError("Attribute \"root\" has value '" + root + "' which can't be turned into a valid URI relative to its source '" + getSourceUnit().getName() + "' @" + node.getClassNode().getNameWithoutPackage() + " annotations", node);
}
}
diff --git a/src/main/java/groovy/io/LineColumnReader.java b/src/main/java/groovy/io/LineColumnReader.java
index d4462da..1d3b113 100644
--- a/src/main/java/groovy/io/LineColumnReader.java
+++ b/src/main/java/groovy/io/LineColumnReader.java
@@ -113,7 +113,7 @@ public class LineColumnReader extends BufferedReader {
mark(1);
c = (char)super.read();
// check if we have \r\n like on Windows
- // if it's not \r\n we reset, otherwise, the \n is just consummed
+ // if it's not \r\n we reset, otherwise, the \n is just consumed
if (c != '\n') {
reset();
}
diff --git a/src/main/java/groovy/util/Factory.java b/src/main/java/groovy/util/Factory.java
index 42d831f..7ab48a1 100644
--- a/src/main/java/groovy/util/Factory.java
+++ b/src/main/java/groovy/util/Factory.java
@@ -30,7 +30,7 @@ public interface Factory {
boolean isLeaf();
/**
- * Does this factory "Own" it's child closure.
+ * Does this factory "Own" its child closure.
*
* @return true if the factory should have onContentClosure() called,
* false if the builder should handle it
diff --git a/src/main/java/org/codehaus/groovy/ast/ModuleNode.java b/src/main/java/org/codehaus/groovy/ast/ModuleNode.java
index 50d5785..23ab7c4 100644
--- a/src/main/java/org/codehaus/groovy/ast/ModuleNode.java
+++ b/src/main/java/org/codehaus/groovy/ast/ModuleNode.java
@@ -362,7 +362,7 @@ public class ModuleNode extends ASTNode implements Opcodes {
classNode.addConstructor(ACC_PUBLIC, Parameter.EMPTY_ARRAY, ClassNode.EMPTY_ARRAY, new BlockStatement());
Statement stmt;
- // A script's contextual constructor should call it's super class' contextual constructor, if it has one.
+ // A script's contextual constructor should call its super class' contextual constructor, if it has one.
// In practice this will always be true because currently this visitor is run before the AST transformations
// (like @BaseScript) that could change this. But this is cautious and anticipates possible compiler changes.
if (classNode.getSuperClass().getDeclaredConstructor(params(param(ClassHelper.BINDING_TYPE, "context"))) != null) {
diff --git a/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java b/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
index 5082d6b..252a7fd 100644
--- a/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
+++ b/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
@@ -8790,7 +8790,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
if (self == null)
throw new GroovyRuntimeException("Fail to convert Object[] to SpreadMap, because it is null.");
else if (self.length % 2 != 0)
- throw new GroovyRuntimeException("Fail to convert Object[] to SpreadMap, because it's size is not even.");
+ throw new GroovyRuntimeException("Fail to convert Object[] to SpreadMap, because its size is not even.");
else
return new SpreadMap(self);
}
@@ -8808,7 +8808,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
if (self == null)
throw new GroovyRuntimeException("Fail to convert List to SpreadMap, because it is null.");
else if (self.size() % 2 != 0)
- throw new GroovyRuntimeException("Fail to convert List to SpreadMap, because it's size is not even.");
+ throw new GroovyRuntimeException("Fail to convert List to SpreadMap, because its size is not even.");
else
return new SpreadMap(self);
}
diff --git a/src/main/java/org/codehaus/groovy/syntax/CSTNode.java b/src/main/java/org/codehaus/groovy/syntax/CSTNode.java
index e074681..8b9bbc6 100644
--- a/src/main/java/org/codehaus/groovy/syntax/CSTNode.java
+++ b/src/main/java/org/codehaus/groovy/syntax/CSTNode.java
@@ -28,7 +28,7 @@ import java.io.Writer;
/**
* An abstract base class for nodes in the concrete syntax tree that is
* the result of parsing. Note that the CSTNode is inextricably linked
- * with the Token in that every CSTNode has a Token as it's root.
+ * with the Token in that every CSTNode has a Token as its root.
*
* @see antlr.Parser
* @see Token
@@ -50,7 +50,7 @@ public abstract class CSTNode {
}
/**
- * Sets the meaning for this node (and it's root Token). Not
+ * Sets the meaning for this node (and its root Token). Not
* valid if the node isEmpty(). Returns the node, for convenience.
*/
public CSTNode setMeaning(int meaning) {
@@ -135,7 +135,7 @@ public abstract class CSTNode {
}
/**
- * Returns true if the node and it's first child match the specified
+ * Returns true if the node and its first child match the specified
* types. Missing nodes are Token.NULL.
*/
boolean matches(int type, int child1) {
@@ -143,7 +143,7 @@ public abstract class CSTNode {
}
/**
- * Returns true if the node and it's first and second child match the
+ * Returns true if the node and its first and second child match the
* specified types. Missing nodes are Token.NULL.
*/
boolean matches(int type, int child1, int child2) {
@@ -151,7 +151,7 @@ public abstract class CSTNode {
}
/**
- * Returns true if the node and it's first three children match the
+ * Returns true if the node and its first three children match the
* specified types. Missing nodes are Token.NULL.
*/
boolean matches(int type, int child1, int child2, int child3) {
@@ -159,7 +159,7 @@ public abstract class CSTNode {
}
/**
- * Returns true if the node an it's first four children match the
+ * Returns true if the node an its first four children match the
* specified types. Missing nodes have type Types.NULL.
*/
boolean matches(int type, int child1, int child2, int child3, int child4) {
@@ -226,7 +226,7 @@ public abstract class CSTNode {
public abstract Token getRoot();
/**
- * Returns the root of the node, the Token that indicates it's
+ * Returns the root of the node, the Token that indicates its
* type. Returns a Token.NULL if safe and the actual root is null.
*/
public Token getRoot(boolean safe) {
diff --git a/src/main/java/org/codehaus/groovy/syntax/Reduction.java b/src/main/java/org/codehaus/groovy/syntax/Reduction.java
index 446d123..7284fd9 100644
--- a/src/main/java/org/codehaus/groovy/syntax/Reduction.java
+++ b/src/main/java/org/codehaus/groovy/syntax/Reduction.java
@@ -59,7 +59,7 @@ public class Reduction extends CSTNode {
/**
* Creates a new <code>Reduction</code> with <code>Token.NULL</code>
- * as it's root.
+ * as its root.
*/
public static Reduction newContainer() {
return new Reduction(Token.NULL);
@@ -96,7 +96,7 @@ public class Reduction extends CSTNode {
}
/**
- * Returns the root of the node, the Token that indicates it's
+ * Returns the root of the node, the Token that indicates its
* type. Returns null if there is no root (usually only if the
* node is a placeholder of some kind -- see isEmpty()).
*/
diff --git a/src/main/java/org/codehaus/groovy/syntax/Token.java b/src/main/java/org/codehaus/groovy/syntax/Token.java
index db686cc..7f738f4 100644
--- a/src/main/java/org/codehaus/groovy/syntax/Token.java
+++ b/src/main/java/org/codehaus/groovy/syntax/Token.java
@@ -81,7 +81,7 @@ public class Token extends CSTNode {
}
/**
- * Sets the meaning for this node (and it's root Token). Not
+ * Sets the meaning for this node (and its root Token). Not
* valid if the node isEmpty(). Returns this token, for
* convenience.
*/
diff --git a/src/main/java/org/codehaus/groovy/tools/LoaderConfiguration.java b/src/main/java/org/codehaus/groovy/tools/LoaderConfiguration.java
index eb2e261..27daeea 100644
--- a/src/main/java/org/codehaus/groovy/tools/LoaderConfiguration.java
+++ b/src/main/java/org/codehaus/groovy/tools/LoaderConfiguration.java
@@ -147,7 +147,7 @@ public class LoaderConfiguration {
}
/*
- * Expands the properties inside the given string to it's values.
+ * Expands the properties inside the given string to their values.
*/
private static String assignProperties(String str) {
int propertyIndexStart = 0, propertyIndexEnd = 0;
diff --git a/src/main/java/org/codehaus/groovy/tools/RootLoader.java b/src/main/java/org/codehaus/groovy/tools/RootLoader.java
index 46e0d5f..d8854ce 100644
--- a/src/main/java/org/codehaus/groovy/tools/RootLoader.java
+++ b/src/main/java/org/codehaus/groovy/tools/RootLoader.java
@@ -28,7 +28,7 @@ import java.util.Map;
/**
* This ClassLoader should be used as root of class loaders. Any
- * RootLoader does have it's own classpath. When searching for a
+ * RootLoader does have its own classpath. When searching for a
* class or resource this classpath will be used. Parent
* Classloaders are ignored first. If a class or resource
* can't be found in the classpath of the RootLoader, then parent is
@@ -45,7 +45,7 @@ import java.util.Map;
* classloader does know a class which depends on a class only
* a child of this loader does know, then you won't be able to
* load the class. To load the class the child is not allowed
- * to redirect it's search for the class to the parent first.
+ * to redirect its search for the class to the parent first.
* That way the child can load the class. If the child does not
* have all classes to do this, this fails of course.
* <p>
diff --git a/src/spec/doc/core-semantics.adoc b/src/spec/doc/core-semantics.adoc
index dd12db3..3d33dcd 100644
--- a/src/spec/doc/core-semantics.adoc
+++ b/src/spec/doc/core-semantics.adoc
@@ -1973,7 +1973,7 @@ is `groovy.transform.stc.FirstParam` which indicated to the type checker that th
whose type is the type of the first parameter of the method. In this case, the first parameter of the method is `Person`,
so it indicates to the type checker that the first parameter of the closure is in fact a `Person`.
-A second optional argument is named _options_. It's semantics depend on the _type hint_ class. Groovy comes with
+A second optional argument is named _options_. Its semantics depend on the _type hint_ class. Groovy comes with
various bundled type hints, illustrated in the table below:
[cols="1a,1,4a"]
diff --git a/src/spec/doc/core-traits.adoc b/src/spec/doc/core-traits.adoc
index 624bd9e..342d287 100644
--- a/src/spec/doc/core-traits.adoc
+++ b/src/spec/doc/core-traits.adoc
@@ -686,7 +686,7 @@ properties and field are accessed dynamically (it's a limitation from the JVM).
* Static methods do not appear within the generated interfaces for each trait.
* The trait is interpreted as a _template_ for the implementing class, which means that each
implementing class will get its own static methods, properties and fields. So a static member
-declared on a trait doesn't belong to the `Trait`, but to it's implementing class.
+declared on a trait doesn't belong to the `Trait`, but to its implementing class.
* You should typically not mix static and instance methods of the same signature. The normal
rules for applying traits apply (including multiple inheritance conflict resolution). If the
method chosen is static but some implemented trait has an instance variant, a compilation error
diff --git a/src/spec/doc/grape.adoc b/src/spec/doc/grape.adoc
index 4aef8ea..57db1a1 100644
--- a/src/spec/doc/grape.adoc
+++ b/src/spec/doc/grape.adoc
@@ -256,10 +256,10 @@ different `ClassLoader` context then resolution may be re-run.
be in the `ClassLoader` chain of the calling class. By default failure to
have such a `ClassLoader` available will result in module resolution and
an exception being thrown
-** The ClassLoader passed in via the `classLoader:` argument and it’s
+** The ClassLoader passed in via the `classLoader:` argument and its
parent classloaders.
** The ClassLoader of the object passed in as the `referenceObject:`
-argument, and it’s parent classloaders.
+argument, and its parent classloaders.
** The ClassLoader of the class issuing the call to `grab`
[[Grape-grabHashMapParameters]]
@@ -282,7 +282,7 @@ maven `runtime` and `master` scopes.
revision must be used in case of conflicts, independently of
* conflicts manager
* `changing:` - <boolean>, default false - Whether the artifact can
-change without it’s version designation changing.
+change without its version designation changing.
* `transitive:` - <boolean>, default true - Whether to resolve other
dependencies this module has or not.
diff --git a/src/test/groovy/ProcessTest.groovy b/src/test/groovy/ProcessTest.groovy
index 1fe048d..4f10f8c 100644
--- a/src/test/groovy/ProcessTest.groovy
+++ b/src/test/groovy/ProcessTest.groovy
@@ -75,7 +75,7 @@ class ProcessTest extends GroovyTestCase {
assert myProcess.out != null
}
- // @todo - ps.waitForOrKill(secs) creates it's own thread, leave this out of test suite for now...
+ // @todo - ps.waitForOrKill(secs) creates its own thread, leave this out of test suite for now...
void tearDown() {
myProcess.destroy()
diff --git a/src/test/groovy/transform/stc/FieldsAndPropertiesSTCTest.groovy b/src/test/groovy/transform/stc/FieldsAndPropertiesSTCTest.groovy
index 4b8ffb3..d925905 100644
--- a/src/test/groovy/transform/stc/FieldsAndPropertiesSTCTest.groovy
+++ b/src/test/groovy/transform/stc/FieldsAndPropertiesSTCTest.groovy
@@ -420,7 +420,7 @@ class FieldsAndPropertiesSTCTest extends StaticTypeCheckingTestCase {
String getFooFromTop() { foo }
}
- // a subclass defining it's own field
+ // a subclass defining its own field
class Bottom extends Top {
private String foo
diff --git a/src/test/groovy/ui/GroovyMainTest.groovy b/src/test/groovy/ui/GroovyMainTest.groovy
index f56d252..903ae4f 100644
--- a/src/test/groovy/ui/GroovyMainTest.groovy
+++ b/src/test/groovy/ui/GroovyMainTest.groovy
@@ -80,7 +80,7 @@ class GroovyMainTest extends GroovyTestCase {
/**
* GROOVY-6561 : Correct handling of scripts from a URI.
- * GROOVY-1642 : Enable a script to get it's URI by annotating a field.
+ * GROOVY-1642 : Enable a script to get its URI by annotating a field.
*/
void testURISource() {
def tempFile = File.createTempFile("groovy-ui-GroovyMainTest-testURISource", ".groovy")
diff --git a/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/transform/MacroClassTransformation.java b/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/transform/MacroClassTransformation.java
index 9bf077c..5775f67 100644
--- a/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/transform/MacroClassTransformation.java
+++ b/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/transform/MacroClassTransformation.java
@@ -46,7 +46,7 @@ import static org.codehaus.groovy.ast.tools.GeneralUtils.constX;
import static org.codehaus.groovy.ast.tools.GeneralUtils.propX;
/**
- * Transforms {@link MacroClass} calls into it's ClassNode
+ * Transforms {@link MacroClass} calls into its ClassNode
*
* @since 2.5.0
*/
diff --git a/subprojects/groovy-swing/src/test/groovy/groovy/swing/SwingBuilderBindingsTest.groovy b/subprojects/groovy-swing/src/test/groovy/groovy/swing/SwingBuilderBindingsTest.groovy
index 8aeb744..6e2d5cb 100644
--- a/subprojects/groovy-swing/src/test/groovy/groovy/swing/SwingBuilderBindingsTest.groovy
+++ b/subprojects/groovy-swing/src/test/groovy/groovy/swing/SwingBuilderBindingsTest.groovy
@@ -809,9 +809,9 @@ class SwingBuilderBindingsTest extends GroovySwingTestCase {
slider(id: 's1', value: bind(target: spin1, targetProperty: 'value', id: 'binding1', value: 15))
slider(id: 's2', value: bind(source: spin2, sourceProperty: 'value', id: 'binding2', value: 16))
}
- // s1 is the source, so it's value should be reflected
+ // s1 is the source, so its value should be reflected
assert swing.s1.value == 15
- // s2 is target, not source, so it's value setting should have no effect
+ // s2 is target, not source, so its value setting should have no effect
assert swing.s2.value == 8
swing.actions {
@@ -824,9 +824,9 @@ class SwingBuilderBindingsTest extends GroovySwingTestCase {
id: 'binding4', value: '16',
converter: {Integer.parseInt(String.valueOf(it))}))
}
- // s1 is the source, so it's value should be reflected
+ // s1 is the source, so its value should be reflected
assert swing.s3.value == 15
- // s2 is target, not source, so it's value setting should have no effect
+ // s2 is target, not source, so its value setting should have no effect
assert swing.s4.value == 8
}
}
diff --git a/subprojects/groovy-swing/src/test/groovy/groovy/swing/SwingBuilderTest.groovy b/subprojects/groovy-swing/src/test/groovy/groovy/swing/SwingBuilderTest.groovy
index 61537dd..d6d82fc 100644
--- a/subprojects/groovy-swing/src/test/groovy/groovy/swing/SwingBuilderTest.groovy
+++ b/subprojects/groovy-swing/src/test/groovy/groovy/swing/SwingBuilderTest.groovy
@@ -689,7 +689,7 @@ class SwingBuilderTest extends GroovySwingTestCase {
def locationLast = frame.location
// setLocationReativeTo(null) places the component in the center of
- // the screen, relative to it's size, so centering it after sizing it
+ // the screen, relative to its size, so centering it after sizing it
// should result in a 250,250 offset from centering it before sizing it
assert locationFirst != locationLast
}