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 2015/10/28 22:39:37 UTC
incubator-groovy git commit: Fix typos in word 'overridden' (closes
#165)
Repository: incubator-groovy
Updated Branches:
refs/heads/GROOVY_2_4_X 2246ee2d4 -> d5e815475
Fix typos in word 'overridden' (closes #165)
Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/d5e81547
Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/d5e81547
Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/d5e81547
Branch: refs/heads/GROOVY_2_4_X
Commit: d5e8154757c5821c1d821c322c5162120279c169
Parents: 2246ee2
Author: Michal Kordas <ko...@gmail.com>
Authored: Wed Oct 28 22:21:45 2015 +0100
Committer: pascalschumacher <pa...@gmx.net>
Committed: Wed Oct 28 22:38:37 2015 +0100
----------------------------------------------------------------------
src/spec/doc/core-domain-specific-languages.adoc | 2 +-
src/spec/doc/core-metaprogramming.adoc | 2 +-
src/spec/doc/core-object-orientation.adoc | 2 +-
src/spec/doc/core-semantics.adoc | 4 ++--
src/spec/test/metaprogramming/GroovyObjectTest.groovy | 4 ++--
src/test/gls/innerClass/InnerClassTest.groovy | 4 ++--
src/test/gls/invocation/CovariantReturnTest.groovy | 2 +-
src/test/groovy/lang/MapOfClosureTest.groovy | 6 +++---
.../src/main/groovy/groovy/text/markup/BaseTemplate.java | 2 +-
.../groovy-templates/src/spec/doc/markup-template-engine.adoc | 2 +-
.../src/spec/test/MarkupTemplateEngineSpecTest.groovy | 4 ++--
11 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/d5e81547/src/spec/doc/core-domain-specific-languages.adoc
----------------------------------------------------------------------
diff --git a/src/spec/doc/core-domain-specific-languages.adoc b/src/spec/doc/core-domain-specific-languages.adoc
index d023834..d733a09 100644
--- a/src/spec/doc/core-domain-specific-languages.adoc
+++ b/src/spec/doc/core-domain-specific-languages.adoc
@@ -226,7 +226,7 @@ is possible by doing this:
include::{projectdir}/src/spec/test/BaseScriptSpecTest.groovy[tags=custom_run_method,indent=0]
----
<1> the base script class should define one (and only one) abstract method
-<2> the `run` method can be overriden and perform a task before executing the script body
+<2> the `run` method can be overridden and perform a task before executing the script body
<3> `run` calls the abstract `scriptBody` method which will delegate to the user script
<4> then it can return something else than the value from the script
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/d5e81547/src/spec/doc/core-metaprogramming.adoc
----------------------------------------------------------------------
diff --git a/src/spec/doc/core-metaprogramming.adoc b/src/spec/doc/core-metaprogramming.adoc
index e78c08c..3e51162 100644
--- a/src/spec/doc/core-metaprogramming.adoc
+++ b/src/spec/doc/core-metaprogramming.adoc
@@ -63,7 +63,7 @@ public interface GroovyObject {
==== invokeMethod
According to the schema in <<core-metaprogramming.adoc#_runtime_metaprogramming,Runtime Metaprogramming>> this method is called when the method you called is not present on a Groovy object.
-Here is a simple example using a overriden `invokeMethod()` method:
+Here is a simple example using a overridden `invokeMethod()` method:
[source,groovy]
----
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/d5e81547/src/spec/doc/core-object-orientation.adoc
----------------------------------------------------------------------
diff --git a/src/spec/doc/core-object-orientation.adoc b/src/spec/doc/core-object-orientation.adoc
index 1729e22..5f5b34d 100644
--- a/src/spec/doc/core-object-orientation.adoc
+++ b/src/spec/doc/core-object-orientation.adoc
@@ -806,7 +806,7 @@ include::{projectdir}/src/spec/test/ClassTest.groovy[tags=compiledynamic_process
<11> we add that expression to the annotation node, which is now `@CompileStatic(TypeCheckingMode.SKIP)`
<12> return the generated annotation
-In the example, the `visit` method is the only method which has to be overriden. It is meant to return a list of
+In the example, the `visit` method is the only method which has to be overridden. It is meant to return a list of
annotation nodes that will be added to the node annotated with the meta-annotation. In this example, we return a
single one corresponding to `@CompileStatic(TypeCheckingMode.SKIP)`.
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/d5e81547/src/spec/doc/core-semantics.adoc
----------------------------------------------------------------------
diff --git a/src/spec/doc/core-semantics.adoc b/src/spec/doc/core-semantics.adoc
index d2b43e7..1e55926 100644
--- a/src/spec/doc/core-semantics.adoc
+++ b/src/spec/doc/core-semantics.adoc
@@ -1744,8 +1744,8 @@ of a closure: its type is inferred from the body of the closure.
.Closures vs methods
****
It's worth noting that return type inference is only applicable to closures. While the type checker could do the
-same on a method, it is in practice not desirable: _in general_, methods can be overriden and it is not statically
-possible to make sure that the method which is called is not an overriden version. So flow typing would actually
+same on a method, it is in practice not desirable: _in general_, methods can be overridden and it is not statically
+possible to make sure that the method which is called is not an overridden version. So flow typing would actually
think that a method returns something, while in reality, it could return something else, like illustrated in the
following example:
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/d5e81547/src/spec/test/metaprogramming/GroovyObjectTest.groovy
----------------------------------------------------------------------
diff --git a/src/spec/test/metaprogramming/GroovyObjectTest.groovy b/src/spec/test/metaprogramming/GroovyObjectTest.groovy
index 10120d1..0d57857 100644
--- a/src/spec/test/metaprogramming/GroovyObjectTest.groovy
+++ b/src/spec/test/metaprogramming/GroovyObjectTest.groovy
@@ -80,14 +80,14 @@ class POGO {
String property
void setProperty(String name, Object value) {
- this.@"$name" = 'overriden'
+ this.@"$name" = 'overridden'
}
}
def pogo = new POGO()
pogo.property = 'a'
-assert pogo.property == 'overriden'
+assert pogo.property == 'overridden'
// end::groovy_set_property[]
'''
}
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/d5e81547/src/test/gls/innerClass/InnerClassTest.groovy
----------------------------------------------------------------------
diff --git a/src/test/gls/innerClass/InnerClassTest.groovy b/src/test/gls/innerClass/InnerClassTest.groovy
index eeeddab..4af2fab 100644
--- a/src/test/gls/innerClass/InnerClassTest.groovy
+++ b/src/test/gls/innerClass/InnerClassTest.groovy
@@ -271,7 +271,7 @@ class InnerClassTest extends CompilableTestSupport {
'''
}
- void testUsageOfOuterFieldOverriden_FAILS() {
+ void testUsageOfOuterFieldOverridden_FAILS() {
if (notYetImplemented()) return
assertScript """
@@ -340,7 +340,7 @@ class InnerClassTest extends CompilableTestSupport {
"""
}
- void testUsageOfOuterMethodOverriden() {
+ void testUsageOfOuterMethodoverridden() {
assertScript """
interface Run {
def run()
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/d5e81547/src/test/gls/invocation/CovariantReturnTest.groovy
----------------------------------------------------------------------
diff --git a/src/test/gls/invocation/CovariantReturnTest.groovy b/src/test/gls/invocation/CovariantReturnTest.groovy
index 9f6648d..407c190 100644
--- a/src/test/gls/invocation/CovariantReturnTest.groovy
+++ b/src/test/gls/invocation/CovariantReturnTest.groovy
@@ -159,7 +159,7 @@ public class CovariantReturnTest extends CompilableTestSupport {
void testImplementedInterfacesNotInfluencing() {
// in GROOVY-3229 some methods from Appendable were not correctly recognized
- // as already being overriden (PrintWriter<Writer<Appenable)
+ // as already being overridden (PrintWriter<Writer<Appenable)
shouldCompile """
class IndentWriter extends java.io.PrintWriter {
public IndentWriter(Writer w) { super(w, true) }
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/d5e81547/src/test/groovy/lang/MapOfClosureTest.groovy
----------------------------------------------------------------------
diff --git a/src/test/groovy/lang/MapOfClosureTest.groovy b/src/test/groovy/lang/MapOfClosureTest.groovy
index 60dbe57..0919bb5 100644
--- a/src/test/groovy/lang/MapOfClosureTest.groovy
+++ b/src/test/groovy/lang/MapOfClosureTest.groovy
@@ -64,7 +64,7 @@ class MapOfClosureTest extends GroovyTestCase {
}
/**
- * Checks public and protected methods from parents can also be overriden by the Map coercion to classes.
+ * Checks public and protected methods from parents can also be overridden by the Map coercion to classes.
*/
void testOverrideProtectedMethods() {
def b = [pub: { "map pub" }, prot: { "map prot" }, child: { "map child" }] as B
@@ -76,7 +76,7 @@ class MapOfClosureTest extends GroovyTestCase {
}
/**
- * Checks that abstract methods can also be overriden.
+ * Checks that abstract methods can also be overridden.
*/
void testAbstractMethodIsOverrided() {
def a = [abstractMethod: { "map abstract" }] as A
@@ -85,7 +85,7 @@ class MapOfClosureTest extends GroovyTestCase {
}
/**
- * Verify that complex method signatures, even with primitive types and arrays, can be overriden.
+ * Verify that complex method signatures, even with primitive types and arrays, can be overridden.
*/
void testComplexMethodSignature() {
def c = [foo: { int a, List b, Double[] c -> ["map foo"] as String[] }] as C
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/d5e81547/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/BaseTemplate.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/BaseTemplate.java b/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/BaseTemplate.java
index 7b0fe83..fa1301c 100644
--- a/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/BaseTemplate.java
+++ b/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/BaseTemplate.java
@@ -402,7 +402,7 @@ public abstract class BaseTemplate implements Writable {
* Imports a template and renders it using the specified model, allowing fine grained composition of templates and
* layouting. This works similarily to a template include but allows a distinct model to be used. If the layout
* inherits from the parent model, a new model is created, with the values from the parent model, eventually
- * overriden with those provided specifically for this layout.
+ * overridden with those provided specifically for this layout.
*
* @param model model to be passed to the template
* @param templateName the name of the template to be used as a layout
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/d5e81547/subprojects/groovy-templates/src/spec/doc/markup-template-engine.adoc
----------------------------------------------------------------------
diff --git a/subprojects/groovy-templates/src/spec/doc/markup-template-engine.adoc b/subprojects/groovy-templates/src/spec/doc/markup-template-engine.adoc
index ad63232..ff14930 100644
--- a/subprojects/groovy-templates/src/spec/doc/markup-template-engine.adoc
+++ b/subprojects/groovy-templates/src/spec/doc/markup-template-engine.adoc
@@ -332,7 +332,7 @@ But it is also possible to override a value from the parent model:
include::{rootProjectDir}/subprojects/groovy-templates/src/spec/test/MarkupTemplateEngineSpecTest.groovy[tags=layout_template_inherit_override,indent=0]
----
<1> `true` means inherit from the parent model
-<2> but `title` is overriden
+<2> but `title` is overridden
then the output will be:
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/d5e81547/subprojects/groovy-templates/src/spec/test/MarkupTemplateEngineSpecTest.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-templates/src/spec/test/MarkupTemplateEngineSpecTest.groovy b/subprojects/groovy-templates/src/spec/test/MarkupTemplateEngineSpecTest.groovy
index 0b527bd..0b1c3d4 100644
--- a/subprojects/groovy-templates/src/spec/test/MarkupTemplateEngineSpecTest.groovy
+++ b/subprojects/groovy-templates/src/spec/test/MarkupTemplateEngineSpecTest.groovy
@@ -716,13 +716,13 @@ layout 'layout-main.tpl', true, // <1>
templateContents = '''
// tag::layout_template_inherit_override[]
layout 'layout-main.tpl', true, // <1>
- title: 'Overriden title', // <2>
+ title: 'overridden title', // <2>
bodyContents: contents { p('This is the body') }
// end::layout_template_inherit_override[]
'''
expectedRendered = stripAsciidocMarkup '''
// tag::layout_expected_3[]
-<html><head><title>Overriden title</title></head><body><p>This is the body</p></body></html>
+<html><head><title>overridden title</title></head><body><p>This is the body</p></body></html>
// end::layout_expected_3[]
'''
assertRendered()