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/09/14 12:21:31 UTC
[isis] branch master updated: ISIS-2871: minor house keeping
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 1d77c4a ISIS-2871: minor house keeping
1d77c4a is described below
commit 1d77c4aac03c72cab3a2a3abe21daa2fe9a625d5
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Sep 14 14:21:24 2021 +0200
ISIS-2871: minor house keeping
---
.../metamodel/specloader/specimpl/dflt/_PropertiesAsColumns.java | 1 +
.../domain/src/main/java/demoapp/dom/homepage/DemoHomePage.java | 2 +-
.../java/org/apache/isis/valuetypes/asciidoc/applib/ui/Prism.java | 8 ++++----
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/_PropertiesAsColumns.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/_PropertiesAsColumns.java
index 17c650f..297570c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/_PropertiesAsColumns.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/_PropertiesAsColumns.java
@@ -58,6 +58,7 @@ class _PropertiesAsColumns implements HasMetaModelContext {
@Getter(onMethod_ = {@Override})
private final MetaModelContext metaModelContext;
+ //TODO there should be always a parent object, then we can use its spec and only require 2 args
public final Stream<OneToOneAssociation> streamPropertiesForColumnRendering(
final ObjectSpecification spec,
final Identifier memberIdentifier,
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/homepage/DemoHomePage.java b/examples/demo/domain/src/main/java/demoapp/dom/homepage/DemoHomePage.java
index 18c78b8..0936aeb 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/homepage/DemoHomePage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/homepage/DemoHomePage.java
@@ -39,7 +39,7 @@ import demoapp.dom._infra.resources.AsciiDocReaderService;
public class DemoHomePage
implements HasAsciiDocDescription { // <.>
- @ObjectSupport public String title() { // <.>
+ @ObjectSupport public String title() { // <.>
return "Hello, " + userService.currentUserNameElseNobody();
}
diff --git a/valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/ui/Prism.java b/valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/ui/Prism.java
index 420b62f..f6642b0 100644
--- a/valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/ui/Prism.java
+++ b/valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/ui/Prism.java
@@ -22,10 +22,10 @@ import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor
public enum Prism {
-// WICKET("1.24.1", "coy"),
-// VAADIN("1.24.1", "coy"),
- WICKET("1.20", "default"),
- VAADIN("1.20", "default");
+ WICKET("1.24.1", "coy"),
+ VAADIN("1.24.1", "coy");
+// WICKET("1.20", "default"),
+// VAADIN("1.20", "default");
final String version;
final String theme;
public String cssFile() {