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 2011/01/17 10:27:01 UTC
svn commit: r1059826 [7/8] - in /incubator/isis/trunk:
alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/auto/
alternatives/progmodel/groovy/metamodel/src/main/java/org/apache/isis/progmodel/groovy/metamo...
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/TypicalLengthAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/TypicalLengthAnnotationFacetFactoryTest.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/TypicalLengthAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/TypicalLengthAnnotationFacetFactoryTest.java Mon Jan 17 09:26:54 2011
@@ -26,8 +26,12 @@ import java.util.List;
import org.apache.isis.applib.annotation.TypicalLength;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
+import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessParameterContext;
import org.apache.isis.core.metamodel.facets.propparam.typicallength.TypicalLengthFacet;
import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
+import org.apache.isis.core.progmodel.facets.propparam.typicallength.annotation.TypicalLengthAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.propparam.typicallength.annotation.TypicalLengthFacetAnnotation;
public class TypicalLengthAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
@@ -68,9 +72,9 @@ public class TypicalLengthAnnotationFace
}
final Method method = findMethod(Customer.class, "getFirstName");
- facetFactory.process(Customer.class, method, methodRemover, facetHolder);
+ facetFactory.process(new ProcessMethodContext(Customer.class, method, methodRemover, facetedMethod));
- final Facet facet = facetHolder.getFacet(TypicalLengthFacet.class);
+ final Facet facet = facetedMethod.getFacet(TypicalLengthFacet.class);
assertNotNull(facet);
assertTrue(facet instanceof TypicalLengthFacetAnnotation);
final TypicalLengthFacetAnnotation typicalLengthFacetAnnotation = (TypicalLengthFacetAnnotation) facet;
@@ -85,9 +89,9 @@ public class TypicalLengthAnnotationFace
}
final Method method = findMethod(Customer.class, "someAction", new Class[] { int.class });
- facetFactory.processParams(method, 0, facetHolder);
+ facetFactory.processParams(new ProcessParameterContext(method, 0, facetedMethodParameter));
- final Facet facet = facetHolder.getFacet(TypicalLengthFacet.class);
+ final Facet facet = facetedMethodParameter.getFacet(TypicalLengthFacet.class);
assertNotNull(facet);
assertTrue(facet instanceof TypicalLengthFacetAnnotation);
final TypicalLengthFacetAnnotation typicalLengthFacetAnnotation = (TypicalLengthFacetAnnotation) facet;
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/validate/mandatory/OptionalAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/validate/mandatory/OptionalAnnotationFacetFactoryTest.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/validate/mandatory/OptionalAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/validate/mandatory/OptionalAnnotationFacetFactoryTest.java Mon Jan 17 09:26:54 2011
@@ -26,8 +26,12 @@ import java.util.List;
import org.apache.isis.applib.annotation.Optional;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
+import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessParameterContext;
import org.apache.isis.core.metamodel.facets.propparam.validate.mandatory.MandatoryFacet;
import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
+import org.apache.isis.core.progmodel.facets.propparam.validate.mandatory.annotation.MandatoryFacetInvertedByOptional;
+import org.apache.isis.core.progmodel.facets.propparam.validate.mandatory.annotation.OptionalAnnotationFacetFactory;
public class OptionalAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
@@ -68,11 +72,11 @@ public class OptionalAnnotationFacetFact
}
final Method method = findMethod(Customer.class, "getFirstName");
- facetFactory.process(Customer.class, method, methodRemover, facetHolder);
+ facetFactory.process(new ProcessMethodContext(Customer.class, method, methodRemover, facetedMethod));
- final Facet facet = facetHolder.getFacet(MandatoryFacet.class);
+ final Facet facet = facetedMethod.getFacet(MandatoryFacet.class);
assertNotNull(facet);
- assertTrue(facet instanceof OptionalFacet);
+ assertTrue(facet instanceof MandatoryFacetInvertedByOptional);
}
public void testOptionalAnnotationPickedUpOnActionParameter() {
@@ -83,11 +87,11 @@ public class OptionalAnnotationFacetFact
}
final Method method = findMethod(Customer.class, "someAction", new Class[] { String.class });
- facetFactory.processParams(method, 0, facetHolder);
+ facetFactory.processParams(new ProcessParameterContext(method, 0, facetedMethodParameter));
- final Facet facet = facetHolder.getFacet(MandatoryFacet.class);
+ final Facet facet = facetedMethodParameter.getFacet(MandatoryFacet.class);
assertNotNull(facet);
- assertTrue(facet instanceof OptionalFacet);
+ assertTrue(facet instanceof MandatoryFacetInvertedByOptional);
}
public void testOptionalAnnotationIgnoredForPrimitiveOnProperty() {
@@ -101,9 +105,9 @@ public class OptionalAnnotationFacetFact
}
final Method method = findMethod(Customer.class, "getNumberOfOrders");
- facetFactory.process(Customer.class, method, methodRemover, facetHolder);
+ facetFactory.process(new ProcessMethodContext(Customer.class, method, methodRemover, facetedMethod));
- assertNull(facetHolder.getFacet(MandatoryFacet.class));
+ assertNull(facetedMethod.getFacet(MandatoryFacet.class));
}
public void testOptionalAnnotationIgnoredForPrimitiveOnActionParameter() {
@@ -114,9 +118,9 @@ public class OptionalAnnotationFacetFact
}
final Method method = findMethod(Customer.class, "someAction", new Class[] { int.class });
- facetFactory.processParams(method, 0, facetHolder);
+ facetFactory.processParams(new ProcessParameterContext(method, 0, facetedMethodParameter));
- assertNull(facetHolder.getFacet(MandatoryFacet.class));
+ assertNull(facetedMethod.getFacet(MandatoryFacet.class));
}
}
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/MaskAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/MaskAnnotationFacetFactoryTest.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/MaskAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/MaskAnnotationFacetFactoryTest.java Mon Jan 17 09:26:54 2011
@@ -26,9 +26,14 @@ import java.util.List;
import org.apache.isis.applib.annotation.Mask;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
+import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
+import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessParameterContext;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
+import org.apache.isis.core.progmodel.facets.propparam.validate.mask.annotation.MaskAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.propparam.validate.mask.annotation.MaskFacetAnnotation;
public class MaskAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
@@ -65,9 +70,9 @@ public class MaskAnnotationFacetFactoryT
public void testMaskAnnotationPickedUpOnClass() {
@Mask("###")
class Customer {}
- facetFactory.process(Customer.class, methodRemover, facetHolder);
+ facetFactory.process(new ProcessClassContext(Customer.class, methodRemover, facetedMethod));
- final Facet facet = facetHolder.getFacet(MaskFacet.class);
+ final Facet facet = facetedMethod.getFacet(MaskFacet.class);
assertNotNull(facet);
assertTrue(facet instanceof MaskFacetAnnotation);
final MaskFacetAnnotation maskFacet = (MaskFacetAnnotation) facet;
@@ -85,9 +90,9 @@ public class MaskAnnotationFacetFactoryT
}
final Method method = findMethod(Customer.class, "getFirstName");
- facetFactory.process(Customer.class, method, methodRemover, facetHolder);
+ facetFactory.process(new ProcessMethodContext(Customer.class, method, methodRemover, facetedMethod));
- final Facet facet = facetHolder.getFacet(MaskFacet.class);
+ final Facet facet = facetedMethod.getFacet(MaskFacet.class);
assertNotNull(facet);
assertTrue(facet instanceof MaskFacetAnnotation);
final MaskFacetAnnotation maskFacet = (MaskFacetAnnotation) facet;
@@ -102,9 +107,9 @@ public class MaskAnnotationFacetFactoryT
}
final Method method = findMethod(Customer.class, "someAction", new Class[] { String.class });
- facetFactory.processParams(method, 0, facetHolder);
+ facetFactory.processParams(new ProcessParameterContext(method, 0, facetedMethodParameter));
- final Facet facet = facetHolder.getFacet(MaskFacet.class);
+ final Facet facet = facetedMethodParameter.getFacet(MaskFacet.class);
assertNotNull(facet);
assertTrue(facet instanceof MaskFacetAnnotation);
final MaskFacetAnnotation maskFacet = (MaskFacetAnnotation) facet;
@@ -122,9 +127,9 @@ public class MaskAnnotationFacetFactoryT
}
final Method method = findMethod(Customer.class, "getNumberOfOrders");
- facetFactory.process(Customer.class, method, methodRemover, facetHolder);
+ facetFactory.process(new ProcessMethodContext(Customer.class, method, methodRemover, facetedMethod));
- assertNotNull(facetHolder.getFacet(MaskFacet.class));
+ assertNotNull(facetedMethod.getFacet(MaskFacet.class));
}
public void testMaskAnnotationNotIgnoredForPrimitiveOnActionParameter() {
@@ -135,9 +140,9 @@ public class MaskAnnotationFacetFactoryT
}
final Method method = findMethod(Customer.class, "someAction", new Class[] { int.class });
- facetFactory.processParams(method, 0, facetHolder);
+ facetFactory.processParams(new ProcessParameterContext(method, 0, facetedMethodParameter));
- assertNotNull(facetHolder.getFacet(MaskFacet.class));
+ assertNotNull(facetedMethodParameter.getFacet(MaskFacet.class));
}
}
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/validate/regex/RegExAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/validate/regex/RegExAnnotationFacetFactoryTest.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/validate/regex/RegExAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/validate/regex/RegExAnnotationFacetFactoryTest.java Mon Jan 17 09:26:54 2011
@@ -26,7 +26,12 @@ import java.util.List;
import org.apache.isis.applib.annotation.RegEx;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
+import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
+import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessParameterContext;
import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
+import org.apache.isis.core.progmodel.facets.propparam.validate.regex.annotation.RegExAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.propparam.validate.regex.annotation.RegExFacetAnnotation;
public class RegExAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
@@ -59,9 +64,9 @@ public class RegExAnnotationFacetFactory
public void testRegExAnnotationPickedUpOnClass() {
@RegEx(validation = "^A.*", caseSensitive = false)
class Customer {}
- facetFactory.process(Customer.class, methodRemover, facetHolder);
+ facetFactory.process(new ProcessClassContext(Customer.class, methodRemover, facetedMethod));
- final Facet facet = facetHolder.getFacet(RegExFacet.class);
+ final Facet facet = facetedMethod.getFacet(RegExFacet.class);
assertNotNull(facet);
assertTrue(facet instanceof RegExFacetAnnotation);
final RegExFacetAnnotation regExFacet = (RegExFacetAnnotation) facet;
@@ -80,9 +85,9 @@ public class RegExAnnotationFacetFactory
}
final Method method = findMethod(Customer.class, "getFirstName");
- facetFactory.process(Customer.class, method, methodRemover, facetHolder);
+ facetFactory.process(new ProcessMethodContext(Customer.class, method, methodRemover, facetedMethod));
- final Facet facet = facetHolder.getFacet(RegExFacet.class);
+ final Facet facet = facetedMethod.getFacet(RegExFacet.class);
assertNotNull(facet);
assertTrue(facet instanceof RegExFacetAnnotation);
final RegExFacetAnnotation regExFacet = (RegExFacetAnnotation) facet;
@@ -98,9 +103,9 @@ public class RegExAnnotationFacetFactory
}
final Method method = findMethod(Customer.class, "someAction", new Class[] { String.class });
- facetFactory.processParams(method, 0, facetHolder);
+ facetFactory.processParams(new ProcessParameterContext(method, 0, facetedMethodParameter));
- final Facet facet = facetHolder.getFacet(RegExFacet.class);
+ final Facet facet = facetedMethodParameter.getFacet(RegExFacet.class);
assertNotNull(facet);
assertTrue(facet instanceof RegExFacetAnnotation);
final RegExFacetAnnotation regExFacet = (RegExFacetAnnotation) facet;
@@ -119,9 +124,9 @@ public class RegExAnnotationFacetFactory
}
final Method method = findMethod(Customer.class, "getNumberOfOrders");
- facetFactory.process(Customer.class, method, methodRemover, facetHolder);
+ facetFactory.process(new ProcessMethodContext(Customer.class, method, methodRemover, facetedMethod));
- assertNull(facetHolder.getFacet(RegExFacet.class));
+ assertNull(facetedMethod.getFacet(RegExFacet.class));
}
public void testRegExAnnotationIgnoredForPrimitiveOnActionParameter() {
@@ -132,9 +137,9 @@ public class RegExAnnotationFacetFactory
}
final Method method = findMethod(Customer.class, "someAction", new Class[] { int.class });
- facetFactory.processParams(method, 0, facetHolder);
+ facetFactory.processParams(new ProcessParameterContext(method, 0, facetedMethodParameter));
- assertNull(facetHolder.getFacet(RegExFacet.class));
+ assertNull(facetedMethod.getFacet(RegExFacet.class));
}
}
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/validate/regex/RegExFacetAnnotationTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/validate/regex/RegExFacetAnnotationTest.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/validate/regex/RegExFacetAnnotationTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/validate/regex/RegExFacetAnnotationTest.java Mon Jan 17 09:26:54 2011
@@ -32,6 +32,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.progmodel.facets.propparam.validate.regex.annotation.RegExFacetAnnotation;
@RunWith(JMock.class)
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/BigDecimalValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/BigDecimalValueSemanticsProviderTest.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/BigDecimalValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/BigDecimalValueSemanticsProviderTest.java Mon Jan 17 09:26:54 2011
@@ -34,6 +34,7 @@ import org.junit.runner.RunWith;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
+import org.apache.isis.core.progmodel.facets.value.bigdecimal.BigDecimalValueSemanticsProvider;
@RunWith(JMock.class)
public class BigDecimalValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/BigIntValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/BigIntValueSemanticsProviderTest.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/BigIntValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/BigIntValueSemanticsProviderTest.java Mon Jan 17 09:26:54 2011
@@ -34,6 +34,7 @@ import org.junit.runner.RunWith;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
+import org.apache.isis.core.progmodel.facets.value.biginteger.BigIntegerValueSemanticsProvider;
@RunWith(JMock.class)
public class BigIntValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/BooleanValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/BooleanValueSemanticsProviderTest.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/BooleanValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/BooleanValueSemanticsProviderTest.java Mon Jan 17 09:26:54 2011
@@ -31,6 +31,8 @@ import org.junit.runner.RunWith;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
+import org.apache.isis.core.progmodel.facets.value.booleans.BooleanValueSemanticsProviderAbstract;
+import org.apache.isis.core.progmodel.facets.value.booleans.BooleanWrapperValueSemanticsProvider;
@RunWith(JMock.class)
public class BooleanValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ByteValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ByteValueSemanticsProviderTest.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ByteValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ByteValueSemanticsProviderTest.java Mon Jan 17 09:26:54 2011
@@ -32,6 +32,8 @@ import org.junit.runner.RunWith;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
+import org.apache.isis.core.progmodel.facets.value.bytes.ByteValueSemanticsProviderAbstract;
+import org.apache.isis.core.progmodel.facets.value.bytes.ByteWrapperValueSemanticsProvider;
@RunWith(JMock.class)
public class ByteValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/CharacterValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/CharacterValueSemanticsProviderTest.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/CharacterValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/CharacterValueSemanticsProviderTest.java Mon Jan 17 09:26:54 2011
@@ -32,6 +32,8 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.InvalidEntryException;
+import org.apache.isis.core.progmodel.facets.value.chars.CharValueSemanticsProviderAbstract;
+import org.apache.isis.core.progmodel.facets.value.chars.CharWrapperValueSemanticsProvider;
@RunWith(JMock.class)
public class CharacterValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ColorValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ColorValueSemanticsProviderTest.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ColorValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ColorValueSemanticsProviderTest.java Mon Jan 17 09:26:54 2011
@@ -32,6 +32,7 @@ import org.apache.isis.applib.value.Colo
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
+import org.apache.isis.core.progmodel.facets.value.color.ColorValueSemanticsProvider;
@RunWith(JMock.class)
public class ColorValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/DateTimeValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/DateTimeValueSemanticsProviderTest.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/DateTimeValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/DateTimeValueSemanticsProviderTest.java Mon Jan 17 09:26:54 2011
@@ -32,6 +32,7 @@ import org.junit.runner.RunWith;
import org.apache.isis.applib.value.DateTime;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
+import org.apache.isis.core.progmodel.facets.value.datetime.DateTimeValueSemanticsProvider;
@RunWith(JMock.class)
public class DateTimeValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/DateValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/DateValueSemanticsProviderTest.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/DateValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/DateValueSemanticsProviderTest.java Mon Jan 17 09:26:54 2011
@@ -34,6 +34,7 @@ import org.apache.isis.applib.value.Date
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
+import org.apache.isis.core.progmodel.facets.value.date.DateValueSemanticsProvider;
@RunWith(JMock.class)
public class DateValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/DoubleValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/DoubleValueSemanticsProviderTest.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/DoubleValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/DoubleValueSemanticsProviderTest.java Mon Jan 17 09:26:54 2011
@@ -32,6 +32,7 @@ import org.junit.runner.RunWith;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
+import org.apache.isis.core.progmodel.facets.value.longs.DoubleWrapperValueSemanticsProvider;
@RunWith(JMock.class)
public class DoubleValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/FloatValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/FloatValueSemanticsProviderTest.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/FloatValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/FloatValueSemanticsProviderTest.java Mon Jan 17 09:26:54 2011
@@ -32,6 +32,8 @@ import org.junit.runner.RunWith;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
+import org.apache.isis.core.progmodel.facets.value.floats.FloatValueSemanticsProviderAbstract;
+import org.apache.isis.core.progmodel.facets.value.floats.FloatWrapperValueSemanticsProvider;
@RunWith(JMock.class)
public class FloatValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ImageValueSemanticsProviderAbstractTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ImageValueSemanticsProviderAbstractTest.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ImageValueSemanticsProviderAbstractTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ImageValueSemanticsProviderAbstractTest.java Mon Jan 17 09:26:54 2011
@@ -33,6 +33,7 @@ import org.junit.runner.RunWith;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.progmodel.facets.value.image.ImageValueSemanticsProviderAbstract;
@RunWith(JMock.class)
public class ImageValueSemanticsProviderAbstractTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/IntValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/IntValueSemanticsProviderTest.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/IntValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/IntValueSemanticsProviderTest.java Mon Jan 17 09:26:54 2011
@@ -32,6 +32,8 @@ import org.junit.runner.RunWith;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
+import org.apache.isis.core.progmodel.facets.value.integer.IntValueSemanticsProviderAbstract;
+import org.apache.isis.core.progmodel.facets.value.integer.IntWrapperValueSemanticsProvider;
@RunWith(JMock.class)
public class IntValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java Mon Jan 17 09:26:54 2011
@@ -36,6 +36,7 @@ import org.junit.runner.RunWith;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
+import org.apache.isis.core.progmodel.facets.value.datesql.JavaSqlDateValueSemanticsProvider;
@RunWith(JMock.class)
public class JavaSqlDateValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/JavaSqlTimeStampValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/JavaSqlTimeStampValueSemanticsProviderTest.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/JavaSqlTimeStampValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/JavaSqlTimeStampValueSemanticsProviderTest.java Mon Jan 17 09:26:54 2011
@@ -33,6 +33,7 @@ import org.junit.runner.RunWith;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
+import org.apache.isis.core.progmodel.facets.value.timestampsql.JavaSqlTimeStampValueSemanticsProvider;
@RunWith(JMock.class)
public class JavaSqlTimeStampValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java Mon Jan 17 09:26:54 2011
@@ -34,6 +34,7 @@ import org.junit.runner.RunWith;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
+import org.apache.isis.core.progmodel.facets.value.timesql.JavaSqlTimeValueSemanticsProvider;
@RunWith(JMock.class)
public class JavaSqlTimeValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java Mon Jan 17 09:26:54 2011
@@ -36,6 +36,7 @@ import org.junit.runner.RunWith;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
+import org.apache.isis.core.progmodel.facets.value.dateutil.JavaUtilDateValueSemanticsProvider;
@RunWith(JMock.class)
public class JavaUtilDateValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/LongValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/LongValueSemanticsProviderTest.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/LongValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/LongValueSemanticsProviderTest.java Mon Jan 17 09:26:54 2011
@@ -32,6 +32,8 @@ import org.junit.runner.RunWith;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
+import org.apache.isis.core.progmodel.facets.value.longs.LongValueSemanticsProviderAbstract;
+import org.apache.isis.core.progmodel.facets.value.longs.LongWrapperValueSemanticsProvider;
@RunWith(JMock.class)
public class LongValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/MoneyValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/MoneyValueSemanticsProviderTest.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/MoneyValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/MoneyValueSemanticsProviderTest.java Mon Jan 17 09:26:54 2011
@@ -34,6 +34,7 @@ import org.apache.isis.applib.value.Mone
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
+import org.apache.isis.core.progmodel.facets.value.money.MoneyValueSemanticsProvider;
@RunWith(JMock.class)
public class MoneyValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/PasswordValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/PasswordValueSemanticsProviderTest.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/PasswordValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/PasswordValueSemanticsProviderTest.java Mon Jan 17 09:26:54 2011
@@ -30,6 +30,7 @@ import org.junit.runner.RunWith;
import org.apache.isis.applib.value.Password;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
+import org.apache.isis.core.progmodel.facets.value.password.PasswordValueSemanticsProvider;
@RunWith(JMock.class)
public class PasswordValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/PercentageValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/PercentageValueSemanticsProviderTest.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/PercentageValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/PercentageValueSemanticsProviderTest.java Mon Jan 17 09:26:54 2011
@@ -31,6 +31,7 @@ import org.junit.runner.RunWith;
import org.apache.isis.applib.value.Percentage;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
+import org.apache.isis.core.progmodel.facets.value.percentage.PercentageValueSemanticsProvider;
@RunWith(JMock.class)
public class PercentageValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/PolishMoneyValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/PolishMoneyValueSemanticsProviderTest.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/PolishMoneyValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/PolishMoneyValueSemanticsProviderTest.java Mon Jan 17 09:26:54 2011
@@ -35,6 +35,7 @@ import org.apache.isis.applib.value.Mone
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
+import org.apache.isis.core.progmodel.facets.value.money.MoneyValueSemanticsProvider;
@Ignore // TODO once the sematics provide has a way to reset the formatters for the new local then this test can be reinstated.
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ShortValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ShortValueSemanticsProviderTest.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ShortValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ShortValueSemanticsProviderTest.java Mon Jan 17 09:26:54 2011
@@ -32,6 +32,8 @@ import org.junit.runner.RunWith;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
+import org.apache.isis.core.progmodel.facets.value.shortint.ShortValueSemanticsProviderAbstract;
+import org.apache.isis.core.progmodel.facets.value.shortint.ShortWrapperValueSemanticsProvider;
@RunWith(JMock.class)
public class ShortValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/StringValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/StringValueSemanticsProviderTest.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/StringValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/StringValueSemanticsProviderTest.java Mon Jan 17 09:26:54 2011
@@ -29,6 +29,7 @@ import org.junit.runner.RunWith;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
+import org.apache.isis.core.progmodel.facets.value.string.StringValueSemanticsProvider;
@RunWith(JMock.class)
public class StringValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/TimeStampValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/TimeStampValueSemanticsProviderTest.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/TimeStampValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/TimeStampValueSemanticsProviderTest.java Mon Jan 17 09:26:54 2011
@@ -32,6 +32,7 @@ import org.junit.runner.RunWith;
import org.apache.isis.applib.value.TimeStamp;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
+import org.apache.isis.core.progmodel.facets.value.timestamp.TimeStampValueSemanticsProvider;
@RunWith(JMock.class)
public class TimeStampValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/TimeValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/TimeValueSemanticsProviderTest.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/TimeValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/TimeValueSemanticsProviderTest.java Mon Jan 17 09:26:54 2011
@@ -33,6 +33,7 @@ import org.apache.isis.applib.adapters.E
import org.apache.isis.applib.value.Time;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
+import org.apache.isis.core.progmodel.facets.value.time.TimeValueSemanticsProvider;
@RunWith(JMock.class)
public class TimeValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ValueSemanticsProviderAbstractTestCase.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ValueSemanticsProviderAbstractTestCase.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ValueSemanticsProviderAbstractTestCase.java Mon Jan 17 09:26:54 2011
@@ -46,7 +46,7 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
import org.apache.isis.core.metamodel.runtimecontext.DependencyInjector;
import org.apache.isis.core.metamodel.spec.SpecificationLoader;
-import org.apache.isis.core.progmodel.facets.object.encodeable.EncodableFacetUsingEncoderDecoder;
+import org.apache.isis.core.progmodel.facets.encodeable.EncodableFacetUsingEncoderDecoder;
import org.apache.isis.core.progmodel.facets.object.parseable.ParseableFacetUsingParser;
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderContext;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationFacetFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationFacetFactoryImpl.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationFacetFactoryImpl.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationFacetFactoryImpl.java Mon Jan 17 09:26:54 2011
@@ -20,13 +20,11 @@
package org.apache.isis.core.runtime.authorization.standard;
-import java.lang.reflect.Method;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facetapi.MethodRemover;
-import org.apache.isis.core.metamodel.spec.FacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
import org.apache.isis.core.runtime.context.IsisContext;
@@ -38,13 +36,13 @@ public class AuthorizationFacetFactoryIm
}
@Override
- public boolean process(final Class<?> cls, final MethodRemover methodRemover, final FacetHolder holder) {
- return FacetUtil.addFacet(createFacet(holder));
+ public void process(ProcessClassContext processClassContaxt) {
+ FacetUtil.addFacet(createFacet(processClassContaxt.getFacetHolder()));
}
@Override
- public boolean process(Class<?> cls, final Method method, final MethodRemover methodRemover, final FacetHolder holder) {
- return FacetUtil.addFacet(createFacet(holder));
+ public void process(ProcessMethodContext processMethodContext) {
+ FacetUtil.addFacet(createFacet(processMethodContext.getFacetHolder()));
}
private AuthorizationFacetImpl createFacet(final FacetHolder holder) {
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java Mon Jan 17 09:26:54 2011
@@ -39,7 +39,7 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacetUtils;
import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
-import org.apache.isis.core.metamodel.facets.propcoll.access.PropertyAccessorFacet;
+import org.apache.isis.core.metamodel.facets.propcoll.access.PropertyOrCollectionAccessorFacet;
import org.apache.isis.core.metamodel.facets.properties.modify.PropertySetterFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.SpecificationLoader;
@@ -105,7 +105,7 @@ public class Memento implements Serializ
if (fields.get(i).isOneToManyAssociation()) {
continue;
}
- if (fields.get(i).containsFacet(PropertyAccessorFacet.class)
+ if (fields.get(i).containsFacet(PropertyOrCollectionAccessorFacet.class)
&& !fields.get(i).containsFacet(PropertySetterFacet.class)) {
LOG.debug("ignoring not-settable field " + fields.get(i).getName());
continue;
@@ -287,7 +287,7 @@ public class Memento implements Serializ
if (field.isOneToManyAssociation()) {
continue;
}
- if (field.containsFacet(PropertyAccessorFacet.class) && !field.containsFacet(PropertySetterFacet.class)) {
+ if (field.containsFacet(PropertyOrCollectionAccessorFacet.class) && !field.containsFacet(PropertySetterFacet.class)) {
LOG.debug("ignoring not-settable field " + field.getName());
continue;
}
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java Mon Jan 17 09:26:54 2011
@@ -42,7 +42,7 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.isis.core.metamodel.facets.object.aggregated.AggregatedFacet;
import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
-import org.apache.isis.core.metamodel.facets.propcoll.access.PropertyAccessorFacet;
+import org.apache.isis.core.metamodel.facets.propcoll.access.PropertyOrCollectionAccessorFacet;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.services.ServicesInjectorAware;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -440,7 +440,7 @@ public class AdapterManagerDefault exten
}
public Object getCollectionPojo(final OneToManyAssociation association, final ObjectAdapter ownerAdapter) {
- final PropertyAccessorFacet accessor = association.getFacet(PropertyAccessorFacet.class);
+ final PropertyOrCollectionAccessorFacet accessor = association.getFacet(PropertyOrCollectionAccessorFacet.class);
return accessor.getProperty(ownerAdapter);
}
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/ActionInvocationFacetWrapTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/ActionInvocationFacetWrapTransaction.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/ActionInvocationFacetWrapTransaction.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/ActionInvocationFacetWrapTransaction.java Mon Jan 17 09:26:54 2011
@@ -24,8 +24,8 @@ import org.apache.log4j.Logger;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.DecoratingFacet;
import org.apache.isis.core.metamodel.facets.actions.invoke.ActionInvocationFacet;
+import org.apache.isis.core.metamodel.facets.actions.invoke.ActionInvocationFacetAbstract;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.progmodel.facets.actions.invoke.ActionInvocationFacetAbstract;
import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.core.runtime.persistence.PersistenceSession;
import org.apache.isis.core.runtime.transaction.IsisTransactionManager;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/CollectionAddToFacetWrapTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/CollectionAddToFacetWrapTransaction.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/CollectionAddToFacetWrapTransaction.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/CollectionAddToFacetWrapTransaction.java Mon Jan 17 09:26:54 2011
@@ -23,7 +23,7 @@ package org.apache.isis.core.runtime.tra
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.DecoratingFacet;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionAddToFacet;
-import org.apache.isis.core.progmodel.facets.collections.modify.CollectionAddToFacetAbstract;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionAddToFacetAbstract;
import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.core.runtime.persistence.PersistenceSession;
import org.apache.isis.core.runtime.transaction.IsisTransactionManager;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/CollectionClearFacetWrapTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/CollectionClearFacetWrapTransaction.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/CollectionClearFacetWrapTransaction.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/CollectionClearFacetWrapTransaction.java Mon Jan 17 09:26:54 2011
@@ -23,7 +23,7 @@ package org.apache.isis.core.runtime.tra
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.DecoratingFacet;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionClearFacet;
-import org.apache.isis.core.progmodel.facets.collections.modify.CollectionClearFacetAbstract;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionClearFacetAbstract;
import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.core.runtime.persistence.PersistenceSession;
import org.apache.isis.core.runtime.transaction.IsisTransactionManager;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/CollectionRemoveFromFacetWrapTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/CollectionRemoveFromFacetWrapTransaction.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/CollectionRemoveFromFacetWrapTransaction.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/CollectionRemoveFromFacetWrapTransaction.java Mon Jan 17 09:26:54 2011
@@ -23,7 +23,7 @@ package org.apache.isis.core.runtime.tra
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.DecoratingFacet;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionRemoveFromFacet;
-import org.apache.isis.core.progmodel.facets.collections.modify.CollectionRemoveFromFacetAbstract;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionRemoveFromFacetAbstract;
import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.core.runtime.persistence.PersistenceSession;
import org.apache.isis.core.runtime.transaction.IsisTransactionManager;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/PropertyClearFacetWrapTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/PropertyClearFacetWrapTransaction.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/PropertyClearFacetWrapTransaction.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/PropertyClearFacetWrapTransaction.java Mon Jan 17 09:26:54 2011
@@ -23,7 +23,7 @@ package org.apache.isis.core.runtime.tra
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.DecoratingFacet;
import org.apache.isis.core.metamodel.facets.properties.modify.PropertyClearFacet;
-import org.apache.isis.core.progmodel.facets.properties.modify.PropertyClearFacetAbstract;
+import org.apache.isis.core.metamodel.facets.properties.modify.PropertyClearFacetAbstract;
import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.core.runtime.persistence.PersistenceSession;
import org.apache.isis.core.runtime.transaction.IsisTransactionManager;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/PropertySetterFacetWrapTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/PropertySetterFacetWrapTransaction.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/PropertySetterFacetWrapTransaction.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/PropertySetterFacetWrapTransaction.java Mon Jan 17 09:26:54 2011
@@ -23,7 +23,7 @@ package org.apache.isis.core.runtime.tra
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.DecoratingFacet;
import org.apache.isis.core.metamodel.facets.properties.modify.PropertySetterFacet;
-import org.apache.isis.core.progmodel.facets.properties.modify.PropertySetterFacetAbstract;
+import org.apache.isis.core.metamodel.facets.properties.modify.PropertySetterFacetAbstract;
import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.core.runtime.persistence.PersistenceSession;
import org.apache.isis.core.runtime.transaction.IsisTransactionManager;
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/MethodFinderUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/MethodFinderUtilsTest.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/MethodFinderUtilsTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/MethodFinderUtilsTest.java Mon Jan 17 09:26:54 2011
@@ -35,8 +35,8 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import org.apache.isis.core.commons.lang.MethodUtils;
-import org.apache.isis.core.metamodel.facetapi.MethodScope;
-import org.apache.isis.core.metamodel.facetedmethod.MethodFinderUtils;
+import org.apache.isis.core.metamodel.methodutils.MethodFinderUtils;
+import org.apache.isis.core.metamodel.methodutils.MethodScope;
@RunWith(Parameterized.class)
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionImplTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionImplTest.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionImplTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionImplTest.java Mon Jan 17 09:26:54 2011
@@ -37,15 +37,15 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.adapter.QuerySubmitter;
import org.apache.isis.core.metamodel.adapter.ServicesProvider;
import org.apache.isis.core.metamodel.adapter.map.AdapterMap;
-import org.apache.isis.core.metamodel.facetedmethod.FacetedMethod;
+import org.apache.isis.core.metamodel.facets.FacetedMethod;
import org.apache.isis.core.metamodel.facets.actions.invoke.ActionInvocationFacet;
+import org.apache.isis.core.metamodel.facets.actions.invoke.ActionInvocationFacetAbstract;
import org.apache.isis.core.metamodel.facets.naming.named.NamedFacet;
import org.apache.isis.core.metamodel.facets.naming.named.NamedFacetAbstract;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.SpecificationLookup;
import org.apache.isis.core.metamodel.spec.feature.ObjectMemberContext;
import org.apache.isis.core.metamodel.specloader.specimpl.ObjectActionImpl;
-import org.apache.isis.core.progmodel.facets.actions.invoke.ActionInvocationFacetAbstract;
import org.apache.isis.core.runtime.testsystem.ProxyJunit3TestCase;
import org.apache.isis.core.runtime.testsystem.TestProxyAdapter;
import org.apache.isis.core.runtime.testsystem.TestSpecification;
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java Mon Jan 17 09:26:54 2011
@@ -35,7 +35,7 @@ import org.apache.isis.core.metamodel.ad
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.facetedmethod.FacetedMethod;
+import org.apache.isis.core.metamodel.facets.FacetedMethod;
import org.apache.isis.core.metamodel.facets.When;
import org.apache.isis.core.metamodel.facets.naming.describedas.DescribedAsFacetAbstract;
import org.apache.isis.core.metamodel.facets.naming.named.NamedFacetAbstract;
@@ -47,13 +47,13 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectMemberContext;
import org.apache.isis.core.metamodel.specloader.specimpl.ObjectMemberAbstract;
-import org.apache.isis.core.progmodel.facets.disable.DisableForSessionFacetAbstract;
-import org.apache.isis.core.progmodel.facets.hide.HiddenFacetAbstract;
-import org.apache.isis.core.progmodel.facets.hide.HiddenFacetAlways;
-import org.apache.isis.core.progmodel.facets.hide.HiddenFacetImpl;
-import org.apache.isis.core.progmodel.facets.hide.HiddenFacetNever;
-import org.apache.isis.core.progmodel.facets.hide.HideForContextFacetNone;
-import org.apache.isis.core.progmodel.facets.hide.HideForSessionFacetAbstract;
+import org.apache.isis.core.progmodel.facets.members.disable.DisableForSessionFacetAbstract;
+import org.apache.isis.core.progmodel.facets.members.hide.HiddenFacetAbstract;
+import org.apache.isis.core.progmodel.facets.members.hide.HiddenFacetImpl;
+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.runtime.testsystem.TestProxySystem;
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationImplTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationImplTest.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationImplTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationImplTest.java Mon Jan 17 09:26:54 2011
@@ -37,7 +37,7 @@ import org.apache.isis.core.commons.auth
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.QuerySubmitter;
import org.apache.isis.core.metamodel.adapter.map.AdapterMap;
-import org.apache.isis.core.metamodel.facetedmethod.FacetedMethod;
+import org.apache.isis.core.metamodel.facets.FacetedMethod;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionAddToFacet;
import org.apache.isis.core.metamodel.facets.naming.named.NamedFacet;
import org.apache.isis.core.metamodel.facets.propcoll.notpersisted.NotPersistedFacet;
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/FacetHolderNoop.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/FacetHolderNoop.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/FacetHolderNoop.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/FacetHolderNoop.java Mon Jan 17 09:26:54 2011
@@ -67,7 +67,16 @@ public class FacetHolderNoop implements
public void removeFacet(final Facet facet) {}
@Override
- public void removeFacet(final Class<? extends Facet> facetType) {}
+ public void removeFacet(final Class<? extends Facet> facetType) {}
+
+ /* (non-Javadoc)
+ * @see org.apache.isis.core.metamodel.facetapi.FacetHolder#containsDoOpFacet(java.lang.Class)
+ */
+ @Override
+ public boolean containsDoOpFacet(Class<? extends Facet> facetType) {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/FacetHolderNoop.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/FacetHolderNoop.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/FacetHolderNoop.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/FacetHolderNoop.java Mon Jan 17 09:26:54 2011
@@ -67,7 +67,16 @@ public class FacetHolderNoop implements
public void removeFacet(final Facet facet) {}
@Override
- public void removeFacet(final Class<? extends Facet> facetType) {}
+ public void removeFacet(final Class<? extends Facet> facetType) {}
+
+ /* (non-Javadoc)
+ * @see org.apache.isis.core.metamodel.facetapi.FacetHolder#containsDoOpFacet(java.lang.Class)
+ */
+ @Override
+ public boolean containsDoOpFacet(Class<? extends Facet> facetType) {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
Added: incubator/isis/trunk/core/src/docbkx/guide/images/common/architecture-perspective.png
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/src/docbkx/guide/images/common/architecture-perspective.png?rev=1059826&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/isis/trunk/core/src/docbkx/guide/images/common/architecture-perspective.png
------------------------------------------------------------------------------
needs-lock =
Propchange: incubator/isis/trunk/core/src/docbkx/guide/images/common/architecture-perspective.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: incubator/isis/trunk/core/src/docbkx/guide/images/common/composition-perspective.png
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/src/docbkx/guide/images/common/composition-perspective.png?rev=1059826&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/isis/trunk/core/src/docbkx/guide/images/common/composition-perspective.png
------------------------------------------------------------------------------
needs-lock =
Propchange: incubator/isis/trunk/core/src/docbkx/guide/images/common/composition-perspective.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: incubator/isis/trunk/core/src/docbkx/guide/images/common/encoding-classdiagram.png
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/src/docbkx/guide/images/common/encoding-classdiagram.png?rev=1059826&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/isis/trunk/core/src/docbkx/guide/images/common/encoding-classdiagram.png
------------------------------------------------------------------------------
needs-lock =
Propchange: incubator/isis/trunk/core/src/docbkx/guide/images/common/encoding-classdiagram.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: incubator/isis/trunk/core/src/docbkx/guide/images/metamodel/architecture-diagram-top-level-with-specloader-expanded.png
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/src/docbkx/guide/images/metamodel/architecture-diagram-top-level-with-specloader-expanded.png?rev=1059826&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/isis/trunk/core/src/docbkx/guide/images/metamodel/architecture-diagram-top-level-with-specloader-expanded.png
------------------------------------------------------------------------------
needs-lock =
Propchange: incubator/isis/trunk/core/src/docbkx/guide/images/metamodel/architecture-diagram-top-level-with-specloader-expanded.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: incubator/isis/trunk/core/src/docbkx/guide/images/metamodel/architecture-diagram-top-level.png
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/src/docbkx/guide/images/metamodel/architecture-diagram-top-level.png?rev=1059826&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/isis/trunk/core/src/docbkx/guide/images/metamodel/architecture-diagram-top-level.png
------------------------------------------------------------------------------
needs-lock =
Propchange: incubator/isis/trunk/core/src/docbkx/guide/images/metamodel/architecture-diagram-top-level.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified: incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/defaults/progmodel/JavaReflectorInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/defaults/progmodel/JavaReflectorInstaller.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/defaults/progmodel/JavaReflectorInstaller.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/defaults/progmodel/JavaReflectorInstaller.java Mon Jan 17 09:26:54 2011
@@ -33,8 +33,8 @@ import org.apache.isis.core.commons.conf
import org.apache.isis.core.commons.config.InstallerAbstract;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.factory.InstanceUtil;
-import org.apache.isis.core.metamodel.facetapi.FacetFactory;
import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
+import org.apache.isis.core.metamodel.facets.FacetFactory;
import org.apache.isis.core.metamodel.layout.MemberLayoutArranger;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
import org.apache.isis.core.metamodel.specloader.FacetDecoratorInstaller;