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 2010/11/08 13:59:33 UTC
svn commit: r1032561 [14/19] - in /incubator/isis/trunk:
alternatives/bytecode/identity/src/main/java/org/apache/isis/metamodel/specloader/classsubstitutor/
alternatives/bytecode/identity/src/main/java/org/apache/isis/runtime/persistence/objectfactory/...
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/LongValueSemanticsProviderAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/LongValueSemanticsProviderAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/LongValueSemanticsProviderAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/LongValueSemanticsProviderAbstract.java Mon Nov 8 12:58:33 2010
@@ -27,11 +27,11 @@ import java.text.ParseException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.metamodel.facets.value.LongValueFacet;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
public abstract class LongValueSemanticsProviderAbstract extends ValueSemanticsProviderAbstract implements LongValueFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/LongWrapperValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/LongWrapperValueSemanticsProvider.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/LongWrapperValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/LongWrapperValueSemanticsProvider.java Mon Nov 8 12:58:33 2010
@@ -23,9 +23,9 @@ package org.apache.isis.metamodel.value;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
public class LongWrapperValueSemanticsProvider extends LongValueSemanticsProviderAbstract {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/LongWrapperValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/LongWrapperValueTypeFacetFactory.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/LongWrapperValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/LongWrapperValueTypeFacetFactory.java Mon Nov 8 12:58:33 2010
@@ -20,8 +20,8 @@
package org.apache.isis.metamodel.value;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.MethodRemover;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.MethodRemover;
import org.apache.isis.metamodel.facets.value.LongValueFacet;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/MoneyValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/MoneyValueSemanticsProvider.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/MoneyValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/MoneyValueSemanticsProvider.java Mon Nov 8 12:58:33 2010
@@ -32,12 +32,12 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
import org.apache.isis.core.metamodel.config.ConfigurationConstants;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.properties.defaults.PropertyDefaultFacet;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.properties.defaults.PropertyDefaultFacet;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.metamodel.facets.value.MoneyValueFacet;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
import edu.umd.cs.findbugs.annotations.SuppressWarnings;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/MoneyValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/MoneyValueTypeFacetFactory.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/MoneyValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/MoneyValueTypeFacetFactory.java Mon Nov 8 12:58:33 2010
@@ -20,8 +20,8 @@
package org.apache.isis.metamodel.value;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.MethodRemover;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.MethodRemover;
import org.apache.isis.metamodel.facets.value.MoneyValueFacet;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/PasswordValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/PasswordValueSemanticsProvider.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/PasswordValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/PasswordValueSemanticsProvider.java Mon Nov 8 12:58:33 2010
@@ -25,11 +25,11 @@ import org.apache.isis.applib.adapters.P
import org.apache.isis.applib.value.Password;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.metamodel.facets.value.PasswordValueFacet;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
public class PasswordValueSemanticsProvider extends ValueSemanticsProviderAbstract implements PasswordValueFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/PasswordValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/PasswordValueTypeFacetFactory.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/PasswordValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/PasswordValueTypeFacetFactory.java Mon Nov 8 12:58:33 2010
@@ -20,8 +20,8 @@
package org.apache.isis.metamodel.value;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.MethodRemover;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.MethodRemover;
import org.apache.isis.metamodel.facets.value.PasswordValueFacet;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/PercentageValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/PercentageValueSemanticsProvider.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/PercentageValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/PercentageValueSemanticsProvider.java Mon Nov 8 12:58:33 2010
@@ -31,11 +31,11 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
import org.apache.isis.core.metamodel.config.ConfigurationConstants;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.metamodel.facets.value.FloatingPointValueFacet;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
import edu.umd.cs.findbugs.annotations.SuppressWarnings;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/PercentageValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/PercentageValueTypeFacetFactory.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/PercentageValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/PercentageValueTypeFacetFactory.java Mon Nov 8 12:58:33 2010
@@ -20,8 +20,8 @@
package org.apache.isis.metamodel.value;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.MethodRemover;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.MethodRemover;
import org.apache.isis.metamodel.facets.value.FloatingPointValueFacet;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ShortPrimitiveValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ShortPrimitiveValueSemanticsProvider.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ShortPrimitiveValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ShortPrimitiveValueSemanticsProvider.java Mon Nov 8 12:58:33 2010
@@ -24,10 +24,10 @@ import org.apache.isis.applib.adapters.E
import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.properties.defaults.PropertyDefaultFacet;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.properties.defaults.PropertyDefaultFacet;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
public class ShortPrimitiveValueSemanticsProvider extends ShortValueSemanticsProviderAbstract implements PropertyDefaultFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ShortPrimitiveValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ShortPrimitiveValueTypeFacetFactory.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ShortPrimitiveValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ShortPrimitiveValueTypeFacetFactory.java Mon Nov 8 12:58:33 2010
@@ -20,8 +20,8 @@
package org.apache.isis.metamodel.value;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.MethodRemover;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.MethodRemover;
import org.apache.isis.metamodel.facets.value.ShortValueFacet;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ShortValueSemanticsProviderAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ShortValueSemanticsProviderAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ShortValueSemanticsProviderAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ShortValueSemanticsProviderAbstract.java Mon Nov 8 12:58:33 2010
@@ -27,11 +27,11 @@ import java.text.ParseException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.metamodel.facets.value.ShortValueFacet;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
public class ShortValueSemanticsProviderAbstract extends ValueSemanticsProviderAbstract implements ShortValueFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ShortWrapperValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ShortWrapperValueSemanticsProvider.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ShortWrapperValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ShortWrapperValueSemanticsProvider.java Mon Nov 8 12:58:33 2010
@@ -23,9 +23,9 @@ package org.apache.isis.metamodel.value;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
public class ShortWrapperValueSemanticsProvider extends ShortValueSemanticsProviderAbstract {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ShortWrapperValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ShortWrapperValueTypeFacetFactory.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ShortWrapperValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ShortWrapperValueTypeFacetFactory.java Mon Nov 8 12:58:33 2010
@@ -20,8 +20,8 @@
package org.apache.isis.metamodel.value;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.MethodRemover;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.MethodRemover;
import org.apache.isis.metamodel.facets.value.ShortValueFacet;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/StringValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/StringValueSemanticsProvider.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/StringValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/StringValueSemanticsProvider.java Mon Nov 8 12:58:33 2010
@@ -24,11 +24,11 @@ import org.apache.isis.applib.adapters.E
import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.metamodel.facets.value.StringValueFacet;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
public class StringValueSemanticsProvider extends ValueSemanticsProviderAbstract implements StringValueFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/StringValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/StringValueTypeFacetFactory.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/StringValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/StringValueTypeFacetFactory.java Mon Nov 8 12:58:33 2010
@@ -20,8 +20,8 @@
package org.apache.isis.metamodel.value;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.MethodRemover;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.MethodRemover;
import org.apache.isis.metamodel.facets.value.StringValueFacet;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/TimeStampValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/TimeStampValueSemanticsProvider.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/TimeStampValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/TimeStampValueSemanticsProvider.java Mon Nov 8 12:58:33 2010
@@ -28,10 +28,10 @@ import org.apache.isis.applib.adapters.P
import org.apache.isis.applib.value.TimeStamp;
import org.apache.isis.core.metamodel.adapter.InvalidEntryException;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.properties.defaults.PropertyDefaultFacet;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.properties.defaults.PropertyDefaultFacet;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import edu.umd.cs.findbugs.annotations.SuppressWarnings;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/TimeStampValueSemanticsProviderAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/TimeStampValueSemanticsProviderAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/TimeStampValueSemanticsProviderAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/TimeStampValueSemanticsProviderAbstract.java Mon Nov 8 12:58:33 2010
@@ -28,9 +28,9 @@ import java.util.Map;
import org.apache.isis.applib.value.TimeStamp;
import org.apache.isis.core.metamodel.config.ConfigurationConstants;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
public abstract class TimeStampValueSemanticsProviderAbstract extends ValueSemanticsProviderAbstractTemporal {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/TimeStampValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/TimeStampValueTypeFacetFactory.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/TimeStampValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/TimeStampValueTypeFacetFactory.java Mon Nov 8 12:58:33 2010
@@ -20,8 +20,8 @@
package org.apache.isis.metamodel.value;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.MethodRemover;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.MethodRemover;
import org.apache.isis.metamodel.facets.value.DateValueFacet;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/TimeValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/TimeValueSemanticsProvider.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/TimeValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/TimeValueSemanticsProvider.java Mon Nov 8 12:58:33 2010
@@ -27,9 +27,9 @@ import org.apache.isis.applib.adapters.E
import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.applib.value.Time;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import edu.umd.cs.findbugs.annotations.SuppressWarnings;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/TimeValueSemanticsProviderAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/TimeValueSemanticsProviderAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/TimeValueSemanticsProviderAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/TimeValueSemanticsProviderAbstract.java Mon Nov 8 12:58:33 2010
@@ -26,9 +26,9 @@ import java.util.Map;
import org.apache.isis.core.metamodel.config.ConfigurationConstants;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
public abstract class TimeValueSemanticsProviderAbstract extends ValueSemanticsProviderAbstractTemporal {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/TimeValueTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/TimeValueTypeFacetFactory.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/TimeValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/TimeValueTypeFacetFactory.java Mon Nov 8 12:58:33 2010
@@ -20,8 +20,8 @@
package org.apache.isis.metamodel.value;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.MethodRemover;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.MethodRemover;
import org.apache.isis.metamodel.facets.value.DateValueFacet;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ValueSemanticsProviderAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ValueSemanticsProviderAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ValueSemanticsProviderAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ValueSemanticsProviderAbstract.java Mon Nov 8 12:58:33 2010
@@ -36,13 +36,13 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.config.ConfigurationConstants;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.FacetAbstract;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.properties.defaults.PropertyDefaultFacet;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.FacetAbstract;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.properties.defaults.PropertyDefaultFacet;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
public abstract class ValueSemanticsProviderAbstract extends FacetAbstract implements ValueSemanticsProvider, EncoderDecoder,
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ValueSemanticsProviderAbstractTemporal.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ValueSemanticsProviderAbstractTemporal.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ValueSemanticsProviderAbstractTemporal.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ValueSemanticsProviderAbstractTemporal.java Mon Nov 8 12:58:33 2010
@@ -35,11 +35,11 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
import org.apache.isis.core.metamodel.config.ConfigurationConstants;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.metamodel.facets.value.DateValueFacet;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
public abstract class ValueSemanticsProviderAbstractTemporal extends ValueSemanticsProviderAbstract implements DateValueFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ValueUsingValueSemanticsProviderFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ValueUsingValueSemanticsProviderFacetFactory.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ValueUsingValueSemanticsProviderFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ValueUsingValueSemanticsProviderFacetFactory.java Mon Nov 8 12:58:33 2010
@@ -22,13 +22,13 @@ package org.apache.isis.metamodel.value;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.core.metamodel.config.IsisConfigurationAware;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.FacetUtil;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContextAware;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
-import org.apache.isis.metamodel.facets.FacetUtil;
import org.apache.isis.metamodel.facets.object.value.ValueFacetUsingSemanticsProvider;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContextAware;
public abstract class ValueUsingValueSemanticsProviderFacetFactory extends FacetFactoryAbstract implements RuntimeContextAware,
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java Mon Nov 8 12:58:33 2010
@@ -28,12 +28,14 @@ import org.jmock.integration.junit4.JUni
import org.junit.After;
import org.junit.Before;
import org.junit.runner.RunWith;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.MethodRemover;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneActionParameter;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.metamodel.specloader.ObjectReflector;
+import org.apache.isis.core.metamodel.specloader.ObjectReflector;
@RunWith(JMock.class)
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/AbstractFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/AbstractFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/AbstractFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/AbstractFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -25,6 +25,7 @@ import java.lang.reflect.Method;
import junit.framework.TestCase;
import org.apache.log4j.BasicConfigurator;
+import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ProgrammableMethodRemover.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ProgrammableMethodRemover.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ProgrammableMethodRemover.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ProgrammableMethodRemover.java Mon Nov 8 12:58:33 2010
@@ -23,6 +23,9 @@ package org.apache.isis.metamodel.facets
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
+
+import org.apache.isis.core.metamodel.facets.MethodRemover;
+import org.apache.isis.core.metamodel.facets.MethodScope;
public class ProgrammableMethodRemover implements MethodRemover {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ProgrammableReflector.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ProgrammableReflector.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ProgrammableReflector.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ProgrammableReflector.java Mon Nov 8 12:58:33 2010
@@ -24,15 +24,15 @@ import java.util.List;
import org.apache.isis.core.commons.debug.DebugString;
import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.specloader.ObjectReflector;
-import org.apache.isis.metamodel.specloader.classsubstitutor.ClassSubstitutor;
-import org.apache.isis.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
-import org.apache.isis.metamodel.specloader.internal.cache.SpecificationCache;
-import org.apache.isis.metamodel.specloader.progmodelfacets.ProgrammingModelFacets;
-import org.apache.isis.metamodel.specloader.traverser.SpecificationTraverser;
-import org.apache.isis.metamodel.specloader.validator.MetaModelValidator;
+import org.apache.isis.core.metamodel.specloader.ObjectReflector;
+import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutor;
+import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
+import org.apache.isis.core.metamodel.specloader.internal.cache.SpecificationCache;
+import org.apache.isis.core.metamodel.specloader.progmodelfacets.ProgrammingModelFacets;
+import org.apache.isis.core.metamodel.specloader.traverser.SpecificationTraverser;
+import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
public class ProgrammableReflector implements ObjectReflector {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfAnnotationFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfAnnotationFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -26,10 +26,11 @@ import java.util.List;
import java.util.Set;
import org.apache.isis.applib.annotation.TypeOf;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistryDefault;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistryDefault;
public class TypeOfAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -27,24 +27,30 @@ import java.util.List;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Named;
import org.apache.isis.applib.security.UserMemento;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.When;
+import org.apache.isis.core.metamodel.facets.actions.choices.ActionChoicesFacet;
+import org.apache.isis.core.metamodel.facets.actions.choices.ActionParameterChoicesFacet;
+import org.apache.isis.core.metamodel.facets.actions.debug.DebugFacet;
+import org.apache.isis.core.metamodel.facets.actions.defaults.ActionDefaultsFacet;
+import org.apache.isis.core.metamodel.facets.actions.defaults.ActionParameterDefaultsFacet;
+import org.apache.isis.core.metamodel.facets.actions.executed.ExecutedFacet;
+import org.apache.isis.core.metamodel.facets.actions.exploration.ExplorationFacet;
+import org.apache.isis.core.metamodel.facets.actions.invoke.ActionInvocationFacet;
+import org.apache.isis.core.metamodel.facets.hide.HiddenFacet;
+import org.apache.isis.core.metamodel.facets.naming.describedas.DescribedAsFacet;
+import org.apache.isis.core.metamodel.facets.naming.named.NamedFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.specloader.internal.peer.JavaObjectActionParamPeer;
+import org.apache.isis.core.metamodel.specloader.internal.peer.JavaObjectActionPeer;
+import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectActionPeer;
import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.When;
-import org.apache.isis.metamodel.facets.actions.choices.ActionChoicesFacet;
import org.apache.isis.metamodel.facets.actions.choices.ActionChoicesFacetViaMethod;
-import org.apache.isis.metamodel.facets.actions.choices.ActionParameterChoicesFacet;
import org.apache.isis.metamodel.facets.actions.choices.ActionParameterChoicesFacetViaMethod;
-import org.apache.isis.metamodel.facets.actions.debug.DebugFacet;
-import org.apache.isis.metamodel.facets.actions.defaults.ActionDefaultsFacet;
import org.apache.isis.metamodel.facets.actions.defaults.ActionDefaultsFacetViaMethod;
-import org.apache.isis.metamodel.facets.actions.defaults.ActionParameterDefaultsFacet;
import org.apache.isis.metamodel.facets.actions.defaults.ActionParameterDefaultsFacetViaMethod;
-import org.apache.isis.metamodel.facets.actions.executed.ExecutedFacet;
-import org.apache.isis.metamodel.facets.actions.exploration.ExplorationFacet;
-import org.apache.isis.metamodel.facets.actions.invoke.ActionInvocationFacet;
import org.apache.isis.metamodel.facets.actions.invoke.ActionInvocationFacetViaMethod;
import org.apache.isis.metamodel.facets.actions.validate.ActionValidationFacet;
import org.apache.isis.metamodel.facets.actions.validate.ActionValidationFacetViaMethod;
@@ -54,17 +60,11 @@ import org.apache.isis.metamodel.facets.
import org.apache.isis.metamodel.facets.disable.DisableForSessionFacetViaMethod;
import org.apache.isis.metamodel.facets.disable.DisabledFacet;
import org.apache.isis.metamodel.facets.disable.DisabledFacetAbstract;
-import org.apache.isis.metamodel.facets.hide.HiddenFacet;
import org.apache.isis.metamodel.facets.hide.HiddenFacetAbstract;
import org.apache.isis.metamodel.facets.hide.HideForSessionFacet;
import org.apache.isis.metamodel.facets.hide.HideForSessionFacetViaMethod;
-import org.apache.isis.metamodel.facets.naming.describedas.DescribedAsFacet;
import org.apache.isis.metamodel.facets.naming.describedas.DescribedAsFacetAbstract;
-import org.apache.isis.metamodel.facets.naming.named.NamedFacet;
import org.apache.isis.metamodel.facets.naming.named.NamedFacetAbstract;
-import org.apache.isis.metamodel.specloader.internal.peer.JavaObjectActionParamPeer;
-import org.apache.isis.metamodel.specloader.internal.peer.JavaObjectActionPeer;
-import org.apache.isis.metamodel.specloader.internal.peer.ObjectActionPeer;
public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/debug/DebugAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/debug/DebugAnnotationFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/debug/DebugAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/debug/DebugAnnotationFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -23,9 +23,10 @@ package org.apache.isis.metamodel.facets
import java.lang.reflect.Method;
import org.apache.isis.applib.annotation.Debug;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.actions.debug.DebugFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
public class DebugAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedAnnotationFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedAnnotationFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -24,10 +24,11 @@ import java.lang.reflect.Method;
import org.apache.isis.applib.annotation.Executed;
import org.apache.isis.applib.annotation.Executed.Where;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.actions.executed.ExecutedFacet;
import org.apache.isis.core.metamodel.spec.Target;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
public class ExecutedAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/exploration/ExplorationAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/exploration/ExplorationAnnotationFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/exploration/ExplorationAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/exploration/ExplorationAnnotationFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -23,9 +23,10 @@ package org.apache.isis.metamodel.facets
import java.lang.reflect.Method;
import org.apache.isis.applib.annotation.Exploration;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.actions.exploration.ExplorationFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
public class ExplorationAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/notcontributed/NotContributedAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/notcontributed/NotContributedAnnotationFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/notcontributed/NotContributedAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/notcontributed/NotContributedAnnotationFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -25,9 +25,9 @@ import java.lang.reflect.Method;
import org.apache.isis.applib.annotation.Exploration;
import org.apache.isis.applib.annotation.NotContributed;
import org.apache.isis.applib.annotation.Prototype;
+import org.apache.isis.core.metamodel.facets.Facet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
public class NotContributedAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/notinrepositorymenu/NotInRepositoryMenuAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/notinrepositorymenu/NotInRepositoryMenuAnnotationFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/notinrepositorymenu/NotInRepositoryMenuAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/notinrepositorymenu/NotInRepositoryMenuAnnotationFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -26,9 +26,9 @@ import org.apache.isis.applib.annotation
import org.apache.isis.applib.annotation.NotContributed;
import org.apache.isis.applib.annotation.NotInRepositoryMenu;
import org.apache.isis.applib.annotation.Prototype;
+import org.apache.isis.core.metamodel.facets.Facet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
public class NotInRepositoryMenuAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeAnnotationFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeAnnotationFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -23,9 +23,10 @@ package org.apache.isis.metamodel.facets
import java.lang.reflect.Method;
import org.apache.isis.applib.annotation.Prototype;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
public class PrototypeAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -26,22 +26,26 @@ import java.util.List;
import java.util.Set;
import org.apache.isis.applib.security.UserMemento;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.When;
+import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionAddToFacet;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionClearFacet;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionRemoveFromFacet;
+import org.apache.isis.core.metamodel.facets.hide.HiddenFacet;
+import org.apache.isis.core.metamodel.facets.naming.describedas.DescribedAsFacet;
+import org.apache.isis.core.metamodel.facets.naming.named.NamedFacet;
+import org.apache.isis.core.metamodel.facets.propcoll.access.PropertyAccessorFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.When;
-import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacetInferredFromSupportingMethods;
import org.apache.isis.metamodel.facets.actions.DescribedAsFacetViaMethod;
import org.apache.isis.metamodel.facets.actions.NamedFacetViaMethod;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionAddToFacet;
import org.apache.isis.metamodel.facets.collections.modify.CollectionAddToFacetViaAccessor;
import org.apache.isis.metamodel.facets.collections.modify.CollectionAddToFacetViaMethod;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionClearFacet;
import org.apache.isis.metamodel.facets.collections.modify.CollectionClearFacetViaAccessor;
import org.apache.isis.metamodel.facets.collections.modify.CollectionClearFacetViaMethod;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionRemoveFromFacet;
import org.apache.isis.metamodel.facets.collections.modify.CollectionRemoveFromFacetViaAccessor;
import org.apache.isis.metamodel.facets.collections.modify.CollectionRemoveFromFacetViaMethod;
import org.apache.isis.metamodel.facets.collections.validate.CollectionValidateAddToFacet;
@@ -52,14 +56,10 @@ import org.apache.isis.metamodel.facets.
import org.apache.isis.metamodel.facets.disable.DisableForSessionFacetViaMethod;
import org.apache.isis.metamodel.facets.disable.DisabledFacet;
import org.apache.isis.metamodel.facets.disable.DisabledFacetAlways;
-import org.apache.isis.metamodel.facets.hide.HiddenFacet;
import org.apache.isis.metamodel.facets.hide.HiddenFacetAbstract;
import org.apache.isis.metamodel.facets.hide.HiddenFacetAlways;
import org.apache.isis.metamodel.facets.hide.HideForSessionFacet;
import org.apache.isis.metamodel.facets.hide.HideForSessionFacetViaMethod;
-import org.apache.isis.metamodel.facets.naming.describedas.DescribedAsFacet;
-import org.apache.isis.metamodel.facets.naming.named.NamedFacet;
-import org.apache.isis.metamodel.facets.propcoll.access.PropertyAccessorFacet;
import org.apache.isis.metamodel.facets.propcoll.access.PropertyAccessorFacetViaAccessor;
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/collections/JavaCollectionFacetTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/collections/JavaCollectionFacetTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/collections/JavaCollectionFacetTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/collections/JavaCollectionFacetTest.java Mon Nov 8 12:58:33 2010
@@ -36,8 +36,8 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
@RunWith(JMock.class)
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/disable/DisabledAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/disable/DisabledAnnotationFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/disable/DisabledAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/disable/DisabledAnnotationFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -25,9 +25,9 @@ import java.util.Collection;
import org.apache.isis.applib.annotation.Disabled;
import org.apache.isis.applib.annotation.When;
+import org.apache.isis.core.metamodel.facets.Facet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
public class DisabledAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
@@ -125,7 +125,7 @@ public class DisabledAnnotationFacetFact
final Facet facet = facetHolder.getFacet(DisabledFacet.class);
final DisabledFacetAbstract disabledFacetAbstract = (DisabledFacetAbstract) facet;
- assertEquals(org.apache.isis.metamodel.facets.When.ALWAYS, disabledFacetAbstract.value());
+ assertEquals(org.apache.isis.core.metamodel.facets.When.ALWAYS, disabledFacetAbstract.value());
}
public void testDisabledWhenNeverAnnotationPickedUpOn() {
@@ -141,7 +141,7 @@ public class DisabledAnnotationFacetFact
final Facet facet = facetHolder.getFacet(DisabledFacet.class);
final DisabledFacetAbstract disabledFacetAbstract = (DisabledFacetAbstract) facet;
- assertEquals(org.apache.isis.metamodel.facets.When.NEVER, disabledFacetAbstract.value());
+ assertEquals(org.apache.isis.core.metamodel.facets.When.NEVER, disabledFacetAbstract.value());
}
public void testDisabledWhenOncePersistedAnnotationPickedUpOn() {
@@ -157,7 +157,7 @@ public class DisabledAnnotationFacetFact
final Facet facet = facetHolder.getFacet(DisabledFacet.class);
final DisabledFacetAbstract disabledFacetAbstract = (DisabledFacetAbstract) facet;
- assertEquals(org.apache.isis.metamodel.facets.When.ONCE_PERSISTED, disabledFacetAbstract.value());
+ assertEquals(org.apache.isis.core.metamodel.facets.When.ONCE_PERSISTED, disabledFacetAbstract.value());
}
public void testDisabledWhenUntilPersistedAnnotationPickedUpOn() {
@@ -174,7 +174,7 @@ public class DisabledAnnotationFacetFact
final Facet facet = facetHolder.getFacet(DisabledFacet.class);
final DisabledFacetAbstract disabledFacetAbstract = (DisabledFacetAbstract) facet;
- assertEquals(org.apache.isis.metamodel.facets.When.UNTIL_PERSISTED, disabledFacetAbstract.value());
+ assertEquals(org.apache.isis.core.metamodel.facets.When.UNTIL_PERSISTED, disabledFacetAbstract.value());
}
}
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/hide/HiddenAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/hide/HiddenAnnotationFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/hide/HiddenAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/hide/HiddenAnnotationFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -25,9 +25,10 @@ import java.util.Collection;
import org.apache.isis.applib.annotation.Hidden;
import org.apache.isis.applib.annotation.When;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.hide.HiddenFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
public class HiddenAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
@@ -125,7 +126,7 @@ public class HiddenAnnotationFacetFactor
final Facet facet = facetHolder.getFacet(HiddenFacet.class);
final HiddenFacetAbstract hiddenFacetAbstract = (HiddenFacetAbstract) facet;
- assertEquals(org.apache.isis.metamodel.facets.When.ALWAYS, hiddenFacetAbstract.value());
+ assertEquals(org.apache.isis.core.metamodel.facets.When.ALWAYS, hiddenFacetAbstract.value());
}
public void testHiddenWhenNeverAnnotationPickedUpOn() {
@@ -141,7 +142,7 @@ public class HiddenAnnotationFacetFactor
final Facet facet = facetHolder.getFacet(HiddenFacet.class);
final HiddenFacetAbstract hiddenFacetAbstract = (HiddenFacetAbstract) facet;
- assertEquals(org.apache.isis.metamodel.facets.When.NEVER, hiddenFacetAbstract.value());
+ assertEquals(org.apache.isis.core.metamodel.facets.When.NEVER, hiddenFacetAbstract.value());
}
public void testHiddenWhenOncePersistedAnnotationPickedUpOn() {
@@ -157,7 +158,7 @@ public class HiddenAnnotationFacetFactor
final Facet facet = facetHolder.getFacet(HiddenFacet.class);
final HiddenFacetAbstract hiddenFacetAbstract = (HiddenFacetAbstract) facet;
- assertEquals(org.apache.isis.metamodel.facets.When.ONCE_PERSISTED, hiddenFacetAbstract.value());
+ assertEquals(org.apache.isis.core.metamodel.facets.When.ONCE_PERSISTED, hiddenFacetAbstract.value());
}
public void testDisabledWhenUntilPersistedAnnotationPickedUpOn() {
@@ -173,7 +174,7 @@ public class HiddenAnnotationFacetFactor
final Facet facet = facetHolder.getFacet(HiddenFacet.class);
final HiddenFacetAbstract hiddenFacetAbstract = (HiddenFacetAbstract) facet;
- assertEquals(org.apache.isis.metamodel.facets.When.UNTIL_PERSISTED, hiddenFacetAbstract.value());
+ assertEquals(org.apache.isis.core.metamodel.facets.When.UNTIL_PERSISTED, hiddenFacetAbstract.value());
}
}
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/naming/describedas/DescribedAsAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/naming/describedas/DescribedAsAnnotationFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/naming/describedas/DescribedAsAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/naming/describedas/DescribedAsAnnotationFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -24,9 +24,10 @@ import java.lang.reflect.Method;
import java.util.Collection;
import org.apache.isis.applib.annotation.DescribedAs;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.naming.describedas.DescribedAsFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
public class DescribedAsAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/naming/named/NamedAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/naming/named/NamedAnnotationFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/naming/named/NamedAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/naming/named/NamedAnnotationFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -24,9 +24,10 @@ import java.lang.reflect.Method;
import java.util.Collection;
import org.apache.isis.applib.annotation.Named;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.naming.named.NamedFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
public class NamedAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/aggregated/AggregatedAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/aggregated/AggregatedAnnotationFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/aggregated/AggregatedAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/aggregated/AggregatedAnnotationFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -21,9 +21,10 @@
package org.apache.isis.metamodel.facets.object.aggregated;
import org.apache.isis.applib.annotation.Aggregated;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.object.aggregated.AggregatedFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
public class AggregatedAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/bounded/BoundedAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/bounded/BoundedAnnotationFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/bounded/BoundedAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/bounded/BoundedAnnotationFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -21,9 +21,10 @@
package org.apache.isis.metamodel.facets.object.bounded;
import org.apache.isis.applib.annotation.Bounded;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.object.bounded.BoundedFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
public class BoundedAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/bounded/BoundedMarkerInterfaceFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/bounded/BoundedMarkerInterfaceFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/bounded/BoundedMarkerInterfaceFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/bounded/BoundedMarkerInterfaceFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -21,9 +21,10 @@
package org.apache.isis.metamodel.facets.object.bounded;
import org.apache.isis.applib.marker.Bounded;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.object.bounded.BoundedFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
public class BoundedMarkerInterfaceFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/CreatedCallbackFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/CreatedCallbackFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/CreatedCallbackFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/CreatedCallbackFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -22,10 +22,10 @@ package org.apache.isis.metamodel.facets
import java.lang.reflect.Method;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.CreatedCallbackFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.object.callbacks.CreatedCallbackFacet;
import org.apache.isis.metamodel.facets.object.callbacks.CreatedCallbackFacetFactory;
import org.apache.isis.metamodel.facets.object.callbacks.CreatedCallbackFacetViaMethod;
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/DeleteCallbackFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/DeleteCallbackFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/DeleteCallbackFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/DeleteCallbackFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -22,13 +22,13 @@ package org.apache.isis.metamodel.facets
import java.lang.reflect.Method;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.RemovedCallbackFacet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.RemovingCallbackFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
import org.apache.isis.metamodel.facets.object.callbacks.DeleteCallbackFacetFactory;
-import org.apache.isis.metamodel.facets.object.callbacks.RemovedCallbackFacet;
import org.apache.isis.metamodel.facets.object.callbacks.RemovedCallbackFacetViaMethod;
-import org.apache.isis.metamodel.facets.object.callbacks.RemovingCallbackFacet;
import org.apache.isis.metamodel.facets.object.callbacks.RemovingCallbackFacetViaMethod;
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/LoadCallbackFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/LoadCallbackFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/LoadCallbackFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/LoadCallbackFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -22,13 +22,13 @@ package org.apache.isis.metamodel.facets
import java.lang.reflect.Method;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.LoadedCallbackFacet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.LoadingCallbackFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
import org.apache.isis.metamodel.facets.object.callbacks.LoadCallbackFacetFactory;
-import org.apache.isis.metamodel.facets.object.callbacks.LoadedCallbackFacet;
import org.apache.isis.metamodel.facets.object.callbacks.LoadedCallbackFacetViaMethod;
-import org.apache.isis.metamodel.facets.object.callbacks.LoadingCallbackFacet;
import org.apache.isis.metamodel.facets.object.callbacks.LoadingCallbackFacetViaMethod;
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/PersistAndSaveCallbackFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/PersistAndSaveCallbackFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/PersistAndSaveCallbackFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/PersistAndSaveCallbackFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -23,12 +23,12 @@ package org.apache.isis.metamodel.facets
import java.lang.reflect.Method;
import java.util.List;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.PersistedCallbackFacet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.PersistingCallbackFacet;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
import org.apache.isis.metamodel.facets.object.callbacks.PersistCallbackFacetFactory;
-import org.apache.isis.metamodel.facets.object.callbacks.PersistedCallbackFacet;
import org.apache.isis.metamodel.facets.object.callbacks.PersistedCallbackFacetViaMethod;
-import org.apache.isis.metamodel.facets.object.callbacks.PersistingCallbackFacet;
import org.apache.isis.metamodel.facets.object.callbacks.PersistingCallbackFacetViaMethod;
import org.apache.isis.metamodel.facets.object.callbacks.SaveCallbackFacetFactory;
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/PersistCallbackFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/PersistCallbackFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/PersistCallbackFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/PersistCallbackFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -22,13 +22,13 @@ package org.apache.isis.metamodel.facets
import java.lang.reflect.Method;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.PersistedCallbackFacet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.PersistingCallbackFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
import org.apache.isis.metamodel.facets.object.callbacks.PersistCallbackFacetFactory;
-import org.apache.isis.metamodel.facets.object.callbacks.PersistedCallbackFacet;
import org.apache.isis.metamodel.facets.object.callbacks.PersistedCallbackFacetViaMethod;
-import org.apache.isis.metamodel.facets.object.callbacks.PersistingCallbackFacet;
import org.apache.isis.metamodel.facets.object.callbacks.PersistingCallbackFacetViaMethod;
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/RemoveAndDeleteCallbackFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/RemoveAndDeleteCallbackFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/RemoveAndDeleteCallbackFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/RemoveAndDeleteCallbackFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -23,13 +23,13 @@ package org.apache.isis.metamodel.facets
import java.lang.reflect.Method;
import java.util.List;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.RemovedCallbackFacet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.RemovingCallbackFacet;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
import org.apache.isis.metamodel.facets.object.callbacks.DeleteCallbackFacetFactory;
import org.apache.isis.metamodel.facets.object.callbacks.RemoveCallbackFacetFactory;
-import org.apache.isis.metamodel.facets.object.callbacks.RemovedCallbackFacet;
import org.apache.isis.metamodel.facets.object.callbacks.RemovedCallbackFacetViaMethod;
-import org.apache.isis.metamodel.facets.object.callbacks.RemovingCallbackFacet;
import org.apache.isis.metamodel.facets.object.callbacks.RemovingCallbackFacetViaMethod;
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/RemoveCallbackFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/RemoveCallbackFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/RemoveCallbackFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/RemoveCallbackFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -22,13 +22,13 @@ package org.apache.isis.metamodel.facets
import java.lang.reflect.Method;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.RemovedCallbackFacet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.RemovingCallbackFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
import org.apache.isis.metamodel.facets.object.callbacks.RemoveCallbackFacetFactory;
-import org.apache.isis.metamodel.facets.object.callbacks.RemovedCallbackFacet;
import org.apache.isis.metamodel.facets.object.callbacks.RemovedCallbackFacetViaMethod;
-import org.apache.isis.metamodel.facets.object.callbacks.RemovingCallbackFacet;
import org.apache.isis.metamodel.facets.object.callbacks.RemovingCallbackFacetViaMethod;
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/SaveCallbackFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/SaveCallbackFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/SaveCallbackFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/SaveCallbackFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -22,12 +22,12 @@ package org.apache.isis.metamodel.facets
import java.lang.reflect.Method;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.PersistedCallbackFacet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.PersistingCallbackFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.object.callbacks.PersistedCallbackFacet;
import org.apache.isis.metamodel.facets.object.callbacks.PersistedCallbackFacetViaMethod;
-import org.apache.isis.metamodel.facets.object.callbacks.PersistingCallbackFacet;
import org.apache.isis.metamodel.facets.object.callbacks.PersistingCallbackFacetViaMethod;
import org.apache.isis.metamodel.facets.object.callbacks.SaveCallbackFacetFactory;
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/UpdateCallbackFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/UpdateCallbackFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/UpdateCallbackFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/UpdateCallbackFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -22,13 +22,13 @@ package org.apache.isis.metamodel.facets
import java.lang.reflect.Method;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.UpdatedCallbackFacet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.UpdatingCallbackFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
import org.apache.isis.metamodel.facets.object.callbacks.UpdateCallbackFacetFactory;
-import org.apache.isis.metamodel.facets.object.callbacks.UpdatedCallbackFacet;
import org.apache.isis.metamodel.facets.object.callbacks.UpdatedCallbackFacetViaMethod;
-import org.apache.isis.metamodel.facets.object.callbacks.UpdatingCallbackFacet;
import org.apache.isis.metamodel.facets.object.callbacks.UpdatingCallbackFacetViaMethod;