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 2013/02/15 10:24:43 UTC
[3/3] git commit: ISIS-314: use iconName() of object if available
Updated Branches:
refs/heads/master 2bbc2a885 -> 74f30f466
ISIS-314: use iconName() of object if available
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/74f30f46
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/74f30f46
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/74f30f46
Branch: refs/heads/master
Commit: 74f30f4663595c0ab8923de526343290a89500f9
Parents: c41ee30
Author: Dan Haywood <da...@apache.org>
Authored: Fri Feb 15 09:02:03 2013 +0000
Committer: Dan Haywood <da...@apache.org>
Committed: Fri Feb 15 09:02:03 2013 +0000
----------------------------------------------------------------------
.../imagecache/ImageResourceCacheClassPath.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/74f30f46/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java
index 42d2293..e9d6940 100644
--- a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java
+++ b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java
@@ -55,6 +55,10 @@ public class ImageResourceCacheClassPath implements ImageResourceCache {
@Override
public ResourceReference resourceReferenceFor(ObjectAdapter adapter) {
+ String adapterIconName = adapter.getIconName();
+ if (adapterIconName != null) {
+ return resourceReferenceFor(adapter.getIconName());
+ }
return resourceReferenceForSpec(adapter.getSpecification());
}