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 [10/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/facets/object/defaults/DefaultedFacetUsingDefaultsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/DefaultedFacetUsingDefaultsProvider.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/DefaultedFacetUsingDefaultsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/DefaultedFacetUsingDefaultsProvider.java Mon Nov 8 12:58:33 2010
@@ -21,9 +21,9 @@
package org.apache.isis.metamodel.facets.object.defaults;
import org.apache.isis.applib.adapters.DefaultsProvider;
-import org.apache.isis.metamodel.facets.FacetAbstract;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.facets.FacetAbstract;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
public class DefaultedFacetUsingDefaultsProvider extends FacetAbstract implements DefaultedFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/DefaultsProviderUtil.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/DefaultsProviderUtil.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/DefaultsProviderUtil.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/DefaultsProviderUtil.java Mon Nov 8 12:58:33 2010
@@ -23,8 +23,8 @@ package org.apache.isis.metamodel.facets
import org.apache.isis.applib.adapters.DefaultsProvider;
import org.apache.isis.core.commons.lang.StringUtils;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
import org.apache.isis.core.metamodel.util.ClassUtil;
-import org.apache.isis.metamodel.facets.FacetHolder;
public final class DefaultsProviderUtil {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/PropertyDefaultFacetDerivedFromDefaultedFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/PropertyDefaultFacetDerivedFromDefaultedFacet.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/PropertyDefaultFacetDerivedFromDefaultedFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/defaults/PropertyDefaultFacetDerivedFromDefaultedFacet.java Mon Nov 8 12:58:33 2010
@@ -21,10 +21,10 @@
package org.apache.isis.metamodel.facets.object.defaults;
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.properties.defaults.PropertyDefaultFacet;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
+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;
public class PropertyDefaultFacetDerivedFromDefaultedFacet extends FacetAbstract implements PropertyDefaultFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/ClearDirtyObjectFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/ClearDirtyObjectFacetAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/ClearDirtyObjectFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/ClearDirtyObjectFacetAbstract.java Mon Nov 8 12:58:33 2010
@@ -20,8 +20,8 @@
package org.apache.isis.metamodel.facets.object.dirty;
-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;
public abstract class ClearDirtyObjectFacetAbstract extends DirtyObjectFacetAbstract implements ClearDirtyObjectFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/ClearDirtyObjectFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/ClearDirtyObjectFacetViaMethod.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/ClearDirtyObjectFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/ClearDirtyObjectFacetViaMethod.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.InvokeUtils;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.java5.ImperativeFacet;
public class ClearDirtyObjectFacetViaMethod extends ClearDirtyObjectFacetAbstract implements ImperativeFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/DirtyMethodsFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/DirtyMethodsFacetFactory.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/DirtyMethodsFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/DirtyMethodsFacetFactory.java Mon Nov 8 12:58:33 2010
@@ -24,11 +24,11 @@ import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
+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.spec.feature.ObjectFeatureType;
-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.java5.MethodPrefixBasedFacetFactoryAbstract;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/DirtyObjectFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/DirtyObjectFacet.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/DirtyObjectFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/DirtyObjectFacet.java Mon Nov 8 12:58:33 2010
@@ -19,7 +19,7 @@
package org.apache.isis.metamodel.facets.object.dirty;
-import org.apache.isis.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.Facet;
/**
* Mechanisms for explicitly managing the dirty state of the object.
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/DirtyObjectFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/DirtyObjectFacetAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/DirtyObjectFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/DirtyObjectFacetAbstract.java Mon Nov 8 12:58:33 2010
@@ -20,9 +20,9 @@
package org.apache.isis.metamodel.facets.object.dirty;
-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;
public abstract class DirtyObjectFacetAbstract extends FacetAbstract implements DirtyObjectFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/IsDirtyObjectFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/IsDirtyObjectFacetAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/IsDirtyObjectFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/IsDirtyObjectFacetAbstract.java Mon Nov 8 12:58:33 2010
@@ -20,8 +20,8 @@
package org.apache.isis.metamodel.facets.object.dirty;
-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;
public abstract class IsDirtyObjectFacetAbstract extends DirtyObjectFacetAbstract implements IsDirtyObjectFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/IsDirtyObjectFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/IsDirtyObjectFacetViaMethod.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/IsDirtyObjectFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/IsDirtyObjectFacetViaMethod.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.InvokeUtils;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.java5.ImperativeFacet;
public class IsDirtyObjectFacetViaMethod extends IsDirtyObjectFacetAbstract implements ImperativeFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/MarkDirtyObjectFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/MarkDirtyObjectFacetAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/MarkDirtyObjectFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/MarkDirtyObjectFacetAbstract.java Mon Nov 8 12:58:33 2010
@@ -20,8 +20,8 @@
package org.apache.isis.metamodel.facets.object.dirty;
-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;
public abstract class MarkDirtyObjectFacetAbstract extends DirtyObjectFacetAbstract implements MarkDirtyObjectFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/MarkDirtyObjectFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/MarkDirtyObjectFacetViaMethod.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/MarkDirtyObjectFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/MarkDirtyObjectFacetViaMethod.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.InvokeUtils;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.java5.ImperativeFacet;
public class MarkDirtyObjectFacetViaMethod extends MarkDirtyObjectFacetAbstract implements ImperativeFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ebc/EqualByContentFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ebc/EqualByContentFacet.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ebc/EqualByContentFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ebc/EqualByContentFacet.java Mon Nov 8 12:58:33 2010
@@ -19,9 +19,9 @@
package org.apache.isis.metamodel.facets.object.ebc;
-import org.apache.isis.metamodel.facets.MarkerFacet;
-import org.apache.isis.metamodel.facets.object.immutable.ImmutableFacet;
-import org.apache.isis.metamodel.facets.object.value.ValueFacet;
+import org.apache.isis.core.metamodel.facets.MarkerFacet;
+import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;
+import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
/**
* Indicates that the instances of this class are equal-by-content.
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ebc/EqualByContentFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ebc/EqualByContentFacetAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ebc/EqualByContentFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ebc/EqualByContentFacetAbstract.java Mon Nov 8 12:58:33 2010
@@ -20,9 +20,9 @@
package org.apache.isis.metamodel.facets.object.ebc;
-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;
public abstract class EqualByContentFacetAbstract extends MarkerFacetAbstract implements EqualByContentFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ebc/EqualByContentFacetImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ebc/EqualByContentFacetImpl.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ebc/EqualByContentFacetImpl.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ebc/EqualByContentFacetImpl.java Mon Nov 8 12:58:33 2010
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.object.ebc;
-import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
public class EqualByContentFacetImpl extends EqualByContentFacetAbstract {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncodableAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncodableAnnotationFacetFactory.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncodableAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncodableAnnotationFacetFactory.java Mon Nov 8 12:58:33 2010
@@ -24,13 +24,14 @@ import org.apache.isis.applib.annotation
import org.apache.isis.core.commons.lang.StringUtils;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.core.metamodel.config.IsisConfigurationAware;
+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.object.encodeable.EncodableFacet;
+import org.apache.isis.core.metamodel.java5.AnnotationBasedFacetFactoryAbstract;
+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.FacetHolder;
-import org.apache.isis.metamodel.facets.FacetUtil;
-import org.apache.isis.metamodel.facets.MethodRemover;
-import org.apache.isis.metamodel.java5.AnnotationBasedFacetFactoryAbstract;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContextAware;
public class EncodableAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract implements IsisConfigurationAware, RuntimeContextAware {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncodableFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncodableFacet.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncodableFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncodableFacet.java Mon Nov 8 12:58:33 2010
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.MultipleValueFacet;
+import org.apache.isis.core.metamodel.facets.MultipleValueFacet;
/**
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncodableFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncodableFacetAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncodableFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncodableFacetAbstract.java Mon Nov 8 12:58:33 2010
@@ -22,10 +22,11 @@ package org.apache.isis.metamodel.facets
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.FacetAbstract;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
import org.apache.isis.core.metamodel.util.ClassUtil;
-import org.apache.isis.metamodel.facets.FacetAbstract;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
public abstract class EncodableFacetAbstract extends FacetAbstract implements EncodableFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncodableFacetAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncodableFacetAnnotation.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncodableFacetAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncodableFacetAnnotation.java Mon Nov 8 12:58:33 2010
@@ -23,8 +23,8 @@ package org.apache.isis.metamodel.facets
import org.apache.isis.applib.annotation.Encodable;
import org.apache.isis.core.commons.lang.StringUtils;
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.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
public class EncodableFacetAnnotation extends EncodableFacetAbstract {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncodableFacetFromConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncodableFacetFromConfiguration.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncodableFacetFromConfiguration.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncodableFacetFromConfiguration.java Mon Nov 8 12:58:33 2010
@@ -20,8 +20,8 @@
package org.apache.isis.metamodel.facets.object.encodeable;
-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;
public class EncodableFacetFromConfiguration extends EncodableFacetAbstract {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncodableFacetUsingEncoderDecoder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncodableFacetUsingEncoderDecoder.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncodableFacetUsingEncoderDecoder.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncodableFacetUsingEncoderDecoder.java Mon Nov 8 12:58:33 2010
@@ -23,9 +23,10 @@ package org.apache.isis.metamodel.facets
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.core.commons.ensure.Assert;
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.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.facets.FacetAbstract;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
public class EncodableFacetUsingEncoderDecoder extends FacetAbstract implements EncodableFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncoderDecoderUtil.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncoderDecoderUtil.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncoderDecoderUtil.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncoderDecoderUtil.java Mon Nov 8 12:58:33 2010
@@ -23,8 +23,8 @@ package org.apache.isis.metamodel.facets
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.core.commons.lang.StringUtils;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
import org.apache.isis.core.metamodel.util.ClassUtil;
-import org.apache.isis.metamodel.facets.FacetHolder;
public final class EncoderDecoderUtil {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/facets/FacetsAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/facets/FacetsAnnotationFacetFactory.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/facets/FacetsAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/facets/FacetsAnnotationFacetFactory.java Mon Nov 8 12:58:33 2010
@@ -21,11 +21,11 @@
package org.apache.isis.metamodel.facets.object.facets;
import org.apache.isis.applib.annotation.Facets;
+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 FacetsAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/facets/FacetsFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/facets/FacetsFacet.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/facets/FacetsFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/facets/FacetsFacet.java Mon Nov 8 12:58:33 2010
@@ -20,9 +20,9 @@
package org.apache.isis.metamodel.facets.object.facets;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.FacetFactory;
-import org.apache.isis.metamodel.facets.MultipleValueFacet;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.FacetFactory;
+import org.apache.isis.core.metamodel.facets.MultipleValueFacet;
/**
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/facets/FacetsFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/facets/FacetsFacetAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/facets/FacetsFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/facets/FacetsFacetAbstract.java Mon Nov 8 12:58:33 2010
@@ -25,10 +25,10 @@ import java.util.List;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.factory.InstanceFactory;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.FacetAbstract;
-import org.apache.isis.metamodel.facets.FacetFactory;
-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.FacetFactory;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
public abstract class FacetsFacetAbstract extends FacetAbstract implements FacetsFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/facets/FacetsFacetAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/facets/FacetsFacetAnnotation.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/facets/FacetsFacetAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/facets/FacetsFacetAnnotation.java Mon Nov 8 12:58:33 2010
@@ -21,7 +21,7 @@
package org.apache.isis.metamodel.facets.object.facets;
import org.apache.isis.applib.annotation.Facets;
-import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
public class FacetsFacetAnnotation extends FacetsFacetAbstract {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/icon/IconFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/icon/IconFacet.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/icon/IconFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/icon/IconFacet.java Mon Nov 8 12:58:33 2010
@@ -20,8 +20,8 @@
package org.apache.isis.metamodel.facets.object.ident.icon;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.object.bounded.BoundedFacet;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.object.bounded.BoundedFacet;
import org.apache.isis.metamodel.facets.object.ident.plural.PluralFacet;
import org.apache.isis.metamodel.facets.object.ident.title.TitleFacet;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/icon/IconFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/icon/IconFacetAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/icon/IconFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/icon/IconFacetAbstract.java Mon Nov 8 12:58:33 2010
@@ -20,9 +20,9 @@
package org.apache.isis.metamodel.facets.object.ident.icon;
-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;
public abstract class IconFacetAbstract extends FacetAbstract implements IconFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/icon/IconFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/icon/IconFacetViaMethod.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/icon/IconFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/icon/IconFacetViaMethod.java Mon Nov 8 12:58:33 2010
@@ -23,8 +23,8 @@ package org.apache.isis.metamodel.facets
import java.lang.reflect.Method;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
import org.apache.isis.core.metamodel.util.ObjectInvokeUtils;
-import org.apache.isis.metamodel.facets.FacetHolder;
public class IconFacetViaMethod extends IconFacetAbstract {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/icon/IconMethodFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/icon/IconMethodFacetFactory.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/icon/IconMethodFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/icon/IconMethodFacetFactory.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.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetUtil;
+import org.apache.isis.core.metamodel.facets.MethodRemover;
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.MethodPrefixBasedFacetFactoryAbstract;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralAnnotationFacetFactory.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralAnnotationFacetFactory.java Mon Nov 8 12:58:33 2010
@@ -21,11 +21,11 @@
package org.apache.isis.metamodel.facets.object.ident.plural;
import org.apache.isis.applib.annotation.Plural;
+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 PluralAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralFacet.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralFacet.java Mon Nov 8 12:58:33 2010
@@ -19,7 +19,7 @@
package org.apache.isis.metamodel.facets.object.ident.plural;
-import org.apache.isis.metamodel.facets.SingleStringValueFacet;
+import org.apache.isis.core.metamodel.facets.SingleStringValueFacet;
import org.apache.isis.metamodel.facets.object.ident.icon.IconFacet;
import org.apache.isis.metamodel.facets.object.ident.title.TitleFacet;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralFacetAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralFacetAbstract.java Mon Nov 8 12:58:33 2010
@@ -20,9 +20,9 @@
package org.apache.isis.metamodel.facets.object.ident.plural;
-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;
public abstract class PluralFacetAbstract extends SingleStringValueFacetAbstract implements PluralFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralFacetAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralFacetAnnotation.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralFacetAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralFacetAnnotation.java Mon Nov 8 12:58:33 2010
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.object.ident.plural;
-import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
public class PluralFacetAnnotation extends PluralFacetAbstract {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralFacetInferred.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralFacetInferred.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralFacetInferred.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralFacetInferred.java Mon Nov 8 12:58:33 2010
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.object.ident.plural;
-import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
public class PluralFacetInferred extends PluralFacetAbstract {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralFacetViaMethod.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralFacetViaMethod.java Mon Nov 8 12:58:33 2010
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.object.ident.plural;
-import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
public class PluralFacetViaMethod extends PluralFacetAbstract {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralMethodFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralMethodFacetFactory.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralMethodFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralMethodFacetFactory.java Mon Nov 8 12:58:33 2010
@@ -22,11 +22,11 @@ package org.apache.isis.metamodel.facets
import java.lang.reflect.Method;
+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.spec.feature.ObjectFeatureType;
import org.apache.isis.core.metamodel.util.InvokeUtils;
-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.MethodPrefixBasedFacetFactoryAbstract;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/singular/NamedFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/singular/NamedFacetViaMethod.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/singular/NamedFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/singular/NamedFacetViaMethod.java Mon Nov 8 12:58:33 2010
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.object.ident.singular;
-import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.facets.naming.named.NamedFacetAbstract;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/singular/SingularMethodFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/singular/SingularMethodFacetFactory.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/singular/SingularMethodFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/singular/SingularMethodFacetFactory.java Mon Nov 8 12:58:33 2010
@@ -22,11 +22,11 @@ package org.apache.isis.metamodel.facets
import java.lang.reflect.Method;
+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.spec.feature.ObjectFeatureType;
import org.apache.isis.core.metamodel.util.InvokeUtils;
-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.MethodPrefixBasedFacetFactoryAbstract;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/title/TitleFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/title/TitleFacet.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/title/TitleFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/title/TitleFacet.java Mon Nov 8 12:58:33 2010
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.object.ident.title;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.Facet;
import org.apache.isis.metamodel.facets.object.ident.icon.IconFacet;
import org.apache.isis.metamodel.facets.object.ident.plural.PluralFacet;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/title/TitleFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/title/TitleFacetAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/title/TitleFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/title/TitleFacetAbstract.java Mon Nov 8 12:58:33 2010
@@ -20,9 +20,9 @@
package org.apache.isis.metamodel.facets.object.ident.title;
-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;
public abstract class TitleFacetAbstract extends FacetAbstract implements TitleFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/title/TitleFacetNone.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/title/TitleFacetNone.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/title/TitleFacetNone.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/title/TitleFacetNone.java Mon Nov 8 12:58:33 2010
@@ -21,7 +21,7 @@
package org.apache.isis.metamodel.facets.object.ident.title;
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 TitleFacetNone extends TitleFacetAbstract {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/title/TitleFacetUsingParser.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/title/TitleFacetUsingParser.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/title/TitleFacetUsingParser.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/title/TitleFacetUsingParser.java Mon Nov 8 12:58:33 2010
@@ -22,9 +22,9 @@ package org.apache.isis.metamodel.facets
import org.apache.isis.applib.adapters.Parser;
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.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.facets.FacetAbstract;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
public class TitleFacetUsingParser extends FacetAbstract implements TitleFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/title/TitleFacetViaTitleMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/title/TitleFacetViaTitleMethod.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/title/TitleFacetViaTitleMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/title/TitleFacetViaTitleMethod.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 TitleFacetViaTitleMethod extends TitleFacetAbstract implements ImperativeFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/title/TitleFacetViaToStringMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/title/TitleFacetViaToStringMethod.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/title/TitleFacetViaToStringMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/title/TitleFacetViaToStringMethod.java Mon Nov 8 12:58:33 2010
@@ -25,8 +25,8 @@ import java.util.Collections;
import java.util.List;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.java5.ImperativeFacet;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.java5.ImperativeFacet;
public class TitleFacetViaToStringMethod extends TitleFacetAbstract implements ImperativeFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/title/TitleMethodFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/title/TitleMethodFacetFactory.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/title/TitleMethodFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/title/TitleMethodFacetFactory.java Mon Nov 8 12:58:33 2010
@@ -23,10 +23,10 @@ package org.apache.isis.metamodel.facets
import java.lang.reflect.Method;
import org.apache.isis.core.commons.lang.JavaClassUtils;
+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.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.FallbackFacetFactory;
import org.apache.isis.metamodel.java5.MethodPrefixBasedFacetFactoryAbstract;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/DisabledFacetDerivedFromImmutable.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/DisabledFacetDerivedFromImmutable.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/DisabledFacetDerivedFromImmutable.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/DisabledFacetDerivedFromImmutable.java Mon Nov 8 12:58:33 2010
@@ -21,7 +21,8 @@
package org.apache.isis.metamodel.facets.object.immutable;
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.facets.object.immutable.ImmutableFacet;
import org.apache.isis.metamodel.facets.disable.DisabledFacetAbstract;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableAnnotationFacetFactory.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableAnnotationFacetFactory.java Mon Nov 8 12:58:33 2010
@@ -23,12 +23,13 @@ package org.apache.isis.metamodel.facets
import java.lang.reflect.Method;
import org.apache.isis.applib.annotation.Immutable;
+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.object.immutable.ImmutableFacet;
+import org.apache.isis.core.metamodel.java5.AnnotationBasedFacetFactoryAbstract;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
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 ImmutableAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableFacet.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableFacet.java Mon Nov 8 12:58:33 2010
@@ -19,10 +19,10 @@
package org.apache.isis.metamodel.facets.object.immutable;
-import org.apache.isis.metamodel.facets.SingleWhenValueFacet;
+import org.apache.isis.core.metamodel.facets.SingleWhenValueFacet;
+import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
+import org.apache.isis.core.metamodel.interactions.DisablingInteractionAdvisor;
import org.apache.isis.metamodel.facets.object.ebc.EqualByContentFacet;
-import org.apache.isis.metamodel.facets.object.value.ValueFacet;
-import org.apache.isis.metamodel.interactions.DisablingInteractionAdvisor;
/**
* Indicates that the instances of this class are immutable and so may not be modified either through the viewer or
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableFacetAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableFacetAbstract.java Mon Nov 8 12:58:33 2010
@@ -22,11 +22,12 @@ 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.facets.object.immutable.ImmutableFacet;
+import org.apache.isis.core.metamodel.interactions.UsabilityContext;
public abstract class ImmutableFacetAbstract extends SingleWhenValueFacetAbstract implements ImmutableFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableFacetAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableFacetAnnotation.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableFacetAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableFacetAnnotation.java Mon Nov 8 12:58:33 2010
@@ -20,8 +20,8 @@
package org.apache.isis.metamodel.facets.object.immutable;
-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 ImmutableFacetAnnotation extends ImmutableFacetImpl {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableFacetImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableFacetImpl.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableFacetImpl.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableFacetImpl.java Mon Nov 8 12:58:33 2010
@@ -21,8 +21,8 @@
package org.apache.isis.metamodel.facets.object.immutable;
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 ImmutableFacetImpl extends ImmutableFacetAbstract {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableFacetMarkerInterface.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableFacetMarkerInterface.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableFacetMarkerInterface.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableFacetMarkerInterface.java Mon Nov 8 12:58:33 2010
@@ -20,8 +20,8 @@
package org.apache.isis.metamodel.facets.object.immutable;
-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 ImmutableFacetMarkerInterface extends ImmutableFacetImpl {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableFacetNever.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableFacetNever.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableFacetNever.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableFacetNever.java Mon Nov 8 12:58:33 2010
@@ -21,8 +21,8 @@
package org.apache.isis.metamodel.facets.object.immutable;
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 ImmutableFacetNever extends ImmutableFacetAbstract {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableMarkerInterfacesFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableMarkerInterfacesFacetFactory.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableMarkerInterfacesFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableMarkerInterfacesFacetFactory.java Mon Nov 8 12:58:33 2010
@@ -24,12 +24,13 @@ import org.apache.isis.applib.marker.Alw
import org.apache.isis.applib.marker.ImmutableOncePersisted;
import org.apache.isis.applib.marker.ImmutableUntilPersisted;
import org.apache.isis.applib.marker.NeverImmutable;
+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.When;
+import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;
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.metamodel.facets.When;
public class ImmutableMarkerInterfacesFacetFactory extends FacetFactoryAbstract {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/notpersistable/InitiatedBy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/notpersistable/InitiatedBy.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/notpersistable/InitiatedBy.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/notpersistable/InitiatedBy.java Mon Nov 8 12:58:33 2010
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.object.notpersistable;
-import org.apache.isis.metamodel.facets.EnumerationAbstract;
+import org.apache.isis.core.metamodel.facets.EnumerationAbstract;
public final class InitiatedBy extends EnumerationAbstract {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/notpersistable/NotPersistableAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/notpersistable/NotPersistableAnnotationFacetFactory.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/notpersistable/NotPersistableAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/notpersistable/NotPersistableAnnotationFacetFactory.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.NotPersistable;
+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 NotPersistableAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/notpersistable/NotPersistableFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/notpersistable/NotPersistableFacet.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/notpersistable/NotPersistableFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/notpersistable/NotPersistableFacet.java Mon Nov 8 12:58:33 2010
@@ -19,8 +19,8 @@
package org.apache.isis.metamodel.facets.object.notpersistable;
-import org.apache.isis.metamodel.facets.SingleValueFacet;
-import org.apache.isis.metamodel.interactions.DisablingInteractionAdvisor;
+import org.apache.isis.core.metamodel.facets.SingleValueFacet;
+import org.apache.isis.core.metamodel.interactions.DisablingInteractionAdvisor;
/**
* Indicates that the instances of this class are not persistable either by the user (through the viewer) or at all
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/notpersistable/NotPersistableFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/notpersistable/NotPersistableFacetAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/notpersistable/NotPersistableFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/notpersistable/NotPersistableFacetAbstract.java Mon Nov 8 12:58:33 2010
@@ -20,9 +20,9 @@
package org.apache.isis.metamodel.facets.object.notpersistable;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.SingleValueFacetAbstract;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.SingleValueFacetAbstract;
public abstract class NotPersistableFacetAbstract extends SingleValueFacetAbstract implements NotPersistableFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/notpersistable/NotPersistableFacetAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/notpersistable/NotPersistableFacetAnnotation.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/notpersistable/NotPersistableFacetAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/notpersistable/NotPersistableFacetAnnotation.java Mon Nov 8 12:58:33 2010
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.object.notpersistable;
-import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
public class NotPersistableFacetAnnotation extends NotPersistableFacetImpl {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/notpersistable/NotPersistableFacetImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/notpersistable/NotPersistableFacetImpl.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/notpersistable/NotPersistableFacetImpl.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/notpersistable/NotPersistableFacetImpl.java Mon Nov 8 12:58:33 2010
@@ -21,8 +21,8 @@
package org.apache.isis.metamodel.facets.object.notpersistable;
import org.apache.isis.applib.events.UsabilityEvent;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.interactions.UsabilityContext;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.interactions.UsabilityContext;
public class NotPersistableFacetImpl extends NotPersistableFacetAbstract {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/notpersistable/NotPersistableFacetMarkerInterface.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/notpersistable/NotPersistableFacetMarkerInterface.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/notpersistable/NotPersistableFacetMarkerInterface.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/notpersistable/NotPersistableFacetMarkerInterface.java Mon Nov 8 12:58:33 2010
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.facets.object.notpersistable;
-import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
public class NotPersistableFacetMarkerInterface extends NotPersistableFacetImpl {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/notpersistable/NotPersistableFacetNull.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/notpersistable/NotPersistableFacetNull.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/notpersistable/NotPersistableFacetNull.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/notpersistable/NotPersistableFacetNull.java Mon Nov 8 12:58:33 2010
@@ -21,8 +21,8 @@
package org.apache.isis.metamodel.facets.object.notpersistable;
import org.apache.isis.applib.events.UsabilityEvent;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.interactions.UsabilityContext;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.interactions.UsabilityContext;
import org.apache.isis.metamodel.java5.FallbackFacetFactory;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/notpersistable/NotPersistableMarkerInterfacesFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/notpersistable/NotPersistableMarkerInterfacesFacetFactory.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/notpersistable/NotPersistableMarkerInterfacesFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/notpersistable/NotPersistableMarkerInterfacesFacetFactory.java Mon Nov 8 12:58:33 2010
@@ -24,11 +24,11 @@ import java.lang.reflect.Method;
import org.apache.isis.applib.marker.NonPersistable;
import org.apache.isis.applib.marker.ProgramPersistable;
+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.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;
public class NotPersistableMarkerInterfacesFacetFactory extends FacetFactoryAbstract {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/ParseableFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/ParseableFacet.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/ParseableFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/ParseableFacet.java Mon Nov 8 12:58:33 2010
@@ -23,7 +23,7 @@ package org.apache.isis.metamodel.facets
import org.apache.isis.core.metamodel.adapter.InvalidEntryException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
-import org.apache.isis.metamodel.facets.MultipleValueFacet;
+import org.apache.isis.core.metamodel.facets.MultipleValueFacet;
import org.apache.isis.metamodel.facets.object.ident.title.TitleFacet;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/ParseableFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/ParseableFacetAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/ParseableFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/ParseableFacetAbstract.java Mon Nov 8 12:58:33 2010
@@ -22,10 +22,11 @@ package org.apache.isis.metamodel.facets
import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.FacetAbstract;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
import org.apache.isis.core.metamodel.util.ClassUtil;
-import org.apache.isis.metamodel.facets.FacetAbstract;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
public abstract class ParseableFacetAbstract extends FacetAbstract implements ParseableFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/ParseableFacetAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/ParseableFacetAnnotation.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/ParseableFacetAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/ParseableFacetAnnotation.java Mon Nov 8 12:58:33 2010
@@ -23,8 +23,8 @@ package org.apache.isis.metamodel.facets
import org.apache.isis.applib.annotation.Parseable;
import org.apache.isis.core.commons.lang.StringUtils;
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.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
public class ParseableFacetAnnotation extends ParseableFacetAbstract {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/ParseableFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/ParseableFacetFactory.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/ParseableFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/ParseableFacetFactory.java Mon Nov 8 12:58:33 2010
@@ -24,13 +24,13 @@ import org.apache.isis.applib.annotation
import org.apache.isis.core.commons.lang.StringUtils;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.core.metamodel.config.IsisConfigurationAware;
+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.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.FacetHolder;
-import org.apache.isis.metamodel.facets.FacetUtil;
-import org.apache.isis.metamodel.facets.MethodRemover;
-import org.apache.isis.metamodel.java5.AnnotationBasedFacetFactoryAbstract;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContextAware;
public class ParseableFacetFactory extends AnnotationBasedFacetFactoryAbstract implements IsisConfigurationAware, RuntimeContextAware {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/ParseableFacetFromConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/ParseableFacetFromConfiguration.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/ParseableFacetFromConfiguration.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/ParseableFacetFromConfiguration.java Mon Nov 8 12:58:33 2010
@@ -20,8 +20,8 @@
package org.apache.isis.metamodel.facets.object.parseable;
-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;
public class ParseableFacetFromConfiguration extends ParseableFacetAbstract {