incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1053871 [9/22] - in /incubator/isis/trunk: alternatives/bytecode/javassist/src/main/java/org/apache/isis/alternatives/bytecode/javassist/classsubstitutor/ alternatives/bytecode/javassist/src/main/java/org/apache/isis/alternatives/bytecode/...
Date Thu, 30 Dec 2010 12:30:25 GMT
Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/consent/InteractionResultTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/consent/InteractionResultTest.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/consent/InteractionResultTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/consent/InteractionResultTest.java Thu Dec 30 12:29:53 2010
@@ -27,6 +27,9 @@ import static org.junit.Assert.assertTru
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+
+import org.apache.isis.core.metamodel.consent2.InteractionResult;
+import org.apache.isis.core.metamodel.interactions2.InteractionAdvisorFacet;
 
 
 public class InteractionResultTest {

Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/FacetAbstractTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/FacetAbstractTest.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/FacetAbstractTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/FacetAbstractTest.java Thu Dec 30 12:29:53 2010
@@ -22,8 +22,10 @@ package org.apache.isis.core.metamodel.f
 
 import junit.framework.TestCase;
 
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.ObjectNoop;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
 
 
 public class FacetAbstractTest extends TestCase {
@@ -77,48 +79,5 @@ public class FacetAbstractTest extends T
         assertEquals("FacetAbstractTest$ConcreteFacet[type=FacetAbstractTest$FooFacet]", fooFacet.toString());
     }
 
-    public void testUnwrapObjectWhenNull() {
-        assertNull(fooFacet.unwrapObject(null));
-    }
-
-    public void testUnwrapObjectWhenNotNull() {
-        final Object underlyingDomainObject = new Object();
-        final ObjectAdapter adapter = new ObjectNoop() {
-            @Override
-            public Object getObject() {
-                return underlyingDomainObject;
-            }
-
-        };
-
-        assertEquals(underlyingDomainObject, fooFacet.unwrapObject(adapter));
-    }
-
-    public void testUnwrapStringWhenNull() {
-        assertNull(fooFacet.unwrapString(null));
-    }
-
-    public void testUnwrapStringWhenNotNullButNotString() {
-        final Object underlyingDomainObject = new Object();
-        final ObjectAdapter adapter = new ObjectNoop() {
-            @Override
-            public Object getObject() {
-                return underlyingDomainObject;
-            }
-        };
-        assertNull(fooFacet.unwrapString(adapter));
-    }
-
-    public void testUnwrapStringWhenNotNullAndString() {
-        final String underlyingDomainObject = "huzzah";
-        final ObjectAdapter adapter = new ObjectNoop() {
-            @Override
-            public Object getObject() {
-                return underlyingDomainObject;
-            }
-        };
-        assertEquals("huzzah", fooFacet.unwrapString(adapter));
-    }
-
 }
 

Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/FacetFiltersTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/FacetFiltersTest.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/FacetFiltersTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/FacetFiltersTest.java Thu Dec 30 12:29:53 2010
@@ -24,6 +24,11 @@ import junit.framework.TestCase;
 
 import org.apache.isis.core.commons.filters.Filter;
 import org.apache.isis.core.commons.filters.Filters;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
