isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1379956 [4/4] - in /incubator/isis/trunk/framework: applib/src/main/java/org/apache/isis/applib/annotation/ applib/src/main/java/org/apache/isis/applib/util/ applib/src/test/java/org/apache/isis/applib/util/ core/commons/src/main/java/org/...
Date Sun, 02 Sep 2012 12:14:52 GMT
Modified: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableMarkerInterfaceFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableMarkerInterfaceFacetFactoryTest.java?rev=1379956&r1=1379955&r2=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableMarkerInterfaceFacetFactoryTest.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableMarkerInterfaceFacetFactoryTest.java Sun Sep  2 12:14:46 2012
@@ -19,6 +19,7 @@
 
 package org.apache.isis.core.progmodel.facets.object.notpersistable;
 
+import org.apache.isis.applib.annotation.NotPersistable;
 import org.apache.isis.applib.marker.NonPersistable;
 import org.apache.isis.applib.marker.ProgramPersistable;
 import org.apache.isis.core.metamodel.facetapi.Facet;
@@ -53,8 +54,8 @@ public class NotPersistableMarkerInterfa
         assertNotNull(facet);
         assertTrue(facet instanceof NotPersistableFacetMarkerInterface);
         final NotPersistableFacetMarkerInterface notPersistableFacetMarkerInterface = (NotPersistableFacetMarkerInterface) facet;
-        final org.apache.isis.core.metamodel.facets.object.notpersistable.InitiatedBy value = notPersistableFacetMarkerInterface.value();
-        assertEquals(org.apache.isis.core.metamodel.facets.object.notpersistable.InitiatedBy.USER, value);
+        final NotPersistable.By value = notPersistableFacetMarkerInterface.value();
+        assertEquals(NotPersistable.By.USER, value);
 
         assertNoMethodsRemoved();
     }
@@ -69,8 +70,8 @@ public class NotPersistableMarkerInterfa
         assertNotNull(facet);
         assertTrue(facet instanceof NotPersistableFacetMarkerInterface);
         final NotPersistableFacetMarkerInterface notPersistableFacetMarkerInterface = (NotPersistableFacetMarkerInterface) facet;
-        final org.apache.isis.core.metamodel.facets.object.notpersistable.InitiatedBy value = notPersistableFacetMarkerInterface.value();
-        assertEquals(org.apache.isis.core.metamodel.facets.object.notpersistable.InitiatedBy.USER_OR_PROGRAM, value);
+        final NotPersistable.By value = notPersistableFacetMarkerInterface.value();
+        assertEquals(NotPersistable.By.USER_OR_PROGRAM, value);
 
         assertNoMethodsRemoved();
     }

Modified: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/properties/PropertyMethodsFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/properties/PropertyMethodsFacetFactoryTest.java?rev=1379956&r1=1379955&r2=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/properties/PropertyMethodsFacetFactoryTest.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/properties/PropertyMethodsFacetFactoryTest.java Sun Sep  2 12:14:46 2012
@@ -44,7 +44,7 @@ import org.apache.isis.core.progmodel.fa
 import org.apache.isis.core.progmodel.facets.members.disable.forsession.DisabledFacetViaDisableForSessionMethodFacetFactory;
 import org.apache.isis.core.progmodel.facets.members.disable.method.DisableForContextFacetViaMethod;
 import org.apache.isis.core.progmodel.facets.members.disable.method.DisabledFacetViaDisableMethodFacetFactory;
-import org.apache.isis.core.progmodel.facets.members.disable.staticmethod.DisabledFacetAlways;
+import org.apache.isis.core.progmodel.facets.members.disable.staticmethod.DisabledFacetAlwaysEverywhere;
 import org.apache.isis.core.progmodel.facets.members.disable.staticmethod.DisabledFacetViaProtectMethodFacetFactory;
 import org.apache.isis.core.progmodel.facets.members.hide.HideForContextFacet;
 import org.apache.isis.core.progmodel.facets.members.hide.HideForSessionFacet;
@@ -52,7 +52,7 @@ import org.apache.isis.core.progmodel.fa
 import org.apache.isis.core.progmodel.facets.members.hide.forsession.HideForSessionFacetViaMethod;
 import org.apache.isis.core.progmodel.facets.members.hide.method.HiddenFacetViaHideMethodFacetFactory;
 import org.apache.isis.core.progmodel.facets.members.hide.method.HideForContextFacetViaMethod;
-import org.apache.isis.core.progmodel.facets.members.hide.staticmethod.HiddenFacetAlways;
+import org.apache.isis.core.progmodel.facets.members.hide.staticmethod.HiddenFacetAlwaysEverywhere;
 import org.apache.isis.core.progmodel.facets.members.hide.staticmethod.HiddenFacetViaAlwaysHideMethodFacetFactory;
 import org.apache.isis.core.progmodel.facets.members.named.staticmethod.NamedFacetViaMethod;
 import org.apache.isis.core.progmodel.facets.members.named.staticmethod.NamedFacetViaNameMethodFacetFactory;
@@ -238,7 +238,7 @@ public class PropertyMethodsFacetFactory
 
         facet = facetedMethod.getFacet(DisabledFacet.class);
         assertNotNull(facet);
-        assertTrue(facet instanceof DisabledFacetAlways);
+        assertTrue(facet instanceof DisabledFacetAlwaysEverywhere);
     }
 
     public void testIfHaveSetterAndModifyFacetThenTheModifyFacetWinsOut() {
@@ -707,7 +707,7 @@ public class PropertyMethodsFacetFactory
 
         final Facet facet = facetedMethod.getFacet(HiddenFacet.class);
         assertNotNull(facet);
-        assertTrue(facet instanceof HiddenFacetAlways);
+        assertTrue(facet instanceof HiddenFacetAlwaysEverywhere);
 
         assertTrue(methodRemover.getRemovedMethodMethodCalls().contains(propertyAlwaysHideMethod));
     }
