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 2014/10/10 08:39:05 UTC
[2/2] git commit: ISIS-901: use @DomainService(repositoryFor=...) to
derive the icon facet for repository services.
ISIS-901: use @DomainService(repositoryFor=...) to derive the icon facet for repository services.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/7c9274b0
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/7c9274b0
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/7c9274b0
Branch: refs/heads/master
Commit: 7c9274b0fb673490d3bfd2262a2f7100346eb1a5
Parents: 3763005
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Oct 10 07:38:23 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Oct 10 07:38:23 2014 +0100
----------------------------------------------------------------------
.../imagecache/ImageResourceCacheClassPath.java | 169 +---------------
.../imagecache/ImageResourceCacheKey.java | 193 ++++++++++++++++++
.../imagecache/ImageResourceCacheKeyTest.java | 201 +++++++++++++++++++
.../wicket/viewer/imagecache/KeyTest.java | 162 ---------------
.../DomainServiceFacetAnnotationFactory.java | 6 +
...FacetDerivedFromDomainServiceAnnotation.java | 40 ++++
.../src/main/java/dom/simple/SimpleObjects.java | 12 --
.../dom/src/main/java/dom/todo/ToDoItems.java | 10 -
8 files changed, 450 insertions(+), 343 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/7c9274b0/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 807303e..45b9948 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
@@ -16,19 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.isis.viewer.wicket.viewer.imagecache;
import images.Images;
import java.io.IOException;
import java.io.InputStream;
-import java.io.Serializable;
import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
import java.util.Map;
-import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.inject.Singleton;
import org.apache.wicket.request.resource.PackageResourceReference;
@@ -52,156 +48,12 @@ public class ImageResourceCacheClassPath implements ImageResourceCache {
private static final List<String> IMAGE_SUFFICES = Arrays.asList("png", "gif", "jpeg", "jpg");
private static final String FALLBACK_IMAGE = "Default.png";
- private final Map<Key, ResourceReference> resourceReferenceByKey = Maps.newConcurrentMap();
-
- static final class Key implements Serializable {
-
- private final Class<?> resourceClass;
- private final String iconName;
- private final String toString;
-
- public Key(
- final Class<?> correspondingClass,
- final String iconName) {
- this.iconName = iconName;
- this.resourceClass = correspondingClass;
- this.toString = calcToString();
- }
-
- //region > getResourceClass, getIconName
-
- public final Class<?> getResourceClass() {
- return resourceClass;
- }
-
- public final String getResourceName() {
- return iconName;
- }
- //endregion
-
- //region > superKey
-
- Key superKey() {
- if(resourceClass == null) {
- return null;
- }
- final Class<?> superclass = resourceClass.getSuperclass();
- if(superclass == Object.class) {
- return null;
- }
- return new Key(superclass, iconName);
- }
-
- //endregion
-
- //region > resourcePaths
-
- List<Key> resourcePaths(final String... suffices) {
- return resourcePaths(Arrays.asList(suffices));
- }
-
- List<Key> resourcePaths(final List<String> suffices) {
-
- Key key;
- final List<Key> resourcePaths = Lists.newArrayList();
-
- if(resourceClass != null) {
- // with the iconName
- if(iconName != null) {
- key = this;
- do {
- for (String suffix : suffices) {
- resourcePaths.add(new Key(key.getResourceClass(), key.getResourceClass().getSimpleName() + "-" + iconName + "." + suffix));
- }
- for (String suffix : suffices) {
- resourcePaths.add(new Key(key.getResourceClass(), iconName + "." + suffix));
- }
- } while ((key = key.superKey()) != null);
- key = this;
- do {
- for (String suffix : suffices) {
- resourcePaths.add(new Key(null, key.getResourceClass().getSimpleName() + "-" + iconName + "." + suffix));
- }
- } while ((key = key.superKey()) != null);
- for (String suffix : suffices) {
- resourcePaths.add(new Key(null, iconName + "." + suffix));
- }
- }
-
- // without the iconName
- key = this;
- do {
- for (String suffix : suffices) {
- resourcePaths.add(new Key(key.getResourceClass(), key.getResourceClass().getSimpleName() + "." + suffix));
- }
- } while ((key = key.superKey()) != null);
- key = this;
- do {
- for (String suffix : suffices) {
- resourcePaths.add(new Key(null, key.getResourceClass().getSimpleName() + "." + suffix));
- }
- } while ((key = key.superKey()) != null);
-
-
- } else {
-
- if(iconName != null) {
- for (String suffix : suffices) {
- resourcePaths.add(new Key(null, iconName + "." + suffix));
- }
- }
- }
-
- // fallback
- for (String suffix : suffices) {
- resourcePaths.add(new Key(null, "Default" + "." + suffix));
- }
-
-
- return Collections.unmodifiableList(resourcePaths);
- }
-
- //endregion
-
- //region > equals, hashCode, toString
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- Key key = (Key) o;
- if (toString != null ? !toString.equals(key.toString) : key.toString != null) return false;
- return true;
- }
-
- @Override
- public int hashCode() {
- return toString != null ? toString.hashCode() : 0;
- }
-
- @Override
- public String toString() {
- return toString;
- }
-
- private String calcToString() {
- final StringBuilder buf = new StringBuilder();
- if(resourceClass != null) {
- buf.append(resourceClass.getName()).append("/").append(resourceClass.getSimpleName());
- }
- if(buf.length() > 0) {
- buf.append("-");
- }
- if(iconName != null) {
- buf.append(iconName);
- }
- return buf.toString();
- }
- //endregion
- }
+ private final Map<ImageResourceCacheKey, ResourceReference> resourceReferenceByKey = Maps.newConcurrentMap();
+ private final PackageResourceReference fallbackResource;
public ImageResourceCacheClassPath() {
- resourceReferenceByKey.put(new Key(null, null), new PackageResourceReference(Images.class, FALLBACK_IMAGE));
+ fallbackResource = new PackageResourceReference(Images.class, FALLBACK_IMAGE);
+ resourceReferenceByKey.put(new ImageResourceCacheKey(null, null), fallbackResource);
}
@Override
@@ -219,7 +71,7 @@ public class ImageResourceCacheClassPath implements ImageResourceCache {
final String iconNameIfAny) {
final Class<?> correspondingClassIfAny = specification != null? specification.getCorrespondingClass(): null;
- final Key key = new Key(correspondingClassIfAny, iconNameIfAny);
+ final ImageResourceCacheKey key = new ImageResourceCacheKey(correspondingClassIfAny, iconNameIfAny);
ResourceReference resourceReference = resourceReferenceByKey.get(key);
if(resourceReference == null) {
@@ -230,15 +82,14 @@ public class ImageResourceCacheClassPath implements ImageResourceCache {
return resourceReference;
}
- private ResourceReference findResourceReferenceFor(final Key key) {
-
- final List<Key> keys = key.resourcePaths(IMAGE_SUFFICES);
- for (Key resourceKey : keys) {
+ protected ResourceReference findResourceReferenceFor(final ImageResourceCacheKey key) {
+ final List<ImageResourceCacheKey> keys = key.resourcePaths(IMAGE_SUFFICES);
+ for (ImageResourceCacheKey resourceKey : keys) {
Class<?> resourceClass = resourceKey.getResourceClass();
if(resourceClass == null) {
resourceClass = Images.class;
}
- final String iconName = resourceKey.iconName;
+ final String iconName = resourceKey.getResourceName();
final InputStream resourceAsStream = resourceClass.getResourceAsStream(iconName);
if (resourceAsStream != null) {
@@ -246,7 +97,7 @@ public class ImageResourceCacheClassPath implements ImageResourceCache {
return new PackageResourceReference(resourceClass, iconName);
}
}
- return null;
+ return fallbackResource;
}
private static void closeSafely(InputStream resourceAsStream) {
http://git-wip-us.apache.org/repos/asf/isis/blob/7c9274b0/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheKey.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheKey.java b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheKey.java
new file mode 100644
index 0000000..68a1ff0
--- /dev/null
+++ b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheKey.java
@@ -0,0 +1,193 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.isis.viewer.wicket.viewer.imagecache;
+
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import com.google.common.collect.Lists;
+import org.apache.isis.core.commons.lang.ClassUtil;
+
+final class ImageResourceCacheKey implements Serializable {
+
+ ImageResourceCacheKey(
+ final Class<?> resourceClass,
+ final String resourceName) {
+ this.resourceName = resourceName;
+ this.resourceClass = resourceClass;
+ this.toString = calcToString();
+ }
+
+ //region > getResourceClass, getResourceName
+
+ private final Class<?> resourceClass;
+ private final String resourceName;
+
+ public final Class<?> getResourceClass() {
+ return resourceClass;
+ }
+
+ public final String getResourceName() {
+ return resourceName;
+ }
+ //endregion
+
+ //region > superKey
+
+ ImageResourceCacheKey superKey() {
+ if(resourceClass == null) {
+ return null;
+ }
+ final Class<?> superclass = resourceClass.getSuperclass();
+ if(superclass == Object.class) {
+ return null;
+ }
+ return new ImageResourceCacheKey(superclass, resourceName);
+ }
+
+ //endregion
+
+ //region > resourcePaths
+
+ List<ImageResourceCacheKey> resourcePaths(final String... suffices) {
+ return resourcePaths(Arrays.asList(suffices));
+ }
+
+ List<ImageResourceCacheKey> resourcePaths(final List<String> suffices) {
+
+ ImageResourceCacheKey key;
+ final List<ImageResourceCacheKey> resourcePaths = Lists.newArrayList();
+
+
+ boolean generated = false;
+
+ if(resourceName != null) {
+
+ final Class<?> resourceClass = ClassUtil.forNameElseNull(resourceName);
+
+ if(resourceClass != null) {
+ for (String suffix : suffices) {
+ resourcePaths.add(new ImageResourceCacheKey(resourceClass, resourceClass.getSimpleName() + "." + suffix));
+ }
+ generated = true;
+ }
+ }
+
+ if(!generated && resourceClass != null) {
+ // with the iconName
+ if(resourceName != null) {
+ key = this;
+ do {
+ for (String suffix : suffices) {
+ resourcePaths.add(new ImageResourceCacheKey(key.getResourceClass(), key.getResourceClass().getSimpleName() + "-" + resourceName + "." + suffix));
+ }
+ for (String suffix : suffices) {
+ resourcePaths.add(new ImageResourceCacheKey(key.getResourceClass(), resourceName + "." + suffix));
+ }
+ } while ((key = key.superKey()) != null);
+ key = this;
+ do {
+ for (String suffix : suffices) {
+ resourcePaths.add(new ImageResourceCacheKey(null, key.getResourceClass().getSimpleName() + "-" + resourceName + "." + suffix));
+ }
+ } while ((key = key.superKey()) != null);
+ for (String suffix : suffices) {
+ resourcePaths.add(new ImageResourceCacheKey(null, resourceName + "." + suffix));
+ }
+ }
+
+ // without the iconName
+ key = this;
+ do {
+ for (String suffix : suffices) {
+ resourcePaths.add(new ImageResourceCacheKey(key.getResourceClass(), key.getResourceClass().getSimpleName() + "." + suffix));
+ }
+ } while ((key = key.superKey()) != null);
+ key = this;
+ do {
+ for (String suffix : suffices) {
+ resourcePaths.add(new ImageResourceCacheKey(null, key.getResourceClass().getSimpleName() + "." + suffix));
+ }
+ } while ((key = key.superKey()) != null);
+
+ generated = true;
+ }
+
+ if(!generated && resourceName != null) {
+
+ for (String suffix : suffices) {
+ resourcePaths.add(new ImageResourceCacheKey(null, resourceName + "." + suffix));
+ }
+
+ }
+
+ // fallback
+ for (String suffix : suffices) {
+ resourcePaths.add(new ImageResourceCacheKey(null, "Default" + "." + suffix));
+ }
+
+
+ return Collections.unmodifiableList(resourcePaths);
+ }
+
+ //endregion
+
+ //region > equals, hashCode
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ ImageResourceCacheKey key = (ImageResourceCacheKey) o;
+ if (toString != null ? !toString.equals(key.toString) : key.toString != null) return false;
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ return toString != null ? toString.hashCode() : 0;
+ }
+
+ //endregion
+
+ //region > toString
+
+ private final String toString;
+
+ @Override
+ public String toString() {
+ return toString;
+ }
+
+ private String calcToString() {
+ final StringBuilder buf = new StringBuilder();
+ if(resourceClass != null) {
+ buf.append(resourceClass.getName()).append("/").append(resourceClass.getSimpleName());
+ }
+ if(buf.length() > 0) {
+ buf.append("-");
+ }
+ if(resourceName != null) {
+ buf.append(resourceName);
+ }
+ return buf.toString();
+ }
+ //endregion
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/7c9274b0/component/viewer/wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheKeyTest.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheKeyTest.java b/component/viewer/wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheKeyTest.java
new file mode 100644
index 0000000..dcd8e50
--- /dev/null
+++ b/component/viewer/wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheKeyTest.java
@@ -0,0 +1,201 @@
+package org.apache.isis.viewer.wicket.viewer.imagecache;
+
+import java.util.Iterator;
+import java.util.List;
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.*;
+
+public class ImageResourceCacheKeyTest {
+
+ ImageResourceCacheKey key;
+
+ public static class SomeSuperclass {
+ }
+
+ public static class SomeSubclass extends SomeSuperclass {
+ }
+
+ public static class SomeOtherContextClass extends SomeSuperclass {
+ }
+
+
+ public static class SuperKey extends ImageResourceCacheKeyTest {
+
+ @Test
+ public void whenSubclass() throws Exception {
+
+ key = new ImageResourceCacheKey(SomeSubclass.class, "foo");
+ final ImageResourceCacheKey superKey = key.superKey();
+
+ assertEquals(SomeSuperclass.class, superKey.getResourceClass());
+ assertEquals("foo", key.getResourceName());
+ }
+
+ @Test
+ public void whenSuperClass() throws Exception {
+
+ key = new ImageResourceCacheKey(SomeSuperclass.class, null);
+ final ImageResourceCacheKey superKey = key.superKey();
+
+ assertNull(superKey);
+ }
+
+ }
+
+ public static class ResourcePaths extends ImageResourceCacheKeyTest {
+
+ @Test
+ public void withIconName() throws Exception {
+ key = new ImageResourceCacheKey(SomeSubclass.class, "foo");
+
+ final List<ImageResourceCacheKey> keys = key.resourcePaths("png", "jpg", "jpeg");
+
+ final Iterator<ImageResourceCacheKey> iterator = keys.iterator();
+
+ assertNext(iterator, SomeSubclass.class, "SomeSubclass-foo.png");
+ assertNext(iterator, SomeSubclass.class, "SomeSubclass-foo.jpg");
+ assertNext(iterator, SomeSubclass.class, "SomeSubclass-foo.jpeg");
+
+ assertNext(iterator, SomeSubclass.class, "foo.png");
+ assertNext(iterator, SomeSubclass.class, "foo.jpg");
+ assertNext(iterator, SomeSubclass.class, "foo.jpeg");
+
+ assertNext(iterator, SomeSuperclass.class, "SomeSuperclass-foo.png");
+ assertNext(iterator, SomeSuperclass.class, "SomeSuperclass-foo.jpg");
+ assertNext(iterator, SomeSuperclass.class, "SomeSuperclass-foo.jpeg");
+
+ assertNext(iterator, SomeSuperclass.class, "foo.png");
+ assertNext(iterator, SomeSuperclass.class, "foo.jpg");
+ assertNext(iterator, SomeSuperclass.class, "foo.jpeg");
+
+ assertNext(iterator, null, "SomeSubclass-foo.png");
+ assertNext(iterator, null, "SomeSubclass-foo.jpg");
+ assertNext(iterator, null, "SomeSubclass-foo.jpeg");
+
+ assertNext(iterator, null, "SomeSuperclass-foo.png");
+ assertNext(iterator, null, "SomeSuperclass-foo.jpg");
+ assertNext(iterator, null, "SomeSuperclass-foo.jpeg");
+
+ assertNext(iterator, null, "foo.png");
+ assertNext(iterator, null, "foo.jpg");
+ assertNext(iterator, null, "foo.jpeg");
+
+ assertNext(iterator, SomeSubclass.class, "SomeSubclass.png");
+ assertNext(iterator, SomeSubclass.class, "SomeSubclass.jpg");
+ assertNext(iterator, SomeSubclass.class, "SomeSubclass.jpeg");
+
+ assertNext(iterator, SomeSuperclass.class, "SomeSuperclass.png");
+ assertNext(iterator, SomeSuperclass.class, "SomeSuperclass.jpg");
+ assertNext(iterator, SomeSuperclass.class, "SomeSuperclass.jpeg");
+
+ assertNext(iterator, null, "SomeSubclass.png");
+ assertNext(iterator, null, "SomeSubclass.jpg");
+ assertNext(iterator, null, "SomeSubclass.jpeg");
+
+ assertNext(iterator, null, "SomeSuperclass.png");
+ assertNext(iterator, null, "SomeSuperclass.jpg");
+ assertNext(iterator, null, "SomeSuperclass.jpeg");
+
+ assertNext(iterator, null, "Default.png");
+ assertNext(iterator, null, "Default.jpg");
+ assertNext(iterator, null, "Default.jpeg");
+
+ }
+
+ @Test
+ public void withoutIconName() throws Exception {
+ key = new ImageResourceCacheKey(SomeSubclass.class, null);
+
+ final List<ImageResourceCacheKey> keys = key.resourcePaths("png", "jpg", "jpeg");
+
+ final Iterator<ImageResourceCacheKey> iterator = keys.iterator();
+
+ assertNext(iterator, SomeSubclass.class, "SomeSubclass.png");
+ assertNext(iterator, SomeSubclass.class, "SomeSubclass.jpg");
+ assertNext(iterator, SomeSubclass.class, "SomeSubclass.jpeg");
+
+ assertNext(iterator, SomeSuperclass.class, "SomeSuperclass.png");
+ assertNext(iterator, SomeSuperclass.class, "SomeSuperclass.jpg");
+ assertNext(iterator, SomeSuperclass.class, "SomeSuperclass.jpeg");
+
+ assertNext(iterator, null, "SomeSubclass.png");
+ assertNext(iterator, null, "SomeSubclass.jpg");
+ assertNext(iterator, null, "SomeSubclass.jpeg");
+
+ assertNext(iterator, null, "SomeSuperclass.png");
+ assertNext(iterator, null, "SomeSuperclass.jpg");
+ assertNext(iterator, null, "SomeSuperclass.jpeg");
+
+ assertNext(iterator, null, "Default.png");
+ assertNext(iterator, null, "Default.jpg");
+ assertNext(iterator, null, "Default.jpeg");
+
+ }
+
+ @Test
+ public void withoutClass() throws Exception {
+ key = new ImageResourceCacheKey(null, "foo");
+
+ final List<ImageResourceCacheKey> keys = key.resourcePaths("png", "jpg", "jpeg");
+
+ final Iterator<ImageResourceCacheKey> iterator = keys.iterator();
+
+ assertNext(iterator, null, "foo.png");
+ assertNext(iterator, null, "foo.jpg");
+ assertNext(iterator, null, "foo.jpeg");
+
+ assertNext(iterator, null, "Default.png");
+ assertNext(iterator, null, "Default.jpg");
+ assertNext(iterator, null, "Default.jpeg");
+ }
+
+ /**
+ * This what we see for repositories (using <code></code>@DomainService(repositoryFor=...))
+ */
+ @Test
+ public void withoutClassButIconNameSpecifyingADifferentContextClassAndClassName() throws Exception {
+ key = new ImageResourceCacheKey(SomeOtherContextClass.class, SomeSuperclass.class.getName());
+
+ final List<ImageResourceCacheKey> keys = key.resourcePaths("png", "jpg", "jpeg");
+
+ final Iterator<ImageResourceCacheKey> iterator = keys.iterator();
+
+ assertNext(iterator, SomeSuperclass.class, "SomeSuperclass.png");
+ assertNext(iterator, SomeSuperclass.class, "SomeSuperclass.jpg");
+ assertNext(iterator, SomeSuperclass.class, "SomeSuperclass.jpeg");
+
+ assertNext(iterator, null, "Default.png");
+ assertNext(iterator, null, "Default.jpg");
+ assertNext(iterator, null, "Default.jpeg");
+
+ }
+
+ @Test
+ public void withoutClassButIconNameSpecifyingAClassName() throws Exception {
+ key = new ImageResourceCacheKey(null, SomeSuperclass.class.getName());
+
+ final List<ImageResourceCacheKey> keys = key.resourcePaths("png", "jpg", "jpeg");
+
+ final Iterator<ImageResourceCacheKey> iterator = keys.iterator();
+
+ assertNext(iterator, SomeSuperclass.class, "SomeSuperclass.png");
+ assertNext(iterator, SomeSuperclass.class, "SomeSuperclass.jpg");
+ assertNext(iterator, SomeSuperclass.class, "SomeSuperclass.jpeg");
+
+ assertNext(iterator, null, "Default.png");
+ assertNext(iterator, null, "Default.jpg");
+ assertNext(iterator, null, "Default.jpeg");
+
+ }
+
+ private static void assertNext(Iterator<ImageResourceCacheKey> iterator, Class<?> resourceClass, String resourceName) {
+ assertThat(iterator.hasNext(), is(true));
+ final ImageResourceCacheKey next = iterator.next();
+ assertEquals(resourceClass, next.getResourceClass());
+ assertEquals(resourceName, next.getResourceName());
+ }
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/7c9274b0/component/viewer/wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/imagecache/KeyTest.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/imagecache/KeyTest.java b/component/viewer/wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/imagecache/KeyTest.java
deleted file mode 100644
index f5118fc..0000000
--- a/component/viewer/wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/imagecache/KeyTest.java
+++ /dev/null
@@ -1,162 +0,0 @@
-package org.apache.isis.viewer.wicket.viewer.imagecache;
-
-import java.util.Iterator;
-import java.util.List;
-import org.junit.Test;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.*;
-
-public class KeyTest {
-
- ImageResourceCacheClassPath.Key key;
-
- public static class SomeSuperclass {
-
- }
-
- public static class SomeSubclass extends SomeSuperclass {
-
- }
-
-
- public static class SuperKey extends KeyTest {
-
- @Test
- public void whenSubclass() throws Exception {
-
- key = new ImageResourceCacheClassPath.Key(SomeSubclass.class, "foo");
- final ImageResourceCacheClassPath.Key superKey = key.superKey();
-
- assertEquals(SomeSuperclass.class, superKey.getResourceClass());
- assertEquals("foo", key.getResourceName());
- }
-
- @Test
- public void whenSuperClass() throws Exception {
-
- key = new ImageResourceCacheClassPath.Key(SomeSuperclass.class, null);
- final ImageResourceCacheClassPath.Key superKey = key.superKey();
-
- assertNull(superKey);
- }
-
- }
-
- public static class ResourcePaths extends KeyTest {
-
- @Test
- public void withIconName() throws Exception {
- key = new ImageResourceCacheClassPath.Key(SomeSubclass.class, "foo");
-
- final List<ImageResourceCacheClassPath.Key> keys = key.resourcePaths("png", "jpg", "jpeg");
-
- final Iterator<ImageResourceCacheClassPath.Key> iterator = keys.iterator();
-
- assertNext(iterator, SomeSubclass.class, "SomeSubclass-foo.png");
- assertNext(iterator, SomeSubclass.class, "SomeSubclass-foo.jpg");
- assertNext(iterator, SomeSubclass.class, "SomeSubclass-foo.jpeg");
-
- assertNext(iterator, SomeSubclass.class, "foo.png");
- assertNext(iterator, SomeSubclass.class, "foo.jpg");
- assertNext(iterator, SomeSubclass.class, "foo.jpeg");
-
- assertNext(iterator, SomeSuperclass.class, "SomeSuperclass-foo.png");
- assertNext(iterator, SomeSuperclass.class, "SomeSuperclass-foo.jpg");
- assertNext(iterator, SomeSuperclass.class, "SomeSuperclass-foo.jpeg");
-
- assertNext(iterator, SomeSuperclass.class, "foo.png");
- assertNext(iterator, SomeSuperclass.class, "foo.jpg");
- assertNext(iterator, SomeSuperclass.class, "foo.jpeg");
-
- assertNext(iterator, null, "SomeSubclass-foo.png");
- assertNext(iterator, null, "SomeSubclass-foo.jpg");
- assertNext(iterator, null, "SomeSubclass-foo.jpeg");
-
- assertNext(iterator, null, "SomeSuperclass-foo.png");
- assertNext(iterator, null, "SomeSuperclass-foo.jpg");
- assertNext(iterator, null, "SomeSuperclass-foo.jpeg");
-
- assertNext(iterator, null, "foo.png");
- assertNext(iterator, null, "foo.jpg");
- assertNext(iterator, null, "foo.jpeg");
-
- assertNext(iterator, SomeSubclass.class, "SomeSubclass.png");
- assertNext(iterator, SomeSubclass.class, "SomeSubclass.jpg");
- assertNext(iterator, SomeSubclass.class, "SomeSubclass.jpeg");
-
- assertNext(iterator, SomeSuperclass.class, "SomeSuperclass.png");
- assertNext(iterator, SomeSuperclass.class, "SomeSuperclass.jpg");
- assertNext(iterator, SomeSuperclass.class, "SomeSuperclass.jpeg");
-
- assertNext(iterator, null, "SomeSubclass.png");
- assertNext(iterator, null, "SomeSubclass.jpg");
- assertNext(iterator, null, "SomeSubclass.jpeg");
-
- assertNext(iterator, null, "SomeSuperclass.png");
- assertNext(iterator, null, "SomeSuperclass.jpg");
- assertNext(iterator, null, "SomeSuperclass.jpeg");
-
- assertNext(iterator, null, "Default.png");
- assertNext(iterator, null, "Default.jpg");
- assertNext(iterator, null, "Default.jpeg");
-
- }
-
- @Test
- public void withoutIconName() throws Exception {
- key = new ImageResourceCacheClassPath.Key(SomeSubclass.class, null);
-
- final List<ImageResourceCacheClassPath.Key> keys = key.resourcePaths("png", "jpg", "jpeg");
-
- final Iterator<ImageResourceCacheClassPath.Key> iterator = keys.iterator();
-
- assertNext(iterator, SomeSubclass.class, "SomeSubclass.png");
- assertNext(iterator, SomeSubclass.class, "SomeSubclass.jpg");
- assertNext(iterator, SomeSubclass.class, "SomeSubclass.jpeg");
-
- assertNext(iterator, SomeSuperclass.class, "SomeSuperclass.png");
- assertNext(iterator, SomeSuperclass.class, "SomeSuperclass.jpg");
- assertNext(iterator, SomeSuperclass.class, "SomeSuperclass.jpeg");
-
- assertNext(iterator, null, "SomeSubclass.png");
- assertNext(iterator, null, "SomeSubclass.jpg");
- assertNext(iterator, null, "SomeSubclass.jpeg");
-
- assertNext(iterator, null, "SomeSuperclass.png");
- assertNext(iterator, null, "SomeSuperclass.jpg");
- assertNext(iterator, null, "SomeSuperclass.jpeg");
-
- assertNext(iterator, null, "Default.png");
- assertNext(iterator, null, "Default.jpg");
- assertNext(iterator, null, "Default.jpeg");
-
- }
-
- @Test
- public void withoutClass() throws Exception {
- key = new ImageResourceCacheClassPath.Key(null, "foo");
-
- final List<ImageResourceCacheClassPath.Key> keys = key.resourcePaths("png", "jpg", "jpeg");
-
- final Iterator<ImageResourceCacheClassPath.Key> iterator = keys.iterator();
-
- assertNext(iterator, null, "foo.png");
- assertNext(iterator, null, "foo.jpg");
- assertNext(iterator, null, "foo.jpeg");
-
- assertNext(iterator, null, "Default.png");
- assertNext(iterator, null, "Default.jpg");
- assertNext(iterator, null, "Default.jpeg");
-
- }
-
- private static void assertNext(Iterator<ImageResourceCacheClassPath.Key> iterator, Class<?> resourceClass, String resourceName) {
- assertThat(iterator.hasNext(), is(true));
- final ImageResourceCacheClassPath.Key next = iterator.next();
- assertEquals(resourceClass, next.getResourceClass());
- assertEquals(resourceName, next.getResourceName());
- }
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/7c9274b0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotationFactory.java
index 2bbb0c4..036ebd8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotationFactory.java
@@ -43,6 +43,12 @@ public class DomainServiceFacetAnnotationFactory extends FacetFactoryAbstract {
new DomainServiceFacetAnnotation(
processClassContext.getFacetHolder(),
annotation.menuOrder(), annotation.repositoryFor()));
+ if(annotation.repositoryFor() != null) {
+ FacetUtil.addFacet(
+ new IconFacetDerivedFromDomainServiceAnnotation(
+ processClassContext.getFacetHolder(),
+ annotation.repositoryFor()));
+ }
return;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/7c9274b0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/IconFacetDerivedFromDomainServiceAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/IconFacetDerivedFromDomainServiceAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/IconFacetDerivedFromDomainServiceAnnotation.java
new file mode 100644
index 0000000..41e561f
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/IconFacetDerivedFromDomainServiceAnnotation.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.isis.core.metamodel.facets.object.domainservice.annotation;
+
+
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facets.object.icon.IconFacetAbstract;
+
+
+public class IconFacetDerivedFromDomainServiceAnnotation extends IconFacetAbstract {
+
+ private final Class<?> repositoryFor;
+
+ public IconFacetDerivedFromDomainServiceAnnotation(FacetHolder facetHolder, Class<?> repositoryFor) {
+ super(facetHolder);
+ this.repositoryFor = repositoryFor;
+ }
+
+ @Override
+ public String iconName(ObjectAdapter object) {
+ return repositoryFor.getName();
+ }
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/7c9274b0/example/application/simpleapp/dom/src/main/java/dom/simple/SimpleObjects.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/src/main/java/dom/simple/SimpleObjects.java b/example/application/simpleapp/dom/src/main/java/dom/simple/SimpleObjects.java
index 0197445..b3faaf0 100644
--- a/example/application/simpleapp/dom/src/main/java/dom/simple/SimpleObjects.java
+++ b/example/application/simpleapp/dom/src/main/java/dom/simple/SimpleObjects.java
@@ -31,18 +31,6 @@ import org.apache.isis.applib.annotation.Named;
@DomainService(menuOrder = "10", repositoryFor = SimpleObject.class)
public class SimpleObjects {
- //region > identification in the UI
-
- public String getId() {
- return "simple";
- }
-
- public String iconName() {
- return "SimpleObject";
- }
-
- //endregion
-
//region > listAll (action)
@Bookmarkable
http://git-wip-us.apache.org/repos/asf/isis/blob/7c9274b0/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItems.java
----------------------------------------------------------------------
diff --git a/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItems.java b/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItems.java
index 2cb6c9f..b4f8428 100644
--- a/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItems.java
+++ b/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItems.java
@@ -35,16 +35,6 @@ import org.apache.isis.applib.services.clock.ClockService;
@DomainService(menuOrder = "10", repositoryFor = ToDoItem.class)
public class ToDoItems {
- //region > identification in the UI
- public String getId() {
- return "toDoItems";
- }
-
- public String iconName() {
- return "ToDoItem";
- }
- //endregion
-
//region > notYetComplete (action)
@Bookmarkable
@ActionSemantics(Of.SAFE)