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/23 09:52:08 UTC
isis git commit: Revert "ISIS-1130 Add #isEnabled() method to
services based on Wicket"
Repository: isis
Updated Branches:
refs/heads/master 9a931d857 -> 9ae8002fc
Revert "ISIS-1130 Add #isEnabled() method to services based on Wicket"
This reverts commit 867188b865edaae77c4999c6059f79f0bc79b096.
Reverting the suggested change. For some reason I don't like it very much. Will think for a better solution.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/9ae8002f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/9ae8002f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/9ae8002f
Branch: refs/heads/master
Commit: 9ae8002fce0a782d8d69cd32f3e7bc3a56870cb8
Parents: 9a931d8
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Apr 23 10:50:33 2015 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Apr 23 10:50:33 2015 +0300
----------------------------------------------------------------------
.../apache/isis/applib/services/linking/DeepLinkService.java | 5 -----
.../viewer/wicket/viewer/services/DeepLinkServiceWicket.java | 6 +-----
2 files changed, 1 insertion(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/9ae8002f/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 49f0be8..4d23b61 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,9 +38,4 @@ 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/9ae8002f/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 7453de2..a665979 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,6 +37,7 @@ 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}
@@ -68,11 +69,6 @@ public class DeepLinkServiceWicket implements DeepLinkService {
}
}
- @Override
- public boolean isEnabled() {
- return RequestCycle.get() != null;
- }
-
protected AdapterManagerDefault getAdapterManager() {
return getPersistenceSession().getAdapterManager();
}