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 2023/01/19 08:04:30 UTC
[isis-app-simpleapp] branch jdo-SNAPSHOT updated: ISIS-3329: upstream changes to DomainObjectLayout#tableDecoration
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch jdo-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
The following commit(s) were added to refs/heads/jdo-SNAPSHOT by this push:
new 13c894d ISIS-3329: upstream changes to DomainObjectLayout#tableDecoration
13c894d is described below
commit 13c894deb50ee11ebe4eaedca98f1257238f7d95
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Jan 19 09:04:25 2023 +0100
ISIS-3329: upstream changes to DomainObjectLayout#tableDecoration
---
.../modules/simple/dom/so/SimpleObject.java | 23 +++++++---------------
.../services/homepage/HomePageViewModel.java | 6 ++----
2 files changed, 9 insertions(+), 20 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 0a4a3bf..fceb150 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
@@ -1,11 +1,8 @@
package domainapp.modules.simple.dom.so;
-import java.time.LocalDate;
import java.time.LocalTime;
-import java.time.ZoneId;
import java.time.ZoneOffset;
import java.util.Comparator;
-import java.util.Optional;
import javax.inject.Inject;
import javax.inject.Named;
@@ -35,18 +32,13 @@ import org.apache.causeway.applib.annotation.PromptStyle;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Publishing;
-import org.apache.causeway.applib.annotation.TableDecoration;
+import org.apache.causeway.applib.annotation.TableDecorator;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
import org.apache.causeway.applib.layout.LayoutConstants;
-import org.apache.causeway.applib.services.clock.ClockService;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.message.MessageService;
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.applib.services.title.TitleService;
-import org.apache.causeway.applib.services.user.UserCurrentSessionTimeZoneHolder;
-import org.apache.causeway.applib.services.user.UserService;
import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.extensions.fullcalendar.applib.CalendarEventable;
import org.apache.causeway.extensions.fullcalendar.applib.value.CalendarEvent;
@@ -55,6 +47,9 @@ import org.apache.causeway.extensions.pdfjs.applib.annotations.PdfJsViewer;
import static org.apache.causeway.applib.annotation.SemanticsOf.IDEMPOTENT;
import static org.apache.causeway.applib.annotation.SemanticsOf.NON_IDEMPOTENT_ARE_YOU_SURE;
+import domainapp.modules.simple.SimpleModule;
+import domainapp.modules.simple.types.Name;
+import domainapp.modules.simple.types.Notes;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -62,10 +57,6 @@ import lombok.Setter;
import lombok.ToString;
import lombok.val;
-import domainapp.modules.simple.SimpleModule;
-import domainapp.modules.simple.types.Name;
-import domainapp.modules.simple.types.Notes;
-
@PersistenceCapable(
schema = SimpleModule.SCHEMA,
@@ -91,7 +82,7 @@ import domainapp.modules.simple.types.Notes;
@Version(strategy= VersionStrategy.DATE_TIME, column="version")
@Named(SimpleModule.NAMESPACE + ".SimpleObject")
@DomainObject(entityChangePublishing = Publishing.ENABLED)
-@DomainObjectLayout(tableDecoration = TableDecoration.DATATABLES_NET)
+@DomainObjectLayout(tableDecorator = TableDecorator.DatatablesNet.class)
@NoArgsConstructor(access = AccessLevel.PUBLIC)
@XmlJavaTypeAdapter(PersistentEntityAdapter.class)
@ToString(onlyExplicitlyIncluded = true)
@@ -100,7 +91,7 @@ public class SimpleObject implements Comparable<SimpleObject>, CalendarEventable
static final String NAMED_QUERY__FIND_BY_NAME_LIKE = "SimpleObject.findByNameLike";
static final String NAMED_QUERY__FIND_BY_NAME_EXACT = "SimpleObject.findByNameExact";
- public static SimpleObject withName(String name) {
+ public static SimpleObject withName(final String name) {
val simpleObject = new SimpleObject();
simpleObject.setName(name);
return simpleObject;
@@ -174,7 +165,7 @@ public class SimpleObject implements Comparable<SimpleObject>, CalendarEventable
@MemberSupport public String default0UpdateName() {
return getName();
}
- @MemberSupport public String validate0UpdateName(String newName) {
+ @MemberSupport public String validate0UpdateName(final String newName) {
for (char prohibitedCharacter : PROHIBITED_CHARACTERS.toCharArray()) {
if( newName.contains(""+prohibitedCharacter)) {
return "Character '" + prohibitedCharacter + "' is not allowed.";
diff --git a/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java b/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java
index 8aeb9e4..80e78c5 100644
--- a/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java
+++ b/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java
@@ -7,14 +7,12 @@ import javax.inject.Named;
import org.apache.causeway.applib.annotation.Collection;
import org.apache.causeway.applib.annotation.CollectionLayout;
-import org.apache.causeway.applib.annotation.Domain;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.annotation.HomePage;
-import org.apache.causeway.applib.annotation.MemberSupport;
import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.annotation.ObjectSupport;
-import org.apache.causeway.applib.annotation.TableDecoration;
+import org.apache.causeway.applib.annotation.TableDecorator;
import domainapp.modules.simple.SimpleModule;
import domainapp.modules.simple.dom.so.SimpleObject;
@@ -31,7 +29,7 @@ public class HomePageViewModel {
}
@Collection
- @CollectionLayout(tableDecoration = TableDecoration.DATATABLES_NET)
+ @CollectionLayout(tableDecorator = TableDecorator.DatatablesNet.class)
public List<SimpleObject> getObjects() {
return simpleObjects.listAll();
}