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/14 19:05:04 UTC
[2/2] git commit: ISIS-340: adding icon to bookmarks in Wicket viewer.
Updated Branches:
refs/heads/master 27c766e09 -> 9e9765fe1
ISIS-340: adding icon to bookmarks in Wicket viewer.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/9e9765fe
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/9e9765fe
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/9e9765fe
Branch: refs/heads/master
Commit: 9e9765fe1e01725aac8862f7567f51ba4eeff12f
Parents: 3a323d7
Author: Dan Haywood <da...@apache.org>
Authored: Thu Feb 14 18:04:07 2013 +0000
Committer: Dan Haywood <da...@apache.org>
Committed: Thu Feb 14 18:04:07 2013 +0000
----------------------------------------------------------------------
.../viewer/imagecache/ImageCacheClassPath.java | 24 ++++--
.../wicket/model/models/BookmarkedPagesModel.java | 10 +++
.../wicket/model/models/ImageResourceCache.java | 3 +
.../bookmarkedpages/BookmarkedPagesPanel.css | 42 +++++++---
.../bookmarkedpages/BookmarkedPagesPanel.html | 7 ++-
.../bookmarkedpages/BookmarkedPagesPanel.java | 62 +++++++++++++--
6 files changed, 120 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/9e9765fe/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageCacheClassPath.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageCacheClassPath.java b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageCacheClassPath.java
index beed0ce..ecb7f53 100644
--- a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageCacheClassPath.java
+++ b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageCacheClassPath.java
@@ -50,14 +50,19 @@ public class ImageCacheClassPath implements ImageResourceCache {
private static final String FALLBACK_IMAGE = "Default.png";
private final Map<ObjectSpecification, ResourceReference> resourceReferenceBySpec = Maps.newHashMap();
+ private PackageResourceReference fallbackResourceReference;
@Override
public ResourceReference resourceReferenceFor(ObjectAdapter adapter) {
- return resourceReferenceFor(adapter.getSpecification());
+ return resourceReferenceForSpec(adapter.getSpecification());
}
- private ResourceReference resourceReferenceFor(final ObjectSpecification spec) {
+ @Override
+ public ResourceReference resourceReferenceForSpec(final ObjectSpecification spec) {
+ if(spec == null) {
+ return fallbackResourceReference();
+ }
ResourceReference resourceReference = resourceReferenceBySpec.get(spec);
if(resourceReference != null) {
return resourceReference;
@@ -81,11 +86,18 @@ public class ImageCacheClassPath implements ImageResourceCache {
// search up hierarchy
final ObjectSpecification superSpec = spec.superclass();
if(superSpec != null) {
- return resourceReferenceFor(superSpec);
+ return resourceReferenceForSpec(superSpec);
}
-
- // fallback
- return newPackageResourceReference(FALLBACK_IMAGE);
+
+ return fallbackResourceReference();
+ }
+
+
+ private ResourceReference fallbackResourceReference() {
+ if(fallbackResourceReference == null) {
+ fallbackResourceReference = newPackageResourceReference(FALLBACK_IMAGE);
+ }
+ return fallbackResourceReference;
}
private static ResourceReference resourceReferenceFor(final String specName) {
http://git-wip-us.apache.org/repos/asf/isis/blob/9e9765fe/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
index 1e1a22a..097adf0 100644
--- a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
+++ b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
@@ -28,6 +28,8 @@ import com.google.common.collect.Lists;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.isis.core.metamodel.adapter.oid.RootOid;
+import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.wicket.model.mementos.PageParameterNames;
@@ -76,6 +78,14 @@ public class BookmarkedPagesModel extends ModelAbstract<List<PageParameters>> im
return PageParameterNames.PAGE_TITLE.getStringFrom(pageParameters);
}
+ public static RootOid oidFrom(final PageParameters pageParameters) {
+ String oidStr = PageParameterNames.OBJECT_OID.getStringFrom(pageParameters);
+ if(oidStr == null) {
+ return null;
+ }
+ return IsisContext.getOidMarshaller().unmarshal(oidStr, RootOid.class);
+ }
+
public void clear() {
list.clear();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/9e9765fe/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ImageResourceCache.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ImageResourceCache.java b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ImageResourceCache.java
index 1b62fd9..b12bcf4 100644
--- a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ImageResourceCache.java
+++ b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ImageResourceCache.java
@@ -22,9 +22,12 @@ package org.apache.isis.viewer.wicket.model.models;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
public interface ImageResourceCache {
ResourceReference resourceReferenceFor(ObjectAdapter adapter);
+
+ ResourceReference resourceReferenceForSpec(ObjectSpecification objectSpecification);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/9e9765fe/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.css
index 31d4550..ab43cbe 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.css
@@ -30,18 +30,37 @@
display: inline;
}
+.bookmarkedPagesPanel .bookmarkedPageItem {
+ display: inline;
+}
+
+.bookmarkedPagesPanel span.bookmarkedPageImageAndTitle {
+ margin-right: 5px;
+ margin-bottom:5px;
+ float:left;
+
+ border-radius:4px;
+ -moz-border-radius:4px;
+ -webkit-border-radius:4px;
+ background-color:#F0EFEA;
+
+ padding:1px 6px 1px 6px;
+}
+
+.bookmarkedPagesPanel span.bookmarkedPageImageAndTitle:hover {
+ background-color:#FFFFFF;
+}
+
+.bookmarkedPagesPanel .bookmarkedPagesList a img.bookmarkedPageImage {
+ float:left;
+ background-color: transparent;
+}
+
.bookmarkedPagesPanel .bookmarkedPagesList span.bookmarkedPageTitle {
- margin-right: 5px;
- margin-bottom:5px;
float:left;
display:block;
- padding:3px 6px 3px 6px;
- border-radius:4px;
- -moz-border-radius:4px;
- -webkit-border-radius:4px;
- background-color:#FFFFFF;
- color:#46413B;
font-style:normal !important;
+ padding:3px 0px 0px 2px;
}
.bookmarkedPagesPanel .bookmarkedPagesList a span.bookmarkedPageTitle {
@@ -49,12 +68,8 @@
}
.bookmarkedPagesPanel .bookmarkedPagesList a:hover span.bookmarkedPageTitle {
- background-color:#FFFFFF;
text-decoration:none;
-}
-
-.bookmarkedPagesPanel .bookmarkedPageItem {
- display: inline;
+ background-color:#FFFFFF;
}
.bookmarkedPagesPanel .clearBookmarks {
@@ -74,3 +89,4 @@
padding:3px 8px 3px 8px;
text-indent: -999em;
}
+
http://git-wip-us.apache.org/repos/asf/isis/blob/9e9765fe/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.html
index 3251812..4929f43 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.html
@@ -27,7 +27,12 @@
<div id="bookmarkedPages" class="bookmarkedPagesPanel bookmarkedPagesComponentType">
<ul wicket:id="bookmarkList" class="bookmarkedPagesList">
<li wicket:id="bookmarkedPageItem" class="bookmarkedPageItem">
- <a href="#" wicket:id="bookmarkedPageLink"><span wicket:id="bookmarkedPageTitle" class="bookmarkedPageTitle">[link title]</span></a>
+ <a href="#" wicket:id="bookmarkedPageLink">
+ <span class="bookmarkedPageImageAndTitle">
+ <img wicket:id="bookmarkedPageImage" class="bookmarkedPageImage" width="24" height="24"/>
+ <span wicket:id="bookmarkedPageTitle" class="bookmarkedPageTitle">[link title]</span>
+ </span>
+ </a>
</li>
</ul>
<a href="#" wicket:id="clearBookmarks" class="clearBookmarks" title="Clear Bookmarks">clear</a>
http://git-wip-us.apache.org/repos/asf/isis/blob/9e9765fe/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
index 155b1ba..5eb7a69 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
@@ -26,13 +26,21 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.image.Image;
import org.apache.wicket.markup.html.link.AbstractLink;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.wicket.request.resource.ResourceReference;
+import org.apache.isis.core.metamodel.adapter.oid.RootOid;
+import org.apache.isis.core.metamodel.spec.ObjectSpecId;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
+import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.wicket.model.mementos.PageParameterNames;
import org.apache.isis.viewer.wicket.model.models.BookmarkedPagesModel;
+import org.apache.isis.viewer.wicket.model.models.ImageResourceCache;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
@@ -42,10 +50,12 @@ public class BookmarkedPagesPanel extends PanelAbstract<BookmarkedPagesModel> {
private static final long serialVersionUID = 1L;
- private static final String BOOKMARK_LIST = "bookmarkList";
- private static final String BOOKMARKED_PAGE_LINK = "bookmarkedPageLink";
- private static final String BOOKMARKED_PAGE_ITEM = "bookmarkedPageItem";
- private static final String BOOKMARKED_PAGE_TITLE = "bookmarkedPageTitle";
+ private static final String ID_BOOKMARK_LIST = "bookmarkList";
+ private static final String ID_BOOKMARKED_PAGE_LINK = "bookmarkedPageLink";
+ private static final String ID_BOOKMARKED_PAGE_ITEM = "bookmarkedPageItem";
+ private static final String ID_BOOKMARKED_PAGE_TITLE = "bookmarkedPageTitle";
+
+ private static final String ID_BOOKMARKED_PAGE_ICON = "bookmarkedPageImage";
private static final String CLEAR_BOOKMARKS = "clearBookmarks";
@@ -59,14 +69,14 @@ public class BookmarkedPagesPanel extends PanelAbstract<BookmarkedPagesModel> {
private void buildGui() {
- final WebMarkupContainer container = new WebMarkupContainer(BOOKMARK_LIST);
+ final WebMarkupContainer container = new WebMarkupContainer(ID_BOOKMARK_LIST);
// allow to be updated by AjaxLink
container.setOutputMarkupId(true);
add(container);
final BookmarkedPagesModel bookmarkedPagesModel = getModel();
- final ListView<PageParameters> listView = new ListView<PageParameters>(BOOKMARKED_PAGE_ITEM, bookmarkedPagesModel) {
+ final ListView<PageParameters> listView = new ListView<PageParameters>(ID_BOOKMARKED_PAGE_ITEM, bookmarkedPagesModel) {
private static final long serialVersionUID = 1L;
@@ -77,8 +87,27 @@ public class BookmarkedPagesPanel extends PanelAbstract<BookmarkedPagesModel> {
final PageType pageType = PageParameterNames.PAGE_TYPE.getEnumFrom(pageParameters, PageType.class);
final Class<? extends Page> pageClass = pageClassRegistry.getPageClass(pageType);
- final AbstractLink link = Links.newBookmarkablePageLink(BOOKMARKED_PAGE_LINK, pageParameters, pageClass);
- link.add(new Label(BOOKMARKED_PAGE_TITLE, BookmarkedPagesModel.titleFrom(pageParameters)));
+ final AbstractLink link = Links.newBookmarkablePageLink(ID_BOOKMARKED_PAGE_LINK, pageParameters, pageClass);
+
+ final RootOid oid = BookmarkedPagesModel.oidFrom(pageParameters);
+ ObjectSpecification objectSpec = null;
+ if(oid != null) {
+ ObjectSpecId objectSpecId = oid.getObjectSpecId();
+ objectSpec = getSpecificationLoader().lookupBySpecId(objectSpecId);
+ }
+ final ResourceReference imageResource = imageCache.resourceReferenceForSpec(objectSpec);
+ final Image image = new Image(ID_BOOKMARKED_PAGE_ICON, imageResource) {
+ private static final long serialVersionUID = 1L;
+ @Override
+ protected boolean shouldAddAntiCacheParameter() {
+ return false;
+ }
+ };
+ link.addOrReplace(image);
+
+ String title = BookmarkedPagesModel.titleFrom(pageParameters);
+ link.add(new Label(ID_BOOKMARKED_PAGE_TITLE, title));
+
item.add(link);
}
};
@@ -103,4 +132,21 @@ public class BookmarkedPagesPanel extends PanelAbstract<BookmarkedPagesModel> {
}
}
+
+ // ///////////////////////////////////////////////
+ // Dependency Injection
+ // ///////////////////////////////////////////////
+
+ @Inject
+ private ImageResourceCache imageCache;
+
+ protected ImageResourceCache getImageCache() {
+ return imageCache;
+ }
+
+
+ protected SpecificationLoaderSpi getSpecificationLoader() {
+ return IsisContext.getSpecificationLoader();
+ }
+
}