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/20 08:03:54 UTC
[isis] branch spring6 updated (71a0918086 -> 479cec8893)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch spring6
in repository https://gitbox.apache.org/repos/asf/isis.git
from 71a0918086 Merge pull request #1377 from apache/dependabot/maven/spring6/io.swagger.parser.v3-swagger-parser-v3-2.1.11
add 95cb0ad42d ISIS-3328: refactors DocumentationService to provide a ViewModel instead of just a Markup
add f2d6f1527e ISIS-3328: DefaultHelpVm: cache the markup content
add d45925b6ef Bump spring-boot.version from 2.7.7 to 2.7.8
add d33eb655d4 Merge pull request #1381 from apache/dependabot/maven/master/spring-boot.version-2.7.8
add 78591613c2 Bump spring-boot-starter-parent from 2.7.7 to 2.7.8
add 7434fafe67 Merge pull request #1379 from apache/dependabot/maven/master/org.springframework.boot-spring-boot-starter-parent-2.7.8
add d18ab3f3de Bump spring-boot-maven-plugin from 2.7.7 to 2.7.8
add 2a8e33a6f4 Merge pull request #1380 from apache/dependabot/maven/master/org.springframework.boot-spring-boot-maven-plugin-2.7.8
add e77726c42a Bump font-awesome from 6.2.0 to 6.2.1
add 30c5b9c082 Bump swagger-parser from 2.1.10 to 2.1.11
add ac6f3a907e ISIS-3328: remove Documentation Service from applib
add 59d48f94d9 ISIS-3328: fixes prev. commit
add 25c35caaaf ISIS-3332: fixes Collection View throws when less than 2 Collection Presentations available
new 479cec8893 Merge remote-tracking branch 'origin/master' into spring6
The 1 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:
api/applib/src/main/java/module-info.java | 1 -
.../runtimeservices/src/main/java/module-info.java | 2 +-
.../CausewayModuleCoreRuntimeServices.java | 4 ++
.../core/runtimeservices/helpui/DefaultHelpVm.java | 55 ++++++++++++----------
.../helpui/DefaultHelpVm.layout.xml | 37 +++++++++++++++
.../runtimeservices/helpui/DocumentationMenu.java | 50 ++++++++++----------
.../helpui}/DocumentationService.java | 10 ++--
.../DocumentationServiceDefault.java | 16 ++++---
.../src/main/java/demoapp/dom/menubars.layout.xml | 5 ++
.../bookmarkedpages/BookmarkedPagesPanel.java | 3 +-
.../CollectionPresentationSelectorPanel.java | 3 +-
.../CollectionContentsMultipleViewsPanel.java | 3 +-
.../entity/collection/EntityCollectionPanel.java | 2 +-
.../entity/header/EntityHeaderPanel.java | 3 +-
.../scalars/image/JavaAwtImagePanel.java | 3 +-
.../viewer/wicket/ui/panels/PanelAbstract.java | 15 ------
16 files changed, 128 insertions(+), 84 deletions(-)
copy examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DemoItem.java => core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/helpui/DefaultHelpVm.java (50%)
create mode 100644 core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/helpui/DefaultHelpVm.layout.xml
rename api/applib/src/main/java/org/apache/causeway/applib/services/documentation/DocumentationServiceMenu.java => core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/helpui/DocumentationMenu.java (54%)
rename {api/applib/src/main/java/org/apache/causeway/applib/services/documentation => core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/helpui}/DocumentationService.java (73%)
rename core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/{documentation => helpui}/DocumentationServiceDefault.java (98%)
[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch spring6
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 479cec8893ab82ddeea612f0964a9c3b56326258
Merge: 71a0918086 25c35caaaf
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Jan 20 09:03:47 2023 +0100
Merge remote-tracking branch 'origin/master' into spring6
api/applib/src/main/java/module-info.java | 1 -
.../runtimeservices/src/main/java/module-info.java | 2 +-
.../CausewayModuleCoreRuntimeServices.java | 4 ++
.../core/runtimeservices/helpui/DefaultHelpVm.java | 63 ++++++++++++++++++++++
.../helpui/DefaultHelpVm.layout.xml | 37 +++++++++++++
.../runtimeservices/helpui/DocumentationMenu.java | 50 +++++++++--------
.../helpui}/DocumentationService.java | 10 ++--
.../DocumentationServiceDefault.java | 16 +++---
.../src/main/java/demoapp/dom/menubars.layout.xml | 5 ++
.../bookmarkedpages/BookmarkedPagesPanel.java | 3 +-
.../CollectionPresentationSelectorPanel.java | 3 +-
.../CollectionContentsMultipleViewsPanel.java | 3 +-
.../entity/collection/EntityCollectionPanel.java | 2 +-
.../entity/header/EntityHeaderPanel.java | 3 +-
.../scalars/image/JavaAwtImagePanel.java | 3 +-
.../viewer/wicket/ui/panels/PanelAbstract.java | 15 ------
16 files changed, 162 insertions(+), 58 deletions(-)
diff --cc core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/helpui/DefaultHelpVm.java
index 0000000000,648e5ae940..15860043b9
mode 000000,100644..100644
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/helpui/DefaultHelpVm.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/helpui/DefaultHelpVm.java
@@@ -1,0 -1,63 +1,63 @@@
+ /*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+ package org.apache.causeway.core.runtimeservices.helpui;
+
-import javax.inject.Inject;
-import javax.inject.Named;
++import jakarta.inject.Inject;
++import jakarta.inject.Named;
+
+ import org.apache.causeway.applib.ViewModel;
+ import org.apache.causeway.applib.annotation.DomainObject;
+ import org.apache.causeway.applib.annotation.DomainObjectLayout;
+ import org.apache.causeway.applib.annotation.LabelPosition;
+ import org.apache.causeway.applib.annotation.Nature;
+ import org.apache.causeway.applib.annotation.ObjectSupport;
+ import org.apache.causeway.applib.annotation.Property;
+ import org.apache.causeway.applib.annotation.PropertyLayout;
+ import org.apache.causeway.applib.value.Markup;
+ import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
+
+ import lombok.Getter;
+ import lombok.RequiredArgsConstructor;
+
+ @Named(CausewayModuleCoreRuntimeServices.NAMESPACE + ".DefaultHelpVm")
+ @DomainObject(nature = Nature.VIEW_MODEL)
+ @DomainObjectLayout(
+ named = "Application Help",
+ cssClassFa = "fa-regular fa-circle-question")
+ @RequiredArgsConstructor(onConstructor_ = {@Inject})
+ public class DefaultHelpVm implements ViewModel {
+
+ private final DocumentationServiceDefault documentationServiceDefault;
+ private final String title;
+
+ @ObjectSupport
+ public String title() {
+ return title;
+ }
+
+ @Property
+ @PropertyLayout(labelPosition = LabelPosition.NONE)
+ @Getter(lazy = true)
+ private final Markup helpContent = new Markup(documentationServiceDefault.getDocumentationAsHtml());
+
+ @Override
+ public String viewModelMemento() {
+ return title;
+ }
+ }
diff --cc core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/helpui/DocumentationMenu.java
index a718c4552d,cfb27dae56..b72d8d056f
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/helpui/DocumentationMenu.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/helpui/DocumentationMenu.java
@@@ -16,9 -16,10 +16,10 @@@
* specific language governing permissions and limitations
* under the License.
*/
- package org.apache.causeway.applib.services.documentation;
+ package org.apache.causeway.core.runtimeservices.helpui;
-import javax.inject.Inject;
-import javax.inject.Named;
++import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.Action;
@@@ -26,26 -27,29 +27,29 @@@ import org.apache.causeway.applib.annot
import org.apache.causeway.applib.annotation.DomainService;
import org.apache.causeway.applib.annotation.DomainServiceLayout;
import org.apache.causeway.applib.annotation.MemberSupport;
+ import org.apache.causeway.applib.annotation.NatureOfService;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
- import org.apache.causeway.applib.annotation.RestrictTo;
import org.apache.causeway.applib.annotation.SemanticsOf;
- import org.apache.causeway.applib.value.Markup;
+ import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
+
+ import lombok.RequiredArgsConstructor;
/**
- * Simply provides a UI to for the generation of a documentation (obtained from {@link DocumentationService}).
+ * Provides entries for a <i>Documentation</i> sub-menu section utilizing the {@link DocumentationService}.
+ * <p>
+ * Currently there is only one, namely (<i>help</i>).
*
+ * @see DocumentationService
* @since 2.x {@index}
*/
- @Named(DocumentationServiceMenu.LOGICAL_TYPE_NAME)
- @DomainService()
+ @Named(CausewayModuleCoreRuntimeServices.NAMESPACE + ".DocumentationMenu")
+ @DomainService(nature = NatureOfService.VIEW)
@DomainServiceLayout(
- named = "Prototyping",
- menuBar = DomainServiceLayout.MenuBar.SECONDARY
+ menuBar = DomainServiceLayout.MenuBar.TERTIARY
)
-@javax.annotation.Priority(PriorityPrecedence.EARLY)
+@jakarta.annotation.Priority(PriorityPrecedence.EARLY)
- public class DocumentationServiceMenu {
-
- public static final String LOGICAL_TYPE_NAME = CausewayModuleApplib.NAMESPACE + ".DocumentationServiceMenu";
+ @RequiredArgsConstructor(onConstructor_ = {@Inject})
+ public class DocumentationMenu {
public static abstract class ActionDomainEvent<T> extends CausewayModuleApplib.ActionDomainEvent<T> {}