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 2021/05/23 08:44:07 UTC
[isis] branch master updated: ISIS-2513: aligning names
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new ba12d06 ISIS-2513: aligning names
ba12d06 is described below
commit ba12d06c4d6624795f58d10f617f04af947ce062
Author: andi-huber <ah...@apache.org>
AuthorDate: Sun May 23 10:43:56 2021 +0200
ISIS-2513: aligning names
---
.../src/main/java/demoapp/dom/DemoModuleJpa.java | 4 ++--
.../javaawt/images/JavaAwtBufferedImages-common.adoc | 18 +++++++++---------
.../images/JavaAwtBufferedImages-description.adoc | 10 +++++-----
.../types/javaawt/images/JavaAwtBufferedImages.java | 12 ++++++------
...mageHolder.java => JavaAwtBufferedImageHolder.java} | 2 +-
...geHolder2.java => JavaAwtBufferedImageHolder2.java} | 2 +-
...=> JavaAwtBufferedImageHolder_actionReturning.java} | 4 ++--
...BufferedImageHolder_actionReturningCollection.java} | 4 ++--
...a => JavaAwtBufferedImageHolder_mixinProperty.java} | 4 ++--
...redImageHolder_updateReadOnlyOptionalProperty.java} | 6 +++---
...AwtBufferedImageHolder_updateReadOnlyProperty.java} | 6 +++---
...ImageHolder_updateReadOnlyPropertyWithChoices.java} | 6 +++---
...n.adoc => JavaAwtBufferedImageJdo-description.adoc} | 2 +-
...vaAwtImageJdo.java => JavaAwtBufferedImageJdo.java} | 12 ++++++------
...ities.java => JavaAwtBufferedImageJdoEntities.java} | 12 ++++++------
...n.adoc => JavaAwtBufferedImageJpa-description.adoc} | 2 +-
...vaAwtImageJpa.java => JavaAwtBufferedImageJpa.java} | 14 +++++++-------
...ities.java => JavaAwtBufferedImageJpaEntities.java} | 12 ++++++------
...mageEntity.java => JavaAwtBufferedImageEntity.java} | 6 +++---
.../JavaAwtBufferedImageEntity.layout.xml} | 0
...geSeeding.java => JavaAwtBufferedImageSeeding.java} | 4 ++--
...geService.java => JavaAwtBufferedImageService.java} | 4 ++--
...sSamples.java => JavaAwtBufferedImagesSamples.java} | 11 +++++------
...on.adoc => JavaAwtBufferedImageVm-description.adoc} | 2 +-
...JavaAwtImageVm.java => JavaAwtBufferedImageVm.java} | 8 ++++----
.../JavaAwtBufferedImageVm.layout.xml} | 0
26 files changed, 83 insertions(+), 84 deletions(-)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java
index 323561f..53a1fa7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java
@@ -33,7 +33,7 @@ import demoapp.dom.types.isis.markups.jpa.IsisMarkupJpa;
import demoapp.dom.types.isis.passwords.jpa.IsisPasswordJpa;
import demoapp.dom.types.isisext.asciidocs.jpa.IsisAsciiDocJpa;
import demoapp.dom.types.isisext.markdowns.jpa.IsisMarkdownJpa;
-import demoapp.dom.types.javaawt.images.jpa.JavaAwtImageJpa;
+import demoapp.dom.types.javaawt.images.jpa.JavaAwtBufferedImageJpa;
import demoapp.dom.types.javalang.booleans.jpa.WrapperBooleanJpa;
import demoapp.dom.types.javalang.bytes.jpa.WrapperByteJpa;
import demoapp.dom.types.javalang.characters.jpa.WrapperCharacterJpa;
@@ -81,7 +81,7 @@ import demoapp.dom.types.primitive.shorts.jpa.PrimitiveShortJpa;
IsisAsciiDocJpa.class,
IsisMarkdownJpa.class,
- JavaAwtImageJpa.class,
+ JavaAwtBufferedImageJpa.class,
JavaLangStringJpa.class,
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/JavaAwtBufferedImages-common.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/JavaAwtBufferedImages-common.adoc
index 9dcf359..37ef97e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/JavaAwtBufferedImages-common.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/JavaAwtBufferedImages-common.adoc
@@ -4,28 +4,28 @@
//== Mixin actions
//
-//A number of mixin actions contribute through the `JavaAwtImageHolder` interface, demonstrate the use of `Image` as a parameter and as a return type.
+//A number of mixin actions contribute through the `JavaAwtBufferedImageHolder` interface, demonstrate the use of `Image` as a parameter and as a return type.
//For example:
//
//* the `updateReadOnlyProperty` action is:
//+
//[source,java]
//----
-//include::holder/JavaAwtImageHolder_updateReadOnlyProperty.java[tags=class]
+//include::holder/JavaAwtBufferedImageHolder_updateReadOnlyProperty.java[tags=class]
//----
//
//* the `updateReadOnlyOptionalProperty` action is:
//+
//[source,java]
//----
-//include::holder/JavaAwtImageHolder_updateReadOnlyOptionalProperty.java[tags=class]
+//include::holder/JavaAwtBufferedImageHolder_updateReadOnlyOptionalProperty.java[tags=class]
//----
//
//* the `actionReturning` action is:
//+
//[source,java]
//----
-//include::holder/JavaAwtImageHolder_actionReturning.java[tags=class]
+//include::holder/JavaAwtBufferedImageHolder_actionReturning.java[tags=class]
//----
//
//
@@ -33,7 +33,7 @@
//+
//[source,java]
//----
-//include::holder/JavaAwtImageHolder_actionReturningCollection.java[tags=class]
+//include::holder/JavaAwtBufferedImageHolder_actionReturningCollection.java[tags=class]
//----
//
//== Mixin properties
@@ -44,17 +44,17 @@
//+
//[source,java]
//----
-//include::holder/JavaAwtImageHolder_mixinProperty.java[tags=class]
+//include::holder/JavaAwtBufferedImageHolder_mixinProperty.java[tags=class]
//----
//
//
//== @PropertyLayout(labelPosition=...)
//
-//There is also an extended interface, `JavaAwtImageHolder2`, with default methods demonstrating the use of label positions:
+//There is also an extended interface, `JavaAwtBufferedImageHolder2`, with default methods demonstrating the use of label positions:
//
//[source,java]
//----
-//include::holder/JavaAwtImageHolder2.java[tags=class]
+//include::holder/JavaAwtBufferedImageHolder2.java[tags=class]
//----
//
//<.> The default methods have annotations that are automatically inherited.
@@ -64,4 +64,4 @@
//<.> Position label to the right
//+
//CAUTION: currently not supported
-//<.> Hide the label compleely.
+//<.> Hide the label completely.
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/JavaAwtBufferedImages-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/JavaAwtBufferedImages-description.adoc
index 1e04d87..658d567 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/JavaAwtBufferedImages-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/JavaAwtBufferedImages-description.adoc
@@ -15,17 +15,17 @@ Some properties on these domain objects are mandatory, some optional.
The entity and view model types both implement some common interfaces.
-=== JavaAwtImageHolder
+=== JavaAwtBufferedImageHolder
-The `JavaAwtImageHolder` interface is used to contribute a number of mixins to both types:
+The `JavaAwtBufferedImageHolder` interface is used to contribute a number of mixins to both types:
[source,java]
----
-include::holder/JavaAwtImageHolder.java[tags=class]
+include::holder/JavaAwtBufferedImageHolder.java[tags=class]
----
-=== JavaAwtImageHolder2
+=== JavaAwtBufferedImageHolder2
-The `JavaAwtImageHolder2` interface is used to demonstrate support for label positions using `@PropertyLayout(labelPosition=...)`.
+The `JavaAwtBufferedImageHolder2` interface is used to demonstrate support for label positions using `@PropertyLayout(labelPosition=...)`.
Further details, along with the effect of this annotation, can be seen on the entity and view model object pages.
\ No newline at end of file
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/JavaAwtBufferedImages.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/JavaAwtBufferedImages.java
index c47a5c9..15a159f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/JavaAwtBufferedImages.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/JavaAwtBufferedImages.java
@@ -40,8 +40,8 @@ import org.apache.isis.applib.annotation.SemanticsOf;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolderRepository;
import demoapp.dom.types.Samples;
-import demoapp.dom.types.javaawt.images.persistence.JavaAwtImageEntity;
-import demoapp.dom.types.javaawt.images.vm.JavaAwtImageVm;
+import demoapp.dom.types.javaawt.images.persistence.JavaAwtBufferedImageEntity;
+import demoapp.dom.types.javaawt.images.vm.JavaAwtBufferedImageVm;
@XmlRootElement(name = "Demo")
@XmlType
@@ -56,21 +56,21 @@ public class JavaAwtBufferedImages implements HasAsciiDocDescription {
@Action(semantics = SemanticsOf.SAFE)
@ActionLayout(promptStyle = PromptStyle.DIALOG_MODAL)
- public JavaAwtImageVm openViewModel(BufferedImage initialValue) {
- return new JavaAwtImageVm(initialValue);
+ public JavaAwtBufferedImageVm openViewModel(BufferedImage initialValue) {
+ return new JavaAwtBufferedImageVm(initialValue);
}
public BufferedImage default0OpenViewModel() {
return samples.single();
}
@Collection
- public List<? extends JavaAwtImageEntity> getEntities() {
+ public List<? extends JavaAwtBufferedImageEntity> getEntities() {
return entities.all();
}
@Inject
@XmlTransient
- ValueHolderRepository<BufferedImage, ? extends JavaAwtImageEntity> entities;
+ ValueHolderRepository<BufferedImage, ? extends JavaAwtBufferedImageEntity> entities;
@Inject
@XmlTransient
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtImageHolder.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtImageHolder.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder.java
index 5bc8449..59d1872 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtImageHolder.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.javaawt.images.holder;
import java.awt.image.BufferedImage;
//tag::class[]
-public interface JavaAwtImageHolder {
+public interface JavaAwtBufferedImageHolder {
BufferedImage getReadOnlyProperty();
void setReadOnlyProperty(BufferedImage c);
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtImageHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder2.java
similarity index 97%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtImageHolder2.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder2.java
index f4a0547..bf146212 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtImageHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder2.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Where;
//tag::class[]
-public interface JavaAwtImageHolder2 extends JavaAwtImageHolder {
+public interface JavaAwtBufferedImageHolder2 extends JavaAwtBufferedImageHolder {
@Property // <.>
@PropertyLayout(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtImageHolder_actionReturning.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder_actionReturning.java
similarity index 92%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtImageHolder_actionReturning.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder_actionReturning.java
index 40157ff..db154b0 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtImageHolder_actionReturning.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder_actionReturning.java
@@ -33,9 +33,9 @@ import lombok.RequiredArgsConstructor;
hidden = Where.EVERYWHERE // TODO: not yet supported
)
@RequiredArgsConstructor
-public class JavaAwtImageHolder_actionReturning {
+public class JavaAwtBufferedImageHolder_actionReturning {
- private final JavaAwtImageHolder holder;
+ private final JavaAwtBufferedImageHolder holder;
public BufferedImage act() {
return holder.getReadOnlyProperty();
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtImageHolder_actionReturningCollection.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder_actionReturningCollection.java
similarity index 92%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtImageHolder_actionReturningCollection.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder_actionReturningCollection.java
index bc923b1..66d0dca 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtImageHolder_actionReturningCollection.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder_actionReturningCollection.java
@@ -39,9 +39,9 @@ import demoapp.dom.types.Samples;
hidden = Where.EVERYWHERE // TODO: not yet supported
)
@RequiredArgsConstructor
-public class JavaAwtImageHolder_actionReturningCollection {
+public class JavaAwtBufferedImageHolder_actionReturningCollection {
- private final JavaAwtImageHolder holder;
+ private final JavaAwtBufferedImageHolder holder;
public Collection<BufferedImage> act() {
return samples.stream()
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtImageHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder_mixinProperty.java
similarity index 92%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtImageHolder_mixinProperty.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder_mixinProperty.java
index d6aa38c..46c9f5a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtImageHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder_mixinProperty.java
@@ -31,9 +31,9 @@ import lombok.RequiredArgsConstructor;
@Property()
@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
-public class JavaAwtImageHolder_mixinProperty {
+public class JavaAwtBufferedImageHolder_mixinProperty {
- private final JavaAwtImageHolder holder;
+ private final JavaAwtBufferedImageHolder holder;
public BufferedImage prop() {
return holder.getReadOnlyProperty();
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtImageHolder_updateReadOnlyOptionalProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder_updateReadOnlyOptionalProperty.java
similarity index 92%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtImageHolder_updateReadOnlyOptionalProperty.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder_updateReadOnlyOptionalProperty.java
index 0214811..fe91d60 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtImageHolder_updateReadOnlyOptionalProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder_updateReadOnlyOptionalProperty.java
@@ -39,11 +39,11 @@ import lombok.RequiredArgsConstructor;
)
@ActionLayout(promptStyle = PromptStyle.INLINE, named = "Update", sequence = "1")
@RequiredArgsConstructor
-public class JavaAwtImageHolder_updateReadOnlyOptionalProperty {
+public class JavaAwtBufferedImageHolder_updateReadOnlyOptionalProperty {
- private final JavaAwtImageHolder holder;
+ private final JavaAwtBufferedImageHolder holder;
- public JavaAwtImageHolder act(
+ public JavaAwtBufferedImageHolder act(
@Parameter(optionality = Optionality.OPTIONAL) // <.>
BufferedImage newValue
) {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtImageHolder_updateReadOnlyProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder_updateReadOnlyProperty.java
similarity index 90%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtImageHolder_updateReadOnlyProperty.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder_updateReadOnlyProperty.java
index a69ba88..08502f0 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtImageHolder_updateReadOnlyProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder_updateReadOnlyProperty.java
@@ -37,11 +37,11 @@ import lombok.RequiredArgsConstructor;
)
@ActionLayout(promptStyle = PromptStyle.INLINE, named = "Update", sequence = "1")
@RequiredArgsConstructor
-public class JavaAwtImageHolder_updateReadOnlyProperty {
+public class JavaAwtBufferedImageHolder_updateReadOnlyProperty {
- private final JavaAwtImageHolder holder;
+ private final JavaAwtBufferedImageHolder holder;
- public JavaAwtImageHolder act(BufferedImage newValue) {
+ public JavaAwtBufferedImageHolder act(BufferedImage newValue) {
holder.setReadOnlyProperty(newValue);
return holder;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtImageHolder_updateReadOnlyPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder_updateReadOnlyPropertyWithChoices.java
similarity index 91%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtImageHolder_updateReadOnlyPropertyWithChoices.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder_updateReadOnlyPropertyWithChoices.java
index 33e91ab..2667e12 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtImageHolder_updateReadOnlyPropertyWithChoices.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder_updateReadOnlyPropertyWithChoices.java
@@ -43,11 +43,11 @@ import demoapp.dom.types.Samples;
)
@ActionLayout(promptStyle = PromptStyle.INLINE, named = "Update with choices", sequence = "2")
@RequiredArgsConstructor
-public class JavaAwtImageHolder_updateReadOnlyPropertyWithChoices {
+public class JavaAwtBufferedImageHolder_updateReadOnlyPropertyWithChoices {
- private final JavaAwtImageHolder holder;
+ private final JavaAwtBufferedImageHolder holder;
- public JavaAwtImageHolder act(BufferedImage newValue) {
+ public JavaAwtBufferedImageHolder act(BufferedImage newValue) {
holder.setReadOnlyProperty(newValue);
return holder;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/JavaAwtImageJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/JavaAwtBufferedImageJdo-description.adoc
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/JavaAwtImageJdo-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/JavaAwtBufferedImageJdo-description.adoc
index a96cf20..079e460 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/JavaAwtImageJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/JavaAwtBufferedImageJdo-description.adoc
@@ -4,7 +4,7 @@ JDO supports `java.awt.image.BufferedImage` out-of-the-box, so no special annota
[source,java]
----
-include::JavaAwtImageJdo.java[tags=class]
+include::JavaAwtBufferedImageJdo.java[tags=class]
----
<.> a no-arg constructor is introduced by JDO enhancer
<.> required property as defined to JDO/DataNucleus.
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/JavaAwtImageJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/JavaAwtBufferedImageJdo.java
similarity index 89%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/JavaAwtImageJdo.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/JavaAwtBufferedImageJdo.java
index ffa1295..b50c07a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/JavaAwtImageJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/JavaAwtBufferedImageJdo.java
@@ -31,7 +31,7 @@ import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import demoapp.dom.types.javaawt.images.persistence.JavaAwtImageEntity;
+import demoapp.dom.types.javaawt.images.persistence.JavaAwtBufferedImageEntity;
import lombok.Getter;
import lombok.Setter;
@@ -39,17 +39,17 @@ import lombok.Setter;
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
@DatastoreIdentity(strategy = IdGeneratorStrategy.IDENTITY, column = "id")
@DomainObject(
- objectType = "demo.JavaAwtImageJdo"
+ objectType = "demo.JavaAwtBufferedImageEntity"
)
-public class JavaAwtImageJdo
- extends JavaAwtImageEntity
+public class JavaAwtBufferedImageJdo
+ extends JavaAwtBufferedImageEntity
//end::class[]
// label positions not yet supported
//tag::class[]
{
//end::class[]
- public JavaAwtImageJdo(BufferedImage initialValue) {
+ public JavaAwtBufferedImageJdo(BufferedImage initialValue) {
this.readOnlyProperty = initialValue;
// this.readWriteProperty = initialValue; // editable properties not yet supported
}
@@ -68,7 +68,7 @@ public class JavaAwtImageJdo
//end::class[]
- @Override // once JavaAwtImageHolder2 is implemented by this class, move this up to JavaAwtImageEntity
+ @Override // once JavaAwtBufferedImageHolder2 is implemented by this class, move this up to JavaAwtBufferedImageEntity
public java.awt.image.BufferedImage value() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/JavaAwtImageJdoEntities.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/JavaAwtBufferedImageJdoEntities.java
similarity index 76%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/JavaAwtImageJdoEntities.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/JavaAwtBufferedImageJdoEntities.java
index 5459f20..db76cc0 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/JavaAwtImageJdoEntities.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/JavaAwtBufferedImageJdoEntities.java
@@ -27,16 +27,16 @@ import demoapp.dom._infra.values.ValueHolderRepository;
@Profile("demo-jdo")
@Service
-public class JavaAwtImageJdoEntities
-extends ValueHolderRepository<BufferedImage, JavaAwtImageJdo> {
+public class JavaAwtBufferedImageJdoEntities
+extends ValueHolderRepository<BufferedImage, JavaAwtBufferedImageJdo> {
- protected JavaAwtImageJdoEntities() {
- super(JavaAwtImageJdo.class);
+ protected JavaAwtBufferedImageJdoEntities() {
+ super(JavaAwtBufferedImageJdo.class);
}
@Override
- protected JavaAwtImageJdo newDetachedEntity(BufferedImage value) {
- return new JavaAwtImageJdo(value);
+ protected JavaAwtBufferedImageJdo newDetachedEntity(BufferedImage value) {
+ return new JavaAwtBufferedImageJdo(value);
}
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/JavaAwtImageJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/JavaAwtBufferedImageJpa-description.adoc
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/JavaAwtImageJpa-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/JavaAwtBufferedImageJpa-description.adoc
index e7e6f74..327964d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/JavaAwtImageJpa-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/JavaAwtBufferedImageJpa-description.adoc
@@ -9,7 +9,7 @@ JDO supports `java.awt.image.BufferedImage` out-of-the-box, so no special annota
[source,java]
----
-include::JavaAwtImageJpa.java[tags=class]
+include::JavaAwtBufferedImageJpa.java[tags=class]
----
<.> a no-arg constructor is introduced by JDO enhancer
<.> required property as defined to JDO/DataNucleus.
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/JavaAwtImageJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/JavaAwtBufferedImageJpa.java
similarity index 88%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/JavaAwtImageJpa.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/JavaAwtBufferedImageJpa.java
index a18e4db..9ee94ea 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/JavaAwtImageJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/JavaAwtBufferedImageJpa.java
@@ -35,7 +35,7 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
-import demoapp.dom.types.javaawt.images.persistence.JavaAwtImageEntity;
+import demoapp.dom.types.javaawt.images.persistence.JavaAwtBufferedImageEntity;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@@ -45,22 +45,22 @@ import lombok.Setter;
@Entity
@Table(
schema = "demo",
- name = "JavaAwtImageJpa"
+ name = "JavaAwtBufferedImageJpa"
)
@EntityListeners(JpaEntityInjectionPointResolver.class)
@DomainObject(
- objectType = "demo.JavaAwtImageEntity"
+ objectType = "demo.JavaAwtBufferedImageEntity"
)
@NoArgsConstructor
-public class JavaAwtImageJpa
- extends JavaAwtImageEntity
+public class JavaAwtBufferedImageJpa
+ extends JavaAwtBufferedImageEntity
//end::class[]
// label positions not yet supported
//tag::class[]
{
//end::class[]
- public JavaAwtImageJpa(BufferedImage initialValue) {
+ public JavaAwtBufferedImageJpa(BufferedImage initialValue) {
this.readOnlyProperty = initialValue;
// this.readWriteProperty = initialValue; // editable properties not yet supported
}
@@ -83,7 +83,7 @@ public class JavaAwtImageJpa
//end::class[]
- @Override // once JavaAwtImageHolder2 is implemented by this class, move this up to JavaAwtImageEntity
+ @Override // once JavaAwtBufferedImageHolder2 is implemented by this class, move this up to JavaAwtBufferedImageEntity
public java.awt.image.BufferedImage value() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/JavaAwtImageJpaEntities.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/JavaAwtBufferedImageJpaEntities.java
similarity index 76%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/JavaAwtImageJpaEntities.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/JavaAwtBufferedImageJpaEntities.java
index d62999c..d568492 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/JavaAwtImageJpaEntities.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/JavaAwtBufferedImageJpaEntities.java
@@ -27,16 +27,16 @@ import demoapp.dom._infra.values.ValueHolderRepository;
@Profile("demo-jpa")
@Service
-public class JavaAwtImageJpaEntities
-extends ValueHolderRepository<BufferedImage, JavaAwtImageJpa> {
+public class JavaAwtBufferedImageJpaEntities
+extends ValueHolderRepository<BufferedImage, JavaAwtBufferedImageJpa> {
- protected JavaAwtImageJpaEntities() {
- super(JavaAwtImageJpa.class);
+ protected JavaAwtBufferedImageJpaEntities() {
+ super(JavaAwtBufferedImageJpa.class);
}
@Override
- protected JavaAwtImageJpa newDetachedEntity(BufferedImage value) {
- return new JavaAwtImageJpa(value);
+ protected JavaAwtBufferedImageJpa newDetachedEntity(BufferedImage value) {
+ return new JavaAwtBufferedImageJpa(value);
}
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/persistence/JavaAwtImageEntity.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/persistence/JavaAwtBufferedImageEntity.java
similarity index 87%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/persistence/JavaAwtImageEntity.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/persistence/JavaAwtBufferedImageEntity.java
index e61a650..07649cb 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/persistence/JavaAwtImageEntity.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/persistence/JavaAwtBufferedImageEntity.java
@@ -24,12 +24,12 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolder;
@DomainObject(
- objectType = "demo.JavaAwtImageEntity" // shared permissions with concrete sub class
+ objectType = "demo.JavaAwtBufferedImageEntity" // shared permissions with concrete sub class
)
-public abstract class JavaAwtImageEntity
+public abstract class JavaAwtBufferedImageEntity
implements
HasAsciiDocDescription,
- //JavaAwtImageHolder2,
+ //JavaAwtBufferedImageHolder2,
ValueHolder<java.awt.image.BufferedImage> {
// @Override
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/vm/JavaAwtImageVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/persistence/JavaAwtBufferedImageEntity.layout.xml
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/vm/JavaAwtImageVm.layout.xml
rename to examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/persistence/JavaAwtBufferedImageEntity.layout.xml
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/persistence/JavaAwtImageSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/persistence/JavaAwtBufferedImageSeeding.java
similarity index 87%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/persistence/JavaAwtImageSeeding.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/persistence/JavaAwtBufferedImageSeeding.java
index 8f782aa..eaf6cf8 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/persistence/JavaAwtImageSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/persistence/JavaAwtBufferedImageSeeding.java
@@ -28,11 +28,11 @@ import demoapp.dom._infra.seed.SeedServiceAbstract;
import demoapp.dom._infra.values.ValueHolderRepository;
@Service
-public class JavaAwtImageSeeding
+public class JavaAwtBufferedImageSeeding
extends SeedServiceAbstract {
@Inject
- public JavaAwtImageSeeding(ValueHolderRepository<BufferedImage, ? extends JavaAwtImageEntity> entities) {
+ public JavaAwtBufferedImageSeeding(ValueHolderRepository<BufferedImage, ? extends JavaAwtBufferedImageEntity> entities) {
super(entities);
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/samples/JavaAwtImageService.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/samples/JavaAwtBufferedImageService.java
similarity index 95%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/samples/JavaAwtImageService.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/samples/JavaAwtBufferedImageService.java
index d843921..9076738 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/samples/JavaAwtImageService.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/samples/JavaAwtBufferedImageService.java
@@ -31,10 +31,10 @@ import org.springframework.stereotype.Service;
import lombok.SneakyThrows;
@Service
-public class JavaAwtImageService {
+public class JavaAwtBufferedImageService {
@SneakyThrows
- public BufferedImage bytesToJavaAwtImage(byte[] bytes) {
+ public BufferedImage bytesToJavaAwtBufferedImage(byte[] bytes) {
return ImageIO.read(new ByteArrayInputStream(bytes));
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/samples/JavaAwtImagesSamples.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/samples/JavaAwtBufferedImagesSamples.java
similarity index 83%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/samples/JavaAwtImagesSamples.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/samples/JavaAwtBufferedImagesSamples.java
index 81bfd83..97d2384 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/samples/JavaAwtImagesSamples.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/samples/JavaAwtBufferedImagesSamples.java
@@ -28,13 +28,12 @@ import org.springframework.stereotype.Service;
import org.apache.isis.commons.internal.base._Bytes;
import org.apache.isis.commons.internal.resources._Resources;
+import demoapp.dom.types.Samples;
import lombok.SneakyThrows;
import lombok.val;
-import demoapp.dom.types.Samples;
-
@Service
-public class JavaAwtImagesSamples implements Samples<BufferedImage> {
+public class JavaAwtBufferedImagesSamples implements Samples<BufferedImage> {
@Override
public Stream<BufferedImage> stream() {
@@ -47,11 +46,11 @@ public class JavaAwtImagesSamples implements Samples<BufferedImage> {
@SneakyThrows
private BufferedImage loadImage(String name) {
- val bytes = _Bytes.of(_Resources.load(JavaAwtImagesSamples.class, name ));
- return javaAwtImageService.bytesToJavaAwtImage(bytes);
+ val bytes = _Bytes.of(_Resources.load(JavaAwtBufferedImagesSamples.class, name ));
+ return javaAwtBufferedImageService.bytesToJavaAwtBufferedImage(bytes);
}
@Inject
- JavaAwtImageService javaAwtImageService;
+ JavaAwtBufferedImageService javaAwtBufferedImageService;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/vm/JavaAwtImageVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/vm/JavaAwtBufferedImageVm-description.adoc
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/vm/JavaAwtImageVm-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/vm/JavaAwtBufferedImageVm-description.adoc
index a83029b..a1ca638 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/vm/JavaAwtImageVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/vm/JavaAwtBufferedImageVm-description.adoc
@@ -4,7 +4,7 @@ JAXB supports `Image` out-of-the-box, so no special annotations are required.
[source,java]
----
-include::JavaAwtImageVm.java[tags=class]
+include::JavaAwtBufferedImageVm.java[tags=class]
----
<.> a no-arg constructor is required by JAXB
<.> required property as defined to JAXB
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/vm/JavaAwtImageVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/vm/JavaAwtBufferedImageVm.java
similarity index 94%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/vm/JavaAwtImageVm.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/vm/JavaAwtBufferedImageVm.java
index 32a8762..7e406bf 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/vm/JavaAwtImageVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/vm/JavaAwtBufferedImageVm.java
@@ -42,19 +42,19 @@ import lombok.Setter;
@XmlAccessorType(XmlAccessType.FIELD)
@DomainObject(
nature=Nature.VIEW_MODEL,
- objectType = "demo.JavaAwtImageVm"
+ objectType = "demo.JavaAwtBufferedImageVm"
)
@lombok.NoArgsConstructor // <.>
-public class JavaAwtImageVm
+public class JavaAwtBufferedImageVm
implements HasAsciiDocDescription
//end::class[]
// label positions not yet supported
-// , JavaAwtImageHolder2
+// , JavaAwtBufferedImageHolder2
//tag::class[]
{
//end::class[]
- public JavaAwtImageVm(BufferedImage initialValue) {
+ public JavaAwtBufferedImageVm(BufferedImage initialValue) {
this.readOnlyProperty = initialValue;
// this.readWriteProperty = initialValue; // editable properties not yet supported
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/persistence/JavaAwtImageEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/vm/JavaAwtBufferedImageVm.layout.xml
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/persistence/JavaAwtImageEntity.layout.xml
rename to examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/vm/JavaAwtBufferedImageVm.layout.xml