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/09/14 16:11:47 UTC
[isis] 06/19: merge - fixes compile issues in SpecificationLoader
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 b28269410f3c9bac22e2ac4988196d751b302b9c
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Sep 14 16:20:30 2018 +0100
merge - fixes compile issues in SpecificationLoader
---
.../apache/isis/core/metamodel/specloader/SpecificationLoader.java | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
index 543bcb8..59c8644 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
@@ -20,7 +20,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import java.util.Properties;
import java.util.Set;
import java.util.concurrent.Callable;
import java.util.concurrent.Future;
@@ -201,7 +200,6 @@ public class SpecificationLoader implements ApplicationScopedComponent {
}
private void loadSpecificationsForServices() {
- final Properties metadataProperties = new Properties();
List<Class<?>> classes = allServiceClasses();
for (final Class<?> serviceClass : classes) {
@@ -211,13 +209,12 @@ public class SpecificationLoader implements ApplicationScopedComponent {
ObjectSpecification objectSpecification = internalLoadSpecification(serviceClass, nature);
facetProcessorObjectSpecId.process(
- serviceClass, metadataProperties,
+ serviceClass,
MethodRemoverConstants.NULL, objectSpecification);
}
}
private void loadSpecificationsForMixins() {
- final Properties metadataProperties = new Properties();
final Set<Class<?>> mixinTypes = AppManifest.Registry.instance().getMixinTypes();
if(mixinTypes == null) {
@@ -226,7 +223,7 @@ public class SpecificationLoader implements ApplicationScopedComponent {
for (final Class<?> mixinType : mixinTypes) {
ObjectSpecification objectSpecification = internalLoadSpecification(mixinType);
facetProcessorObjectSpecId.process(
- mixinType, metadataProperties,
+ mixinType,
MethodRemoverConstants.NULL, objectSpecification);
}