@@ -737,7 +737,7 @@ public class PropertyMethodsFacetFactory
 
         final Facet facet = facetedMethod.getFacet(DisabledFacet.class);
         assertNotNull(facet);
-        assertTrue(facet instanceof DisabledFacetAlways);
+        assertTrue(facet instanceof DisabledFacetAlwaysEverywhere);
 
         assertTrue(methodRemover.getRemovedMethodMethodCalls().contains(propertyProtectMethod));
     }

Modified: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/BigDecimalValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/BigDecimalValueSemanticsProviderTest.java?rev=1379956&r1=1379955&r2=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/BigDecimalValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/BigDecimalValueSemanticsProviderTest.java Sun Sep  2 12:14:46 2012
@@ -25,10 +25,8 @@ import static org.junit.Assert.fail;
 import java.math.BigDecimal;
 
 import org.jmock.Expectations;
-import org.jmock.integration.junit4.JMock;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import org.apache.isis.applib.profiles.Localization;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;

Modified: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/BigIntValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/BigIntValueSemanticsProviderTest.java?rev=1379956&r1=1379955&r2=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/BigIntValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/BigIntValueSemanticsProviderTest.java Sun Sep  2 12:14:46 2012
@@ -25,10 +25,8 @@ import static org.junit.Assert.fail;
 import java.math.BigInteger;
 
 import org.jmock.Expectations;
-import org.jmock.integration.junit4.JMock;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import org.apache.isis.applib.profiles.Localization;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;

Modified: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/BooleanValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/BooleanValueSemanticsProviderTest.java?rev=1379956&r1=1379955&r2=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/BooleanValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/BooleanValueSemanticsProviderTest.java Sun Sep  2 12:14:46 2012
@@ -22,10 +22,8 @@ package org.apache.isis.core.progmodel.f
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
-import org.jmock.integration.junit4.JMock;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import org.apache.isis.applib.profiles.Localization;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;

Modified: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ByteValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ByteValueSemanticsProviderTest.java?rev=1379956&r1=1379955&r2=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ByteValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ByteValueSemanticsProviderTest.java Sun Sep  2 12:14:46 2012
@@ -23,10 +23,8 @@ import static org.junit.Assert.assertEqu
 import static org.junit.Assert.fail;
 
 import org.jmock.Expectations;
-import org.jmock.integration.junit4.JMock;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import org.apache.isis.applib.profiles.Localization;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;

Modified: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/CharacterValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/CharacterValueSemanticsProviderTest.java?rev=1379956&r1=1379955&r2=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/CharacterValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/CharacterValueSemanticsProviderTest.java Sun Sep  2 12:14:46 2012
@@ -22,10 +22,8 @@ package org.apache.isis.core.progmodel.f
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
-import org.jmock.integration.junit4.JMock;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import org.apache.isis.applib.profiles.Localization;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;

Modified: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ColorValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ColorValueSemanticsProviderTest.java?rev=1379956&r1=1379955&r2=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ColorValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ColorValueSemanticsProviderTest.java Sun Sep  2 12:14:46 2012
@@ -22,10 +22,8 @@ package org.apache.isis.core.progmodel.f
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
-import org.jmock.integration.junit4.JMock;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import org.apache.isis.applib.profiles.Localization;
 import org.apache.isis.applib.value.Color;

Modified: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/DateTimeValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/DateTimeValueSemanticsProviderTest.java?rev=1379956&r1=1379955&r2=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/DateTimeValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/DateTimeValueSemanticsProviderTest.java Sun Sep  2 12:14:46 2012
@@ -23,10 +23,8 @@ import static org.junit.Assert.assertEqu
 import static org.junit.Assert.assertNull;
 
 import org.jmock.Expectations;
-import org.jmock.integration.junit4.JMock;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import org.apache.isis.applib.value.DateTime;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;

Modified: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/DateValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/DateValueSemanticsProviderTest.java?rev=1379956&r1=1379955&r2=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/DateValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/DateValueSemanticsProviderTest.java Sun Sep  2 12:14:46 2012
@@ -23,10 +23,8 @@ import static org.junit.Assert.assertEqu
 import static org.junit.Assert.fail;
 
 import org.jmock.Expectations;
-import org.jmock.integration.junit4.JMock;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import org.apache.isis.applib.adapters.EncodingException;
 import org.apache.isis.applib.value.Date;

Modified: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/DoubleValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/DoubleValueSemanticsProviderTest.java?rev=1379956&r1=1379955&r2=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/DoubleValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/DoubleValueSemanticsProviderTest.java Sun Sep  2 12:14:46 2012
@@ -23,10 +23,8 @@ import static org.junit.Assert.assertEqu
 import static org.junit.Assert.fail;
 
 import org.jmock.Expectations;
-import org.jmock.integration.junit4.JMock;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import org.apache.isis.applib.profiles.Localization;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;

Modified: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/FloatValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/FloatValueSemanticsProviderTest.java?rev=1379956&r1=1379955&r2=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/FloatValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/FloatValueSemanticsProviderTest.java Sun Sep  2 12:14:46 2012
@@ -23,10 +23,8 @@ import static org.junit.Assert.assertEqu
 import static org.junit.Assert.fail;
 
 import org.jmock.Expectations;
-import org.jmock.integration.junit4.JMock;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import org.apache.isis.applib.profiles.Localization;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;

Modified: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/IntValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/IntValueSemanticsProviderTest.java?rev=1379956&r1=1379955&r2=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/IntValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/IntValueSemanticsProviderTest.java Sun Sep  2 12:14:46 2012
@@ -23,10 +23,8 @@ import static org.junit.Assert.assertEqu
 import static org.junit.Assert.fail;
 
 import org.jmock.Expectations;
