incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1051971 [4/18] - in /incubator/isis/trunk: alternatives/bytecode/identity/src/main/java/org/apache/isis/alternatives/bytecode/identity/objectfactory/ alternatives/bytecode/javassist/src/main/java/org/apache/isis/alternatives/bytecode/javas...
Date Wed, 22 Dec 2010 16:22:32 GMT
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actcoll/typeof/TypeOfFacetDefaultToObject.java (from r1051471, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetDefaultToObject.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actcoll/typeof/TypeOfFacetDefaultToObject.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actcoll/typeof/TypeOfFacetDefaultToObject.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetDefaultToObject.java&r1=1051471&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetDefaultToObject.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actcoll/typeof/TypeOfFacetDefaultToObject.java Wed Dec 22 16:22:08 2010
@@ -18,10 +18,10 @@
  */
 
 
-package org.apache.isis.core.progmodel.facets.actcoll.typeof;
+package org.apache.isis.core.metamodel.facets.actcoll.typeof;
 
 import org.apache.isis.core.metamodel.facets.FacetHolder;
-import org.apache.isis.core.metamodel.runtimecontext.SpecificationLookup;
+import org.apache.isis.core.metamodel.spec.SpecificationLookup;
 
 
 public class TypeOfFacetDefaultToObject extends TypeOfFacetAbstract {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/CollectionFacetAbstract.java (from r1051446, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/modify/CollectionFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/CollectionFacetAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/CollectionFacetAbstract.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/modify/CollectionFacetAbstract.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/modify/CollectionFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/CollectionFacetAbstract.java Wed Dec 22 16:22:08 2010
@@ -18,13 +18,14 @@
  */
 
 
-package org.apache.isis.core.progmodel.facets.collections.modify;
+package org.apache.isis.core.metamodel.facets.collections;
 
 import java.util.Collection;
 import java.util.Enumeration;
 import java.util.Iterator;
 
 import org.apache.commons.collections.iterators.IteratorEnumeration;
+
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.FacetAbstract;
 import org.apache.isis.core.metamodel.facets.FacetHolder;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionFacetUtils.java (from r1051446, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/CollectionFacetUtils.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionFacetUtils.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionFacetUtils.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/CollectionFacetUtils.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/CollectionFacetUtils.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionFacetUtils.java Wed Dec 22 16:22:08 2010
@@ -18,13 +18,12 @@
  */
 
 
-package org.apache.isis.core.metamodel.util;
-
-import java.util.ArrayList;
-import java.util.List;
+package org.apache.isis.core.metamodel.facets.collections.modify;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/facets/FacetsFacet.java (from r1051446, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/facets/FacetsFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/facets/FacetsFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/facets/FacetsFacet.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/facets/FacetsFacet.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/facets/FacetsFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/facets/FacetsFacet.java Wed Dec 22 16:22:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.progmodel.facets.object.facets;
+package org.apache.isis.core.metamodel.facets.facets;
 
 import org.apache.isis.core.metamodel.facets.Facet;
 import org.apache.isis.core.metamodel.facets.FacetFactory;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/naming/NamedAndDescribedNameComparator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/naming/NamedAndDescribedNameComparator.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/naming/NamedAndDescribedNameComparator.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/naming/NamedAndDescribedNameComparator.java Wed Dec 22 16:22:08 2010
@@ -20,9 +20,9 @@
 
 package org.apache.isis.core.metamodel.facets.naming;
 
-import java.io.Serializable;
-import java.util.Comparator;
-
+import java.io.Serializable;
+import java.util.Comparator;
+
 import org.apache.isis.core.metamodel.spec.NamedAndDescribed;
 
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/naming/named/NamedFacetAbstract.java (from r1051446, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/naming/named/NamedFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/naming/named/NamedFacetAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/naming/named/NamedFacetAbstract.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/naming/named/NamedFacetAbstract.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/naming/named/NamedFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/naming/named/NamedFacetAbstract.java Wed Dec 22 16:22:08 2010
@@ -18,12 +18,11 @@
  */
 
 
-package org.apache.isis.core.progmodel.facets.naming.named;
+package org.apache.isis.core.metamodel.facets.naming.named;
 
 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.naming.named.NamedFacet;
 
 
 public abstract class NamedFacetAbstract extends SingleStringValueFacetAbstract implements NamedFacet {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/naming/named/NamedFacetInferred.java (from r1051446, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/naming/named/NamedFacetInferred.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/naming/named/NamedFacetInferred.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/naming/named/NamedFacetInferred.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/naming/named/NamedFacetInferred.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/naming/named/NamedFacetInferred.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/naming/named/NamedFacetInferred.java Wed Dec 22 16:22:08 2010
@@ -18,12 +18,12 @@
  */
 
 
-package org.apache.isis.core.progmodel.facets.naming.named;
+package org.apache.isis.core.metamodel.facets.naming.named;
 
 import org.apache.isis.core.metamodel.facets.FacetHolder;
 
 
-public class NamedFacetInferred extends NamedFacetImpl {
+public class NamedFacetInferred extends NamedFacetAbstract {
 
     public NamedFacetInferred(final String value, final FacetHolder holder) {
         super(value, holder);

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/CallbackFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/CallbackFacet.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/CallbackFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/CallbackFacet.java Wed Dec 22 16:22:08 2010
@@ -22,7 +22,7 @@ package org.apache.isis.core.metamodel.f
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.java5.ImperativeFacetMulti;
+import org.apache.isis.core.metamodel.facets.ImperativeFacetMulti;
 
 
 /**

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/CallbackUtils.java (from r1051446, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/CallbackUtils.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/CallbackUtils.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/CallbackUtils.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/CallbackUtils.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/CallbackUtils.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/CallbackUtils.java Wed Dec 22 16:22:08 2010
@@ -18,11 +18,10 @@
  */
 
 
-package org.apache.isis.core.metamodel.util;
+package org.apache.isis.core.metamodel.facets.object.callbacks;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.facets.object.callbacks.CallbackFacet;
 
 public final class CallbackUtils {
 	

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/CreatedCallbackFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/CreatedCallbackFacet.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/CreatedCallbackFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/CreatedCallbackFacet.java Wed Dec 22 16:22:08 2010
@@ -19,9 +19,6 @@
 
 package org.apache.isis.core.metamodel.facets.object.callbacks;
 
-import org.apache.isis.core.metamodel.facets.object.callbacks.CallbackFacet;
-import org.apache.isis.core.metamodel.facets.object.callbacks.LoadedCallbackFacet;
-import org.apache.isis.core.metamodel.facets.object.callbacks.LoadingCallbackFacet;
 
 /**
  * Represents the mechanism to inform the object that it has just been created.

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LifeCycleEvent.java (from r1051446, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/LifeCycleEvent.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LifeCycleEvent.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LifeCycleEvent.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/LifeCycleEvent.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/LifeCycleEvent.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LifeCycleEvent.java Wed Dec 22 16:22:08 2010
@@ -18,63 +18,21 @@
  */
 
 
-package org.apache.isis.core.metamodel.adapter;
+package org.apache.isis.core.metamodel.facets.object.callbacks;
 
 import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.facets.object.callbacks.CreatedCallbackFacet;
-import org.apache.isis.core.metamodel.facets.object.callbacks.LoadedCallbackFacet;
-import org.apache.isis.core.metamodel.facets.object.callbacks.LoadingCallbackFacet;
-import org.apache.isis.core.metamodel.facets.object.callbacks.PersistedCallbackFacet;
-import org.apache.isis.core.metamodel.facets.object.callbacks.PersistingCallbackFacet;
-import org.apache.isis.core.metamodel.facets.object.callbacks.RemovedCallbackFacet;
-import org.apache.isis.core.metamodel.facets.object.callbacks.RemovingCallbackFacet;
-import org.apache.isis.core.metamodel.facets.object.callbacks.UpdatedCallbackFacet;
-import org.apache.isis.core.metamodel.facets.object.callbacks.UpdatingCallbackFacet;
-
-
-public class LifeCycleEvent {
-    /**
-     * Index for the life cycle method marking the logical creation of an object.
-     */
-    public static final LifeCycleEvent CREATED = new LifeCycleEvent(CreatedCallbackFacet.class);
-    /**
-     * Index for the life cycle method marking the end of the deleting process.
-     */
-    public static final LifeCycleEvent DELETED = new LifeCycleEvent(RemovedCallbackFacet.class);
-    /**
-     * Index for the life cycle method marking the beginning of the deleting process.
-     */
-    public static final LifeCycleEvent DELETING = new LifeCycleEvent(RemovingCallbackFacet.class);
-
-    /**
-     * Index for the life cycle method marking the end of the loading process.
-     */
-    public static final LifeCycleEvent LOADED = new LifeCycleEvent(LoadedCallbackFacet.class);
-
-    /**
-     * Index for the life cycle method marking the beginning of the loading process.
-     */
-    public static final LifeCycleEvent LOADING = new LifeCycleEvent(LoadingCallbackFacet.class);
-
-    /**
-     * Index for the life cycle method marking the end of the save process.
-     */
-    public static final LifeCycleEvent SAVED = new LifeCycleEvent(PersistedCallbackFacet.class);
-
-    /**
-     * Index for the life cycle method marking the beginning of the save process.
-     */
-    public static final LifeCycleEvent SAVING = new LifeCycleEvent(PersistingCallbackFacet.class);
-
-    /**
-     * Index for the life cycle method marking the end of the updating process.
-     */
-    public static final LifeCycleEvent UPDATED = new LifeCycleEvent(UpdatedCallbackFacet.class);
-
-    /**
-     * Index for the life cycle method marking the beginning of the updating process.
-     */
-    public static final LifeCycleEvent UPDATING = new LifeCycleEvent(UpdatingCallbackFacet.class);
+
+
+public enum LifeCycleEvent {
+    CREATED(CreatedCallbackFacet.class),
+    DELETED(RemovedCallbackFacet.class),
+    DELETING(RemovingCallbackFacet.class),
+    LOADED(LoadedCallbackFacet.class),
+    LOADING(LoadingCallbackFacet.class),
+    SAVED(PersistedCallbackFacet.class),
+    SAVING(PersistingCallbackFacet.class),
+    UPDATED(UpdatedCallbackFacet.class),
+    UPDATING(UpdatingCallbackFacet.class);
 
     private final Class<? extends Facet> cls;
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LoadedCallbackFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LoadedCallbackFacet.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LoadedCallbackFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LoadedCallbackFacet.java Wed Dec 22 16:22:08 2010
@@ -19,9 +19,6 @@
 
 package org.apache.isis.core.metamodel.facets.object.callbacks;
 
-import org.apache.isis.core.metamodel.facets.object.callbacks.CallbackFacet;
-import org.apache.isis.core.metamodel.facets.object.callbacks.CreatedCallbackFacet;
-import org.apache.isis.core.metamodel.facets.object.callbacks.LoadingCallbackFacet;
 
 /**
  * Represents the mechanism to inform the object that it has just been loaded from the object store.

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LoadingCallbackFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LoadingCallbackFacet.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LoadingCallbackFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LoadingCallbackFacet.java Wed Dec 22 16:22:08 2010
@@ -19,9 +19,6 @@
 
 package org.apache.isis.core.metamodel.facets.object.callbacks;
 
-import org.apache.isis.core.metamodel.facets.object.callbacks.CallbackFacet;
-import org.apache.isis.core.metamodel.facets.object.callbacks.CreatedCallbackFacet;
-import org.apache.isis.core.metamodel.facets.object.callbacks.LoadingCallbackFacet;
 
 /**
  * Represents the mechanism to inform the object that it is about to be loaded from the object store.

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistedCallbackFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistedCallbackFacet.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistedCallbackFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistedCallbackFacet.java Wed Dec 22 16:22:08 2010
@@ -19,8 +19,6 @@
 
 package org.apache.isis.core.metamodel.facets.object.callbacks;
 
-import org.apache.isis.core.metamodel.facets.object.callbacks.CallbackFacet;
-import org.apache.isis.core.metamodel.facets.object.callbacks.PersistingCallbackFacet;
 
 /**
  * Represents the mechanism to inform the object that it has been persisted to the object store for the first time.

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistingCallbackFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistingCallbackFacet.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistingCallbackFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistingCallbackFacet.java Wed Dec 22 16:22:08 2010
@@ -19,8 +19,6 @@
 
 package org.apache.isis.core.metamodel.facets.object.callbacks;
 
-import org.apache.isis.core.metamodel.facets.object.callbacks.CallbackFacet;
-import org.apache.isis.core.metamodel.facets.object.callbacks.PersistedCallbackFacet;
 
 /**
  * Represents the mechanism to inform the object that it is about to be persisted to the object store for the first

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/RemovedCallbackFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/RemovedCallbackFacet.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/RemovedCallbackFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/RemovedCallbackFacet.java Wed Dec 22 16:22:08 2010
@@ -19,8 +19,6 @@
 
 package org.apache.isis.core.metamodel.facets.object.callbacks;
 
-import org.apache.isis.core.metamodel.facets.object.callbacks.CallbackFacet;
-import org.apache.isis.core.metamodel.facets.object.callbacks.RemovingCallbackFacet;
 
 /**
  * Represents the mechanism to inform the object that it has just been deleted.

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/RemovingCallbackFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/RemovingCallbackFacet.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/RemovingCallbackFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/RemovingCallbackFacet.java Wed Dec 22 16:22:08 2010
@@ -19,8 +19,6 @@
 
 package org.apache.isis.core.metamodel.facets.object.callbacks;
 
-import org.apache.isis.core.metamodel.facets.object.callbacks.CallbackFacet;
-import org.apache.isis.core.metamodel.facets.object.callbacks.RemovedCallbackFacet;
 
 /**
  * Represents the mechanism to inform the object that it about to be deleted.

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatedCallbackFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatedCallbackFacet.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatedCallbackFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatedCallbackFacet.java Wed Dec 22 16:22:08 2010
@@ -19,9 +19,6 @@
 
 package org.apache.isis.core.metamodel.facets.object.callbacks;
 
-import org.apache.isis.core.metamodel.facets.object.callbacks.CallbackFacet;
-import org.apache.isis.core.metamodel.facets.object.callbacks.PersistedCallbackFacet;
-import org.apache.isis.core.metamodel.facets.object.callbacks.UpdatingCallbackFacet;
 
 /**
  * Represents the mechanism to inform the object that it has been updated in the object store.

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatingCallbackFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatingCallbackFacet.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatingCallbackFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatingCallbackFacet.java Wed Dec 22 16:22:08 2010
@@ -19,9 +19,6 @@
 
 package org.apache.isis.core.metamodel.facets.object.callbacks;
 
-import org.apache.isis.core.metamodel.facets.object.callbacks.CallbackFacet;
-import org.apache.isis.core.metamodel.facets.object.callbacks.PersistedCallbackFacet;
-import org.apache.isis.core.metamodel.facets.object.callbacks.UpdatedCallbackFacet;
 
 /**
  * Represents the mechanism to inform the object that it is about to be updated in the object store.

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/dirty/ClearDirtyObjectFacet.java (from r1051446, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/dirty/ClearDirtyObjectFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/dirty/ClearDirtyObjectFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/dirty/ClearDirtyObjectFacet.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/dirty/ClearDirtyObjectFacet.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/dirty/ClearDirtyObjectFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/dirty/ClearDirtyObjectFacet.java Wed Dec 22 16:22:08 2010
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.progmodel.facets.object.dirty;
+package org.apache.isis.core.metamodel.facets.object.dirty;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/dirty/DirtyObjectFacet.java (from r1051446, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/dirty/DirtyObjectFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/dirty/DirtyObjectFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/dirty/DirtyObjectFacet.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/dirty/DirtyObjectFacet.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/dirty/DirtyObjectFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/dirty/DirtyObjectFacet.java Wed Dec 22 16:22:08 2010
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.progmodel.facets.object.dirty;
+package org.apache.isis.core.metamodel.facets.object.dirty;
 
 import org.apache.isis.core.metamodel.facets.Facet;
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/dirty/IsDirtyObjectFacet.java (from r1051446, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/dirty/IsDirtyObjectFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/dirty/IsDirtyObjectFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/dirty/IsDirtyObjectFacet.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/dirty/IsDirtyObjectFacet.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/dirty/IsDirtyObjectFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/dirty/IsDirtyObjectFacet.java Wed Dec 22 16:22:08 2010
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.progmodel.facets.object.dirty;
+package org.apache.isis.core.metamodel.facets.object.dirty;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/dirty/MarkDirtyObjectFacet.java (from r1051446, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/dirty/MarkDirtyObjectFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/dirty/MarkDirtyObjectFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/dirty/MarkDirtyObjectFacet.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/dirty/MarkDirtyObjectFacet.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/dirty/MarkDirtyObjectFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/dirty/MarkDirtyObjectFacet.java Wed Dec 22 16:22:08 2010
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.progmodel.facets.object.dirty;
+package org.apache.isis.core.metamodel.facets.object.dirty;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/EncodableFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/EncodableFacet.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/EncodableFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/EncodableFacet.java Wed Dec 22 16:22:08 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.metamodel.facets.object.encodeable;
 
-import org.apache.isis.applib.adapters.EncoderDecoder;
+import org.apache.isis.applib.adapters.EncoderDecoder;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.MultipleValueFacet;
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ident/icon/IconFacet.java (from r1051446, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ident/icon/IconFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ident/icon/IconFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ident/icon/IconFacet.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ident/icon/IconFacet.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ident/icon/IconFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ident/icon/IconFacet.java Wed Dec 22 16:22:08 2010
@@ -17,20 +17,17 @@
  *  under the License.
  */
 
-package org.apache.isis.core.progmodel.facets.object.ident.icon;
+package org.apache.isis.core.metamodel.facets.object.ident.icon;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.facets.object.bounded.BoundedFacet;
-import org.apache.isis.core.progmodel.facets.object.ident.plural.PluralFacet;
-import org.apache.isis.core.progmodel.facets.object.ident.title.TitleFacet;
 
-/**
- * Mechanism for obtaining the name of the icon for <i>this instance</i> of a class.
+/*
+ * Icon for an object a class (for example, by placing an appropriately named image
+ * file into a certain directory). 
  * 
  * <p>
- * Typically a single icon is used for every instance of a class (for example, by placing an appropriately named image
- * file into a certain directory). This facet allows the icon to be changed on an instance-by-instance basis. For
+ * The facet is checked each time the object is rendered, allowing the icon to be changed on an instance-by-instance basis. For
  * example, the icon might be adapted with an overlay to represent its state through some well-defined lifecycle (eg
  * pending approval, approved, rejected). Alternatively a {@link BoundedFacet bounded} class might have completely
  * different icons for its instances (eg Visa, Mastercard, Amex).

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ident/plural/PluralFacet.java (from r1051446, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ident/plural/PluralFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ident/plural/PluralFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ident/plural/PluralFacet.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ident/plural/PluralFacet.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ident/plural/PluralFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ident/plural/PluralFacet.java Wed Dec 22 16:22:08 2010
@@ -17,11 +17,11 @@
  *  under the License.
  */
 
-package org.apache.isis.core.progmodel.facets.object.ident.plural;
+package org.apache.isis.core.metamodel.facets.object.ident.plural;
 
 import org.apache.isis.core.metamodel.facets.SingleStringValueFacet;
-import org.apache.isis.core.progmodel.facets.object.ident.icon.IconFacet;
-import org.apache.isis.core.progmodel.facets.object.ident.title.TitleFacet;
+import org.apache.isis.core.metamodel.facets.object.ident.icon.IconFacet;
+import org.apache.isis.core.metamodel.facets.object.ident.title.TitleFacet;
 
 /**
  * Mechanism for obtaining the plural title of an instance of a class, used to label a collection of a certain class.

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ident/plural/PluralFacetAbstract.java (from r1051446, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ident/plural/PluralFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ident/plural/PluralFacetAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ident/plural/PluralFacetAbstract.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ident/plural/PluralFacetAbstract.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ident/plural/PluralFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ident/plural/PluralFacetAbstract.java Wed Dec 22 16:22:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.progmodel.facets.object.ident.plural;
+package org.apache.isis.core.metamodel.facets.object.ident.plural;
 
 import org.apache.isis.core.metamodel.facets.Facet;
 import org.apache.isis.core.metamodel.facets.FacetHolder;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ident/plural/PluralFacetInferred.java (from r1051446, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ident/plural/PluralFacetInferred.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ident/plural/PluralFacetInferred.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ident/plural/PluralFacetInferred.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ident/plural/PluralFacetInferred.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ident/plural/PluralFacetInferred.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ident/plural/PluralFacetInferred.java Wed Dec 22 16:22:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.progmodel.facets.object.ident.plural;
+package org.apache.isis.core.metamodel.facets.object.ident.plural;
 
 import org.apache.isis.core.metamodel.facets.FacetHolder;
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ident/title/TitleFacet.java (from r1051446, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ident/title/TitleFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ident/title/TitleFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ident/title/TitleFacet.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ident/title/TitleFacet.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ident/title/TitleFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ident/title/TitleFacet.java Wed Dec 22 16:22:08 2010
@@ -17,12 +17,12 @@
  *  under the License.
  */
 
-package org.apache.isis.core.progmodel.facets.object.ident.title;
+package org.apache.isis.core.metamodel.facets.object.ident.title;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.progmodel.facets.object.ident.icon.IconFacet;
-import org.apache.isis.core.progmodel.facets.object.ident.plural.PluralFacet;
+import org.apache.isis.core.metamodel.facets.object.ident.icon.IconFacet;
+import org.apache.isis.core.metamodel.facets.object.ident.plural.PluralFacet;
 
 /**
  * Mechanism for obtaining the title of an instance of a class, used to label the instance in the viewer (usually

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/isis/RemoveSetDomainObjectContainerMethodFacetFactory.java (from r1051446, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveSetDomainObjectContainerMethodFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/isis/RemoveSetDomainObjectContainerMethodFacetFactory.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/isis/RemoveSetDomainObjectContainerMethodFacetFactory.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveSetDomainObjectContainerMethodFacetFactory.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveSetDomainObjectContainerMethodFacetFactory.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/isis/RemoveSetDomainObjectContainerMethodFacetFactory.java Wed Dec 22 16:22:08 2010
@@ -18,14 +18,14 @@
  */
 
 
-package org.apache.isis.core.metamodel.java5;
+package org.apache.isis.core.metamodel.facets.object.isis;
 
-import org.apache.isis.applib.DomainObjectContainer;
+import org.apache.isis.applib.DomainObjectContainer;
 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.MethodScope;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.feature.FeatureType;
 
 
 /**
@@ -34,7 +34,7 @@ import org.apache.isis.core.metamodel.sp
 public class RemoveSetDomainObjectContainerMethodFacetFactory extends FacetFactoryAbstract {
 
     public RemoveSetDomainObjectContainerMethodFacetFactory() {
-        super(ObjectFeatureType.OBJECTS_ONLY);
+        super(FeatureType.OBJECTS_ONLY);
     }
 
     @Override

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/isis/RemoveStaticGettersAndSettersFacetFactory.java (from r1051446, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveStaticGettersAndSettersFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/isis/RemoveStaticGettersAndSettersFacetFactory.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/isis/RemoveStaticGettersAndSettersFacetFactory.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveStaticGettersAndSettersFacetFactory.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveStaticGettersAndSettersFacetFactory.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/isis/RemoveStaticGettersAndSettersFacetFactory.java Wed Dec 22 16:22:08 2010
@@ -18,13 +18,13 @@
  */
 
 
-package org.apache.isis.core.metamodel.java5;
+package org.apache.isis.core.metamodel.facets.object.isis;
 
 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.MethodScope;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.feature.FeatureType;
 
 
 /**
@@ -33,7 +33,7 @@ import org.apache.isis.core.metamodel.sp
 public class RemoveStaticGettersAndSettersFacetFactory extends FacetFactoryAbstract {
 
     public RemoveStaticGettersAndSettersFacetFactory() {
-        super(ObjectFeatureType.OBJECTS_ONLY);
+        super(FeatureType.OBJECTS_ONLY);
     }
 
     @Override

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/java5/RemoveGetClassMethodFacetFactory.java (from r1051446, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveGetClassMethodFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/java5/RemoveGetClassMethodFacetFactory.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/java5/RemoveGetClassMethodFacetFactory.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveGetClassMethodFacetFactory.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveGetClassMethodFacetFactory.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/java5/RemoveGetClassMethodFacetFactory.java Wed Dec 22 16:22:08 2010
@@ -18,13 +18,13 @@
  */
 
 
-package org.apache.isis.core.metamodel.java5;
+package org.apache.isis.core.metamodel.facets.object.java5;
 
 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.MethodScope;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.feature.FeatureType;
 
 
 /**
@@ -36,7 +36,7 @@ import org.apache.isis.core.metamodel.sp
 public class RemoveGetClassMethodFacetFactory extends FacetFactoryAbstract {
 
     public RemoveGetClassMethodFacetFactory() {
-        super(ObjectFeatureType.OBJECTS_ONLY);
+        super(FeatureType.OBJECTS_ONLY);
     }
 
     @Override

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/java5/RemoveInitMethodFacetFactory.java (from r1051446, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveInitMethodFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/java5/RemoveInitMethodFacetFactory.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/java5/RemoveInitMethodFacetFactory.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveInitMethodFacetFactory.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveInitMethodFacetFactory.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/java5/RemoveInitMethodFacetFactory.java Wed Dec 22 16:22:08 2010
@@ -18,13 +18,13 @@
  */
 
 
-package org.apache.isis.core.metamodel.java5;
+package org.apache.isis.core.metamodel.facets.object.java5;
 
 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.MethodScope;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.feature.FeatureType;
 
 
 /**
@@ -33,7 +33,7 @@ import org.apache.isis.core.metamodel.sp
 public class RemoveInitMethodFacetFactory extends FacetFactoryAbstract {
 
     public RemoveInitMethodFacetFactory() {
-        super(ObjectFeatureType.OBJECTS_ONLY);
+        super(FeatureType.OBJECTS_ONLY);
     }
 
     @Override

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/java5/RemoveJavaLangObjectMethodsFacetFactory.java (from r1051446, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveJavaLangObjectMethodsFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/java5/RemoveJavaLangObjectMethodsFacetFactory.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/java5/RemoveJavaLangObjectMethodsFacetFactory.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveJavaLangObjectMethodsFacetFactory.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveJavaLangObjectMethodsFacetFactory.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/java5/RemoveJavaLangObjectMethodsFacetFactory.java Wed Dec 22 16:22:08 2010
@@ -18,15 +18,15 @@
  */
 
 
-package org.apache.isis.core.metamodel.java5;
-
-import java.lang.reflect.Method;
+package org.apache.isis.core.metamodel.facets.object.java5;
 
+import java.lang.reflect.Method;
+
 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.MethodScope;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.feature.FeatureType;
 
 
 /**
@@ -35,7 +35,7 @@ import org.apache.isis.core.metamodel.sp
 public class RemoveJavaLangObjectMethodsFacetFactory extends FacetFactoryAbstract {
 
     public RemoveJavaLangObjectMethodsFacetFactory() {
-        super(ObjectFeatureType.OBJECTS_ONLY);
+        super(FeatureType.OBJECTS_ONLY);
     }
 
     private static final String[] objectMethodNames;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/java5/RemoveSuperclassMethodsFacetFactory.java (from r1051446, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveSuperclassMethodsFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/java5/RemoveSuperclassMethodsFacetFactory.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/java5/RemoveSuperclassMethodsFacetFactory.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveSuperclassMethodsFacetFactory.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/RemoveSuperclassMethodsFacetFactory.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/java5/RemoveSuperclassMethodsFacetFactory.java Wed Dec 22 16:22:08 2010
@@ -18,16 +18,16 @@
  */
 
 
-package org.apache.isis.core.metamodel.java5;
-
-import java.lang.reflect.Method;
+package org.apache.isis.core.metamodel.facets.object.java5;
 
+import java.lang.reflect.Method;
+
 import org.apache.isis.core.commons.lang.JavaClassUtils;
 import org.apache.isis.core.metamodel.facets.Facet;
 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.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.feature.FeatureType;
 
 
 /**
@@ -39,7 +39,7 @@ public class RemoveSuperclassMethodsFace
 	private static final String JAVA_CLASS_PREFIX = "java.";
 
     public RemoveSuperclassMethodsFacetFactory() {
-        super(ObjectFeatureType.OBJECTS_ONLY);
+        super(FeatureType.OBJECTS_ONLY);
     }
 
     @Override

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/notpersistable/InitiatedBy.java (from r1051446, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/notpersistable/InitiatedBy.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/notpersistable/InitiatedBy.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/notpersistable/InitiatedBy.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/notpersistable/InitiatedBy.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/notpersistable/InitiatedBy.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/notpersistable/InitiatedBy.java Wed Dec 22 16:22:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.progmodel.facets.object.notpersistable;
+package org.apache.isis.core.metamodel.facets.object.notpersistable;
 
 import org.apache.isis.core.metamodel.facets.EnumerationAbstract;
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/notpersistable/NotPersistableFacet.java (from r1051446, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/notpersistable/NotPersistableFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/notpersistable/NotPersistableFacet.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableFacet.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/notpersistable/NotPersistableFacet.java Wed Dec 22 16:22:08 2010
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.progmodel.facets.object.notpersistable;
+package org.apache.isis.core.metamodel.facets.object.notpersistable;
 
 import org.apache.isis.core.metamodel.facets.SingleValueFacet;
 import org.apache.isis.core.metamodel.interactions.DisablingInteractionAdvisor;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacet.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacet.java Wed Dec 22 16:22:08 2010
@@ -24,6 +24,7 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
 import org.apache.isis.core.metamodel.facets.MultipleValueFacet;
+import org.apache.isis.core.metamodel.facets.object.ident.title.TitleFacet;
 
 
 /**

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/DeweyOrderSet.java (from r1051446, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/DeweyOrderSet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/DeweyOrderSet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/DeweyOrderSet.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/DeweyOrderSet.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/DeweyOrderSet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/DeweyOrderSet.java Wed Dec 22 16:22:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.progmodel.facets.ordering.memberorder;
+package org.apache.isis.core.metamodel.facets.ordering;
 
 import java.util.Iterator;
 import java.util.List;
@@ -28,16 +28,15 @@ import java.util.SortedSet;
 import java.util.TreeMap;
 import java.util.TreeSet;
 
-import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectMemberPeer;
-import org.apache.isis.core.progmodel.facets.ordering.OrderSet;
+import org.apache.isis.core.metamodel.peer.FacetedMethod;
 
 
 /**
  * Represents a nested hierarchy of ordered members.
  * 
  * <p>
- * At each level the elements are either {@link ObjectMemberPeer}s or they are instances of
- * {@link OrderSet} represent a group of {@link ObjectMemberPeer}s that have a {@link MemberOrderFacet}
+ * At each level the elements are either {@link FacetedMethod}s or they are instances of
+ * {@link OrderSet} represent a group of {@link FacetedMethod}s that have a {@link MemberOrderFacet}
  * of the same name.
  * 
  * <p>
@@ -66,14 +65,14 @@ import org.apache.isis.core.progmodel.fa
  * 
  */
 public class DeweyOrderSet extends OrderSet {
-    public static DeweyOrderSet createOrderSet(final List<ObjectMemberPeer> members) {
+    public static DeweyOrderSet createOrderSet(final List<FacetedMethod> members) {
 
         final SortedMap sortedMembersByGroup = new TreeMap();
         final SortedSet nonAnnotatedGroup = new TreeSet(new MemberIdentifierComparator());
 
         // spin over all the members and put them into a Map of SortedSets
         // any non-annotated members go into additional nonAnnotatedGroup set.
-        for (ObjectMemberPeer member : members) {
+        for (FacetedMethod member : members) {
             final MemberOrderFacet memberOrder = member.getFacet(MemberOrderFacet.class);
             if (memberOrder == null) {
                 nonAnnotatedGroup.add(member);

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/FieldOrderFacet.java (from r1051446, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/ordering/fieldorder/FieldOrderFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/FieldOrderFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/FieldOrderFacet.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/ordering/fieldorder/FieldOrderFacet.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/ordering/fieldorder/FieldOrderFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/FieldOrderFacet.java Wed Dec 22 16:22:08 2010
@@ -17,11 +17,10 @@
  *  under the License.
  */
 
-package org.apache.isis.core.progmodel.facets.ordering.fieldorder;
+package org.apache.isis.core.metamodel.facets.ordering;
 
 import org.apache.isis.core.metamodel.facets.SingleStringValueFacet;
-import org.apache.isis.core.progmodel.facets.ordering.actionorder.ActionOrderFacet;
-import org.apache.isis.core.progmodel.facets.ordering.memberorder.MemberOrderFacet;
+import org.apache.isis.core.metamodel.facets.ordering.actionorder.ActionOrderFacet;
 
 /**
  * (One of the) mechanism(s) for determining the order in which the properties and collections of the object should be

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/MemberIdentifierComparator.java (from r1051446, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberIdentifierComparator.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/MemberIdentifierComparator.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/MemberIdentifierComparator.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberIdentifierComparator.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberIdentifierComparator.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/MemberIdentifierComparator.java Wed Dec 22 16:22:08 2010
@@ -18,24 +18,24 @@
  */
 
 
-package org.apache.isis.core.progmodel.facets.ordering.memberorder;
+package org.apache.isis.core.metamodel.facets.ordering;
 
-import java.io.Serializable;
-import java.util.Comparator;
-
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectMemberPeer;
+import java.io.Serializable;
+import java.util.Comparator;
+
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.core.metamodel.peer.FacetedMethod;
 
 
 /**
- * Compares {@link ObjectMemberPeer}) by {@link ObjectMemberPeer#getIdentifier()}
+ * Compares {@link FacetedMethod}) by {@link FacetedMethod#getIdentifier()}
  *
  */
-public class MemberIdentifierComparator implements Comparator<ObjectMemberPeer>, Serializable {
+public class MemberIdentifierComparator implements Comparator<FacetedMethod>, Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    public int compare(final ObjectMemberPeer o1, final ObjectMemberPeer o2) {
+    public int compare(final FacetedMethod o1, final FacetedMethod o2) {
         final Identifier identifier1 = o1.getIdentifier();
         final Identifier identifier2 = o2.getIdentifier();
         return identifier1.compareTo(identifier2);

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/MemberOrderComparator.java (from r1051446, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberOrderComparator.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/MemberOrderComparator.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/MemberOrderComparator.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberOrderComparator.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberOrderComparator.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/MemberOrderComparator.java Wed Dec 22 16:22:08 2010
@@ -18,22 +18,20 @@
  */
 
 
-package org.apache.isis.core.progmodel.facets.ordering.memberorder;
-
-import java.util.Comparator;
-import java.util.StringTokenizer;
+package org.apache.isis.core.metamodel.facets.ordering;
 
+import java.util.Comparator;
+import java.util.StringTokenizer;
+
 import org.apache.isis.core.metamodel.facets.FacetHolder;
-import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectMemberPeer;
-import org.apache.isis.core.progmodel.facets.ordering.OrderSet;
-import org.apache.isis.core.progmodel.facets.ordering.OrderSetGroupNameComparator;
+import org.apache.isis.core.metamodel.peer.FacetedMethod;
 
 
 /**
- * Compares by {@link MemberOrderFacet} obtained from each {@link ObjectMemberPeer}).
+ * Compares by {@link MemberOrderFacet} obtained from each {@link FacetedMethod}).
  *
  * <p>
- * Will also compare {@link OrderSet}s; these are put after any {@link ObjectMemberPeer}s. If there is
+ * Will also compare {@link OrderSet}s; these are put after any {@link FacetedMethod}s. If there is
  * more than one OrderSet then these are compared by an {@link OrderSetGroupNameComparator}.
  *
  * <p>
@@ -58,22 +56,22 @@ public class MemberOrderComparator imple
     private final OrderSetGroupNameComparator orderSetComparator = new OrderSetGroupNameComparator(true);
 
     public int compare(final Object o1, final Object o2) {
-        if (o1 instanceof ObjectMemberPeer && o2 instanceof ObjectMemberPeer) {
-            return compare((ObjectMemberPeer) o1, (ObjectMemberPeer) o2);
+        if (o1 instanceof FacetedMethod && o2 instanceof FacetedMethod) {
+            return compare((FacetedMethod) o1, (FacetedMethod) o2);
         }
         if (o1 instanceof OrderSet && o2 instanceof OrderSet) {
             return orderSetComparator.compare((OrderSet)o1, (OrderSet)o2);
         }
-        if (o1 instanceof ObjectMemberPeer && o2 instanceof OrderSet) {
+        if (o1 instanceof FacetedMethod && o2 instanceof OrderSet) {
             return -1; // members before OrderSets.
         }
-        if (o1 instanceof OrderSet && o2 instanceof ObjectMemberPeer) {
+        if (o1 instanceof OrderSet && o2 instanceof FacetedMethod) {
             return +1; // members before OrderSets.
         }
         throw new IllegalArgumentException("can only compare MemberPeers and OrderSets");
     }
 
-    public int compare(final ObjectMemberPeer o1, final ObjectMemberPeer o2) {
+    public int compare(final FacetedMethod o1, final FacetedMethod o2) {
         final MemberOrderFacet m1 = getMemberOrder(o1);
         final MemberOrderFacet m2 = getMemberOrder(o2);
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/MemberOrderFacet.java (from r1051446, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberOrderFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/MemberOrderFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/MemberOrderFacet.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberOrderFacet.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberOrderFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/MemberOrderFacet.java Wed Dec 22 16:22:08 2010
@@ -17,11 +17,10 @@
  *  under the License.
  */
 
-package org.apache.isis.core.progmodel.facets.ordering.memberorder;
+package org.apache.isis.core.metamodel.facets.ordering;
 
 import org.apache.isis.core.metamodel.facets.MultipleValueFacet;
-import org.apache.isis.core.progmodel.facets.ordering.actionorder.ActionOrderFacet;
-import org.apache.isis.core.progmodel.facets.ordering.fieldorder.FieldOrderFacet;
+import org.apache.isis.core.metamodel.facets.ordering.actionorder.ActionOrderFacet;
 
 /**
  * The preferred mechanism for determining the order in which the members of the object should be rendered.

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/OrderSet.java (from r1051446, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/ordering/OrderSet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/OrderSet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/OrderSet.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/ordering/OrderSet.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/ordering/OrderSet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/OrderSet.java Wed Dec 22 16:22:08 2010
@@ -18,23 +18,22 @@
  */
 
 
-package org.apache.isis.core.progmodel.facets.ordering;
+package org.apache.isis.core.metamodel.facets.ordering;
 
 import java.util.ArrayList;
-import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.List;
 import java.util.SortedSet;
 import java.util.StringTokenizer;
 import java.util.TreeSet;
-import java.util.Vector;
 
-import org.apache.isis.core.progmodel.facets.ordering.memberorder.DeweyOrderSet;
+import com.google.common.collect.Lists;
 
 
-public class OrderSet implements Comparable<OrderSet> {
 
-    private final Vector<Object> elements = new Vector<Object>();
+public class OrderSet implements Comparable<OrderSet>, Iterable<Object> {
+
+    private final List<Object> elements = Lists.newArrayList();
     private final String groupFullName;
     private final String groupName;
     private final String groupPath;
@@ -166,9 +165,7 @@ public class OrderSet implements Compara
      * @return
      */
     public List<Object> elementList() {
-        final ArrayList<Object> list = new ArrayList<Object>();
-        list.addAll(elements);
-        return list;
+        return new ArrayList<Object>(elements);
     }
 
     public int size() {
@@ -179,8 +176,9 @@ public class OrderSet implements Compara
         elements.add(element);
     }
 
-    public Enumeration<Object> elements() {
-        return elements.elements();
+    @Override
+    public Iterator<Object> iterator() {
+        return elements.iterator();
     }
 
     protected void addAll(final SortedSet<DeweyOrderSet> sortedMembers) {
@@ -194,6 +192,7 @@ public class OrderSet implements Compara
     /**
      * Natural ordering is to compare by {@link #getGroupFullName()}.
      */
+    @Override
     public int compareTo(final OrderSet o) {
         if (this.equals(o)) { return 0; }
         return groupFullName.compareTo(o.groupFullName);

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/OrderSetGroupNameComparator.java (from r1051446, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/ordering/OrderSetGroupNameComparator.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/OrderSetGroupNameComparator.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/OrderSetGroupNameComparator.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/ordering/OrderSetGroupNameComparator.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/ordering/OrderSetGroupNameComparator.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/OrderSetGroupNameComparator.java Wed Dec 22 16:22:08 2010
@@ -18,10 +18,11 @@
  */
 
 
-package org.apache.isis.core.progmodel.facets.ordering;
+package org.apache.isis.core.metamodel.facets.ordering;
 
-import java.io.Serializable;
-import java.util.Comparator;
+import java.io.Serializable;
+import java.util.Comparator;
+
 
 
 /**

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/SimpleOrderSet.java (from r1051446, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/ordering/SimpleOrderSet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/SimpleOrderSet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/SimpleOrderSet.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/ordering/SimpleOrderSet.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/ordering/SimpleOrderSet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/SimpleOrderSet.java Wed Dec 22 16:22:08 2010
@@ -18,17 +18,17 @@
  */
 
 
-package org.apache.isis.core.progmodel.facets.ordering;
+package org.apache.isis.core.metamodel.facets.ordering;
 
 import java.util.List;
 import java.util.StringTokenizer;
 
-import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectMemberPeer;
+import org.apache.isis.core.metamodel.peer.FacetedMethod;
 import org.apache.isis.core.metamodel.util.NameUtils;
 
 
 public class SimpleOrderSet extends OrderSet {
-    public static SimpleOrderSet createOrderSet(final String order, final List<ObjectMemberPeer> members) {
+    public static SimpleOrderSet createOrderSet(final String order, final List<FacetedMethod> members) {
         SimpleOrderSet set = new SimpleOrderSet(members);
 
         final StringTokenizer st = new StringTokenizer(order, ",");
@@ -58,9 +58,9 @@ public class SimpleOrderSet extends Orde
     }
 
     private final SimpleOrderSet parent;
-    private final List<ObjectMemberPeer> members;
+    private final List<FacetedMethod> members;
 
-    private SimpleOrderSet(final List<ObjectMemberPeer> members) {
+    private SimpleOrderSet(final List<FacetedMethod> members) {
         super("");
         this.members = members;
         parent = null;
@@ -70,7 +70,7 @@ public class SimpleOrderSet extends Orde
             final SimpleOrderSet set,
             final String groupName,
             final String name,
-            final List<ObjectMemberPeer> members) {
+            final List<FacetedMethod> members) {
         super(groupName);
         parent = set;
         parent.addElement(this);
@@ -79,7 +79,7 @@ public class SimpleOrderSet extends Orde
     }
 
     private void add(final String name) {
-        final ObjectMemberPeer memberWithName = getMemberWithName(name);
+        final FacetedMethod memberWithName = getMemberWithName(name);
         if (memberWithName != null) {
             addElement(memberWithName);
         }
@@ -88,7 +88,7 @@ public class SimpleOrderSet extends Orde
     private void addAnyRemainingMember() {
         for (int i = 0; i < members.size(); i++) {
             if (members.get(i) != null) {
-                ObjectMemberPeer member = members.get(i);
+                FacetedMethod member = members.get(i);
                 addElement(member);
             }
         }
@@ -99,10 +99,10 @@ public class SimpleOrderSet extends Orde
         return new SimpleOrderSet(this, groupName, memberName, members);
     }
 
-    private ObjectMemberPeer getMemberWithName(final String name) {
+    private FacetedMethod getMemberWithName(final String name) {
         final String searchName = NameUtils.simpleName(name);
         for (int i = 0; i < members.size(); i++) {
-            final ObjectMemberPeer member = members.get(i);
+            final FacetedMethod member = members.get(i);
             if (member != null) {
                 final String testName = NameUtils.simpleName(member.getIdentifier().getMemberName());
                 if (testName.equals(searchName)) {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/actionorder/ActionOrderFacet.java (from r1051446, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/ordering/actionorder/ActionOrderFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/actionorder/ActionOrderFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/actionorder/ActionOrderFacet.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/ordering/actionorder/ActionOrderFacet.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/ordering/actionorder/ActionOrderFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/actionorder/ActionOrderFacet.java Wed Dec 22 16:22:08 2010
@@ -17,11 +17,11 @@
  *  under the License.
  */
 
-package org.apache.isis.core.progmodel.facets.ordering.actionorder;
+package org.apache.isis.core.metamodel.facets.ordering.actionorder;
 
 import org.apache.isis.core.metamodel.facets.SingleStringValueFacet;
-import org.apache.isis.core.progmodel.facets.ordering.fieldorder.FieldOrderFacet;
-import org.apache.isis.core.progmodel.facets.ordering.memberorder.MemberOrderFacet;
+import org.apache.isis.core.metamodel.facets.ordering.FieldOrderFacet;
+import org.apache.isis.core.metamodel.facets.ordering.MemberOrderFacet;
 
 /**
  * (One of the) mechanism(s) for determining the order in which the actions of the object should be rendered.

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/PropertyChoicesFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/PropertyChoicesFacet.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/PropertyChoicesFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/PropertyChoicesFacet.java Wed Dec 22 16:22:08 2010
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.f
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.runtimecontext.SpecificationLookup;
+import org.apache.isis.core.metamodel.spec.SpecificationLookup;
 
 /**
  * Provides a set of choices for a property.

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/modify/PropertyInitializationFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/modify/PropertyInitializationFacet.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/modify/PropertyInitializationFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/modify/PropertyInitializationFacet.java Wed Dec 22 16:22:08 2010
@@ -22,8 +22,6 @@ package org.apache.isis.core.metamodel.f
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.Facet;
 import org.apache.isis.core.metamodel.facets.propcoll.access.PropertyAccessorFacet;
-import org.apache.isis.core.metamodel.facets.properties.modify.PropertyClearFacet;
-import org.apache.isis.core.metamodel.facets.properties.modify.PropertySetterFacet;
 
 /**
  * The mechanism by which the value of the property can be initialised.

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/modify/PropertySetterFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/modify/PropertySetterFacet.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/modify/PropertySetterFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/modify/PropertySetterFacet.java Wed Dec 22 16:22:08 2010
@@ -22,8 +22,6 @@ package org.apache.isis.core.metamodel.f
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.Facet;
 import org.apache.isis.core.metamodel.facets.propcoll.access.PropertyAccessorFacet;
-import org.apache.isis.core.metamodel.facets.properties.modify.PropertyClearFacet;
-import org.apache.isis.core.metamodel.facets.properties.modify.PropertyInitializationFacet;
 
 /**
  * The mechanism by which the value of the property can be set.



Mime
View raw message