You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2018/10/12 09:36:00 UTC
[isis] 02/04: Merge remote-tracking branch 'origin/master' into v2
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 44d88c7243344d5af56f5829735eabd9c62d77be
Merge: ca71b7b 85fa275
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Oct 12 09:25:07 2018 +0100
Merge remote-tracking branch 'origin/master' into v2
# Conflicts:
# core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/DeriveFacetsPostProcessor.java
# core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
...sAndChoicesPostProcessor.java => DeriveFacetsPostProcessor.java} | 6 ++----
.../apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java | 5 +++--
2 files changed, 5 insertions(+), 6 deletions(-)
diff --cc core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
index f33dff6,ee5c697..ec1c49a
--- a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
+++ b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
@@@ -149,12 -196,10 +149,12 @@@ import org.apache.isis.core.metamodel.f
import org.apache.isis.core.metamodel.facets.value.timestampsql.JavaSqlTimeStampValueFacetUsingSemanticsProviderFactory;
import org.apache.isis.core.metamodel.facets.value.url.URLValueFacetUsingSemanticsProviderFactory;
import org.apache.isis.core.metamodel.facets.value.uuid.UUIDValueFacetUsingSemanticsProviderFactory;
- import org.apache.isis.core.metamodel.postprocessors.param.ActionCollectionParameterDefaultsAndChoicesPostProcessor;
+ import org.apache.isis.core.metamodel.postprocessors.param.DeriveFacetsPostProcessor;
import org.apache.isis.core.metamodel.progmodel.ObjectSpecificationPostProcessor;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModelAbstract;
+import org.apache.isis.core.metamodel.progmodel.ProgrammingModelPlugin;
+import org.apache.isis.core.metamodel.progmodel.ProgrammingModelPlugin.FacetFactoryCategory;
+import org.apache.isis.core.metamodel.progmodel.ProgrammingModelPlugin.FactoryCollector;
public final class ProgrammingModelFacetsJava5 extends ProgrammingModelAbstract {
@@@ -406,19 -538,8 +406,20 @@@
@Override
public List<ObjectSpecificationPostProcessor> getPostProcessors() {
- return Lists.<ObjectSpecificationPostProcessor>newArrayList(
+ return _Lists.singleton(
- new ActionCollectionParameterDefaultsAndChoicesPostProcessor() );
+ new DeriveFacetsPostProcessor()
+ );
}
+
+ // -- HELPER
+
+ private static FactoryCollector discoverFactories() {
+ final Set<ProgrammingModelPlugin> plugins = _Plugin.loadAll(ProgrammingModelPlugin.class);
+ final FactoryCollector collector = ProgrammingModelPlugin.collector();
+ plugins.forEach(plugin->{
+ plugin.plugin(collector);
+ });
+ return collector;
+ }
+
}