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 2022/08/30 11:06:09 UTC
[isis-app-simpleapp] branch jdo-SNAPSHOT updated (5ec3272 -> 39d7437)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch jdo-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
from 5ec3272 Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT
new f15db03 removes unnecessary field
new 8a3e7a4 renames blob attachment field
new 39d7437 Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
[isis-app-simpleapp] 02/03: renames blob attachment field
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jdo-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit 8a3e7a4d6c661d4e3a3cafdc7b36bbc273c029fe
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Aug 30 12:00:35 2022 +0100
renames blob attachment field
---
.../java/domainapp/modules/simple/dom/so/SimpleObject.java | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java b/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java
index 536c630..2765da2 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java
@@ -27,7 +27,6 @@ import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.DomainObjectLayout;
-import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.Property;
@@ -123,21 +122,21 @@ public class SimpleObject implements Comparable<SimpleObject> {
private String notes;
@AttributeOverrides({
- @AttributeOverride(name="name", column=@Column(name="readOnlyProperty_name")),
- @AttributeOverride(name="mimeType",column=@Column(name="readOnlyProperty_mimeType")),
- @AttributeOverride(name="bytes", column=@Column(name="readOnlyProperty_bytes"))
+ @AttributeOverride(name="name", column=@Column(name="attachment_name")),
+ @AttributeOverride(name="mimeType",column=@Column(name="attachment_mimeType")),
+ @AttributeOverride(name="bytes", column=@Column(name="attachment_bytes"))
})
@Embedded
- private BlobJpaEmbeddable attachmentEmbedded;
+ private BlobJpaEmbeddable attachment;
@PdfJsViewer
@Property()
@PropertyLayout(fieldSetId = "content", sequence = "1")
public Blob getAttachment() {
- return BlobJpaEmbeddable.toBlob(attachmentEmbedded);
+ return BlobJpaEmbeddable.toBlob(attachment);
}
public void setAttachment(final Blob attachment) {
- this.attachmentEmbedded = BlobJpaEmbeddable.fromBlob(attachment);
+ this.attachment = BlobJpaEmbeddable.fromBlob(attachment);
}
@Action(semantics = IDEMPOTENT, commandPublishing = Publishing.ENABLED, executionPublishing = Publishing.ENABLED)
[isis-app-simpleapp] 03/03: Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jdo-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit 39d7437c0b8605f0148fa04e1d1ee7394c139a3a
Merge: 5ec3272 8a3e7a4
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Aug 30 12:02:44 2022 +0100
Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT
[isis-app-simpleapp] 01/03: removes unnecessary field
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jdo-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit f15db03c96c292011ed7efee07070295439ccd2b
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Aug 30 11:59:53 2022 +0100
removes unnecessary field
---
.../src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java | 2 --
1 file changed, 2 deletions(-)
diff --git a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java b/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java
index bda401d..536c630 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java
@@ -122,8 +122,6 @@ public class SimpleObject implements Comparable<SimpleObject> {
@PropertyLayout(fieldSetId = LayoutConstants.FieldSetId.DETAILS, sequence = "2")
private String notes;
- private org.apache.isis.applib.value.Blob attachment;
-
@AttributeOverrides({
@AttributeOverride(name="name", column=@Column(name="readOnlyProperty_name")),
@AttributeOverride(name="mimeType",column=@Column(name="readOnlyProperty_mimeType")),