-import org.jmock.integration.junit4.JMock;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import org.apache.isis.applib.profiles.Localization;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;

Modified: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java?rev=1379956&r1=1379955&r2=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java Sun Sep  2 12:14:46 2012
@@ -27,10 +27,8 @@ import java.util.Calendar;
 import java.util.TimeZone;
 
 import org.jmock.Expectations;
-import org.jmock.integration.junit4.JMock;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import org.apache.isis.applib.profiles.Localization;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;

Modified: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/JavaSqlTimeStampValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/JavaSqlTimeStampValueSemanticsProviderTest.java?rev=1379956&r1=1379955&r2=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/JavaSqlTimeStampValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/JavaSqlTimeStampValueSemanticsProviderTest.java Sun Sep  2 12:14:46 2012
@@ -25,10 +25,8 @@ import static org.junit.Assert.assertNul
 import java.sql.Timestamp;
 
 import org.jmock.Expectations;
-import org.jmock.integration.junit4.JMock;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;

Modified: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java?rev=1379956&r1=1379955&r2=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java Sun Sep  2 12:14:46 2012
@@ -25,10 +25,8 @@ import java.sql.Time;
 import java.util.Calendar;
 
 import org.jmock.Expectations;
-import org.jmock.integration.junit4.JMock;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;

Modified: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/LongValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/LongValueSemanticsProviderTest.java?rev=1379956&r1=1379955&r2=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/LongValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/LongValueSemanticsProviderTest.java Sun Sep  2 12:14:46 2012
@@ -23,10 +23,8 @@ import static org.junit.Assert.assertEqu
 import static org.junit.Assert.fail;
 
 import org.jmock.Expectations;
-import org.jmock.integration.junit4.JMock;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import org.apache.isis.applib.profiles.Localization;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;

Modified: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/MoneyValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/MoneyValueSemanticsProviderTest.java?rev=1379956&r1=1379955&r2=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/MoneyValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/MoneyValueSemanticsProviderTest.java Sun Sep  2 12:14:46 2012
@@ -24,10 +24,8 @@ import static org.junit.Assert.fail;
 
 import java.util.Locale;
 
-import org.jmock.integration.junit4.JMock;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import org.apache.isis.applib.profiles.Localization;
 import org.apache.isis.applib.value.Money;

Modified: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/PasswordValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/PasswordValueSemanticsProviderTest.java?rev=1379956&r1=1379955&r2=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/PasswordValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/PasswordValueSemanticsProviderTest.java Sun Sep  2 12:14:46 2012
@@ -21,10 +21,8 @@ package org.apache.isis.core.progmodel.f
 
 import static org.junit.Assert.assertEquals;
 
-import org.jmock.integration.junit4.JMock;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import org.apache.isis.applib.value.Password;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;

Modified: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/PercentageValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/PercentageValueSemanticsProviderTest.java?rev=1379956&r1=1379955&r2=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/PercentageValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/PercentageValueSemanticsProviderTest.java Sun Sep  2 12:14:46 2012
@@ -22,10 +22,8 @@ package org.apache.isis.core.progmodel.f
 import static org.junit.Assert.assertEquals;
 
 import org.jmock.Expectations;
-import org.jmock.integration.junit4.JMock;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import org.apache.isis.applib.profiles.Localization;
 import org.apache.isis.applib.value.Percentage;

Modified: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ShortValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ShortValueSemanticsProviderTest.java?rev=1379956&r1=1379955&r2=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ShortValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ShortValueSemanticsProviderTest.java Sun Sep  2 12:14:46 2012
@@ -23,10 +23,8 @@ import static org.junit.Assert.assertEqu
 import static org.junit.Assert.fail;
 
 import org.jmock.Expectations;
-import org.jmock.integration.junit4.JMock;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import org.apache.isis.applib.profiles.Localization;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;

Modified: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/StringValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/StringValueSemanticsProviderTest.java?rev=1379956&r1=1379955&r2=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/StringValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/StringValueSemanticsProviderTest.java Sun Sep  2 12:14:46 2012
@@ -21,10 +21,8 @@ package org.apache.isis.core.progmodel.f
 
 import static org.junit.Assert.assertEquals;
 
-import org.jmock.integration.junit4.JMock;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import org.apache.isis.applib.profiles.Localization;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;

Modified: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/TimeStampValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/TimeStampValueSemanticsProviderTest.java?rev=1379956&r1=1379955&r2=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/TimeStampValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/TimeStampValueSemanticsProviderTest.java Sun Sep  2 12:14:46 2012
@@ -23,10 +23,8 @@ import static org.junit.Assert.assertEqu
 import static org.junit.Assert.assertNull;
 
 import org.jmock.Expectations;
-import org.jmock.integration.junit4.JMock;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import org.apache.isis.applib.value.TimeStamp;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;

Modified: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/TimeValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/TimeValueSemanticsProviderTest.java?rev=1379956&r1=1379955&r2=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/TimeValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/TimeValueSemanticsProviderTest.java Sun Sep  2 12:14:46 2012
@@ -23,11 +23,9 @@ import static org.junit.Assert.assertEqu
 import static org.junit.Assert.fail;
 
 import org.jmock.Expectations;
-import org.jmock.integration.junit4.JMock;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import org.apache.isis.applib.adapters.EncodingException;
 import org.apache.isis.applib.value.Time;

