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 2019/06/17 20:43:23 UTC
[isis] branch v2 updated: ISIS-2113: blob-demo: use the Apache Isis
logo
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/v2 by this push:
new bc60511 ISIS-2113: blob-demo: use the Apache Isis logo
bc60511 is described below
commit bc60511ca5ecd23f3c1955899a44a9d4446c397b
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Jun 17 22:43:17 2019 +0200
ISIS-2113: blob-demo: use the Apache Isis logo
Task-Url: https://issues.apache.org/jira/browse/ISIS-2113
---
.../domainapp/application/isis-non-changing.properties | 3 +++
.../main/java/domainapp/dom/types/blob/BlobDemo.adoc | 12 ++++++++----
.../main/java/domainapp/dom/types/blob/BlobDemo.java | 8 +++++---
.../java/domainapp/dom/types/blob/BlobDemo.layout.xml | 2 +-
.../main/resources/domainapp/dom/types/blob/avatar.png | Bin 41840 -> 0 bytes
.../domainapp/dom/types/blob/isis-logo-568x286.png | Bin 0 -> 54831 bytes
6 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/example/application/demo/src/main/java/domainapp/application/isis-non-changing.properties b/example/application/demo/src/main/java/domainapp/application/isis-non-changing.properties
index 89eddc4..fc49dd5 100644
--- a/example/application/demo/src/main/java/domainapp/application/isis-non-changing.properties
+++ b/example/application/demo/src/main/java/domainapp/application/isis-non-changing.properties
@@ -77,4 +77,7 @@ isis.viewer.wicket.developmentUtilities.enable=false
isis.persistor.datanucleus.impl.datanucleus.findObject.validateWhenCached=false
#disable translation ...
isis.services.translation.po.mode=disable
+#modal action rendering is considered to work for all use-cases
+isis.viewer.wicket.dialogMode=modal
+
diff --git a/example/application/demo/src/main/java/domainapp/dom/types/blob/BlobDemo.adoc b/example/application/demo/src/main/java/domainapp/dom/types/blob/BlobDemo.adoc
index 3a3ade9..b6980a1 100644
--- a/example/application/demo/src/main/java/domainapp/dom/types/blob/BlobDemo.adoc
+++ b/example/application/demo/src/main/java/domainapp/dom/types/blob/BlobDemo.adoc
@@ -14,11 +14,15 @@ The framework supports big large objects (blobs) for various MIME types:
----
public class BlobDemo {
- @Property
- @XmlElement @XmlJavaTypeAdapter(JaxbAdapters.BlobAdapter.class)
- @Getter @Setter private Blob avatar; // rendered as image, according to its MIME type
+ @Property
+ @PropertyLayout
+ @XmlElement @XmlJavaTypeAdapter(DemoBlobStore.BlobAdapter.class) // <1>
+ @Getter @Setter private Blob logo; // <2>
}
----
-See the text demo link:${SOURCES_DEMO}/domainapp/dom/types/blob[sources].
\ No newline at end of file
+<1> we use this BlobAdapter only for demo purposes here
+<2> renders as image, according to its MIME type
+
+See the blob demo link:${SOURCES_DEMO}/domainapp/dom/types/blob[sources].
\ No newline at end of file
diff --git a/example/application/demo/src/main/java/domainapp/dom/types/blob/BlobDemo.java b/example/application/demo/src/main/java/domainapp/dom/types/blob/BlobDemo.java
index 8c9e6ef..1f31828 100644
--- a/example/application/demo/src/main/java/domainapp/dom/types/blob/BlobDemo.java
+++ b/example/application/demo/src/main/java/domainapp/dom/types/blob/BlobDemo.java
@@ -29,6 +29,7 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.commons.internal.base._Bytes;
import org.apache.isis.commons.internal.resources._Resources;
@@ -52,8 +53,8 @@ public class BlobDemo extends DemoStub {
log.info("BlobDemo::initDefaults");
try {
- val bytes = _Bytes.of(_Resources.load(BlobDemo.class, "avatar.png"));
- avatar = new Blob("family", "image/png", bytes);
+ val bytes = _Bytes.of(_Resources.load(BlobDemo.class, "isis-logo-568x286.png"));
+ logo = new Blob("isis-logo-568x286.png", "image/png", bytes);
} catch (Exception e) {
// TODO: handle exception
}
@@ -63,8 +64,9 @@ public class BlobDemo extends DemoStub {
// -- EDITABLE
@Property(editing=Editing.ENABLED) //TODO should not be required, https://issues.apache.org/jira/browse/ISIS-1970
+ @PropertyLayout
@XmlElement @XmlJavaTypeAdapter(DemoBlobStore.BlobAdapter.class)
- @Getter @Setter private Blob avatar;
+ @Getter @Setter private Blob logo;
// -- READONLY
diff --git a/example/application/demo/src/main/java/domainapp/dom/types/blob/BlobDemo.layout.xml b/example/application/demo/src/main/java/domainapp/dom/types/blob/BlobDemo.layout.xml
index b773eba..035aee4 100644
--- a/example/application/demo/src/main/java/domainapp/dom/types/blob/BlobDemo.layout.xml
+++ b/example/application/demo/src/main/java/domainapp/dom/types/blob/BlobDemo.layout.xml
@@ -14,7 +14,7 @@
<bs3:col span="6">
<cpt:fieldSet name="Editable" id="editable">
- <cpt:property id="avatar"/>
+ <cpt:property id="logo"/>
</cpt:fieldSet>
diff --git a/example/application/demo/src/main/resources/domainapp/dom/types/blob/avatar.png b/example/application/demo/src/main/resources/domainapp/dom/types/blob/avatar.png
deleted file mode 100644
index 461f001..0000000
Binary files a/example/application/demo/src/main/resources/domainapp/dom/types/blob/avatar.png and /dev/null differ
diff --git a/example/application/demo/src/main/resources/domainapp/dom/types/blob/isis-logo-568x286.png b/example/application/demo/src/main/resources/domainapp/dom/types/blob/isis-logo-568x286.png
new file mode 100644
index 0000000..df3db1d
Binary files /dev/null and b/example/application/demo/src/main/resources/domainapp/dom/types/blob/isis-logo-568x286.png differ