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/05 09:40:36 UTC
[isis] 01/02: ISIS-2340: just some renaming
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 16d4b5f08a668e80f7a55541167be08ef7568a4d
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue May 5 10:17:13 2020 +0200
ISIS-2340: just some renaming
---
.../isis/core/metamodel/spec/ManagedObjects.java | 2 +-
.../wicket/model/models/EntityCollectionModel.java | 24 ++++++++++------------
.../wicket/model/models/ScalarPropertyModel.java | 2 +-
.../CollectionContentsAsAjaxTablePanel.java | 2 +-
4 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java
index 80b5604..18cc336 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java
@@ -87,7 +87,7 @@ public final class ManagedObjects {
// -- COPY UTILITIES
@Nullable
- public static ManagedObject copyOfIfClonable(@Nullable ManagedObject adapter) {
+ public static ManagedObject copyIfClonable(@Nullable ManagedObject adapter) {
if(adapter==null) {
return null;
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 353d269..6230008 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
@@ -58,6 +58,8 @@ import org.apache.isis.viewer.wicket.model.models.Util.LowestCommonSuperclassFin
import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
+import lombok.Getter;
+
/**
* Model representing a collection of entities, either {@link Variant#STANDALONE
* standalone} (eg result of invoking an action) or {@link Variant#PARENTED
@@ -295,12 +297,8 @@ implements LinksProvider, UiHintContainer {
this.actionModelHint = actionModelHint;
}
- private final Variant type;
-
- public Variant getType() {
- return type;
- }
-
+ @Getter private final Variant variant;
+
private final Class<?> typeOf;
private transient ObjectSpecification typeOfSpec;
@@ -350,7 +348,7 @@ implements LinksProvider, UiHintContainer {
int pageSize) {
super(commonContext);
- this.type = type;
+ this.variant = type;
this.entityModel = entityModel;
this.typeOf = typeOf;
this.pageSize = pageSize;
@@ -385,11 +383,11 @@ implements LinksProvider, UiHintContainer {
}
public boolean isParented() {
- return type == Variant.PARENTED;
+ return variant == Variant.PARENTED;
}
public boolean isStandalone() {
- return type == Variant.STANDALONE;
+ return variant == Variant.STANDALONE;
}
public int getPageSize() {
@@ -405,11 +403,11 @@ implements LinksProvider, UiHintContainer {
* (eg 'Customers').
*/
public String getName() {
- return type.getName(this);
+ return variant.getName(this);
}
public int getCount() {
- return this.type.getCount(this);
+ return this.variant.getCount(this);
}
/**
@@ -423,7 +421,7 @@ implements LinksProvider, UiHintContainer {
@Override
protected List<ManagedObject> load() {
- return type.load(this);
+ return variant.load(this);
}
public ObjectSpecification getTypeOfSpecification() {
@@ -436,7 +434,7 @@ implements LinksProvider, UiHintContainer {
@Override
public void setObject(List<ManagedObject> list) {
super.setObject(list);
- type.setObject(this, list);
+ variant.setObject(this, list);
}
/**
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarPropertyModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarPropertyModel.java
index 81e519a..f352888 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarPropertyModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarPropertyModel.java
@@ -350,7 +350,7 @@ public class ScalarPropertyModel extends ScalarModel {
val associate = getObject();
property.set(adapter, associate, InteractionInitiatedBy.USER);
- return ManagedObjects.copyOfIfClonable(adapter);
+ return ManagedObjects.copyIfClonable(adapter);
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
index f3c4649..85365bd 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
@@ -292,7 +292,7 @@ implements CollectionCountProvider {
return new ObjectAdapterPropertyColumn(
commonContext,
- getModel().getType(),
+ getModel().getVariant(),
Model.of(property.getName()),
property.getId(),
property.getId(),