incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1053925 [2/6] - in /incubator/isis/trunk: alternatives/bytecode/javassist/src/main/java/org/apache/isis/alternatives/bytecode/javassist/objectfactory/internal/ alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternativ...
Date Thu, 30 Dec 2010 16:13:22 GMT
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacet.java?rev=1053925&r1=1053924&r2=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacet.java Thu Dec 30 16:13:13 2010
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.f
 
 import org.apache.isis.core.metamodel.facets.SingleWhenValueFacet;
 import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
-import org.apache.isis.core.metamodel.interactions2.DisablingInteractionAdvisor;
+import org.apache.isis.core.metamodel.interactions.DisablingInteractionAdvisor;
 
 /**
  * Indicates that the instances of this class are immutable and so may not be modified either through the viewer or

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/notpersistable/NotPersistableFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/notpersistable/NotPersistableFacet.java?rev=1053925&r1=1053924&r2=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/notpersistable/NotPersistableFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/notpersistable/NotPersistableFacet.java Thu Dec 30 16:13:13 2010
@@ -20,7 +20,7 @@
 package org.apache.isis.core.metamodel.facets.object.notpersistable;
 
 import org.apache.isis.core.metamodel.facets.SingleValueFacet;
-import org.apache.isis.core.metamodel.interactions2.DisablingInteractionAdvisor;
+import org.apache.isis.core.metamodel.interactions.DisablingInteractionAdvisor;
 
 /**
  * Indicates that the instances of this class are not persistable either by the user (through the viewer) or at all

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propcoll/notpersisted/NotPersistedFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propcoll/notpersisted/NotPersistedFacet.java?rev=1053925&r1=1053924&r2=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propcoll/notpersisted/NotPersistedFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propcoll/notpersisted/NotPersistedFacet.java Thu Dec 30 16:13:13 2010
@@ -20,7 +20,7 @@
 package org.apache.isis.core.metamodel.facets.propcoll.notpersisted;
 
 import org.apache.isis.core.metamodel.facets.MarkerFacet;
-import org.apache.isis.core.metamodel.interactions2.DisablingInteractionAdvisor;
+import org.apache.isis.core.metamodel.interactions.DisablingInteractionAdvisor;
 
 /**
  * Indicates that a property or a collection shouldn't be persisted.

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/validate/mandatory/MandatoryFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/validate/mandatory/MandatoryFacet.java?rev=1053925&r1=1053924&r2=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/validate/mandatory/MandatoryFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/validate/mandatory/MandatoryFacet.java Thu Dec 30 16:13:13 2010
@@ -23,7 +23,7 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.MarkerFacet;
-import org.apache.isis.core.metamodel.interactions2.ValidatingInteractionAdvisor;
+import org.apache.isis.core.metamodel.interactions.ValidatingInteractionAdvisor;
 
 /**
  * Whether a property or a parameter is mandatory (not optional).

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/validate/maxlength/MaxLengthFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/validate/maxlength/MaxLengthFacet.java?rev=1053925&r1=1053924&r2=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/validate/maxlength/MaxLengthFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/validate/maxlength/MaxLengthFacet.java Thu Dec 30 16:13:13 2010
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.f
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.SingleIntValueFacet;
-import org.apache.isis.core.metamodel.interactions2.ValidatingInteractionAdvisor;
+import org.apache.isis.core.metamodel.interactions.ValidatingInteractionAdvisor;
 
 /**
  * Whether the (string) property or a parameter's length must not exceed a certain length.

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/AccessContext.java (from r1053850, 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?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/AccessContext.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/AccessContext.java&r1=1053850&r2=1053925&rev=1053925&view=diff
==============================================================================
    (empty)

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgumentContext.java (from r1053850, 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?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgumentContext.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgumentContext.java&r1=1053850&r2=1053925&rev=1053925&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 Thu Dec 30 16:13:13 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.metamodel.interactions;
 
-import static org.apache.isis.core.metamodel.adapter.AdapterUtils.unwrap;
+import static org.apache.isis.core.metamodel.adapter.util.AdapterUtils.unwrap;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.events.ActionArgumentEvent;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionInvocationContext.java (from r1053850, 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?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionInvocationContext.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionInvocationContext.java&r1=1053850&r2=1053925&rev=1053925&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 Thu Dec 30 16:13:13 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.metamodel.interactions;
 
-import static org.apache.isis.core.metamodel.adapter.AdapterUtils.unwrap;
+import static org.apache.isis.core.metamodel.adapter.util.AdapterUtils.unwrap;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.events.ActionInvocationEvent;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionUsabilityContext.java (from r1053850, 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?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionUsabilityContext.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionUsabilityContext.java&r1=1053850&r2=1053925&rev=1053925&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 Thu Dec 30 16:13:13 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.metamodel.interactions;
 
-import static org.apache.isis.core.metamodel.adapter.AdapterUtils.unwrap;
+import static org.apache.isis.core.metamodel.adapter.util.AdapterUtils.unwrap;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.events.ActionUsabilityEvent;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionVisibilityContext.java (from r1053850, 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?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionVisibilityContext.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionVisibilityContext.java&r1=1053850&r2=1053925&rev=1053925&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 Thu Dec 30 16:13:13 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.metamodel.interactions;
 
-import static org.apache.isis.core.metamodel.adapter.AdapterUtils.unwrap;
+import static org.apache.isis.core.metamodel.adapter.util.AdapterUtils.unwrap;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.events.ActionVisibilityEvent;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAccessContext.java (from r1053850, 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?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAccessContext.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAccessContext.java&r1=1053850&r2=1053925&rev=1053925&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 Thu Dec 30 16:13:13 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.metamodel.interactions;
 
-import static org.apache.isis.core.metamodel.adapter.AdapterUtils.unwrap;
+import static org.apache.isis.core.metamodel.adapter.util.AdapterUtils.unwrap;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.events.CollectionAccessEvent;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAddToContext.java (from r1053850, 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?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAddToContext.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAddToContext.java&r1=1053850&r2=1053925&rev=1053925&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 Thu Dec 30 16:13:13 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.metamodel.interactions;
 
-import static org.apache.isis.core.metamodel.adapter.AdapterUtils.unwrap;
+import static org.apache.isis.core.metamodel.adapter.util.AdapterUtils.unwrap;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.events.CollectionAddToEvent;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionRemoveFromContext.java (from r1053850, 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?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionRemoveFromContext.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionRemoveFromContext.java&r1=1053850&r2=1053925&rev=1053925&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 Thu Dec 30 16:13:13 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.metamodel.interactions;
 
-import static org.apache.isis.core.metamodel.adapter.AdapterUtils.unwrap;
+import static org.apache.isis.core.metamodel.adapter.util.AdapterUtils.unwrap;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.events.CollectionRemoveFromEvent;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionUsabilityContext.java (from r1053850, 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?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionUsabilityContext.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionUsabilityContext.java&r1=1053850&r2=1053925&rev=1053925&view=diff
==============================================================================
    (empty)

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionVisibilityContext.java (from r1053850, 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?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionVisibilityContext.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionVisibilityContext.java&r1=1053850&r2=1053925&rev=1053925&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 Thu Dec 30 16:13:13 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.metamodel.interactions;
 
-import static org.apache.isis.core.metamodel.adapter.AdapterUtils.unwrap;
+import static org.apache.isis.core.metamodel.adapter.util.AdapterUtils.unwrap;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.events.CollectionVisibilityEvent;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/DisablingInteractionAdvisor.java (from r1053850, 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?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/DisablingInteractionAdvisor.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/DisablingInteractionAdvisor.java&r1=1053850&r2=1053925&rev=1053925&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 Thu Dec 30 16:13:13 2010
@@ -21,7 +21,7 @@
 package org.apache.isis.core.metamodel.interactions;
 
 import org.apache.isis.applib.events.UsabilityEvent;
-import org.apache.isis.core.metamodel.consent.InteractionAdvisorFacet;
+import org.apache.isis.core.metamodel.facetapi.FacetAbstract.Disabling;
 
 
 /**
@@ -30,7 +30,7 @@ import org.apache.isis.core.metamodel.co
  * @see ValidatingInteractionAdvisor
  * @see HidingInteractionAdvisor
  */
