From bf040c3dc1a8ab927a91f1a91458a3ab3d7cef4b Mon Sep 17 00:00:00 2001 From: Aviskar Basnet Date: Sun, 5 Mar 2017 12:14:28 +0545 Subject: [PATCH 1/2] Polish doc See gh-1349 --- src/asciidoc/core-beans.adoc | 4 ++-- src/asciidoc/core-validation.adoc | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/asciidoc/core-beans.adoc b/src/asciidoc/core-beans.adoc index 1bc2a1ff0f6..5559e677f37 100644 --- a/src/asciidoc/core-beans.adoc +++ b/src/asciidoc/core-beans.adoc @@ -370,7 +370,7 @@ delegates, e.g. with `XmlBeanDefinitionReader` for XML files: [subs="verbatim,quotes"] ---- GenericApplicationContext context = new GenericApplicationContext(); - new XmlBeanDefinitionReader(ctx).loadBeanDefinitions("services.xml", "daos.xml"); + new XmlBeanDefinitionReader(context).loadBeanDefinitions("services.xml", "daos.xml"); context.refresh(); ---- @@ -380,7 +380,7 @@ Or with `GroovyBeanDefinitionReader` for Groovy files: [subs="verbatim,quotes"] ---- GenericApplicationContext context = new GenericApplicationContext(); - new GroovyBeanDefinitionReader(ctx).loadBeanDefinitions("services.groovy", "daos.groovy"); + new GroovyBeanDefinitionReader(context).loadBeanDefinitions("services.groovy", "daos.groovy"); context.refresh(); ---- diff --git a/src/asciidoc/core-validation.adoc b/src/asciidoc/core-validation.adoc index 76dd177cf6e..dd9876353ab 100644 --- a/src/asciidoc/core-validation.adoc +++ b/src/asciidoc/core-validation.adoc @@ -863,12 +863,16 @@ such as a `static valueOf` method, is defined on the target class. [source,java,indent=0] [subs="verbatim,quotes"] ---- - public interface ConditionalGenericConverter - extends GenericConverter, ConditionalConverter { + public interface ConditionalConverter { boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType); } + + public interface ConditionalGenericConverter + extends GenericConverter, ConditionalConverter { + + } ---- A good example of a `ConditionalGenericConverter` is an EntityConverter that converts From 6bd4c8837148375fb221b0f7e91e9b5e28afd029 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sun, 5 Mar 2017 09:33:57 +0100 Subject: [PATCH 2/2] Polish contribution Closes gh-1349 --- src/asciidoc/core-validation.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/asciidoc/core-validation.adoc b/src/asciidoc/core-validation.adoc index dd9876353ab..64604b6dab6 100644 --- a/src/asciidoc/core-validation.adoc +++ b/src/asciidoc/core-validation.adoc @@ -868,9 +868,9 @@ such as a `static valueOf` method, is defined on the target class. boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType); } - + public interface ConditionalGenericConverter - extends GenericConverter, ConditionalConverter { + extends GenericConverter, ConditionalConverter { } ----