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 2018/09/25 20:42:32 UTC
[isis] 01/04: ISIS-1976: further replace ObjectAdapter uses with
Instance
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 7663849a5e36a104c84e14c9322f93880e3d65ce
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Sep 25 17:53:21 2018 +0200
ISIS-1976: further replace ObjectAdapter uses with Instance
Task-Url: https://issues.apache.org/jira/browse/ISIS-1976
---
.../viewer/imagecache/ImageResourceCacheClassPath.java | 14 +++++++++++---
.../viewer/wicket/model/models/ImageResourceCache.java | 4 ++--
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java
index fe2adba..7a69b10 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java
@@ -30,8 +30,9 @@ import com.google.inject.Singleton;
import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.Instance;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.Specification;
import org.apache.isis.viewer.wicket.model.models.ImageResourceCache;
import images.Images;
@@ -60,8 +61,15 @@ public class ImageResourceCacheClassPath implements ImageResourceCache {
}
@Override
- public ResourceReference resourceReferenceFor(final ObjectAdapter adapter) {
- return resourceReferenceFor(adapter.getSpecification(), adapter.getIconName());
+ public ResourceReference resourceReferenceFor(final Instance adapter) {
+ final Specification spec = adapter.getSpecification();
+ if(spec!=null && spec instanceof ObjectSpecification) {
+ final ObjectSpecification objSpec = (ObjectSpecification) spec;
+ return resourceReferenceFor(objSpec, objSpec.getIconName(adapter));
+ } else {
+ return fallbackResource;
+ }
+
}
@Override
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ImageResourceCache.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ImageResourceCache.java
index 7626b2f..cb61049 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ImageResourceCache.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ImageResourceCache.java
@@ -23,7 +23,7 @@ import java.io.Serializable;
import org.apache.wicket.request.resource.ResourceReference;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.Instance;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
/**
@@ -32,7 +32,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
*/
public interface ImageResourceCache extends Serializable {
- ResourceReference resourceReferenceFor(ObjectAdapter adapter);
+ ResourceReference resourceReferenceFor(Instance adapter);
ResourceReference resourceReferenceForSpec(ObjectSpecification objectSpecification);