You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by mg...@apache.org on 2015/04/01 15:12:21 UTC
[2/2] isis git commit: ISIS-1130 Add #isEnabled() method to services
based on Wicket
ISIS-1130 Add #isEnabled() method to services based on Wicket
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/867188b8
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/867188b8
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/867188b8
Branch: refs/heads/master
Commit: 867188b865edaae77c4999c6059f79f0bc79b096
Parents: dfaef0b
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Apr 1 16:11:01 2015 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Apr 1 16:11:01 2015 +0300
----------------------------------------------------------------------
.../apache/isis/applib/services/linking/DeepLinkService.java | 5 +++++
.../viewer/wicket/viewer/services/DeepLinkServiceWicket.java | 6 +++++-
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/867188b8/core/applib/src/main/java/org/apache/isis/applib/services/linking/DeepLinkService.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/linking/DeepLinkService.java b/core/applib/src/main/java/org/apache/isis/applib/services/linking/DeepLinkService.java
index 4d23b61..49f0be8 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/linking/DeepLinkService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/linking/DeepLinkService.java
@@ -38,4 +38,9 @@ public interface DeepLinkService {
@Programmatic
URI deepLinkFor(Object domainObject);
+ /**
+ * @return {@code true} if the service be used to create a link to domain objects
+ */
+ @Programmatic
+ boolean isEnabled();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/867188b8/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
index a665979..7453de2 100644
--- a/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
+++ b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
@@ -37,7 +37,6 @@ import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
-import org.apache.isis.viewer.wicket.viewer.registries.pages.PageClassListDefault;
/**
* An implementation of {@link org.apache.isis.applib.services.linking.DeepLinkService}
@@ -69,6 +68,11 @@ public class DeepLinkServiceWicket implements DeepLinkService {
}
}
+ @Override
+ public boolean isEnabled() {
+ return RequestCycle.get() != null;
+ }
+
protected AdapterManagerDefault getAdapterManager() {
return getPersistenceSession().getAdapterManager();
}