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 2016/02/26 15:53:03 UTC
[3/6] isis git commit: ISIS-1314: adding @ParameterLayout to the DTO
mixin (download) actions.
ISIS-1314: adding @ParameterLayout to the DTO mixin (download) actions.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/25f5899d
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/25f5899d
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/25f5899d
Branch: refs/heads/ISIS-993
Commit: 25f5899d68ad779ea3b22f1708880e61097256e0
Parents: e7f7c8a
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Feb 26 14:27:32 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Feb 26 14:27:32 2016 +0000
----------------------------------------------------------------------
.../org/apache/isis/applib/services/dto/Dto_downloadXml.java | 5 ++++-
.../org/apache/isis/applib/services/dto/Dto_downloadXsd.java | 2 ++
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/25f5899d/core/applib/src/main/java/org/apache/isis/applib/services/dto/Dto_downloadXml.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/dto/Dto_downloadXml.java b/core/applib/src/main/java/org/apache/isis/applib/services/dto/Dto_downloadXml.java
index 3cd9ad4..dc972f1 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/dto/Dto_downloadXml.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/dto/Dto_downloadXml.java
@@ -25,6 +25,7 @@ import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.Mixin;
+import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.applib.annotation.RestrictTo;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.jaxb.JaxbService;
@@ -50,7 +51,9 @@ public class Dto_downloadXml {
cssClassFa = "fa-download"
)
@MemberOrder(sequence = "500.1")
- public Object $$(final String fileName) throws JAXBException, IOException {
+ public Object $$(
+ @ParameterLayout(named = "File name")
+ final String fileName) throws JAXBException, IOException {
final String xml = jaxbService.toXml(dto);
return new Clob(Util.withSuffix(fileName, "xml"), "text/xml", xml);
http://git-wip-us.apache.org/repos/asf/isis/blob/25f5899d/core/applib/src/main/java/org/apache/isis/applib/services/dto/Dto_downloadXsd.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/dto/Dto_downloadXsd.java b/core/applib/src/main/java/org/apache/isis/applib/services/dto/Dto_downloadXsd.java
index 9366ec4..a139f15 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/dto/Dto_downloadXsd.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/dto/Dto_downloadXsd.java
@@ -33,6 +33,7 @@ import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.Mixin;
+import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.applib.annotation.RestrictTo;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.jaxb.JaxbService;
@@ -67,6 +68,7 @@ public class Dto_downloadXsd {
)
@MemberOrder(sequence = "500.2")
public Object $$(
+ @ParameterLayout(named = "File name")
final String fileName,
final JaxbService.IsisSchemas isisSchemas) {