incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1032561 [8/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/ ...
Date Mon, 08 Nov 2010 12:59:33 GMT
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeAnnotationFacetFactory.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeAnnotationFacetFactory.java Mon Nov  8 12:58:33 2010
@@ -23,11 +23,12 @@ 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.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetUtil;
+import org.apache.isis.core.metamodel.facets.MethodRemover;
+import org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet;
+import org.apache.isis.core.metamodel.java5.AnnotationBasedFacetFactoryAbstract;
 import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.FacetUtil;
-import org.apache.isis.metamodel.facets.MethodRemover;
-import org.apache.isis.metamodel.java5.AnnotationBasedFacetFactoryAbstract;
 
 
 public class PrototypeAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeFacet.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeFacet.java Mon Nov  8 12:58:33 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.metamodel.facets.actions.prototype;
 
-import org.apache.isis.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.Facet;
 
 
 /**

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeFacetAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeFacetAbstract.java Mon Nov  8 12:58:33 2010
@@ -20,9 +20,10 @@
 
 package org.apache.isis.metamodel.facets.actions.prototype;
 
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.MarkerFacetAbstract;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.MarkerFacetAbstract;
+import org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet;
 
 
 public abstract class PrototypeFacetAbstract extends MarkerFacetAbstract implements PrototypeFacet {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeFacetAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeFacetAnnotation.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeFacetAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeFacetAnnotation.java Mon Nov  8 12:58:33 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.metamodel.facets.actions.prototype;
 
-import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
 
 
 public class PrototypeFacetAnnotation extends PrototypeFacetAbstract {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/ActionValidationFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/ActionValidationFacet.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/ActionValidationFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/ActionValidationFacet.java Mon Nov  8 12:58:33 2010
@@ -20,9 +20,9 @@
 package org.apache.isis.metamodel.facets.actions.validate;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.actions.invoke.ActionInvocationFacet;
-import org.apache.isis.metamodel.interactions.ValidatingInteractionAdvisor;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.actions.invoke.ActionInvocationFacet;
+import org.apache.isis.core.metamodel.interactions.ValidatingInteractionAdvisor;
 
 /**
  * The mechanism by which the set of parameters of the action can be validated before the action itself is invoked.

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/ActionValidationFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/ActionValidationFacetAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/ActionValidationFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/ActionValidationFacetAbstract.java Mon Nov  8 12:58:33 2010
@@ -21,11 +21,11 @@
 package org.apache.isis.metamodel.facets.actions.validate;
 
 import org.apache.isis.applib.events.ValidityEvent;
-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.interactions.ActionInvocationContext;
-import org.apache.isis.metamodel.interactions.ValidityContext;
+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.interactions.ActionInvocationContext;
+import org.apache.isis.core.metamodel.interactions.ValidityContext;
 
 
 public abstract class ActionValidationFacetAbstract extends FacetAbstract implements ActionValidationFacet {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/ActionValidationFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/ActionValidationFacetViaMethod.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/ActionValidationFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/ActionValidationFacetViaMethod.java Mon Nov  8 12:58:33 2010
@@ -25,9 +25,9 @@ import java.util.Collections;
 import java.util.List;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.java5.ImperativeFacet;
 import org.apache.isis.core.metamodel.util.ObjectInvokeUtils;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.java5.ImperativeFacet;
 
 
 public class ActionValidationFacetViaMethod extends ActionValidationFacetAbstract implements ImperativeFacet {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/CollectionFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/CollectionFacetFactory.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/CollectionFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/CollectionFacetFactory.java Mon Nov  8 12:58:33 2010
@@ -20,18 +20,18 @@
 
 package org.apache.isis.metamodel.facets.collections;
 
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.MethodRemover;
+import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
+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.FacetFactoryAbstract;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.MethodRemover;
-import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
+import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
+import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistryAware;
 import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacetDefaultToObject;
 import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacetInferredFromArray;
 import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacetInferredFromGenerics;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContextAware;
-import org.apache.isis.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
-import org.apache.isis.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistryAware;
 
 
 public class CollectionFacetFactory extends FacetFactoryAbstract implements CollectionTypeRegistryAware, RuntimeContextAware {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/CollectionFieldMethodsFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/CollectionFieldMethodsFacetFactory.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/CollectionFieldMethodsFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/CollectionFieldMethodsFacetFactory.java Mon Nov  8 12:58:33 2010
@@ -27,13 +27,16 @@ import java.util.List;
 import org.apache.log4j.Logger;
 import org.apache.isis.applib.security.UserMemento;
 import org.apache.isis.core.commons.lang.StringUtils;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetUtil;
+import org.apache.isis.core.metamodel.facets.MethodRemover;
+import org.apache.isis.core.metamodel.facets.MethodScope;
+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.core.metamodel.specloader.internal.peer.JavaOneToManyAssociationPeer;
 import org.apache.isis.core.metamodel.util.NameUtils;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.FacetUtil;
-import org.apache.isis.metamodel.facets.MethodRemover;
-import org.apache.isis.metamodel.facets.MethodScope;
 import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacetInferredFromSupportingMethods;
 import org.apache.isis.metamodel.facets.collections.modify.CollectionAddToFacetViaAccessor;
 import org.apache.isis.metamodel.facets.collections.modify.CollectionAddToFacetViaMethod;
@@ -46,9 +49,6 @@ import org.apache.isis.metamodel.facets.
 import org.apache.isis.metamodel.facets.propcoll.access.PropertyAccessorFacetViaAccessor;
 import org.apache.isis.metamodel.facets.properties.choices.PropertyChoicesFacetViaMethod;
 import org.apache.isis.metamodel.java5.PropertyOrCollectionIdentifyingFacetFactoryAbstract;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContextAware;
-import org.apache.isis.metamodel.specloader.internal.peer.JavaOneToManyAssociationPeer;
 
 
 public class CollectionFieldMethodsFacetFactory extends PropertyOrCollectionIdentifyingFacetFactoryAbstract implements

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/JavaArrayFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/JavaArrayFacet.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/JavaArrayFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/JavaArrayFacet.java Mon Nov  8 12:58:33 2010
@@ -24,9 +24,9 @@ import java.util.ArrayList;
 import java.util.Collection;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.metamodel.facets.collections.modify.CollectionFacetAbstract;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
 
 
 public class JavaArrayFacet extends CollectionFacetAbstract {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/JavaCollectionFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/JavaCollectionFacet.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/JavaCollectionFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/JavaCollectionFacet.java Mon Nov  8 12:58:33 2010
@@ -25,9 +25,9 @@ import java.util.Iterator;
 
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.metamodel.facets.collections.modify.CollectionFacetAbstract;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
 
 
 public class JavaCollectionFacet extends CollectionFacetAbstract {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/ObjectToAdapterTransformer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/ObjectToAdapterTransformer.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/ObjectToAdapterTransformer.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/ObjectToAdapterTransformer.java Mon Nov  8 12:58:33 2010
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets
 
 import org.apache.commons.collections.Transformer;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
 
 /**
  * Uses the Commons Collection API to transform {@link Object}s into

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/aggregated/AggregatedIfCollectionFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/aggregated/AggregatedIfCollectionFacetFactory.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/aggregated/AggregatedIfCollectionFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/aggregated/AggregatedIfCollectionFacetFactory.java Mon Nov  8 12:58:33 2010
@@ -20,16 +20,16 @@
 
 package org.apache.isis.metamodel.facets.collections.aggregated;
 
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetUtil;
+import org.apache.isis.core.metamodel.facets.MethodRemover;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
+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.FacetFactoryAbstract;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.FacetUtil;
-import org.apache.isis.metamodel.facets.MethodRemover;
+import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
+import org.apache.isis.core.metamodel.specloader.progmodelfacets.ProgrammingModelFacets;
 import org.apache.isis.metamodel.facets.collections.CollectionFacetFactory;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.metamodel.facets.object.aggregated.AggregatedFacet;
-import org.apache.isis.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
-import org.apache.isis.metamodel.specloader.progmodelfacets.ProgrammingModelFacets;
 
 
 /**

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/aggregated/AggregatedSinceCollection.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/aggregated/AggregatedSinceCollection.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/aggregated/AggregatedSinceCollection.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/aggregated/AggregatedSinceCollection.java Mon Nov  8 12:58:33 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.metamodel.facets.collections.aggregated;
 
-import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
 import org.apache.isis.metamodel.facets.object.aggregated.AggregatedFacetImpl;
 
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToFacet.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToFacet.java Mon Nov  8 12:58:33 2010
@@ -21,7 +21,7 @@
 package org.apache.isis.metamodel.facets.collections.modify;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.Facet;
 
 
 /**

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToFacetAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToFacetAbstract.java Mon Nov  8 12:58:33 2010
@@ -20,9 +20,10 @@
 
 package org.apache.isis.metamodel.facets.collections.modify;
 
-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.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.collections.modify.CollectionAddToFacet;
 
 
 public abstract class CollectionAddToFacetAbstract extends FacetAbstract implements CollectionAddToFacet {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToFacetViaAccessor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToFacetViaAccessor.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToFacetViaAccessor.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToFacetViaAccessor.java Mon Nov  8 12:58:33 2010
@@ -27,11 +27,11 @@ import java.util.List;
 
 import org.apache.isis.applib.DomainObjectContainer;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.java5.ImperativeFacet;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.core.metamodel.util.IsisUtils;
 import org.apache.isis.core.metamodel.util.ObjectInvokeUtils;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.java5.ImperativeFacet;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
 
 
 public class CollectionAddToFacetViaAccessor extends CollectionAddToFacetAbstract implements ImperativeFacet {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToFacetViaMethod.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToFacetViaMethod.java Mon Nov  8 12:58:33 2010
@@ -25,9 +25,9 @@ import java.util.Collections;
 import java.util.List;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.java5.ImperativeFacet;
 import org.apache.isis.core.metamodel.util.ObjectInvokeUtils;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.java5.ImperativeFacet;
 
 
 public class CollectionAddToFacetViaMethod extends CollectionAddToFacetAbstract implements ImperativeFacet {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionClearFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionClearFacet.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionClearFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionClearFacet.java Mon Nov  8 12:58:33 2010
@@ -20,7 +20,7 @@
 package org.apache.isis.metamodel.facets.collections.modify;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.Facet;
 
 /**
  * Clear all objects from a collection.

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionClearFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionClearFacetAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionClearFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionClearFacetAbstract.java Mon Nov  8 12:58:33 2010
@@ -20,9 +20,10 @@
 
 package org.apache.isis.metamodel.facets.collections.modify;
 
-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.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.collections.modify.CollectionClearFacet;
 
 
 public abstract class CollectionClearFacetAbstract extends FacetAbstract implements CollectionClearFacet {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionClearFacetViaAccessor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionClearFacetViaAccessor.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionClearFacetViaAccessor.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionClearFacetViaAccessor.java Mon Nov  8 12:58:33 2010
@@ -27,10 +27,10 @@ import java.util.List;
 
 import org.apache.isis.applib.DomainObjectContainer;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.java5.ImperativeFacet;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.core.metamodel.util.ObjectInvokeUtils;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.java5.ImperativeFacet;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
 
 
 public class CollectionClearFacetViaAccessor extends CollectionClearFacetAbstract implements ImperativeFacet {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionClearFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionClearFacetViaMethod.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionClearFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionClearFacetViaMethod.java Mon Nov  8 12:58:33 2010
@@ -25,9 +25,9 @@ import java.util.Collections;
 import java.util.List;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.java5.ImperativeFacet;
 import org.apache.isis.core.metamodel.util.ObjectInvokeUtils;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.java5.ImperativeFacet;
 
 
 public class CollectionClearFacetViaMethod extends CollectionClearFacetAbstract implements ImperativeFacet {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionFacet.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionFacet.java Mon Nov  8 12:58:33 2010
@@ -25,9 +25,9 @@ import java.util.Enumeration;
 import java.util.Iterator;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+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.ObjectSpecification;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
 
 
 /**

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionFacetAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionFacetAbstract.java Mon Nov  8 12:58:33 2010
@@ -26,9 +26,10 @@ import java.util.Iterator;
 
 import org.apache.commons.collections.iterators.IteratorEnumeration;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.FacetAbstract;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
+import org.apache.isis.core.metamodel.facets.FacetAbstract;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 
 
 public abstract class CollectionFacetAbstract extends FacetAbstract implements CollectionFacet {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionRemoveFromFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionRemoveFromFacet.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionRemoveFromFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionRemoveFromFacet.java Mon Nov  8 12:58:33 2010
@@ -20,7 +20,7 @@
 package org.apache.isis.metamodel.facets.collections.modify;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.Facet;
 
 /**
  * Remove object to a collection.

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionRemoveFromFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionRemoveFromFacetAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionRemoveFromFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionRemoveFromFacetAbstract.java Mon Nov  8 12:58:33 2010
@@ -20,9 +20,10 @@
 
 package org.apache.isis.metamodel.facets.collections.modify;
 
-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.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.collections.modify.CollectionRemoveFromFacet;
 
 
 public abstract class CollectionRemoveFromFacetAbstract extends FacetAbstract implements CollectionRemoveFromFacet {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionRemoveFromFacetViaAccessor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionRemoveFromFacetViaAccessor.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionRemoveFromFacetViaAccessor.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionRemoveFromFacetViaAccessor.java Mon Nov  8 12:58:33 2010
@@ -27,11 +27,11 @@ import java.util.List;
 
 import org.apache.isis.applib.DomainObjectContainer;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.java5.ImperativeFacet;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.core.metamodel.util.IsisUtils;
 import org.apache.isis.core.metamodel.util.ObjectInvokeUtils;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.java5.ImperativeFacet;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
 
 
 public class CollectionRemoveFromFacetViaAccessor extends CollectionRemoveFromFacetAbstract implements ImperativeFacet {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionRemoveFromFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionRemoveFromFacetViaMethod.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionRemoveFromFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionRemoveFromFacetViaMethod.java Mon Nov  8 12:58:33 2010
@@ -25,9 +25,9 @@ import java.util.Collections;
 import java.util.List;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.java5.ImperativeFacet;
 import org.apache.isis.core.metamodel.util.ObjectInvokeUtils;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.java5.ImperativeFacet;
 
 
 public class CollectionRemoveFromFacetViaMethod extends CollectionRemoveFromFacetAbstract implements ImperativeFacet {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateAddToFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateAddToFacet.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateAddToFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateAddToFacet.java Mon Nov  8 12:58:33 2010
@@ -20,8 +20,8 @@
 package org.apache.isis.metamodel.facets.collections.validate;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.interactions.ValidatingInteractionAdvisor;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.interactions.ValidatingInteractionAdvisor;
 
 /**
  * Validate that an object can be added to a collection.

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateAddToFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateAddToFacetAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateAddToFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateAddToFacetAbstract.java Mon Nov  8 12:58:33 2010
@@ -21,11 +21,11 @@
 package org.apache.isis.metamodel.facets.collections.validate;
 
 import org.apache.isis.applib.events.ValidityEvent;
-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.interactions.CollectionAddToContext;
-import org.apache.isis.metamodel.interactions.ValidityContext;
+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.interactions.CollectionAddToContext;
+import org.apache.isis.core.metamodel.interactions.ValidityContext;
 
 
 public abstract class CollectionValidateAddToFacetAbstract extends FacetAbstract implements CollectionValidateAddToFacet {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateAddToFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateAddToFacetViaMethod.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateAddToFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateAddToFacetViaMethod.java Mon Nov  8 12:58:33 2010
@@ -25,9 +25,9 @@ import java.util.Collections;
 import java.util.List;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.java5.ImperativeFacet;
 import org.apache.isis.core.metamodel.util.ObjectInvokeUtils;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.java5.ImperativeFacet;
 
 
 public class CollectionValidateAddToFacetViaMethod extends CollectionValidateAddToFacetAbstract implements ImperativeFacet {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateRemoveFromFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateRemoveFromFacet.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateRemoveFromFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateRemoveFromFacet.java Mon Nov  8 12:58:33 2010
@@ -20,8 +20,8 @@
 package org.apache.isis.metamodel.facets.collections.validate;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.interactions.ValidatingInteractionAdvisor;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.interactions.ValidatingInteractionAdvisor;
 
 /**
  * Validate that an object can be removed to a collection.

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateRemoveFromFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateRemoveFromFacetAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateRemoveFromFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateRemoveFromFacetAbstract.java Mon Nov  8 12:58:33 2010
@@ -21,11 +21,11 @@
 package org.apache.isis.metamodel.facets.collections.validate;
 
 import org.apache.isis.applib.events.ValidityEvent;
-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.interactions.CollectionRemoveFromContext;
-import org.apache.isis.metamodel.interactions.ValidityContext;
+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.interactions.CollectionRemoveFromContext;
+import org.apache.isis.core.metamodel.interactions.ValidityContext;
 
 
 public abstract class CollectionValidateRemoveFromFacetAbstract extends FacetAbstract implements

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateRemoveFromFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateRemoveFromFacetViaMethod.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateRemoveFromFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateRemoveFromFacetViaMethod.java Mon Nov  8 12:58:33 2010
@@ -25,9 +25,9 @@ import java.util.Collections;
 import java.util.List;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.java5.ImperativeFacet;
 import org.apache.isis.core.metamodel.util.ObjectInvokeUtils;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.java5.ImperativeFacet;
 
 
 public class CollectionValidateRemoveFromFacetViaMethod extends CollectionValidateRemoveFromFacetAbstract implements

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForContextFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForContextFacet.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForContextFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForContextFacet.java Mon Nov  8 12:58:33 2010
@@ -20,8 +20,8 @@
 package org.apache.isis.metamodel.facets.disable;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.interactions.DisablingInteractionAdvisor;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.interactions.DisablingInteractionAdvisor;
 
 /**
  * Disable a property, collection or action based on the state of the target {@link ObjectAdapter object}.

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForContextFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForContextFacetAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForContextFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForContextFacetAbstract.java Mon Nov  8 12:58:33 2010
@@ -22,10 +22,10 @@ package org.apache.isis.metamodel.facets
 
 import org.apache.isis.applib.events.UsabilityEvent;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-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.interactions.UsabilityContext;
+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.interactions.UsabilityContext;
 
 
 public abstract class DisableForContextFacetAbstract extends FacetAbstract implements DisableForContextFacet {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForContextFacetNone.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForContextFacetNone.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForContextFacetNone.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForContextFacetNone.java Mon Nov  8 12:58:33 2010
@@ -21,7 +21,7 @@
 package org.apache.isis.metamodel.facets.disable;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
 
 
 public class DisableForContextFacetNone extends DisableForContextFacetAbstract {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForContextFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForContextFacetViaMethod.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForContextFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForContextFacetViaMethod.java Mon Nov  8 12:58:33 2010
@@ -25,9 +25,9 @@ import java.util.Collections;
 import java.util.List;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.java5.ImperativeFacet;
 import org.apache.isis.core.metamodel.util.ObjectInvokeUtils;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.java5.ImperativeFacet;
 
 
 public class DisableForContextFacetViaMethod extends DisableForContextFacetAbstract implements ImperativeFacet {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForSessionFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForSessionFacet.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForSessionFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForSessionFacet.java Mon Nov  8 12:58:33 2010
@@ -20,8 +20,8 @@
 package org.apache.isis.metamodel.facets.disable;
 
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.interactions.DisablingInteractionAdvisor;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.interactions.DisablingInteractionAdvisor;
 
 /**
  * Disable a property, collection or action based on the current session.

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForSessionFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForSessionFacetAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForSessionFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForSessionFacetAbstract.java Mon Nov  8 12:58:33 2010
@@ -22,10 +22,10 @@ package org.apache.isis.metamodel.facets
 
 import org.apache.isis.applib.events.UsabilityEvent;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-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.interactions.UsabilityContext;
+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.interactions.UsabilityContext;
 
 
 public abstract class DisableForSessionFacetAbstract extends FacetAbstract implements DisableForSessionFacet {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForSessionFacetNone.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForSessionFacetNone.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForSessionFacetNone.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForSessionFacetNone.java Mon Nov  8 12:58:33 2010
@@ -21,7 +21,7 @@
 package org.apache.isis.metamodel.facets.disable;
 
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
 
 
 public class DisableForSessionFacetNone extends DisableForSessionFacetAbstract {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForSessionFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForSessionFacetViaMethod.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForSessionFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForSessionFacetViaMethod.java Mon Nov  8 12:58:33 2010
@@ -26,9 +26,9 @@ import java.util.List;
 
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSessionUtils;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.java5.ImperativeFacet;
 import org.apache.isis.core.metamodel.util.InvokeUtils;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.java5.ImperativeFacet;
 
 
 public class DisableForSessionFacetViaMethod extends DisableForSessionFacetAbstract implements ImperativeFacet {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisabledAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisabledAnnotationFacetFactory.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisabledAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisabledAnnotationFacetFactory.java Mon Nov  8 12:58:33 2010
@@ -23,11 +23,11 @@ package org.apache.isis.metamodel.facets
 import java.lang.reflect.Method;
 
 import org.apache.isis.applib.annotation.Disabled;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetUtil;
+import org.apache.isis.core.metamodel.facets.MethodRemover;
+import org.apache.isis.core.metamodel.java5.AnnotationBasedFacetFactoryAbstract;
 import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.FacetUtil;
-import org.apache.isis.metamodel.facets.MethodRemover;
-import org.apache.isis.metamodel.java5.AnnotationBasedFacetFactoryAbstract;
 
 
 public class DisabledAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisabledFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisabledFacet.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisabledFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisabledFacet.java Mon Nov  8 12:58:33 2010
@@ -20,8 +20,8 @@
 package org.apache.isis.metamodel.facets.disable;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.SingleWhenValueFacet;
-import org.apache.isis.metamodel.interactions.DisablingInteractionAdvisor;
+import org.apache.isis.core.metamodel.facets.SingleWhenValueFacet;
+import org.apache.isis.core.metamodel.interactions.DisablingInteractionAdvisor;
 
 /**
  * Disable a property, collection or action.

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisabledFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisabledFacetAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisabledFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisabledFacetAbstract.java Mon Nov  8 12:58:33 2010
@@ -22,11 +22,11 @@ package org.apache.isis.metamodel.facets
 
 import org.apache.isis.applib.events.UsabilityEvent;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.SingleWhenValueFacetAbstract;
-import org.apache.isis.metamodel.facets.When;
-import org.apache.isis.metamodel.interactions.UsabilityContext;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.SingleWhenValueFacetAbstract;
+import org.apache.isis.core.metamodel.facets.When;
+import org.apache.isis.core.metamodel.interactions.UsabilityContext;
 
 
 public abstract class DisabledFacetAbstract extends SingleWhenValueFacetAbstract implements DisabledFacet {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisabledFacetAlways.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisabledFacetAlways.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisabledFacetAlways.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisabledFacetAlways.java Mon Nov  8 12:58:33 2010
@@ -21,8 +21,8 @@
 package org.apache.isis.metamodel.facets.disable;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.When;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.When;
 
 
 public class DisabledFacetAlways extends DisabledFacetAbstract {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisabledFacetAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisabledFacetAnnotation.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisabledFacetAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisabledFacetAnnotation.java Mon Nov  8 12:58:33 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.metamodel.facets.disable;
 
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.When;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.When;
 
 
 public class DisabledFacetAnnotation extends DisabledFacetImpl {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisabledFacetImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisabledFacetImpl.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisabledFacetImpl.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisabledFacetImpl.java Mon Nov  8 12:58:33 2010
@@ -21,8 +21,8 @@
 package org.apache.isis.metamodel.facets.disable;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.When;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.When;
 
 
 public class DisabledFacetImpl extends DisabledFacetAbstract {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisabledFacetNever.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisabledFacetNever.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisabledFacetNever.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisabledFacetNever.java Mon Nov  8 12:58:33 2010
@@ -21,8 +21,8 @@
 package org.apache.isis.metamodel.facets.disable;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.When;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.When;
 
 
 public class DisabledFacetNever extends DisabledFacetAbstract {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/help/HelpFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/help/HelpFacet.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/help/HelpFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/help/HelpFacet.java Mon Nov  8 12:58:33 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.metamodel.facets.help;
 
-import org.apache.isis.metamodel.facets.SingleStringValueFacet;
+import org.apache.isis.core.metamodel.facets.SingleStringValueFacet;
 
 
 /**

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/help/HelpFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/help/HelpFacetAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/help/HelpFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/help/HelpFacetAbstract.java Mon Nov  8 12:58:33 2010
@@ -20,9 +20,10 @@
 
 package org.apache.isis.metamodel.facets.help;
 
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.SingleStringValueFacetAbstract;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.SingleStringValueFacetAbstract;
+import org.apache.isis.core.metamodel.facets.help.HelpFacet;
 
 
 public abstract class HelpFacetAbstract extends SingleStringValueFacetAbstract implements HelpFacet {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/help/HelpFacetNone.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/help/HelpFacetNone.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/help/HelpFacetNone.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/help/HelpFacetNone.java Mon Nov  8 12:58:33 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.metamodel.facets.help;
 
-import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
 
 
 /**

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HiddenAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HiddenAnnotationFacetFactory.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HiddenAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HiddenAnnotationFacetFactory.java Mon Nov  8 12:58:33 2010
@@ -23,11 +23,12 @@ package org.apache.isis.metamodel.facets
 import java.lang.reflect.Method;
 
 import org.apache.isis.applib.annotation.Hidden;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetUtil;
+import org.apache.isis.core.metamodel.facets.MethodRemover;
+import org.apache.isis.core.metamodel.facets.hide.HiddenFacet;
+import org.apache.isis.core.metamodel.java5.AnnotationBasedFacetFactoryAbstract;
 import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.FacetUtil;
-import org.apache.isis.metamodel.facets.MethodRemover;
-import org.apache.isis.metamodel.java5.AnnotationBasedFacetFactoryAbstract;
 
 
 public class HiddenAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HiddenFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HiddenFacet.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HiddenFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HiddenFacet.java Mon Nov  8 12:58:33 2010
@@ -20,8 +20,8 @@
 package org.apache.isis.metamodel.facets.hide;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.SingleWhenValueFacet;
-import org.apache.isis.metamodel.interactions.HidingInteractionAdvisor;
+import org.apache.isis.core.metamodel.facets.SingleWhenValueFacet;
+import org.apache.isis.core.metamodel.interactions.HidingInteractionAdvisor;
 
 /**
  * Hide a property, collection or action.

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HiddenFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HiddenFacetAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HiddenFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HiddenFacetAbstract.java Mon Nov  8 12:58:33 2010
@@ -21,11 +21,12 @@
 package org.apache.isis.metamodel.facets.hide;
 
 import org.apache.isis.applib.events.VisibilityEvent;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.SingleWhenValueFacetAbstract;
-import org.apache.isis.metamodel.facets.When;
-import org.apache.isis.metamodel.interactions.VisibilityContext;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.SingleWhenValueFacetAbstract;
+import org.apache.isis.core.metamodel.facets.When;
+import org.apache.isis.core.metamodel.facets.hide.HiddenFacet;
+import org.apache.isis.core.metamodel.interactions.VisibilityContext;
 
 
 public abstract class HiddenFacetAbstract extends SingleWhenValueFacetAbstract implements HiddenFacet {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HiddenFacetAlways.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HiddenFacetAlways.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HiddenFacetAlways.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HiddenFacetAlways.java Mon Nov  8 12:58:33 2010
@@ -21,8 +21,8 @@
 package org.apache.isis.metamodel.facets.hide;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.When;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.When;
 
 
 public class HiddenFacetAlways extends HiddenFacetAbstract {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HiddenFacetAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HiddenFacetAnnotation.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HiddenFacetAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HiddenFacetAnnotation.java Mon Nov  8 12:58:33 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.metamodel.facets.hide;
 
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.When;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.When;
 
 
 public class HiddenFacetAnnotation extends HiddenFacetImpl {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HiddenFacetImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HiddenFacetImpl.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HiddenFacetImpl.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HiddenFacetImpl.java Mon Nov  8 12:58:33 2010
@@ -21,8 +21,8 @@
 package org.apache.isis.metamodel.facets.hide;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.When;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.When;
 
 
 public class HiddenFacetImpl extends HiddenFacetAbstract {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HiddenFacetNever.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HiddenFacetNever.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HiddenFacetNever.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HiddenFacetNever.java Mon Nov  8 12:58:33 2010
@@ -21,8 +21,8 @@
 package org.apache.isis.metamodel.facets.hide;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.When;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.When;
 
 
 public class HiddenFacetNever extends HiddenFacetAbstract {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HideForContextFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HideForContextFacet.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HideForContextFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HideForContextFacet.java Mon Nov  8 12:58:33 2010
@@ -20,8 +20,8 @@
 package org.apache.isis.metamodel.facets.hide;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.interactions.HidingInteractionAdvisor;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.interactions.HidingInteractionAdvisor;
 
 /**
  * Hide a property, collection or action based on the state of the target {@link ObjectAdapter object}.

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HideForContextFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HideForContextFacetAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HideForContextFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HideForContextFacetAbstract.java Mon Nov  8 12:58:33 2010
@@ -21,10 +21,10 @@
 package org.apache.isis.metamodel.facets.hide;
 
 import org.apache.isis.applib.events.VisibilityEvent;
-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.interactions.VisibilityContext;
+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.interactions.VisibilityContext;
 
 
 public abstract class HideForContextFacetAbstract extends FacetAbstract implements HideForContextFacet {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HideForContextFacetNone.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HideForContextFacetNone.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HideForContextFacetNone.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HideForContextFacetNone.java Mon Nov  8 12:58:33 2010
@@ -21,7 +21,7 @@
 package org.apache.isis.metamodel.facets.hide;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
 
 
 public class HideForContextFacetNone extends HideForContextFacetAbstract {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HideForContextFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HideForContextFacetViaMethod.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HideForContextFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HideForContextFacetViaMethod.java Mon Nov  8 12:58:33 2010
@@ -25,9 +25,9 @@ import java.util.Collections;
 import java.util.List;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.java5.ImperativeFacet;
 import org.apache.isis.core.metamodel.util.ObjectInvokeUtils;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.java5.ImperativeFacet;
 
 
 public class HideForContextFacetViaMethod extends HideForContextFacetAbstract implements ImperativeFacet {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HideForSessionFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HideForSessionFacet.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HideForSessionFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HideForSessionFacet.java Mon Nov  8 12:58:33 2010
@@ -20,8 +20,8 @@
 package org.apache.isis.metamodel.facets.hide;
 
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.interactions.HidingInteractionAdvisor;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.interactions.HidingInteractionAdvisor;
 
 /**
  * Hide a property, collection or action based on the current session.

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HideForSessionFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HideForSessionFacetAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HideForSessionFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HideForSessionFacetAbstract.java Mon Nov  8 12:58:33 2010
@@ -20,10 +20,10 @@
 package org.apache.isis.metamodel.facets.hide;
 
 import org.apache.isis.applib.events.VisibilityEvent;
-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.interactions.VisibilityContext;
+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.interactions.VisibilityContext;
 
 /**
  * Hide a property, collection or action based on the current session.

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HideForSessionFacetNone.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HideForSessionFacetNone.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HideForSessionFacetNone.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HideForSessionFacetNone.java Mon Nov  8 12:58:33 2010
@@ -21,7 +21,7 @@
 package org.apache.isis.metamodel.facets.hide;
 
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
 
 
 public class HideForSessionFacetNone extends HideForSessionFacetAbstract {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HideForSessionFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HideForSessionFacetViaMethod.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HideForSessionFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HideForSessionFacetViaMethod.java Mon Nov  8 12:58:33 2010
@@ -26,9 +26,9 @@ import java.util.List;
 
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSessionUtils;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.java5.ImperativeFacet;
 import org.apache.isis.core.metamodel.util.InvokeUtils;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.java5.ImperativeFacet;
 
 
 public class HideForSessionFacetViaMethod extends HideForSessionFacetAbstract implements ImperativeFacet {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/ignore/IgnoreFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/ignore/IgnoreFacet.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/ignore/IgnoreFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/ignore/IgnoreFacet.java Mon Nov  8 12:58:33 2010
@@ -19,7 +19,7 @@
 
 package org.apache.isis.metamodel.facets.ignore;
 
-import org.apache.isis.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.Facet;
 
 /**
  * Whether the action is programmatic, and therefore should be ignored.

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/ignore/IgnoreFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/ignore/IgnoreFacetAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/ignore/IgnoreFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/ignore/IgnoreFacetAbstract.java Mon Nov  8 12:58:33 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.metamodel.facets.ignore;
 
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.MarkerFacetAbstract;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.MarkerFacetAbstract;
 
 
 public abstract class IgnoreFacetAbstract extends MarkerFacetAbstract implements IgnoreFacet {



Mime
View raw message