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/30 13:30:25 UTC
svn commit: r1053871 [8/22] - in /incubator/isis/trunk:
alternatives/bytecode/javassist/src/main/java/org/apache/isis/alternatives/bytecode/javassist/classsubstitutor/
alternatives/bytecode/javassist/src/main/java/org/apache/isis/alternatives/bytecode/...
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/ObjectSpecificationAbstract.java (from r1051972, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/IntrospectableSpecificationAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/ObjectSpecificationAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/ObjectSpecificationAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/IntrospectableSpecificationAbstract.java&r1=1051972&r2=1053871&rev=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/IntrospectableSpecificationAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/ObjectSpecificationAbstract.java Thu Dec 30 12:29:53 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.metamodel.spec;
+package org.apache.isis.core.metamodel.specloader.internal.spec;
import java.util.ArrayList;
import java.util.Arrays;
@@ -34,46 +34,60 @@ import org.apache.isis.applib.Identifier
import org.apache.isis.core.commons.filters.Filter;
import org.apache.isis.core.commons.lang.JavaClassUtils;
import org.apache.isis.core.commons.lang.ToString;
-import org.apache.isis.core.metamodel.adapter.Instance;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
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.consent.Consent;
-import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
-import org.apache.isis.core.metamodel.consent.InteractionResult;
-import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.consent2.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.consent2.InteractionResult;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.core.metamodel.facets.hide.HiddenFacet;
+import org.apache.isis.core.metamodel.facets.naming.describedas.DescribedAsFacet;
+import org.apache.isis.core.metamodel.facets.naming.named.NamedFacet;
import org.apache.isis.core.metamodel.facets.object.aggregated.AggregatedFacet;
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.encodeable.EncodableFacet;
+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.title.TitleFacet;
import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;
+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.object.parseable.ParseableFacet;
import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
-import org.apache.isis.core.metamodel.feature.FeatureType;
-import org.apache.isis.core.metamodel.interactions.InteractionContext;
-import org.apache.isis.core.metamodel.interactions.InteractionUtils;
-import org.apache.isis.core.metamodel.interactions.ObjectTitleContext;
-import org.apache.isis.core.metamodel.interactions.ObjectValidityContext;
+import org.apache.isis.core.metamodel.interactions2.InteractionContext;
+import org.apache.isis.core.metamodel.interactions2.InteractionUtils;
+import org.apache.isis.core.metamodel.interactions2.ObjectTitleContext;
+import org.apache.isis.core.metamodel.interactions2.ObjectValidityContext;
+import org.apache.isis.core.metamodel.spec.ActionType;
+import org.apache.isis.core.metamodel.spec.Instance;
+import org.apache.isis.core.metamodel.spec.ObjectActionSet;
+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.SpecificationContext;
+import org.apache.isis.core.metamodel.spec.SpecificationLookup;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification.CreationMode;
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.ObjectAssociationFilters;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.isis.core.metamodel.specloader.internal.spec.objectlist.ObjectSpecificationForObjectList;
-// TODO work through all subclasses and remove duplicated overridden methods - this
-// hierarchy is badly structured move common, and default, functionality to this class from subclasses.
-public abstract class IntrospectableSpecificationAbstract extends FacetHolderImpl implements
- IntrospectableSpecification {
+public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implements
+ ObjectSpecification {
- private final static Logger LOG = Logger.getLogger(IntrospectableSpecificationAbstract.class);
+ private final static Logger LOG = Logger.getLogger(ObjectSpecificationAbstract.class);
private static class SubclassList {
private final List<ObjectSpecification> classes = Lists.newArrayList();
@@ -107,9 +121,9 @@ public abstract class IntrospectableSpec
/**
* Lazily populated.
*/
- private final Map<ObjectActionType, List<ObjectAction>> contributedActionSetsByType = Maps.newLinkedHashMap();
+ private final Map<ActionType, List<ObjectAction>> contributedActionSetsByType = Maps.newLinkedHashMap();
- private final Class<?> introspectedClass;
+ private final Class<?> correspondingClass;
private final String fullName;
private final String shortName;
private final Identifier identifier;
@@ -136,27 +150,30 @@ public abstract class IntrospectableSpec
private ClearDirtyObjectFacet clearDirtyObjectFacet;
private IsDirtyObjectFacet isDirtyObjectFacet;
+ private TitleFacet titleFacet;
+ private IconFacet iconFacet;
+
private boolean introspected = false;
// //////////////////////////////////////////////////////////////////////
// Constructor
// //////////////////////////////////////////////////////////////////////
- public IntrospectableSpecificationAbstract(final Class<?> introspectedClass, final String shortName,
- final AuthenticationSessionProvider authenticationSessionProvider, final ServicesProvider servicesProvider,
- final ObjectInstantiator objectInstantiator, final SpecificationLookup specificationLookup) {
+ public ObjectSpecificationAbstract(
+ final Class<?> introspectedClass, final String shortName,
+ final SpecificationContext specificationContext) {
- this.introspectedClass = introspectedClass;
+ this.correspondingClass = introspectedClass;
this.fullName = introspectedClass.getName();
this.shortName = shortName;
this.isAbstract = JavaClassUtils.isAbstract(introspectedClass);
this.identifier = Identifier.classIdentifier(introspectedClass);
// dependencies
- this.authenticationSessionProvider = authenticationSessionProvider;
- this.servicesProvider = servicesProvider;
- this.objectInstantiator = objectInstantiator;
- this.specificationLookup = specificationLookup;
+ this.authenticationSessionProvider = specificationContext.authenticationSessionProvider;
+ this.servicesProvider = specificationContext.servicesProvider;
+ this.objectInstantiator = specificationContext.objectInstantiator;
+ this.specificationLookup = specificationContext.specificationLookup;
}
// //////////////////////////////////////////////////////////////////////
@@ -170,34 +187,37 @@ public abstract class IntrospectableSpec
/**
* As provided explicitly within the
- * {@link #IntrospectableSpecificationAbstract(Class, String, AuthenticationSessionProvider, ServicesProvider, ObjectInstantiator, SpecificationLookup)
+ * {@link #IntrospectableSpecificationAbstract(Class, String, SpecificationContext)
* constructor}.
+ *
+ * <p>
+ * Not API, but <tt>public</tt> so that {@link FacetedMethodsBuilder} can call it.
*/
- protected Class<?> getIntrospectedClass() {
- return introspectedClass;
+ public Class<?> getCorrespondingClass() {
+ return correspondingClass;
}
/**
* As provided explicitly within the
- * {@link #IntrospectableSpecificationAbstract(Class, String, AuthenticationSessionProvider, ServicesProvider, ObjectInstantiator, SpecificationLookup)
+ * {@link #IntrospectableSpecificationAbstract(Class, String, SpecificationContext)
* constructor}.
*/
@Override
- public String getShortName() {
+ public String getShortIdentifier() {
return shortName;
}
/**
- * The {@link Class#getName() (full) name} of the {@link #getIntrospectedClass() class}.
+ * The {@link Class#getName() (full) name} of the {@link #getCorrespondingClass() class}.
*/
@Override
- public String getFullName() {
+ public String getFullIdentifier() {
return fullName;
}
/**
* Only if {@link #setIntrospected(boolean)} has been called (should be called within
- * {@link #completeIntrospection()}.
+ * {@link #updateFromFacetValues()}.
*/
@Override
public boolean isIntrospected() {
@@ -235,11 +255,11 @@ public abstract class IntrospectableSpec
* Intended to be called within {@link #introspectTypeHierarchyAndMembers()}.
*/
protected void addAsSubclassTo(ObjectSpecification supertypeSpec) {
- if (!(supertypeSpec instanceof IntrospectableSpecificationAbstract)) {
+ if (!(supertypeSpec instanceof ObjectSpecificationAbstract)) {
return;
}
// downcast required because addSubclass is (deliberately) not public API
- IntrospectableSpecificationAbstract introspectableSpec = (IntrospectableSpecificationAbstract) supertypeSpec;
+ ObjectSpecificationAbstract introspectableSpec = (ObjectSpecificationAbstract) supertypeSpec;
introspectableSpec.addSubclass(this);
}
@@ -260,6 +280,9 @@ public abstract class IntrospectableSpec
* Intended to be called within {@link #introspectTypeHierarchyAndMembers()}.
*/
protected void addAssociations(List<ObjectAssociation> associations) {
+ if(associations == null) {
+ return;
+ }
this.associations.addAll(associations);
}
@@ -267,6 +290,9 @@ public abstract class IntrospectableSpec
* Intended to be called within {@link #introspectTypeHierarchyAndMembers()}.
*/
protected void addObjectActions(List<ObjectAction> objectActions) {
+ if(objectActions == null) {
+ return;
+ }
this.objectActions.addAll(objectActions);
}
@@ -274,62 +300,79 @@ public abstract class IntrospectableSpec
// Introspection (part 2)
// //////////////////////////////////////////////////////////////////////
- /**
- * Intended to be called within
- */
- protected void setSingularName(String singularName) {
- this.singularName = singularName;
- }
+ @Override
+ public void updateFromFacetValues() {
+ clearDirtyObjectFacet = getFacet(ClearDirtyObjectFacet.class);
+ markDirtyObjectFacet = getFacet(MarkDirtyObjectFacet.class);
+ isDirtyObjectFacet = getFacet(IsDirtyObjectFacet.class);
- /**
- * Intended to be called (if at all) within {@link #completeIntrospection()}.
- */
- protected void setPluralName(String pluralName) {
- this.pluralName = pluralName;
- }
+ titleFacet = getFacet(TitleFacet.class);
+ iconFacet = getFacet(IconFacet.class);
- /**
- * Intended to be called (if at all) within {@link #completeIntrospection()}.
- */
- protected void setDescribedAs(String describedAs) {
- this.describedAs = describedAs;
- }
+ NamedFacet namedFacet = getFacet(NamedFacet.class);
+ singularName = namedFacet.value();
- /**
- * Intended to be called (if at all) within {@link #completeIntrospection()}.
- */
- protected void setPersistability(Persistability persistability) {
+ PluralFacet pluralFacet = getFacet(PluralFacet.class);
+ pluralName = pluralFacet.value();
+
+ final DescribedAsFacet describedAsFacet = getFacet(DescribedAsFacet.class);
+ describedAs = describedAsFacet.value();
+
+ Persistability persistability = determinePersistability();
this.persistability = persistability;
}
+ private Persistability determinePersistability() {
+ final NotPersistableFacet notPersistableFacet = getFacet(NotPersistableFacet.class);
+ if(notPersistableFacet==null) {
+ return Persistability.USER_PERSISTABLE;
+ }
+ final InitiatedBy initiatedBy = notPersistableFacet.value();
+ if (initiatedBy == InitiatedBy.USER_OR_PROGRAM) {
+ return Persistability.TRANSIENT;
+ } else if (initiatedBy == InitiatedBy.USER) {
+ return Persistability.PROGRAM_PERSISTABLE;
+ } else {
+ return Persistability.USER_PERSISTABLE;
+ }
+ }
+
+
/**
- * Intended to be called (if at all) within {@link #completeIntrospection()}.
+ * Intended to be called (if at all) within {@link #updateFromFacetValues()}.
*/
protected void setClearDirtyObjectFacet(ClearDirtyObjectFacet clearDirtyObjectFacet) {
this.clearDirtyObjectFacet = clearDirtyObjectFacet;
}
/**
- * Intended to be called (if at all) within {@link #completeIntrospection()}.
+ * Intended to be called within {@link #updateFromFacetValues()}.
*/
- protected void setMarkDirtyObjectFacet(MarkDirtyObjectFacet markDirtyObjectFacet) {
- this.markDirtyObjectFacet = markDirtyObjectFacet;
+ protected void setIntrospected(boolean introspected) {
+ this.introspected = introspected;
}
- /**
- * Intended to be called (if at all) within {@link #completeIntrospection()}.
- */
- protected void setIsDirtyObjectFacet(IsDirtyObjectFacet isDirtyObjectFacet) {
- this.isDirtyObjectFacet = isDirtyObjectFacet;
+ // //////////////////////////////////////////////////////////////////////
+ // Title, Icon
+ // //////////////////////////////////////////////////////////////////////
+
+ @Override
+ public String getTitle(final ObjectAdapter object) {
+ if (titleFacet != null) {
+ final String titleString = titleFacet.title(object);
+ if (titleString != null && !titleString.equals("")) {
+ return titleString;
+ }
+ }
+ return (this.isService() ? "" : "Untitled ") + getSingularName();
}
- /**
- * Intended to be called within {@link #completeIntrospection()}.
- */
- protected void setIntrospected(boolean introspected) {
- this.introspected = introspected;
+ @Override
+ public String getIconName(final ObjectAdapter reference) {
+ return iconFacet == null ? null : iconFacet.iconName(reference);
}
+
// //////////////////////////////////////////////////////////////////////
// Specification
// //////////////////////////////////////////////////////////////////////
@@ -381,7 +424,7 @@ public abstract class IntrospectableSpec
// //////////////////////////////////////////////////////////////////////
@Override
- public String getName() {
+ public String getSingularName() {
return singularName;
}
@@ -541,14 +584,14 @@ public abstract class IntrospectableSpec
* The association with the given {@link ObjectAssociation#getId() id}.
*
* <p>
- * This is overridable because {@link InstanceCollectionSpecification} simply returns <tt>null</tt>.
+ * This is overridable because {@link ObjectSpecificationForObjectList} simply returns <tt>null</tt>.
*
* <p>
* TODO put fields into hash.
*
* <p>
* TODO: could this be made final? (ie does the framework ever call this method for an
- * {@link InstanceCollectionSpecification})
+ * {@link ObjectSpecificationForObjectList})
*/
@Override
public ObjectAssociation getAssociation(final String id) {
@@ -557,7 +600,7 @@ public abstract class IntrospectableSpec
return objectAssociation;
}
}
- throw new ObjectSpecificationException("No association called '" + id + "' in '" + getName() + "'");
+ throw new ObjectSpecificationException("No association called '" + id + "' in '" + getSingularName() + "'");
}
@Override
@@ -601,26 +644,26 @@ public abstract class IntrospectableSpec
}
@Override
- public List<ObjectAction> getObjectActions(final ObjectActionType... requestedTypes) {
+ public List<ObjectAction> getObjectActions(final ActionType... requestedTypes) {
List<ObjectAction> actions = Lists.newArrayList();
- for (ObjectActionType type : requestedTypes) {
+ for (ActionType type : requestedTypes) {
addActions(type, actions);
}
return actions;
}
- private void addActions(ObjectActionType type, List<ObjectAction> actions) {
+ private void addActions(ActionType type, List<ObjectAction> actions) {
if (!isService()) {
actions.addAll(getContributedActions(type));
}
actions.addAll(getActions(objectActions, type));
}
- private List<ObjectAction> getActions(final List<ObjectAction> availableActions, final ObjectActionType type) {
+ private List<ObjectAction> getActions(final List<ObjectAction> availableActions, final ActionType type) {
final List<ObjectAction> actions = Lists.newArrayList();
for (final ObjectAction action : availableActions) {
- final ObjectActionType actionType = action.getType();
- if (actionType == ObjectActionType.SET) {
+ final ActionType actionType = action.getType();
+ if (actionType == ActionType.SET) {
final ObjectActionSet actionSet = (ObjectActionSet) action;
final List<ObjectAction> subActions = actionSet.getActions();
for (final ObjectAction subAction : subActions) {
@@ -640,7 +683,7 @@ public abstract class IntrospectableSpec
return actions;
}
- protected boolean sameActionTypeOrNotSpecified(final ObjectActionType type, final ObjectAction action) {
+ protected boolean sameActionTypeOrNotSpecified(final ActionType type, final ObjectAction action) {
return type == null || action.getType().equals(type);
}
@@ -650,7 +693,7 @@ public abstract class IntrospectableSpec
// //////////////////////////////////////////////////////////////////////
@Override
- public List<ObjectAction> getServiceActionsReturning(final ObjectActionType... types) {
+ public List<ObjectAction> getServiceActionsReturning(final ActionType... types) {
final List<ObjectAction> serviceActions = Lists.newArrayList();
final List<ObjectAdapter> services = getServicesProvider().getServices();
for (ObjectAdapter serviceAdapter : services) {
@@ -659,10 +702,10 @@ public abstract class IntrospectableSpec
return serviceActions;
}
- private void appendServiceActionsReturning(ObjectAdapter serviceAdapter, final List<ObjectActionType> types,
+ private void appendServiceActionsReturning(ObjectAdapter serviceAdapter, final List<ActionType> types,
final List<ObjectAction> relatedActionsToAppendTo) {
final List<ObjectAction> matchingActionsToAppendTo = Lists.newArrayList();
- for (ObjectActionType type : types) {
+ for (ActionType type : types) {
final List<ObjectAction> serviceActions = serviceAdapter.getSpecification().getObjectActions(type);
for (ObjectAction serviceAction : serviceActions) {
addIfReturnsSubtype(serviceAction, matchingActionsToAppendTo);
@@ -711,7 +754,7 @@ public abstract class IntrospectableSpec
* type.
*
*/
- protected List<ObjectAction> getContributedActions(final ObjectActionType actionType) {
+ protected List<ObjectAction> getContributedActions(final ActionType actionType) {
if (isService()) {
return Collections.emptyList();
}
@@ -728,7 +771,7 @@ public abstract class IntrospectableSpec
return contributedActionSets;
}
- private void addContributedActionsIfAny(ObjectAdapter serviceAdapter, final ObjectActionType actionType,
+ private void addContributedActionsIfAny(ObjectAdapter serviceAdapter, final ActionType actionType,
final List<ObjectAction> contributedActionSetsToAppendTo) {
final ObjectSpecification specification = serviceAdapter.getSpecification();
if (specification == this) {
@@ -745,7 +788,7 @@ public abstract class IntrospectableSpec
}
private List<ObjectAction> findContributedActions(final ObjectSpecification specification,
- final ObjectActionType actionType) {
+ final ActionType actionType) {
final List<ObjectAction> contributedActions = Lists.newArrayList();
final List<ObjectAction> serviceActions = specification.getObjectActions(actionType);
for (ObjectAction serviceAction : serviceActions) {
@@ -860,7 +903,7 @@ public abstract class IntrospectableSpec
@Override
public Object createObject(CreationMode creationMode) {
- throw new UnsupportedOperationException(getFullName());
+ throw new UnsupportedOperationException(getFullIdentifier());
}
// //////////////////////////////////////////////////////////////////////
@@ -870,7 +913,7 @@ public abstract class IntrospectableSpec
@Override
public String toString() {
final ToString str = new ToString(this);
- str.append("class", getFullName());
+ str.append("class", getFullIdentifier());
return str.toString();
}
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/OneToManyAssociationImpl.java (from r1051972, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/OneToManyAssociationImpl.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/OneToManyAssociationImpl.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/OneToManyAssociationImpl.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/OneToManyAssociationImpl.java&r1=1051972&r2=1053871&rev=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/OneToManyAssociationImpl.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/OneToManyAssociationImpl.java Thu Dec 30 12:29:53 2010
@@ -18,58 +18,44 @@
*/
-package org.apache.isis.core.metamodel.specloader.internal;
+package org.apache.isis.core.metamodel.specloader.internal.spec;
import org.apache.isis.core.commons.debug.DebugString;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.lang.ToString;
-import org.apache.isis.core.metamodel.adapter.AdapterMap;
-import org.apache.isis.core.metamodel.adapter.Instance;
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;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.consent2.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.consent2.InteractionResult;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionAddToFacet;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionClearFacet;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacetUtils;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionRemoveFromFacet;
import org.apache.isis.core.metamodel.facets.propcoll.access.PropertyAccessorFacet;
-import org.apache.isis.core.metamodel.feature.FeatureType;
-import org.apache.isis.core.metamodel.interactions.CollectionAddToContext;
-import org.apache.isis.core.metamodel.interactions.CollectionRemoveFromContext;
-import org.apache.isis.core.metamodel.interactions.CollectionUsabilityContext;
-import org.apache.isis.core.metamodel.interactions.CollectionVisibilityContext;
-import org.apache.isis.core.metamodel.interactions.InteractionUtils;
-import org.apache.isis.core.metamodel.interactions.UsabilityContext;
-import org.apache.isis.core.metamodel.interactions.ValidityContext;
-import org.apache.isis.core.metamodel.interactions.VisibilityContext;
+import org.apache.isis.core.metamodel.interactions2.CollectionAddToContext;
+import org.apache.isis.core.metamodel.interactions2.CollectionRemoveFromContext;
+import org.apache.isis.core.metamodel.interactions2.CollectionUsabilityContext;
+import org.apache.isis.core.metamodel.interactions2.CollectionVisibilityContext;
+import org.apache.isis.core.metamodel.interactions2.InteractionUtils;
+import org.apache.isis.core.metamodel.interactions2.UsabilityContext;
+import org.apache.isis.core.metamodel.interactions2.ValidityContext;
+import org.apache.isis.core.metamodel.interactions2.VisibilityContext;
import org.apache.isis.core.metamodel.peer.FacetedMethod;
-import org.apache.isis.core.metamodel.runtimecontext.spec.feature.ObjectAssociationAbstract;
-import org.apache.isis.core.metamodel.spec.SpecificationLookup;
+import org.apache.isis.core.metamodel.peer.ObjectAssociationAbstract;
+import org.apache.isis.core.metamodel.spec.Instance;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMemberContext;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
public class OneToManyAssociationImpl extends ObjectAssociationAbstract implements OneToManyAssociation {
- private final FacetedMethod facetedMethod;
-
public OneToManyAssociationImpl(
final FacetedMethod facetedMethod,
- final AuthenticationSessionProvider authenticationSessionProvider,
- final SpecificationLookup specificationLookup,
- final AdapterMap adapterManager,
- final QuerySubmitter querySubmitter) {
- super(facetedMethod.getIdentifier().getMemberName(), getSpecification(specificationLookup, facetedMethod.getType()), FeatureType.COLLECTION, facetedMethod, authenticationSessionProvider, specificationLookup, adapterManager, querySubmitter);
- this.facetedMethod = facetedMethod;
- }
-
-
- public FacetedMethod getFacetedMethod(){
- return facetedMethod;
+ final ObjectMemberContext objectMemberContext) {
+ super(facetedMethod, FeatureType.COLLECTION, getSpecification(objectMemberContext.specificationLookup, facetedMethod.getType()), objectMemberContext);
}
// /////////////////////////////////////////////////////////////
@@ -277,7 +263,7 @@ public class OneToManyAssociationImpl ex
final DebugString debugString = new DebugString();
debugString.indent();
debugString.indent();
- facetedMethod.debugData(debugString);
+ getFacetedMethod().debugData(debugString);
return debugString.toString();
}
@@ -287,7 +273,7 @@ public class OneToManyAssociationImpl ex
str.append(super.toString());
str.append(",");
str.append("persisted", !isNotPersisted());
- str.append("type", getSpecification() == null ? "unknown" : getSpecification().getShortName());
+ str.append("type", getSpecification() == null ? "unknown" : getSpecification().getShortIdentifier());
return str.toString();
}
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/OneToOneActionParameterImpl.java (from r1051972, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/OneToOneActionParameterImpl.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/OneToOneActionParameterImpl.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/OneToOneActionParameterImpl.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/OneToOneActionParameterImpl.java&r1=1051972&r2=1053871&rev=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/OneToOneActionParameterImpl.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/OneToOneActionParameterImpl.java Thu Dec 30 12:29:53 2010
@@ -18,13 +18,13 @@
*/
-package org.apache.isis.core.metamodel.specloader.internal;
+package org.apache.isis.core.metamodel.specloader.internal.spec;
-import org.apache.isis.core.metamodel.adapter.Instance;
import org.apache.isis.core.metamodel.adapter.MutableProposedHolder;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.TypedHolder;
-import org.apache.isis.core.metamodel.feature.FeatureType;
+import org.apache.isis.core.metamodel.spec.Instance;
import org.apache.isis.core.metamodel.spec.feature.OneToOneActionParameter;
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/OneToOneAssociationImpl.java (from r1051972, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/OneToOneAssociationImpl.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/OneToOneAssociationImpl.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/OneToOneAssociationImpl.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/OneToOneAssociationImpl.java&r1=1051972&r2=1053871&rev=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/OneToOneAssociationImpl.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/OneToOneAssociationImpl.java Thu Dec 30 12:29:53 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.core.metamodel.specloader.internal;
+package org.apache.isis.core.metamodel.specloader.internal.spec;
import java.util.List;
@@ -26,15 +26,13 @@ import org.apache.isis.applib.query.Quer
import org.apache.isis.core.commons.debug.DebugString;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.lang.ToString;
-import org.apache.isis.core.metamodel.adapter.AdapterMap;
-import org.apache.isis.core.metamodel.adapter.Instance;
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;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.consent2.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.consent2.InteractionResult;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.facets.SpecificationFacets;
import org.apache.isis.core.metamodel.facets.propcoll.access.PropertyAccessorFacet;
import org.apache.isis.core.metamodel.facets.properties.choices.PropertyChoicesFacet;
import org.apache.isis.core.metamodel.facets.properties.defaults.PropertyDefaultFacet;
@@ -42,34 +40,30 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facets.properties.modify.PropertyInitializationFacet;
import org.apache.isis.core.metamodel.facets.properties.modify.PropertySetterFacet;
import org.apache.isis.core.metamodel.facets.propparam.validate.mandatory.MandatoryFacet;
-import org.apache.isis.core.metamodel.feature.FeatureType;
-import org.apache.isis.core.metamodel.interactions.InteractionUtils;
-import org.apache.isis.core.metamodel.interactions.PropertyAccessContext;
-import org.apache.isis.core.metamodel.interactions.PropertyModifyContext;
-import org.apache.isis.core.metamodel.interactions.PropertyUsabilityContext;
-import org.apache.isis.core.metamodel.interactions.PropertyVisibilityContext;
-import org.apache.isis.core.metamodel.interactions.UsabilityContext;
-import org.apache.isis.core.metamodel.interactions.ValidityContext;
-import org.apache.isis.core.metamodel.interactions.VisibilityContext;
+import org.apache.isis.core.metamodel.interactions2.InteractionUtils;
+import org.apache.isis.core.metamodel.interactions2.PropertyAccessContext;
+import org.apache.isis.core.metamodel.interactions2.PropertyModifyContext;
+import org.apache.isis.core.metamodel.interactions2.PropertyUsabilityContext;
+import org.apache.isis.core.metamodel.interactions2.PropertyVisibilityContext;
+import org.apache.isis.core.metamodel.interactions2.UsabilityContext;
+import org.apache.isis.core.metamodel.interactions2.ValidityContext;
+import org.apache.isis.core.metamodel.interactions2.VisibilityContext;
import org.apache.isis.core.metamodel.peer.FacetedMethod;
-import org.apache.isis.core.metamodel.runtimecontext.spec.feature.ObjectAssociationAbstract;
-import org.apache.isis.core.metamodel.spec.SpecificationFacets;
-import org.apache.isis.core.metamodel.spec.SpecificationLookup;
+import org.apache.isis.core.metamodel.peer.ObjectAssociationAbstract;
+import org.apache.isis.core.metamodel.spec.Instance;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMemberContext;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
public class OneToOneAssociationImpl extends ObjectAssociationAbstract implements OneToOneAssociation {
- private final FacetedMethod associationPeer;
-
public OneToOneAssociationImpl(
- final FacetedMethod association,
- final AuthenticationSessionProvider authenticationSessionProvider,
- final SpecificationLookup specificationLookup,
- final AdapterMap adapterManager,
- final QuerySubmitter querySubmitter) {
- super(association.getIdentifier().getMemberName(), getSpecification(specificationLookup, association.getType()), FeatureType.PROPERTY, association, authenticationSessionProvider, specificationLookup, adapterManager, querySubmitter);
- this.associationPeer = association;
+ final FacetedMethod facetedMethod,
+ final ObjectMemberContext objectMemberContext) {
+ super(facetedMethod,
+ FeatureType.PROPERTY,
+ getSpecification(objectMemberContext.specificationLookup, facetedMethod.getType()),
+ objectMemberContext);
}
// /////////////////////////////////////////////////////////////
@@ -260,7 +254,7 @@ public class OneToOneAssociationImpl ext
return options;
} else if (SpecificationFacets.isBoundedSet(getSpecification())) {
- QueryFindAllInstances query = new QueryFindAllInstances(getSpecification().getFullName());
+ QueryFindAllInstances query = new QueryFindAllInstances(getSpecification().getFullIdentifier());
final List<ObjectAdapter> allInstancesAdapter = getQuerySubmitter().allMatchingQuery(query);
final ObjectAdapter[] options = new ObjectAdapter[allInstancesAdapter.size()];
int j = 0;
@@ -296,7 +290,7 @@ public class OneToOneAssociationImpl ext
final DebugString debugString = new DebugString();
debugString.indent();
debugString.indent();
- associationPeer.debugData(debugString);
+ getFacetedMethod().debugData(debugString);
return debugString.toString();
}
@@ -306,10 +300,8 @@ public class OneToOneAssociationImpl ext
str.append(super.toString());
str.setAddComma();
str.append("persisted", !isNotPersisted());
- str.append("type", getSpecification().getShortName());
+ str.append("type", getSpecification().getShortIdentifier());
return str.toString();
}
-
-
}
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/dflt/ObjectSpecificationDefault.java (from r1051972, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/JavaSpecification.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/dflt/ObjectSpecificationDefault.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/dflt/ObjectSpecificationDefault.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/JavaSpecification.java&r1=1051972&r2=1053871&rev=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/JavaSpecification.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/dflt/ObjectSpecificationDefault.java Thu Dec 30 12:29:53 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.metamodel.java5;
+package org.apache.isis.core.metamodel.specloader.internal.spec.dflt;
import java.lang.reflect.Array;
import java.lang.reflect.Method;
@@ -39,55 +39,50 @@ import org.apache.isis.core.commons.filt
import org.apache.isis.core.commons.filters.Filter;
import org.apache.isis.core.commons.lang.JavaClassUtils;
import org.apache.isis.core.commons.lang.ListUtils;
+import org.apache.isis.core.commons.lang.NameUtils;
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.adapter.map.AdapterMap;
import org.apache.isis.core.metamodel.exceptions.ReflectionException;
-import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.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.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.layout.MemberLayoutArranger;
+import org.apache.isis.core.metamodel.layout.OrderSet;
import org.apache.isis.core.metamodel.peer.FacetedMethod;
import org.apache.isis.core.metamodel.runtimecontext.DependencyInjector;
-import org.apache.isis.core.metamodel.spec.IntrospectableSpecificationAbstract;
+import org.apache.isis.core.metamodel.spec.ActionType;
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.SpecificationContext;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-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.ObjectReflectorDefault;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMemberContext;
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.util.NameUtils;
+import org.apache.isis.core.metamodel.specloader.internal.spec.CreateObjectContext;
+import org.apache.isis.core.metamodel.specloader.internal.spec.FacetedMethodsBuilder;
+import org.apache.isis.core.metamodel.specloader.internal.spec.FacetedMethodsBuilderContext;
+import org.apache.isis.core.metamodel.specloader.internal.spec.IntrospectionContext;
+import org.apache.isis.core.metamodel.specloader.internal.spec.ObjectActionImpl;
+import org.apache.isis.core.metamodel.specloader.internal.spec.ObjectSpecificationAbstract;
+import org.apache.isis.core.metamodel.specloader.internal.spec.OneToManyAssociationImpl;
+import org.apache.isis.core.metamodel.specloader.internal.spec.OneToOneAssociationImpl;
-public class JavaSpecification extends IntrospectableSpecificationAbstract implements DebugInfo, FacetHolder {
+public class ObjectSpecificationDefault extends ObjectSpecificationAbstract implements DebugInfo, FacetHolder {
- private final static Logger LOG = Logger.getLogger(JavaSpecification.class);
+ private final static Logger LOG = Logger.getLogger(ObjectSpecificationDefault.class);
private static String determineShortName(final Class<?> introspectedClass) {
String name = introspectedClass.getName();
@@ -98,68 +93,68 @@ public class JavaSpecification extends I
// fields
// //////////////////////////////////////////////////////////////
- private final ObjectReflectorDefault reflector;
- private final AdapterMap adapterMap;
- private final DependencyInjector dependencyInjector;
- private final QuerySubmitter querySubmitter;
private boolean isService;
- private IconFacet iconFacet;
- private TitleFacet titleFacet;
-
+
/**
* Lazily built by {@link #getMember(Method)}.
*/
private Map<Method, ObjectMember> membersByMethod = null;
- private JavaIntrospector introspector;
+ private final ObjectMemberContext objectMemberContext;
+ private final IntrospectionContext introspectionContext;
+ private final CreateObjectContext createObjectContext;
+
+ private FacetedMethodsBuilder facetedMethodsBuilder;
+
// //////////////////////////////////////////////////////////////////////
// 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.introspector = new JavaIntrospector(cls, this, reflector);
-
- this.adapterMap = adapterManager;
- this.dependencyInjector = dependencyInjector;
- this.querySubmitter = querySubmitter;
- }
- // //////////////////////////////////////////////////////////////////////
- // introspect (part 1)
- // //////////////////////////////////////////////////////////////////////
+ public ObjectSpecificationDefault(
+ final Class<?> correspondingClass,
+ final FacetedMethodsBuilderContext facetedMethodsBuilderContext,
+ final IntrospectionContext introspectionContext,
+ final SpecificationContext specContext,
+ final ObjectMemberContext objectMemberContext,
+ final CreateObjectContext createObjectContext
+ ) {
+ super(correspondingClass, determineShortName(correspondingClass), specContext);
+
+ this.facetedMethodsBuilder = new FacetedMethodsBuilder(this, facetedMethodsBuilderContext);
+
+ this.introspectionContext = introspectionContext;
+ this.createObjectContext = createObjectContext;
+ this.objectMemberContext = objectMemberContext;
+ }
+
@Override
public void introspectTypeHierarchyAndMembers() {
- if (introspector == null) {
+ if (facetedMethodsBuilder == null) {
throw new ReflectionException("Introspection already taken place, cannot introspect again");
}
// class
- introspector.introspectClass();
+ facetedMethodsBuilder.introspectClass();
// names
addNamedFacetAndPluralFacetIfRequired();
// superclass
- final Class<?> superclass = getIntrospectedClass().getSuperclass();
+ final Class<?> superclass = getCorrespondingClass().getSuperclass();
setSuperclass(superclass);
// go no further if required
final boolean skipFurtherIntrospection =
- JavaClassUtils.isJavaClass(getIntrospectedClass()) || isAppLibValue(getIntrospectedClass());
+ JavaClassUtils.isJavaClass(getCorrespondingClass()) || isAppLibValue(getCorrespondingClass());
if (skipFurtherIntrospection) {
if (LOG.isDebugEnabled()) {
LOG.debug("skipping introspection of interfaces, properties, actions and interfaces for "
- + getFullName() + " (java.xxx or applib value class)");
+ + getFullIdentifier() + " (java.xxx or applib value class)");
}
return;
}
@@ -172,7 +167,7 @@ public class JavaSpecification extends I
// 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();
+ final Class<?>[] interfaceTypes = getCorrespondingClass().getInterfaces();
List<ObjectSpecification> interfaceSpecList = Lists.newArrayList();
for (Class<?> interfaceType : interfaceTypes) {
Class<?> substitutedInterfaceType = getClassSubstitutor().getClass(interfaceType);
@@ -185,23 +180,30 @@ public class JavaSpecification extends I
addAsSubclassTo(interfaceSpecList);
addInterfaces(interfaceSpecList);
- // properties and collections
- introspector.introspectAssociations();
- final OrderSet associationOrderSet = introspector.getAssociationOrderSet();
- if (associationOrderSet != null) {
- addAssociations(asAssociations(associationOrderSet));
- }
-
+ // associations and actions
+ final List<FacetedMethod> associationFacetedMethods = facetedMethodsBuilder.getAssociationFacetedMethods();
// actions
- introspector.introspectActions();
- OrderSet actionOrderSet = introspector.getActionOrderSet();
+ final List<FacetedMethod> actionFacetedMethods = facetedMethodsBuilder.getActionFacetedMethods();
+
+ // ordering
+ final OrderSet associationOrderSet = getMemberLayoutArranger().createAssociationOrderSetFor(this, associationFacetedMethods);
+ addAssociations(asAssociations(associationOrderSet));
+
+ OrderSet actionOrderSet = getMemberLayoutArranger().createActionOrderSetFor(this, actionFacetedMethods);
addObjectActions(asObjectActions(actionOrderSet));
+
+ updateFromFacetValues();
+
+ facetedMethodsBuilder = null;
+ setIntrospected(true);
}
+
+
private void addNamedFacetAndPluralFacetIfRequired() {
NamedFacet namedFacet = getFacet(NamedFacet.class);
if (namedFacet == null) {
- namedFacet = new NamedFacetInferred(NameUtils.naturalName(getShortName()), this);
+ namedFacet = new NamedFacetInferred(NameUtils.naturalName(getShortIdentifier()), this);
addFacet(namedFacet);
}
@@ -220,6 +222,9 @@ public class JavaSpecification extends I
}
private List<ObjectAssociation> asAssociations(final OrderSet orderSet) {
+ if(orderSet == null) {
+ return null;
+ }
final List<ObjectAssociation> associations = Lists.newArrayList();
for (Object element : orderSet) {
if (element instanceof FacetedMethod) {
@@ -240,6 +245,9 @@ public class JavaSpecification extends I
}
private List<ObjectAction> asObjectActions(final OrderSet orderSet) {
+ if(orderSet == null) {
+ return null;
+ }
final List<ObjectAction> actions = Lists.newArrayList();
for (Object element : orderSet) {
if (element instanceof FacetedMethod) {
@@ -258,91 +266,28 @@ public class JavaSpecification extends I
}
private OneToOneAssociationImpl createProperty(final FacetedMethod facetedMethod) {
- return new OneToOneAssociationImpl(facetedMethod, getAuthenticationSessionProvider(), getSpecificationLookup(),
- getAdapterMap(), getQuerySubmitter());
+ return new OneToOneAssociationImpl(facetedMethod, objectMemberContext);
}
private OneToManyAssociationImpl createCollection(final FacetedMethod facetedMethod) {
- return new OneToManyAssociationImpl(facetedMethod, getAuthenticationSessionProvider(), getSpecificationLookup(),
- getAdapterMap(), getQuerySubmitter());
+ return new OneToManyAssociationImpl(facetedMethod, objectMemberContext);
}
private ObjectAction createAction(final FacetedMethod facetedMethod) {
- return new ObjectActionImpl(facetedMethod, getAuthenticationSessionProvider(), getSpecificationLookup(),
- getAdapterMap(), getServicesProvider(), getQuerySubmitter());
+ return new ObjectActionImpl(facetedMethod, objectMemberContext, getServicesProvider());
}
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 {
- 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);
+ return facetedMethodsBuilder == null;
}
// //////////////////////////////////////////////////////////////////////
@@ -381,7 +326,7 @@ public class JavaSpecification extends I
}
}
if (buf.length() > 0) {
- throw new ObjectSpecificationException("Service object " + getFullName()
+ throw new ObjectSpecificationException("Service object " + getFullIdentifier()
+ " should have no fields, but has: " + buf);
}
}
@@ -406,7 +351,7 @@ public class JavaSpecification extends I
// //////////////////////////////////////////////////////////////////////
@Override
- public ObjectAction getObjectAction(final ObjectActionType type, final String id,
+ public ObjectAction getObjectAction(final ActionType type, final String id,
final List<ObjectSpecification> parameters) {
final List<ObjectAction> availableActions =
ListUtils.combine(getObjectActionsAll(), getContributedActions(type));
@@ -414,13 +359,13 @@ public class JavaSpecification extends I
}
@Override
- public ObjectAction getObjectAction(final ObjectActionType type, final String nameParmsIdentityString) {
+ public ObjectAction getObjectAction(final ActionType 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,
+ private ObjectAction getAction(final List<ObjectAction> availableActions, final ActionType type,
final String actionName, final List<ObjectSpecification> parameters) {
outer: for (int i = 0; i < availableActions.size(); i++) {
final ObjectAction action = availableActions.get(i);
@@ -452,7 +397,7 @@ public class JavaSpecification extends I
return null;
}
- private ObjectAction getAction(final List<ObjectAction> availableActions, final ObjectActionType type,
+ private ObjectAction getAction(final List<ObjectAction> availableActions, final ActionType type,
final String nameParmsIdentityString) {
if (nameParmsIdentityString == null) {
return null;
@@ -490,12 +435,12 @@ public class JavaSpecification extends I
@Override
public Object createObject(CreationMode creationMode) {
- if (getIntrospectedClass().isArray()) {
- return Array.newInstance(getIntrospectedClass().getComponentType(), 0);
+ if (getCorrespondingClass().isArray()) {
+ return Array.newInstance(getCorrespondingClass().getComponentType(), 0);
}
try {
- Object object = getObjectInstantiator().instantiate(getIntrospectedClass());
+ Object object = getObjectInstantiator().instantiate(getCorrespondingClass());
if (creationMode == CreationMode.INITIALIZE) {
final ObjectAdapter adapter = getAdapterMap().adapterFor(object);
@@ -511,7 +456,7 @@ public class JavaSpecification extends I
}
return object;
} catch (final ObjectInstantiationException e) {
- throw new IsisException("Failed to create instance of type " + getFullName(), e);
+ throw new IsisException("Failed to create instance of type " + getFullIdentifier(), e);
}
}
@@ -545,7 +490,7 @@ public class JavaSpecification extends I
}
private void catalogueActions(final Map<Method, ObjectMember> membersByMethod) {
- final List<ObjectAction> userActions = getObjectActions(ObjectActionType.USER);
+ final List<ObjectAction> userActions = getObjectActions(ActionType.USER);
for (int i = 0; i < userActions.size(); i++) {
final ObjectAction userAction = userActions.get(i);
final Facet[] facets = userAction.getFacets(ImperativeFacet.FILTER);
@@ -566,6 +511,7 @@ public class JavaSpecification extends I
public void debugData(final DebugString debug) {
debug.blankLine();
debug.appendln("Title", getFacet(TitleFacet.class));
+ IconFacet iconFacet = getFacet(IconFacet.class);
if (iconFacet != null) {
debug.appendln("Icon", iconFacet);
}
@@ -580,10 +526,10 @@ public class JavaSpecification extends I
@Override
public String toString() {
final ToString str = new ToString(this);
- str.append("class", getFullName());
+ str.append("class", getFullIdentifier());
str.append("type", (isCollection() ? "Collection" : "Object"));
str.append("persistable", persistability());
- str.append("superclass", superclass() == null ? "Object" : superclass().getFullName());
+ str.append("superclass", superclass() == null ? "Object" : superclass().getFullIdentifier());
return str.toString();
}
@@ -591,23 +537,20 @@ public class JavaSpecification extends I
// Dependencies (from constructor)
// //////////////////////////////////////////////////////////////////
- /**
- * Derived from {@link #getReflector()}
- */
- private ClassSubstitutor getClassSubstitutor() {
- return reflector.getClassSubstitutor();
- }
-
protected AdapterMap getAdapterMap() {
- return adapterMap;
+ return createObjectContext.adapterMap;
}
protected DependencyInjector getDependencyInjector() {
- return dependencyInjector;
+ return createObjectContext.dependencyInjector;
+ }
+
+ private ClassSubstitutor getClassSubstitutor() {
+ return introspectionContext.classSubstitutor;
}
- protected QuerySubmitter getQuerySubmitter() {
- return querySubmitter;
+ private MemberLayoutArranger getMemberLayoutArranger() {
+ return introspectionContext.memberLayoutArranger;
}
}
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/objectlist/CollectionFacetForObjectList.java (from r1051972, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/InstancesCollectionFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/objectlist/CollectionFacetForObjectList.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/objectlist/CollectionFacetForObjectList.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/InstancesCollectionFacet.java&r1=1051972&r2=1053871&rev=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/InstancesCollectionFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/objectlist/CollectionFacetForObjectList.java Thu Dec 30 12:29:53 2010
@@ -18,19 +18,19 @@
*/
-package org.apache.isis.core.metamodel.spec;
+package org.apache.isis.core.metamodel.specloader.internal.spec.objectlist;
import java.util.List;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.ObjectList;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.collections.CollectionFacetAbstract;
+import org.apache.isis.core.metamodel.spec.ObjectList;
-public class InstancesCollectionFacet extends CollectionFacetAbstract {
+public class CollectionFacetForObjectList extends CollectionFacetAbstract {
- public InstancesCollectionFacet(final FacetHolder holder) {
+ public CollectionFacetForObjectList(final FacetHolder holder) {
super(holder);
}
Added: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/objectlist/DescribedAsFacetForObjectList.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/objectlist/DescribedAsFacetForObjectList.java?rev=1053871&view=auto
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/objectlist/DescribedAsFacetForObjectList.java (added)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/objectlist/DescribedAsFacetForObjectList.java Thu Dec 30 12:29:53 2010
@@ -0,0 +1,34 @@
+/*
+ * 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.specloader.internal.spec.objectlist;
+
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facets.naming.describedas.DescribedAsFacetAbstract;
+
+
+public class DescribedAsFacetForObjectList extends DescribedAsFacetAbstract {
+
+ public DescribedAsFacetForObjectList(final String value, final FacetHolder holder) {
+ super(value, holder);
+ }
+
+}
+
Added: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/objectlist/NamedFacetForObjectList.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/objectlist/NamedFacetForObjectList.java?rev=1053871&view=auto
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/objectlist/NamedFacetForObjectList.java (added)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/objectlist/NamedFacetForObjectList.java Thu Dec 30 12:29:53 2010
@@ -0,0 +1,34 @@
+/*
+ * 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.specloader.internal.spec.objectlist;
+
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facets.naming.named.NamedFacetAbstract;
+
+
+public class NamedFacetForObjectList extends NamedFacetAbstract {
+
+ public NamedFacetForObjectList(final String value, final FacetHolder holder) {
+ super(value, holder);
+ }
+
+}
+
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/objectlist/ObjectSpecificationForObjectList.java (from r1051972, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/InstanceCollectionSpecification.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/objectlist/ObjectSpecificationForObjectList.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/objectlist/ObjectSpecificationForObjectList.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/InstanceCollectionSpecification.java&r1=1051972&r2=1053871&rev=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/InstanceCollectionSpecification.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/objectlist/ObjectSpecificationForObjectList.java Thu Dec 30 12:29:53 2010
@@ -18,41 +18,40 @@
*/
-package org.apache.isis.core.metamodel.spec;
+package org.apache.isis.core.metamodel.specloader.internal.spec.objectlist;
import java.util.Collections;
import java.util.List;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.ObjectList;
-import org.apache.isis.core.metamodel.adapter.ServicesProvider;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacetDefaultToObject;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
+import org.apache.isis.core.metamodel.spec.ActionType;
+import org.apache.isis.core.metamodel.spec.ObjectList;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.SpecificationContext;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.metamodel.specloader.internal.spec.ObjectSpecificationAbstract;
/**
* A custom {@link ObjectSpecification} that is designed to treat the
* {@link ObjectList} class as a "standalone" collection.
*/
-public class InstanceCollectionSpecification extends IntrospectableSpecificationAbstract {
+public class ObjectSpecificationForObjectList extends ObjectSpecificationAbstract {
/**
- * Used as {@link #getShortName()}, {@link #getName()} and {@link #getPluralName()}.
+ * Used as {@link #getShortIdentifier()}, {@link #getName()} and {@link #getPluralName()}.
*/
private static final String NAME = "Instances";
private static final String DESCRIBED_AS = "Typed instances";
private static final String ICON_NAME = "instances";
- public InstanceCollectionSpecification(
- final SpecificationLookup specificationLookup,
- final AuthenticationSessionProvider authenticationSessionProvider,
- final ServicesProvider servicesProvider,
- final ObjectInstantiator objectInstantiator) {
- super(ObjectList.class, NAME, authenticationSessionProvider, servicesProvider, objectInstantiator, specificationLookup);
+ public ObjectSpecificationForObjectList(
+ final SpecificationContext specificationContext) {
+ super(ObjectList.class, NAME, specificationContext);
}
@@ -78,22 +77,21 @@ public class InstanceCollectionSpecifica
public void introspectTypeHierarchyAndMembers() {
setSuperclass(Object.class);
- addFacet(new InstancesCollectionFacet(this));
+ addFacet(new CollectionFacetForObjectList(this));
addFacet(new TypeOfFacetDefaultToObject(this, getSpecificationLookup()) {});
- }
-
- @Override
- public void completeIntrospection() {
- setSingularName(NAME);
- setPluralName(NAME);
- setDescribedAs(DESCRIBED_AS);
- // REVIEW... is this right?
- setPersistability(Persistability.USER_PERSISTABLE);
- setIntrospected(true);
+ // ObjectList specific
+ FacetUtil.addFacet(new NamedFacetForObjectList(NAME, this));
+ FacetUtil.addFacet(new PluralFacetForObjectList(NAME, this));
+ FacetUtil.addFacet(new DescribedAsFacetForObjectList(DESCRIBED_AS, this));
+ // don't install anything for NotPersistableFacet
}
+ ///////////////////////////////////////////////////////////
+ // Override facets
+ ///////////////////////////////////////////////////////////
+
///////////////////////////////////////////////////////
// Service
@@ -154,7 +152,7 @@ public class InstanceCollectionSpecifica
*/
@Override
public ObjectAction getObjectAction(
- final ObjectActionType type,
+ final ActionType type,
final String id,
final List<ObjectSpecification> parameters) {
return null;
@@ -164,7 +162,7 @@ public class InstanceCollectionSpecifica
* Review: is it necessary to override for this subclass?
*/
@Override
- public ObjectAction getObjectAction(final ObjectActionType type, final String id) {
+ public ObjectAction getObjectAction(final ActionType type, final String id) {
return null;
}
@@ -176,7 +174,7 @@ public class InstanceCollectionSpecifica
* Review: is it necessary to override for this subclass?
*/
@Override
- public List<ObjectAction> getServiceActionsReturning(final ObjectActionType... type) {
+ public List<ObjectAction> getServiceActionsReturning(final ActionType... type) {
return Collections.emptyList();
}
Added: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/objectlist/PluralFacetForObjectList.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/objectlist/PluralFacetForObjectList.java?rev=1053871&view=auto
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/objectlist/PluralFacetForObjectList.java (added)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/objectlist/PluralFacetForObjectList.java Thu Dec 30 12:29:53 2010
@@ -0,0 +1,34 @@
+/*
+ * 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.specloader.internal.spec.objectlist;
+
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facets.object.ident.plural.PluralFacetAbstract;
+
+
+public class PluralFacetForObjectList extends PluralFacetAbstract {
+
+ public PluralFacetForObjectList(final String value, final FacetHolder holder) {
+ super(value, holder);
+ }
+
+}
+
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/package-info.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/package-info.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/package-info.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/package-info.java Thu Dec 30 12:29:53 2010
@@ -29,11 +29,11 @@
* Concrete implementations are in the <tt>programmingmodel-xxx-impl</tt> modules. These
* are expected to be based heavily on <tt>ObjectReflectorAbstract</tt>, defined in
* <tt>nof-core</tt>. This implementation defines two further sub-APIs which are based on
- * the {@link org.apache.isis.core.metamodel.facets.Facet}s and {@link org.apache.isis.core.metamodel.facetdecorator.FacetDecorator}s:
+ * the {@link org.apache.isis.core.metamodel.facetapi.Facet}s and {@link org.apache.isis.core.metamodel.facetdecorator.FacetDecorator}s:
* <ul>
- * <li> the {@link ProgrammingModelInstaller} is used to specify the collection of {@link org.apache.isis.core.metamodel.facets.FacetFactory}s
+ * <li> the {@link ProgrammingModelInstaller} is used to specify the collection of {@link org.apache.isis.core.metamodel.facetapi.FacetFactory}s
* that will be used to actually process and build up the metamodel.
- * <li> the {@link FacetDecoratorInstaller} API specifies how {@link org.apache.isis.core.metamodel.facets.Facet}, once created,
+ * <li> the {@link FacetDecoratorInstaller} API specifies how {@link org.apache.isis.core.metamodel.facetapi.Facet}, once created,
* can be additionally decorated to modify their behaviour. A number of other components are implemented as
* {@link org.apache.isis.core.metamodel.facetdecorator.FacetDecorator}s, such as {@link org.apache.isis.authorization.AuthorisationFacetDecorator authorisation},
* {@link org.apache.isis.help.HelpFacetDecorator help}, and {@link org.apache.isis.transaction.facetdecorator.TransactionFacetDecorator transactions}. However
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/SpecificationTraverserDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/SpecificationTraverserDefault.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/SpecificationTraverserDefault.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/SpecificationTraverserDefault.java Thu Dec 30 12:29:53 2010
@@ -30,7 +30,6 @@ import java.util.List;
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.specloader.internal.TypeExtractorMethodReturn;
public class SpecificationTraverserDefault implements SpecificationTraverser, SpecificationLoaderAware {
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/TypeExtractorAbstract.java (from r1051972, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/TypeExtractorAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/TypeExtractorAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/TypeExtractorAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/TypeExtractorAbstract.java&r1=1051972&r2=1053871&rev=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/TypeExtractorAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/TypeExtractorAbstract.java Thu Dec 30 12:29:53 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.core.metamodel.specloader.internal;
+package org.apache.isis.core.metamodel.specloader.traverser;
import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType;
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/TypeExtractorMethodParameters.java (from r1051972, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/TypeExtractorMethodParameters.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/TypeExtractorMethodParameters.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/TypeExtractorMethodParameters.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/TypeExtractorMethodParameters.java&r1=1051972&r2=1053871&rev=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/TypeExtractorMethodParameters.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/TypeExtractorMethodParameters.java Thu Dec 30 12:29:53 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.core.metamodel.specloader.internal;
+package org.apache.isis.core.metamodel.specloader.traverser;
import java.lang.reflect.Method;
import java.lang.reflect.Type;
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/TypeExtractorMethodReturn.java (from r1051972, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/TypeExtractorMethodReturn.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/TypeExtractorMethodReturn.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/TypeExtractorMethodReturn.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/TypeExtractorMethodReturn.java&r1=1051972&r2=1053871&rev=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/TypeExtractorMethodReturn.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/TypeExtractorMethodReturn.java Thu Dec 30 12:29:53 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.core.metamodel.specloader.internal;
+package org.apache.isis.core.metamodel.specloader.traverser;
import java.lang.reflect.Method;
Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ObjectActionNoop.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ObjectActionNoop.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ObjectActionNoop.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ObjectActionNoop.java Thu Dec 30 12:29:53 2010
@@ -25,21 +25,22 @@ import java.util.List;
import org.apache.isis.applib.Identifier;
import org.apache.isis.core.commons.filters.Filter;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.consent.Allow;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
-import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.facets.MultiTypedFacet;
-import org.apache.isis.core.metamodel.feature.FeatureType;
-import org.apache.isis.core.metamodel.interactions.ActionInvocationContext;
-import org.apache.isis.core.metamodel.interactions.UsabilityContext;
-import org.apache.isis.core.metamodel.interactions.VisibilityContext;
+import org.apache.isis.core.metamodel.consent2.Allow;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.consent2.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.facetapi.MultiTypedFacet;
+import org.apache.isis.core.metamodel.interactions2.ActionInvocationContext;
+import org.apache.isis.core.metamodel.interactions2.UsabilityContext;
+import org.apache.isis.core.metamodel.interactions2.VisibilityContext;
import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.spec.ActionType;
+import org.apache.isis.core.metamodel.spec.Instance;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.Target;
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;
/**
@@ -167,7 +168,7 @@ public class ObjectActionNoop implements
}
@Override
- public ObjectActionType getType() {
+ public ActionType getType() {
return null;
}
Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ObjectNoop.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ObjectNoop.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ObjectNoop.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ObjectNoop.java Thu Dec 30 12:29:53 2010
@@ -22,7 +22,8 @@ package org.apache.isis.core.metamodel.a
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.version.Version;
-import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
+import org.apache.isis.core.metamodel.spec.ElementSpecificationProvider;
+import org.apache.isis.core.metamodel.spec.Instance;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.Specification;
@@ -81,14 +82,16 @@ public class ObjectNoop implements Objec
public String titleString() {
return null;
}
-
+
@Override
- public TypeOfFacet getTypeOfFacet() {
- return null;
- }
-
+ public ObjectSpecification getElementSpecification() {
+ return null;
+ }
+
@Override
- public void setTypeOfFacet(final TypeOfFacet typeOfFacet) {}
+ public void setElementSpecificationProvider(ElementSpecificationProvider elementSpecificationProvider) {
+ }
+
@Override
public ObjectAdapter getOwner() {