You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2019/02/23 17:42:16 UTC
[isis] branch 2033-IoC updated: ISIS-2033: consolidating enums
ManagedObjectType + MetaModelService.Sort
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch 2033-IoC
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/2033-IoC by this push:
new 579578a ISIS-2033: consolidating enums ManagedObjectType + MetaModelService.Sort
579578a is described below
commit 579578a410bc18f62165d5d5d302ed9a65b4d1fb
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Feb 23 18:42:04 2019 +0100
ISIS-2033: consolidating enums ManagedObjectType + MetaModelService.Sort
.. into org.apache.isis.applib.metamodel.ManagedObjectSort
Task-Url: https://issues.apache.org/jira/browse/ISIS-2033
---
.../isis/applib/metamodel/ManagedObjectSort.java | 40 ++++++++++++++++++++
.../services/metamodel/MetaModelService.java | 44 ++--------------------
...ctionInvocationFacetForDomainEventAbstract.java | 3 +-
.../DomainObjectAnnotationFacetFactory.java | 2 +-
.../metamodel/MetaModelServiceDefault.java | 21 ++++++-----
.../core/metamodel/spec/ManagedObjectType.java | 2 +-
.../core/metamodel/spec/ObjectSpecification.java | 3 +-
.../specimpl/ObjectSpecificationAbstract.java | 37 ++++++++++++++----
.../specimpl/dflt/ObjectSpecificationDefault.java | 2 +-
.../testspec/ObjectSpecificationStub.java | 6 +--
.../ObjectAdapterServiceDefault.java | 10 ++---
.../wicket/model/models/ActionPromptProvider.java | 5 ++-
.../components/scalars/ScalarPanelAbstract2.java | 3 +-
.../linkandlabel/ActionLinkFactoryAbstract.java | 3 +-
.../isis/viewer/wicket/ui/pages/PageAbstract.java | 6 +--
15 files changed, 108 insertions(+), 79 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/metamodel/ManagedObjectSort.java b/core/applib/src/main/java/org/apache/isis/applib/metamodel/ManagedObjectSort.java
new file mode 100644
index 0000000..bebd93d
--- /dev/null
+++ b/core/applib/src/main/java/org/apache/isis/applib/metamodel/ManagedObjectSort.java
@@ -0,0 +1,40 @@
+package org.apache.isis.applib.metamodel;
+
+public enum ManagedObjectSort {
+ VIEW_MODEL,
+ ENTITY,
+ DOMAIN_SERVICE, //TODO [2033] this includes BEANS, shall we add 'BEAN' as separate option, or rename?
+ MIXIN,
+ VALUE,
+ COLLECTION,
+ UNKNOWN;
+
+ public boolean isDomainService() {
+ return this == DOMAIN_SERVICE;
+ }
+
+ public boolean isMixin() {
+ return this == MIXIN;
+ }
+
+ public boolean isViewModel() {
+ return this == VIEW_MODEL;
+ }
+
+ public boolean isValue() {
+ return this == VALUE;
+ }
+
+ public boolean isCollection() {
+ return this == COLLECTION;
+ }
+
+ public boolean isEntity() {
+ return this == ENTITY;
+ }
+
+ public boolean isUnknown() {
+ return this == UNKNOWN;
+ }
+
+}
\ No newline at end of file
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService.java b/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService.java
index 0b306a8..d8a2b66 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService.java
@@ -24,6 +24,7 @@ import java.util.List;
import org.apache.isis.applib.AppManifest;
import org.apache.isis.applib.AppManifest2;
import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.metamodel.ManagedObjectSort;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.command.CommandDtoProcessor;
import org.apache.isis.commons.internal.collections._Lists;
@@ -66,48 +67,9 @@ public interface MetaModelService {
*/
DomainModel getDomainModel();
- Sort sortOf(Class<?> domainType, Mode mode);
+ ManagedObjectSort sortOf(Class<?> domainType, Mode mode);
- Sort sortOf(Bookmark bookmark, Mode mode);
-
- enum Sort { //TODO [2033] duplicate of ManagedObjectType
- VIEW_MODEL,
- ENTITY,
- DOMAIN_SERVICE,
- MIXIN,
- VALUE,
- COLLECTION,
- UNKNOWN;
-
- public boolean isDomainService() {
- return this == DOMAIN_SERVICE;
- }
-
- public boolean isMixin() {
- return this == MIXIN;
- }
-
- public boolean isViewModel() {
- return this == VIEW_MODEL;
- }
-
- public boolean isValue() {
- return this == VALUE;
- }
-
- public boolean isCollection() {
- return this == COLLECTION;
- }
-
- public boolean isEntity() {
- return this == ENTITY;
- }
-
- public boolean isUnknown() {
- return this == UNKNOWN;
- }
-
- }
+ ManagedObjectSort sortOf(Bookmark bookmark, Mode mode);
enum Mode {
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
index 023ecc2..6e6530d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
@@ -38,6 +38,7 @@ import org.apache.isis.applib.NonRecoverableException;
import org.apache.isis.applib.RecoverableException;
import org.apache.isis.applib.events.domain.AbstractDomainEvent;
import org.apache.isis.applib.events.domain.ActionDomainEvent;
+import org.apache.isis.applib.metamodel.ManagedObjectSort;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.services.clock.ClockService;
@@ -398,7 +399,7 @@ implements ImperativeFacet {
}
final Class<?> domainType = resultAdapter.getSpecification().getCorrespondingClass();
- final MetaModelService.Sort sort = getMetaModelService().sortOf(domainType, Mode.STRICT);
+ final ManagedObjectSort sort = getMetaModelService().sortOf(domainType, Mode.STRICT);
switch (sort) {
case ENTITY:
final Object domainObject = resultAdapter.getPojo();
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
index aa89c83..479ed0e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
@@ -576,7 +576,7 @@ implements MetaModelValidatorRefiner, PostConstructMethodCache, ObjectSpecIdFace
// -- HELPER
private boolean isEntityOrViewModel(ObjectSpecification spec) {
- val type = spec.getManagedObjectType();
+ val type = spec.getManagedObjectSort();
return type.isEntity() || type.isViewModel();
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
index a8d724b..5df137e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
@@ -29,6 +29,7 @@ import javax.inject.Singleton;
import org.apache.isis.applib.AppManifest;
import org.apache.isis.applib.AppManifest2;
+import org.apache.isis.applib.metamodel.ManagedObjectSort;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.command.CommandDtoProcessor;
import org.apache.isis.applib.services.grid.GridService;
@@ -171,32 +172,32 @@ public class MetaModelServiceDefault implements MetaModelService {
// //////////////////////////////////////
@Override
- public Sort sortOf(
+ public ManagedObjectSort sortOf(
final Class<?> domainType, final Mode mode) {
if(domainType == null) {
return null;
}
final ObjectSpecification objectSpec = specificationLoader.loadSpecification(domainType);
if(objectSpec.isService()) {
- return Sort.DOMAIN_SERVICE;
+ return ManagedObjectSort.DOMAIN_SERVICE;
}
if(objectSpec.isViewModel()) {
- return Sort.VIEW_MODEL;
+ return ManagedObjectSort.VIEW_MODEL;
}
if(objectSpec.isValue()) {
- return Sort.VALUE;
+ return ManagedObjectSort.VALUE;
}
if(objectSpec.isMixin()) {
- return Sort.MIXIN;
+ return ManagedObjectSort.MIXIN;
}
if(objectSpec.isParentedOrFreeCollection()) {
- return Sort.COLLECTION;
+ return ManagedObjectSort.COLLECTION;
}
if(objectSpec.isEntity()) {
- return Sort.ENTITY;
+ return ManagedObjectSort.ENTITY;
}
if(mode == Mode.RELAXED) {
- return Sort.UNKNOWN;
+ return ManagedObjectSort.UNKNOWN;
}
throw new IllegalArgumentException(String.format(
"Unable to determine what sort of domain object this is: '%s'. Originating domainType: '%s'",
@@ -206,7 +207,7 @@ public class MetaModelServiceDefault implements MetaModelService {
}
@Override
- public Sort sortOf(final Bookmark bookmark, final Mode mode) {
+ public ManagedObjectSort sortOf(final Bookmark bookmark, final Mode mode) {
if(bookmark == null) {
return null;
}
@@ -217,7 +218,7 @@ public class MetaModelServiceDefault implements MetaModelService {
try {
domainType = this.fromObjectType(bookmark.getObjectType());
} catch (Exception e) {
- return Sort.UNKNOWN;
+ return ManagedObjectSort.UNKNOWN;
}
break;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjectType.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjectType.java
index 44b2e52..2b6ee8b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjectType.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjectType.java
@@ -24,7 +24,7 @@ package org.apache.isis.core.metamodel.spec;
* @since 2.0.0-M3
*
*/
-public enum ManagedObjectType {
+enum ManagedObjectType {
Other,
Value,
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
index 875be72..030b533 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
@@ -28,6 +28,7 @@ import java.util.Optional;
import java.util.function.Function;
import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.metamodel.ManagedObjectSort;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.JdoMetamodelUtil;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -231,7 +232,7 @@ ObjectAssociationContainer, Hierarchical, DefaultProvider {
*
* @since 2.0.0-M3
*/
- ManagedObjectType getManagedObjectType();
+ ManagedObjectSort getManagedObjectSort();
// //////////////////////////////////////////////////////////////
// TitleContext
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
index 912c574..2d95865 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
@@ -35,6 +35,7 @@ import javax.enterprise.inject.Vetoed;
import org.apache.isis.applib.AppManifest;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
+import org.apache.isis.applib.metamodel.ManagedObjectSort;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.collections._Lists;
@@ -76,7 +77,6 @@ import org.apache.isis.core.metamodel.interactions.ObjectValidityContext;
import org.apache.isis.core.metamodel.layout.DeweyOrderSet;
import org.apache.isis.core.metamodel.spec.ActionType;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.core.metamodel.spec.ManagedObjectType;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.ObjectSpecificationException;
@@ -1121,14 +1121,14 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
return new ObjectValidityContext(targetAdapter, getIdentifier(), interactionInitiatedBy);
}
- private ManagedObjectType managedObjectType;
+ private ManagedObjectSort managedObjectSort;
@Override
- public ManagedObjectType getManagedObjectType() {
- if(managedObjectType==null) {
- managedObjectType = ManagedObjectType.valueOf(this);
+ public ManagedObjectSort getManagedObjectSort() {
+ if(managedObjectSort==null) {
+ managedObjectSort = sortOf(this);
}
- return managedObjectType;
+ return managedObjectSort;
}
// -- convenience isXxx (looked up from facets)
@@ -1187,8 +1187,6 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
return isViewModel() || isPersistenceCapable();
}
- // -- toString
-
@Override
public String toString() {
final ToString str = new ToString(this);
@@ -1238,5 +1236,28 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
protected SpecificationLoader getSpecificationLoader() {
return specificationLoader;
}
+
+ protected ManagedObjectSort sortOf(ObjectSpecification spec) {
+ if(spec.isValue()) {
+ return ManagedObjectSort.VALUE;
+ }
+ if(spec.isViewModel()) {
+ return ManagedObjectSort.VIEW_MODEL;
+ }
+ if(spec.isMixin()) {
+ return ManagedObjectSort.MIXIN;
+ }
+ if(spec.isParentedOrFreeCollection()) {
+ return ManagedObjectSort.COLLECTION;
+ }
+ if(spec.isService()) {
+ return ManagedObjectSort.DOMAIN_SERVICE;
+ }
+ if(spec.isPersistenceCapable()) {
+ return ManagedObjectSort.ENTITY;
+ }
+
+ return ManagedObjectSort.UNKNOWN;
+ }
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
index e0feeb7..d3539eb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
@@ -427,7 +427,7 @@ public class ObjectSpecificationDefault extends ObjectSpecificationAbstract impl
public String toString() {
final ToString str = new ToString(this);
str.append("class", getFullIdentifier());
- str.append("type", getManagedObjectType().name());
+ str.append("type", getManagedObjectSort().name());
str.append("superclass", superclass() == null ? "Object" : superclass().getFullIdentifier());
return str.toString();
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
index 4f7a500..4026be2 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
@@ -24,6 +24,7 @@ import java.util.List;
import java.util.stream.Stream;
import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.metamodel.ManagedObjectSort;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.consent.Consent;
@@ -37,7 +38,6 @@ import org.apache.isis.core.metamodel.interactions.ObjectTitleContext;
import org.apache.isis.core.metamodel.interactions.ObjectValidityContext;
import org.apache.isis.core.metamodel.spec.ActionType;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.core.metamodel.spec.ManagedObjectType;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.Contributed;
@@ -378,8 +378,8 @@ public class ObjectSpecificationStub extends FacetHolderImpl implements ObjectSp
}
@Override
- public ManagedObjectType getManagedObjectType() {
- return ManagedObjectType.valueOf(this);
+ public ManagedObjectSort getManagedObjectSort() {
+ return null; // [2033] not implemented yet
}
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/ObjectAdapterServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/ObjectAdapterServiceDefault.java
index 8459c2e..d73a8b7 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/ObjectAdapterServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/ObjectAdapterServiceDefault.java
@@ -56,12 +56,12 @@ public class ObjectAdapterServiceDefault implements ObjectAdapterService {
}
val spec = specificationLoader.loadSpecification(pojo.getClass());
- switch (spec.getManagedObjectType()) {
- case Value:
+ switch (spec.getManagedObjectSort()) {
+ case VALUE:
return PojoAdapter.ofValue((Serializable) pojo);
- case ViewModel:
- case Bean:
- case Entity:
+ case VIEW_MODEL:
+ case DOMAIN_SERVICE:
+ case ENTITY:
val managedObject = SimpleManagedObject.of(spec, pojo);
val resolver = resolverFor(managedObject);
if(resolver!=null) {
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionPromptProvider.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionPromptProvider.java
index 143c5c7..c977fe1 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionPromptProvider.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionPromptProvider.java
@@ -17,7 +17,8 @@
package org.apache.isis.viewer.wicket.model.models;
import org.apache.isis.applib.annotation.PromptStyle;
-import org.apache.isis.applib.services.metamodel.MetaModelService;
+import org.apache.isis.applib.metamodel.ManagedObjectSort;
+
import org.apache.wicket.Component;
import org.apache.wicket.Page;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -46,6 +47,6 @@ public interface ActionPromptProvider {
public ActionPrompt getActionPrompt(
final PromptStyle promptStyle,
- final MetaModelService.Sort sort);
+ final ManagedObjectSort sort);
void closePrompt(final AjaxRequestTarget target);
}
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
index 9e7a551..fd32d1f 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
@@ -23,6 +23,7 @@ import java.util.List;
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.PromptStyle;
+import org.apache.isis.applib.metamodel.ManagedObjectSort;
import org.apache.isis.applib.services.metamodel.MetaModelService;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.collections._Lists;
@@ -727,7 +728,7 @@ public abstract class ScalarPanelAbstract2 extends PanelAbstract<ScalarModel> im
final ObjectSpecification specification = scalarModel.getObject().getSpecification();
final MetaModelService metaModelService = getIsisSessionFactory().getServiceInjector()
.lookupServiceElseFail(MetaModelService.class);
- final MetaModelService.Sort sort = metaModelService.sortOf(specification.getCorrespondingClass(), MetaModelService.Mode.RELAXED);
+ final ManagedObjectSort sort = metaModelService.sortOf(specification.getCorrespondingClass(), MetaModelService.Mode.RELAXED);
final ActionPrompt prompt = ActionPromptProvider.Util
.getFrom(ScalarPanelAbstract2.this).getActionPrompt(promptStyle, sort);
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java
index ce44b07..001d63a 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java
@@ -23,6 +23,7 @@ import java.util.concurrent.Callable;
import javax.annotation.Nullable;
import org.apache.isis.applib.annotation.PromptStyle;
+import org.apache.isis.applib.metamodel.ManagedObjectSort;
import org.apache.isis.applib.services.metamodel.MetaModelService;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.collections._Lists;
@@ -161,7 +162,7 @@ public abstract class ActionLinkFactoryAbstract implements ActionLinkFactory {
final MetaModelService metaModelService = getIsisSessionFactory().getServiceInjector()
.lookupServiceElseFail(MetaModelService.class);
- final MetaModelService.Sort sort = metaModelService.sortOf(specification.getCorrespondingClass(), MetaModelService.Mode.RELAXED);
+ final ManagedObjectSort sort = metaModelService.sortOf(specification.getCorrespondingClass(), MetaModelService.Mode.RELAXED);
final ActionPrompt prompt = promptProvider.getActionPrompt(promptStyle, sort);
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index 76a7f7d..60fa079 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -29,10 +29,10 @@ import java.util.stream.Stream;
import javax.inject.Inject;
import org.apache.isis.applib.annotation.PromptStyle;
+import org.apache.isis.applib.metamodel.ManagedObjectSort;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerComposite;
import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.applib.services.metamodel.MetaModelService;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.beans.WebAppConfigBean;
@@ -463,7 +463,7 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
public ActionPrompt getActionPrompt(
final PromptStyle promptStyle,
- final MetaModelService.Sort sort) {
+ final ManagedObjectSort sort) {
switch (promptStyle) {
case AS_CONFIGURED:
@@ -472,7 +472,7 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
case INLINE_AS_IF_EDIT:
default:
final ConfigPropertyEnum<DialogMode> configProp =
- sort == MetaModelService.Sort.DOMAIN_SERVICE
+ sort == ManagedObjectSort.DOMAIN_SERVICE
? CONFIG_DIALOG_MODE_FOR_MENUS
: CONFIG_DIALOG_MODE;
final DialogMode dialogMode = configProp.from(getConfiguration());