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 2019/10/09 22:42:00 UTC
[isis] branch ISIS-2062 updated: ISIS-1998: uses memberOrder
constant for Persistable_ mixins
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/ISIS-2062 by this push:
new 9fd8bb9 ISIS-1998: uses memberOrder constant for Persistable_ mixins
9fd8bb9 is described below
commit 9fd8bb9ea7a35746d11026103878908ac46006de
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Oct 9 23:41:38 2019 +0100
ISIS-1998: uses memberOrder constant for Persistable_ mixins
---
.../isis/jdo/jdosupport/mixins/Persistable_datanucleusIdLong.java | 3 ++-
.../isis/jdo/jdosupport/mixins/Persistable_datanucleusVersionLong.java | 3 ++-
.../jdo/jdosupport/mixins/Persistable_datanucleusVersionTimestamp.java | 3 ++-
.../isis/jdo/jdosupport/mixins/Persistable_downloadJdoMetadata.java | 3 ++-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/mixins/Persistable_datanucleusIdLong.java b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/mixins/Persistable_datanucleusIdLong.java
index 2640640..89237dc 100644
--- a/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/mixins/Persistable_datanucleusIdLong.java
+++ b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/mixins/Persistable_datanucleusIdLong.java
@@ -20,6 +20,7 @@ package org.apache.isis.jdo.jdosupport.mixins;
import javax.jdo.JDOHelper;
+import org.apache.isis.applib.mixins.MixinConstants;
import org.datanucleus.enhancement.Persistable;
import org.datanucleus.identity.DatastoreId;
@@ -54,7 +55,7 @@ public class Persistable_datanucleusIdLong {
named = "Id",
hidden = Where.ALL_TABLES
)
- @MemberOrder(name = "Metadata", sequence = "800.1")
+ @MemberOrder(name = MixinConstants.METADATA_LAYOUT_GROUPNAME, sequence = "800.1")
public Long prop() {
final Object objectId = JDOHelper.getObjectId(persistable);
if(objectId instanceof DatastoreId) {
diff --git a/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/mixins/Persistable_datanucleusVersionLong.java b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/mixins/Persistable_datanucleusVersionLong.java
index 4bae573..f62762f 100644
--- a/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/mixins/Persistable_datanucleusVersionLong.java
+++ b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/mixins/Persistable_datanucleusVersionLong.java
@@ -20,6 +20,7 @@ package org.apache.isis.jdo.jdosupport.mixins;
import javax.jdo.JDOHelper;
+import org.apache.isis.applib.mixins.MixinConstants;
import org.datanucleus.enhancement.Persistable;
import org.apache.isis.applib.annotation.Action;
@@ -53,7 +54,7 @@ public class Persistable_datanucleusVersionLong {
named = "Version",
hidden = Where.ALL_TABLES
)
- @MemberOrder(name = "Metadata", sequence = "800.2")
+ @MemberOrder(name = MixinConstants.METADATA_LAYOUT_GROUPNAME, sequence = "800.2")
public Long prop() {
final Object version = JDOHelper.getVersion(persistable);
return version != null && version instanceof Long ? (Long) version : null;
diff --git a/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/mixins/Persistable_datanucleusVersionTimestamp.java b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/mixins/Persistable_datanucleusVersionTimestamp.java
index af99395..cc29b1b 100644
--- a/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/mixins/Persistable_datanucleusVersionTimestamp.java
+++ b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/mixins/Persistable_datanucleusVersionTimestamp.java
@@ -20,6 +20,7 @@ package org.apache.isis.jdo.jdosupport.mixins;
import javax.jdo.JDOHelper;
+import org.apache.isis.applib.mixins.MixinConstants;
import org.datanucleus.enhancement.Persistable;
import org.apache.isis.applib.annotation.Action;
@@ -53,7 +54,7 @@ public class Persistable_datanucleusVersionTimestamp {
named = "Version",
hidden = Where.ALL_TABLES
)
- @MemberOrder(name = "Metadata", sequence = "800.2")
+ @MemberOrder(name = MixinConstants.METADATA_LAYOUT_GROUPNAME, sequence = "800.2")
public java.sql.Timestamp prop() {
final Object version = JDOHelper.getVersion(persistable);
return version != null && version instanceof java.sql.Timestamp ? (java.sql.Timestamp) version : null;
diff --git a/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/mixins/Persistable_downloadJdoMetadata.java b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/mixins/Persistable_downloadJdoMetadata.java
index ea709b6..461dc05 100644
--- a/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/mixins/Persistable_downloadJdoMetadata.java
+++ b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/mixins/Persistable_downloadJdoMetadata.java
@@ -25,6 +25,7 @@ import javax.jdo.PersistenceManagerFactory;
import javax.jdo.metadata.TypeMetadata;
import javax.xml.bind.JAXBException;
+import org.apache.isis.applib.mixins.MixinConstants;
import org.datanucleus.enhancement.Persistable;
import org.apache.isis.applib.annotation.Action;
@@ -60,7 +61,7 @@ public class Persistable_downloadJdoMetadata {
cssClassFa = "fa-download",
position = ActionLayout.Position.PANEL_DROPDOWN
)
- @MemberOrder(name = "datanucleusIdLong", sequence = "710.1")
+ @MemberOrder(name = MixinConstants.METADATA_LAYOUT_GROUPNAME, sequence = "710.1")
public Clob act(
@ParameterLayout(named = "File name")
final String fileName) throws JAXBException, IOException {