+import org.apache.isis.core.metamodel.facetapi.FacetFilters;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
 
 
 public class FacetFiltersTest extends TestCase {

Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/FacetHolderNoop.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/FacetHolderNoop.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/FacetHolderNoop.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/FacetHolderNoop.java Thu Dec 30 12:29:53 2010
@@ -22,6 +22,9 @@ package org.apache.isis.core.metamodel.f
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.commons.filters.Filter;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.MultiTypedFacet;
 
 
 /**

Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/java5/ImperativeFacetUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/java5/ImperativeFacetUtilsTest.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/java5/ImperativeFacetUtilsTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/java5/ImperativeFacetUtilsTest.java Thu Dec 30 12:29:53 2010
@@ -37,7 +37,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.apache.isis.core.commons.filters.Filter;
-import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facets.ImperativeFacet;
 import org.apache.isis.core.metamodel.facets.ImperativeFacetUtils;
 import org.apache.isis.core.metamodel.facets.ImperativeFacetUtils.ImperativeFacetFlags;

Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/runtimecontext/spec/feature/ObjectAssociationAbstractTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/runtimecontext/spec/feature/ObjectAssociationAbstractTest.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/runtimecontext/spec/feature/ObjectAssociationAbstractTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/runtimecontext/spec/feature/ObjectAssociationAbstractTest.java Thu Dec 30 12:29:53 2010
@@ -27,23 +27,26 @@ import org.jmock.Expectations;
 import org.jmock.Mockery;
 import org.jmock.integration.junit4.JMock;
 import org.jmock.integration.junit4.JUnit4Mockery;
+import org.jmock.lib.legacy.ClassImposteriser;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import org.apache.isis.core.metamodel.adapter.Instance;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
-import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.consent2.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facets.hide.HiddenFacet;
 import org.apache.isis.core.metamodel.facets.propcoll.notpersisted.NotPersistedFacet;
 import org.apache.isis.core.metamodel.facets.properties.choices.PropertyChoicesFacet;
 import org.apache.isis.core.metamodel.facets.propparam.validate.mandatory.MandatoryFacet;
-import org.apache.isis.core.metamodel.feature.FeatureType;
-import org.apache.isis.core.metamodel.interactions.UsabilityContext;
-import org.apache.isis.core.metamodel.interactions.VisibilityContext;
-import org.apache.isis.core.metamodel.spec.identifier.IdentifiedImpl;
+import org.apache.isis.core.metamodel.interactions2.UsabilityContext;
+import org.apache.isis.core.metamodel.interactions2.VisibilityContext;
+import org.apache.isis.core.metamodel.peer.FacetedMethod;
+import org.apache.isis.core.metamodel.peer.ObjectAssociationAbstract;
+import org.apache.isis.core.metamodel.spec.Instance;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMemberContext;
 import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
 
 
@@ -51,15 +54,23 @@ import org.apache.isis.core.metamodel.te
 public class ObjectAssociationAbstractTest {
 
     private ObjectAssociationAbstract objectAssociation;
-    private IdentifiedImpl facetHolder;
+    private FacetedMethod facetedMethod;
     
-    private Mockery context = new JUnit4Mockery();
-
+    private Mockery context = new JUnit4Mockery() {{
+        setImposteriser(ClassImposteriser.INSTANCE);
+    }};
+
+    public static class Customer {
+        private String firstName;
+        public String getFirstName() {
+            return firstName;
+        }
+    }
     @Before
     public void setup() {
-        facetHolder = new IdentifiedImpl();
-        objectAssociation = new ObjectAssociationAbstract("id", new TestProxySpecification("test"),
-            FeatureType.PROPERTY, facetHolder, null, null, null, null) {
+        facetedMethod = FacetedMethod.createProperty(Customer.class, "firstName");
+        objectAssociation = new ObjectAssociationAbstract(facetedMethod, FeatureType.PROPERTY,
+            new TestProxySpecification("test"), new ObjectMemberContext(null, null, null, null)) {
 
             @Override
             public ObjectAdapter get(ObjectAdapter fromObject) {
@@ -116,14 +127,14 @@ public class ObjectAssociationAbstractTe
     public void notPersistedWhenDerived() throws Exception {
     	// TODO: ISIS-5, need to reinstate DerivedFacet
         final NotPersistedFacet mockFacet = mockFacetIgnoring(NotPersistedFacet.class);
-		facetHolder.addFacet(mockFacet);
+		facetedMethod.addFacet(mockFacet);
         assertTrue(objectAssociation.isNotPersisted());
     }
 
     @Test
     public void notPersistedWhenFlaggedAsNotPersisted() throws Exception {
     	NotPersistedFacet mockFacet = mockFacetIgnoring(NotPersistedFacet.class);
-        facetHolder.addFacet(mockFacet);
+        facetedMethod.addFacet(mockFacet);
         assertTrue(objectAssociation.isNotPersisted());
     }
 
@@ -140,7 +151,7 @@ public class ObjectAssociationAbstractTe
     @Test
     public void hidden() throws Exception {
     	HiddenFacet mockFacet = mockFacetIgnoring(HiddenFacet.class);
-        facetHolder.addFacet(mockFacet);
+        facetedMethod.addFacet(mockFacet);
         assertTrue(objectAssociation.isAlwaysHidden());
     }
 
@@ -152,7 +163,7 @@ public class ObjectAssociationAbstractTe
     @Test
     public void mandatory() throws Exception {
     	MandatoryFacet mockFacet = mockFacetIgnoring(MandatoryFacet.class);
-        facetHolder.addFacet(mockFacet);
+        facetedMethod.addFacet(mockFacet);
         assertTrue(objectAssociation.isMandatory());
     }
 
@@ -164,7 +175,7 @@ public class ObjectAssociationAbstractTe
     @Test
     public void hasChoices() throws Exception {
     	PropertyChoicesFacet mockFacet = mockFacetIgnoring(PropertyChoicesFacet.class);
-        facetHolder.addFacet(mockFacet);
+        facetedMethod.addFacet(mockFacet);
         assertTrue(objectAssociation.hasChoices());
     }
 

Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/feature/ActionTargetTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/feature/ActionTargetTest.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/feature/ActionTargetTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/feature/ActionTargetTest.java Thu Dec 30 12:29:53 2010
@@ -20,6 +20,8 @@
 
 package org.apache.isis.core.metamodel.spec.feature;
 
+import org.apache.isis.core.metamodel.spec.ActionType;
+
 import junit.framework.TestCase;
 
 
@@ -30,11 +32,11 @@ public class ActionTargetTest extends Te
     }
 
     public void testEquals() {
-        assertTrue(ObjectActionType.EXPLORATION.equals(ObjectActionType.EXPLORATION));
+        assertTrue(ActionType.EXPLORATION.equals(ActionType.EXPLORATION));
     }
 
     public void testHashCode() {
-        assertEquals(ObjectActionType.EXPLORATION.hashCode(), ObjectActionType.EXPLORATION.hashCode());
+        assertEquals(ActionType.EXPLORATION.hashCode(), ActionType.EXPLORATION.hashCode());
     }
 
 }

Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/identifier/IdentifiedImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/identifier/IdentifiedImpl.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/identifier/IdentifiedImpl.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/identifier/IdentifiedImpl.java Thu Dec 30 12:29:53 2010
@@ -21,8 +21,8 @@
 package org.apache.isis.core.metamodel.spec.identifier;
 
 import org.apache.isis.applib.Identifier;
-import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
-import org.apache.isis.core.metamodel.feature.IdentifiedHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
+import org.apache.isis.core.metamodel.facetapi.IdentifiedHolder;
 
 public class IdentifiedImpl extends FacetHolderImpl implements IdentifiedHolder {
 

Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/TestProxySpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/TestProxySpecification.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/TestProxySpecification.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/TestProxySpecification.java Thu Dec 30 12:29:53 2010
@@ -33,20 +33,20 @@ import org.apache.isis.core.commons.fact
 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.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.FacetHolderImpl;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.consent2.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.consent2.InteractionResult;
+import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;
-import org.apache.isis.core.metamodel.feature.FeatureType;
-import org.apache.isis.core.metamodel.interactions.ObjectTitleContext;
-import org.apache.isis.core.metamodel.interactions.ObjectValidityContext;
+import org.apache.isis.core.metamodel.interactions2.ObjectTitleContext;
+import org.apache.isis.core.metamodel.interactions2.ObjectValidityContext;
 import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.core.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
+import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.Persistability;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
@@ -71,6 +71,15 @@ public class TestProxySpecification exte
 		runtimeContext = new RuntimeContextNoRuntime();
     }
 
+    @Override
+    public Class<?> getCorrespondingClass() {
+        try {
+            return Class.forName(name);
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     public TestProxySpecification(final String name) {
         this.name = name;
         title = "";
@@ -101,14 +110,14 @@ public class TestProxySpecification exte
     }
 
     public ObjectAction getClassAction(
-            final ObjectActionType type,
+            final ActionType type,
             final String name,
             final ObjectSpecification[] parameters) {
         return null;
     }
 
     @Override
-    public List<ObjectAction> getServiceActionsReturning(final ObjectActionType... type) {
+    public List<ObjectAction> getServiceActionsReturning(final ActionType... type) {
         return null;
     }
 
@@ -172,7 +181,7 @@ public class TestProxySpecification exte
     }
 
     @Override
-    public String getFullName() {
+    public String getFullIdentifier() {
         return name;
     }
 
@@ -183,7 +192,7 @@ public class TestProxySpecification exte
 
     @Override
     public ObjectAction getObjectAction(
-            final ObjectActionType type,
+            final ActionType type,
             final String name,
             final List<ObjectSpecification> parameters) {
         if (action != null && action.getId().equals(name)) {
@@ -193,13 +202,13 @@ public class TestProxySpecification exte
     }
 
     @Override
-    public ObjectAction getObjectAction(final ObjectActionType type, final String id) {
+    public ObjectAction getObjectAction(final ActionType type, final String id) {
     	int openBracket = id.indexOf('(');
         return getObjectAction(type, id.substring(0, openBracket), null);
     }
 
     @Override
-    public List<ObjectAction> getObjectActions(final ObjectActionType... types) {
+    public List<ObjectAction> getObjectActions(final ActionType... types) {
         return null;
     }
 
@@ -209,18 +218,18 @@ public class TestProxySpecification exte
     }
 
     @Override
-    public String getShortName() {
+    public String getShortIdentifier() {
         return name.substring(name.lastIndexOf('.') + 1);
     }
 
     @Override
-    public String getName() {
+    public String getSingularName() {
         return name + " (singular)";
     }
 
     @Override
     public String getDescription() {
-        return getName();
+        return getSingularName();
     }
 
     @Override
@@ -323,7 +332,7 @@ public class TestProxySpecification exte
 
     @Override
     public String toString() {
-        return getFullName();
+        return getFullIdentifier();
     }
 
     @Override
@@ -418,6 +427,37 @@ public class TestProxySpecification exte
 		return runtimeContext;
 	}
 
+	
+    // /////////////////////////////////////////////////////////////
+    // introspection
+    // /////////////////////////////////////////////////////////////
+
+    @Override
+    public void introspectTypeHierarchyAndMembers() {
+    }
+
+    @Override
+    public void updateFromFacetValues() {
+    }
+
+    @Override
+    public void markAsService() {
+    }
+
+    @Override
+    public boolean isIntrospected() {
+        return false;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.isis.core.metamodel.spec.feature.ObjectActionContainer#getObjectActionsAll()
+     */
+    @Override
+    public List<ObjectAction> getObjectActionsAll() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
 
 }
 

Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/util/NameUtilTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/util/NameUtilTest.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/util/NameUtilTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/util/NameUtilTest.java Thu Dec 30 12:29:53 2010
@@ -20,6 +20,8 @@
 
 package org.apache.isis.core.metamodel.util;
 
