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/07 10:21:53 UTC
[isis] 04/06: ISIS-2340: introduces HasTitle as common interface
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
commit 699fb89850b880d58d89696774b0d7882949989e
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu May 7 11:02:24 2020 +0200
ISIS-2340: introduces HasTitle as common interface
---
.../java/org/apache/isis/viewer/common/model/HasTitle.java | 7 +++++++
.../apache/isis/viewer/wicket/model/models/ActionModel.java | 12 +++++++-----
.../isis/viewer/wicket/model/models/BookmarkableModel.java | 7 ++++---
3 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/HasTitle.java b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/HasTitle.java
new file mode 100644
index 0000000..dbe1201
--- /dev/null
+++ b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/HasTitle.java
@@ -0,0 +1,7 @@
+package org.apache.isis.viewer.common.model;
+
+public interface HasTitle {
+
+ String getTitle();
+
+}
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 7a691fb..85cbbef 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
@@ -74,7 +74,9 @@ import org.apache.isis.viewer.wicket.model.mementos.PageParameterNames;
import lombok.Value;
import lombok.val;
-public class ActionModel extends BookmarkableModel<ManagedObject> implements FormExecutorContext {
+public class ActionModel
+extends BookmarkableModel<ManagedObject>
+implements FormExecutorContext {
private static final long serialVersionUID = 1L;
@@ -169,10 +171,10 @@ public class ActionModel extends BookmarkableModel<ManagedObject> implements For
@Override
public String getTitle() {
- val adapter = getTargetAdapter();
- final ObjectAction objectAction = getAction();
+ val target = getTargetAdapter();
+ val objectAction = getAction();
- final StringBuilder buf = new StringBuilder();
+ val buf = new StringBuilder();
for(val argumentAdapter: argCache().snapshot()) {
if(buf.length() > 0) {
buf.append(",");
@@ -180,7 +182,7 @@ public class ActionModel extends BookmarkableModel<ManagedObject> implements For
buf.append(abbreviated(titleOf(argumentAdapter), 8));
}
- return adapter.titleString(null) + "." + objectAction.getName() + (buf.length()>0?"(" + buf.toString() + ")":"");
+ return target.titleString(null) + "." + objectAction.getName() + (buf.length()>0?"(" + buf.toString() + ")":"");
}
@Override
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 0753fdb..cbbdf90 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
@@ -22,8 +22,11 @@ package org.apache.isis.viewer.wicket.model.models;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.viewer.common.model.HasTitle;
-public abstract class BookmarkableModel<T> extends ModelAbstract<T> {
+public abstract class BookmarkableModel<T>
+extends ModelAbstract<T>
+implements HasTitle {
private static final long serialVersionUID = 1L;
@@ -45,6 +48,4 @@ public abstract class BookmarkableModel<T> extends ModelAbstract<T> {
public abstract boolean hasAsRootPolicy();
- public abstract String getTitle();
-
}