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/30 04:18:25 UTC
[isis] 04/06: ISIS-1976: move ObjectAdapter.getIconName() up the
hierarchy
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 53cb555c802f3bb09a04354ffae08d5e60b3478d
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Sep 30 05:11:47 2018 +0200
ISIS-1976: move ObjectAdapter.getIconName() up the hierarchy
Task-Url: https://issues.apache.org/jira/browse/ISIS-1976
---
.../isis/core/metamodel/adapter/ObjectAdapter.java | 9 ---------
.../apache/isis/core/metamodel/spec/ManagedObject.java | 17 ++++++++++++++++-
.../core/runtime/persistence/adapter/PojoAdapter.java | 14 --------------
3 files changed, 16 insertions(+), 24 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
index fcbd15e..b8581c2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
@@ -54,15 +54,6 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
public interface ObjectAdapter extends ManagedObject {
/**
- * Returns the name of an icon to use if this object is to be displayed
- * graphically.
- *
- * <p>
- * May return <code>null</code> if no icon is specified.
- */
- String getIconName();
-
- /**
* Checks the version of this adapter to make sure that it does not differ
* from the specified version.
*
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObject.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObject.java
index 101c21c..1409ff9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObject.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObject.java
@@ -111,7 +111,7 @@ public interface ManagedObject {
}
- // -- COLLECTION SUPPORT
+ // -- SHORTCUT - ELEMENT SPECIFICATION
/**
* Used only for (standalone or parented) collections.
@@ -123,6 +123,21 @@ public interface ManagedObject {
return getSpecification().getElementSpecification();
}
+ // -- SHORTCUT - ICON NAME
+
+ /**
+ * Returns the name of an icon to use if this object is to be displayed
+ * graphically.
+ * <p>
+ * May return <code>null</code> if no icon is specified.
+ * @deprecated use {@link ObjectSpecification#getIconName(ManagedObject))} instead,
+ * (proposed for removal, to keep the API slim)
+ */
+ @Deprecated
+ default public String getIconName() {
+ return getSpecification().getIconName(this);
+ }
+
// -- FACTORIES
public static ManagedObject of(
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
index 9b87fdc..180e4de 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
@@ -92,9 +92,6 @@ public final class PojoAdapter implements ObjectAdapter {
final _Lazy<ObjectSpecification> objectSpecification = _Lazy.of(this::loadSpecification);
- /**
- * Downcasts {@link #getSpecification()}.
- */
@Override
public ObjectSpecification getSpecification() {
return objectSpecification.get();
@@ -255,15 +252,4 @@ public final class PojoAdapter implements ObjectAdapter {
return "S"; // standalone adapter (value)
}
- // -- iconName
-
- /**
- * Returns the name of the icon to use to represent this object.
- */
- @Override
- public String getIconName() {
- return getSpecification().getIconName(this);
- }
-
-
}