You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2021/05/31 19:15:14 UTC
[isis] 01/01: ISIS-2702: adds logicalTypeName to
downloadMetaModelCsv
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2707
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 3762c4ddc412850f1d603487a315fd645e14cfc7
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon May 31 20:14:52 2021 +0100
ISIS-2702: adds logicalTypeName to downloadMetaModelCsv
---
.../org/apache/isis/applib/services/metamodel/DomainMember.java | 3 ++-
.../apache/isis/applib/services/metamodel/MetaModelServiceMenu.java | 5 +++--
.../isis/core/metamodel/services/metamodel/DomainMemberDefault.java | 6 ++++++
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/DomainMember.java b/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/DomainMember.java
index 100cbc4..2738114 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/DomainMember.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/DomainMember.java
@@ -19,13 +19,14 @@
package org.apache.isis.applib.services.metamodel;
/**
- *
+ *
* @since 1.x {@index}
*/
public interface DomainMember extends Comparable<DomainMember> {
String getClassType();
+ String getLogicalTypeName();
String getClassName();
String getPackageName();
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServiceMenu.java b/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServiceMenu.java
index 25e415e..63e81e7 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServiceMenu.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServiceMenu.java
@@ -204,14 +204,15 @@ public class MetaModelServiceMenu {
}
private static String header() {
- return "classType,packageName,className,memberType,memberName,numParams,mixedIn?,mixin,hidden,disabled,choices,autoComplete,default,validate";
+ return "classType,logicalTypeName,className,packageName,memberType,memberName,numParams,mixedIn?,mixin,hidden,disabled,choices,autoComplete,default,validate";
}
private static String asTextCsv(final DomainMember row) {
return Stream.of(
row.getClassType(),
- row.getPackageName(),
+ row.getLogicalTypeName(),
row.getClassName(),
+ row.getPackageName(),
row.getType(),
row.getMemberName(),
row.getNumParams(),
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/DomainMemberDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/DomainMemberDefault.java
index a747d62..03dc543 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/DomainMemberDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/DomainMemberDefault.java
@@ -108,6 +108,12 @@ public class DomainMemberDefault implements DomainMember {
: "1 Object";
}
+
+ @XmlElement @Override
+ public String getLogicalTypeName() {
+ return spec.getLogicalTypeName();
+ }
+
@XmlElement @Override
public String getClassName() {
final String fullIdentifier = spec.getFullIdentifier();