incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1060035 [2/14] - in /incubator/isis/trunk: alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/ alternatives/objectstore/nosql/src/test/java/org/apache/isis/alternatives/objectstore/nosql/ alternatives/objectstore/sql...
Date Mon, 17 Jan 2011 18:23:18 GMT

Modified: incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/IsisMetaModel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/IsisMetaModel.java?rev=1060035&r1=1060034&r2=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/IsisMetaModel.java (original)
+++ incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/IsisMetaModel.java Mon Jan 17 18:22:58 2011
@@ -40,7 +40,6 @@ import org.apache.isis.core.commons.conf
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
 import org.apache.isis.core.metamodel.layout.MemberLayoutArranger;
-import org.apache.isis.core.metamodel.layout.dflt.MemberLayoutArrangerDefault;
 import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
 import org.apache.isis.core.metamodel.services.ServicesInjector;
 import org.apache.isis.core.metamodel.services.container.DomainObjectContainerDefault;
@@ -54,6 +53,7 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.specloader.traverser.SpecificationTraverserDefault;
 import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
 import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorNoop;
+import org.apache.isis.core.progmodel.layout.dflt.MemberLayoutArrangerDefault;
 import org.apache.isis.defaults.progmodel.ProgrammingModelFacetsJava5;
 import org.apache.isis.progmodel.wrapper.applib.WrapperFactory;
 import org.apache.isis.progmodel.wrapper.metamodel.DomainObjectContainerWrapperFactory;

Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/alternatives/objectstore/nosql/TrialObjects.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/alternatives/objectstore/nosql/TrialObjects.java?rev=1060035&r1=1060034&r2=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/alternatives/objectstore/nosql/TrialObjects.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/alternatives/objectstore/nosql/TrialObjects.java Mon Jan 17 18:22:58 2011
@@ -32,13 +32,13 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
 import org.apache.isis.core.metamodel.facetapi.IdentifiedHolder;
 import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
-import org.apache.isis.core.metamodel.layout.dflt.MemberLayoutArrangerDefault;
 import org.apache.isis.core.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.specloader.ObjectReflectorDefault;
 import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistryDefault;
 import org.apache.isis.core.metamodel.specloader.traverser.SpecificationTraverserDefault;
 import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorNoop;
+import org.apache.isis.core.progmodel.layout.dflt.MemberLayoutArrangerDefault;
 import org.apache.isis.core.runtime.persistence.adapterfactory.AdapterFactory;
 import org.apache.isis.core.runtime.persistence.adapterfactory.AdapterFactoryAbstract;
 import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SerialOid;

Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/auto/AutoCollectionMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/auto/AutoCollectionMapper.java?rev=1060035&r1=1060034&r2=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/auto/AutoCollectionMapper.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/auto/AutoCollectionMapper.java Mon Jan 17 18:22:58 2011
@@ -35,8 +35,8 @@ import org.apache.isis.alternatives.obje
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.ResolveState;
-import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
+import org.apache.isis.core.metamodel.facets.typeof.TypeOfFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.runtime.persistence.PersistorUtil;

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/protocol/internal/ObjectSerializer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/protocol/internal/ObjectSerializer.java?rev=1060035&r1=1060034&r2=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/protocol/internal/ObjectSerializer.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/protocol/internal/ObjectSerializer.java Mon Jan 17 18:22:58 2011
@@ -34,10 +34,10 @@ import org.apache.isis.core.commons.exce
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.ResolveState;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
-import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacetUtils;
 import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
+import org.apache.isis.core.metamodel.facets.typeof.TypeOfFacet;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.runtime.persistence.PersistorUtil;
 

Copied: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionUtils.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/authentication/AuthenticationSessionUtils.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionUtils.java?p2=incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionUtils.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/authentication/AuthenticationSessionUtils.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/authentication/AuthenticationSessionUtils.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionUtils.java Mon Jan 17 18:22:58 2011
@@ -18,14 +18,14 @@
  */
 
 
-package org.apache.isis.core.progmodel.authentication;
+package org.apache.isis.core.commons.authentication;
 
-import java.util.ArrayList;
 import java.util.List;
 
+import com.google.common.collect.Lists;
+
 import org.apache.isis.applib.security.RoleMemento;
 import org.apache.isis.applib.security.UserMemento;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
 
 
 
