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/09 22:58:37 UTC
git commit: ISIS-809: removing constraint from
DomainObjectContainer#newViewModelInstance().
Repository: isis
Updated Branches:
refs/heads/master ae3e39a67 -> 81c34b3be
ISIS-809: removing <T extends ViewModel> constraint from DomainObjectContainer#newViewModelInstance().
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/81c34b3b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/81c34b3b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/81c34b3b
Branch: refs/heads/master
Commit: 81c34b3be57052f75179e6191578ec3190bb8f64
Parents: ae3e39a
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Oct 9 21:58:18 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Oct 9 21:58:18 2014 +0100
----------------------------------------------------------------------
.../java/org/apache/isis/applib/DomainObjectContainer.java | 6 +++---
.../services/container/DomainObjectContainerDefault.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/81c34b3b/core/applib/src/main/java/org/apache/isis/applib/DomainObjectContainer.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/DomainObjectContainer.java b/core/applib/src/main/java/org/apache/isis/applib/DomainObjectContainer.java
index ff30c98..4f5e1ae 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/DomainObjectContainer.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/DomainObjectContainer.java
@@ -171,8 +171,8 @@ public interface DomainObjectContainer {
/**
- * Create a new instance of the specified {@link ViewModel} class, initializing with the
- * specified {@link ViewModel#viewModelMemento() memento}.
+ * Create a new instance of the specified view model class, initializing with the
+ * specified memento.
*
* <p>
* Rather than use this constructor it is generally preferable to simply instantiate a
@@ -181,7 +181,7 @@ public interface DomainObjectContainer {
* </p>
*/
@Programmatic
- <T extends ViewModel> T newViewModelInstance(final Class<T> ofType, final String memento);
+ <T> T newViewModelInstance(final Class<T> ofType, final String memento);
/**
* Create a new instance that will be persisted as part of the specified
http://git-wip-us.apache.org/repos/asf/isis/blob/81c34b3b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
index 68d9f25..8df17d1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
@@ -93,7 +93,7 @@ public class DomainObjectContainerDefault implements DomainObjectContainer, Que
@Programmatic
@SuppressWarnings("unchecked")
@Override
- public <T extends ViewModel> T newViewModelInstance(Class<T> ofClass, String memento) {
+ public <T> T newViewModelInstance(Class<T> ofClass, String memento) {
final ObjectSpecification spec = getSpecificationLookup().loadSpecification(ofClass);
if (!spec.containsFacet(ViewModelFacet.class)) {
throw new IsisException("Type must be a ViewModel: " + ofClass);