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/12/22 17:22:32 UTC

svn commit: r1051971 [7/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...

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/JavaSpecification.java (from r1051471, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/spec/JavaSpecification.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/JavaSpecification.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/JavaSpecification.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/spec/JavaSpecification.java&r1=1051471&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/spec/JavaSpecification.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/JavaSpecification.java Wed Dec 22 16:22:08 2010
@@ -17,832 +17,588 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.java5;
 
-package org.apache.isis.core.progmodel.spec;
-
 import java.lang.reflect.Array;
 import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.log4j.Logger;
 
 import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 
-import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.profiles.Perspective;
 import org.apache.isis.core.commons.debug.DebugInfo;
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.commons.exceptions.UnknownTypeException;
 import org.apache.isis.core.commons.filters.AbstractFilter;
 import org.apache.isis.core.commons.filters.Filter;
-import org.apache.isis.core.commons.lang.ArrayUtils;
-import org.apache.isis.core.commons.lang.CastUtils;
 import org.apache.isis.core.commons.lang.JavaClassUtils;
+import org.apache.isis.core.commons.lang.ListUtils;
 import org.apache.isis.core.commons.lang.ToString;
+import org.apache.isis.core.metamodel.adapter.AdapterMap;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.QuerySubmitter;
+import org.apache.isis.core.metamodel.adapter.ServicesProvider;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSessionProvider;
 import org.apache.isis.core.metamodel.exceptions.ReflectionException;
-import org.apache.isis.core.metamodel.facetdecorator.FacetDecoratorSet;
 import org.apache.isis.core.metamodel.facets.Facet;
 import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.ImperativeFacet;
+import org.apache.isis.core.metamodel.facets.ImperativeFacetUtils;
 import org.apache.isis.core.metamodel.facets.naming.describedas.DescribedAsFacet;
 import org.apache.isis.core.metamodel.facets.naming.named.NamedFacet;
+import org.apache.isis.core.metamodel.facets.naming.named.NamedFacetInferred;
+import org.apache.isis.core.metamodel.facets.object.callbacks.CallbackUtils;
 import org.apache.isis.core.metamodel.facets.object.callbacks.CreatedCallbackFacet;
-import org.apache.isis.core.metamodel.java5.ImperativeFacet;
-import org.apache.isis.core.metamodel.java5.ImperativeFacetUtils;
-import org.apache.isis.core.metamodel.runtimecontext.AuthenticationSessionProvider;
+import org.apache.isis.core.metamodel.facets.object.dirty.ClearDirtyObjectFacet;
+import org.apache.isis.core.metamodel.facets.object.dirty.IsDirtyObjectFacet;
+import org.apache.isis.core.metamodel.facets.object.dirty.MarkDirtyObjectFacet;
+import org.apache.isis.core.metamodel.facets.object.ident.icon.IconFacet;
+import org.apache.isis.core.metamodel.facets.object.ident.plural.PluralFacet;
+import org.apache.isis.core.metamodel.facets.object.ident.plural.PluralFacetInferred;
+import org.apache.isis.core.metamodel.facets.object.ident.title.TitleFacet;
+import org.apache.isis.core.metamodel.facets.object.notpersistable.InitiatedBy;
+import org.apache.isis.core.metamodel.facets.object.notpersistable.NotPersistableFacet;
+import org.apache.isis.core.metamodel.facets.ordering.OrderSet;
+import org.apache.isis.core.metamodel.peer.FacetedMethod;
 import org.apache.isis.core.metamodel.runtimecontext.DependencyInjector;
-import org.apache.isis.core.metamodel.runtimecontext.AdapterMap;
-import org.apache.isis.core.metamodel.runtimecontext.ObjectInstantiationException;
-import org.apache.isis.core.metamodel.runtimecontext.ObjectInstantiator;
-import org.apache.isis.core.metamodel.runtimecontext.QuerySubmitter;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesProvider;
-import org.apache.isis.core.metamodel.runtimecontext.SpecificationLookup;
-import org.apache.isis.core.metamodel.runtimecontext.spec.IntrospectableSpecificationAbstract;
-import org.apache.isis.core.metamodel.runtimecontext.spec.feature.ObjectActionSet;
+import org.apache.isis.core.metamodel.spec.IntrospectableSpecificationAbstract;
+import org.apache.isis.core.metamodel.spec.ObjectActionSet;
+import org.apache.isis.core.metamodel.spec.ObjectInstantiationException;
+import org.apache.isis.core.metamodel.spec.ObjectInstantiator;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.ObjectSpecificationException;
 import org.apache.isis.core.metamodel.spec.Persistability;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.core.metamodel.specloader.ObjectReflectorAbstract;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.specloader.ObjectReflectorDefault;
 import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutor;
 import org.apache.isis.core.metamodel.specloader.internal.ObjectActionImpl;
 import org.apache.isis.core.metamodel.specloader.internal.OneToManyAssociationImpl;
 import org.apache.isis.core.metamodel.specloader.internal.OneToOneAssociationImpl;
-import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectMemberPeer;
-import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectMemberPeerImpl;
-import org.apache.isis.core.metamodel.util.CallbackUtils;
 import org.apache.isis.core.metamodel.util.NameUtils;
-import org.apache.isis.core.metamodel.util.SpecUtils;
-import org.apache.isis.core.progmodel.facets.naming.named.NamedFacetInferred;
-import org.apache.isis.core.progmodel.facets.object.dirty.ClearDirtyObjectFacet;
-import org.apache.isis.core.progmodel.facets.object.dirty.IsDirtyObjectFacet;
-import org.apache.isis.core.progmodel.facets.object.dirty.MarkDirtyObjectFacet;
-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.progmodel.facets.object.ident.plural.PluralFacetInferred;
-import org.apache.isis.core.progmodel.facets.object.ident.title.TitleFacet;
-import org.apache.isis.core.progmodel.facets.object.notpersistable.InitiatedBy;
-import org.apache.isis.core.progmodel.facets.object.notpersistable.NotPersistableFacet;
-import org.apache.isis.core.progmodel.facets.ordering.OrderSet;
-import org.apache.isis.core.progmodel.specloader.internal.introspector.JavaIntrospector;
-
-
-public class JavaSpecification extends IntrospectableSpecificationAbstract implements DebugInfo, FacetHolder {
-
-    private final static Logger LOG = Logger.getLogger(JavaSpecification.class);
-
-    private static class SubclassList {
-        private final List<ObjectSpecification> classes = Lists.newArrayList();
-
-        public void addSubclass(final ObjectSpecification subclass) {
-            classes.add(subclass);
-        }
-
-        public boolean hasSubclasses() {
-            return !classes.isEmpty();
-        }
-
-        /**
-         * @return
-         */
-        public List<ObjectSpecification> toList() {
-            return Collections.unmodifiableList(classes);
-        }
-    }
-
-    private final SubclassList subclasses;
-    private final ObjectReflectorAbstract reflector;
 
-    private final SpecificationLookup specificationLookup;
+public class JavaSpecification extends IntrospectableSpecificationAbstract implements DebugInfo, FacetHolder {
+
+    private final static Logger LOG = Logger.getLogger(JavaSpecification.class);
+
+    private static String determineShortName(final Class<?> introspectedClass) {
+        String name = introspectedClass.getName();
+        return name.substring(name.lastIndexOf('.') + 1);
+    }
+
+    // //////////////////////////////////////////////////////////////
+    // fields
+    // //////////////////////////////////////////////////////////////
+
+    private final ObjectReflectorDefault reflector;
     private final AdapterMap adapterMap;
     private final DependencyInjector dependencyInjector;
     private final QuerySubmitter querySubmitter;
-
-    private JavaIntrospector introspector;
-
-    private Persistability persistable;
-
-    private String pluralName;
-    private String shortName;
-    private String singularName;
-    private String description;
-
-    private List<ObjectSpecification> interfaces;
-
-    private IconFacet iconMethod;
-    private MarkDirtyObjectFacet markDirtyObjectFacet;
-    private ClearDirtyObjectFacet clearDirtyObjectFacet;
-    private IsDirtyObjectFacet isDirtyObjectFacet;
-
-    /**
-     * Lazily built by {@link #getMember(Method)}.
-     */
-    private Hashtable<Method, ObjectMember> membersByMethod = null;
-    private Class<?> cls;
-
-    private boolean whetherAbstract;
-    private boolean whetherFinal;
-    private boolean service;
-
-
-    // //////////////////////////////////////////////////////////////////////
-    // Constructor
-    // //////////////////////////////////////////////////////////////////////
-
-    public JavaSpecification(
-    		final Class<?> cls,
-    		final ObjectReflectorAbstract reflector,
-    		final AuthenticationSessionProvider authenticationSessionProvider,
-    		final SpecificationLookup specificationLookup,
-    		final ServicesProvider servicesProvider,
-    		final AdapterMap adapterManager,
-    		final ObjectInstantiator objectInstantiator,
-    		final DependencyInjector dependencyInjector, 
-    		final QuerySubmitter querySubmitter) {
-    	super(authenticationSessionProvider, servicesProvider, objectInstantiator);
-        this.introspector = new JavaIntrospector(cls, this, reflector);
-        this.subclasses = new SubclassList();
-        this.identifier = Identifier.classIdentifier(cls);
+
+    private boolean isService;
+
+    private IconFacet iconFacet;
+    private TitleFacet titleFacet;
+
+    /**
+     * Lazily built by {@link #getMember(Method)}.
+     */
+    private Map<Method, ObjectMember> membersByMethod = null;
+
+    private JavaIntrospector introspector;
+
+    // //////////////////////////////////////////////////////////////////////
+    // Constructor
+    // //////////////////////////////////////////////////////////////////////
+
+    public JavaSpecification(final Class<?> cls, final ObjectReflectorDefault reflector,
+        final AuthenticationSessionProvider authenticationSessionProvider, final ServicesProvider servicesProvider,
+        final AdapterMap adapterManager, final ObjectInstantiator objectInstantiator,
+        final DependencyInjector dependencyInjector, final QuerySubmitter querySubmitter) {
+        super(cls, determineShortName(cls), authenticationSessionProvider, servicesProvider, objectInstantiator,
+            reflector);
         this.reflector = reflector;
-        
-        this.specificationLookup = specificationLookup;
+        this.introspector = new JavaIntrospector(cls, this, reflector);
+
         this.adapterMap = adapterManager;
         this.dependencyInjector = dependencyInjector;
-        this.querySubmitter = querySubmitter;
-    }
+        this.querySubmitter = querySubmitter;
+    }
+
+    // //////////////////////////////////////////////////////////////////////
+    // introspect (part 1)
+    // //////////////////////////////////////////////////////////////////////
+
+    @Override
+    public void introspectTypeHierarchyAndMembers() {
+        if (introspector == null) {
+            throw new ReflectionException("Introspection already taken place, cannot introspect again");
+        }
+
+        // class
+        introspector.introspectClass();
+
+        // names
+        addNamedFacetAndPluralFacetIfRequired();
+
+        // superclass
+        final Class<?> superclass = getIntrospectedClass().getSuperclass();
+        setSuperclass(superclass);
+
+        // go no further if required
+        final boolean skipFurtherIntrospection =
+            JavaClassUtils.isJavaClass(getIntrospectedClass()) || isAppLibValue(getIntrospectedClass());
+        if (skipFurtherIntrospection) {
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("skipping introspection of interfaces, properties, actions and interfaces for "
+                    + getFullName() + " (java.xxx or applib value class)");
+            }
+            return;
+        }
+
+        // walk superinterfaces
+
+        // REVIEW: the processing here isn't quite the same as with superclasses,
+        // in that with superclasses the superclass adds this type as its subclass,
+        // whereas here this type defines itself as the subtype.
+        // it'd be nice to push the responsibility for adding subclasses to
+        // the interface type... needs some tests around it, though, before
+        // making that refactoring.
+        final Class<?>[] interfaceTypes = getIntrospectedClass().getInterfaces();
+        List<ObjectSpecification> interfaceSpecList = Lists.newArrayList();
+        for (Class<?> interfaceType : interfaceTypes) {
+            Class<?> substitutedInterfaceType = getClassSubstitutor().getClass(interfaceType);
+            if (substitutedInterfaceType != null) {
+                ObjectSpecification interfaceSpec =
+                    getSpecificationLookup().loadSpecification(substitutedInterfaceType);
+                interfaceSpecList.add(interfaceSpec);
+            }
+        }
+        addAsSubclassTo(interfaceSpecList);
+        addInterfaces(interfaceSpecList);
+
+        // properties and collections
+        introspector.introspectAssociations();
+        final OrderSet associationOrderSet = introspector.getAssociationOrderSet();
+        if (associationOrderSet != null) {
+            addAssociations(asAssociations(associationOrderSet));
+        }
+
+        // actions
+        introspector.introspectActions();
+        OrderSet actionOrderSet = introspector.getActionOrderSet();
+        addObjectActions(asObjectActions(actionOrderSet));
+    }
+
+    private void addNamedFacetAndPluralFacetIfRequired() {
+        NamedFacet namedFacet = getFacet(NamedFacet.class);
+        if (namedFacet == null) {
+            namedFacet = new NamedFacetInferred(NameUtils.naturalName(getShortName()), this);
+            addFacet(namedFacet);
+        }
+
+        PluralFacet pluralFacet = getFacet(PluralFacet.class);
+        if (pluralFacet == null) {
+            pluralFacet = new PluralFacetInferred(NameUtils.pluralName(namedFacet.value()), this);
+            addFacet(pluralFacet);
+        }
+    }
+
+    /**
+     * TODO: review this, should be more general and check for value facet, surely?
+     */
+    private boolean isAppLibValue(Class<?> type) {
+        return type.getName().startsWith("org.apache.isis.applib.value.");
+    }
+
+    private List<ObjectAssociation> asAssociations(final OrderSet orderSet) {
+        final List<ObjectAssociation> associations = Lists.newArrayList();
+        for (Object element : orderSet) {
+            if (element instanceof FacetedMethod) {
+                FacetedMethod facetMethod = (FacetedMethod) element;
+                if (facetMethod.getFeatureType().isCollection()) {
+                    associations.add(createCollection(facetMethod));
+                } else if (facetMethod.getFeatureType().isProperty()) {
+                    associations.add(createProperty(facetMethod));
+                }
+            } else if (element instanceof OrderSet) {
+                // Not supported at present
+            } else {
+                throw new UnknownTypeException(element);
+            }
+        }
+
+        return associations;
+    }
+
+    private List<ObjectAction> asObjectActions(final OrderSet orderSet) {
+        final List<ObjectAction> actions = Lists.newArrayList();
+        for (Object element : orderSet) {
+            if (element instanceof FacetedMethod) {
+                final FacetedMethod facetedMethod = (FacetedMethod) element;
+                if (facetedMethod.getFeatureType().isAction()) {
+                    actions.add(createAction(facetedMethod));
+                }
+            } else if (element instanceof OrderSet) {
+                final OrderSet set = ((OrderSet) element);
+                actions.add(createObjectActionSet(set));
+            } else {
+                throw new UnknownTypeException(element);
+            }
+        }
+        return actions;
+    }
 
-
-    // //////////////////////////////////////////////////////////////////////
-    // Class and stuff immediately derivable from class
-    // //////////////////////////////////////////////////////////////////////
-
-    @Override
-    public void addSubclass(final ObjectSpecification subclass) {
-        subclasses.addSubclass(subclass);
-    }
-
-    @Override
-    public boolean hasSubclasses() {
-        return subclasses.hasSubclasses();
-    }
-
-    @Override
-    public List<ObjectSpecification> interfaces() {
-        return interfaces;
-    }
-
-    @Override
-    public List<ObjectSpecification> subclasses() {
-        return subclasses.toList();
-    }
-
-    // //////////////////////////////////////////////////////////////////////
-    // Hierarchical
-    // //////////////////////////////////////////////////////////////////////
-
-    /**
-     * Determines if this class represents the same class, or a subclass, of the specified class.
-     */
-    @Override
-    public boolean isOfType(final ObjectSpecification specification) {
-        if (specification == this) {
-            return true;
-        } else {
-            if (interfaces != null) {
-                for (int i = 0, len = interfaces.size(); i < len; i++) {
-                    if (interfaces.get(i).isOfType(specification)) {
-                        return true;
-                    }
-                }
-            }
-            if (superClassSpecification != null) {
-                return superClassSpecification.isOfType(specification);
-            }
-        }
-        return false;
-    }
-
-    // //////////////////////////////////////////////////////////////////////
-    // introspect
-    // //////////////////////////////////////////////////////////////////////
-
-    @Override
-    public synchronized void introspect(final FacetDecoratorSet decorator) {
-        if (introspector == null) {
-            throw new ReflectionException("Introspection already taken place, cannot introspect again");
-        }
-
-        cls = introspector.getIntrospectedClass();
-
-        introspector.introspectClass();
-
-        fullName = introspector.getFullName();
-        shortName = introspector.shortName();
-        NamedFacet namedFacet = getFacet(NamedFacet.class);
-        if (namedFacet == null) {
-            namedFacet = new NamedFacetInferred(NameUtils.naturalName(shortName), this);
-            addFacet(namedFacet);
-        }
-
-        PluralFacet pluralFacet = getFacet(PluralFacet.class);
-        if (pluralFacet == null) {
-            pluralFacet = new PluralFacetInferred(NameUtils.pluralName(namedFacet.value()), this);
-            addFacet(pluralFacet);
-        }
-
-        whetherAbstract = introspector.isAbstract();
-        whetherFinal = introspector.isFinal();
-
-        final String superclassName = introspector.getSuperclass();
-        final String[] interfaceNames = introspector.getInterfaces();
-
-        final SpecificationLoader loader = getReflector();
-        if (superclassName != null) {
-            superClassSpecification = loader.loadSpecification(superclassName);
-            if (superClassSpecification != null) {
-            	if (LOG.isDebugEnabled()) {
-            		LOG.debug("  Superclass " + superclassName);
-            	}
-                superClassSpecification.addSubclass(this);
-            }
-        }
-
-        final boolean skipIntrospection = JavaClassUtils.isJavaClass(cls) || isValueClass(cls);
-        if (skipIntrospection) {
-        	if (LOG.isDebugEnabled()) {
-        		LOG.debug("skipping introspection of properties, actions and interfaces for " + cls.getName() + " (java.xxx class)");
-        	}
-            fields = Collections.emptyList();
-            objectActions = Collections.emptyList();
-            interfaces = Collections.emptyList();
-
-        } else {
-
-            List<ObjectSpecification> interfaceSpecList = Lists.newArrayList();
-            for (int i = 0; i < interfaceNames.length; i++) {
-
-                Class<?> substitutedInterfaceClass = getSubstitutedClass(interfaceNames[i], getClassSubstitutor());
-                if (substitutedInterfaceClass != null) {
-                    ObjectSpecification interfacespec = loader.loadSpecification(substitutedInterfaceClass.getName());
-                    interfaceSpecList.add(interfacespec);
-                    interfacespec.addSubclass(this);
-                }
-            }
-            interfaces = interfaceSpecList;
-
-            introspector.introspectPropertiesAndCollections();
-
-            final OrderSet orderedFields = introspector.getFields();
-            if (orderedFields != null) {
-                fields = orderFields(orderedFields);
-            }
-
-            introspector.introspectActions();
-
-            OrderSet orderedActions = introspector.getClassActions();
-
-            orderedActions = introspector.getObjectActions();
-            objectActions = orderActions(orderedActions);
-        }
-
-        decorateAllFacets(decorator);
-
-        clearDirtyObjectFacet = getFacet(ClearDirtyObjectFacet.class);
-        markDirtyObjectFacet = getFacet(MarkDirtyObjectFacet.class);
-        isDirtyObjectFacet = getFacet(IsDirtyObjectFacet.class);
-        namedFacet = getFacet(NamedFacet.class);
-        singularName = namedFacet.value();
-
-        pluralFacet = getFacet(PluralFacet.class);
-        pluralName = pluralFacet.value();
-
-        final DescribedAsFacet describedAsFacet = getFacet(DescribedAsFacet.class);
-        description = describedAsFacet.value();
-
-        iconMethod = getFacet(IconFacet.class);
-
-        final NotPersistableFacet notPersistableFacet = getFacet(NotPersistableFacet.class);
-        final InitiatedBy initiatedBy = notPersistableFacet.value();
-        if (initiatedBy == InitiatedBy.USER_OR_PROGRAM) {
-            persistable = Persistability.TRANSIENT;
-        } else if (initiatedBy == InitiatedBy.USER) {
-            persistable = Persistability.PROGRAM_PERSISTABLE;
-        } else {
-            persistable = Persistability.USER_PERSISTABLE;
-        }
-
-        // indicates have now been introspected.
-        introspector = null;
-        setIntrospected(true);
-    }
-
-    private boolean isValueClass(Class<?> type) {
-        return  type.getName().startsWith("org.apache.isis.applib.value.");
-    }
-
-
-    /**
-     * Looks up the class and runs it through the {@link #getClassSubstitutor()} obtained
-     * from in the constructor.
-     */
-    private Class<?> getSubstitutedClass(
-    		final String fullyQualifiedClassName,
-    		final ClassSubstitutor classSubstitor) {
-        Class<?> interfaceClass;
-        try {
-            interfaceClass = Class.forName(fullyQualifiedClassName);
-        } catch (ClassNotFoundException e) {
-            return null;
-        }
-        return classSubstitor.getClass(interfaceClass);
-    }
-
-
-    /**
-     * Added to try to track down a race condition.
-     */
-    @Override
-	public boolean isIntrospected() {
-		return introspector == null;
-	}
-
-
-
-    // //////////////////////////////////////////////////////////////////////
-    // Facets
-    // //////////////////////////////////////////////////////////////////////
-
-    private void decorateAllFacets(final FacetDecoratorSet decoratorSet) {
-        decoratorSet.decorateAllFacets(this);
-        for (int i = 0; i < fields.size(); i++) {
-            ObjectAssociation objectAssociation = fields.get(i);
-			decoratorSet.decorateAllFacets(objectAssociation);
-        }
-        for (int i = 0; i < objectActions.size(); i++) {
-            ObjectAction objectAction = objectActions.get(i);
-			decoratorSet.decorateAllFacets(objectAction);
-            final List<ObjectActionParameter> parameters = objectActions.get(i).getParameters();
-            for (int j = 0; j < parameters.size(); j++) {
-                decoratorSet.decorateAllFacets(parameters.get(j));
-            }
-        }
-    }
-
-    // //////////////////////////////////////////////////////////////////////
-    // getMember, catalog...
-    // //////////////////////////////////////////////////////////////////////
-
-    public ObjectMember getMember(final Method method) {
-        if (membersByMethod == null) {
-            membersByMethod = new Hashtable<Method, ObjectMember>();
-            cataloguePropertiesAndCollections(membersByMethod);
-            catalogueActions(membersByMethod);
-        }
-        return membersByMethod.get(method);
-    }
-
-    private void cataloguePropertiesAndCollections(final Hashtable<Method, ObjectMember> membersByMethod) {
-        Filter noop = AbstractFilter.noop(ObjectAssociation.class);
-        final List<ObjectAssociation> fields = getAssociations(noop);
-        for (int i = 0; i < fields.size(); i++) {
-            final ObjectAssociation field = fields.get(i);
-            final Facet[] facets = field.getFacets(ImperativeFacet.FILTER);
-            for (int j = 0; j < facets.length; j++) {
-                final ImperativeFacet facet = ImperativeFacetUtils.getImperativeFacet(facets[j]);
-                for(Method imperativeFacetMethod: facet.getMethods()) {
-                	membersByMethod.put(imperativeFacetMethod, field);
-                }
-            }
-        }
-    }
-
-    private void catalogueActions(final Hashtable<Method, ObjectMember> membersByMethod) {
-        final List<ObjectAction> userActions = getObjectActions(ObjectActionType.USER);
-        for (int i = 0; i < userActions.size(); i++) {
-            final ObjectAction userAction = userActions.get(i);
-            final Facet[] facets = userAction.getFacets(ImperativeFacet.FILTER);
-            for (int j = 0; j < facets.length; j++) {
-                final ImperativeFacet facet = ImperativeFacetUtils.getImperativeFacet(facets[j]);
-                for(Method imperativeFacetMethod: facet.getMethods()) {
-                	membersByMethod.put(imperativeFacetMethod, userAction);
-                }
-            }
-        }
-    }
-
-    // //////////////////////////////////////////////////////////////////////
-    // getStaticallyAvailableFields, getDynamically..Fields, getField
-    // //////////////////////////////////////////////////////////////////////
-
-    @Override
-    public ObjectAssociation getAssociation(final String id) {
-        // TODO put fields into hash
-        for (int i = 0; i < fields.size(); i++) {
-            if (fields.get(i).getId().equals(id)) {
-                return fields.get(i);
-            }
-        }
-        throw new ObjectSpecificationException("No field called '" + id + "' in '" + getSingularName() + "'");
-    }
-
-    // //////////////////////////////////////////////////////////////////////
-    // getObjectAction, getAction, getActions, getClassActions
-    // //////////////////////////////////////////////////////////////////////
-
-    @Override
-    public ObjectAction getObjectAction(
-            final ObjectActionType type,
-            final String id,
-            final List<ObjectSpecification> parameters) {
-        final List<ObjectAction> availableActions = ArrayUtils.combine(objectActions, getServiceActions(type));
-        return getAction(availableActions, type, id, parameters);
-    }
-
-    @Override
-    public ObjectAction getObjectAction(final ObjectActionType type, final String nameParmsIdentityString) {
-        final List<ObjectAction> availableActions = ArrayUtils.combine(objectActions, getServiceActions(type));
-        return getAction2(availableActions, type, nameParmsIdentityString);
-    }
-
-    private ObjectAction getAction(
-            final List<ObjectAction> availableActions,
-            final ObjectActionType type,
-            final String actionName,
-            final List<ObjectSpecification> parameters) {
-        outer: for (int i = 0; i < availableActions.size(); i++) {
-            final ObjectAction action = availableActions.get(i);
-            if (action.getActions().size() > 0) {
-                // deal with action set
-                final ObjectAction a = getAction(action.getActions(), type, actionName, parameters);
-                if (a != null) {
-                    return a;
-                }
-            } else {
-                // regular action
-                if (!action.getType().equals(type)) {
-                    continue outer;
-                }
-                if (actionName != null && !actionName.equals(action.getId())) {
-                    continue outer;
-                }
-                if (action.getParameters().size() != parameters.size()) {
-                    continue outer;
-                }
-                for (int j = 0; j < parameters.size(); j++) {
-                    if (!parameters.get(j).isOfType(action.getParameters().get(j).getSpecification())) {
-                        continue outer;
-                    }
-                }
-                return action;
-            }
-        }
-        return null;
-    }
-
-    private ObjectAction getAction2(
-            final List<ObjectAction> availableActions,
-            final ObjectActionType type,
-            final String nameParmsIdentityString) {
-        if (nameParmsIdentityString == null) {
-            return null;
-        }
-        outer: for (int i = 0; i < availableActions.size(); i++) {
-            final ObjectAction action = availableActions.get(i);
-            if (action.getActions().size() > 0) {
-                // deal with action set
-                final ObjectAction a = getAction2(action.getActions(), type, nameParmsIdentityString);
-                if (a != null) {
-                    return a;
-                }
-            } else {
-                // regular action
-                if (!sameActionTypeOrNotSpecified(type, action)) {
-                    continue outer;
-                }
-                if (!nameParmsIdentityString.equals(action.getIdentifier().toNameParmsIdentityString())) {
-                    continue outer;
-                }
-                return action;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    protected List<ObjectAction> getActions(final List<ObjectAction> availableActions, final ObjectActionType type) {
-        final List<ObjectAction> actions = new ArrayList<ObjectAction>();
-        for (final ObjectAction action : availableActions) {
-            final ObjectActionType actionType = action.getType();
-            if (actionType == ObjectActionType.SET) {
-                final ObjectActionSet actionSet = (ObjectActionSet) action;
-                final List<ObjectAction> subActions = actionSet.getActions();
-                for (final ObjectAction subAction : subActions) {
-                    if (sameActionTypeOrNotSpecified(type, subAction)) {
-                        actions.add(subAction);
-                        break;
-                    }
-                }
-            } else {
-                if (sameActionTypeOrNotSpecified(type, action)) {
-                    actions.add(action);
-                }
-            }
-        }
-
-        return actions;
-    }
-
-    private boolean sameActionTypeOrNotSpecified(final ObjectActionType type, final ObjectAction action) {
-        return type == null || action.getType().equals(type);
-    }
-
-    // //////////////////////////////////////////////////////////////////////
-    // orderFields, orderActions
-    // //////////////////////////////////////////////////////////////////////
-
-    private List<ObjectAssociation> orderFields(final OrderSet order) {
-        final List<ObjectAssociation> fields = Lists.newArrayList();
-        final Enumeration<ObjectAssociation> elements = CastUtils.enumerationOver(order.elements(),
-                ObjectAssociation.class);
-        while (elements.hasMoreElements()) {
-            final Object element = elements.nextElement();
-            if (element instanceof ObjectMemberPeerImpl) {
-                ObjectMemberPeerImpl javaObjectMemberPeer = (ObjectMemberPeerImpl) element;
-                if (javaObjectMemberPeer.getFeatureType().isPropertyOrCollection()) {
-                    final ObjectAssociation objectAssociation = createObjectAssociation(javaObjectMemberPeer);
-                    fields.add(objectAssociation);
-                }
-            } else if (element instanceof OrderSet) {
-                // Not supported at present
-            } else {
-                throw new UnknownTypeException(element);
-            }
-        }
-
-        return fields;
-    }
-
-    private List<ObjectAction> orderActions(final OrderSet order) {
-        final List<ObjectAction> actions = Lists.newArrayList();
-        final Enumeration<ObjectAction> elements = CastUtils.enumerationOver(order.elements(), ObjectAction.class);
-        while (elements.hasMoreElements()) {
-            final Object element = elements.nextElement();
-            if (element instanceof ObjectMemberPeerImpl) {
-                final ObjectMemberPeerImpl memberPeer = (ObjectMemberPeerImpl) element;
-                if(memberPeer.getFeatureType().isAction()) {
-                    final String actionId = memberPeer.getIdentifier().getMemberName();
-                    final ObjectAction objectAction = 
-                        new ObjectActionImpl(actionId, memberPeer, 
-                            getAuthenticationSessionProvider(), 
-                            getSpecificationLookup(),
-                            getAdapterMap(),
-                            getServicesProvider(), 
-                            getQuerySubmitter());
-                    actions.add(objectAction);
-                }
-            } else if (element instanceof OrderSet) {
-                final OrderSet set = ((OrderSet) element);
-                actions.add(new ObjectActionSet("", set.getGroupFullName(), orderActions(set)));
-            } else {
-                throw new UnknownTypeException(element);
-            }
-        }
-
-        return actions;
-    }
-
-    private ObjectAssociation createObjectAssociation(final ObjectMemberPeer peer) {
-        if (peer.getFeatureType().isCollection()) {
-            return new OneToManyAssociationImpl(peer, getAuthenticationSessionProvider(), getSpecificationLookup(), getAdapterMap(), getQuerySubmitter());
-
+    private OneToOneAssociationImpl createProperty(final FacetedMethod facetedMethod) {
+        return new OneToOneAssociationImpl(facetedMethod, getAuthenticationSessionProvider(), getSpecificationLookup(),
+            getAdapterMap(), getQuerySubmitter());
+    }
+
+    private OneToManyAssociationImpl createCollection(final FacetedMethod facetedMethod) {
+        return new OneToManyAssociationImpl(facetedMethod, getAuthenticationSessionProvider(), getSpecificationLookup(),
+            getAdapterMap(), getQuerySubmitter());
+    }
+
+    private ObjectAction createAction(final FacetedMethod facetedMethod) {
+        return new ObjectActionImpl(facetedMethod, getAuthenticationSessionProvider(), getSpecificationLookup(),
+            getAdapterMap(), getServicesProvider(), getQuerySubmitter());
+    }
+
+    private ObjectActionSet createObjectActionSet(final OrderSet set) {
+        return new ObjectActionSet("", set.getGroupFullName(), asObjectActions(set));
+    }
+
+    // //////////////////////////////////////////////////////////////////////
+    // introspect (part 2)
+    // //////////////////////////////////////////////////////////////////////
+
+    @Override
+    public void completeIntrospection() {
+        setClearDirtyObjectFacet(getFacet(ClearDirtyObjectFacet.class));
+        setMarkDirtyObjectFacet(getFacet(MarkDirtyObjectFacet.class));
+        setIsDirtyObjectFacet(getFacet(IsDirtyObjectFacet.class));
+
+        iconFacet = getFacet(IconFacet.class);
+
+        NamedFacet namedFacet = getFacet(NamedFacet.class);
+        setSingularName(namedFacet.value());
+
+        PluralFacet pluralFacet = getFacet(PluralFacet.class);
+        setPluralName(pluralFacet.value());
+
+        final DescribedAsFacet describedAsFacet = getFacet(DescribedAsFacet.class);
+        setDescribedAs(describedAsFacet.value());
+
+        final NotPersistableFacet notPersistableFacet = getFacet(NotPersistableFacet.class);
+        final InitiatedBy initiatedBy = notPersistableFacet.value();
+        Persistability persistability;
+        if (initiatedBy == InitiatedBy.USER_OR_PROGRAM) {
+            persistability = Persistability.TRANSIENT;
+        } else if (initiatedBy == InitiatedBy.USER) {
+            persistability = Persistability.PROGRAM_PERSISTABLE;
         } else {
-            return new OneToOneAssociationImpl(peer, getAuthenticationSessionProvider(), getSpecificationLookup(), getAdapterMap(), getQuerySubmitter());
-        }
-    }
-
-    @Override
-    public boolean isCollectionOrIsAggregated() {
-        return isCollection() || isValueOrIsAggregated();
-    }
-
-    @Override
-    public boolean isAbstract() {
-        return whetherAbstract;
-    }
-
-    @Override
-    public boolean isFinal() {
-        return whetherFinal;
-    }
-
-    @Override
-    public boolean isService() {
-        return service;
-    }
-
-    @Override
-    public String getShortName() {
-        return shortName;
-    }
-
-    @Override
-    public String getSingularName() {
-        return singularName;
-    }
-
-    @Override
-    public String getPluralName() {
-        return pluralName;
-    }
-
-    @Override
-    public String getDescription() {
-        return description == null ? "" : description;
-    }
-
-    private TitleFacet titleFacet;
-
+            persistability = Persistability.USER_PERSISTABLE;
+        }
+        setPersistability(persistability);
+
+        // indicates have now been introspected.
+        introspector = null;
+        setIntrospected(true);
+    }
+
+    /**
+     * Added to try to track down a race condition.
+     */
+    @Override
+    public boolean isIntrospected() {
+        return introspector == null;
+    }
+
+    // //////////////////////////////////////////////////////////////////////
+    // Title and Icon
+    // //////////////////////////////////////////////////////////////////////
+
+    @Override
+    public String getTitle(final ObjectAdapter object) {
+        if (titleFacet == null) {
+            titleFacet = getFacet(TitleFacet.class);
+        }
+        if (titleFacet != null) {
+            final String titleString = titleFacet.title(object);
+            if (titleString != null && !titleString.equals("")) {
+                return titleString;
+            }
+        }
+        return (this.isService() ? "" : "Untitled ") + getName();
+    }
+
+    @Override
+    public String getIconName(final ObjectAdapter reference) {
+        return iconFacet == null ? null : iconFacet.iconName(reference);
+    }
+
+    // //////////////////////////////////////////////////////////////////////
+    // Whether a service or not
+    // //////////////////////////////////////////////////////////////////////
+
+    @Override
+    public boolean isService() {
+        return isService;
+    }
+
+    /**
+     * TODO: should ensure that service has at least one user action; fix when specification knows of its hidden
+     * methods.
+     * 
+     * <pre>
+     * if (objectActions != null &amp;&amp; objectActions.length == 0) {
+     *     throw new ObjectSpecificationException(&quot;Service object &quot; + getFullName() + &quot; should have at least one user action&quot;);
+     * }
+     * </pre>
+     */
+    @Override
+    public void markAsService() {
+        ensureServiceHasNoAssociations();
+        isService = true;
+    }
+
+    private void ensureServiceHasNoAssociations() {
+        final List<ObjectAssociation> associations = getAssociations();
+        StringBuilder buf = new StringBuilder();
+        for (ObjectAssociation association : associations) {
+            final String name = association.getId();
+            // services are allowed to have one association, called 'id'
+            if (!isValidAssociationForService(name)) {
+                appendAssociationName(buf, name);
+            }
+        }
+        if (buf.length() > 0) {
+            throw new ObjectSpecificationException("Service object " + getFullName()
+                + " should have no fields, but has: " + buf);
+        }
+    }
+
+    /**
+     * Services are allowed to have one association, called 'id'.
+     * 
+     * <p>
+     * This is used for {@link Perspective}s (user profiles).
+     */
+    private boolean isValidAssociationForService(final String associationId) {
+        return "id".indexOf(associationId) != -1;
+    }
+
+    private void appendAssociationName(StringBuilder fieldNames, final String name) {
+        fieldNames.append(fieldNames.length() > 0 ? ", " : "");
+        fieldNames.append(name);
+    }
+
+    // //////////////////////////////////////////////////////////////////////
+    // Actions
+    // //////////////////////////////////////////////////////////////////////
+
     @Override
-    public String getTitle(final ObjectAdapter object) {
-        if (titleFacet == null) {
-            titleFacet = getFacet(TitleFacet.class);
-        }
-        if (titleFacet != null) {
-            final String titleString = titleFacet.title(object);
-            if (titleString != null && !titleString.equals("")) {
-                return titleString;
-            }
-        }
-        return (this.isService() ? "" : "Untitled ") + getSingularName();
-    }
-
-    @Override
-    public String getIconName(final ObjectAdapter reference) {
-        if (iconMethod == null) {
-            return null;
-        } else {
-            return iconMethod.iconName(reference);
-        }
-    }
-
-    @Override
-    public Persistability persistability() {
-        return persistable;
-    }
-
-    // //////////////////////////////////////////////////////////////////////
-    // createObject
-    // //////////////////////////////////////////////////////////////////////
-
-    @Override
-    public Object createObject(CreationMode creationMode) {
-        if (cls.isArray()) {
-            return Array.newInstance(cls.getComponentType(), 0);
-        }
-
-        try {
-            Object object = getObjectInstantiator().instantiate(cls);
-
-            if (creationMode == CreationMode.INITIALIZE) {
-                final ObjectAdapter adapter = getAdapterMap().adapterFor(object);
-
-                // initialize new object
-                final List<ObjectAssociation> fields = adapter.getSpecification().getAssociations();
-        		for (int i = 0; i < fields.size(); i++) {
-        		    fields.get(i).toDefault(adapter);
-        		}
-        		getDependencyInjector().injectDependenciesInto(object);
-
-        		CallbackUtils.callCallback(adapter, CreatedCallbackFacet.class);
-            }
-			return object;
-        } catch (final ObjectInstantiationException e) {
-            throw new IsisException("Failed to create instance of type " + cls.getName(), e);
-        }
-    }
-
-
-
-    @Override
-    public boolean isDirty(final ObjectAdapter object) {
-        return isDirtyObjectFacet == null ? false : isDirtyObjectFacet.invoke(object);
-    }
-
-    @Override
-    public void clearDirty(final ObjectAdapter object) {
-        if (clearDirtyObjectFacet != null) {
-            clearDirtyObjectFacet.invoke(object);
-        }
-    }
-
-    @Override
-    public void markDirty(final ObjectAdapter object) {
-        if (markDirtyObjectFacet != null) {
-            markDirtyObjectFacet.invoke(object);
-        }
-    }
-
-    // //////////////////////////////////////////////////////////////////////
-    // markAsService
-    // //////////////////////////////////////////////////////////////////////
-
-    /**
-     * TODO: should ensure that service has at least one user action; fix when specification knows of its
-     * hidden methods.
-     *
-     * <pre>
-     * if (objectActions != null &amp;&amp; objectActions.length == 0) {
-     *     throw new ObjectSpecificationException(&quot;Service object &quot; + getFullName() + &quot; should have at least one user action&quot;);
-     * }
-     * </pre>
-     */
-    @Override
-    public void markAsService() {
-        final List<ObjectAssociation> fields = getAssociations();
-        if (fields != null && fields.size() > 0) {
-            StringBuilder buf = new StringBuilder();
-            for (int i = 0; i < fields.size(); i++) {
-                final String name = fields.get(i).getId();
-                if ("id".indexOf(name) == -1) {
-                    appendFieldName(buf, name);
-                }
-            }
-            if (buf.length() > 0) {
-                throw new ObjectSpecificationException("Service object " + getFullName()
-                        + " should have no fields, but has: " + buf);
-            }
-        }
-
-        service = true;
-    }
-
-
-    private void appendFieldName(StringBuilder fieldNames, final String name) {
-        fieldNames.append(fieldNames.length() > 0 ? ", " : "");
-        fieldNames.append(name);
-    }
-
-
-
-    // //////////////////////////////////////////////////////////////////////
-    // Debug, toString
-    // //////////////////////////////////////////////////////////////////////
-
-    @Override
-    public void debugData(final DebugString debug) {
-        debug.blankLine();
-        debug.appendln("Title", getFacet(TitleFacet.class));
-        if (iconMethod != null) {
-            debug.appendln("Icon", iconMethod);
-        }
-        debug.unindent();
-    }
-
-    @Override
-    public String debugTitle() {
-        return "NO Member Specification";
-    }
-
-    @Override
-    public String toString() {
-        final ToString str = new ToString(this);
-        str.append("class", fullName);
-        str.append("type", SpecUtils.typeNameFor(this));
-        str.append("persistable", persistable);
-        str.append("superclass", superClassSpecification == null ? "Object" : superClassSpecification.getFullName());
-        return str.toString();
-    }
-
-
-
-    // //////////////////////////////////////////////////////////////////
-    // Dependencies (from constructor)
-    // //////////////////////////////////////////////////////////////////
-
-    private ObjectReflectorAbstract getReflector() {
-        return reflector;
-    }
-
-    /**
-     * Derived from {@link #getReflector()}
-     */
-    private ClassSubstitutor getClassSubstitutor() {
-        return reflector.getClassSubstitutor();
-    }
-
-    public SpecificationLookup getSpecificationLookup() {
-        return specificationLookup;
+    public ObjectAction getObjectAction(final ObjectActionType type, final String id,
+        final List<ObjectSpecification> parameters) {
+        final List<ObjectAction> availableActions =
+            ListUtils.combine(getObjectActionsAll(), getContributedActions(type));
+        return getAction(availableActions, type, id, parameters);
     }
-    public AdapterMap getAdapterMap() {
+
+    @Override
+    public ObjectAction getObjectAction(final ObjectActionType type, final String nameParmsIdentityString) {
+        final List<ObjectAction> availableActions =
+            ListUtils.combine(getObjectActionsAll(), getContributedActions(type));
+        return getAction(availableActions, type, nameParmsIdentityString);
+    }
+
+    private ObjectAction getAction(final List<ObjectAction> availableActions, final ObjectActionType type,
+        final String actionName, final List<ObjectSpecification> parameters) {
+        outer: for (int i = 0; i < availableActions.size(); i++) {
+            final ObjectAction action = availableActions.get(i);
+            if (action.getActions().size() > 0) {
+                // deal with action set
+                final ObjectAction a = getAction(action.getActions(), type, actionName, parameters);
+                if (a != null) {
+                    return a;
+                }
+            } else {
+                // regular action
+                if (!action.getType().equals(type)) {
+                    continue outer;
+                }
+                if (actionName != null && !actionName.equals(action.getId())) {
+                    continue outer;
+                }
+                if (action.getParameters().size() != parameters.size()) {
+                    continue outer;
+                }
+                for (int j = 0; j < parameters.size(); j++) {
+                    if (!parameters.get(j).isOfType(action.getParameters().get(j).getSpecification())) {
+                        continue outer;
+                    }
+                }
+                return action;
+            }
+        }
+        return null;
+    }
+
+    private ObjectAction getAction(final List<ObjectAction> availableActions, final ObjectActionType type,
+        final String nameParmsIdentityString) {
+        if (nameParmsIdentityString == null) {
+            return null;
+        }
+        outer: for (int i = 0; i < availableActions.size(); i++) {
+            final ObjectAction action = availableActions.get(i);
+            if (action.getActions().size() > 0) {
+                // deal with action set
+                final ObjectAction a = getAction(action.getActions(), type, nameParmsIdentityString);
+                if (a != null) {
+                    return a;
+                }
+            } else {
+                // regular action
+                if (!sameActionTypeOrNotSpecified(type, action)) {
+                    continue outer;
+                }
+                if (!nameParmsIdentityString.equals(action.getIdentifier().toNameParmsIdentityString())) {
+                    continue outer;
+                }
+                return action;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public boolean isCollectionOrIsAggregated() {
+        return isCollection() || isValueOrIsAggregated();
+    }
+
+    // //////////////////////////////////////////////////////////////////////
+    // createObject
+    // //////////////////////////////////////////////////////////////////////
+
+    @Override
+    public Object createObject(CreationMode creationMode) {
+        if (getIntrospectedClass().isArray()) {
+            return Array.newInstance(getIntrospectedClass().getComponentType(), 0);
+        }
+
+        try {
+            Object object = getObjectInstantiator().instantiate(getIntrospectedClass());
+
+            if (creationMode == CreationMode.INITIALIZE) {
+                final ObjectAdapter adapter = getAdapterMap().adapterFor(object);
+
+                // initialize new object
+                final List<ObjectAssociation> fields = adapter.getSpecification().getAssociations();
+                for (int i = 0; i < fields.size(); i++) {
+                    fields.get(i).toDefault(adapter);
+                }
+                getDependencyInjector().injectDependenciesInto(object);
+
+                CallbackUtils.callCallback(adapter, CreatedCallbackFacet.class);
+            }
+            return object;
+        } catch (final ObjectInstantiationException e) {
+            throw new IsisException("Failed to create instance of type " + getFullName(), e);
+        }
+    }
+
+    // //////////////////////////////////////////////////////////////////////
+    // getMember, catalog... (not API)
+    // //////////////////////////////////////////////////////////////////////
+
+    public ObjectMember getMember(final Method method) {
+        if (membersByMethod == null) {
+            final HashMap<Method, ObjectMember> membersByMethod = Maps.newHashMap();
+            cataloguePropertiesAndCollections(membersByMethod);
+            catalogueActions(membersByMethod);
+            this.membersByMethod = membersByMethod;
+        }
+        return membersByMethod.get(method);
+    }
+
+    private void cataloguePropertiesAndCollections(final Map<Method, ObjectMember> membersByMethod) {
+        Filter noop = AbstractFilter.noop(ObjectAssociation.class);
+        final List<ObjectAssociation> fields = getAssociations(noop);
+        for (int i = 0; i < fields.size(); i++) {
+            final ObjectAssociation field = fields.get(i);
+            final Facet[] facets = field.getFacets(ImperativeFacet.FILTER);
+            for (int j = 0; j < facets.length; j++) {
+                final ImperativeFacet facet = ImperativeFacetUtils.getImperativeFacet(facets[j]);
+                for (Method imperativeFacetMethod : facet.getMethods()) {
+                    membersByMethod.put(imperativeFacetMethod, field);
+                }
+            }
+        }
+    }
+
+    private void catalogueActions(final Map<Method, ObjectMember> membersByMethod) {
+        final List<ObjectAction> userActions = getObjectActions(ObjectActionType.USER);
+        for (int i = 0; i < userActions.size(); i++) {
+            final ObjectAction userAction = userActions.get(i);
+            final Facet[] facets = userAction.getFacets(ImperativeFacet.FILTER);
+            for (int j = 0; j < facets.length; j++) {
+                final ImperativeFacet facet = ImperativeFacetUtils.getImperativeFacet(facets[j]);
+                for (Method imperativeFacetMethod : facet.getMethods()) {
+                    membersByMethod.put(imperativeFacetMethod, userAction);
+                }
+            }
+        }
+    }
+
+    // //////////////////////////////////////////////////////////////////////
+    // Debug, toString
+    // //////////////////////////////////////////////////////////////////////
+
+    @Override
+    public void debugData(final DebugString debug) {
+        debug.blankLine();
+        debug.appendln("Title", getFacet(TitleFacet.class));
+        if (iconFacet != null) {
+            debug.appendln("Icon", iconFacet);
+        }
+        debug.unindent();
+    }
+
+    @Override
+    public String debugTitle() {
+        return "NO Member Specification";
+    }
+
+    @Override
+    public String toString() {
+        final ToString str = new ToString(this);
+        str.append("class", getFullName());
+        str.append("type", (isCollection() ? "Collection" : "Object"));
+        str.append("persistable", persistability());
+        str.append("superclass", superclass() == null ? "Object" : superclass().getFullName());
+        return str.toString();
+    }
+
+    // //////////////////////////////////////////////////////////////////
+    // Dependencies (from constructor)
+    // //////////////////////////////////////////////////////////////////
+
+    /**
+     * Derived from {@link #getReflector()}
+     */
+    private ClassSubstitutor getClassSubstitutor() {
+        return reflector.getClassSubstitutor();
+    }
+
+    protected AdapterMap getAdapterMap() {
         return adapterMap;
     }
 
@@ -853,5 +609,5 @@ public class JavaSpecification extends I
     protected QuerySubmitter getQuerySubmitter() {
         return querySubmitter;
     }
-    
-}
+
+}

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/peer/FacetedMethod.java (from r1051446, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/peer/ObjectMemberPeer.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/peer/FacetedMethod.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/peer/FacetedMethod.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/peer/ObjectMemberPeer.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/peer/ObjectMemberPeer.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/peer/FacetedMethod.java Wed Dec 22 16:22:08 2010
@@ -18,26 +18,134 @@
  */
 
 
-package org.apache.isis.core.metamodel.specloader.internal.peer;
+package org.apache.isis.core.metamodel.peer;
 
+import java.lang.reflect.Method;
+import java.util.Collections;
 import java.util.List;
 
+import com.google.inject.internal.Lists;
+
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.debug.Debuggable;
-import org.apache.isis.core.metamodel.runtimecontext.spec.feature.FeatureType;
-import org.apache.isis.core.metamodel.spec.identifier.Identified;
-
-
-/**
- * Details about action and field members gained via reflection.
- */
-public interface ObjectMemberPeer extends Identified, TypedHolder, Debuggable {
+import org.apache.isis.core.commons.lang.StringUtils;
+import org.apache.isis.core.metamodel.facets.TypedHolderDefault;
+import org.apache.isis.core.metamodel.feature.FeatureType;
+import org.apache.isis.core.metamodel.feature.IdentifiedHolder;
+
+
+/**
+ * non-final only so it can be mocked if need be.
+ */
+public class FacetedMethod extends TypedHolderDefault implements IdentifiedHolder, Debuggable {
+
+    ////////////////////////////////////////////////////
+    // Factory methods
+    ////////////////////////////////////////////////////
+
+    public static FacetedMethod createPropertyPeer(Class<?> declaringType, Method method) {
+        return new FacetedMethod(FeatureType.PROPERTY, declaringType, method, method.getReturnType(), emptyParameterList());
+    }
+
+    /**
+     * Principally for testing purposes.
+     */
+    public static FacetedMethod createProperty(Class<?> owningClass, final String name) {
+        try {
+            final Method method = owningClass.getMethod("get" + StringUtils.pascal(name));
+            return FacetedMethod.createPropertyPeer(owningClass, method);
+        } catch (SecurityException e) {
+            throw new RuntimeException(e);
+        } catch (NoSuchMethodException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static FacetedMethod createCollectionPeer(Class<?> declaringType, Method method) {
+        return new FacetedMethod(FeatureType.COLLECTION, declaringType, method, null, emptyParameterList());
+    }
+
+    public static FacetedMethod createActionPeer(Class<?> declaringType, Method method) {
+        return new FacetedMethod(FeatureType.ACTION, declaringType, method, method.getReturnType(), getParameters(method));
+    }
+
+    private static List<FacetedMethodParameter> getParameters(final Method actionMethod) {
+        final Class<?>[] parameterTypes = actionMethod.getParameterTypes();
+        final List<FacetedMethodParameter> actionParams = Lists.newArrayList();
+        for (Class<?> parameterType : parameterTypes) {
+            actionParams.add(new FacetedMethodParameter(parameterType));
+        }
+        return Collections.unmodifiableList(actionParams);
+    }
+
+    ////////////////////////////////////////////////////
+    // Constructor
+    ////////////////////////////////////////////////////
+
+    private final Class<?> owningType;
+    private final Method method;
+    private final Identifier identifier;
+    private final List<FacetedMethodParameter> parameters;
+
+    public List<FacetedMethodParameter> getParameters() {
+        return parameters;
+    }
+
+    public static List<FacetedMethodParameter> emptyParameterList() {
+        final List<FacetedMethodParameter> emptyList = Collections.emptyList();
+        return Collections.unmodifiableList(emptyList);
+    }
+
+    private FacetedMethod(final FeatureType featureType, final Class<?> declaringType, final Method method, Class<?> type, final List<FacetedMethodParameter> parameters) {
+        super(featureType, type);
+        this.owningType = declaringType;
+        this.method = method;
+        this.identifier = featureType.identifierFor(declaringType, method);
+        this.parameters = parameters;
+    }
 
     /**
-     * Associated {@link TypedHolder}s.
+     * The {@link Class} that owns this {@link Method} (as per
+     * {@link Class#getMethods()}, returning the {@link Method}s both of this
+     * class and of its superclasses).
      * 
-     * Only {@link FeatureType#ACTION action}s have a non-empty list, 
-     * namely their parameters.
+     * <p>
+     * Note: we don't call this the 'declaring type' because {@link Class#getDeclaredMethods()}
+     * does not return methods from superclasses.
+     */
+    public Class<?> getOwningType() {
+        return owningType;
+    }
+
+    /**
+     * A {@link Method} obtained from the {@link #getOwningType() owning type}
+     * using {@link Class#getMethods()}.
      */
-    List<TypedHolder> getChildren();
+    public Method getMethod() {
+        return method;
+    }
+
+    @Override
+    public Identifier getIdentifier() {
+        return identifier;
+    }
+
+
+    //////////////////////////////////////////////////////////////////////
+    // toString, debug
+    //////////////////////////////////////////////////////////////////////
+
+    @Override
+    public String toString() {
+        return getFeatureType().name() + " Peer [identifier=\"" + getIdentifier() + "\",type=" + getType().getName() + " ]";
+    }
+
+    @Override
+    public void debugData(final DebugString debug) {
+        // TODO: reinstate
+        // debug.appendln("Identifier", identifier.toString());
+    }
+
 
-}
+}

Added: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/peer/FacetedMethodParameter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/peer/FacetedMethodParameter.java?rev=1051971&view=auto
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/peer/FacetedMethodParameter.java (added)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/peer/FacetedMethodParameter.java Wed Dec 22 16:22:08 2010
@@ -0,0 +1,28 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.isis.core.metamodel.peer;
+
+import org.apache.isis.core.metamodel.facets.TypedHolderDefault;
+import org.apache.isis.core.metamodel.feature.FeatureType;
+
+public final class FacetedMethodParameter extends TypedHolderDefault {
+
+    public FacetedMethodParameter(Class<?> type) {
+        super(FeatureType.ACTION_PARAMETER, type);
+    }
+
+}

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/peer/IdentifierUtils.java (from r1051446, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/identifier/IdentifierFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/peer/IdentifierUtils.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/peer/IdentifierUtils.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/identifier/IdentifierFactory.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/identifier/IdentifierFactory.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/peer/IdentifierUtils.java Wed Dec 22 16:22:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.spec.identifier;
+package org.apache.isis.core.metamodel.peer;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
@@ -30,12 +30,11 @@ import java.util.StringTokenizer;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.commons.ensure.Ensure;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
 
-public class IdentifierFactory {
+public final class IdentifierUtils {
 
-    private IdentifierFactory() {}
+    private IdentifierUtils() {}
 
     /**
      * Factory method.
@@ -70,22 +69,5 @@ public class IdentifierFactory {
         return Identifier.actionIdentifier(className, name, parmList.toArray(new String[]{}));
     }
 
-    /**
-     * Helper, used within contructor chaining
-     */
-    private static String[] toParameterStringArray(final ObjectSpecification[] specifications) {
-        final String[] parameters = new String[specifications == null ? 0 : specifications.length];
-        for (int i = 0; i < parameters.length; i++) {
-            parameters[i] = specifications[i].getFullName();
-        }
-        return parameters;
-    }
-
-    public static Identifier create(
-            final String className,
-            final String methodName,
-            final ObjectSpecification[] specifications) {
-        return Identifier.actionIdentifier(className, methodName, toParameterStringArray(specifications));
-    }
 
 }

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContext.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContext.java Wed Dec 22 16:22:08 2010
@@ -22,7 +22,16 @@ package org.apache.isis.core.metamodel.r
 
 import org.apache.isis.applib.DomainObjectContainer;
 import org.apache.isis.core.commons.components.Injectable;
+import org.apache.isis.core.metamodel.adapter.AdapterMap;
+import org.apache.isis.core.metamodel.adapter.DomainObjectServices;
+import org.apache.isis.core.metamodel.adapter.ObjectDirtier;
+import org.apache.isis.core.metamodel.adapter.ObjectPersistor;
+import org.apache.isis.core.metamodel.adapter.QuerySubmitter;
+import org.apache.isis.core.metamodel.adapter.ServicesProvider;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.metamodel.spec.ObjectInstantiator;
+import org.apache.isis.core.metamodel.spec.SpecificationLookup;
 
 /**
  * Decouples the metamodel from a runtime.

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAbstract.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAbstract.java Wed Dec 22 16:22:08 2010
@@ -26,9 +26,11 @@ import java.util.Properties;
 
 import org.apache.isis.applib.DomainObjectContainer;
 import org.apache.isis.core.metamodel.services.container.DomainObjectContainerAware;
-import org.apache.isis.core.metamodel.specloader.ObjectReflectorAbstract;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoaderAware;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
+import org.apache.isis.core.metamodel.spec.SpecificationLoaderAware;
+import org.apache.isis.core.metamodel.spec.SpecificationLookup;
+import org.apache.isis.core.metamodel.spec.SpecificationLookupDelegator;
 
 
 public abstract class RuntimeContextAbstract implements RuntimeContext, SpecificationLoaderAware, DomainObjectContainerAware {
@@ -69,11 +71,21 @@ public abstract class RuntimeContextAbst
 	 * Is injected into when the reflector is {@link ObjectReflectorAbstract#init() initialized}.
 	 */
 	@Override
-    public void setSpecificationLoader(SpecificationLoader specificationLoader) {
-		this.specificationLookupDelegator.setDelegate(specificationLoader);
+    public void setSpecificationLoader(final SpecificationLoader specificationLoader) {
+		this.specificationLookupDelegator.setDelegate(new SpecificationLookup() {
+            
+            @Override
+            public void injectInto(Object candidate) {
+                specificationLoader.injectInto(candidate);
+            }
+            
+            @Override
+            public ObjectSpecification loadSpecification(Class<?> cls) {
+                return specificationLoader.loadSpecification(cls);
+            }
+        });
 	}
 	
-	
 
 	protected DomainObjectContainer getContainer() {
 		return container;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/AuthenticationSessionNoRuntime.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/AuthenticationSessionNoRuntime.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/AuthenticationSessionNoRuntime.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/AuthenticationSessionNoRuntime.java Wed Dec 22 16:22:08 2010
@@ -20,11 +20,10 @@
 
 package org.apache.isis.core.metamodel.runtimecontext.noruntime;
 
-import java.io.IOException;
-
+import java.io.IOException;
+
 import org.apache.isis.core.metamodel.authentication.AuthenticationSessionAbstract;
 import org.apache.isis.core.metamodel.encoding.DataInputExtended;
-import org.apache.isis.core.metamodel.encoding.DataInputStreamExtended;
 
 public class AuthenticationSessionNoRuntime extends AuthenticationSessionAbstract {
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java Wed Dec 22 16:22:08 2010
@@ -23,19 +23,19 @@ package org.apache.isis.core.metamodel.r
 import java.util.Collections;
 import java.util.List;
 
+import org.apache.isis.core.metamodel.adapter.AdapterMap;
+import org.apache.isis.core.metamodel.adapter.DomainObjectServices;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.runtimecontext.AuthenticationSessionProvider;
+import org.apache.isis.core.metamodel.adapter.ObjectDirtier;
+import org.apache.isis.core.metamodel.adapter.ObjectPersistor;
+import org.apache.isis.core.metamodel.adapter.QuerySubmitter;
+import org.apache.isis.core.metamodel.adapter.ServicesProvider;
+import org.apache.isis.core.metamodel.adapter.ServicesProviderAbstract;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSessionProvider;
 import org.apache.isis.core.metamodel.runtimecontext.DependencyInjector;
 import org.apache.isis.core.metamodel.runtimecontext.DependencyInjectorAbstract;
-import org.apache.isis.core.metamodel.runtimecontext.DomainObjectServices;
-import org.apache.isis.core.metamodel.runtimecontext.AdapterMap;
-import org.apache.isis.core.metamodel.runtimecontext.ObjectDirtier;
-import org.apache.isis.core.metamodel.runtimecontext.ObjectInstantiator;
-import org.apache.isis.core.metamodel.runtimecontext.ObjectPersistor;
-import org.apache.isis.core.metamodel.runtimecontext.QuerySubmitter;
 import org.apache.isis.core.metamodel.runtimecontext.RuntimeContextAbstract;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesProvider;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesProviderAbstract;
+import org.apache.isis.core.metamodel.spec.ObjectInstantiator;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
 public class RuntimeContextNoRuntime extends RuntimeContextAbstract {

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/spec/feature/ObjectAssociationAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/spec/feature/ObjectAssociationAbstract.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/spec/feature/ObjectAssociationAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/spec/feature/ObjectAssociationAbstract.java Wed Dec 22 16:22:08 2010
@@ -21,17 +21,18 @@
 package org.apache.isis.core.metamodel.runtimecontext.spec.feature;
 
 import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
+import org.apache.isis.core.metamodel.adapter.AdapterMap;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.QuerySubmitter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSessionProvider;
 import org.apache.isis.core.metamodel.facets.propcoll.notpersisted.NotPersistedFacet;
 import org.apache.isis.core.metamodel.facets.properties.choices.PropertyChoicesFacet;
 import org.apache.isis.core.metamodel.facets.propparam.validate.mandatory.MandatoryFacet;
-import org.apache.isis.core.metamodel.runtimecontext.AuthenticationSessionProvider;
-import org.apache.isis.core.metamodel.runtimecontext.AdapterMap;
-import org.apache.isis.core.metamodel.runtimecontext.QuerySubmitter;
-import org.apache.isis.core.metamodel.runtimecontext.SpecificationLookup;
+import org.apache.isis.core.metamodel.feature.FeatureType;
+import org.apache.isis.core.metamodel.feature.IdentifiedHolder;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.SpecificationLookup;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.core.metamodel.spec.identifier.Identified;
 
 
 // TODO need to pull up the common methods. like getName(), from subclasses
@@ -42,13 +43,13 @@ public abstract class ObjectAssociationA
     public ObjectAssociationAbstract(
             final String associationId,
             final ObjectSpecification specification,
-            final FeatureType memberType,
-            final Identified facetHolder, 
+            final FeatureType featureType,
+            final IdentifiedHolder facetHolder, 
             final AuthenticationSessionProvider authenticationSessionProvider,
             final SpecificationLookup specificationLookup,
             final AdapterMap adapterManager,
             final QuerySubmitter querySubmitter) {
-        super(associationId, facetHolder, memberType, authenticationSessionProvider, specificationLookup, adapterManager, querySubmitter);
+        super(associationId, facetHolder, featureType, authenticationSessionProvider, specificationLookup, adapterManager, querySubmitter);
         if (specification == null) {
             throw new IllegalArgumentException("field type for '" + associationId + "' must exist");
         }

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/spec/feature/ObjectMemberAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/spec/feature/ObjectMemberAbstract.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/spec/feature/ObjectMemberAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/spec/feature/ObjectMemberAbstract.java Wed Dec 22 16:22:08 2010
@@ -22,8 +22,11 @@ package org.apache.isis.core.metamodel.r
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.commons.filters.Filter;
+import org.apache.isis.core.metamodel.adapter.AdapterMap;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.QuerySubmitter;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSessionProvider;
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
 import org.apache.isis.core.metamodel.consent.InteractionResult;
@@ -33,18 +36,16 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.hide.HiddenFacet;
 import org.apache.isis.core.metamodel.facets.naming.describedas.DescribedAsFacet;
 import org.apache.isis.core.metamodel.facets.naming.named.NamedFacet;
+import org.apache.isis.core.metamodel.feature.FeatureType;
+import org.apache.isis.core.metamodel.feature.IdentifiedHolder;
 import org.apache.isis.core.metamodel.interactions.DisablingInteractionAdvisor;
 import org.apache.isis.core.metamodel.interactions.HidingInteractionAdvisor;
 import org.apache.isis.core.metamodel.interactions.InteractionUtils;
 import org.apache.isis.core.metamodel.interactions.UsabilityContext;
 import org.apache.isis.core.metamodel.interactions.VisibilityContext;
-import org.apache.isis.core.metamodel.runtimecontext.AuthenticationSessionProvider;
-import org.apache.isis.core.metamodel.runtimecontext.AdapterMap;
-import org.apache.isis.core.metamodel.runtimecontext.QuerySubmitter;
-import org.apache.isis.core.metamodel.runtimecontext.SpecificationLookup;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.SpecificationLookup;
 import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.core.metamodel.spec.identifier.Identified;
 import org.apache.isis.core.metamodel.util.NameUtils;
 
 
@@ -56,7 +57,7 @@ public abstract class ObjectMemberAbstra
 
     protected final String defaultName;
     private final String id;
-    private final Identified facetHolder;
+    private final IdentifiedHolder facetHolder;
     private final FeatureType featureType;
     private final AuthenticationSessionProvider authenticationSessionProvider;
     private final SpecificationLookup specificationLookup;
@@ -65,8 +66,8 @@ public abstract class ObjectMemberAbstra
 
     protected ObjectMemberAbstract(
     		final String id, 
-    		final Identified facetHolder, 
-    		final FeatureType memberType, 
+    		final IdentifiedHolder facetHolder, 
+    		final FeatureType featureType, 
             final AuthenticationSessionProvider authenticationSessionProvider,
     		final SpecificationLookup specificationLookup,
             final AdapterMap adapterManager,
@@ -77,7 +78,7 @@ public abstract class ObjectMemberAbstra
         this.id = id;
         this.defaultName = NameUtils.naturalName(id);
         this.facetHolder = facetHolder;
-        this.featureType = memberType;
+        this.featureType = featureType;
         this.authenticationSessionProvider = authenticationSessionProvider;
         this.specificationLookup = specificationLookup;
         this.adapterMap = adapterManager;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorAbstract.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorAbstract.java Wed Dec 22 16:22:08 2010
@@ -20,10 +20,10 @@
 
 package org.apache.isis.core.metamodel.services;
 
+import static org.apache.isis.core.commons.ensure.Ensure.ensureThatArg;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.apache.isis.core.commons.ensure.Ensure.ensureThatArg;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -32,6 +32,7 @@ import java.util.Collections;
 import java.util.List;
 
 import org.apache.log4j.Logger;
+
 import org.apache.isis.applib.DomainObjectContainer;
 import org.apache.isis.core.commons.ensure.Assert;
 import org.apache.isis.core.commons.lang.CastUtils;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerAware.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerAware.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerAware.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerAware.java Wed Dec 22 16:22:08 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.metamodel.services.container;
 
-import org.apache.isis.applib.DomainObjectContainer;
+import org.apache.isis.applib.DomainObjectContainer;
 
 public interface DomainObjectContainerAware {