@@ -34,7 +34,7 @@ public final class AuthenticationSession
     private AuthenticationSessionUtils() {}
 
     public static UserMemento createUserMemento(final AuthenticationSession session) {
-        final List<RoleMemento> roles = new ArrayList();
+        final List<RoleMemento> roles = Lists.newArrayList();
         for (String roleName : session.getRoles()) {
 			roles.add(new RoleMemento(roleName));
         }

Copied: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ArrayUtil.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/util/ArrayUtil.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ArrayUtil.java?p2=incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ArrayUtil.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/util/ArrayUtil.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/util/ArrayUtil.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ArrayUtil.java Mon Jan 17 18:22:58 2011
@@ -18,15 +18,13 @@
  */
 
 
-package org.apache.isis.core.progmodel.util;
+package org.apache.isis.core.commons.lang;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 
 import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.core.commons.lang.ArrayUtils;
-import org.apache.isis.core.commons.lang.WrapperUtils;
 
 
 

Copied: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ClassUtil.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/util/ClassUtil.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ClassUtil.java?p2=incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ClassUtil.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/util/ClassUtil.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/util/ClassUtil.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ClassUtil.java Mon Jan 17 18:22:58 2011
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.progmodel.util;
+package org.apache.isis.core.commons.lang;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;

Modified: incubator/isis/trunk/core/metamodel/core-metamodel.java.hsp
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/core-metamodel.java.hsp?rev=1060035&r1=1060034&r2=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/core-metamodel.java.hsp (original)
+++ incubator/isis/trunk/core/metamodel/core-metamodel.java.hsp Mon Jan 17 18:22:58 2011
@@ -10,61 +10,6 @@
       <pathentry type="file" path="src/main/java" />
    </sourcepaths>
    <grid-set sep="." version="3.3.722">
-      <grid name="all of metamodel with specloader expanded" enforce="true" strict="false">
-         <row>
-            <cell name="specloader" pattern="org.apache.isis.core.metamodel.specloader.*" vexpanded="true" visibility="public">
-               <grid>
-                  <row>
-                     <cell name="specloader" pattern="org.apache.isis.core.metamodel.specloader.?" vexpanded="true" visibility="public" />
-                  </row>
-                  <row>
-                     <cell name="validator" pattern="org.apache.isis.core.metamodel.specloader.validator.?" vexpanded="true" visibility="public" />
-                     <cell name="speccache" pattern="org.apache.isis.core.metamodel.specloader.speccache.?" vexpanded="true" visibility="public" />
-                     <cell name="specimpl" pattern="org.apache.isis.core.metamodel.specloader.specimpl.*" vexpanded="true" visibility="public" />
-                  </row>
-                  <row>
-                     <cell name="traverser" pattern="org.apache.isis.core.metamodel.specloader.traverser.?" vexpanded="true" visibility="public" />
-                     <cell name="classsubstitutor" pattern="org.apache.isis.core.metamodel.specloader.classsubstitutor.?" vexpanded="true" visibility="public" />
-                     <cell name="facetprocessor" pattern="org.apache.isis.core.metamodel.specloader.facetprocessor.?" vexpanded="true" visibility="public" />
-                  </row>
-                  <row>
-                     <cell name="collectiontyperegistry" pattern="org.apache.isis.core.metamodel.specloader.collectiontyperegistry.?" vexpanded="true" visibility="public" />
-                  </row>
-               </grid>
-            </cell>
-         </row>
-         <row>
-            <cell name="progmodel" pattern="org.apache.isis.core.metamodel.progmodel.*" vexpanded="true" visibility="public" />
-            <cell name="facetdecorator" pattern="org.apache.isis.core.metamodel.facetdecorator.*" vexpanded="true" visibility="public" />
-            <cell name="runtimecontext" pattern="org.apache.isis.core.metamodel.runtimecontext.*" vexpanded="true" visibility="public" />
-            <cell name="layout" pattern="org.apache.isis.core.metamodel.layout.*" vexpanded="true" visibility="public" />
-         </row>
-         <row>
-            <cell name="services" pattern="org.apache.isis.core.metamodel.services.*" vexpanded="true" visibility="public" />
-            <cell name="facetedmethod" pattern="org.apache.isis.core.metamodel.facetedmethod.*" vexpanded="true" visibility="public" />
-         </row>
-         <row>
-            <cell name="facets" pattern="org.apache.isis.core.metamodel.facets.*" vexpanded="true" visibility="public" />
-         </row>
-         <row>
-            <cell vexpanded="true" visibility="public">
-               <grid>
-                  <row>
-                     <cell name="spec" pattern="org.apache.isis.core.metamodel.spec.*" vexpanded="true" visibility="public" />
-                  </row>
-                  <row>
-                     <cell name="interactions" pattern="org.apache.isis.core.metamodel.interactions.*" vexpanded="true" visibility="public" />
-                     <cell name="adapter" pattern="org.apache.isis.core.metamodel.adapter.*" vexpanded="true" visibility="public" />
-                  </row>
-               </grid>
-            </cell>
-         </row>
-         <row>
-            <cell name="facetapi" pattern="org.apache.isis.core.metamodel.facetapi.*" vexpanded="true" visibility="public" />
-            <cell name="consent" pattern="org.apache.isis.core.metamodel.consent.*" vexpanded="true" visibility="public" />
-            <cell name="exceptions" pattern="org.apache.isis.core.metamodel.exceptions.*" vexpanded="true" visibility="public" />
-         </row>
-      </grid>
       <grid name="Diagram 1" enforce="true" strict="false">
          <row>
             <cell name="specloader" pattern="org.apache.isis.core.metamodel.specloader.*" vexpanded="true" visibility="public">

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolder.java?rev=1060035&r1=1060034&r2=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolder.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolder.java Mon Jan 17 18:22:58 2011
@@ -45,7 +45,7 @@ public interface FacetHolder {
      * Whether there is a facet registered of the specified type that is not a {@link Facet#isNoop() no-op}.
      * 
      * <p>
-     * Convenience; saves having to {@link #getFacet(Class)} and then check if <tt>null</tt>.
+     * Convenience; saves having to {@link #getFacet(Class)} and then check if <tt>null</tt> and not a no-op.
      */
     boolean containsDoOpFacet(Class<? extends Facet> facetType);
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FeatureType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FeatureType.java?rev=1060035&r1=1060034&r2=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FeatureType.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FeatureType.java Mon Jan 17 18:22:58 2011
@@ -28,6 +28,7 @@ import com.google.common.collect.Immutab
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.commons.lang.NameUtils;
+import org.apache.isis.core.metamodel.facets.FacetFactory;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
 
@@ -83,22 +84,19 @@ public enum FeatureType {
     public final static List<FeatureType> COLLECTIONS_ONLY = ImmutableList.of( COLLECTION );
     public final static List<FeatureType> ACTIONS_ONLY = ImmutableList.of( ACTION );
     public final static List<FeatureType> PARAMETERS_ONLY = ImmutableList.of( ACTION_PARAMETER );
-    public final static List<FeatureType> ACTIONS_AND_PARAMETERS = ImmutableList.of( ACTION, ACTION_PARAMETER );
-    public final static List<FeatureType> COLLECTIONS_AND_ACTIONS = ImmutableList.of( COLLECTION, ACTION );
-    public final static List<FeatureType> PROPERTIES_AND_PARAMETERS = ImmutableList.of( PROPERTY,
-            ACTION_PARAMETER );
-    public final static List<FeatureType> OBJECTS_PROPERTIES_AND_PARAMETERS = ImmutableList.of( OBJECT,
-            PROPERTY, ACTION_PARAMETER );
-    public final static List<FeatureType> OBJECTS_AND_PROPERTIES = ImmutableList.of( OBJECT, PROPERTY );
     public final static List<FeatureType> PROPERTIES_ONLY = ImmutableList.of( PROPERTY );
     public final static List<FeatureType> OBJECTS_ONLY = ImmutableList.of( OBJECT );
-    public final static List<FeatureType> OBJECTS_PROPERTIES_AND_COLLECTIONS = ImmutableList.of( OBJECT,
-            PROPERTY, COLLECTION );
-    public final static List<FeatureType> PROPERTIES_AND_COLLECTIONS = ImmutableList.of( PROPERTY, COLLECTION );
-    public final static List<FeatureType> PROPERTIES_COLLECTIONS_AND_ACTIONS = ImmutableList.of( PROPERTY,
-            COLLECTION, ACTION );
+    public final static List<FeatureType> MEMBERS = ImmutableList.of( PROPERTY,
+            COLLECTION, ACTION );
+    
+    /**
+     * Use of this is discouraged; instead use multiple {@link FacetFactory}s for different features.
+     */
     public final static List<FeatureType> EVERYTHING_BUT_PARAMETERS = ImmutableList.of( OBJECT, PROPERTY,
             COLLECTION, ACTION );
+    /**
+     * Use of this is discouraged; instead use multiple {@link FacetFactory}s for different features.
+     */
     public final static List<FeatureType> EVERYTHING = ImmutableList.of(OBJECT, PROPERTY, COLLECTION,
             ACTION, ACTION_PARAMETER);
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/accessor/PropertyOrCollectionAccessorFacet.java (from r1059849, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propcoll/access/PropertyOrCollectionAccessorFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/accessor/PropertyOrCollectionAccessorFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/accessor/PropertyOrCollectionAccessorFacet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propcoll/access/PropertyOrCollectionAccessorFacet.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propcoll/access/PropertyOrCollectionAccessorFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/accessor/PropertyOrCollectionAccessorFacet.java Mon Jan 17 18:22:58 2011
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.metamodel.facets.propcoll.access;
+package org.apache.isis.core.metamodel.facets.accessor;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facetapi.Facet;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/accessor/PropertyOrCollectionAccessorFacetAbstract.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/accessor/PropertyOrCollectionAccessorFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/accessor/PropertyOrCollectionAccessorFacetAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/accessor/PropertyOrCollectionAccessorFacetAbstract.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/accessor/PropertyOrCollectionAccessorFacetAbstract.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/accessor/PropertyOrCollectionAccessorFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/accessor/PropertyOrCollectionAccessorFacetAbstract.java Mon Jan 17 18:22:58 2011
@@ -18,13 +18,12 @@
  */
 
 
-package org.apache.isis.core.progmodel.facets.properties.accessor;
+package org.apache.isis.core.metamodel.facets.accessor;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 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.propcoll.access.PropertyOrCollectionAccessorFacet;
 
 
 public abstract class PropertyOrCollectionAccessorFacetAbstract extends FacetAbstract implements PropertyOrCollectionAccessorFacet {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/choices/ActionChoicesFacetAbstract.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/choices/ActionChoicesFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/choices/ActionChoicesFacetAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/choices/ActionChoicesFacetAbstract.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/choices/ActionChoicesFacetAbstract.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/choices/ActionChoicesFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/choices/ActionChoicesFacetAbstract.java Mon Jan 17 18:22:58 2011
@@ -18,12 +18,11 @@
  */
 
 
-package org.apache.isis.core.progmodel.facets.param.choices;
+package org.apache.isis.core.metamodel.facets.actions.choices;
 
 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;
 
 
 public abstract class ActionChoicesFacetAbstract extends FacetAbstract implements ActionChoicesFacet {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/defaults/ActionDefaultsFacetAbstract.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/defaults/ActionDefaultsFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/defaults/ActionDefaultsFacetAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/defaults/ActionDefaultsFacetAbstract.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/defaults/ActionDefaultsFacetAbstract.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/defaults/ActionDefaultsFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/defaults/ActionDefaultsFacetAbstract.java Mon Jan 17 18:22:58 2011
@@ -18,12 +18,11 @@
  */
 
 
-package org.apache.isis.core.progmodel.facets.param.defaults;
+package org.apache.isis.core.metamodel.facets.actions.defaults;
 
 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;
 
 
 public abstract class ActionDefaultsFacetAbstract extends FacetAbstract implements ActionDefaultsFacet {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/executed/ExecutedFacetAbstract.java (from r1059849, 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/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/executed/ExecutedFacetAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/executed/ExecutedFacetAbstract.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/ExecutedFacetAbstract.java&r1=1059849&r2=1060035&rev=1060035&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/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/executed/ExecutedFacetAbstract.java Mon Jan 17 18:22:58 2011
@@ -18,12 +18,11 @@
  */
 
 
-package org.apache.isis.core.progmodel.facets.actions.executed;
+package org.apache.isis.core.metamodel.facets.actions.executed;
 
 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;
 
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/choices/ChoicesFacet.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/enums/ChoicesFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/choices/ChoicesFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/choices/ChoicesFacet.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/enums/ChoicesFacet.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/enums/ChoicesFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/choices/ChoicesFacet.java Mon Jan 17 18:22:58 2011
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.progmodel.facets.propparam.enums;
+package org.apache.isis.core.metamodel.facets.choices;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facetapi.Facet;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/choices/ChoicesFacetAbstract.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/enums/ChoicesFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/choices/ChoicesFacetAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/choices/ChoicesFacetAbstract.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/enums/ChoicesFacetAbstract.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/enums/ChoicesFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/choices/ChoicesFacetAbstract.java Mon Jan 17 18:22:58 2011
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.progmodel.facets.propparam.enums;
+package org.apache.isis.core.metamodel.facets.choices;
 
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FacetAbstract;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/CollectionFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/CollectionFacetAbstract.java?rev=1060035&r1=1060034&r2=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/CollectionFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/CollectionFacetAbstract.java Mon Jan 17 18:22:58 2011
@@ -29,8 +29,8 @@ import org.apache.commons.collections.it
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
+import org.apache.isis.core.metamodel.facets.typeof.TypeOfFacet;
 
 
 public abstract class CollectionFacetAbstract extends FacetAbstract implements CollectionFacet {
@@ -39,30 +39,35 @@ public abstract class CollectionFacetAbs
         super(CollectionFacet.class, holder, false);
     }
     
+    @Override
     @SuppressWarnings("unchecked")
     public final Enumeration<ObjectAdapter> elements(final ObjectAdapter collectionAdapter) {
         return new IteratorEnumeration(iterator(collectionAdapter));
     }
 
+    @Override
     public final boolean contains(final ObjectAdapter collectionAdapter, final ObjectAdapter candidateObjectAdapter) {
         Collection<ObjectAdapter> collection = collection(collectionAdapter);
         return collection.contains(candidateObjectAdapter);
     }
 
-    @SuppressWarnings("unchecked")
+    @Override
     public final Iterator<ObjectAdapter> iterator(final ObjectAdapter collectionAdapter) {
         Collection<ObjectAdapter> collection = collection(collectionAdapter);
         return collection.iterator();
     }
 
+    @Override
     public Iterable<ObjectAdapter> iterable(final ObjectAdapter collectionAdapter) {
         return new Iterable<ObjectAdapter>() {
+            @Override
             public Iterator<ObjectAdapter> iterator() {
                 return CollectionFacetAbstract.this.iterator(collectionAdapter);
             }
         };
     }
 
+    @Override
     public final TypeOfFacet getTypeOfFacet() {
         return getFacetHolder().getFacet(TypeOfFacet.class);
     }

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionFacet.java?rev=1060035&r1=1060034&r2=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionFacet.java Mon Jan 17 18:22:58 2011
@@ -26,7 +26,7 @@ import java.util.Iterator;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
+import org.apache.isis.core.metamodel.facets.typeof.TypeOfFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/describedas/DescribedAsFacet.java (from r1059849, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/naming/describedas/DescribedAsFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/describedas/DescribedAsFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/describedas/DescribedAsFacet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/naming/describedas/DescribedAsFacet.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/naming/describedas/DescribedAsFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/describedas/DescribedAsFacet.java Mon Jan 17 18:22:58 2011
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.metamodel.facets.naming.describedas;
+package org.apache.isis.core.metamodel.facets.describedas;
 
 import org.apache.isis.core.metamodel.facets.SingleStringValueFacet;
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/describedas/DescribedAsFacetAbstract.java (from r1059849, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/naming/describedas/DescribedAsFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/describedas/DescribedAsFacetAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/describedas/DescribedAsFacetAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/naming/describedas/DescribedAsFacetAbstract.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/naming/describedas/DescribedAsFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/describedas/DescribedAsFacetAbstract.java Mon Jan 17 18:22:58 2011
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.facets.naming.describedas;
+package org.apache.isis.core.metamodel.facets.describedas;
 
 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/facets/ebc/EqualByContentFacet.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ebc/EqualByContentFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ebc/EqualByContentFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ebc/EqualByContentFacet.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ebc/EqualByContentFacet.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ebc/EqualByContentFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ebc/EqualByContentFacet.java Mon Jan 17 18:22:58 2011
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.progmodel.facets.object.ebc;
+package org.apache.isis.core.metamodel.facets.ebc;
 
 import org.apache.isis.core.metamodel.facets.MarkerFacet;
 import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ebc/EqualByContentFacetAbstract.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ebc/EqualByContentFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ebc/EqualByContentFacetAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ebc/EqualByContentFacetAbstract.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ebc/EqualByContentFacetAbstract.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ebc/EqualByContentFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ebc/EqualByContentFacetAbstract.java Mon Jan 17 18:22:58 2011
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.progmodel.facets.object.ebc;
+package org.apache.isis.core.metamodel.facets.ebc;
 
 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/facets/help/HelpFacetAbstract.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/help/HelpFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/help/HelpFacetAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/help/HelpFacetAbstract.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/help/HelpFacetAbstract.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/help/HelpFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/help/HelpFacetAbstract.java Mon Jan 17 18:22:58 2011
@@ -18,12 +18,11 @@
  */
 
 
-package org.apache.isis.core.progmodel.facets.help;
+package org.apache.isis.core.metamodel.facets.help;
 
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.SingleStringValueFacetAbstract;
-import org.apache.isis.core.metamodel.facets.help.HelpFacet;
 
 
 public abstract class HelpFacetAbstract extends SingleStringValueFacetAbstract implements HelpFacet {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/mandatory/MandatoryFacet.java (from r1059849, 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/mandatory/MandatoryFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/mandatory/MandatoryFacet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/validate/mandatory/MandatoryFacet.java&r1=1059849&r2=1060035&rev=1060035&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/mandatory/MandatoryFacet.java Mon Jan 17 18:22:58 2011
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.metamodel.facets.propparam.validate.mandatory;
+package org.apache.isis.core.metamodel.facets.mandatory;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facetapi.Facet;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/mandatory/MandatoryFacetAbstract.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mandatory/MandatoryFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/mandatory/MandatoryFacetAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/mandatory/MandatoryFacetAbstract.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mandatory/MandatoryFacetAbstract.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mandatory/MandatoryFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/mandatory/MandatoryFacetAbstract.java Mon Jan 17 18:22:58 2011
@@ -18,13 +18,12 @@
  */
 
 
-package org.apache.isis.core.progmodel.facets.propparam.validate.mandatory;
+package org.apache.isis.core.metamodel.facets.mandatory;
 
 import org.apache.isis.applib.events.ValidityEvent;
 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.propparam.validate.mandatory.MandatoryFacet;
 import org.apache.isis.core.metamodel.interactions.ActionArgumentContext;
 import org.apache.isis.core.metamodel.interactions.PropertyModifyContext;
 import org.apache.isis.core.metamodel.interactions.ProposedHolder;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/mandatory/MandatoryFacetDefault.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mandatory/MandatoryFacetDefault.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/mandatory/MandatoryFacetDefault.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/mandatory/MandatoryFacetDefault.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mandatory/MandatoryFacetDefault.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mandatory/MandatoryFacetDefault.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/mandatory/MandatoryFacetDefault.java Mon Jan 17 18:22:58 2011
@@ -17,11 +17,11 @@
  *  under the License.
  */
 
-package org.apache.isis.core.progmodel.facets.propparam.validate.mandatory;
+package org.apache.isis.core.metamodel.facets.mandatory;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.progmodel.facets.ObjectAdapterUtils;
+import org.apache.isis.core.metamodel.spec.ObjectAdapterUtils;
 
 /**
  * Whether a property or a parameter is mandatory (not optional).

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/member/ordering/MemberOrderFacet.java (from r1059849, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/MemberOrderFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/member/ordering/MemberOrderFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/member/ordering/MemberOrderFacet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/MemberOrderFacet.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/MemberOrderFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/member/ordering/MemberOrderFacet.java Mon Jan 17 18:22:58 2011
@@ -17,11 +17,11 @@
  *  under the License.
  */
 
-package org.apache.isis.core.metamodel.facets.ordering;
+package org.apache.isis.core.metamodel.facets.member.ordering;
 
 import org.apache.isis.core.metamodel.facets.MultipleValueFacet;
-import org.apache.isis.core.metamodel.facets.ordering.actionorder.ActionOrderFacet;
-import org.apache.isis.core.metamodel.layout.ordermethod.FieldOrderFacet;
+import org.apache.isis.core.metamodel.facets.object.orderactions.ActionOrderFacet;
+import org.apache.isis.core.metamodel.facets.object.orderfields.FieldOrderFacet;
 
 /**
  * The preferred mechanism for determining the order in which the members of the object should be rendered.

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/multiline/MultiLineFacet.java (from r1059849, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/multiline/MultiLineFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/multiline/MultiLineFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/multiline/MultiLineFacet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/multiline/MultiLineFacet.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/multiline/MultiLineFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/multiline/MultiLineFacet.java Mon Jan 17 18:22:58 2011
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.metamodel.facets.propparam.multiline;
+package org.apache.isis.core.metamodel.facets.multiline;
 
 import org.apache.isis.core.metamodel.facets.MultipleValueFacet;
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/multiline/MultiLineFacetAbstract.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/multiline/MultiLineFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/multiline/MultiLineFacetAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/multiline/MultiLineFacetAbstract.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/multiline/MultiLineFacetAbstract.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/multiline/MultiLineFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/multiline/MultiLineFacetAbstract.java Mon Jan 17 18:22:58 2011
@@ -18,12 +18,11 @@
  */
 
 
-package org.apache.isis.core.progmodel.facets.propparam.multiline;
+package org.apache.isis.core.metamodel.facets.multiline;
 
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.MultipleValueFacetAbstract;
-import org.apache.isis.core.metamodel.facets.propparam.multiline.MultiLineFacet;
 
 
 public abstract class MultiLineFacetAbstract extends MultipleValueFacetAbstract implements MultiLineFacet {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/named/NamedFacet.java (from r1059849, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/naming/named/NamedFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/named/NamedFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/named/NamedFacet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/naming/named/NamedFacet.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/naming/named/NamedFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/named/NamedFacet.java Mon Jan 17 18:22:58 2011
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.metamodel.facets.naming.named;
+package org.apache.isis.core.metamodel.facets.named;
 
 import org.apache.isis.core.metamodel.facets.SingleStringValueFacet;
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/named/NamedFacetAbstract.java (from r1059849, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/naming/named/NamedFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/named/NamedFacetAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/named/NamedFacetAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/naming/named/NamedFacetAbstract.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/naming/named/NamedFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/named/NamedFacetAbstract.java Mon Jan 17 18:22:58 2011
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.facets.naming.named;
+package org.apache.isis.core.metamodel.facets.named;
 
 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/facets/named/NamedFacetInferred.java (from r1059849, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/naming/named/NamedFacetInferred.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/named/NamedFacetInferred.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/named/NamedFacetInferred.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/naming/named/NamedFacetInferred.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/naming/named/NamedFacetInferred.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/named/NamedFacetInferred.java Mon Jan 17 18:22:58 2011
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.facets.naming.named;
+package org.apache.isis.core.metamodel.facets.named;
 
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/notpersisted/NotPersistedFacet.java (from r1059849, 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/notpersisted/NotPersistedFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/notpersisted/NotPersistedFacet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propcoll/notpersisted/NotPersistedFacet.java&r1=1059849&r2=1060035&rev=1060035&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/notpersisted/NotPersistedFacet.java Mon Jan 17 18:22:58 2011
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.metamodel.facets.propcoll.notpersisted;
+package org.apache.isis.core.metamodel.facets.notpersisted;
 
 import org.apache.isis.core.metamodel.facets.MarkerFacet;
 import org.apache.isis.core.metamodel.interactions.DisablingInteractionAdvisor;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/notpersisted/NotPersistedFacetAbstract.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propcoll/notpersisted/NotPersistedFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/notpersisted/NotPersistedFacetAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/notpersisted/NotPersistedFacetAbstract.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propcoll/notpersisted/NotPersistedFacetAbstract.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propcoll/notpersisted/NotPersistedFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/notpersisted/NotPersistedFacetAbstract.java Mon Jan 17 18:22:58 2011
@@ -18,12 +18,11 @@
  */
 
 
-package org.apache.isis.core.progmodel.facets.propcoll.notpersisted;
+package org.apache.isis.core.metamodel.facets.notpersisted;
 
 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.propcoll.notpersisted.NotPersistedFacet;
 
 
 public abstract class NotPersistedFacetAbstract extends MarkerFacetAbstract implements NotPersistedFacet {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/aggregated/AggregatedFacetAbstract.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/aggregated/AggregatedFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/aggregated/AggregatedFacetAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/aggregated/AggregatedFacetAbstract.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/aggregated/AggregatedFacetAbstract.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/aggregated/AggregatedFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/aggregated/AggregatedFacetAbstract.java Mon Jan 17 18:22:58 2011
@@ -18,12 +18,11 @@
  */
 
 
-package org.apache.isis.core.progmodel.facets.object.aggregated;
+package org.apache.isis.core.metamodel.facets.object.aggregated;
 
 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.object.aggregated.AggregatedFacet;
 
 
 public abstract class AggregatedFacetAbstract extends MarkerFacetAbstract implements AggregatedFacet {

Added: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bounded/BoundedFacetUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bounded/BoundedFacetUtils.java?rev=1060035&view=auto
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bounded/BoundedFacetUtils.java (added)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bounded/BoundedFacetUtils.java Mon Jan 17 18:22:58 2011
@@ -0,0 +1,36 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+
+package org.apache.isis.core.metamodel.facets.object.bounded;
+
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+
+
+
+public class BoundedFacetUtils {
+
+
+    private BoundedFacetUtils() {}
+
+    public static boolean isBoundedSet(final ObjectSpecification specification) {
+        return specification.getFacet(BoundedFacet.class) != null;
+    }
+}
+

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/cached/CachedFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/cached/CachedFacet.java?rev=1060035&r1=1060034&r2=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/cached/CachedFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/cached/CachedFacet.java Mon Jan 17 18:22:58 2011
@@ -37,4 +37,5 @@ import org.apache.isis.core.metamodel.fa
  */
 public interface CachedFacet extends MarkerFacet {
 
+
 }

Added: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/cached/CachedFacetUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/cached/CachedFacetUtils.java?rev=1060035&view=auto
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/cached/CachedFacetUtils.java (added)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/cached/CachedFacetUtils.java Mon Jan 17 18:22:58 2011
@@ -0,0 +1,36 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+
+package org.apache.isis.core.metamodel.facets.object.cached;
+
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+
+
+
+public class CachedFacetUtils {
+
+
+    private CachedFacetUtils() {}
+
+    public static boolean isCached(final ObjectSpecification specification) {
+        return specification.getFacet(CachedFacet.class) != null;
+    }
+}
+

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/icon/IconFacet.java (from r1059849, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ident/icon/IconFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/icon/IconFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/icon/IconFacet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ident/icon/IconFacet.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ident/icon/IconFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/icon/IconFacet.java Mon Jan 17 18:22:58 2011
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.metamodel.facets.object.ident.icon;
+package org.apache.isis.core.metamodel.facets.object.icon;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facetapi.Facet;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/icon/IconFacetAbstract.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/icon/IconFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/icon/IconFacetAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/icon/IconFacetAbstract.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/icon/IconFacetAbstract.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/icon/IconFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/icon/IconFacetAbstract.java Mon Jan 17 18:22:58 2011
@@ -18,12 +18,11 @@
  */
 
 
-package org.apache.isis.core.progmodel.facets.object.icon;
+package org.apache.isis.core.metamodel.facets.object.icon;
 
 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.object.ident.icon.IconFacet;
 
 
 public abstract class IconFacetAbstract extends FacetAbstract implements IconFacet {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacetAbstract.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/ImmutableFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacetAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacetAbstract.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/ImmutableFacetAbstract.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/ImmutableFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacetAbstract.java Mon Jan 17 18:22:58 2011
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.progmodel.facets.object.immutable;
+package org.apache.isis.core.metamodel.facets.object.immutable;
 
 import org.apache.isis.applib.events.UsabilityEvent;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -26,7 +26,6 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.SingleWhenValueFacetAbstract;
 import org.apache.isis.core.metamodel.facets.When;
-import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;
 import org.apache.isis.core.metamodel.interactions.UsabilityContext;
 
 
@@ -40,14 +39,31 @@ public abstract class ImmutableFacetAbst
         super(type(), holder, value);
     }
 
-    /**
-     * Hook method for subclasses to override.
-     */
-    public abstract String disabledReason(ObjectAdapter no);
-
+    @Override
     public String disables(final UsabilityContext<? extends UsabilityEvent> ic) {
         final ObjectAdapter target = ic.getTarget();
         return disabledReason(target);
     }
-
+
+    public String disabledReason(final ObjectAdapter targetAdapter) {
+        if (value() == When.ALWAYS) {
+            return "Always hidden";
+        } else if (value() == When.NEVER) {
+            return null;
+        }
+
+        // remaining tests depend on target in question.
+        if (targetAdapter == null) {
+            return null;
+        }
+
+        if (value() == When.UNTIL_PERSISTED) {
+            return targetAdapter.isTransient() ? "Immutable until persisted" : null;
+        } else if (value() == When.ONCE_PERSISTED) {
+            return targetAdapter.isPersistent() ? "Immutable once persisted" : null;
+        }
+        return null;
+    }
+
+    
 }

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacetUtils.java (from r1059849, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SpecificationFacets.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacetUtils.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacetUtils.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SpecificationFacets.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SpecificationFacets.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacetUtils.java Mon Jan 17 18:22:58 2011
@@ -18,15 +18,13 @@
  */
 
 
-package org.apache.isis.core.metamodel.facets;
+package org.apache.isis.core.metamodel.facets.object.immutable;
 
-import org.apache.isis.core.metamodel.facets.object.bounded.BoundedFacet;
-import org.apache.isis.core.metamodel.facets.object.cached.CachedFacet;
-import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;
+import org.apache.isis.core.metamodel.facets.When;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
 
-public class SpecificationFacets {
+public class ImmutableFacetUtils {
 
     public static boolean isAlwaysImmutable(final ObjectSpecification specification) {
     	// this is a workaround for a dubious test
@@ -54,14 +52,6 @@ public class SpecificationFacets {
         return immutableFacet.value() == When.ONCE_PERSISTED;
     }
 
-    public static boolean isBoundedSet(final ObjectSpecification specification) {
-        return specification.getFacet(BoundedFacet.class) != null;
-    }
-
-    public static boolean isCached(final ObjectSpecification specification) {
-        return specification.getFacet(CachedFacet.class) != null;
-    }
-
-    private SpecificationFacets() {}
+    private ImmutableFacetUtils() {}
 }
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/orderactions/ActionOrderFacet.java (from r1059849, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/actionorder/ActionOrderFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/orderactions/ActionOrderFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/orderactions/ActionOrderFacet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/actionorder/ActionOrderFacet.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ordering/actionorder/ActionOrderFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/orderactions/ActionOrderFacet.java Mon Jan 17 18:22:58 2011
@@ -17,11 +17,11 @@
  *  under the License.
  */
 
-package org.apache.isis.core.metamodel.facets.ordering.actionorder;
+package org.apache.isis.core.metamodel.facets.object.orderactions;
 
 import org.apache.isis.core.metamodel.facets.SingleStringValueFacet;
-import org.apache.isis.core.metamodel.facets.ordering.MemberOrderFacet;
-import org.apache.isis.core.metamodel.layout.ordermethod.FieldOrderFacet;
+import org.apache.isis.core.metamodel.facets.member.ordering.MemberOrderFacet;
+import org.apache.isis.core.metamodel.facets.object.orderfields.FieldOrderFacet;
 
 /**
  * (One of the) mechanism(s) for determining the order in which the actions of the object should be rendered.

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/orderfields/FieldOrderFacet.java (from r1059849, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/ordermethod/FieldOrderFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/orderfields/FieldOrderFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/orderfields/FieldOrderFacet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/ordermethod/FieldOrderFacet.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/ordermethod/FieldOrderFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/orderfields/FieldOrderFacet.java Mon Jan 17 18:22:58 2011
@@ -17,11 +17,11 @@
  *  under the License.
  */
 
-package org.apache.isis.core.metamodel.layout.ordermethod;
+package org.apache.isis.core.metamodel.facets.object.orderfields;
 
 import org.apache.isis.core.metamodel.facets.SingleStringValueFacet;
-import org.apache.isis.core.metamodel.facets.ordering.MemberOrderFacet;
-import org.apache.isis.core.metamodel.facets.ordering.actionorder.ActionOrderFacet;
+import org.apache.isis.core.metamodel.facets.member.ordering.MemberOrderFacet;
+import org.apache.isis.core.metamodel.facets.object.orderactions.ActionOrderFacet;
 
 /**
  * (One of the) mechanism(s) for determining the order in which the properties and collections of the object should be

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacet.java?rev=1060035&r1=1060034&r2=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacet.java Mon Jan 17 18:22:58 2011
@@ -22,7 +22,7 @@ package org.apache.isis.core.metamodel.f
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.MultipleValueFacet;
-import org.apache.isis.core.metamodel.facets.object.ident.title.TitleFacet;
+import org.apache.isis.core.metamodel.facets.object.title.TitleFacet;
 
 
 /**

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/plural/PluralFacet.java (from r1059849, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ident/plural/PluralFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/plural/PluralFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/plural/PluralFacet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ident/plural/PluralFacet.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ident/plural/PluralFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/plural/PluralFacet.java Mon Jan 17 18:22:58 2011
@@ -17,11 +17,11 @@
  *  under the License.
  */
 
-package org.apache.isis.core.metamodel.facets.object.ident.plural;
+package org.apache.isis.core.metamodel.facets.object.plural;
 
 import org.apache.isis.core.metamodel.facets.SingleStringValueFacet;
-import org.apache.isis.core.metamodel.facets.object.ident.icon.IconFacet;
-import org.apache.isis.core.metamodel.facets.object.ident.title.TitleFacet;
+import org.apache.isis.core.metamodel.facets.object.icon.IconFacet;
+import org.apache.isis.core.metamodel.facets.object.title.TitleFacet;
 
 /**
  * Mechanism for obtaining the plural title of an instance of a class, used to label a collection of a certain class.

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/plural/PluralFacetAbstract.java (from r1059849, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ident/plural/PluralFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/plural/PluralFacetAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/plural/PluralFacetAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ident/plural/PluralFacetAbstract.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ident/plural/PluralFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/plural/PluralFacetAbstract.java Mon Jan 17 18:22:58 2011
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.facets.object.ident.plural;
+package org.apache.isis.core.metamodel.facets.object.plural;
 
 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/facets/object/plural/PluralFacetInferred.java (from r1059849, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ident/plural/PluralFacetInferred.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/plural/PluralFacetInferred.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/plural/PluralFacetInferred.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ident/plural/PluralFacetInferred.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ident/plural/PluralFacetInferred.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/plural/PluralFacetInferred.java Mon Jan 17 18:22:58 2011
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.facets.object.ident.plural;
+package org.apache.isis.core.metamodel.facets.object.plural;
 
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/TitleFacet.java (from r1059849, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ident/title/TitleFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/TitleFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/TitleFacet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ident/title/TitleFacet.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ident/title/TitleFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/TitleFacet.java Mon Jan 17 18:22:58 2011
@@ -17,12 +17,12 @@
  *  under the License.
  */
 
-package org.apache.isis.core.metamodel.facets.object.ident.title;
+package org.apache.isis.core.metamodel.facets.object.title;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.facets.object.ident.icon.IconFacet;
-import org.apache.isis.core.metamodel.facets.object.ident.plural.PluralFacet;
+import org.apache.isis.core.metamodel.facets.object.icon.IconFacet;
+import org.apache.isis.core.metamodel.facets.object.plural.PluralFacet;
 
 /**
  * Mechanism for obtaining the title of an instance of a class, used to label the instance in the viewer (usually

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/TitleFacetAbstract.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ident/title/TitleFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/TitleFacetAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/TitleFacetAbstract.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ident/title/TitleFacetAbstract.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ident/title/TitleFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/TitleFacetAbstract.java Mon Jan 17 18:22:58 2011
@@ -18,12 +18,11 @@
  */
 
 
-package org.apache.isis.core.progmodel.facets.object.ident.title;
+package org.apache.isis.core.metamodel.facets.object.title;
 
 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.object.ident.title.TitleFacet;
 
 
 public abstract class TitleFacetAbstract extends FacetAbstract implements TitleFacet {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/ActionParameterChoicesFacet.java (from r1059849, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/choices/ActionParameterChoicesFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/ActionParameterChoicesFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/ActionParameterChoicesFacet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/choices/ActionParameterChoicesFacet.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/choices/ActionParameterChoicesFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/ActionParameterChoicesFacet.java Mon Jan 17 18:22:58 2011
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.metamodel.facets.actions.choices;
+package org.apache.isis.core.metamodel.facets.param.choices;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facetapi.Facet;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/defaults/ActionParameterDefaultsFacet.java (from r1059849, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/defaults/ActionParameterDefaultsFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/defaults/ActionParameterDefaultsFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/defaults/ActionParameterDefaultsFacet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/defaults/ActionParameterDefaultsFacet.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/defaults/ActionParameterDefaultsFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/defaults/ActionParameterDefaultsFacet.java Mon Jan 17 18:22:58 2011
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.metamodel.facets.actions.defaults;
+package org.apache.isis.core.metamodel.facets.param.defaults;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facetapi.Facet;



Mime
View raw message