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 2012/07/19 23:18:42 UTC
svn commit: r1363551 - in /incubator/isis/trunk/framework:
core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/
runtimes/dflt/objectstores/jdo/jdo-metamodel/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/...
Author: danhaywood
Date: Thu Jul 19 21:18:41 2012
New Revision: 1363551
URL: http://svn.apache.org/viewvc?rev=1363551&view=rev
Log:
ISIS-14: working on the optimistic locking stuff
Modified:
incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/facets/object/version/GivenJdoVersionAnnotationFacetFactoryTest.java
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java?rev=1363551&r1=1363550&r2=1363551&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java Thu Jul 19 21:18:41 2012
@@ -24,6 +24,7 @@ import static org.hamcrest.CoreMatchers.
import static org.hamcrest.CoreMatchers.notNullValue;
import java.lang.reflect.Method;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -346,7 +347,8 @@ public class FacetProcessor implements R
private List<FacetFactory> getFactoryListByFeatureType(final FeatureType featureType) {
cacheByFeatureTypeIfRequired();
- return factoryListByFeatureType.get(featureType);
+ List<FacetFactory> list = factoryListByFeatureType.get(featureType);
+ return list != null? list: Collections.<FacetFactory>emptyList();
}
private void clearCaches() {
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/facets/object/version/GivenJdoVersionAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/facets/object/version/GivenJdoVersionAnnotationFacetFactoryTest.java?rev=1363551&r1=1363550&r2=1363551&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/facets/object/version/GivenJdoVersionAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/facets/object/version/GivenJdoVersionAnnotationFacetFactoryTest.java Thu Jul 19 21:18:41 2012
@@ -71,7 +71,7 @@ public class GivenJdoVersionAnnotationFa
public void testFeatureTypes() {
final List<FeatureType> featureTypes = facetFactory.getFeatureTypes();
- assertTrue(contains(featureTypes, FeatureType.OBJECT));
+ assertTrue(contains(featureTypes, FeatureType.OBJECT_POST_PROCESSING));
assertFalse(contains(featureTypes, FeatureType.PROPERTY));
assertFalse(contains(featureTypes, FeatureType.COLLECTION));
assertFalse(contains(featureTypes, FeatureType.ACTION));