You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@groovy.apache.org by pa...@apache.org on 2015/05/16 01:10:49 UTC
incubator-groovy git commit: fix some typos
Repository: incubator-groovy
Updated Branches:
refs/heads/master baefe9d32 -> d9f4fa8ef
fix some typos
Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/d9f4fa8e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/d9f4fa8e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/d9f4fa8e
Branch: refs/heads/master
Commit: d9f4fa8efbd1981de2d95673bffe35e7abae1eff
Parents: baefe9d
Author: Paul King <pa...@asert.com.au>
Authored: Sat May 16 09:10:40 2015 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Sat May 16 09:10:40 2015 +1000
----------------------------------------------------------------------
.../codehaus/groovy/control/customizers/SecureASTCustomizer.java | 4 ++--
src/spec/doc/core-object-orientation.adoc | 2 +-
src/spec/doc/core-semantics.adoc | 2 +-
.../customizers/builder/CompilerCustomizationBuilderTest.groovy | 2 +-
.../main/groovy/groovy/text/markup/TemplateConfiguration.java | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/d9f4fa8e/src/main/org/codehaus/groovy/control/customizers/SecureASTCustomizer.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/control/customizers/SecureASTCustomizer.java b/src/main/org/codehaus/groovy/control/customizers/SecureASTCustomizer.java
index 44dbd23..6b327da 100644
--- a/src/main/org/codehaus/groovy/control/customizers/SecureASTCustomizer.java
+++ b/src/main/org/codehaus/groovy/control/customizers/SecureASTCustomizer.java
@@ -35,11 +35,11 @@ import java.util.*;
* want to allow arithmetic operations in a groovy shell, you can configure this customizer to restrict package imports,
* method calls and so on.
* <p>
- * Most of the securization options found in this class work with either blacklist or whitelist. This means that, for a
+ * Most of the security customization options found in this class work with either blacklist or whitelist. This means that, for a
* single option, you can set a whitelist OR a blacklist, but not both. You can mix whitelist/blacklist strategies for
* different options. For example, you can have import whitelist and tokens blacklist.
* <p>
- * The recommanded way of securing shells is to use whitelists because it is guaranteed that future features of the
+ * The recommended way of securing shells is to use whitelists because it is guaranteed that future features of the
* Groovy language won't be allowed by defaut. Using blacklists, you can limit the features of the languages by opting
* out, but new language features would require you to update your configuration.
* <p>
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/d9f4fa8e/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 693d52a..10146ed 100644
--- a/src/spec/doc/core-object-orientation.adoc
+++ b/src/spec/doc/core-object-orientation.adoc
@@ -137,7 +137,7 @@ An interface can extend another interface:
[source,groovy]
----
-include::{projectdir}/src/spec/test/ClassTest.groovy[tags=class_implements,indent=0]
+include::{projectdir}/src/spec/test/ClassTest.groovy[tags=extended_interface,indent=0]
----
<1> the `ExtendedGreeter` interface extends the `Greeter` interface using the `extends` keyword
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/d9f4fa8e/src/spec/doc/core-semantics.adoc
----------------------------------------------------------------------
diff --git a/src/spec/doc/core-semantics.adoc b/src/spec/doc/core-semantics.adoc
index d239798..9b42fe1 100644
--- a/src/spec/doc/core-semantics.adoc
+++ b/src/spec/doc/core-semantics.adoc
@@ -1614,7 +1614,7 @@ include::{projectdir}/src/spec/test/typing/TypeCheckingJavaTest.java[tags=java_m
<2> we call the `compute` method with `o`
<3> and print the result
-In Java, this code will output `0`, because method selection is done at compile time and based on the *declared* types.
+In Java, this code will output `Nope`, because method selection is done at compile time and based on the *declared* types.
So even if `o` is a `String` at runtime, it is still the `Object` version which is called, because `o` has been declared
as an `Object`. To be short, in Java, declared types are most important, be it variable types, parameter types or return
types.
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/d9f4fa8e/src/test/org/codehaus/groovy/control/customizers/builder/CompilerCustomizationBuilderTest.groovy
----------------------------------------------------------------------
diff --git a/src/test/org/codehaus/groovy/control/customizers/builder/CompilerCustomizationBuilderTest.groovy b/src/test/org/codehaus/groovy/control/customizers/builder/CompilerCustomizationBuilderTest.groovy
index 2b4f236..c63b300 100644
--- a/src/test/org/codehaus/groovy/control/customizers/builder/CompilerCustomizationBuilderTest.groovy
+++ b/src/test/org/codehaus/groovy/control/customizers/builder/CompilerCustomizationBuilderTest.groovy
@@ -91,7 +91,7 @@ class CompilerCustomizationBuilderTest extends GroovyTestCase {
assert cz.imports[0].classNode.name == 'java.util.concurrent.atomic.AtomicInteger'
assert cz.imports[1].classNode.name == 'java.util.concurrent.atomic.AtomicLong'
- // regular imports using classes (not recommanded for classloading, but people like it)
+ // regular imports using classes (not recommended for classloading, but people like it)
cz = builder.imports(AtomicInteger)
assert cz instanceof ImportCustomizer
assert cz.imports.size() == 1
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/d9f4fa8e/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/TemplateConfiguration.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/TemplateConfiguration.java b/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/TemplateConfiguration.java
index 5002e3c..b85f3a6 100644
--- a/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/TemplateConfiguration.java
+++ b/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/TemplateConfiguration.java
@@ -180,7 +180,7 @@ public class TemplateConfiguration {
}
/**
- * If cache is enabled, then templates are compiled once for each source (URL or File). It is recommanded to keep
+ * If cache is enabled, then templates are compiled once for each source (URL or File). It is recommended to keep
* this flag to true unless you are in development mode and want automatic reloading of templates.
* @param cacheTemplates should templates be cached
*/