Updated Branches: refs/heads/master 396f4c02a -> df2b75512
ISIS-285, ISIS-188: updating archetype, backing out fail-fast change * quickstart_wicket_restful_jdo archetype updated in line with ISIS-285 * backing out Rob's "fail-fast" change (3ef112336e90d18f77142ba118527db17342fffd) on loading of ObjectSpecs, this is incompatible with Wicket viewer. Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/df2b7551 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/df2b7551 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/df2b7551 Branch: refs/heads/master Commit: df2b7551223c8348426cf4b103bb02098493324a Parents: 396f4c0 Author: Dan Haywood <[email protected]> Authored: Thu Dec 20 20:21:06 2012 +0000 Committer: Dan Haywood <[email protected]> Committed: Thu Dec 20 20:21:06 2012 +0000 ---------------------------------------------------------------------- .../specloader/ObjectReflectorDefault.java | 6 +----- .../dom/src/main/java/dom/todo/ToDoItem.java | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/df2b7551/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java index 67f89e2..b2ce2ef 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java @@ -506,11 +506,7 @@ public final class ObjectReflectorDefault implements SpecificationLoaderSpi, App @Override public ObjectSpecification lookupBySpecId(ObjectSpecId objectSpecId) { - ObjectSpecification specification = getCache().getByObjectType(objectSpecId); - if (specification == null) { - throw new IsisException("Could not load specification for " + objectSpecId.asString()); - } - return specification; + return getCache().getByObjectType(objectSpecId); } http://git-wip-us.apache.org/repos/asf/isis/blob/df2b7551/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java ---------------------------------------------------------------------- diff --git a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java index 7b639f3..ebe8a6f 100644 --- a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java +++ b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java @@ -281,7 +281,7 @@ public class ToDoItem implements Comparable<ToDoItem> { getDependencies().remove(toDoItem); return this; } - public String disableRemove() { + public String disableRemove(final ToDoItem toDoItem) { return getDependencies().isEmpty()? "No dependencies to remove": null; } public String validateRemove(final ToDoItem toDoItem) {
