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 2017/01/09 22:40:40 UTC
[20/22] isis git commit: ISIS-1565: fixes @MemberOrder for default
mixin actions
ISIS-1565: fixes @MemberOrder for default mixin actions
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/c0467a67
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/c0467a67
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/c0467a67
Branch: refs/heads/master
Commit: c0467a67dfbe7446343e92c157af74b0f536be6e
Parents: ec67e59
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Jan 9 22:12:12 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Jan 9 22:12:12 2017 +0000
----------------------------------------------------------------------
.../isis/applib/services/layout/Object_downloadLayoutXml.java | 4 +---
.../isis/applib/services/layout/Object_rebuildMetamodel.java | 2 +-
.../services/jdosupport/Persistable_downloadJdoMetadata.java | 3 +--
.../isis/viewer/wicket/viewer/services/Object_clearHints.java | 2 +-
4 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/c0467a67/core/applib/src/main/java/org/apache/isis/applib/services/layout/Object_downloadLayoutXml.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/layout/Object_downloadLayoutXml.java b/core/applib/src/main/java/org/apache/isis/applib/services/layout/Object_downloadLayoutXml.java
index 22261f9..f1bcaf8 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/layout/Object_downloadLayoutXml.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/layout/Object_downloadLayoutXml.java
@@ -16,8 +16,6 @@
*/
package org.apache.isis.applib.services.layout;
-import javax.inject.Inject;
-
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.MemberOrder;
@@ -48,7 +46,7 @@ public class Object_downloadLayoutXml {
cssClassFa = "fa-download",
position = ActionLayout.Position.PANEL_DROPDOWN
)
- @MemberOrder(name = "Metadata", sequence = "700.1")
+ @MemberOrder(name = "datanucleusIdLong", sequence = "700.1")
public Object $$(
@ParameterLayout(named = "File name")
final String fileName,
http://git-wip-us.apache.org/repos/asf/isis/blob/c0467a67/core/applib/src/main/java/org/apache/isis/applib/services/layout/Object_rebuildMetamodel.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/layout/Object_rebuildMetamodel.java b/core/applib/src/main/java/org/apache/isis/applib/services/layout/Object_rebuildMetamodel.java
index 69d0cb7..05a9618 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/layout/Object_rebuildMetamodel.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/layout/Object_rebuildMetamodel.java
@@ -44,7 +44,7 @@ public class Object_rebuildMetamodel {
cssClassFa = "fa-refresh",
position = ActionLayout.Position.PANEL_DROPDOWN
)
- @MemberOrder(name = "Metadata", sequence = "800.1")
+ @MemberOrder(name = "datanucleusIdLong", sequence = "800.1")
public void $$() {
metaModelService.rebuild(object.getClass());
}
http://git-wip-us.apache.org/repos/asf/isis/blob/c0467a67/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/jdosupport/Persistable_downloadJdoMetadata.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/jdosupport/Persistable_downloadJdoMetadata.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/jdosupport/Persistable_downloadJdoMetadata.java
index 38a0f2f..3155247 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/jdosupport/Persistable_downloadJdoMetadata.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/jdosupport/Persistable_downloadJdoMetadata.java
@@ -20,7 +20,6 @@ package org.apache.isis.core.metamodel.services.jdosupport;
import java.io.IOException;
-import javax.inject.Inject;
import javax.jdo.PersistenceManagerFactory;
import javax.jdo.metadata.TypeMetadata;
import javax.xml.bind.JAXBException;
@@ -57,7 +56,7 @@ public class Persistable_downloadJdoMetadata {
cssClassFa = "fa-download",
position = ActionLayout.Position.PANEL_DROPDOWN
)
- @MemberOrder(name = "Metadata", sequence = "710.1")
+ @MemberOrder(name = "datanucleusIdLong", sequence = "710.1")
public Clob $$(
@ParameterLayout(named = ".jdo file name")
final String fileName) throws JAXBException, IOException {
http://git-wip-us.apache.org/repos/asf/isis/blob/c0467a67/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/Object_clearHints.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/Object_clearHints.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/Object_clearHints.java
index c97f8a6..00d419d 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/Object_clearHints.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/Object_clearHints.java
@@ -52,7 +52,7 @@ public class Object_clearHints {
cssClassFa = "fa-trash",
position = ActionLayout.Position.PANEL_DROPDOWN
)
- @MemberOrder(name = "Metadata", sequence = "400.1")
+ @MemberOrder(name = "datanucleusIdLong", sequence = "400.1")
public Object $$() {
if (getHintStoreUsingWicketSession() != null) {
final Bookmark bookmark = bookmarkService.bookmarkFor(object);