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 2022/08/01 05:46:45 UTC
[isis] branch master updated: ISIS-3102: build fixes
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 db0828fa95 ISIS-3102: build fixes
db0828fa95 is described below
commit db0828fa95c4615923203e34a75f8b065f01b443
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Aug 1 07:46:39 2022 +0200
ISIS-3102: build fixes
---
.../commandreplay/primary/mixins/Object_openOnSecondary.java | 4 ++--
.../commandreplay/secondary/mixins/Object_openOnPrimary.java | 8 +++++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/incubator/extensions/core/commandreplay/primary/src/main/java/org/apache/isis/extensions/commandreplay/primary/mixins/Object_openOnSecondary.java b/incubator/extensions/core/commandreplay/primary/src/main/java/org/apache/isis/extensions/commandreplay/primary/mixins/Object_openOnSecondary.java
index 94295ef3ea..6e9828163b 100644
--- a/incubator/extensions/core/commandreplay/primary/src/main/java/org/apache/isis/extensions/commandreplay/primary/mixins/Object_openOnSecondary.java
+++ b/incubator/extensions/core/commandreplay/primary/src/main/java/org/apache/isis/extensions/commandreplay/primary/mixins/Object_openOnSecondary.java
@@ -30,7 +30,7 @@ import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.applib.annotation.RestrictTo;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.exceptions.RecoverableException;
-import org.apache.isis.applib.mixins.layout.LayoutMixinConstants;
+import org.apache.isis.applib.layout.LayoutConstants;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.extensions.commandreplay.primary.IsisModuleExtCommandReplayPrimary;
import org.apache.isis.extensions.commandreplay.primary.config.PrimaryConfig;
@@ -51,7 +51,7 @@ import lombok.val;
@ActionLayout(
cssClassFa = "fa-external-link-alt",
position = ActionLayout.Position.PANEL_DROPDOWN,
- associateWith = LayoutMixinConstants.METADATA_LAYOUT_GROUPNAME,
+ associateWith = LayoutConstants.FieldSetId.METADATA,
sequence = "750.3"
)
@RequiredArgsConstructor
diff --git a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/mixins/Object_openOnPrimary.java b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/mixins/Object_openOnPrimary.java
index bcc59f950d..602ea9c766 100644
--- a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/mixins/Object_openOnPrimary.java
+++ b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/mixins/Object_openOnPrimary.java
@@ -25,11 +25,12 @@ import javax.inject.Inject;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.applib.annotation.RestrictTo;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.exceptions.RecoverableException;
-import org.apache.isis.applib.mixins.layout.LayoutMixinConstants;
+import org.apache.isis.applib.layout.LayoutConstants;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.extensions.commandreplay.secondary.IsisModuleExtCommandReplaySecondary;
import org.apache.isis.extensions.commandreplay.secondary.config.SecondaryConfig;
@@ -50,7 +51,7 @@ import lombok.val;
@ActionLayout(
cssClassFa = "fa-external-link-alt",
position = ActionLayout.Position.PANEL_DROPDOWN,
- associateWith = LayoutMixinConstants.METADATA_LAYOUT_GROUPNAME,
+ associateWith = LayoutConstants.FieldSetId.METADATA,
sequence = "750.2"
)
@RequiredArgsConstructor
@@ -61,6 +62,7 @@ public class Object_openOnPrimary {
final Object object;
+ @MemberSupport
public URL act() {
val baseUrlPrefix = lookupBaseUrlPrefix();
val urlSuffix = bookmarkService.bookmarkForElseFail(object).toString();
@@ -71,7 +73,7 @@ public class Object_openOnPrimary {
throw new RecoverableException(e);
}
}
- public boolean hideAct() {
+ @MemberSupport public boolean hideAct() {
return !secondaryConfig.isConfigured();
}