You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2010/12/22 17:22:32 UTC
svn commit: r1051971 [5/18] - in /incubator/isis/trunk:
alternatives/bytecode/identity/src/main/java/org/apache/isis/alternatives/bytecode/identity/objectfactory/
alternatives/bytecode/javassist/src/main/java/org/apache/isis/alternatives/bytecode/javas...
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/feature/FeatureType.java (from r1051446, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectFeatureType.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/feature/FeatureType.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/feature/FeatureType.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectFeatureType.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectFeatureType.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/feature/FeatureType.java Wed Dec 22 16:22:08 2010
@@ -18,76 +18,128 @@
*/
-package org.apache.isis.core.metamodel.spec.feature;
+package org.apache.isis.core.metamodel.feature;
+import java.beans.Introspector;
+import java.lang.reflect.Method;
import java.util.List;
import com.google.common.collect.ImmutableList;
+import org.apache.isis.applib.Identifier;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.util.NameUtils;
/**
- * Enumerates the features that a particular annotation can be applied to.
- *
- * <p>
- * Modelled after Java 5 <tt>ElementType</tt>.
- *
+ * Enumerates the features that a particular Facet can be applied to.
*
* <p>
* TODO: should rationalize this and {@link ObjectSpecification#getResultType()}. Note though that we don't
* distinguish value properties and reference properties (and we probably shouldn't in
* {@link ObjectSpecification}, either).
*/
-public final class ObjectFeatureType {
+public enum FeatureType {
- public final static ObjectFeatureType OBJECT = new ObjectFeatureType(0, "Object");
- public final static ObjectFeatureType PROPERTY = new ObjectFeatureType(1, "Property");
- public final static ObjectFeatureType COLLECTION = new ObjectFeatureType(2, "Collection");
- public final static ObjectFeatureType ACTION = new ObjectFeatureType(3, "Action");
- public final static ObjectFeatureType ACTION_PARAMETER = new ObjectFeatureType(4, "Parameter");
-
- public final static List<ObjectFeatureType> COLLECTIONS_ONLY = ImmutableList.of( COLLECTION );
- public final static List<ObjectFeatureType> ACTIONS_ONLY = ImmutableList.of( ACTION );
- public final static List<ObjectFeatureType> PARAMETERS_ONLY = ImmutableList.of( ACTION_PARAMETER );
- public final static List<ObjectFeatureType> ACTIONS_AND_PARAMETERS = ImmutableList.of( ACTION, ACTION_PARAMETER );
- public final static List<ObjectFeatureType> COLLECTIONS_AND_ACTIONS = ImmutableList.of( COLLECTION, ACTION );
- public final static List<ObjectFeatureType> PROPERTIES_AND_PARAMETERS = ImmutableList.of( PROPERTY,
+ OBJECT("Object") {
+ /**
+ * The supplied method can be null; at any rate it will be ignored.
+ */
+ @Override
+ public Identifier identifierFor(Class<?> type, Method method) {
+ return Identifier.classIdentifier(type);
+ }
+ },
+ PROPERTY("Property") {
+ @Override
+ public Identifier identifierFor(Class<?> type, Method method) {
+ return propertyOrCollectionIdentifierFor(type, method);
+ }
+ },
+ COLLECTION("Collection") {
+ @Override
+ public Identifier identifierFor(Class<?> type, Method method) {
+ return propertyOrCollectionIdentifierFor(type, method);
+ }
+ },
+ ACTION("Action") {
+ @Override
+ public Identifier identifierFor(Class<?> type, Method method) {
+ final String fullMethodName = method.getName();
+ final Class<?>[] parameterTypes = method.getParameterTypes();
+ return Identifier.actionIdentifier(type.getName(), fullMethodName, parameterTypes);
+ }
+ },
+ ACTION_PARAMETER("Parameter") {
+ /**
+ * Always returns <tt>null</tt>.
+ */
+ @Override
+ public Identifier identifierFor(Class<?> type, Method method) {
+ return null;
+ }
+ };
+
+ public final static List<FeatureType> COLLECTIONS_ONLY = ImmutableList.of( COLLECTION );
+ public final static List<FeatureType> ACTIONS_ONLY = ImmutableList.of( ACTION );
+ public final static List<FeatureType> PARAMETERS_ONLY = ImmutableList.of( ACTION_PARAMETER );
+ public final static List<FeatureType> ACTIONS_AND_PARAMETERS = ImmutableList.of( ACTION, ACTION_PARAMETER );
+ public final static List<FeatureType> COLLECTIONS_AND_ACTIONS = ImmutableList.of( COLLECTION, ACTION );
+ public final static List<FeatureType> PROPERTIES_AND_PARAMETERS = ImmutableList.of( PROPERTY,
ACTION_PARAMETER );
- public final static List<ObjectFeatureType> OBJECTS_PROPERTIES_AND_PARAMETERS = ImmutableList.of( OBJECT,
+ public final static List<FeatureType> OBJECTS_PROPERTIES_AND_PARAMETERS = ImmutableList.of( OBJECT,
PROPERTY, ACTION_PARAMETER );
- public final static List<ObjectFeatureType> OBJECTS_AND_PROPERTIES = ImmutableList.of( OBJECT, PROPERTY );
- public final static List<ObjectFeatureType> PROPERTIES_ONLY = ImmutableList.of( PROPERTY );
- public final static List<ObjectFeatureType> OBJECTS_ONLY = ImmutableList.of( OBJECT );
- public final static List<ObjectFeatureType> OBJECTS_PROPERTIES_AND_COLLECTIONS = ImmutableList.of( OBJECT,
+ public final static List<FeatureType> OBJECTS_AND_PROPERTIES = ImmutableList.of( OBJECT, PROPERTY );
+ public final static List<FeatureType> PROPERTIES_ONLY = ImmutableList.of( PROPERTY );
+ public final static List<FeatureType> OBJECTS_ONLY = ImmutableList.of( OBJECT );
+ public final static List<FeatureType> OBJECTS_PROPERTIES_AND_COLLECTIONS = ImmutableList.of( OBJECT,
PROPERTY, COLLECTION );
- public final static List<ObjectFeatureType> PROPERTIES_AND_COLLECTIONS = ImmutableList.of( PROPERTY, COLLECTION );
- public final static List<ObjectFeatureType> PROPERTIES_COLLECTIONS_AND_ACTIONS = ImmutableList.of( PROPERTY,
+ public final static List<FeatureType> PROPERTIES_AND_COLLECTIONS = ImmutableList.of( PROPERTY, COLLECTION );
+ public final static List<FeatureType> PROPERTIES_COLLECTIONS_AND_ACTIONS = ImmutableList.of( PROPERTY,
COLLECTION, ACTION );
- public final static List<ObjectFeatureType> EVERYTHING_BUT_PARAMETERS = ImmutableList.of( OBJECT, PROPERTY,
+ public final static List<FeatureType> EVERYTHING_BUT_PARAMETERS = ImmutableList.of( OBJECT, PROPERTY,
COLLECTION, ACTION );
- public final static List<ObjectFeatureType> EVERYTHING = ImmutableList.of(OBJECT, PROPERTY, COLLECTION,
+ public final static List<FeatureType> EVERYTHING = ImmutableList.of(OBJECT, PROPERTY, COLLECTION,
ACTION, ACTION_PARAMETER);
- private final int num;
- private final String name;
+ private final String name;
- private ObjectFeatureType(final int num, final String nameInCode) {
- this.num = num;
- this.name = nameInCode;
- }
-
- public int getNum() {
- return num;
- }
-
- public String getName() {
- return name;
+ private FeatureType(final String name) {
+ this.name = name;
}
+
+
+ private static Identifier propertyOrCollectionIdentifierFor(Class<?> type, Method method) {
+ final String capitalizedName = NameUtils.javaBaseName(method.getName());
+ final String beanName = Introspector.decapitalize(capitalizedName);
+ return Identifier.propertyOrCollectionIdentifier(type.getName(), beanName);
+ }
+
+ public boolean isProperty() {
+ return this == PROPERTY;
+ }
+ public boolean isCollection() {
+ return this == COLLECTION;
+ }
+ public boolean isAction() {
+ return this == ACTION;
+ }
+ public boolean isActionParameter() {
+ return this == ACTION_PARAMETER;
+ }
+
+ /**
+ * Convenience.
+ */
+ public boolean isPropertyOrCollection() {
+ return isProperty() || isCollection();
+ }
+
+ public abstract Identifier identifierFor(Class<?> type, Method method);
@Override
public String toString() {
- return getName();
+ return name;
}
}
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/feature/IdentifiedHolder.java (from r1051446, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/identifier/Identified.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/feature/IdentifiedHolder.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/feature/IdentifiedHolder.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/identifier/Identified.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/identifier/Identified.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/feature/IdentifiedHolder.java Wed Dec 22 16:22:08 2010
@@ -18,12 +18,12 @@
*/
-package org.apache.isis.core.metamodel.spec.identifier;
+package org.apache.isis.core.metamodel.feature;
-import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.Identifier;
import org.apache.isis.core.metamodel.facets.FacetHolder;
-public interface Identified extends FacetHolder {
+public interface IdentifiedHolder extends FacetHolder {
/**
* Identifier of this feature.
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/AccessContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/AccessContext.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/AccessContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/AccessContext.java Wed Dec 22 16:22:08 2010
@@ -20,8 +20,8 @@
package org.apache.isis.core.metamodel.interactions;
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.AccessEvent;
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.events.AccessEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgumentContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgumentContext.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgumentContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgumentContext.java Wed Dec 22 16:22:08 2010
@@ -20,10 +20,10 @@
package org.apache.isis.core.metamodel.interactions;
-import static org.apache.isis.core.metamodel.util.IsisUtils.unwrap;
-
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.ActionArgumentEvent;
+import static org.apache.isis.core.metamodel.adapter.AdapterUtils.unwrap;
+
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.events.ActionArgumentEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionInvocationContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionInvocationContext.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionInvocationContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionInvocationContext.java Wed Dec 22 16:22:08 2010
@@ -20,10 +20,10 @@
package org.apache.isis.core.metamodel.interactions;
-import static org.apache.isis.core.metamodel.util.IsisUtils.unwrap;
-
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.ActionInvocationEvent;
+import static org.apache.isis.core.metamodel.adapter.AdapterUtils.unwrap;
+
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.events.ActionInvocationEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionUsabilityContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionUsabilityContext.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionUsabilityContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionUsabilityContext.java Wed Dec 22 16:22:08 2010
@@ -20,10 +20,10 @@
package org.apache.isis.core.metamodel.interactions;
-import static org.apache.isis.core.metamodel.util.IsisUtils.unwrap;
-
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.ActionUsabilityEvent;
+import static org.apache.isis.core.metamodel.adapter.AdapterUtils.unwrap;
+
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.events.ActionUsabilityEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionVisibilityContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionVisibilityContext.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionVisibilityContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionVisibilityContext.java Wed Dec 22 16:22:08 2010
@@ -20,10 +20,10 @@
package org.apache.isis.core.metamodel.interactions;
-import static org.apache.isis.core.metamodel.util.IsisUtils.unwrap;
-
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.ActionVisibilityEvent;
+import static org.apache.isis.core.metamodel.adapter.AdapterUtils.unwrap;
+
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.events.ActionVisibilityEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAccessContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAccessContext.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAccessContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAccessContext.java Wed Dec 22 16:22:08 2010
@@ -20,10 +20,10 @@
package org.apache.isis.core.metamodel.interactions;
-import static org.apache.isis.core.metamodel.util.IsisUtils.unwrap;
-
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.CollectionAccessEvent;
+import static org.apache.isis.core.metamodel.adapter.AdapterUtils.unwrap;
+
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.events.CollectionAccessEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAddToContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAddToContext.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAddToContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAddToContext.java Wed Dec 22 16:22:08 2010
@@ -20,10 +20,10 @@
package org.apache.isis.core.metamodel.interactions;
-import static org.apache.isis.core.metamodel.util.IsisUtils.unwrap;
-
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.CollectionAddToEvent;
+import static org.apache.isis.core.metamodel.adapter.AdapterUtils.unwrap;
+
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.events.CollectionAddToEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionRemoveFromContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionRemoveFromContext.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionRemoveFromContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionRemoveFromContext.java Wed Dec 22 16:22:08 2010
@@ -20,10 +20,10 @@
package org.apache.isis.core.metamodel.interactions;
-import static org.apache.isis.core.metamodel.util.IsisUtils.unwrap;
-
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.CollectionRemoveFromEvent;
+import static org.apache.isis.core.metamodel.adapter.AdapterUtils.unwrap;
+
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.events.CollectionRemoveFromEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionUsabilityContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionUsabilityContext.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionUsabilityContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionUsabilityContext.java Wed Dec 22 16:22:08 2010
@@ -20,8 +20,8 @@
package org.apache.isis.core.metamodel.interactions;
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.CollectionUsabilityEvent;
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.events.CollectionUsabilityEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionVisibilityContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionVisibilityContext.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionVisibilityContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionVisibilityContext.java Wed Dec 22 16:22:08 2010
@@ -20,10 +20,10 @@
package org.apache.isis.core.metamodel.interactions;
-import static org.apache.isis.core.metamodel.util.IsisUtils.unwrap;
-
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.CollectionVisibilityEvent;
+import static org.apache.isis.core.metamodel.adapter.AdapterUtils.unwrap;
+
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.events.CollectionVisibilityEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/DisablingInteractionAdvisor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/DisablingInteractionAdvisor.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/DisablingInteractionAdvisor.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/DisablingInteractionAdvisor.java Wed Dec 22 16:22:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.core.metamodel.interactions;
-import org.apache.isis.applib.events.UsabilityEvent;
+import org.apache.isis.applib.events.UsabilityEvent;
import org.apache.isis.core.metamodel.consent.InteractionAdvisorFacet;
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/HidingInteractionAdvisor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/HidingInteractionAdvisor.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/HidingInteractionAdvisor.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/HidingInteractionAdvisor.java Wed Dec 22 16:22:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.core.metamodel.interactions;
-import org.apache.isis.applib.events.VisibilityEvent;
+import org.apache.isis.applib.events.VisibilityEvent;
import org.apache.isis.core.metamodel.consent.InteractionAdvisorFacet;
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionContext.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionContext.java Wed Dec 22 16:22:08 2010
@@ -20,8 +20,8 @@
package org.apache.isis.core.metamodel.interactions;
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.InteractionEvent;
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.events.InteractionEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectTitleContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectTitleContext.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectTitleContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectTitleContext.java Wed Dec 22 16:22:08 2010
@@ -20,10 +20,10 @@
package org.apache.isis.core.metamodel.interactions;
-import static org.apache.isis.core.metamodel.util.IsisUtils.unwrap;
-
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.ObjectTitleEvent;
+import static org.apache.isis.core.metamodel.adapter.AdapterUtils.unwrap;
+
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.events.ObjectTitleEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectValidityContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectValidityContext.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectValidityContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectValidityContext.java Wed Dec 22 16:22:08 2010
@@ -20,10 +20,10 @@
package org.apache.isis.core.metamodel.interactions;
-import static org.apache.isis.core.metamodel.util.IsisUtils.unwrap;
-
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.ObjectValidityEvent;
+import static org.apache.isis.core.metamodel.adapter.AdapterUtils.unwrap;
+
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.events.ObjectValidityEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ParseValueContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ParseValueContext.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ParseValueContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ParseValueContext.java Wed Dec 22 16:22:08 2010
@@ -20,10 +20,10 @@
package org.apache.isis.core.metamodel.interactions;
-import static org.apache.isis.core.metamodel.util.IsisUtils.unwrap;
-
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.ParseValueEvent;
+import static org.apache.isis.core.metamodel.adapter.AdapterUtils.unwrap;
+
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.events.ParseValueEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyAccessContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyAccessContext.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyAccessContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyAccessContext.java Wed Dec 22 16:22:08 2010
@@ -20,10 +20,10 @@
package org.apache.isis.core.metamodel.interactions;
-import static org.apache.isis.core.metamodel.util.IsisUtils.unwrap;
-
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.PropertyAccessEvent;
+import static org.apache.isis.core.metamodel.adapter.AdapterUtils.unwrap;
+
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.events.PropertyAccessEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyModifyContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyModifyContext.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyModifyContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyModifyContext.java Wed Dec 22 16:22:08 2010
@@ -20,10 +20,10 @@
package org.apache.isis.core.metamodel.interactions;
-import static org.apache.isis.core.metamodel.util.IsisUtils.unwrap;
-
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.PropertyModifyEvent;
+import static org.apache.isis.core.metamodel.adapter.AdapterUtils.unwrap;
+
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.events.PropertyModifyEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyUsabilityContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyUsabilityContext.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyUsabilityContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyUsabilityContext.java Wed Dec 22 16:22:08 2010
@@ -20,10 +20,10 @@
package org.apache.isis.core.metamodel.interactions;
-import static org.apache.isis.core.metamodel.util.IsisUtils.unwrap;
-
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.PropertyUsabilityEvent;
+import static org.apache.isis.core.metamodel.adapter.AdapterUtils.unwrap;
+
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.events.PropertyUsabilityEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyVisibilityContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyVisibilityContext.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyVisibilityContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyVisibilityContext.java Wed Dec 22 16:22:08 2010
@@ -20,10 +20,10 @@
package org.apache.isis.core.metamodel.interactions;
-import static org.apache.isis.core.metamodel.util.IsisUtils.unwrap;
-
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.PropertyVisibilityEvent;
+import static org.apache.isis.core.metamodel.adapter.AdapterUtils.unwrap;
+
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.events.PropertyVisibilityEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/UsabilityContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/UsabilityContext.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/UsabilityContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/UsabilityContext.java Wed Dec 22 16:22:08 2010
@@ -20,8 +20,8 @@
package org.apache.isis.core.metamodel.interactions;
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.UsabilityEvent;
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.events.UsabilityEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ValidatingInteractionAdvisor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ValidatingInteractionAdvisor.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ValidatingInteractionAdvisor.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ValidatingInteractionAdvisor.java Wed Dec 22 16:22:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.core.metamodel.interactions;
-import org.apache.isis.applib.events.ValidityEvent;
+import org.apache.isis.applib.events.ValidityEvent;
import org.apache.isis.core.metamodel.consent.InteractionAdvisorFacet;
import org.apache.isis.core.metamodel.facets.Facet;
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ValidityContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ValidityContext.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ValidityContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ValidityContext.java Wed Dec 22 16:22:08 2010
@@ -20,8 +20,8 @@
package org.apache.isis.core.metamodel.interactions;
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.ValidityEvent;
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.events.ValidityEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/VisibilityContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/VisibilityContext.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/VisibilityContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/VisibilityContext.java Wed Dec 22 16:22:08 2010
@@ -20,8 +20,8 @@
package org.apache.isis.core.metamodel.interactions;
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.VisibilityEvent;
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.events.VisibilityEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.consent.InteractionContextType;