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 2020/05/27 06:22:57 UTC
[isis] branch master updated: ISIS-2340: cleanup last commit
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 5e73d1f ISIS-2340: cleanup last commit
5e73d1f is described below
commit 5e73d1f74aedb19a8da8d49dd56932af19275a50
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed May 27 08:22:48 2020 +0200
ISIS-2340: cleanup last commit
---
.../isis/viewer/wicket/model/models/EntityCollectionModel.java | 6 ------
.../viewer/wicket/model/models/HintPageParameterSerializer.java | 9 ++++-----
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
index d6784af..c19e613 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
@@ -364,12 +364,6 @@ implements LinksProvider, UiHintContainer {
}
val collectionId = collectionLayoutData.getId();
-
-// final SpecificationLoader specificationLoader = entityModel.getSpecificationLoader();
-// final ObjectMemento parentObjectAdapterMemento = entityModel.memento();
-// final ObjectSpecId objectSpecId = parentObjectAdapterMemento.getObjectSpecId();
-// final ObjectSpecification objectSpec = specificationLoader.lookupBySpecIdElseLoad(objectSpecId);
-
val spec = entityModel.getTypeOfSpecification();
return (OneToManyAssociation) spec.getAssociationElseFail(collectionId);
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/HintPageParameterSerializer.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/HintPageParameterSerializer.java
index af00230..d8103d6 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/HintPageParameterSerializer.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/HintPageParameterSerializer.java
@@ -22,6 +22,7 @@ import java.io.Serializable;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.hint.HintStore;
import org.apache.isis.viewer.wicket.model.util.ComponentHintKey;
@@ -38,20 +39,18 @@ class HintPageParameterSerializer implements Serializable {
final PageParameters pageParameters,
final ManagedObjectModel objectModel) {
- objectModel.asHintingBookmarkIfSupported();
-
+ val bookmark = objectModel.asHintingBookmarkIfSupported();
val hintStore = objectModel.getCommonContext().lookupServiceElseFail(HintStore.class);
- hintStoreToPageParameters(pageParameters, objectModel, hintStore);
+ hintStoreToPageParameters(pageParameters, bookmark, hintStore);
}
// -- HELPER
private static void hintStoreToPageParameters(
final PageParameters pageParameters,
- final ManagedObjectModel objectModel,
+ final Bookmark bookmark,
final HintStore hintStore) {
- val bookmark = objectModel.asHintingBookmarkIfSupported();
if(bookmark==null) {
return;
}