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 10:28:27 UTC
[isis] branch master updated: ISIS-2340: minor clean up
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 4b3a2fe ISIS-2340: minor clean up
4b3a2fe is described below
commit 4b3a2fefa33ba092789c1098a574aa7a0ffe1ae1
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri May 15 12:28:15 2020 +0200
ISIS-2340: minor clean up
---
.../isis/viewer/wicket/model/models/ManagedObjectModel.java | 12 ++++++++----
.../apache/isis/viewer/wicket/model/models/ScalarModel.java | 1 +
.../scalars/valuechoices/ValueChoicesSelect2Panel.java | 3 +--
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ManagedObjectModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ManagedObjectModel.java
index 7c87fa1..293a5f9 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ManagedObjectModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ManagedObjectModel.java
@@ -167,6 +167,10 @@ extends ModelAbstract<ManagedObject> {
.map(objectSpec->objectSpec.getFacet(facetClass));
}
+ public boolean isEmpty() {
+ return memento == null;
+ }
+
// -- CONTRACT
@Override
@@ -185,13 +189,13 @@ extends ModelAbstract<ManagedObject> {
// -- DEPRECATIONS
- @Deprecated //TODO do not expose this implementation detail
- public ObjectMemento memento() {
+ @Deprecated //XXX we'de rather not expose this implementation detail
+ ObjectMemento memento() {
return memento;
}
- @Deprecated //TODO do not expose this implementation detail
- public void memento(ObjectMemento memento) {
+ @Deprecated //XXX we'de rather not expose this implementation detail
+ void memento(ObjectMemento memento) {
val manageObject = super.getCommonContext().reconstructObject(memento);
super.setObject(manageObject);
this.memento = memento;
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 49e4b41..04710ad 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
@@ -392,6 +392,7 @@ implements HasRenderingHints, ScalarUiModel, LinksProvider, FormExecutorContext
public void clearPending() {
pendingModel.clearPending();
}
+
// --
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
index 5196042..8ec3ca8 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
@@ -169,9 +169,8 @@ public class ValueChoicesSelect2Panel extends ScalarPanelSelect2Abstract {
@Override
protected void syncIfNull(final Select2 select2) {
- final ObjectMemento curr = getModel().memento();
- if(curr == null) {
+ if(getModel().isEmpty()) {
select2.getModel().setObject(null);
}
}