Modified: incubator/isis/trunk/framework/progmodels/dflt/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/progmodels/dflt/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java?rev=1379956&r1=1379955&r2=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/progmodels/dflt/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java (original)
+++ incubator/isis/trunk/framework/progmodels/dflt/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java Sun Sep  2 12:14:46 2012
@@ -22,16 +22,16 @@ package org.apache.isis.progmodels.dflt;
 import org.apache.isis.core.metamodel.progmodel.ProgrammingModelAbstract;
 import org.apache.isis.core.progmodel.facets.actions.debug.annotation.DebugAnnotationFacetFactory;
 import org.apache.isis.core.progmodel.facets.actions.defaults.method.ActionDefaultsFacetFactory;
-import org.apache.isis.core.progmodel.facets.actions.executed.annotation.ExecutedAnnotationFacetFactory;
-import org.apache.isis.core.progmodel.facets.actions.executed.prefix.ExecutedViaNamingConventionFacetFactory;
 import org.apache.isis.core.progmodel.facets.actions.exploration.annotation.ExplorationAnnotationFacetFactory;
-import org.apache.isis.core.progmodel.facets.actions.idempotent.IdempotentAnnotationFacetFactory;
 import org.apache.isis.core.progmodel.facets.actions.invoke.ActionInvocationFacetFactory;
 import org.apache.isis.core.progmodel.facets.actions.notcontributed.annotation.NotContributedAnnotationFacetFactory;
 import org.apache.isis.core.progmodel.facets.actions.notinservicemenu.annotation.NotInServiceMenuAnnotationFacetFactory;
 import org.apache.isis.core.progmodel.facets.actions.notinservicemenu.method.NotInServiceMenuMethodFacetFactory;
 import org.apache.isis.core.progmodel.facets.actions.prototype.annotation.PrototypeAnnotationFacetFactory;
-import org.apache.isis.core.progmodel.facets.actions.queryonly.QueryOnlyAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.actions.semantics.ActionSemanticsAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.actions.semantics.ActionSemanticsFallbackFacetFactory;
+import org.apache.isis.core.progmodel.facets.actions.semantics.IdempotentAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.actions.semantics.QueryOnlyAnnotationFacetFactory;
 import org.apache.isis.core.progmodel.facets.actions.typeof.annotation.TypeOfAnnotationForActionsFacetFactory;
 import org.apache.isis.core.progmodel.facets.actions.validate.method.ActionValidationFacetViaValidateMethodFacetFactory;
 import org.apache.isis.core.progmodel.facets.collections.accessor.CollectionAccessorFacetFactory;
@@ -241,6 +241,8 @@ public class ProgrammingModelFacetsJava5
         addFactory(ActionParameterDefaultsFacetFactory.class);
         addFactory(QueryOnlyAnnotationFacetFactory.class);
         addFactory(IdempotentAnnotationFacetFactory.class);
+        addFactory(ActionSemanticsAnnotationFacetFactory.class);
+        addFactory(ActionSemanticsFallbackFacetFactory.class);
 
         // members in general
         addFactory(NamedFacetViaNameMethodFacetFactory.class);
@@ -287,8 +289,6 @@ public class ProgrammingModelFacetsJava5
 
         addFactory(DisabledAnnotationFacetFactory.class);
         addFactory(EncodableAnnotationFacetFactory.class);
-        addFactory(ExecutedAnnotationFacetFactory.class);
-        addFactory(ExecutedViaNamingConventionFacetFactory.class);
         addFactory(ExplorationAnnotationFacetFactory.class);
         addFactory(PrototypeAnnotationFacetFactory.class);
         addFactory(NotContributedAnnotationFacetFactory.class);

Modified: incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/WrappedFactoryDefaultTest_wrappedObject_transient.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/WrappedFactoryDefaultTest_wrappedObject_transient.java?rev=1379956&r1=1379955&r2=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/WrappedFactoryDefaultTest_wrappedObject_transient.java (original)
+++ incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/WrappedFactoryDefaultTest_wrappedObject_transient.java Sun Sep  2 12:14:46 2012
@@ -51,7 +51,7 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
 import org.apache.isis.core.progmodel.facets.members.disable.DisabledFacet;
-import org.apache.isis.core.progmodel.facets.members.disable.staticmethod.DisabledFacetAlways;
+import org.apache.isis.core.progmodel.facets.members.disable.staticmethod.DisabledFacetAlwaysEverywhere;
 import org.apache.isis.core.progmodel.facets.properties.accessor.PropertyAccessorFacetViaAccessor;
 import org.apache.isis.core.progmodel.facets.properties.modify.PropertySetterFacetViaSetterMethod;
 import org.apache.isis.core.runtime.authentication.standard.SimpleSession;