+import org.apache.isis.core.commons.lang.NameUtils;
+
 import junit.framework.TestCase;
 
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/FallbackFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/FallbackFacetFactory.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/FallbackFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/FallbackFacetFactory.java Thu Dec 30 12:29:53 2010
@@ -25,14 +25,14 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
-import org.apache.isis.core.metamodel.facets.FacetUtil;
-import org.apache.isis.core.metamodel.facets.MethodRemover;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetUtil;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.facetapi.MethodRemover;
 import org.apache.isis.core.metamodel.facets.TypedHolder;
-import org.apache.isis.core.metamodel.feature.FeatureType;
 import org.apache.isis.core.metamodel.peer.FacetedMethod;
+import org.apache.isis.core.metamodel.spec.FacetFactoryAbstract;
 import org.apache.isis.core.progmodel.facets.actions.choices.ActionChoicesFacetNone;
 import org.apache.isis.core.progmodel.facets.actions.defaults.ActionDefaultsFacetNone;
 import org.apache.isis.core.progmodel.facets.actions.executed.ExecutedFacetAtDefault;

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/MethodPrefixBasedFacetFactoryAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/MethodPrefixBasedFacetFactoryAbstract.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/MethodPrefixBasedFacetFactoryAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/MethodPrefixBasedFacetFactoryAbstract.java Thu Dec 30 12:29:53 2010
@@ -26,13 +26,13 @@ import java.util.List;
 
 import org.apache.isis.applib.security.UserMemento;
 import org.apache.isis.core.commons.lang.ListUtils;
