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/15 05:53:49 UTC
[isis] branch master updated: ISIS-2340: BookmarkableModel no
longer needs a generic type param
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 3d0c2b7 ISIS-2340: BookmarkableModel no longer needs a generic type param
3d0c2b7 is described below
commit 3d0c2b7b76d51c26d4147a14db8f6f8f9964d91b
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri May 15 07:53:39 2020 +0200
ISIS-2340: BookmarkableModel no longer needs a generic type param
---
.../apache/isis/viewer/wicket/model/models/ActionModel.java | 2 +-
.../isis/viewer/wicket/model/models/BookmarkTreeNode.java | 12 ++++++------
.../isis/viewer/wicket/model/models/BookmarkableModel.java | 2 +-
.../viewer/wicket/model/models/BookmarkedPagesModel.java | 2 +-
.../apache/isis/viewer/wicket/model/models/EntityModel.java | 2 +-
.../apache/isis/viewer/wicket/model/models/ScalarModel.java | 3 ++-
.../org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java | 2 +-
.../isis/viewer/wicket/ui/panels/PromptFormAbstract.java | 2 +-
8 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
index 193473a..e8bcc26 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
@@ -65,7 +65,7 @@ import lombok.val;
public final class ActionModel
extends ManagedObjectModel
-implements FormUiModel, FormExecutorContext, BookmarkableModel<ManagedObject> {
+implements FormUiModel, FormExecutorContext, BookmarkableModel {
private static final long serialVersionUID = 1L;
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java
index 00e1378..6ca7473 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java
@@ -54,12 +54,12 @@ public class BookmarkTreeNode implements Serializable {
private PageParameters pageParameters;
public static BookmarkTreeNode newRoot(
- BookmarkableModel<?> bookmarkableModel) {
+ BookmarkableModel bookmarkableModel) {
return new BookmarkTreeNode(bookmarkableModel, 0);
}
private BookmarkTreeNode(
- final BookmarkableModel<?> bookmarkableModel,
+ final BookmarkableModel bookmarkableModel,
final int depth) {
pageParameters = bookmarkableModel.getPageParametersWithoutUiHints();
RootOid oid = oidFrom(pageParameters);
@@ -90,7 +90,7 @@ public class BookmarkTreeNode implements Serializable {
public List<BookmarkTreeNode> getChildren() {
return children;
}
- public BookmarkTreeNode addChild(BookmarkableModel<?> childModel) {
+ public BookmarkTreeNode addChild(BookmarkableModel childModel) {
final BookmarkTreeNode childNode = new BookmarkTreeNode(childModel, depth+1);
children.add(childNode);
return childNode;
@@ -110,7 +110,7 @@ public class BookmarkTreeNode implements Serializable {
*
* @return - whether the provided candidate is found or was added to this node's tree.
*/
- public boolean matches(BookmarkableModel<?> candidateBookmarkableModel) {
+ public boolean matches(BookmarkableModel candidateBookmarkableModel) {
if(candidateBookmarkableModel instanceof EntityModel) {
if(this.pageType != PageType.ENTITY) {
return false;
@@ -188,7 +188,7 @@ public class BookmarkTreeNode implements Serializable {
return true;
}
- private boolean addToGraphIfParented(BookmarkableModel<?> candidateBookmarkableModel) {
+ private boolean addToGraphIfParented(BookmarkableModel candidateBookmarkableModel) {
final boolean whetherAdded[] = {false}; // simply a fast non-thread-safe value reference
@@ -258,7 +258,7 @@ public class BookmarkTreeNode implements Serializable {
}
}
- public static String oidStrFrom(BookmarkableModel<?> candidateBookmarkableModel) {
+ public static String oidStrFrom(BookmarkableModel candidateBookmarkableModel) {
final RootOid oid = oidFrom(candidateBookmarkableModel.getPageParametersWithoutUiHints());
return oid != null? Oid.marshaller().marshal(oid): null;
}
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkableModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkableModel.java
index d5c3514..3f53e04 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkableModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkableModel.java
@@ -23,7 +23,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.viewer.common.model.HasTitle;
-public interface BookmarkableModel<T>
+public interface BookmarkableModel
extends HasTitle {
/**
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
index 2c2c7d7..b78a409 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
@@ -45,7 +45,7 @@ public class BookmarkedPagesModel extends ModelAbstract<List<BookmarkTreeNode>>
super(commonContext);
}
- public void bookmarkPage(final BookmarkableModel<?> bookmarkableModel) {
+ public void bookmarkPage(final BookmarkableModel bookmarkableModel) {
// hack: remove any garbage that might've got stored in 'rootNodes'
cleanUpGarbage(rootNodes);
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
index a32d2b1..4a5dab1 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
@@ -57,7 +57,7 @@ import lombok.val;
//@Log4j2
public class EntityModel
extends ManagedObjectModel
-implements ObjectAdapterModel, UiHintContainer, ObjectUiModel, BookmarkableModel<ManagedObject> {
+implements ObjectAdapterModel, UiHintContainer, ObjectUiModel, BookmarkableModel {
private static final long serialVersionUID = 1L;
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
index d29cee2..ac1b65e 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
@@ -72,7 +72,8 @@ import lombok.extern.log4j.Log4j2;
* </p>
*/
@Log4j2
-public abstract class ScalarModel extends EntityModel
+public abstract class ScalarModel
+extends EntityModel
implements ScalarUiModel, LinksProvider, FormExecutorContext {
private static final long serialVersionUID = 1L;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index d429c83..bc2a27d 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -410,7 +410,7 @@ public abstract class PageAbstract extends WebPageBase implements ActionPromptPr
return getCommonContext().getConfiguration().getViewer().getWicket().getBookmarkedPages().isShowDropDownOnFooter();
}
- protected void bookmarkPageIfShown(final BookmarkableModel<?> model) {
+ protected void bookmarkPageIfShown(final BookmarkableModel model) {
if(!isShowBookmarks()) {
// no need...
return;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PromptFormAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PromptFormAbstract.java
index c625bef..5ba4a78 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PromptFormAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PromptFormAbstract.java
@@ -57,7 +57,7 @@ import org.apache.isis.viewer.wicket.ui.pages.PageAbstract;
import org.apache.isis.viewer.wicket.ui.pages.entity.EntityPage;
import org.apache.isis.viewer.wicket.ui.util.Components;
-public abstract class PromptFormAbstract<T extends BookmarkableModel<ManagedObject>
+public abstract class PromptFormAbstract<T extends BookmarkableModel
& HasParentUiModel<EntityModel>
& IModel<ManagedObject>
& FormExecutorContext>