@@ -169,7 +169,7 @@ public class WrappedFactoryDefaultTest_w
     public void shouldNotBeAbleToModifyProperty() {
 
         // given
-        final DisabledFacet disabledFacet = new DisabledFacetAlways(mockPasswordMember);
+        final DisabledFacet disabledFacet = new DisabledFacetAlwaysEverywhere(mockPasswordMember);
         facets = Arrays.asList((Facet)disabledFacet, new PropertySetterFacetViaSetterMethod(setPasswordMethod, mockPasswordMember));
 
         final Consent visibilityConsent = new Allow(new InteractionResult(new PropertyVisibilityEvent(employeeDO, null)));

Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/facets/prop/primarykey/DisabledFacetDerivedFromJdoPrimaryKeyAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/facets/prop/primarykey/DisabledFacetDerivedFromJdoPrimaryKeyAnnotation.java?rev=1379956&r1=1379955&r2=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/facets/prop/primarykey/DisabledFacetDerivedFromJdoPrimaryKeyAnnotation.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/facets/prop/primarykey/DisabledFacetDerivedFromJdoPrimaryKeyAnnotation.java Sun Sep  2 12:14:46 2012
@@ -18,8 +18,9 @@
  */
 package org.apache.isis.runtimes.dflt.objectstores.jdo.metamodel.facets.prop.primarykey;
 
+import org.apache.isis.applib.annotation.When;
+import org.apache.isis.applib.annotation.Where;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.When;
 import org.apache.isis.core.progmodel.facets.members.disable.DisabledFacetImpl;
 
 
@@ -29,7 +30,7 @@ import org.apache.isis.core.progmodel.fa
 public class DisabledFacetDerivedFromJdoPrimaryKeyAnnotation extends DisabledFacetImpl {
 
     public DisabledFacetDerivedFromJdoPrimaryKeyAnnotation(final FacetHolder holder) {
-        super(When.ALWAYS, holder);
+        super(When.ALWAYS, Where.EVERYWHERE, holder);
     }
 
 }

Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/system/ObjectMemberAbstractTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/system/ObjectMemberAbstractTest.java?rev=1379956&r1=1379955&r2=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/system/ObjectMemberAbstractTest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/system/ObjectMemberAbstractTest.java Sun Sep  2 12:14:46 2012
@@ -29,13 +29,14 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 
+import org.apache.isis.applib.annotation.When;
+import org.apache.isis.applib.annotation.Where;
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facets.FacetedMethod;
-import org.apache.isis.core.metamodel.facets.When;
 import org.apache.isis.core.metamodel.facets.describedas.DescribedAsFacetAbstract;
 import org.apache.isis.core.metamodel.facets.named.NamedFacetAbstract;
 import org.apache.isis.core.metamodel.interactions.PropertyUsabilityContext;
@@ -52,7 +53,7 @@ import org.apache.isis.core.progmodel.fa
 import org.apache.isis.core.progmodel.facets.members.hide.HiddenFacetNever;
 import org.apache.isis.core.progmodel.facets.members.hide.HideForContextFacetNone;
 import org.apache.isis.core.progmodel.facets.members.hide.HideForSessionFacetAbstract;
-import org.apache.isis.core.progmodel.facets.members.hide.staticmethod.HiddenFacetAlways;
+import org.apache.isis.core.progmodel.facets.members.hide.staticmethod.HiddenFacetAlwaysEverywhere;
 import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2;
 import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2.Mode;
 import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.transaction.PojoAdapterBuilder;
@@ -101,7 +102,7 @@ public class ObjectMemberAbstractTest {
     @Test
     public void testVisibleWhenHiddenFacetSetToAlways() {
         testMember.addFacet(new HideForContextFacetNone(testMember));
-        testMember.addFacet(new HiddenFacetAbstract(When.ALWAYS, testMember) {
+        testMember.addFacet(new HiddenFacetAbstract(When.ALWAYS, Where.EVERYWHERE, testMember) {
             @Override
             public String hiddenReason(final ObjectAdapter target) {
                 return null;
@@ -114,14 +115,14 @@ public class ObjectMemberAbstractTest {
     @Test
     public void testVisibleWhenTargetPersistentAndHiddenFacetSetToOncePersisted() {
         testMember.addFacet(new HideForContextFacetNone(testMember));
-        testMember.addFacet(new HiddenFacetImpl(When.ONCE_PERSISTED, testMember));
+        testMember.addFacet(new HiddenFacetImpl(When.ONCE_PERSISTED, Where.EVERYWHERE, testMember));
         assertFalse(testMember.isVisible(null, persistentAdapter).isAllowed());
     }
 
     @Test
     public void testVisibleWhenTargetPersistentAndHiddenFacetSetToUntilPersisted() {
         testMember.addFacet(new HideForContextFacetNone(testMember));
-        testMember.addFacet(new HiddenFacetImpl(When.UNTIL_PERSISTED, testMember));
+        testMember.addFacet(new HiddenFacetImpl(When.UNTIL_PERSISTED, Where.EVERYWHERE, testMember));
         final Consent visible = testMember.isVisible(null, persistentAdapter);
         assertTrue(visible.isAllowed());
     }
@@ -129,7 +130,7 @@ public class ObjectMemberAbstractTest {
     @Test
     public void testVisibleWhenTargetTransientAndHiddenFacetSetToUntilPersisted() {
         testMember.addFacet(new HideForContextFacetNone(testMember));
-        testMember.addFacet(new HiddenFacetImpl(When.UNTIL_PERSISTED, testMember));
+        testMember.addFacet(new HiddenFacetImpl(When.UNTIL_PERSISTED, Where.EVERYWHERE, testMember));
         
         final Consent visible = testMember.isVisible(null, transientAdapter);
         assertFalse(visible.isAllowed());
@@ -144,7 +145,7 @@ public class ObjectMemberAbstractTest {
 
     @Test
     public void testVisibleDeclaratively() {
-        testMember.addFacet(new HiddenFacetAlways(testMember) {
+        testMember.addFacet(new HiddenFacetAlwaysEverywhere(testMember) {
         });
         assertFalse(testMember.isVisible(null, persistentAdapter).isAllowed());
     }

Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/claimapp/employees/Employee.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/claimapp/employees/Employee.java?rev=1379956&r1=1379955&r2=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/claimapp/employees/Employee.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/claimapp/employees/Employee.java Sun Sep  2 12:14:46 2012
@@ -79,7 +79,7 @@ public class Employee extends AbstractDo
     private String password;
 
     @MemberOrder(sequence = "2")
-    @Disabled(When.ONCE_PERSISTED)
+    @Disabled(when = When.ONCE_PERSISTED)
     public String getPassword() {
         return password;
     }

Modified: incubator/isis/trunk/framework/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ObjectActionNoop.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ObjectActionNoop.java?rev=1379956&r1=1379955&r2=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ObjectActionNoop.java (original)
+++ incubator/isis/trunk/framework/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ObjectActionNoop.java Sun Sep  2 12:14:46 2012
@@ -22,6 +22,7 @@ package org.apache.isis.viewer.html.cont
 import java.util.List;
 
 import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.annotation.ActionSemantics;
 import org.apache.isis.applib.filter.Filter;
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -38,8 +39,6 @@ import org.apache.isis.core.metamodel.ru
 import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.core.metamodel.spec.Instance;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.Target;
-import org.apache.isis.core.metamodel.spec.feature.ActionSemantics;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
 
@@ -184,11 +183,6 @@ public class ObjectActionNoop implements
     }
 
     @Override
-    public Target getTarget() {
-        return null;
-    }
-
-    @Override
     public ActionType getType() {
         return null;
     }
@@ -310,8 +304,8 @@ public class ObjectActionNoop implements
     }
 
     @Override
-    public ActionSemantics getSemantics() {
-        return null;
+    public ActionSemantics.Of getSemantics() {
+        return ActionSemantics.Of.NON_IDEMPOTENT;
     }
 
 }

Modified: incubator/isis/trunk/framework/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/domain/Customer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/domain/Customer.java?rev=1379956&r1=1379955&r2=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/domain/Customer.java (original)
+++ incubator/isis/trunk/framework/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/domain/Customer.java Sun Sep  2 12:14:46 2012
@@ -200,7 +200,7 @@ public class Customer extends AbstractDo
     // {{ AlwaysDisabledValue
     private String alwaysDisabledValue;
 
-    @Disabled(When.ALWAYS)
+    @Disabled(when = When.ALWAYS)
     public String getAlwaysDisabledValue() {
         return this.alwaysDisabledValue;
     }
@@ -214,7 +214,7 @@ public class Customer extends AbstractDo
     // {{ AlwaysDisabledAssociation
     private Country alwaysDisabledAssociation;
 
-    @Disabled(When.ALWAYS)
+    @Disabled(when = When.ALWAYS)
     public Country getAlwaysDisabledAssociation() {
         return this.alwaysDisabledAssociation;
     }
@@ -228,7 +228,7 @@ public class Customer extends AbstractDo
     // {{ AlwaysDisabledCollection
     private List<Country> alwaysDisabledCollection = new ArrayList<Country>();
 
-    @Disabled(When.ALWAYS)
+    @Disabled(when = When.ALWAYS)
     public List<Country> getAlwaysDisabledCollection() {
         return this.alwaysDisabledCollection;
     }
@@ -249,7 +249,7 @@ public class Customer extends AbstractDo
     // }}
 
     // {{ AlwaysDisabledAction
-    @Disabled(When.ALWAYS)
+    @Disabled(when = When.ALWAYS)
     public void alwaysDisabledAction() {
     }
 
@@ -328,7 +328,7 @@ public class Customer extends AbstractDo
     // {{ AlwaysHiddenValue
     private String alwaysHiddenValue;
 
-    @Hidden(When.ALWAYS)
+    @Hidden(when=When.ALWAYS)
     public String getAlwaysHiddenValue() {
         return this.alwaysHiddenValue;
     }
@@ -342,7 +342,7 @@ public class Customer extends AbstractDo
     // {{ AlwaysHiddenAssociation
     private Country alwaysHiddenAssociation;
 
-    @Hidden(When.ALWAYS)
+    @Hidden(when=When.ALWAYS)
     public Country getAlwaysHiddenAssociation() {
         return this.alwaysHiddenAssociation;
     }
@@ -356,7 +356,7 @@ public class Customer extends AbstractDo
     // {{ AlwaysHiddenCollection
     private List<Country> alwaysHiddenCollection = new ArrayList<Country>();
 
-    @Hidden(When.ALWAYS)
+    @Hidden(when=When.ALWAYS)
     public List<Country> getAlwaysHiddenCollection() {
         return this.alwaysHiddenCollection;
     }
@@ -377,7 +377,7 @@ public class Customer extends AbstractDo
     // }}
 
     // {{ SessionDisabledAction
-    @Hidden(When.ALWAYS)
+    @Hidden(when=When.ALWAYS)
     public void alwaysHiddenAction() {
     }
 
@@ -596,7 +596,7 @@ public class Customer extends AbstractDo
     // {{ CustomerNumber
     private Integer customerNumber;
 
-    @Disabled(When.ONCE_PERSISTED)
+    @Disabled(when = When.ONCE_PERSISTED)
     public Integer getCustomerNumber() {
         return this.customerNumber;
     }

Modified: incubator/isis/trunk/framework/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/domain/Product.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/domain/Product.java?rev=1379956&r1=1379955&r2=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/domain/Product.java (original)
+++ incubator/isis/trunk/framework/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/domain/Product.java Sun Sep  2 12:14:46 2012
@@ -68,7 +68,7 @@ public class Product extends AbstractDom
 
     @TypicalLength(9)
     @MaxLength(9)
-    @Disabled(When.ONCE_PERSISTED)
+    @Disabled(when = When.ONCE_PERSISTED)
     public String getCode() {
         return this.code;
     }

Modified: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-applib/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-applib/pom.xml?rev=1379956&r1=1379955&r2=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-applib/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-applib/pom.xml Sun Sep  2 12:14:46 2012
@@ -68,6 +68,11 @@
         </dependency>
 
         <dependency>
+            <groupId>org.apache.isis</groupId>
+            <artifactId>applib</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.isis.core</groupId>
             <artifactId>commons</artifactId>
             <scope>test</scope>

Modified: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationType.java?rev=1379956&r1=1379955&r2=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationType.java (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationType.java Sun Sep  2 12:14:46 2012
@@ -20,6 +20,7 @@ package org.apache.isis.viewer.restfulob
 
 import javax.ws.rs.core.MediaType;
 
+import org.apache.isis.applib.util.Enums;
 import org.apache.isis.viewer.restfulobjects.applib.domaintypes.ActionDescriptionRepresentation;
 import org.apache.isis.viewer.restfulobjects.applib.domaintypes.ActionParameterDescriptionRepresentation;
 import org.apache.isis.viewer.restfulobjects.applib.domaintypes.CollectionDescriptionRepresentation;
@@ -30,7 +31,6 @@ import org.apache.isis.viewer.restfulobj
 import org.apache.isis.viewer.restfulobjects.applib.errors.ErrorRepresentation;
 import org.apache.isis.viewer.restfulobjects.applib.homepage.HomePageRepresentation;
 import org.apache.isis.viewer.restfulobjects.applib.user.UserRepresentation;
-import org.apache.isis.viewer.restfulobjects.applib.util.Enums;
 import org.apache.isis.viewer.restfulobjects.applib.util.Parser;
 import org.apache.isis.viewer.restfulobjects.applib.version.VersionRepresentation;
 import org.apache.isis.viewer.restfulobjects.domainobjects.ActionResultRepresentation;

Modified: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/ActionResultReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/ActionResultReprRenderer.java?rev=1379956&r1=1379955&r2=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/ActionResultReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/ActionResultReprRenderer.java Sun Sep  2 12:14:46 2012
@@ -19,6 +19,7 @@ package org.apache.isis.viewer.restfulob
 import java.util.Collection;
 import java.util.Map;
 
+import org.apache.isis.applib.annotation.ActionSemantics;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
@@ -164,8 +165,7 @@ public class ActionResultReprRenderer ex
         final MemberType memberType = MemberType.of(action);
         final Map<String, MutatorSpec> mutators = memberType.getMutators();
 
-        final ActionSemantics semantics = ActionSemantics.determine(getResourceContext(), action);
-        final String mutator = semantics.getInvokeKey();
+        final String mutator = InvokeKeys.getKeyFor(action.getSemantics());
         final MutatorSpec mutatorSpec = mutators.get(mutator);
         selfLinkBuilder.withHttpMethod(mutatorSpec.httpMethod);
 

Modified: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/DomainResourceHelper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/DomainResourceHelper.java?rev=1379956&r1=1379955&r2=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/DomainResourceHelper.java (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/DomainResourceHelper.java Sun Sep  2 12:14:46 2012
@@ -34,6 +34,7 @@ import com.google.common.io.ByteStreams;
 import org.codehaus.jackson.JsonParseException;
 import org.codehaus.jackson.map.JsonMappingException;
 
+import org.apache.isis.applib.annotation.ActionSemantics;
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.version.Version;
@@ -220,8 +221,8 @@ public final class DomainResourceHelper 
     Response invokeActionQueryOnly(final String actionId, final JsonRepresentation arguments) {
         final ObjectAction action = getObjectActionThatIsVisibleAndUsable(actionId, Intent.ACCESS);
 
-        final ActionSemantics actionSemantics = ActionSemantics.determine(resourceContext, action);
-        if (!actionSemantics.isQueryOnly()) {
+        final ActionSemantics.Of actionSemantics = action.getSemantics();
+        if (actionSemantics != ActionSemantics.Of.SAFE) {
             throw RestfulObjectsApplicationException.create(HttpStatusCode.METHOD_NOT_ALLOWED, "Method not allowed; action '%s' is not query only", action.getId());
         }
 
@@ -232,8 +233,8 @@ public final class DomainResourceHelper 
 
         final ObjectAction action = getObjectActionThatIsVisibleAndUsable(actionId, Intent.MUTATE);
 
-        final ActionSemantics actionSemantics = ActionSemantics.determine(resourceContext, action);
-        if (!actionSemantics.isIdempotent()) {
+        final ActionSemantics.Of actionSemantics = action.getSemantics();
+        if (actionSemantics.isIdempotentInNature()) {
             throw RestfulObjectsApplicationException.create(HttpStatusCode.METHOD_NOT_ALLOWED, "Method not allowed; action '%s' is not idempotent", action.getId());
         }
         final String bodyAsString = asStringUtf8(body);

Copied: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/InvokeKeys.java (from r1379526, incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/idempotent/IdempotentFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/InvokeKeys.java?p2=incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/InvokeKeys.java&p1=incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/idempotent/IdempotentFacetAbstract.java&r1=1379526&r2=1379956&rev=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/idempotent/IdempotentFacetAbstract.java (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/InvokeKeys.java Sun Sep  2 12:14:46 2012
@@ -16,21 +16,25 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
+package org.apache.isis.viewer.restfulobjects.viewer.resources.domainobjects;
 
-package org.apache.isis.core.metamodel.facets.actions.idempotent;
+import java.util.EnumMap;
 
-import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.MarkerFacetAbstract;
+import org.apache.isis.applib.annotation.ActionSemantics;
 
-public abstract class IdempotentFacetAbstract extends MarkerFacetAbstract implements IdempotentFacet {
-
-    public static Class<? extends Facet> type() {
-        return IdempotentFacet.class;
+public final class InvokeKeys {
+    
+    private final static EnumMap<ActionSemantics.Of, String> map = new EnumMap<ActionSemantics.Of, String>(ActionSemantics.Of.class);
+    static {
+        map.put(ActionSemantics.Of.SAFE, "invokeQueryOnly");
+        map.put(ActionSemantics.Of.IDEMPOTENT, "invokeIdempotent");
+        map.put(ActionSemantics.Of.NON_IDEMPOTENT, "invoke");
     }
-
-    public IdempotentFacetAbstract(final FacetHolder holder) {
-        super(type(), holder);
+    
+    private InvokeKeys() {
+    }
+    
+    public static String getKeyFor(ActionSemantics.Of actionSemantics) {
+        return map.get(actionSemantics);
     }
-
 }

Modified: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/MemberType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/MemberType.java?rev=1379956&r1=1379955&r2=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/MemberType.java (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/MemberType.java Sun Sep  2 12:14:46 2012
@@ -20,6 +20,8 @@ import java.util.Map;
 
 import com.google.common.collect.ImmutableMap;
 
+import org.apache.isis.applib.annotation.ActionSemantics;
+import org.apache.isis.applib.util.Enums;
 import org.apache.isis.core.metamodel.facets.actions.invoke.ActionInvocationFacet;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionAddToFacet;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionRemoveFromFacet;
@@ -38,7 +40,6 @@ import org.apache.isis.core.progmodel.fa
 import org.apache.isis.viewer.restfulobjects.applib.HttpMethod;
 import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
 import org.apache.isis.viewer.restfulobjects.applib.links.Rel;
-import org.apache.isis.viewer.restfulobjects.applib.util.Enums;
 
 public enum MemberType {
 

Modified: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/ObjectActionReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/ObjectActionReprRenderer.java?rev=1379956&r1=1379955&r2=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/ObjectActionReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/ObjectActionReprRenderer.java Sun Sep  2 12:14:46 2012
@@ -23,6 +23,7 @@ import com.google.common.collect.Lists;
 
 import org.codehaus.jackson.node.NullNode;
 
+import org.apache.isis.applib.annotation.ActionSemantics;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
@@ -96,9 +97,9 @@ public class ObjectActionReprRenderer ex
             return;
         }
         final Map<String, MutatorSpec> mutators = memberType.getMutators();
-        final ActionSemantics semantics = ActionSemantics.determine(this.resourceContext, objectMember);
-
-        final String mutator = semantics.getInvokeKey();
+        
+        final ActionSemantics.Of actionSemantics = objectMember.getSemantics();
+        final String mutator = InvokeKeys.getKeyFor(actionSemantics);
         final MutatorSpec mutatorSpec = mutators.get(mutator);
 
         addLinkFor(mutatorSpec);
@@ -221,8 +222,8 @@ public class ObjectActionReprRenderer ex
     protected void putExtensionsIsisProprietary() {
         getExtensions().mapPut("actionType", objectMember.getType().name().toLowerCase());
 
-        final ActionSemantics semantics = ActionSemantics.determine(resourceContext, objectMember);
-        getExtensions().mapPut("actionSemantics", semantics.getName());
+        final ActionSemantics.Of semantics = objectMember.getSemantics();
+        getExtensions().mapPut("actionSemantics", semantics.getCamelCaseName());
     }
 
 }
\ No newline at end of file

Modified: incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Debug.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Debug.java?rev=1379956&r1=1379955&r2=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Debug.java (original)
+++ incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Debug.java Sun Sep  2 12:14:46 2012
@@ -323,7 +323,6 @@ public class Debug extends AbstractEleme
             view.appendln("Name", action.getName());
             view.appendln("Specification", specificationLink(action.getSpecification()));
 
-            view.appendln("Target", action.getTarget());
             view.appendln("On type", specificationLink(action.getOnType()));
 
             final ObjectSpecification returnType = action.getReturnType();

Modified: incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/EditLink.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/EditLink.java?rev=1379956&r1=1379955&r2=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/EditLink.java (original)
+++ incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/EditLink.java Sun Sep  2 12:14:46 2012
@@ -21,6 +21,7 @@ package org.apache.isis.viewer.scimpi.di
 
 import java.util.List;
 
+import org.apache.isis.applib.annotation.When;
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;
@@ -39,8 +40,8 @@ public class EditLink extends AbstractLi
         final AuthenticationSession session = IsisContext.getAuthenticationSession();
         final List<ObjectAssociation> visibleFields = specification.getAssociations(ObjectAssociationFilters.dynamicallyVisible(session, adapter));
         final ImmutableFacet facet = specification.getFacet(ImmutableFacet.class);
-        final boolean isImmutable = facet != null && facet.value() == org.apache.isis.core.metamodel.facets.When.ALWAYS;
-        final boolean isImmutableOncePersisted = facet != null && facet.value() == org.apache.isis.core.metamodel.facets.When.ONCE_PERSISTED && adapter.representsPersistent();
+        final boolean isImmutable = facet != null && facet.when() == When.ALWAYS;
+        final boolean isImmutableOncePersisted = facet != null && facet.when() == When.ONCE_PERSISTED && adapter.representsPersistent();
         return visibleFields.size() > 0 && !isImmutable && !isImmutableOncePersisted;
     }
 

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionMemento.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionMemento.java?rev=1379956&r1=1379955&r2=1379956&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionMemento.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionMemento.java Sun Sep  2 12:14:46 2012
@@ -21,10 +21,10 @@ package org.apache.isis.viewer.wicket.mo
 
 import java.io.Serializable;
 
+import org.apache.isis.applib.annotation.ActionSemantics;
 import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
 import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.core.metamodel.spec.ObjectSpecId;
-import org.apache.isis.core.metamodel.spec.feature.ActionSemantics;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
 
 /**
@@ -37,7 +37,7 @@ public class ActionMemento implements Se
     private final ObjectSpecId owningType;
     private final ActionType actionType;
     private final String nameParmsId;
-    private final ActionSemantics actionSemantics;
+    private final ActionSemantics.Of actionSemantics;
 
     private transient ObjectAction action;
 
@@ -66,7 +66,7 @@ public class ActionMemento implements Se
     }
 
     public ConcurrencyChecking getConcurrencyChecking() {
-        return this.actionSemantics.getConcurrencyChecking();
+        return ConcurrencyChecking.concurrencyCheckingFor(this.actionSemantics);
     }
 
     public ObjectAction getAction() {



Mime
View raw message