-import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.adapter.util.InvokeUtils;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.facetapi.MethodRemover;
 import org.apache.isis.core.metamodel.facets.MethodPrefixBasedFacetFactory;
-import org.apache.isis.core.metamodel.facets.MethodRemover;
-import org.apache.isis.core.metamodel.feature.FeatureType;
-import org.apache.isis.core.metamodel.util.InvokeUtils;
+import org.apache.isis.core.metamodel.spec.FacetFactoryAbstract;
 import org.apache.isis.core.progmodel.facets.actions.DescribedAsFacetViaMethod;
 import org.apache.isis.core.progmodel.facets.actions.NamedFacetViaMethod;
 import org.apache.isis.core.progmodel.facets.disable.DisableForContextFacetViaMethod;

Added: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/ObjectAdapterUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/ObjectAdapterUtils.java?rev=1053871&view=auto
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/ObjectAdapterUtils.java (added)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/ObjectAdapterUtils.java Thu Dec 30 12:29:53 2010
@@ -0,0 +1,43 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.isis.core.progmodel.facets;
+
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+
+public final class ObjectAdapterUtils {
+    
+    private ObjectAdapterUtils (){}
+
+    public static Object unwrapObject(final ObjectAdapter adapter) {
+        if (adapter == null) {
+            return null;
+        }
+        return adapter.getObject();
+    }
+
+    public static String unwrapString(final ObjectAdapter adapter) {
+        final Object obj = unwrapObject(adapter);
+        if (obj == null) {
+            return null;
+        }
+        if (!(obj instanceof String)) {
+            return null;
+        }
+        return (String) obj;
+    }
+
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/PropertyOrCollectionIdentifyingFacetFactoryAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/PropertyOrCollectionIdentifyingFacetFactoryAbstract.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/PropertyOrCollectionIdentifyingFacetFactoryAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/PropertyOrCollectionIdentifyingFacetFactoryAbstract.java Thu Dec 30 12:29:53 2010
@@ -22,9 +22,9 @@ package org.apache.isis.core.progmodel.f
 
 import java.util.List;
 
-import org.apache.isis.core.metamodel.facets.FacetFactory;
+import org.apache.isis.core.metamodel.facetapi.FacetFactory;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facets.PropertyOrCollectionIdentifyingFacetFactory;
-import org.apache.isis.core.metamodel.feature.FeatureType;
 import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
 import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistryAware;
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfAnnotationFacetFactory.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfAnnotationFacetFactory.java Thu Dec 30 12:29:53 2010
@@ -26,11 +26,11 @@ import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
 
 import org.apache.isis.applib.annotation.TypeOf;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetUtil;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.facetapi.MethodRemover;
 import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
-import org.apache.isis.core.metamodel.facets.FacetUtil;
-import org.apache.isis.core.metamodel.facets.MethodRemover;
-import org.apache.isis.core.metamodel.feature.FeatureType;
 import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
 import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistryAware;
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetInferredFromArray.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetInferredFromArray.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetInferredFromArray.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetInferredFromArray.java Thu Dec 30 12:29:53 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.progmodel.facets.actcoll.typeof;
 
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacetAbstract;
 import org.apache.isis.core.metamodel.spec.SpecificationLookup;
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetInferredFromGenerics.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetInferredFromGenerics.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetInferredFromGenerics.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetInferredFromGenerics.java Thu Dec 30 12:29:53 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.progmodel.facets.actcoll.typeof;
 
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacetAbstract;
 import org.apache.isis.core.metamodel.spec.SpecificationLookup;
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetInferredFromSupportingMethods.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetInferredFromSupportingMethods.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetInferredFromSupportingMethods.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetInferredFromSupportingMethods.java Thu Dec 30 12:29:53 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.progmodel.facets.actcoll.typeof;
 
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacetAbstract;
 import org.apache.isis.core.metamodel.spec.SpecificationLookup;
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetViaAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetViaAnnotation.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetViaAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetViaAnnotation.java Thu Dec 30 12:29:53 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.progmodel.facets.actcoll.typeof;
 
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacetAbstract;
 import org.apache.isis.core.metamodel.spec.SpecificationLookup;
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/ActionMethodsFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/ActionMethodsFacetFactory.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/ActionMethodsFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/ActionMethodsFacetFactory.java Thu Dec 30 12:29:53 2010
@@ -27,21 +27,21 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.isis.applib.security.UserMemento;
-import org.apache.isis.core.metamodel.adapter.AdapterMap;
-import org.apache.isis.core.metamodel.adapter.AdapterMapAware;
+import org.apache.isis.core.commons.lang.NameUtils;
+import org.apache.isis.core.metamodel.adapter.map.AdapterMap;
+import org.apache.isis.core.metamodel.adapter.map.AdapterMapAware;
+import org.apache.isis.core.metamodel.adapter.util.InvokeUtils;
 import org.apache.isis.core.metamodel.exceptions.ReflectionException;
-import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
-import org.apache.isis.core.metamodel.facets.FacetUtil;
-import org.apache.isis.core.metamodel.facets.MethodRemover;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetUtil;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.facetapi.MethodRemover;
 import org.apache.isis.core.metamodel.facets.actions.executed.ExecutedFacet.Where;
 import org.apache.isis.core.metamodel.facets.naming.named.NamedFacetInferred;
-import org.apache.isis.core.metamodel.feature.FeatureType;
 import org.apache.isis.core.metamodel.peer.FacetedMethod;
 import org.apache.isis.core.metamodel.peer.FacetedMethodParameter;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.util.InvokeUtils;
-import org.apache.isis.core.metamodel.util.NameUtils;
 import org.apache.isis.core.progmodel.facets.MethodPrefixBasedFacetFactoryAbstract;
 import org.apache.isis.core.progmodel.facets.actions.choices.ActionChoicesFacetViaMethod;
 import org.apache.isis.core.progmodel.facets.actions.choices.ActionParameterChoicesFacetViaMethod;

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/DebugFacetViaNamingConvention.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/DebugFacetViaNamingConvention.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/DebugFacetViaNamingConvention.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/DebugFacetViaNamingConvention.java Thu Dec 30 12:29:53 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.progmodel.facets.actions;
 
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.progmodel.facets.actions.debug.DebugFacetAbstract;
 
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/DescribedAsFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/DescribedAsFacetViaMethod.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/DescribedAsFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/DescribedAsFacetViaMethod.java Thu Dec 30 12:29:53 2010
@@ -24,9 +24,9 @@ import java.lang.reflect.Method;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.ImperativeFacet;
-import org.apache.isis.core.progmodel.facets.naming.describedas.DescribedAsFacetAbstract;
+import org.apache.isis.core.metamodel.facets.naming.describedas.DescribedAsFacetAbstract;
 
 
 public class DescribedAsFacetViaMethod extends DescribedAsFacetAbstract implements ImperativeFacet {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/ExecutedFacetViaNamingConvention.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/ExecutedFacetViaNamingConvention.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/ExecutedFacetViaNamingConvention.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/ExecutedFacetViaNamingConvention.java Thu Dec 30 12:29:53 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.progmodel.facets.actions;
 
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.progmodel.facets.actions.executed.ExecutedFacetAbstract;
 
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/ExplorationFacetViaNamingConvention.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/ExplorationFacetViaNamingConvention.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/ExplorationFacetViaNamingConvention.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/ExplorationFacetViaNamingConvention.java Thu Dec 30 12:29:53 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.progmodel.facets.actions;
 
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.progmodel.facets.actions.exploration.ExplorationFacetAbstract;
 
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/IteratorFilteringFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/IteratorFilteringFacetFactory.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/IteratorFilteringFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/IteratorFilteringFacetFactory.java Thu Dec 30 12:29:53 2010
@@ -22,13 +22,13 @@ package org.apache.isis.core.progmodel.f
 
 import java.lang.reflect.Method;
 
-import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.facetapi.MethodRemover;
+import org.apache.isis.core.metamodel.facetapi.MethodScope;
 import org.apache.isis.core.metamodel.facets.MethodFilteringFacetFactory;
-import org.apache.isis.core.metamodel.facets.MethodRemover;
-import org.apache.isis.core.metamodel.facets.MethodScope;
-import org.apache.isis.core.metamodel.feature.FeatureType;
+import org.apache.isis.core.metamodel.spec.FacetFactoryAbstract;
 
 
 /**

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/MandatoryFacetOverriddenByMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/MandatoryFacetOverriddenByMethod.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/MandatoryFacetOverriddenByMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/MandatoryFacetOverriddenByMethod.java Thu Dec 30 12:29:53 2010
@@ -21,7 +21,7 @@
 package org.apache.isis.core.progmodel.facets.actions;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.progmodel.facets.propparam.validate.mandatory.MandatoryFacetAbstract;
 
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/NamedFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/NamedFacetViaMethod.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/NamedFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/NamedFacetViaMethod.java Thu Dec 30 12:29:53 2010
@@ -24,7 +24,7 @@ import java.lang.reflect.Method;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.ImperativeFacet;
 import org.apache.isis.core.metamodel.facets.naming.named.NamedFacetAbstract;
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/SyntheticMethodFilteringFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/SyntheticMethodFilteringFacetFactory.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/SyntheticMethodFilteringFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/SyntheticMethodFilteringFacetFactory.java Thu Dec 30 12:29:53 2010
@@ -24,10 +24,10 @@ import java.lang.reflect.Method;
 import java.util.ArrayList;
 
 import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facets.MethodFilteringFacetFactory;
-import org.apache.isis.core.metamodel.feature.FeatureType;
+import org.apache.isis.core.metamodel.spec.FacetFactoryAbstract;
 
 
 /**

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionChoicesFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionChoicesFacetAbstract.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionChoicesFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionChoicesFacetAbstract.java Thu Dec 30 12:29:53 2010
@@ -20,9 +20,9 @@
 
 package org.apache.isis.core.progmodel.facets.actions.choices;
 
-import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.facets.FacetAbstract;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.actions.choices.ActionChoicesFacet;
 
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionChoicesFacetNone.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionChoicesFacetNone.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionChoicesFacetNone.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionChoicesFacetNone.java Thu Dec 30 12:29:53 2010
@@ -21,7 +21,7 @@
 package org.apache.isis.core.progmodel.facets.actions.choices;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 
 
 public class ActionChoicesFacetNone extends ActionChoicesFacetAbstract {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionChoicesFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionChoicesFacetViaMethod.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionChoicesFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionChoicesFacetViaMethod.java Thu Dec 30 12:29:53 2010
@@ -24,12 +24,12 @@ import java.util.Collections;
 import java.util.List;
 
 import org.apache.isis.core.commons.lang.ArrayUtils;
-import org.apache.isis.core.metamodel.adapter.AdapterInvokeUtils;
-import org.apache.isis.core.metamodel.adapter.AdapterMap;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.map.AdapterMap;
+import org.apache.isis.core.metamodel.adapter.util.AdapterInvokeUtils;
 import org.apache.isis.core.metamodel.exceptions.ModelException;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.ChoicesUtils;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
 import org.apache.isis.core.metamodel.facets.ImperativeFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.SpecificationLookup;

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionParameterChoicesFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionParameterChoicesFacetAbstract.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionParameterChoicesFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionParameterChoicesFacetAbstract.java Thu Dec 30 12:29:53 2010
@@ -20,10 +20,10 @@
 
 package org.apache.isis.core.progmodel.facets.actions.choices;
 
-import org.apache.isis.core.metamodel.adapter.AdapterMap;
-import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.facets.FacetAbstract;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.adapter.map.AdapterMap;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.actions.choices.ActionParameterChoicesFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.SpecificationLookup;

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionParameterChoicesFacetNone.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionParameterChoicesFacetNone.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionParameterChoicesFacetNone.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionParameterChoicesFacetNone.java Thu Dec 30 12:29:53 2010
@@ -20,9 +20,9 @@
 
 package org.apache.isis.core.progmodel.facets.actions.choices;
 
-import org.apache.isis.core.metamodel.adapter.AdapterMap;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.adapter.map.AdapterMap;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.spec.SpecificationLookup;
 
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionParameterChoicesFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionParameterChoicesFacetViaMethod.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionParameterChoicesFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionParameterChoicesFacetViaMethod.java Thu Dec 30 12:29:53 2010
@@ -25,11 +25,11 @@ import java.util.Collections;
 import java.util.List;
 
 import org.apache.isis.core.commons.lang.ArrayUtils;
-import org.apache.isis.core.metamodel.adapter.AdapterInvokeUtils;
-import org.apache.isis.core.metamodel.adapter.AdapterMap;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.map.AdapterMap;
+import org.apache.isis.core.metamodel.adapter.util.AdapterInvokeUtils;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.ChoicesUtils;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
 import org.apache.isis.core.metamodel.facets.ImperativeFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.SpecificationLookup;

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/DebugAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/DebugAnnotationFacetFactory.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/DebugAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/DebugAnnotationFacetFactory.java Thu Dec 30 12:29:53 2010
@@ -23,12 +23,12 @@ package org.apache.isis.core.progmodel.f
 import java.lang.reflect.Method;
 
 import org.apache.isis.applib.annotation.Debug;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetUtil;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.facetapi.MethodRemover;
 import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
-import org.apache.isis.core.metamodel.facets.FacetUtil;
-import org.apache.isis.core.metamodel.facets.MethodRemover;
 import org.apache.isis.core.metamodel.facets.actions.debug.DebugFacet;
-import org.apache.isis.core.metamodel.feature.FeatureType;
 
 
 public class DebugAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/DebugFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/DebugFacetAbstract.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/DebugFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/DebugFacetAbstract.java Thu Dec 30 12:29:53 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.core.progmodel.facets.actions.debug;
 
-import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.MarkerFacetAbstract;
 import org.apache.isis.core.metamodel.facets.actions.debug.DebugFacet;
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/DebugFacetAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/DebugFacetAnnotation.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/DebugFacetAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/DebugFacetAnnotation.java Thu Dec 30 12:29:53 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.progmodel.facets.actions.debug;
 
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 
 
 public class DebugFacetAnnotation extends DebugFacetAbstract {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionDefaultsFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionDefaultsFacetAbstract.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionDefaultsFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionDefaultsFacetAbstract.java Thu Dec 30 12:29:53 2010
@@ -20,9 +20,9 @@
 
 package org.apache.isis.core.progmodel.facets.actions.defaults;
 
-import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.facets.FacetAbstract;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.actions.defaults.ActionDefaultsFacet;
 
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionDefaultsFacetNone.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionDefaultsFacetNone.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionDefaultsFacetNone.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionDefaultsFacetNone.java Thu Dec 30 12:29:53 2010
@@ -21,7 +21,7 @@
 package org.apache.isis.core.progmodel.facets.actions.defaults;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 
 
 public class ActionDefaultsFacetNone extends ActionDefaultsFacetAbstract {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionDefaultsFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionDefaultsFacetViaMethod.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionDefaultsFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionDefaultsFacetViaMethod.java Thu Dec 30 12:29:53 2010
@@ -24,10 +24,10 @@ import java.lang.reflect.Method;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.isis.core.metamodel.adapter.AdapterInvokeUtils;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.adapter.util.AdapterInvokeUtils;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.ImperativeFacet;
 import org.apache.isis.core.metamodel.facets.actions.invoke.ActionInvocationFacet;
 import org.apache.isis.core.progmodel.facets.actions.invoke.ActionInvocationFacetViaMethod;

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionParameterDefaultsFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionParameterDefaultsFacetAbstract.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionParameterDefaultsFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionParameterDefaultsFacetAbstract.java Thu Dec 30 12:29:53 2010
@@ -20,9 +20,9 @@
 
 package org.apache.isis.core.progmodel.facets.actions.defaults;
 
-import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.facets.FacetAbstract;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.actions.defaults.ActionParameterDefaultsFacet;
 
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionParameterDefaultsFacetNone.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionParameterDefaultsFacetNone.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionParameterDefaultsFacetNone.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionParameterDefaultsFacetNone.java Thu Dec 30 12:29:53 2010
@@ -21,7 +21,7 @@
 package org.apache.isis.core.progmodel.facets.actions.defaults;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 
 
 public class ActionParameterDefaultsFacetNone extends ActionParameterDefaultsFacetAbstract {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionParameterDefaultsFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionParameterDefaultsFacetViaMethod.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionParameterDefaultsFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/ActionParameterDefaultsFacetViaMethod.java Thu Dec 30 12:29:53 2010
@@ -24,9 +24,9 @@ import java.lang.reflect.Method;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.isis.core.metamodel.adapter.AdapterInvokeUtils;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.adapter.util.AdapterInvokeUtils;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.ImperativeFacet;
 
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedAnnotationFacetFactory.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedAnnotationFacetFactory.java Thu Dec 30 12:29:53 2010
@@ -23,12 +23,12 @@ package org.apache.isis.core.progmodel.f
 import java.lang.reflect.Method;
 
 import org.apache.isis.applib.annotation.Executed;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetUtil;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.facetapi.MethodRemover;
 import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
-import org.apache.isis.core.metamodel.facets.FacetUtil;
-import org.apache.isis.core.metamodel.facets.MethodRemover;
 import org.apache.isis.core.metamodel.facets.actions.executed.ExecutedFacet;
-import org.apache.isis.core.metamodel.feature.FeatureType;
 
 
 /**

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedFacetAbstract.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedFacetAbstract.java Thu Dec 30 12:29:53 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.core.progmodel.facets.actions.executed;
 
-import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.SingleValueFacetAbstract;
 import org.apache.isis.core.metamodel.facets.actions.executed.ExecutedFacet;
 import org.apache.isis.core.metamodel.spec.Target;

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedFacetAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedFacetAnnotation.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedFacetAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedFacetAnnotation.java Thu Dec 30 12:29:53 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.progmodel.facets.actions.executed;
 
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 
 
 public class ExecutedFacetAnnotation extends ExecutedFacetAbstract {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedFacetAtDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedFacetAtDefault.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedFacetAtDefault.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedFacetAtDefault.java Thu Dec 30 12:29:53 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.progmodel.facets.actions.executed;
 
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 
 
 public class ExecutedFacetAtDefault extends ExecutedFacetAbstract {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedViaNamingConventionFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedViaNamingConventionFacetFactory.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedViaNamingConventionFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedViaNamingConventionFacetFactory.java Thu Dec 30 12:29:53 2010
@@ -22,14 +22,14 @@ package org.apache.isis.core.progmodel.f
 
 import java.lang.reflect.Method;
 
-import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
-import org.apache.isis.core.metamodel.facets.FacetUtil;
-import org.apache.isis.core.metamodel.facets.MethodRemover;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetUtil;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.facetapi.MethodRemover;
 import org.apache.isis.core.metamodel.facets.actions.executed.ExecutedFacet;
 import org.apache.isis.core.metamodel.facets.naming.named.NamedFacetInferred;
-import org.apache.isis.core.metamodel.feature.FeatureType;
+import org.apache.isis.core.metamodel.spec.FacetFactoryAbstract;
 import org.apache.isis.core.progmodel.facets.actions.ActionMethodsFacetFactory;
 import org.apache.isis.core.progmodel.facets.actions.ExecutedFacetViaNamingConvention;
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/ExplorationAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/ExplorationAnnotationFacetFactory.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/ExplorationAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/ExplorationAnnotationFacetFactory.java Thu Dec 30 12:29:53 2010
@@ -23,12 +23,12 @@ package org.apache.isis.core.progmodel.f
 import java.lang.reflect.Method;
 
 import org.apache.isis.applib.annotation.Exploration;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetUtil;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.facetapi.MethodRemover;
 import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
-import org.apache.isis.core.metamodel.facets.FacetUtil;
-import org.apache.isis.core.metamodel.facets.MethodRemover;
 import org.apache.isis.core.metamodel.facets.actions.exploration.ExplorationFacet;
-import org.apache.isis.core.metamodel.feature.FeatureType;
 
 
 public class ExplorationAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/ExplorationFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/ExplorationFacetAbstract.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/ExplorationFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/ExplorationFacetAbstract.java Thu Dec 30 12:29:53 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.core.progmodel.facets.actions.exploration;
 
-import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.MarkerFacetAbstract;
 import org.apache.isis.core.metamodel.facets.actions.exploration.ExplorationFacet;
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/ExplorationFacetAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/ExplorationFacetAnnotation.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/ExplorationFacetAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/ExplorationFacetAnnotation.java Thu Dec 30 12:29:53 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.progmodel.facets.actions.exploration;
 
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 
 
 public class ExplorationFacetAnnotation extends ExplorationFacetAbstract {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/ActionInvocationFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/ActionInvocationFacetAbstract.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/ActionInvocationFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/ActionInvocationFacetAbstract.java Thu Dec 30 12:29:53 2010
@@ -20,9 +20,9 @@
 
 package org.apache.isis.core.progmodel.facets.actions.invoke;
 
-import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.facets.FacetAbstract;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.actions.invoke.ActionInvocationFacet;
 
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/ActionInvocationFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/ActionInvocationFacetViaMethod.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/ActionInvocationFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/ActionInvocationFacetViaMethod.java Thu Dec 30 12:29:53 2010
@@ -26,14 +26,15 @@ import java.util.List;
 
 import org.apache.log4j.Logger;
 
-import org.apache.isis.core.metamodel.adapter.AdapterMap;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.adapter.map.AdapterMap;
+import org.apache.isis.core.metamodel.adapter.util.InvokeUtils;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.ImperativeFacet;
+import org.apache.isis.core.metamodel.facets.actcoll.typeof.ElementSpecificationProviderFromTypeOfFacet;
 import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.specloader.ReflectiveActionException;
-import org.apache.isis.core.metamodel.util.InvokeUtils;
 
 public class ActionInvocationFacetViaMethod extends ActionInvocationFacetAbstract implements ImperativeFacet {
 
@@ -45,6 +46,7 @@ public class ActionInvocationFacetViaMet
     private final ObjectSpecification returnType;
 
     private final AdapterMap adapterMap;
+    
 
     public ActionInvocationFacetViaMethod(final Method method, final ObjectSpecification onType,
         final ObjectSpecification returnType, final FacetHolder holder, final AdapterMap adapterManager) {
@@ -88,15 +90,17 @@ public class ActionInvocationFacetViaMet
 
             final Object object = unwrap(inObject);
             final Object result = method.invoke(object, executionParameters);
-            LOG.debug(" action result " + result);
+            if(LOG.isDebugEnabled()) {
+                LOG.debug(" action result " + result);
+            }
             if (result == null) {
                 return null;
             }
 
-            final ObjectAdapter adapter = getAdapterMap().adapterFor(result);
+            final ObjectAdapter resultAdapter = getAdapterMap().adapterFor(result);
             final TypeOfFacet typeOfFacet = getFacetHolder().getFacet(TypeOfFacet.class);
-            adapter.setTypeOfFacet(typeOfFacet);
-            return adapter;
+            resultAdapter.setElementSpecificationProvider(ElementSpecificationProviderFromTypeOfFacet.createFrom(typeOfFacet));
+            return resultAdapter;
 
         } catch (final IllegalArgumentException e) {
             throw e;

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notcontributed/NotContributedAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notcontributed/NotContributedAnnotationFacetFactory.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notcontributed/NotContributedAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notcontributed/NotContributedAnnotationFacetFactory.java Thu Dec 30 12:29:53 2010
@@ -23,11 +23,11 @@ package org.apache.isis.core.progmodel.f
 import java.lang.reflect.Method;
 
 import org.apache.isis.applib.annotation.NotContributed;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetUtil;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.facetapi.MethodRemover;
 import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
-import org.apache.isis.core.metamodel.facets.FacetUtil;
-import org.apache.isis.core.metamodel.facets.MethodRemover;
-import org.apache.isis.core.metamodel.feature.FeatureType;
 
 
 public class NotContributedAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notcontributed/NotContributedFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notcontributed/NotContributedFacet.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notcontributed/NotContributedFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notcontributed/NotContributedFacet.java Thu Dec 30 12:29:53 2010
@@ -19,7 +19,7 @@
 
 package org.apache.isis.core.progmodel.facets.actions.notcontributed;
 
-import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facetapi.Facet;
 
 /**
  * Indicates that the (repository) action should not be contributed to any objects.

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notcontributed/NotContributedFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notcontributed/NotContributedFacetAbstract.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notcontributed/NotContributedFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notcontributed/NotContributedFacetAbstract.java Thu Dec 30 12:29:53 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.core.progmodel.facets.actions.notcontributed;
 
-import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.MarkerFacetAbstract;
 
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notcontributed/NotContributedFacetAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notcontributed/NotContributedFacetAnnotation.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notcontributed/NotContributedFacetAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notcontributed/NotContributedFacetAnnotation.java Thu Dec 30 12:29:53 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.progmodel.facets.actions.notcontributed;
 
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 
 
 public class NotContributedFacetAnnotation extends NotContributedFacetAbstract {



Mime
View raw message