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 2012/01/22 07:59:23 UTC
svn commit: r1234453 [8/33] - in /incubator/isis/trunk/framework/core:
commons/src/main/java/org/apache/isis/core/commons/authentication/
commons/src/main/java/org/apache/isis/core/commons/components/
commons/src/main/java/org/apache/isis/core/commons/...
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Hierarchical.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Hierarchical.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Hierarchical.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Hierarchical.java Sun Jan 22 06:58:43 2012
@@ -24,29 +24,31 @@ import java.util.List;
public interface Hierarchical {
/**
- * Returns true if the <tt>subclasses()</tt> method will return an array of one or more elements (ie, not an empty
- * array).
+ * Returns true if the <tt>subclasses()</tt> method will return an array of
+ * one or more elements (ie, not an empty array).
*/
boolean hasSubclasses();
/**
- * Get the list of specifications for all the interfaces that the class represented by this specification
- * implements.
+ * Get the list of specifications for all the interfaces that the class
+ * represented by this specification implements.
*/
List<ObjectSpecification> interfaces();
/**
- * Determines if this specification represents the same specification, or a subclass, of the specified
- * specification.
+ * Determines if this specification represents the same specification, or a
+ * subclass, of the specified specification.
*
* <p>
- * <tt>subSpec.isOfType(superSpec)</tt> is equivalent to {@link Class#isAssignableFrom(Class) Java's}
+ * <tt>subSpec.isOfType(superSpec)</tt> is equivalent to
+ * {@link Class#isAssignableFrom(Class) Java's}
* <tt>superType.isAssignableFrom(subType)</tt>.
*/
boolean isOfType(ObjectSpecification specification);
/**
- * Get the list of specifications for the subclasses of the class represented by this specification
+ * Get the list of specifications for the subclasses of the class
+ * represented by this specification
*/
List<ObjectSpecification> subclasses();
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Instance.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Instance.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Instance.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Instance.java Sun Jan 22 06:58:43 2012
@@ -25,8 +25,9 @@ import org.apache.isis.core.metamodel.ad
* Represents an instance of some element of the meta-model.
*
* <p>
- * Currently the only sub-interface is {@link ObjectAdapter}. However, the intention is for associations, actions and
- * action parameters to also inherit from this interface.
+ * Currently the only sub-interface is {@link ObjectAdapter}. However, the
+ * intention is for associations, actions and action parameters to also inherit
+ * from this interface.
*/
public interface Instance {
@@ -39,7 +40,8 @@ public interface Instance {
* The owning {@link ObjectAdapter} of this instance.
*
* <p>
- * In the case of the {@link ObjectAdapter} interface, just returns <tt>null</tt>.
+ * In the case of the {@link ObjectAdapter} interface, just returns
+ * <tt>null</tt>.
*/
ObjectAdapter getOwner();
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/InstanceAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/InstanceAbstract.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/InstanceAbstract.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/InstanceAbstract.java Sun Jan 22 06:58:43 2012
@@ -60,8 +60,8 @@ public abstract class InstanceAbstract i
}
/**
- * Allows subclasses to get specification without necessarily triggering {@link #loadSpecification() loading} if not
- * yet known.
+ * Allows subclasses to get specification without necessarily triggering
+ * {@link #loadSpecification() loading} if not yet known.
*/
protected final Specification getSpecificationNoLoad() {
return specification;
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectActionSet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectActionSet.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectActionSet.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectActionSet.java Sun Jan 22 06:58:43 2012
@@ -231,12 +231,12 @@ public class ObjectActionSet implements
}
@Override
- public ObjectActionParameter getParameterById(String paramId) {
+ public ObjectActionParameter getParameterById(final String paramId) {
return null;
}
@Override
- public ObjectActionParameter getParameterByName(String paramName) {
+ public ObjectActionParameter getParameterByName(final String paramName) {
return null;
}
@@ -273,8 +273,7 @@ public class ObjectActionSet implements
* Does nothing, but shouldn't be called.
*/
@Override
- public VisibilityContext<?> createVisibleInteractionContext(final AuthenticationSession session,
- final InteractionInvocationMethod invocationMethod, final ObjectAdapter targetObjectAdapter) {
+ public VisibilityContext<?> createVisibleInteractionContext(final AuthenticationSession session, final InteractionInvocationMethod invocationMethod, final ObjectAdapter targetObjectAdapter) {
return null;
}
@@ -288,8 +287,7 @@ public class ObjectActionSet implements
// /////////////////////////////////////////////////////////////
@Override
- public UsabilityContext<?> createUsableInteractionContext(final AuthenticationSession session,
- final InteractionInvocationMethod invocationMethod, final ObjectAdapter target) {
+ public UsabilityContext<?> createUsableInteractionContext(final AuthenticationSession session, final InteractionInvocationMethod invocationMethod, final ObjectAdapter target) {
return null;
}
@@ -303,9 +301,7 @@ public class ObjectActionSet implements
// /////////////////////////////////////////////////////////////
@Override
- public ActionInvocationContext createActionInvocationInteractionContext(final AuthenticationSession session,
- final InteractionInvocationMethod invocationMethod, final ObjectAdapter object,
- final ObjectAdapter[] candidateArguments) {
+ public ActionInvocationContext createActionInvocationInteractionContext(final AuthenticationSession session, final InteractionInvocationMethod invocationMethod, final ObjectAdapter object, final ObjectAdapter[] candidateArguments) {
return null;
}
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectMetaModel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectMetaModel.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectMetaModel.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectMetaModel.java Sun Jan 22 06:58:43 2012
@@ -23,16 +23,19 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.adapter.ResolveState;
/**
- * Adapters to domain objects, where the application is written in terms of domain objects and those objects are
- * represented within the NOF through these adapter, and not directly.
+ * Adapters to domain objects, where the application is written in terms of
+ * domain objects and those objects are represented within the NOF through these
+ * adapter, and not directly.
*
* <p>
- * This interface defines just those aspects of the adapter that are of interest to the meta-model (hence the 'MM'
- * suffix), while the {@link ObjectAdapter} subtype defines additional properties used by the framework (
- * <tt>PersistenceSession</tt>s et al) for tracking the persistence state of the object. In theory it ought to be
- * possible to move {@link ObjectAdapter} interface out of the metamodel module. However, this would require either lots
- * of genericizing or lots of downcasting to ensure that the framework is only ever handed or deals with the
- * {@link ObjectAdapter}s.
+ * This interface defines just those aspects of the adapter that are of interest
+ * to the meta-model (hence the 'MM' suffix), while the {@link ObjectAdapter}
+ * subtype defines additional properties used by the framework (
+ * <tt>PersistenceSession</tt>s et al) for tracking the persistence state of the
+ * object. In theory it ought to be possible to move {@link ObjectAdapter}
+ * interface out of the metamodel module. However, this would require either
+ * lots of genericizing or lots of downcasting to ensure that the framework is
+ * only ever handed or deals with the {@link ObjectAdapter}s.
*
* @see ObjectAdapter
*/
@@ -45,30 +48,35 @@ public interface ObjectMetaModel extends
ObjectSpecification getSpecification();
/**
- * Returns the adapted domain object, the POJO, that this adapter represents with the NOF.
+ * Returns the adapted domain object, the POJO, that this adapter represents
+ * with the NOF.
*/
Object getObject();
/**
- * Returns the title to display this object with, which is usually got from the wrapped {@link #getObject() domain
- * object}.
+ * Returns the title to display this object with, which is usually got from
+ * the wrapped {@link #getObject() domain object}.
*/
String titleString();
/**
- * Return an {@link Instance} of the specified {@link Specification} with respect to this {@link ObjectAdapter}.
+ * Return an {@link Instance} of the specified {@link Specification} with
+ * respect to this {@link ObjectAdapter}.
*
* <p>
- * If called with {@link ObjectSpecification}, then just returns <tt>this</tt>). If called for other subinterfaces,
- * then should provide an appropriate {@link Instance} implementation.
+ * If called with {@link ObjectSpecification}, then just returns
+ * <tt>this</tt>). If called for other subinterfaces, then should provide an
+ * appropriate {@link Instance} implementation.
*
* <p>
- * Designed to be called in a double-dispatch design from {@link Specification#getInstance(ObjectAdapter)}.
+ * Designed to be called in a double-dispatch design from
+ * {@link Specification#getInstance(ObjectAdapter)}.
*
* <p>
- * Note: this method will throw an {@link UnsupportedOperationException} unless the extended
- * <tt>PojoAdapterXFactory</tt> is configured. (That is, only <tt>PojoAdapterX</tt> provides support for this; the
- * regular <tt>PojoAdapter</tt> does not currently.
+ * Note: this method will throw an {@link UnsupportedOperationException}
+ * unless the extended <tt>PojoAdapterXFactory</tt> is configured. (That is,
+ * only <tt>PojoAdapterX</tt> provides support for this; the regular
+ * <tt>PojoAdapter</tt> does not currently.
*
* @param adapter
* @return
@@ -79,8 +87,9 @@ public interface ObjectMetaModel extends
* Whether the object is persisted.
*
* <p>
- * Note: not necessarily the reciprocal of {@link #isTransient()}; standalone adapters (with
- * {@link ResolveState#VALUE}) report as neither persistent or transient.
+ * Note: not necessarily the reciprocal of {@link #isTransient()};
+ * standalone adapters (with {@link ResolveState#VALUE}) report as neither
+ * persistent or transient.
*/
boolean isPersistent();
@@ -88,14 +97,16 @@ public interface ObjectMetaModel extends
* Whether the object is transient.
*
* <p>
- * Note: not necessarily the reciprocal of {@link #isPersistent()}; standalone adapters (with
- * {@link ResolveState#VALUE}) report as neither persistent or transient.
+ * Note: not necessarily the reciprocal of {@link #isPersistent()};
+ * standalone adapters (with {@link ResolveState#VALUE}) report as neither
+ * persistent or transient.
*/
boolean isTransient();
/**
- * Sometimes it is necessary to manage the replacement of the underlying domain object (by another component such as
- * an object store). This method allows the adapter to be kept while the domain object is replaced.
+ * Sometimes it is necessary to manage the replacement of the underlying
+ * domain object (by another component such as an object store). This method
+ * allows the adapter to be kept while the domain object is replaced.
*/
void replacePojo(Object pojo);
@@ -103,8 +114,9 @@ public interface ObjectMetaModel extends
* For (stand-alone) collections, returns the element type.
*
* <p>
- * For owned (aggregated) collections, the element type can be determined from the <tt>TypeOfFacet</tt> associated
- * with the <tt>ObjectAssociation</tt> representing the collection.
+ * For owned (aggregated) collections, the element type can be determined
+ * from the <tt>TypeOfFacet</tt> associated with the
+ * <tt>ObjectAssociation</tt> representing the collection.
*
* @see #setElementSpecificationProvider(ElementSpecificationProvider)
*/
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java Sun Jan 22 06:58:43 2012
@@ -52,42 +52,40 @@ import org.apache.isis.core.metamodel.sp
import com.google.common.base.Function;
/**
- * Represents an entity or value (cf {@link java.lang.Class}) within the metamodel.
+ * Represents an entity or value (cf {@link java.lang.Class}) within the
+ * metamodel.
*
* <p>
- * As specifications are cyclic (specifically a class will reference its subclasses, which in turn reference their
- * superclass) they need be created first, and then later work out its internals. Hence we create
+ * As specifications are cyclic (specifically a class will reference its
+ * subclasses, which in turn reference their superclass) they need be created
+ * first, and then later work out its internals. Hence we create
* {@link ObjectSpecification}s as we need them, and then introspect them later.
*
* <p>
* REVIEW: why is there no Help method for classes?
*/
-public interface ObjectSpecification extends Specification, ObjectActionContainer, ObjectAssociationContainer,
- Hierarchical, Dirtiable, DefaultProvider {
+public interface ObjectSpecification extends Specification, ObjectActionContainer, ObjectAssociationContainer, Hierarchical, Dirtiable, DefaultProvider {
public final static List<ObjectSpecification> EMPTY_LIST = Collections.emptyList();
- public final static Function<ObjectSpecification, String> FUNCTION_FULLY_QUALIFIED_CLASS_NAME =
- new Function<ObjectSpecification, String>() {
- @Override
- public String apply(final ObjectSpecification from) {
- return from.getFullIdentifier();
- }
- };
- public final static Comparator<ObjectSpecification> COMPARATOR_FULLY_QUALIFIED_CLASS_NAME =
- new Comparator<ObjectSpecification>() {
- @Override
- public int compare(final ObjectSpecification o1, final ObjectSpecification o2) {
- return o1.getFullIdentifier().compareTo(o2.getFullIdentifier());
- }
- };
- public final static Comparator<ObjectSpecification> COMPARATOR_SHORT_IDENTIFIER_IGNORE_CASE =
- new Comparator<ObjectSpecification>() {
- @Override
- public int compare(final ObjectSpecification s1, final ObjectSpecification s2) {
- return s1.getShortIdentifier().compareToIgnoreCase(s2.getShortIdentifier());
- }
- };
+ public final static Function<ObjectSpecification, String> FUNCTION_FULLY_QUALIFIED_CLASS_NAME = new Function<ObjectSpecification, String>() {
+ @Override
+ public String apply(final ObjectSpecification from) {
+ return from.getFullIdentifier();
+ }
+ };
+ public final static Comparator<ObjectSpecification> COMPARATOR_FULLY_QUALIFIED_CLASS_NAME = new Comparator<ObjectSpecification>() {
+ @Override
+ public int compare(final ObjectSpecification o1, final ObjectSpecification o2) {
+ return o1.getFullIdentifier().compareTo(o2.getFullIdentifier());
+ }
+ };
+ public final static Comparator<ObjectSpecification> COMPARATOR_SHORT_IDENTIFIER_IGNORE_CASE = new Comparator<ObjectSpecification>() {
+ @Override
+ public int compare(final ObjectSpecification s1, final ObjectSpecification s2) {
+ return s1.getShortIdentifier().compareToIgnoreCase(s2.getShortIdentifier());
+ }
+ };
/**
* @return
@@ -98,8 +96,8 @@ public interface ObjectSpecification ext
* Returns an (immutable) "full" identifier for this specification.
*
* <p>
- * This will be the fully qualified name of the Class object that this object represents (i.e. it includes the
- * package name).
+ * This will be the fully qualified name of the Class object that this
+ * object represents (i.e. it includes the package name).
*/
String getFullIdentifier();
@@ -107,7 +105,8 @@ public interface ObjectSpecification ext
* Returns an (immutable) "short" identifier for this specification.
*
* <p>
- * This will be the class name without the package; any text up to and including the last period is removed.
+ * This will be the class name without the package; any text up to and
+ * including the last period is removed.
*/
String getShortIdentifier();
@@ -115,7 +114,8 @@ public interface ObjectSpecification ext
* Returns the (singular) name for objects of this specification.
*
* <p>
- * Corresponds to the {@link NamedFacet#value()} of {@link NamedFacet}; is not necessarily immutable.
+ * Corresponds to the {@link NamedFacet#value()} of {@link NamedFacet}; is
+ * not necessarily immutable.
*/
String getSingularName();
@@ -123,7 +123,8 @@ public interface ObjectSpecification ext
* Returns the plural name for objects of this specification.
*
* <p>
- * Corresponds to the {@link PluralFacet#value() value} of {@link PluralFacet}; is not necessarily immutable.
+ * Corresponds to the {@link PluralFacet#value() value} of
+ * {@link PluralFacet}; is not necessarily immutable.
*/
String getPluralName();
@@ -131,8 +132,8 @@ public interface ObjectSpecification ext
* Returns the description, if any, of the specification.
*
* <p>
- * Corresponds to the {@link DescribedAsFacet#value()) value} of {@link DescribedAsFacet}; is not necessarily
- * immutable.
+ * Corresponds to the {@link DescribedAsFacet#value()) value} of
+ * {@link DescribedAsFacet}; is not necessarily immutable.
*/
@Override
String getDescription();
@@ -141,7 +142,8 @@ public interface ObjectSpecification ext
* Returns a help string or lookup reference, if any, of the specification.
*
* <p>
- * Corresponds to the {@link HelpFacet#value()) value} of {@link HelpFacet}; is not necessarily immutable.
+ * Corresponds to the {@link HelpFacet#value()) value} of {@link HelpFacet};
+ * is not necessarily immutable.
*/
String getHelp();
@@ -149,7 +151,8 @@ public interface ObjectSpecification ext
* Returns the title string for the specified object.
*
* <p>
- * Corresponds to the {@link TitleFacet#value()) value} of {@link TitleFacet}; is not necessarily immutable.
+ * Corresponds to the {@link TitleFacet#value()) value} of
+ * {@link TitleFacet}; is not necessarily immutable.
*/
String getTitle(ObjectAdapter adapter, Localization localization);
@@ -157,8 +160,8 @@ public interface ObjectSpecification ext
* Returns the name of an icon to use for the specified object.
*
* <p>
- * Corresponds to the {@link IconFacet#iconName(ObjectAdapter)) icon name} returned by the {@link IconFacet}; is not
- * necessarily immutable.
+ * Corresponds to the {@link IconFacet#iconName(ObjectAdapter)) icon name}
+ * returned by the {@link IconFacet}; is not necessarily immutable.
*/
String getIconName(ObjectAdapter object);
@@ -169,30 +172,30 @@ public interface ObjectSpecification ext
// //////////////////////////////////////////////////////////////
/**
- * Create an {@link InteractionContext} representing an attempt to read the object's title.
+ * Create an {@link InteractionContext} representing an attempt to read the
+ * object's title.
*/
- ObjectTitleContext createTitleInteractionContext(AuthenticationSession session,
- InteractionInvocationMethod invocationMethod, ObjectAdapter targetObjectAdapter);
+ ObjectTitleContext createTitleInteractionContext(AuthenticationSession session, InteractionInvocationMethod invocationMethod, ObjectAdapter targetObjectAdapter);
// //////////////////////////////////////////////////////////////
// ValidityContext, Validity
// //////////////////////////////////////////////////////////////
/**
- * Create an {@link InteractionContext} representing an attempt to save the object.
+ * Create an {@link InteractionContext} representing an attempt to save the
+ * object.
*/
- ObjectValidityContext createValidityInteractionContext(AuthenticationSession session,
- InteractionInvocationMethod invocationMethod, ObjectAdapter targetObjectAdapter);
+ ObjectValidityContext createValidityInteractionContext(AuthenticationSession session, InteractionInvocationMethod invocationMethod, ObjectAdapter targetObjectAdapter);
/**
- * Determines whether the specified object is in a valid state (for example, so can be persisted); represented as a
- * {@link Consent}.
+ * Determines whether the specified object is in a valid state (for example,
+ * so can be persisted); represented as a {@link Consent}.
*/
Consent isValid(ObjectAdapter adapter);
/**
- * Determines whether the specified object is in a valid state (for example, so can be persisted); represented as a
- * {@link InteractionResult}.
+ * Determines whether the specified object is in a valid state (for example,
+ * so can be persisted); represented as a {@link InteractionResult}.
*/
InteractionResult isValidResult(ObjectAdapter adapter);
@@ -201,10 +204,12 @@ public interface ObjectSpecification ext
// //////////////////////////////////////////////////////////////
/**
- * Determines if objects of this specification can be persisted or not. If it can be persisted (i.e. it return
- * something other than {@link Persistability}.TRANSIENT ObjectAdapter.isPersistent() will indicated whether the
- * object is persistent or not. If they cannot be persisted then {@link ObjectAdapter}. {@link #persistability()}
- * should be ignored.
+ * Determines if objects of this specification can be persisted or not. If
+ * it can be persisted (i.e. it return something other than
+ * {@link Persistability}.TRANSIENT ObjectAdapter.isPersistent() will
+ * indicated whether the object is persistent or not. If they cannot be
+ * persisted then {@link ObjectAdapter}. {@link #persistability()} should be
+ * ignored.
*/
Persistability persistability();
@@ -212,8 +217,8 @@ public interface ObjectSpecification ext
* Determines if the object represents an value or object.
*
* <p>
- * In effect, means that it doesn't have the {@link CollectionFacet}, and therefore will return NOT
- * {@link #isCollection()}
+ * In effect, means that it doesn't have the {@link CollectionFacet}, and
+ * therefore will return NOT {@link #isCollection()}
*
* @see #isCollection().
*/
@@ -223,17 +228,20 @@ public interface ObjectSpecification ext
* Determines if objects represents a collection.
*
* <p>
- * In effect, means has got {@link CollectionFacet}, and therefore will return NOT {@link #isNotCollection()}.
+ * In effect, means has got {@link CollectionFacet}, and therefore will
+ * return NOT {@link #isNotCollection()}.
*
* @see #isNotCollection()
*/
boolean isCollection();
/**
- * Whether objects of this type are a collection or are intrinsically aggregated.
+ * Whether objects of this type are a collection or are intrinsically
+ * aggregated.
*
* <p>
- * In effect, means has got a {@link CollectionFacet} and/or got the {@link AggregatedFacet}.
+ * In effect, means has got a {@link CollectionFacet} and/or got the
+ * {@link AggregatedFacet}.
*/
boolean isCollectionOrIsAggregated();
@@ -262,7 +270,8 @@ public interface ObjectSpecification ext
boolean isValueOrIsAggregated();
/**
- * Determines if objects of this type can be set up from a text entry string.
+ * Determines if objects of this type can be set up from a text entry
+ * string.
*
* <p>
* In effect, means has got a {@link ParseableFacet}.
@@ -296,7 +305,8 @@ public interface ObjectSpecification ext
*/
public enum CreationMode {
/**
- * Default all properties and call any {@link CreatedCallbackFacet created callbacks}.
+ * Default all properties and call any {@link CreatedCallbackFacet
+ * created callbacks}.
*/
INITIALIZE, NO_INITIALIZE
}
@@ -307,7 +317,8 @@ public interface ObjectSpecification ext
Object createObject(CreationMode creationMode);
/**
- * Create and optionally {@link CreationMode#INITIALIZE initialize} an aggregated object with a parent.
+ * Create and optionally {@link CreationMode#INITIALIZE initialize} an
+ * aggregated object with a parent.
*/
Object createAggregatedObject(ObjectAdapter parent, CreationMode creationMode);
@@ -335,14 +346,14 @@ public interface ObjectSpecification ext
* Is called after to running the <tt>FacetDecoratorSet</tt>.
*
* <p>
- * TODO: it's possible that this could be merged with {@link #introspectTypeHierarchyAndMembers()}; need to check
- * though, because this would cause facets to be decorated at the end of introspection, rather than midway as is
- * currently.
+ * TODO: it's possible that this could be merged with
+ * {@link #introspectTypeHierarchyAndMembers()}; need to check though,
+ * because this would cause facets to be decorated at the end of
+ * introspection, rather than midway as is currently.
*
*/
public void updateFromFacetValues();
public boolean isIntrospected();
-
}
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecificationException.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecificationException.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecificationException.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecificationException.java Sun Jan 22 06:58:43 2012
@@ -20,7 +20,8 @@
package org.apache.isis.core.metamodel.spec;
/**
- * A runtime exception indicating an problem has occurred within the Apache Isis framework.
+ * A runtime exception indicating an problem has occurred within the Apache Isis
+ * framework.
*/
public class ObjectSpecificationException extends RuntimeException {
private static final long serialVersionUID = 1L;
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Persistability.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Persistability.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Persistability.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Persistability.java Sun Jan 22 06:58:43 2012
@@ -21,7 +21,8 @@ package org.apache.isis.core.metamodel.s
public enum Persistability {
/**
- * Marks a class as being persistable, but only by under application program control.
+ * Marks a class as being persistable, but only by under application program
+ * control.
*/
PROGRAM_PERSISTABLE("Program Persistable", true),
/**
@@ -29,7 +30,8 @@ public enum Persistability {
*/
TRANSIENT("Transient", false),
/**
- * Marks a class as being persistable by the user (or under application program control).
+ * Marks a class as being persistable by the user (or under application
+ * program control).
*/
USER_PERSISTABLE("User Persistable", true);
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Specification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Specification.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Specification.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Specification.java Sun Jan 22 06:58:43 2012
@@ -31,8 +31,9 @@ import org.apache.isis.core.metamodel.sp
* Base interface for elements of the metamodel.
*
* <p>
- * The most significant subinterfaces of this are {@link ObjectSpecification} and {@link ObjectFeature} (which brings in
- * {@link ObjectMember} and {@link ObjectActionParameter}.
+ * The most significant subinterfaces of this are {@link ObjectSpecification}
+ * and {@link ObjectFeature} (which brings in {@link ObjectMember} and
+ * {@link ObjectActionParameter}.
*
* <p>
* Introduces so that viewers can deal with abstract Instances of said.
@@ -43,22 +44,27 @@ public interface Specification extends I
FeatureType getFeatureType();
/**
- * Returns a description of how the member is used - this complements the help text.
+ * Returns a description of how the member is used - this complements the
+ * help text.
*
* @see #getHelp()
*/
String getDescription();
/**
- * Return an {@link Instance} of this {@link Specification} with respect to the provided {@link ObjectAdapter}.
+ * Return an {@link Instance} of this {@link Specification} with respect to
+ * the provided {@link ObjectAdapter}.
*
* <p>
- * For example, if the {@link Specification} is a {@link OneToOneAssociation}, then is an {@link Instance}
- * implementation representing the { {@link ObjectAdapter}/ {@link OneToOneAssociation} tuple.
+ * For example, if the {@link Specification} is a
+ * {@link OneToOneAssociation}, then is an {@link Instance} implementation
+ * representing the { {@link ObjectAdapter}/ {@link OneToOneAssociation}
+ * tuple.
*
* <p>
- * Implementations are expected to use a double-dispatch back to the provided {@link ObjectAdapter} (passing
- * themselves as a parameter), using {@link ObjectAdapter#getInstance(Specification)}.
+ * Implementations are expected to use a double-dispatch back to the
+ * provided {@link ObjectAdapter} (passing themselves as a parameter), using
+ * {@link ObjectAdapter#getInstance(Specification)}.
*
* <p>
* Note: this method may throw an {@link UnsupportedOperationException}; see
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationContext.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationContext.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationContext.java Sun Jan 22 06:58:43 2012
@@ -26,9 +26,7 @@ public class SpecificationContext {
private final ObjectInstantiator objectInstantiator;
private final SpecificationLookup specificationLookup;
- public SpecificationContext(final AuthenticationSessionProvider authenticationSessionProvider,
- final ServicesProvider servicesProvider, final ObjectInstantiator objectInstantiator,
- final SpecificationLookup specificationLookup) {
+ public SpecificationContext(final AuthenticationSessionProvider authenticationSessionProvider, final ServicesProvider servicesProvider, final ObjectInstantiator objectInstantiator, final SpecificationLookup specificationLookup) {
this.authenticationSessionProvider = authenticationSessionProvider;
this.servicesProvider = servicesProvider;
this.objectInstantiator = objectInstantiator;
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationLoader.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationLoader.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationLoader.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationLoader.java Sun Jan 22 06:58:43 2012
@@ -26,7 +26,6 @@ import org.apache.isis.core.commons.debu
public interface SpecificationLoader extends ApplicationScopedComponent, DebuggableWithTitle, SpecificationLookup {
-
/**
* @see #loadSpecification(String)
*/
@@ -34,7 +33,8 @@ public interface SpecificationLoader ext
ObjectSpecification loadSpecification(Class<?> cls);
/**
- * Loads the specifications of the specified types except the one specified (to prevent an infinite loop).
+ * Loads the specifications of the specified types except the one specified
+ * (to prevent an infinite loop).
*/
public boolean loadSpecifications(List<Class<?>> typesToLoad, final Class<?> typeToIgnore);
@@ -42,8 +42,8 @@ public interface SpecificationLoader ext
* Return the specification for the specified class of object.
*
* <p>
- * It is possible for this method to return <tt>null</tt>, for example if the configured
- * {@link #getClassSubstitutor()} has filtered out the class.
+ * It is possible for this method to return <tt>null</tt>, for example if
+ * the configured {@link #getClassSubstitutor()} has filtered out the class.
*/
ObjectSpecification loadSpecification(String fullyQualifiedClassName);
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationLookupDelegator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationLookupDelegator.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationLookupDelegator.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationLookupDelegator.java Sun Jan 22 06:58:43 2012
@@ -19,7 +19,8 @@ package org.apache.isis.core.metamodel.s
import java.util.Collection;
/**
- * Allows a SpecificationLookup to be provided even if the concrete implementation is only available later.
+ * Allows a SpecificationLookup to be provided even if the concrete
+ * implementation is only available later.
*/
public class SpecificationLookupDelegator extends SpecificationLookupAbstract {
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/CurrentHolder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/CurrentHolder.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/CurrentHolder.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/CurrentHolder.java Sun Jan 22 06:58:43 2012
@@ -22,19 +22,23 @@ package org.apache.isis.core.metamodel.s
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
/**
- * Mix-in interface for {@link ObjectFeature}s that reference or otherwise contain a 'current' value.
+ * Mix-in interface for {@link ObjectFeature}s that reference or otherwise
+ * contain a 'current' value.
*
* <p>
- * Examples include {@link OneToOneAssociation properties}, {@link OneToManyAssociation collection}s and
- * {@link OneToOneActionParameter action parameter}s (but not {@link ObjectAction action}s themselves).
+ * Examples include {@link OneToOneAssociation properties},
+ * {@link OneToManyAssociation collection}s and {@link OneToOneActionParameter
+ * action parameter}s (but not {@link ObjectAction action}s themselves).
*/
public interface CurrentHolder {
/**
- * Returns the referenced {@link ObjectAdapter} for the owning {@link ObjectAdapter}.
+ * Returns the referenced {@link ObjectAdapter} for the owning
+ * {@link ObjectAdapter}.
*
* <p>
- * For example, if this is an {@link OneToOneAssociation}, then returns the referenced object.
+ * For example, if this is an {@link OneToOneAssociation}, then returns the
+ * referenced object.
*/
ObjectAdapter get(final ObjectAdapter owner);
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/MutableCurrentHolder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/MutableCurrentHolder.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/MutableCurrentHolder.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/MutableCurrentHolder.java Sun Jan 22 06:58:43 2012
@@ -22,21 +22,25 @@ package org.apache.isis.core.metamodel.s
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
/**
- * Mix-in interface for {@link ObjectAction}s that reference or otherwise contain a 'current' value that moreover can be
- * changed.
+ * Mix-in interface for {@link ObjectAction}s that reference or otherwise
+ * contain a 'current' value that moreover can be changed.
*
* <p>
- * Examples include {@link OneToOneAssociation properties} and {@link OneToOneActionParameter action parameter}s (but
- * not {@link ObjectAction action}s themselves) nor {@link OneToManyAssociation collection}s.
+ * Examples include {@link OneToOneAssociation properties} and
+ * {@link OneToOneActionParameter action parameter}s (but not
+ * {@link ObjectAction action}s themselves) nor {@link OneToManyAssociation
+ * collection}s.
*/
public interface MutableCurrentHolder extends CurrentHolder {
/**
- * Updates the referenced {@link ObjectAdapter} for the owning {@link ObjectAdapter} with the new value provided, or
- * clears the reference if null.
+ * Updates the referenced {@link ObjectAdapter} for the owning
+ * {@link ObjectAdapter} with the new value provided, or clears the
+ * reference if null.
*
* <p>
- * For example, if this is a {@link OneToOneAssociation}, then updates the object referenced .
+ * For example, if this is a {@link OneToOneAssociation}, then updates the
+ * object referenced .
*
* @param owner
* @param newValue
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java Sun Jan 22 06:58:43 2012
@@ -39,25 +39,29 @@ public interface ObjectAction extends Ob
// //////////////////////////////////////////////////////
/**
- * Returns where the action should be executed: explicitly locally on the client; explicitly remotely on the server;
- * or where it normally should be executed. By default instance methods should execute on the server, static methods
- * should execute on the client.
+ * Returns where the action should be executed: explicitly locally on the
+ * client; explicitly remotely on the server; or where it normally should be
+ * executed. By default instance methods should execute on the server,
+ * static methods should execute on the client.
*/
Target getTarget();
/**
- * Determine the real target for this action. If this action represents an object action than the target is
- * returned. If this action is on a service then that service will be returned.
+ * Determine the real target for this action. If this action represents an
+ * object action than the target is returned. If this action is on a service
+ * then that service will be returned.
*/
ObjectAdapter realTarget(ObjectAdapter target);
/**
- * Returns the specification for the type of object that this action can be invoked upon.
+ * Returns the specification for the type of object that this action can be
+ * invoked upon.
*/
ObjectSpecification getOnType();
/**
- * Return true if the action is run on a service object using the target object as a parameter.
+ * Return true if the action is run on a service object using the target
+ * object as a parameter.
*/
boolean isContributed();
@@ -68,8 +72,8 @@ public interface ObjectAction extends Ob
// //////////////////////////////////////////////////////////////////
/**
- * Returns the {@link ActionType type} of action: user, exploration, prototype or debug, or that it is a set of
- * actions.
+ * Returns the {@link ActionType type} of action: user, exploration,
+ * prototype or debug, or that it is a set of actions.
*/
ActionType getType();
@@ -83,7 +87,8 @@ public interface ObjectAction extends Ob
ObjectSpecification getReturnType();
/**
- * Returns true if the represented action returns something, else returns false.
+ * Returns true if the represented action returns something, else returns
+ * false.
*/
boolean hasReturn();
@@ -92,7 +97,8 @@ public interface ObjectAction extends Ob
// //////////////////////////////////////////////////////////////////
/**
- * Invokes the action's method on the target object given the specified set of parameters.
+ * Invokes the action's method on the target object given the specified set
+ * of parameters.
*/
ObjectAdapter execute(ObjectAdapter target, ObjectAdapter[] parameters);
@@ -101,18 +107,23 @@ public interface ObjectAction extends Ob
// //////////////////////////////////////////////////////////////////
/**
- * Creates an {@link ActionInvocationContext interaction context} representing an attempt to invoke this action.
+ * Creates an {@link ActionInvocationContext interaction context}
+ * representing an attempt to invoke this action.
*
* <p>
- * Typically it is easier to just call {@link #isProposedArgumentSetValid(ObjectAdapter, ObjectAdapter[]) {
- * @link #isProposedArgumentSetValidResultSet(ObjectAdapter, ObjectAdapter[])}; this is provided as API for
- * symmetry with interactions (such as {@link AccessContext} accesses) have no corresponding vetoing methods.
+ * Typically it is easier to just call
+ * {@link #isProposedArgumentSetValid(ObjectAdapter, ObjectAdapter[])
+ *
+ * @link #isProposedArgumentSetValidResultSet(ObjectAdapter,
+ * ObjectAdapter[])}; this is provided as API for symmetry with
+ * interactions (such as {@link AccessContext} accesses) have no
+ * corresponding vetoing methods.
*/
- public ActionInvocationContext createActionInvocationInteractionContext(AuthenticationSession session,
- InteractionInvocationMethod invocationMethod, ObjectAdapter targetObject, ObjectAdapter[] proposedArguments);
+ public ActionInvocationContext createActionInvocationInteractionContext(AuthenticationSession session, InteractionInvocationMethod invocationMethod, ObjectAdapter targetObject, ObjectAdapter[] proposedArguments);
/**
- * Whether the provided argument set is valid, represented as a {@link Consent}.
+ * Whether the provided argument set is valid, represented as a
+ * {@link Consent}.
*/
Consent isProposedArgumentSetValid(ObjectAdapter object, ObjectAdapter[] proposedArguments);
@@ -124,7 +135,8 @@ public interface ObjectAction extends Ob
* Lists the sub-actions that are available under this name.
*
* <p>
- * If any actions are returned then this action is only a set and not an action itself.
+ * If any actions are returned then this action is only a set and not an
+ * action itself.
*/
List<ObjectAction> getActions();
@@ -148,7 +160,8 @@ public interface ObjectAction extends Ob
List<ObjectActionParameter> getParameters();
/**
- * Returns the {@link ObjectSpecification type} of each of the {@link #getParameters() parameters}.
+ * Returns the {@link ObjectSpecification type} of each of the
+ * {@link #getParameters() parameters}.
*/
List<ObjectSpecification> getParameterTypes();
@@ -179,9 +192,9 @@ public interface ObjectAction extends Ob
ObjectAdapter[] getDefaults(ObjectAdapter target);
/**
- * Returns a list of possible references/values for each parameter, which the user can choose from.
+ * Returns a list of possible references/values for each parameter, which
+ * the user can choose from.
*/
ObjectAdapter[][] getChoices(ObjectAdapter target);
-
}
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionContainer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionContainer.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionContainer.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionContainer.java Sun Jan 22 06:58:43 2012
@@ -27,14 +27,18 @@ import org.apache.isis.core.metamodel.sp
public interface ObjectActionContainer {
- public enum Contributed {
- INCLUDED,
- EXCLUDED;
-
- public boolean isIncluded() { return this == INCLUDED; }
- public boolean isExcluded() { return this == EXCLUDED; }
- }
-
+ public enum Contributed {
+ INCLUDED, EXCLUDED;
+
+ public boolean isIncluded() {
+ return this == INCLUDED;
+ }
+
+ public boolean isExcluded() {
+ return this == EXCLUDED;
+ }
+ }
+
/**
* Returns the action of the specified type with the specified signature.
*/
@@ -44,45 +48,47 @@ public interface ObjectActionContainer {
* Get the action object represented by the specified identity string.
*
* <p>
- * The identity string can be either fully specified with parameters
- * (as per {@link Identifier#toNameParmsIdentityString()} or in
- * abbreviated form ({@link Identifier#toNameIdentityString()}).
+ * The identity string can be either fully specified with parameters (as per
+ * {@link Identifier#toNameParmsIdentityString()} or in abbreviated form (
+ * {@link Identifier#toNameIdentityString()}).
*
* @see #getObjectAction(String)
*/
ObjectAction getObjectAction(ActionType type, String id);
/**
- * Get the action object represented by the specified identity string, irrespective of {@link ActionType}.
+ * Get the action object represented by the specified identity string,
+ * irrespective of {@link ActionType}.
*
* <p>
- * The identity string can be either fully specified with parameters
- * (as per {@link Identifier#toNameParmsIdentityString()} or in
- * abbreviated form ({@link Identifier#toNameIdentityString()}).
+ * The identity string can be either fully specified with parameters (as per
+ * {@link Identifier#toNameParmsIdentityString()} or in abbreviated form (
+ * {@link Identifier#toNameIdentityString()}).
*
* @see #getObjectAction(ActionType, String)
*/
ObjectAction getObjectAction(String id);
/**
- * Returns an array of actions of the specified type, including or excluding contributed actions as required.
+ * Returns an array of actions of the specified type, including or excluding
+ * contributed actions as required.
*/
List<ObjectAction> getObjectActions(ActionType type, Contributed contributed);
/**
- * Returns an array of actions of the specified types, including or excluding contributed actions as required.
+ * Returns an array of actions of the specified types, including or
+ * excluding contributed actions as required.
*/
List<ObjectAction> getObjectActions(List<ActionType> types, Contributed contributed);
/**
- * Returns a list of all object actions, including or excluding contributed actions as required.
+ * Returns a list of all object actions, including or excluding contributed
+ * actions as required.
*/
List<ObjectAction> getObjectActions(Contributed contributed);
-
+
List<ObjectAction> getServiceActionsReturning(ActionType type);
List<ObjectAction> getServiceActionsReturning(List<ActionType> type);
-
-
}
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java Sun Jan 22 06:58:43 2012
@@ -42,8 +42,9 @@ public interface ObjectActionParameter e
boolean isObject();
/**
- * Only for symmetry with {@link ObjectAssociation}, however since the NOF does not support collections as actions
- * all implementations should return <tt>false</tt>.
+ * Only for symmetry with {@link ObjectAssociation}, however since the NOF
+ * does not support collections as actions all implementations should return
+ * <tt>false</tt>.
*/
boolean isCollection();
@@ -53,7 +54,8 @@ public interface ObjectActionParameter e
ObjectAction getAction();
/**
- * Returns a flag indicating if it can be left unset when the action can be invoked.
+ * Returns a flag indicating if it can be left unset when the action can be
+ * invoked.
*/
boolean isOptional();
@@ -66,21 +68,22 @@ public interface ObjectActionParameter e
* Returns the name of this parameter.
*
* <p>
- * Because Java's reflection API does not allow us to access the code name of
- * the parameter, we have to do figure out the name of the parameter ourselves:
+ * Because Java's reflection API does not allow us to access the code name
+ * of the parameter, we have to do figure out the name of the parameter
+ * ourselves:
* <ul>
- * <li>If there is a {@link NamedFacet} associated with this parameter then we infer
- * a name from this, eg "First Name" becomes "firstName".
+ * <li>If there is a {@link NamedFacet} associated with this parameter then
+ * we infer a name from this, eg "First Name" becomes "firstName".
* <li>Otherwise we use the type, eg "string".
- * <li>If there is more than one parameter
- * of the same type, then we use a numeric suffix (eg "string1", "string2"). Wrappers
- * and primitives are considered to be the same type.
+ * <li>If there is more than one parameter of the same type, then we use a
+ * numeric suffix (eg "string1", "string2"). Wrappers and primitives are
+ * considered to be the same type.
* </ul>
*/
+ @Override
String getName();
- ActionArgumentContext createProposedArgumentInteractionContext(AuthenticationSession session,
- InteractionInvocationMethod invocationMethod, ObjectAdapter targetObject, ObjectAdapter[] args, int position);
+ ActionArgumentContext createProposedArgumentInteractionContext(AuthenticationSession session, InteractionInvocationMethod invocationMethod, ObjectAdapter targetObject, ObjectAdapter[] args, int position);
/**
* Whether proposed value for this parameter is valid.
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociation.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociation.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociation.java Sun Jan 22 06:58:43 2012
@@ -42,27 +42,32 @@ public interface ObjectAssociation exten
public void toDefault(ObjectAdapter target);
/**
- * Returns a list of possible references/values for this field, which the user can choose from.
+ * Returns a list of possible references/values for this field, which the
+ * user can choose from.
*/
public ObjectAdapter[] getChoices(ObjectAdapter object);
/**
- * Returns true if calculated from other data in the object, that is, should not be persisted.
+ * Returns true if calculated from other data in the object, that is, should
+ * not be persisted.
*/
boolean isNotPersisted();
/**
- * Returns <code>true</code> if this field on the specified object is deemed to be empty, or has no content.
+ * Returns <code>true</code> if this field on the specified object is deemed
+ * to be empty, or has no content.
*/
boolean isEmpty(ObjectAdapter target);
/**
- * Determines if this field must be complete before the object is in a valid state
+ * Determines if this field must be complete before the object is in a valid
+ * state
*/
boolean isMandatory();
/**
- * Whether there are any choices provided (eg <tt>choicesXxx</tt> supporting method) for the association.
+ * Whether there are any choices provided (eg <tt>choicesXxx</tt> supporting
+ * method) for the association.
*/
public boolean hasChoices();
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationContainer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationContainer.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationContainer.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationContainer.java Sun Jan 22 06:58:43 2012
@@ -28,22 +28,25 @@ import org.apache.isis.core.metamodel.sp
public interface ObjectAssociationContainer {
/**
- * Get the field object representing the field with the specified field identifier.
+ * Get the field object representing the field with the specified field
+ * identifier.
*
- * Throw a {@link ObjectSpecificationException} if no such association exists.
+ * Throw a {@link ObjectSpecificationException} if no such association
+ * exists.
*/
ObjectAssociation getAssociation(String id);
/**
- * Return all the fields that exist in an object of this specification, although they need not all be accessible or
- * visible.
+ * Return all the fields that exist in an object of this specification,
+ * although they need not all be accessible or visible.
*/
List<ObjectAssociation> getAssociations();
/**
* Return all {@link ObjectAssociation}s matching the supplied filter.
*
- * To get the statically visible fields (where any invisible and unauthorised fields have been removed) use
+ * To get the statically visible fields (where any invisible and
+ * unauthorised fields have been removed) use
* <tt>ObjectAssociationFilters#STATICALLY_VISIBLE_ASSOCIATIONS</tt>
*
* @see Filters
@@ -51,12 +54,14 @@ public interface ObjectAssociationContai
List<ObjectAssociation> getAssociations(Filter<ObjectAssociation> filter);
/**
- * All {@link ObjectAssociation association}s that represent {@link OneToOneAssociation properties}.
+ * All {@link ObjectAssociation association}s that represent
+ * {@link OneToOneAssociation properties}.
*/
List<OneToOneAssociation> getProperties();
/**
- * All {@link ObjectAssociation association}s that represents {@link OneToManyAssociation collections}.
+ * All {@link ObjectAssociation association}s that represents
+ * {@link OneToManyAssociation collections}.
*
* @return
*/
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFilters.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFilters.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFilters.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFilters.java Sun Jan 22 06:58:43 2012
@@ -60,9 +60,10 @@ public class ObjectAssociationFilters {
};
/**
- * Filters only properties that are visible statically, ie have not been unconditionally hidden at compile time.
- * Note this list will include properties marked as hidden once persisted and until persisted, but not those marked
- * hidden always.
+ * Filters only properties that are visible statically, ie have not been
+ * unconditionally hidden at compile time. Note this list will include
+ * properties marked as hidden once persisted and until persisted, but not
+ * those marked hidden always.
*/
public static final Filter<ObjectAssociation> STATICALLY_VISIBLE_ASSOCIATIONS = new Filter<ObjectAssociation>() {
@Override
@@ -72,10 +73,10 @@ public class ObjectAssociationFilters {
};
/**
- * Filters only properties that are visible statically, ie have not been hidden at compile time.
+ * Filters only properties that are visible statically, ie have not been
+ * hidden at compile time.
*/
- public static Filter<ObjectAssociation> dynamicallyVisible(final AuthenticationSession session,
- final ObjectAdapter target) {
+ public static Filter<ObjectAssociation> dynamicallyVisible(final AuthenticationSession session, final ObjectAdapter target) {
return new Filter<ObjectAssociation>() {
@Override
public boolean accept(final ObjectAssociation objectAssociation) {
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectFeature.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectFeature.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectFeature.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectFeature.java Sun Jan 22 06:58:43 2012
@@ -24,30 +24,33 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.spec.Specification;
/**
- * A specification representing a non-{@link FeatureType#OBJECT object}, that therefore has an underlying type (the type
- * of the property, collection)
+ * A specification representing a non-{@link FeatureType#OBJECT object}, that
+ * therefore has an underlying type (the type of the property, collection)
*
* <p>
- * For a property or action parameter, is the type. For a collection is the element type. For an action it is always
- * <tt>null</tt>.
+ * For a property or action parameter, is the type. For a collection is the
+ * element type. For an action it is always <tt>null</tt>.
*/
public interface ObjectFeature extends Specification {
/**
- * Returns the identifier of the member, which must not change. This should be all camel-case with no spaces: so if
- * the member is called 'Return Date' then the a suitable id would be 'ReturnDate'.
+ * Returns the identifier of the member, which must not change. This should
+ * be all camel-case with no spaces: so if the member is called 'Return
+ * Date' then the a suitable id would be 'ReturnDate'.
*/
String getId();
/**
- * Return the name for this member - the field or action. This is based on the name of this member.
+ * Return the name for this member - the field or action. This is based on
+ * the name of this member.
*
* @see #getIdentifier()
*/
String getName();
/**
- * Returns a description of how the member is used - this complements the help text.
+ * Returns a description of how the member is used - this complements the
+ * help text.
*
* @see #getHelp()
*/
@@ -60,13 +63,15 @@ public interface ObjectFeature extends S
* <p>
* For example:
* <ul>
- * <li>for a {@link OneToOneAssociation property}, will return the {@link ObjectSpecification} of the type that the
- * accessor returns.
- * <li>for a {@link OneToManyAssociation collection} it will be the type of element the collection holds (not the
- * type of collection).
- * <li>for a {@link ObjectAction action}, will always return <tt>null</tt>. See instead
- * {@link ObjectAction#getReturnType()} and {@link ObjectAction#getParameterTypes()}.
- * <li>for a {@link ObjectActionParameter action}, will return the type of the parameter}.
+ * <li>for a {@link OneToOneAssociation property}, will return the
+ * {@link ObjectSpecification} of the type that the accessor returns.
+ * <li>for a {@link OneToManyAssociation collection} it will be the type of
+ * element the collection holds (not the type of collection).
+ * <li>for a {@link ObjectAction action}, will always return <tt>null</tt>.
+ * See instead {@link ObjectAction#getReturnType()} and
+ * {@link ObjectAction#getParameterTypes()}.
+ * <li>for a {@link ObjectActionParameter action}, will return the type of
+ * the parameter}.
* </ul>
*/
ObjectSpecification getSpecification();
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java Sun Jan 22 06:58:43 2012
@@ -34,13 +34,13 @@ import org.apache.isis.core.metamodel.in
*/
public interface ObjectMember extends ObjectFeature {
-
// /////////////////////////////////////////////////////////////
// Name, Description, Help (convenience for facets)
// /////////////////////////////////////////////////////////////
/**
- * Return the help text for this member - the field or action - to complement the description.
+ * Return the help text for this member - the field or action - to
+ * complement the description.
*
* @see #getDescription()
*/
@@ -56,16 +56,17 @@ public interface ObjectMember extends Ob
boolean isAlwaysHidden();
/**
- * Create an {@link InteractionContext} to represent an attempt to view this member (that is, to check if it is
- * visible or not).
+ * Create an {@link InteractionContext} to represent an attempt to view this
+ * member (that is, to check if it is visible or not).
*
* <p>
- * Typically it is easier to just call {@link #isVisible(AuthenticationSession, ObjectAdapter)} or
- * {@link #isVisibleResult(AuthenticationSession, ObjectAdapter)}; this is provided as API for symmetry with
- * interactions (such as {@link AccessContext} accesses) have no corresponding vetoing methods.
+ * Typically it is easier to just call
+ * {@link #isVisible(AuthenticationSession, ObjectAdapter)} or
+ * {@link #isVisibleResult(AuthenticationSession, ObjectAdapter)}; this is
+ * provided as API for symmetry with interactions (such as
+ * {@link AccessContext} accesses) have no corresponding vetoing methods.
*/
- VisibilityContext<?> createVisibleInteractionContext(AuthenticationSession session,
- InteractionInvocationMethod invocationMethod, ObjectAdapter targetObjectAdapter);
+ VisibilityContext<?> createVisibleInteractionContext(AuthenticationSession session, InteractionInvocationMethod invocationMethod, ObjectAdapter targetObjectAdapter);
/**
* Determines if this member is visible, represented as a {@link Consent}.
@@ -82,19 +83,22 @@ public interface ObjectMember extends Ob
// /////////////////////////////////////////////////////////////
/**
- * Create an {@link InteractionContext} to represent an attempt to {@link InteractionContextType#MEMBER_USABLE use
- * this member} (that is, to check if it is usable or not).
+ * Create an {@link InteractionContext} to represent an attempt to
+ * {@link InteractionContextType#MEMBER_USABLE use this member} (that is, to
+ * check if it is usable or not).
*
* <p>
- * Typically it is easier to just call {@link #isUsable(AuthenticationSession, ObjectAdapter)} or
- * {@link #isUsableResult(AuthenticationSession, ObjectAdapter)}; this is provided as API for symmetry with
- * interactions (such as {@link AccessContext} accesses) have no corresponding vetoing methods.
+ * Typically it is easier to just call
+ * {@link #isUsable(AuthenticationSession, ObjectAdapter)} or
+ * {@link #isUsableResult(AuthenticationSession, ObjectAdapter)}; this is
+ * provided as API for symmetry with interactions (such as
+ * {@link AccessContext} accesses) have no corresponding vetoing methods.
*/
- UsabilityContext<?> createUsableInteractionContext(AuthenticationSession session,
- InteractionInvocationMethod invocationMethod, ObjectAdapter target);
+ UsabilityContext<?> createUsableInteractionContext(AuthenticationSession session, InteractionInvocationMethod invocationMethod, ObjectAdapter target);
/**
- * Determines whether this member is usable, represented as a {@link Consent}.
+ * Determines whether this member is usable, represented as a
+ * {@link Consent}.
*
* @param target
* may be <tt>null</tt> if just checking for authorization.
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMemberContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMemberContext.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMemberContext.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMemberContext.java Sun Jan 22 06:58:43 2012
@@ -30,13 +30,8 @@ public class ObjectMemberContext {
private final QuerySubmitter querySubmitter;
private final CollectionTypeRegistry collectionTypeRegistry;
- public ObjectMemberContext(
- final AuthenticationSessionProvider authenticationSessionProvider,
- final SpecificationLookup specificationLookup,
- final AdapterMap adapterManager,
- final QuerySubmitter querySubmitter,
- final CollectionTypeRegistry collectionTypeRegistry) {
-
+ public ObjectMemberContext(final AuthenticationSessionProvider authenticationSessionProvider, final SpecificationLookup specificationLookup, final AdapterMap adapterManager, final QuerySubmitter querySubmitter, final CollectionTypeRegistry collectionTypeRegistry) {
+
this.authenticationSessionProvider = authenticationSessionProvider;
this.specificationLookup = specificationLookup;
this.adapterManager = adapterManager;
@@ -59,7 +54,7 @@ public class ObjectMemberContext {
public QuerySubmitter getQuerySubmitter() {
return querySubmitter;
}
-
+
public CollectionTypeRegistry getCollectionTypeRegistry() {
return collectionTypeRegistry;
}
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToManyAssociation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToManyAssociation.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToManyAssociation.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToManyAssociation.java Sun Jan 22 06:58:43 2012
@@ -34,31 +34,33 @@ public interface OneToManyAssociation ex
// /////////////////////////////////////////////////////////////
/**
- * Creates an {@link InteractionContext} that represents validation of a candidate object to be added to the
- * collection.
+ * Creates an {@link InteractionContext} that represents validation of a
+ * candidate object to be added to the collection.
*
* <p>
- * Typically it is easier to just call {@link #isValidToAdd(ObjectAdapter, ObjectAdapter)} or
- * {@link #isValidToAddResult(ObjectAdapter, ObjectAdapter)}; this is provided as API for symmetry with interactions
- * (such as {@link AccessContext} accesses) have no corresponding vetoing methods.
+ * Typically it is easier to just call
+ * {@link #isValidToAdd(ObjectAdapter, ObjectAdapter)} or
+ * {@link #isValidToAddResult(ObjectAdapter, ObjectAdapter)}; this is
+ * provided as API for symmetry with interactions (such as
+ * {@link AccessContext} accesses) have no corresponding vetoing methods.
*/
- public ValidityContext<?> createValidateAddInteractionContext(AuthenticationSession session,
- InteractionInvocationMethod invocationMethod, ObjectAdapter owningObjectAdapter,
- ObjectAdapter proposedObjectToAdd);
+ public ValidityContext<?> createValidateAddInteractionContext(AuthenticationSession session, InteractionInvocationMethod invocationMethod, ObjectAdapter owningObjectAdapter, ObjectAdapter proposedObjectToAdd);
/**
- * Determines if the specified element can be added to the collection field, represented as a {@link Consent}.
+ * Determines if the specified element can be added to the collection field,
+ * represented as a {@link Consent}.
*
* <p>
- * If allowed the {@link #addElement(ObjectAdapter, ObjectAdapter) add} method can be called with the same
- * parameters, .
+ * If allowed the {@link #addElement(ObjectAdapter, ObjectAdapter) add}
+ * method can be called with the same parameters, .
*
* @see #isValidToAddResult(ObjectAdapter, ObjectAdapter)
*/
Consent isValidToAdd(ObjectAdapter owningObjectAdapter, ObjectAdapter proposedObjectToAdd);
/**
- * Add the specified element to this collection field in the specified object.
+ * Add the specified element to this collection field in the specified
+ * object.
*/
void addElement(ObjectAdapter owningObjectAdapter, ObjectAdapter objectToAdd);
@@ -67,24 +69,25 @@ public interface OneToManyAssociation ex
// /////////////////////////////////////////////////////////////
/**
- * Creates an {@link InteractionContext} that represents validation of a candidate object to be removed from the
- * collection.
+ * Creates an {@link InteractionContext} that represents validation of a
+ * candidate object to be removed from the collection.
*
* <p>
- * Typically it is easier to just call {@link #isValidToAdd(ObjectAdapter, ObjectAdapter)} or
- * {@link #isValidToAddResult(ObjectAdapter, ObjectAdapter)}; this is provided as API for symmetry with interactions
- * (such as {@link AccessContext} accesses) have no corresponding vetoing methods.
+ * Typically it is easier to just call
+ * {@link #isValidToAdd(ObjectAdapter, ObjectAdapter)} or
+ * {@link #isValidToAddResult(ObjectAdapter, ObjectAdapter)}; this is
+ * provided as API for symmetry with interactions (such as
+ * {@link AccessContext} accesses) have no corresponding vetoing methods.
*/
- ValidityContext<?> createValidateRemoveInteractionContext(AuthenticationSession session,
- InteractionInvocationMethod invocationMethod, ObjectAdapter owningObjectAdapter,
- ObjectAdapter proposedObjectToRemove);
+ ValidityContext<?> createValidateRemoveInteractionContext(AuthenticationSession session, InteractionInvocationMethod invocationMethod, ObjectAdapter owningObjectAdapter, ObjectAdapter proposedObjectToRemove);
/**
- * Determines if the specified element can be removed from the collection field, represented as a {@link Consent}.
+ * Determines if the specified element can be removed from the collection
+ * field, represented as a {@link Consent}.
*
* <p>
- * If allowed the {@link #removeElement(ObjectAdapter, ObjectAdapter) remove} method can be called with the same
- * parameters, .
+ * If allowed the {@link #removeElement(ObjectAdapter, ObjectAdapter)
+ * remove} method can be called with the same parameters, .
*
* @see #removeElement(ObjectAdapter, ObjectAdapter)
* @see #isValidToAddResult(ObjectAdapter, ObjectAdapter)
@@ -92,7 +95,8 @@ public interface OneToManyAssociation ex
Consent isValidToRemove(ObjectAdapter owningObjectAdapter, ObjectAdapter proposedObjectToRemove);
/**
- * Remove the specified element from this collection field in the specified object.
+ * Remove the specified element from this collection field in the specified
+ * object.
*/
void removeElement(ObjectAdapter owningObjectAdapter, ObjectAdapter oObjectToRemove);
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToManyFeature.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToManyFeature.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToManyFeature.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToManyFeature.java Sun Jan 22 06:58:43 2012
@@ -22,13 +22,13 @@ package org.apache.isis.core.metamodel.s
import java.util.Collection;
import java.util.Queue;
-
/**
* Base interface for {@link OneToManyAssociation} only.
*
* <p>
- * Introduced for symmetry with {@link OneToOneFeature}; if we ever support collections as parameters then would also be
- * the base interface for a <tt>OneToManyActionParameter</tt>.
+ * Introduced for symmetry with {@link OneToOneFeature}; if we ever support
+ * collections as parameters then would also be the base interface for a
+ * <tt>OneToManyActionParameter</tt>.
*
* <p>
* Is also the route up to the {@link ObjectFeature} superinterface.
@@ -37,21 +37,31 @@ import java.util.Queue;
public interface OneToManyFeature extends ObjectFeature {
public enum CollectionSemantics {
- LIST,
- ARRAY,
- SET,
- OTHER;
+ LIST, ARRAY, SET, OTHER;
/**
* The corresponding class is not a subclass of {@link Collection}.
*/
- public boolean isArray() { return this == ARRAY; }
- public boolean isList() { return this == LIST; }
- public boolean isSet() { return this == SET; }
+ public boolean isArray() {
+ return this == ARRAY;
+ }
+
+ public boolean isList() {
+ return this == LIST;
+ }
+
+ public boolean isSet() {
+ return this == SET;
+ }
+
/**
- * For example, {@link Queue}, or some other 3rdparty implementation of {@link Collection}.
+ * For example, {@link Queue}, or some other 3rdparty implementation of
+ * {@link Collection}.
*/
- public boolean isOther() { return this == OTHER; }
+ public boolean isOther() {
+ return this == OTHER;
+ }
+
public boolean isListOrArray() {
return isList() || isArray();
}
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToOneActionParameter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToOneActionParameter.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToOneActionParameter.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToOneActionParameter.java Sun Jan 22 06:58:43 2012
@@ -20,7 +20,8 @@
package org.apache.isis.core.metamodel.spec.feature;
/**
- * Modelled after {@link OneToOneAssociation} as a subinterface of {@link ObjectAssociation}.
+ * Modelled after {@link OneToOneAssociation} as a subinterface of
+ * {@link ObjectAssociation}.
*/
public interface OneToOneActionParameter extends ObjectActionParameter, OneToOneFeature {