You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by th...@apache.org on 2014/12/21 20:56:58 UTC
[32/35] tapestry-5 git commit: Resolving merge conflicts after git
pull
Resolving merge conflicts after git pull
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/31493159
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/31493159
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/31493159
Branch: refs/heads/master
Commit: 31493159a0b8bf5676c88111865452405c721ea8
Parents: 97bd4d5 696bc7a
Author: Thiago H. de Paula Figueiredo <th...@apache.org>
Authored: Sun Dec 7 00:28:27 2014 -0200
Committer: Thiago H. de Paula Figueiredo <th...@apache.org>
Committed: Sun Dec 7 00:28:27 2014 -0200
----------------------------------------------------------------------
.../org/apache/tapestry5/beaneditor/BeanModelSourceBuilder.java | 5 +++++
.../apache/tapestry5/ioc/internal/BasicDataTypeAnalyzers.java | 2 --
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/31493159/beanmodel/src/main/java/org/apache/tapestry5/beaneditor/BeanModelSourceBuilder.java
----------------------------------------------------------------------
diff --cc beanmodel/src/main/java/org/apache/tapestry5/beaneditor/BeanModelSourceBuilder.java
index 58537b5,4ac3373..1b08733
--- a/beanmodel/src/main/java/org/apache/tapestry5/beaneditor/BeanModelSourceBuilder.java
+++ b/beanmodel/src/main/java/org/apache/tapestry5/beaneditor/BeanModelSourceBuilder.java
@@@ -40,12 -46,8 +40,17 @@@ import org.apache.tapestry5.services.Pr
import org.slf4j.LoggerFactory;
/**
++<<<<<<< HEAD
+ * <p>Utility class for creating {@link BeanModelSource} instances without
+ * Tapestry-IoC. Usage of Tapestry-IoC is still recommended.
+ * </p>
+ * <p>The setter methods can be used to customize the BeanModelSource to be created and can be
+ * (and usually are skipped), so <code>BeanModelSource beanModelSource = new BeanModelSourceBuilder().build()</code>
+ * is all you need to do.
++=======
+ * Utility class for creating {@link BeanModelSource} instances without
+ * Tapestry-IoC. Usage of Tapestry-IoC is still recommended.
++>>>>>>> 696bc7ae848f4b4f2421ff77ceb4858a2f10465c
*/
public class BeanModelSourceBuilder {
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/31493159/commons/src/main/java/org/apache/tapestry5/ioc/internal/BasicDataTypeAnalyzers.java
----------------------------------------------------------------------
diff --cc commons/src/main/java/org/apache/tapestry5/ioc/internal/BasicDataTypeAnalyzers.java
index 4d603f5,df7564f..79594a8
--- a/commons/src/main/java/org/apache/tapestry5/ioc/internal/BasicDataTypeAnalyzers.java
+++ b/commons/src/main/java/org/apache/tapestry5/ioc/internal/BasicDataTypeAnalyzers.java
@@@ -48,8 -46,7 +47,7 @@@ public class BasicDataTypeAnalyzer
{
DefaultDataTypeAnalyzerMappedConfiguration mappedConfiguration = new DefaultDataTypeAnalyzerMappedConfiguration();
provideDefaultDataTypeAnalyzers(mappedConfiguration);
-
- return new CombinedDataTypeAnalyzer(new AnnotationDataTypeAnalyzer(), new MapDataTypeAnalyzer(mappedConfiguration.getMap()));
+ return new CombinedDataTypeAnalyzer(new AnnotationDataTypeAnalyzer(), new DefaultDataTypeAnalyzer(mappedConfiguration.getMap()));
}
/**