You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2017/10/16 13:37:11 UTC
[isis] 05/08: ISIS-1742: deletes unused methods and injected
services, inlines usage of targetAdapterFor
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 1a3a50728ea03ca01ce741c156f89e10faf2226f
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 16 14:29:44 2017 +0100
ISIS-1742: deletes unused methods and injected services, inlines usage of targetAdapterFor
---
.../background/BackgroundCommandExecution.java | 44 +++-------------------
1 file changed, 6 insertions(+), 38 deletions(-)
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundCommandExecution.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundCommandExecution.java
index 7ab5003..4503199 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundCommandExecution.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundCommandExecution.java
@@ -26,11 +26,10 @@ import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import org.apache.isis.applib.services.bookmark.Bookmark;
-import org.apache.isis.applib.services.bookmark.BookmarkService2;
+import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.services.clock.ClockService;
import org.apache.isis.applib.services.command.Command;
import org.apache.isis.applib.services.command.Command.Executor;
-import org.apache.isis.applib.services.command.CommandContext;
import org.apache.isis.applib.services.iactn.Interaction;
import org.apache.isis.applib.services.iactn.InteractionContext;
import org.apache.isis.applib.services.jaxb.JaxbService;
@@ -143,7 +142,7 @@ public abstract class BackgroundCommandExecution extends AbstractIsisSessionTemp
for (OidDto targetOidDto : targetOidDtos) {
- final ObjectAdapter targetAdapter = targetAdapterFor(targetOidDto);
+ final ObjectAdapter targetAdapter = adapterFor(targetOidDto);
final ObjectAction objectAction = findObjectAction(targetAdapter, memberId);
// we pass 'null' for the mixedInAdapter; if this action _is_ a mixin then
@@ -274,35 +273,6 @@ public abstract class BackgroundCommandExecution extends AbstractIsisSessionTemp
return null;
}
-
- protected ObjectAdapter targetAdapterFor(final OidDto targetOidDto) {
-
-// // this is the original code, but it can be simplified ...
-// // (moved out to separate method so that, if proven wrong, can override as a patch)
-
-// final Bookmark bookmark = Bookmark.from(targetOidDto);
-// final Object targetObject = bookmarkService.lookup(bookmark);
-// final ObjectAdapter targetAdapter = adapterFor(targetObject);
-
- return adapterFor(targetOidDto);
- }
-
- protected ObjectAdapter argAdapterFor(final Class<?> argType, final Object arg) {
-
-// // this is the original code, but it can be simplified ...
-// // (moved out to separate method so that, if proven wrong, can override as a patch)
-
-// if(Bookmark.class != argType) {
-// return adapterFor(arg);
-// } else {
-// final Bookmark argBookmark = (Bookmark)arg;
-// final RootOid rootOid = RootOid.create(argBookmark);
-// return adapterFor(rootOid);
-// }
-
- return adapterFor(arg);
- }
-
private ObjectAdapter[] argAdaptersFor(final ActionDto actionDto) {
final List<ParamDto> params = paramDtosFrom(actionDto);
final List<ObjectAdapter> args = Lists.newArrayList(
@@ -330,20 +300,18 @@ public abstract class BackgroundCommandExecution extends AbstractIsisSessionTemp
// //////////////////////////////////////
- @javax.inject.Inject
- private BookmarkService2 bookmarkService;
@javax.inject.Inject
- private JaxbService jaxbService;
+ BookmarkService bookmarkService;
@javax.inject.Inject
- private CommandContext commandContext;
+ JaxbService jaxbService;
@javax.inject.Inject
- private InteractionContext interactionContext;
+ InteractionContext interactionContext;
@javax.inject.Inject
- private ClockService clockService;
+ ClockService clockService;
}
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.