-public interface DisablingInteractionAdvisor extends InteractionAdvisorFacet {
+public interface DisablingInteractionAdvisor extends InteractionAdvisorFacet, Disabling {
 
     /**
      * Whether the rule represented by this facet disables the member to which it applies.

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/HidingInteractionAdvisor.java (from r1053850, 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?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/HidingInteractionAdvisor.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/HidingInteractionAdvisor.java&r1=1053850&r2=1053925&rev=1053925&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 Thu Dec 30 16:13:13 2010
@@ -21,7 +21,7 @@
 package org.apache.isis.core.metamodel.interactions;
 
 import org.apache.isis.applib.events.VisibilityEvent;
-import org.apache.isis.core.metamodel.consent.InteractionAdvisorFacet;
+import org.apache.isis.core.metamodel.facetapi.FacetAbstract.Hiding;
 
 
 /**
@@ -30,7 +30,7 @@ import org.apache.isis.core.metamodel.co
  * @see DisablingInteractionAdvisor
  * @see ValidatingInteractionAdvisor
  */
-public interface HidingInteractionAdvisor extends InteractionAdvisorFacet {
+public interface HidingInteractionAdvisor extends InteractionAdvisorFacet, Hiding {
 
     /**
      * Whether the rule represented by this facet hides the member to which it applies.

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionAdvisorFacet.java (from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions2/InteractionAdvisorFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionAdvisorFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionAdvisorFacet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions2/InteractionAdvisorFacet.java&r1=1053871&r2=1053925&rev=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions2/InteractionAdvisorFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionAdvisorFacet.java Thu Dec 30 16:13:13 2010
@@ -18,12 +18,12 @@
  */
 
 
-package org.apache.isis.core.metamodel.interactions2;
+package org.apache.isis.core.metamodel.interactions;
 
-import org.apache.isis.core.metamodel.consent2.Allow;
-import org.apache.isis.core.metamodel.consent2.Consent;
-import org.apache.isis.core.metamodel.consent2.InteractionAdvisor;
-import org.apache.isis.core.metamodel.consent2.Veto;
+import org.apache.isis.core.metamodel.consent.Allow;
+import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent.InteractionAdvisor;
+import org.apache.isis.core.metamodel.consent.Veto;
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionContext.java (from r1053850, 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?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionContext.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionContext.java&r1=1053850&r2=1053925&rev=1053925&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 Thu Dec 30 16:13:13 2010
@@ -26,7 +26,7 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.consent.InteractionContextType;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
-import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facetapi.Facet;
 
 
 /**

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionUtils.java (from r1053850, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionUtils.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionUtils.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionUtils.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionUtils.java&r1=1053850&r2=1053925&rev=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionUtils.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionUtils.java Thu Dec 30 16:13:13 2010
@@ -22,9 +22,9 @@ package org.apache.isis.core.metamodel.i
 
 import org.apache.isis.core.metamodel.consent.InteractionResult;
 import org.apache.isis.core.metamodel.consent.InteractionResultSet;
-import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.facets.FacetFilters;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetFilters;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 
 
 public final class InteractionUtils {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectTitleContext.java (from r1053850, 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?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectTitleContext.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectTitleContext.java&r1=1053850&r2=1053925&rev=1053925&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 Thu Dec 30 16:13:13 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.metamodel.interactions;
 
-import static org.apache.isis.core.metamodel.adapter.AdapterUtils.unwrap;
+import static org.apache.isis.core.metamodel.adapter.util.AdapterUtils.unwrap;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.events.ObjectTitleEvent;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectValidityContext.java (from r1053850, 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?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectValidityContext.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectValidityContext.java&r1=1053850&r2=1053925&rev=1053925&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 Thu Dec 30 16:13:13 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.metamodel.interactions;
 
-import static org.apache.isis.core.metamodel.adapter.AdapterUtils.unwrap;
+import static org.apache.isis.core.metamodel.adapter.util.AdapterUtils.unwrap;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.events.ObjectValidityEvent;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ParseValueContext.java (from r1053850, 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?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ParseValueContext.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ParseValueContext.java&r1=1053850&r2=1053925&rev=1053925&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 Thu Dec 30 16:13:13 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.metamodel.interactions;
 
-import static org.apache.isis.core.metamodel.adapter.AdapterUtils.unwrap;
+import static org.apache.isis.core.metamodel.adapter.util.AdapterUtils.unwrap;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.events.ParseValueEvent;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyAccessContext.java (from r1053850, 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?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyAccessContext.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyAccessContext.java&r1=1053850&r2=1053925&rev=1053925&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 Thu Dec 30 16:13:13 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.metamodel.interactions;
 
-import static org.apache.isis.core.metamodel.adapter.AdapterUtils.unwrap;
+import static org.apache.isis.core.metamodel.adapter.util.AdapterUtils.unwrap;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.events.PropertyAccessEvent;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyModifyContext.java (from r1053850, 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?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyModifyContext.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyModifyContext.java&r1=1053850&r2=1053925&rev=1053925&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 Thu Dec 30 16:13:13 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.metamodel.interactions;
 
-import static org.apache.isis.core.metamodel.adapter.AdapterUtils.unwrap;
+import static org.apache.isis.core.metamodel.adapter.util.AdapterUtils.unwrap;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.events.PropertyModifyEvent;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyUsabilityContext.java (from r1053850, 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?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyUsabilityContext.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyUsabilityContext.java&r1=1053850&r2=1053925&rev=1053925&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 Thu Dec 30 16:13:13 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.metamodel.interactions;
 
-import static org.apache.isis.core.metamodel.adapter.AdapterUtils.unwrap;
+import static org.apache.isis.core.metamodel.adapter.util.AdapterUtils.unwrap;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.events.PropertyUsabilityEvent;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyVisibilityContext.java (from r1053850, 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?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyVisibilityContext.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyVisibilityContext.java&r1=1053850&r2=1053925&rev=1053925&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 Thu Dec 30 16:13:13 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.metamodel.interactions;
 
-import static org.apache.isis.core.metamodel.adapter.AdapterUtils.unwrap;
+import static org.apache.isis.core.metamodel.adapter.util.AdapterUtils.unwrap;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.events.PropertyVisibilityEvent;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ProposedHolder.java (from r1053850, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ProposedHolder.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ProposedHolder.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ProposedHolder.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ProposedHolder.java&r1=1053850&r2=1053925&rev=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ProposedHolder.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ProposedHolder.java Thu Dec 30 16:13:13 2010
@@ -21,7 +21,7 @@
 package org.apache.isis.core.metamodel.interactions;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facetapi.Facet;
 
 
 /**

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/UsabilityContext.java (from r1053850, 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?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/UsabilityContext.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/UsabilityContext.java&r1=1053850&r2=1053925&rev=1053925&view=diff
==============================================================================
    (empty)

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ValidatingInteractionAdvisor.java (from r1053850, 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?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ValidatingInteractionAdvisor.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ValidatingInteractionAdvisor.java&r1=1053850&r2=1053925&rev=1053925&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 Thu Dec 30 16:13:13 2010
@@ -21,9 +21,8 @@
 package org.apache.isis.core.metamodel.interactions;
 
 import org.apache.isis.applib.events.ValidityEvent;
-import org.apache.isis.core.metamodel.consent.InteractionAdvisorFacet;
-import org.apache.isis.core.metamodel.facets.Facet;
-
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetAbstract.Validating;
 
 /**
  * Mix-in interface for {@link Facet}s that can advise as to whether a proposed value is valid.
@@ -35,7 +34,7 @@ import org.apache.isis.core.metamodel.fa
  * @see DisablingInteractionAdvisor
  * @see HidingInteractionAdvisor
  */
-public interface ValidatingInteractionAdvisor extends InteractionAdvisorFacet {
+public interface ValidatingInteractionAdvisor extends InteractionAdvisorFacet, Validating {
 
     /**
      * Whether the validation represented by this facet passes or fails.

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ValidityContext.java (from r1053850, 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?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ValidityContext.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ValidityContext.java&r1=1053850&r2=1053925&rev=1053925&view=diff
==============================================================================
    (empty)

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/VisibilityContext.java (from r1053850, 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?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/VisibilityContext.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/VisibilityContext.java&r1=1053850&r2=1053925&rev=1053925&view=diff
==============================================================================
    (empty)

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/MemberLayoutArranger.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/MemberLayoutArranger.java?rev=1053925&r1=1053924&r2=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/MemberLayoutArranger.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/MemberLayoutArranger.java Thu Dec 30 16:13:13 2010
@@ -18,7 +18,7 @@ package org.apache.isis.core.metamodel.l
 
 import java.util.List;
 
-import org.apache.isis.core.metamodel.peer.FacetedMethod;
+import org.apache.isis.core.metamodel.facetedmethod.FacetedMethod;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
 public interface MemberLayoutArranger {

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/MemberLayoutArrangerComposite.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/MemberLayoutArrangerComposite.java?rev=1053925&r1=1053924&r2=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/MemberLayoutArrangerComposite.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/MemberLayoutArrangerComposite.java Thu Dec 30 16:13:13 2010
@@ -23,7 +23,7 @@ import org.apache.log4j.Logger;
 
 import com.google.inject.internal.Lists;
 
-import org.apache.isis.core.metamodel.peer.FacetedMethod;
+import org.apache.isis.core.metamodel.facetedmethod.FacetedMethod;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
 public abstract class MemberLayoutArrangerComposite implements MemberLayoutArranger {

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/DeweyOrderSet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/DeweyOrderSet.java?rev=1053925&r1=1053924&r2=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/DeweyOrderSet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/DeweyOrderSet.java Thu Dec 30 16:13:13 2010
@@ -28,9 +28,9 @@ import java.util.SortedSet;
 import java.util.TreeMap;
 import java.util.TreeSet;
 
+import org.apache.isis.core.metamodel.facetedmethod.FacetedMethod;
 import org.apache.isis.core.metamodel.facets.ordering.MemberOrderFacet;
 import org.apache.isis.core.metamodel.layout.OrderSet;
-import org.apache.isis.core.metamodel.peer.FacetedMethod;
 
 
 /**

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/MemberIdentifierComparator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/MemberIdentifierComparator.java?rev=1053925&r1=1053924&r2=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/MemberIdentifierComparator.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/MemberIdentifierComparator.java Thu Dec 30 16:13:13 2010
@@ -24,7 +24,7 @@ import java.io.Serializable;
 import java.util.Comparator;
 
 import org.apache.isis.applib.Identifier;
-import org.apache.isis.core.metamodel.peer.FacetedMethod;
+import org.apache.isis.core.metamodel.facetedmethod.FacetedMethod;
 
 
 /**

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/MemberLayoutArrangerUsingMemberOrderFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/MemberLayoutArrangerUsingMemberOrderFacet.java?rev=1053925&r1=1053924&r2=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/MemberLayoutArrangerUsingMemberOrderFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/MemberLayoutArrangerUsingMemberOrderFacet.java Thu Dec 30 16:13:13 2010
@@ -20,9 +20,9 @@ import java.util.List;
 
 import org.apache.log4j.Logger;
 
+import org.apache.isis.core.metamodel.facetedmethod.FacetedMethod;
 import org.apache.isis.core.metamodel.layout.MemberLayoutArranger;
 import org.apache.isis.core.metamodel.layout.OrderSet;
-import org.apache.isis.core.metamodel.peer.FacetedMethod;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
 public class MemberLayoutArrangerUsingMemberOrderFacet implements MemberLayoutArranger {

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/MemberOrderComparator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/MemberOrderComparator.java?rev=1053925&r1=1053924&r2=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/MemberOrderComparator.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/MemberOrderComparator.java Thu Dec 30 16:13:13 2010
@@ -24,9 +24,9 @@ import java.util.Comparator;
 import java.util.StringTokenizer;
 
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facetedmethod.FacetedMethod;
 import org.apache.isis.core.metamodel.facets.ordering.MemberOrderFacet;
 import org.apache.isis.core.metamodel.layout.OrderSet;
-import org.apache.isis.core.metamodel.peer.FacetedMethod;
 
 
 /**

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/ordermethod/MemberLayoutArrangerUsingOrderMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/ordermethod/MemberLayoutArrangerUsingOrderMethod.java?rev=1053925&r1=1053924&r2=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/ordermethod/MemberLayoutArrangerUsingOrderMethod.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/ordermethod/MemberLayoutArrangerUsingOrderMethod.java Thu Dec 30 16:13:13 2010
@@ -26,11 +26,11 @@ import org.apache.log4j.Logger;
 import org.apache.isis.core.commons.lang.JavaClassUtils;
 import org.apache.isis.core.commons.lang.StringUtils;
 import org.apache.isis.core.metamodel.facetapi.MethodScope;
+import org.apache.isis.core.metamodel.facetedmethod.FacetedMethod;
+import org.apache.isis.core.metamodel.facetedmethod.MethodFinderUtils;
 import org.apache.isis.core.metamodel.facets.ordering.actionorder.ActionOrderFacet;
 import org.apache.isis.core.metamodel.layout.MemberLayoutArranger;
 import org.apache.isis.core.metamodel.layout.OrderSet;
-import org.apache.isis.core.metamodel.peer.FacetedMethod;
-import org.apache.isis.core.metamodel.peer.MethodFinderUtils;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
 public class MemberLayoutArrangerUsingOrderMethod implements MemberLayoutArranger {

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/ordermethod/SimpleOrderSet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/ordermethod/SimpleOrderSet.java?rev=1053925&r1=1053924&r2=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/ordermethod/SimpleOrderSet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/ordermethod/SimpleOrderSet.java Thu Dec 30 16:13:13 2010
@@ -24,8 +24,8 @@ import java.util.List;
 import java.util.StringTokenizer;
 
 import org.apache.isis.core.commons.lang.NameUtils;
+import org.apache.isis.core.metamodel.facetedmethod.FacetedMethod;
 import org.apache.isis.core.metamodel.layout.OrderSet;
-import org.apache.isis.core.metamodel.peer.FacetedMethod;
 
 
 public class SimpleOrderSet extends OrderSet {

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorAbstract.java?rev=1053925&r1=1053924&r2=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorAbstract.java Thu Dec 30 16:13:13 2010
@@ -37,7 +37,7 @@ import org.apache.isis.applib.DomainObje
 import org.apache.isis.core.commons.ensure.Assert;
 import org.apache.isis.core.commons.lang.CastUtils;
 import org.apache.isis.core.commons.lang.ToString;
-import org.apache.isis.core.metamodel.exceptions.ReflectionException;
+import org.apache.isis.core.metamodel.exceptions.MetaModelException;
 
 
 public abstract class ServicesInjectorAbstract implements ServicesInjector {
@@ -164,19 +164,19 @@ public abstract class ServicesInjectorAb
         try {
             method.invoke(target, parameters);
         } catch (final SecurityException e) {
-            throw new ReflectionException(String.format("Cannot access the %s method in %s", method.getName(), target.getClass()
+            throw new MetaModelException(String.format("Cannot access the %s method in %s", method.getName(), target.getClass()
                     .getName()));
         } catch (final IllegalArgumentException e1) {
-            throw new ReflectionException(e1);
+            throw new MetaModelException(e1);
         } catch (final IllegalAccessException e1) {
-            throw new ReflectionException(String.format("Cannot access the %s method in %s", method.getName(), target.getClass()
+            throw new MetaModelException(String.format("Cannot access the %s method in %s", method.getName(), target.getClass()
                     .getName()));
         } catch (final InvocationTargetException e) {
             final Throwable targetException = e.getTargetException();
             if (targetException instanceof RuntimeException) {
                 throw (RuntimeException) targetException;
             } else {
-                throw new ReflectionException(targetException);
+                throw new MetaModelException(targetException);
             }
         }
     }

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java?rev=1053925&r1=1053924&r2=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java Thu Dec 30 16:13:13 2010
@@ -46,7 +46,7 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSessionProvider;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSessionProviderAware;
-import org.apache.isis.core.metamodel.consent2.InteractionResult;
+import org.apache.isis.core.metamodel.consent.InteractionResult;
 import org.apache.isis.core.metamodel.services.container.query.QueryFindByPattern;
 import org.apache.isis.core.metamodel.services.container.query.QueryFindByTitle;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/DomainModelException.java (from r1053850, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/ModelException.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/DomainModelException.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/DomainModelException.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/ModelException.java&r1=1053850&r2=1053925&rev=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/ModelException.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/DomainModelException.java Thu Dec 30 16:13:13 2010
@@ -17,29 +17,29 @@
  *  under the License.
  */
 
-package org.apache.isis.core.metamodel.exceptions;
+package org.apache.isis.core.metamodel.spec;
 
 import org.apache.isis.core.commons.exceptions.IsisException;
 
 /**
  * Thrown when a problem is found with the domain model, and Isis cannot proceed.
  */
-public class ModelException extends IsisException {
+public class DomainModelException extends IsisException {
     private static final long serialVersionUID = 1L;
 
-    public ModelException() {
+    public DomainModelException() {
         super();
     }
 
-    public ModelException(final String message) {
+    public DomainModelException(final String message) {
         super(message);
     }
 
-    public ModelException(final Throwable cause) {
+    public DomainModelException(final Throwable cause) {
         super(cause);
     }
 
-    public ModelException(final String message, final Throwable cause) {
+    public DomainModelException(final String message, final Throwable cause) {
         super(message, cause);
     }
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectActionSet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectActionSet.java?rev=1053925&r1=1053924&r2=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectActionSet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectActionSet.java Thu Dec 30 16:13:13 2010
@@ -28,15 +28,15 @@ import org.apache.isis.core.commons.exce
 import org.apache.isis.core.commons.filters.Filter;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.consent2.Allow;
-import org.apache.isis.core.metamodel.consent2.Consent;
-import org.apache.isis.core.metamodel.consent2.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.consent.Allow;
+import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facetapi.MultiTypedFacet;
-import org.apache.isis.core.metamodel.interactions2.ActionInvocationContext;
-import org.apache.isis.core.metamodel.interactions2.UsabilityContext;
-import org.apache.isis.core.metamodel.interactions2.VisibilityContext;
+import org.apache.isis.core.metamodel.interactions.ActionInvocationContext;
+import org.apache.isis.core.metamodel.interactions.UsabilityContext;
+import org.apache.isis.core.metamodel.interactions.VisibilityContext;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectInstantiator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectInstantiator.java?rev=1053925&r1=1053924&r2=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectInstantiator.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectInstantiator.java Thu Dec 30 16:13:13 2010
@@ -17,7 +17,7 @@
 package org.apache.isis.core.metamodel.spec;
 
 import org.apache.isis.core.commons.components.Injectable;
-import org.apache.isis.core.metamodel.specloader.internal.spec.dflt.ObjectSpecificationDefault;
+import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
 
 public interface ObjectInstantiator extends Injectable {
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java?rev=1053925&r1=1053924&r2=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java Thu Dec 30 16:13:13 2010
@@ -22,13 +22,16 @@ package org.apache.isis.core.metamodel.s
 
 
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
+import com.google.common.base.Function;
+
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.consent2.Consent;
-import org.apache.isis.core.metamodel.consent2.InteractionInvocationMethod;
-import org.apache.isis.core.metamodel.consent2.InteractionResult;
+import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.consent.InteractionResult;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.facets.hide.HiddenFacet;
 import org.apache.isis.core.metamodel.facets.naming.describedas.DescribedAsFacet;
@@ -42,9 +45,9 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;
 import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
 import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
-import org.apache.isis.core.metamodel.interactions2.InteractionContext;
-import org.apache.isis.core.metamodel.interactions2.ObjectTitleContext;
-import org.apache.isis.core.metamodel.interactions2.ObjectValidityContext;
+import org.apache.isis.core.metamodel.interactions.InteractionContext;
+import org.apache.isis.core.metamodel.interactions.ObjectTitleContext;
+import org.apache.isis.core.metamodel.interactions.ObjectValidityContext;
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionContainer;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationContainer;
 
@@ -64,6 +67,25 @@ import org.apache.isis.core.metamodel.sp
 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(ObjectSpecification from) {
+            return from.getFullIdentifier();
+        }};
+    public final static Comparator<ObjectSpecification> COMPARATOR_FULLY_QUALIFIED_CLASS_NAME = new Comparator<ObjectSpecification>() {
+    @Override
+    public int compare(ObjectSpecification o1,
+            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());
+        }
+    };
 
 
     /**

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationLoader.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationLoader.java?rev=1053925&r1=1053924&r2=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationLoader.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationLoader.java Thu Dec 30 16:13:13 2010
@@ -20,6 +20,7 @@
 
 package org.apache.isis.core.metamodel.spec;
 
+import java.util.Collection;
 import java.util.List;
 
 import org.apache.isis.core.commons.components.ApplicationScopedComponent;
@@ -28,7 +29,7 @@ import org.apache.isis.core.commons.debu
 
 public interface SpecificationLoader extends ApplicationScopedComponent, DebugInfo, SpecificationLookup {
 
-    ObjectSpecification[] allSpecifications();
+    Collection<ObjectSpecification> allSpecifications();
 
     /**
      * @see #loadSpecification(String)

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java?rev=1053925&r1=1053924&r2=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java Thu Dec 30 16:13:13 2010
@@ -25,10 +25,10 @@ import java.util.List;
 import org.apache.isis.core.commons.filters.Filter;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.consent2.Consent;
-import org.apache.isis.core.metamodel.consent2.InteractionInvocationMethod;
-import org.apache.isis.core.metamodel.interactions2.AccessContext;
-import org.apache.isis.core.metamodel.interactions2.ActionInvocationContext;
+import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.interactions.AccessContext;
+import org.apache.isis.core.metamodel.interactions.ActionInvocationContext;
 import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.Target;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java?rev=1053925&r1=1053924&r2=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java Thu Dec 30 16:13:13 2010
@@ -22,8 +22,8 @@ package org.apache.isis.core.metamodel.s
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.consent2.InteractionInvocationMethod;
-import org.apache.isis.core.metamodel.interactions2.ActionArgumentContext;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.interactions.ActionArgumentContext;
 
 /**
  * Analogous to {@link ObjectAssociation}.

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFilters.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFilters.java?rev=1053925&r1=1053924&r2=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFilters.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFilters.java Thu Dec 30 16:13:13 2010
@@ -24,7 +24,7 @@ import org.apache.isis.core.commons.filt
 import org.apache.isis.core.commons.filters.Filter;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.consent.Consent;
 
 
 public class ObjectAssociationFilters {

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java?rev=1053925&r1=1053924&r2=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java Thu Dec 30 16:13:13 2010
@@ -22,13 +22,13 @@ package org.apache.isis.core.metamodel.s
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.consent2.Consent;
-import org.apache.isis.core.metamodel.consent2.InteractionContextType;
-import org.apache.isis.core.metamodel.consent2.InteractionInvocationMethod;
-import org.apache.isis.core.metamodel.interactions2.AccessContext;
-import org.apache.isis.core.metamodel.interactions2.InteractionContext;
-import org.apache.isis.core.metamodel.interactions2.UsabilityContext;
-import org.apache.isis.core.metamodel.interactions2.VisibilityContext;
+import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent.InteractionContextType;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.interactions.AccessContext;
+import org.apache.isis.core.metamodel.interactions.InteractionContext;
+import org.apache.isis.core.metamodel.interactions.UsabilityContext;
+import org.apache.isis.core.metamodel.interactions.VisibilityContext;
 
 
 /**

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToManyAssociation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToManyAssociation.java?rev=1053925&r1=1053924&r2=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToManyAssociation.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToManyAssociation.java Thu Dec 30 16:13:13 2010
@@ -22,11 +22,11 @@ package org.apache.isis.core.metamodel.s
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.consent2.Consent;
-import org.apache.isis.core.metamodel.consent2.InteractionInvocationMethod;
-import org.apache.isis.core.metamodel.interactions2.AccessContext;
-import org.apache.isis.core.metamodel.interactions2.InteractionContext;
-import org.apache.isis.core.metamodel.interactions2.ValidityContext;
+import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.interactions.AccessContext;
+import org.apache.isis.core.metamodel.interactions.InteractionContext;
+import org.apache.isis.core.metamodel.interactions.ValidityContext;
 
 
 public interface OneToManyAssociation extends ObjectAssociation, OneToManyFeature {

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToOneAssociation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToOneAssociation.java?rev=1053925&r1=1053924&r2=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToOneAssociation.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToOneAssociation.java Thu Dec 30 16:13:13 2010
@@ -22,12 +22,12 @@ package org.apache.isis.core.metamodel.s
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.consent2.Consent;
-import org.apache.isis.core.metamodel.consent2.InteractionInvocationMethod;
-import org.apache.isis.core.metamodel.interactions2.AccessContext;
-import org.apache.isis.core.metamodel.interactions2.InteractionContext;
-import org.apache.isis.core.metamodel.interactions2.PropertyAccessContext;
-import org.apache.isis.core.metamodel.interactions2.ValidityContext;
+import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.interactions.AccessContext;
+import org.apache.isis.core.metamodel.interactions.InteractionContext;
+import org.apache.isis.core.metamodel.interactions.PropertyAccessContext;
+import org.apache.isis.core.metamodel.interactions.ValidityContext;
 
 
 /**

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java?rev=1053925&r1=1053924&r2=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java Thu Dec 30 16:13:13 2010
@@ -25,9 +25,8 @@ import static org.hamcrest.CoreMatchers.
 import static org.hamcrest.CoreMatchers.notNullValue;
 
 import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Set;
 
@@ -67,15 +66,15 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutor;
 import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
 import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistryDefault;
-import org.apache.isis.core.metamodel.specloader.internal.cache.SimpleSpecificationCache;
-import org.apache.isis.core.metamodel.specloader.internal.cache.SpecificationCache;
-import org.apache.isis.core.metamodel.specloader.internal.facetprocessor.FacetProcessor;
-import org.apache.isis.core.metamodel.specloader.internal.spec.CreateObjectContext;
-import org.apache.isis.core.metamodel.specloader.internal.spec.FacetedMethodsBuilderContext;
-import org.apache.isis.core.metamodel.specloader.internal.spec.IntrospectionContext;
-import org.apache.isis.core.metamodel.specloader.internal.spec.ObjectSpecificationAbstract;
-import org.apache.isis.core.metamodel.specloader.internal.spec.dflt.ObjectSpecificationDefault;
-import org.apache.isis.core.metamodel.specloader.internal.spec.objectlist.ObjectSpecificationForObjectList;
+import org.apache.isis.core.metamodel.specloader.facetprocessor.FacetProcessor;
+import org.apache.isis.core.metamodel.specloader.speccache.SpecificationCache;
+import org.apache.isis.core.metamodel.specloader.speccache.SpecificationCacheDefault;
+import org.apache.isis.core.metamodel.specloader.specimpl.CreateObjectContext;
+import org.apache.isis.core.metamodel.specloader.specimpl.FacetedMethodsBuilderContext;
+import org.apache.isis.core.metamodel.specloader.specimpl.IntrospectionContext;
+import org.apache.isis.core.metamodel.specloader.specimpl.ObjectSpecificationAbstract;
+import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
+import org.apache.isis.core.metamodel.specloader.specimpl.objectlist.ObjectSpecificationForObjectList;
 import org.apache.isis.core.metamodel.specloader.traverser.SpecificationTraverser;
 import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
 
@@ -115,8 +114,7 @@ import org.apache.isis.core.metamodel.sp
  */
 
 public class ObjectReflectorDefault implements ObjectReflector, DebugInfo {
-
-    @SuppressWarnings("unused")
+
     private final static Logger LOG = Logger.getLogger(ObjectReflectorDefault.class);
 
 
@@ -223,7 +221,7 @@ public class ObjectReflectorDefault impl
         this.facetProcessor = new FacetProcessor(configuration, this,
                 collectionTypeRegistry, programmingModel);
         
-        this.cache = new SimpleSpecificationCache();
+        this.cache = new SpecificationCacheDefault();
     }
 
     @Override
@@ -297,7 +295,7 @@ public class ObjectReflectorDefault impl
     private List<Class<?>> newlyDiscoveredClasses() {
         List<Class<?>> newlyDiscoveredClasses = new ArrayList<Class<?>>();
         
-        ObjectSpecification[] noSpecs = allSpecifications();
+        Collection<ObjectSpecification> noSpecs = allSpecifications();
         try {
             for(ObjectSpecification noSpec: noSpecs) {
                 getSpecificationTraverser().traverseReferencedClasses(noSpec, newlyDiscoveredClasses);
@@ -461,7 +459,7 @@ public class ObjectReflectorDefault impl
      * Return all the loaded specifications.
      */
     @Override
-    public ObjectSpecification[] allSpecifications() {
+    public Collection<ObjectSpecification> allSpecifications() {
         return getCache().allSpecifications();
     }
 
@@ -528,33 +526,26 @@ public class ObjectReflectorDefault impl
         str.appendln();
 
         str.appendTitle("Specifications");
-        final ObjectSpecification[] specs = allSpecifications();
-        Arrays.sort(specs, new Comparator<ObjectSpecification>() {
-            @Override
-            public int compare(final ObjectSpecification s1,
-                    final ObjectSpecification s2) {
-                return s1.getShortIdentifier().compareToIgnoreCase(s2.getShortIdentifier());
-            }
-        });
-        for (int i = 0; i < specs.length; i++) {
-            final ObjectSpecification specification = specs[i];
-            str.append(specification.isAbstract() ? "A" : ".");
-            str.append(specification.isService() ? "S" : ".");
-            str.append(SpecificationFacets.isBoundedSet(specification) ? "B"
-                    : ".");
-            str.append(specification.isCollection() ? "C" : ".");
-            str.append(specification.isNotCollection() ? "O" : ".");
+        final List<ObjectSpecification> specs = Lists.newArrayList(allSpecifications());
+        Collections.sort(specs, ObjectSpecification.COMPARATOR_SHORT_IDENTIFIER_IGNORE_CASE);
+        for (ObjectSpecification spec : specs) {
+            str.append(spec.isAbstract() ? "A" : ".");
+            str.append(spec.isService() ? "S" : ".");
+            str.append(SpecificationFacets.isBoundedSet(spec) ? "B"
+                : ".");
+            str.append(spec.isCollection() ? "C" : ".");
+            str.append(spec.isNotCollection() ? "O" : ".");
             str.append("."); // placeholder for future support of maps
-            str.append(specification.isParseable() ? "P" : ".");
-            str.append(specification.isEncodeable() ? "E" : ".");
-            str.append(specification.isValueOrIsAggregated() ? "A" : ".");
-            str.append(!specification.isCollectionOrIsAggregated() ? "I" : ".");
+            str.append(spec.isParseable() ? "P" : ".");
+            str.append(spec.isEncodeable() ? "E" : ".");
+            str.append(spec.isValueOrIsAggregated() ? "A" : ".");
+            str.append(!spec.isCollectionOrIsAggregated() ? "I" : ".");
             str.append("  ");
-            str.append(specification.getShortIdentifier());
+            str.append(spec.getShortIdentifier());
             str.append("  [fqc=");
-            str.append(specification.getFullIdentifier());
+            str.append(spec.getFullIdentifier());
             str.append(",type=");
-            str.append(specification.getClass().getName());
+            str.append(spec.getClass().getName());
             str.appendln("]");
         }
     }

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java (from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/facetprocessor/FacetProcessor.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/facetprocessor/FacetProcessor.java&r1=1053871&r2=1053925&rev=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/facetprocessor/FacetProcessor.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java Thu Dec 30 16:13:13 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.specloader.internal.facetprocessor;
+package org.apache.isis.core.metamodel.specloader.facetprocessor;
 
 import static org.apache.isis.core.commons.ensure.Ensure.ensureThatState;
 import static org.hamcrest.CoreMatchers.is;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/speccache/SpecificationCache.java (from r1053850, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/cache/SpecificationCache.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/speccache/SpecificationCache.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/speccache/SpecificationCache.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/cache/SpecificationCache.java&r1=1053850&r2=1053925&rev=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/cache/SpecificationCache.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/speccache/SpecificationCache.java Thu Dec 30 16:13:13 2010
@@ -18,8 +18,10 @@
  */
 
 
-package org.apache.isis.core.metamodel.specloader.internal.cache;
+package org.apache.isis.core.metamodel.specloader.speccache;
 
+import java.util.Collection;
+
 import org.apache.isis.core.commons.components.ApplicationScopedComponent;
 import org.apache.isis.core.commons.components.SessionScopedComponent;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -45,7 +47,7 @@ public interface SpecificationCache {
      */
     ObjectSpecification get(String className);
 
-    ObjectSpecification[] allSpecifications();
+    Collection<ObjectSpecification> allSpecifications();
 
     void cache(String className, ObjectSpecification spec);
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/speccache/SpecificationCacheDefault.java (from r1053850, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/cache/SimpleSpecificationCache.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/speccache/SpecificationCacheDefault.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/speccache/SpecificationCacheDefault.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/cache/SimpleSpecificationCache.java&r1=1053850&r2=1053925&rev=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/cache/SimpleSpecificationCache.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/speccache/SpecificationCacheDefault.java Thu Dec 30 16:13:13 2010
@@ -18,38 +18,38 @@
  */
 
 
-package org.apache.isis.core.metamodel.specloader.internal.cache;
+package org.apache.isis.core.metamodel.specloader.speccache;
 
-import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+
+import com.google.inject.internal.Maps;
 
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
 
-public class SimpleSpecificationCache implements SpecificationCache {
-    private final Hashtable specs = new Hashtable();
+public class SpecificationCacheDefault implements SpecificationCache {
+    private final Map<String,ObjectSpecification> specByClassName = Maps.newHashMap();
 
+    @Override
     public ObjectSpecification get(final String className) {
-        return (ObjectSpecification) specs.get(className);
+        return specByClassName.get(className);
     }
 
+    @Override
     public void cache(final String className, final ObjectSpecification spec) {
-        specs.put(className, spec);
+        specByClassName.put(className, spec);
     }
 
+    @Override
     public void clear() {
-        specs.clear();
+        specByClassName.clear();
     }
 
-    public ObjectSpecification[] allSpecifications() {
-        final int size = specs.size();
-        final ObjectSpecification[] cls = new ObjectSpecification[size];
-        final Enumeration e = specs.elements();
-        int i = 0;
-        while (e.hasMoreElements()) {
-            cls[i++] = (ObjectSpecification) e.nextElement();
-        }
-        return cls;
+    @Override
+    public Collection<ObjectSpecification> allSpecifications() {
+        return Collections.unmodifiableCollection(specByClassName.values());
     }
 
 }



Mime
View raw message