incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1051971 [17/18] - in /incubator/isis/trunk: alternatives/bytecode/identity/src/main/java/org/apache/isis/alternatives/bytecode/identity/objectfactory/ alternatives/bytecode/javassist/src/main/java/org/apache/isis/alternatives/bytecode/java...
Date Wed, 22 Dec 2010 16:22:32 GMT
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/ObjectAssociationNoop.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/ObjectAssociationNoop.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/ObjectAssociationNoop.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/ObjectAssociationNoop.java Wed Dec 22 16:22:08 2010
@@ -21,20 +21,20 @@
 package org.apache.isis.core.runtime.testsystem;
 
 import org.apache.isis.applib.Identifier;
+import org.apache.isis.core.metamodel.adapter.AdapterMap;
 import org.apache.isis.core.metamodel.adapter.Instance;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.QuerySubmitter;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSessionProvider;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+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.runtimecontext.AuthenticationSessionProvider;
-import org.apache.isis.core.metamodel.runtimecontext.AdapterMap;
-import org.apache.isis.core.metamodel.runtimecontext.QuerySubmitter;
-import org.apache.isis.core.metamodel.runtimecontext.spec.feature.FeatureType;
 import org.apache.isis.core.metamodel.runtimecontext.spec.feature.ObjectAssociationAbstract;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.SpecificationLookup;
 import org.apache.isis.core.metamodel.spec.identifier.IdentifiedImpl;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 
 
 public class ObjectAssociationNoop extends ObjectAssociationAbstract {
@@ -43,10 +43,10 @@ public class ObjectAssociationNoop exten
     		final String name, 
     		final ObjectSpecification spec, 
     		final AuthenticationSessionProvider authenticationSessionProvider,
-    		final SpecificationLoader specificationLoader, 
+    		final SpecificationLookup specificationLookup, 
     		final AdapterMap adapterManager,
             final QuerySubmitter querySubmitter) {
-        super(name, spec, FeatureType.PROPERTY, new IdentifiedImpl(), authenticationSessionProvider, specificationLoader, adapterManager, querySubmitter);
+        super(name, spec, FeatureType.PROPERTY, new IdentifiedImpl(), authenticationSessionProvider, specificationLookup, adapterManager, querySubmitter);
     }
 
     @Override

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestObjectFactory.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestObjectFactory.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestObjectFactory.java Wed Dec 22 16:22:08 2010
@@ -21,7 +21,7 @@ package org.apache.isis.core.runtime.tes
 
 import java.lang.reflect.Modifier;
 
-import org.apache.isis.core.metamodel.runtimecontext.ObjectInstantiationException;
+import org.apache.isis.core.metamodel.spec.ObjectInstantiationException;
 import org.apache.isis.core.runtime.persistence.objectfactory.ObjectFactoryAbstract;
 import org.apache.isis.core.runtime.persistence.objectfactory.ObjectFactoryAbstract.Mode;
 

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyAction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyAction.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyAction.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyAction.java Wed Dec 22 16:22:08 2010
@@ -31,12 +31,12 @@ import org.apache.isis.core.metamodel.co
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
 import org.apache.isis.core.metamodel.facets.FacetHolderNoop;
+import org.apache.isis.core.metamodel.feature.FeatureType;
 import org.apache.isis.core.metamodel.interactions.ActionInvocationContext;
 import org.apache.isis.core.metamodel.interactions.UsabilityContext;
 import org.apache.isis.core.metamodel.interactions.VisibilityContext;
 import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.core.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
-import org.apache.isis.core.metamodel.runtimecontext.spec.feature.FeatureType;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.Target;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
@@ -259,9 +259,6 @@ public class TestProxyAction extends Fac
 		return runtimeContext;
 	}
 
-    /* (non-Javadoc)
-     * @see org.apache.isis.core.metamodel.spec.feature.ObjectFeature#getFeatureType()
-     */
     @Override
     public FeatureType getFeatureType() {
         return FeatureType.ACTION;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyAssociation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyAssociation.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyAssociation.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyAssociation.java Wed Dec 22 16:22:08 2010
@@ -36,6 +36,7 @@ import org.apache.isis.core.metamodel.co
 import org.apache.isis.core.metamodel.consent.InteractionResult;
 import org.apache.isis.core.metamodel.facets.Facet;
 import org.apache.isis.core.metamodel.facets.FacetHolderNoop;
+import org.apache.isis.core.metamodel.feature.FeatureType;
 import org.apache.isis.core.metamodel.interactions.InteractionContext;
 import org.apache.isis.core.metamodel.interactions.PropertyAccessContext;
 import org.apache.isis.core.metamodel.interactions.UsabilityContext;
@@ -43,7 +44,6 @@ import org.apache.isis.core.metamodel.in
 import org.apache.isis.core.metamodel.interactions.VisibilityContext;
 import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.core.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
-import org.apache.isis.core.metamodel.runtimecontext.spec.feature.FeatureType;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.core.metamodel.testspec.TestProxySpecification;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyField.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyField.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyField.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyField.java Wed Dec 22 16:22:08 2010
@@ -30,12 +30,12 @@ import org.apache.isis.core.metamodel.co
 import org.apache.isis.core.metamodel.consent.InteractionResult;
 import org.apache.isis.core.metamodel.consent.InteractionResultSet;
 import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
+import org.apache.isis.core.metamodel.feature.FeatureType;
 import org.apache.isis.core.metamodel.interactions.UsabilityContext;
 import org.apache.isis.core.metamodel.interactions.ValidityContext;
 import org.apache.isis.core.metamodel.interactions.VisibilityContext;
 import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.core.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
-import org.apache.isis.core.metamodel.runtimecontext.spec.feature.FeatureType;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyIdentityMapOriginal.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyIdentityMapOriginal.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyIdentityMapOriginal.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyIdentityMapOriginal.java Wed Dec 22 16:22:08 2010
@@ -30,8 +30,8 @@ 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.spec.identifier.Identified;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.feature.IdentifiedHolder;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.persistence.PersistenceSession;
 import org.apache.isis.core.runtime.persistence.adapterfactory.AdapterFactory;
@@ -135,7 +135,7 @@ public class TestProxyIdentityMapOrigina
         throw new NotYetImplementedException();
     }
 
-    public ObjectAdapter adapterFor(Object pojo, ObjectAdapter ownerAdapter, Identified identified) {
+    public ObjectAdapter adapterFor(Object pojo, ObjectAdapter ownerAdapter, IdentifiedHolder identifiedHolder) {
         throw new NotYetImplementedException();
     }
 

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyPersistenceSessionFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyPersistenceSessionFactory.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyPersistenceSessionFactory.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyPersistenceSessionFactory.java Wed Dec 22 16:22:08 2010
@@ -24,7 +24,7 @@ import java.util.Collections;
 import java.util.List;
 
 import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
 import org.apache.isis.core.runtime.persistence.PersistenceSession;
 import org.apache.isis.core.runtime.persistence.PersistenceSessionFactory;
 import org.apache.isis.core.runtime.system.DeploymentType;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyReflector.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyReflector.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyReflector.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyReflector.java Wed Dec 22 16:22:08 2010
@@ -30,8 +30,8 @@ import org.apache.isis.core.metamodel.ru
 import org.apache.isis.core.metamodel.services.ServicesInjector;
 import org.apache.isis.core.metamodel.services.ServicesInjectorNoop;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.SpecificationLoaderAware;
 import org.apache.isis.core.metamodel.specloader.ObjectReflector;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoaderAware;
 import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutor;
 import org.apache.isis.core.metamodel.specloader.internal.cache.SpecificationCache;
 import org.apache.isis.core.metamodel.specloader.progmodelfacets.ProgrammingModelFacets;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxySystem.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxySystem.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxySystem.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxySystem.java Wed Dec 22 16:22:08 2010
@@ -28,10 +28,10 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.adapter.ResolveState;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
 import org.apache.isis.core.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacetDefaultToObject;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.specloader.ObjectReflector;
 import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
-import org.apache.isis.core.progmodel.facets.actcoll.typeof.TypeOfFacetDefaultToObject;
 import org.apache.isis.core.runtime.authentication.AuthenticationManager;
 import org.apache.isis.core.runtime.authorization.AuthorizationManager;
 import org.apache.isis.core.runtime.context.IsisContext;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestSpecification.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestSpecification.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestSpecification.java Wed Dec 22 16:22:08 2010
@@ -37,10 +37,9 @@ import org.apache.isis.core.metamodel.co
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
 import org.apache.isis.core.metamodel.consent.InteractionResult;
 import org.apache.isis.core.metamodel.facets.FacetHolderNoop;
+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.runtimecontext.RuntimeContext;
-import org.apache.isis.core.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
 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;
@@ -65,22 +64,23 @@ public class TestSpecification extends F
     private final String name;
     private List<ObjectSpecification> subclasses = Collections.emptyList();
     private String title;
-	private RuntimeContext runtimeContext;
 
     public TestSpecification() {
         this((String) null);
-        this.runtimeContext = new RuntimeContextNoRuntime();
     }
 
+    @Override
+    public FeatureType getFeatureType() {
+        return FeatureType.OBJECT;
+    }
+    
+
     public TestSpecification(final String name) {
         this.name = name == null ? "DummyObjectSpecification#" + id : name;
         title = "";
     }
 
     @Override
-    public void addSubclass(final ObjectSpecification specification) {}
-
-    @Override
     public void clearDirty(final ObjectAdapter object) {}
 
     @Override
@@ -89,7 +89,7 @@ public class TestSpecification extends F
     }
 
     @Override
-    public List<ObjectAction> getServiceActionsFor(final ObjectActionType... type) {
+    public List<ObjectAction> getServiceActionsReturning(final ObjectActionType... type) {
         return null;
     }
 
@@ -194,13 +194,13 @@ public class TestSpecification extends F
     }
 
     @Override
-    public String getSingularName() {
+    public String getName() {
         return name + " (singular)";
     }
 
     @Override
     public String getDescription() {
-        return getSingularName();
+        return getName();
     }
 
     @Override
@@ -319,7 +319,7 @@ public class TestSpecification extends F
     public boolean isCollection() {
         return false;
     }
-
+    
     @Override
     public boolean isNotCollection() {
         return !isCollection();

Modified: incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/defaults/bytecode/objectfactory/CglibObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/defaults/bytecode/objectfactory/CglibObjectFactory.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/defaults/bytecode/objectfactory/CglibObjectFactory.java (original)
+++ incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/defaults/bytecode/objectfactory/CglibObjectFactory.java Wed Dec 22 16:22:08 2010
@@ -19,7 +19,7 @@
 
 package org.apache.isis.defaults.bytecode.objectfactory;
 
-import org.apache.isis.core.metamodel.runtimecontext.ObjectInstantiationException;
+import org.apache.isis.core.metamodel.spec.ObjectInstantiationException;
 import org.apache.isis.core.runtime.persistence.container.DomainObjectContainerObjectChanged;
 import org.apache.isis.core.runtime.persistence.container.DomainObjectContainerResolve;
 import org.apache.isis.core.runtime.persistence.objectfactory.ObjectChanger;

Modified: incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/defaults/bytecode/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/defaults/bytecode/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/defaults/bytecode/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java (original)
+++ incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/defaults/bytecode/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java Wed Dec 22 16:22:08 2010
@@ -30,12 +30,12 @@ import net.sf.cglib.proxy.MethodIntercep
 import net.sf.cglib.proxy.MethodProxy;
 
 import org.apache.isis.core.commons.lang.ArrayUtils;
-import org.apache.isis.core.metamodel.java5.ImperativeFacet;
-import org.apache.isis.core.metamodel.java5.ImperativeFacetUtils;
-import org.apache.isis.core.metamodel.java5.ImperativeFacetUtils.ImperativeFacetFlags;
+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;
+import org.apache.isis.core.metamodel.java5.JavaSpecification;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
 import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.progmodel.spec.JavaSpecification;
 import org.apache.isis.core.runtime.bytecode.ObjectResolveAndObjectChangedEnhancerAbstract;
 import org.apache.isis.core.runtime.persistence.objectfactory.ObjectChanger;
 import org.apache.isis.core.runtime.persistence.objectfactory.ObjectResolver;

Modified: incubator/isis/trunk/defaults/bytecode/src/test/java/org/apache/isis/defaults/bytecode/objectfactory/internal/ClassEnhancerTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/bytecode/src/test/java/org/apache/isis/defaults/bytecode/objectfactory/internal/ClassEnhancerTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/bytecode/src/test/java/org/apache/isis/defaults/bytecode/objectfactory/internal/ClassEnhancerTest.java (original)
+++ incubator/isis/trunk/defaults/bytecode/src/test/java/org/apache/isis/defaults/bytecode/objectfactory/internal/ClassEnhancerTest.java Wed Dec 22 16:22:08 2010
@@ -36,7 +36,8 @@ import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
 import org.apache.isis.core.runtime.persistence.objectfactory.ObjectChanger;
 import org.apache.isis.core.runtime.persistence.objectfactory.ObjectResolver;
 import org.apache.isis.defaults.bytecode.objectfactory.internal.ObjectResolveAndObjectChangedEnhancer;

Modified: incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore.java Wed Dec 22 16:22:08 2010
@@ -35,9 +35,9 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
 import org.apache.isis.core.metamodel.adapter.version.Version;
 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.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.persistence.ObjectNotFoundException;
 import org.apache.isis.core.runtime.persistence.PersistenceSession;

Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/testsystem/TestProxySystemII.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/testsystem/TestProxySystemII.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/testsystem/TestProxySystemII.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/testsystem/TestProxySystemII.java Wed Dec 22 16:22:08 2010
@@ -23,9 +23,14 @@ package org.apache.isis.defaults.objects
 import java.util.Collections;
 import java.util.List;
 
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.jmock.lib.legacy.ClassImposteriser;
+
 import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
-import org.apache.isis.core.metamodel.specloader.ObjectReflectorAbstract;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
+import org.apache.isis.core.metamodel.specloader.ObjectReflectorDefault;
 import org.apache.isis.core.runtime.authentication.AuthenticationManager;
 import org.apache.isis.core.runtime.authentication.standard.SimpleSession;
 import org.apache.isis.core.runtime.authorization.AuthorizationManager;
@@ -39,10 +44,6 @@ import org.apache.isis.core.runtime.syst
 import org.apache.isis.core.runtime.userprofile.UserProfileLoader;
 import org.apache.isis.defaults.objectstore.InMemoryPersistenceMechanismInstaller;
 import org.apache.isis.defaults.progmodel.JavaReflectorInstaller;
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.jmock.lib.legacy.ClassImposteriser;
 
 /*
  * TODO allow to be created with specific requirements for components being set up rather than using mocks.
@@ -83,7 +84,7 @@ public class TestProxySystemII {
         javaReflectorInstaller.setConfiguration(configuration);
         mockSpecificationLoader = javaReflectorInstaller.createReflector();
 
-        ((ObjectReflectorAbstract) mockSpecificationLoader).setRuntimeContext(new RuntimeContextFromSession());
+        ((ObjectReflectorDefault) mockSpecificationLoader).setRuntimeContext(new RuntimeContextFromSession());
 
         InMemoryPersistenceMechanismInstaller persistenceMechanismInstaller = new InMemoryPersistenceMechanismInstaller();
         persistenceMechanismInstaller.setConfiguration(configuration);

Modified: incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/defaults/progmodel/JavaReflectorInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/defaults/progmodel/JavaReflectorInstaller.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/defaults/progmodel/JavaReflectorInstaller.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/defaults/progmodel/JavaReflectorInstaller.java Wed Dec 22 16:22:08 2010
@@ -32,6 +32,7 @@ import org.apache.isis.core.metamodel.co
 import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
 import org.apache.isis.core.metamodel.facets.FacetFactory;
 import org.apache.isis.core.metamodel.specloader.FacetDecoratorInstaller;
+import org.apache.isis.core.metamodel.specloader.ObjectReflectorDefault;
 import org.apache.isis.core.metamodel.specloader.ObjectReflector;
 import org.apache.isis.core.metamodel.specloader.ObjectReflectorInstaller;
 import org.apache.isis.core.metamodel.specloader.ReflectorConstants;
@@ -83,7 +84,7 @@ public class JavaReflectorInstaller exte
     /**
      * Should call {@link #addFacetDecoratorInstaller(ReflectorDecoratorInstaller)} prior to calling this.
      */
-    public JavaReflector createReflector() {
+    public ObjectReflectorDefault createReflector() {
         final ClassSubstitutor classSubstitutor = createClassSubstitutor(getConfiguration());
         final CollectionTypeRegistry collectionTypeRegistry = createCollectionTypeRegistry(getConfiguration());
         final SpecificationTraverser specificationTraverser = createSpecificationTraverser(getConfiguration());
@@ -91,7 +92,7 @@ public class JavaReflectorInstaller exte
         final Set<FacetDecorator> facetDecorators = createFacetDecorators(getConfiguration());
         final MetaModelValidator metaModelValidator = createMetaModelValidator(getConfiguration());
 
-		final JavaReflector reflector = doCreateReflector(getConfiguration(), classSubstitutor, collectionTypeRegistry,
+		final ObjectReflectorDefault reflector = doCreateReflector(getConfiguration(), classSubstitutor, collectionTypeRegistry,
                 specificationTraverser, programmingModelFacets, facetDecorators, metaModelValidator);
 
         return reflector;
@@ -280,9 +281,9 @@ public class JavaReflectorInstaller exte
     }
 
     /**
-     * Hook method to allow for other implementations (still based on {@link JavaReflector}).
+     * Hook method to allow for other implementations (still based on {@link ObjectReflectorDefault}).
      */
-    protected JavaReflector doCreateReflector(
+    protected ObjectReflectorDefault doCreateReflector(
             final IsisConfiguration configuration,
             final ClassSubstitutor classSubstitutor,
             final CollectionTypeRegistry collectionTypeRegistry,
@@ -290,7 +291,7 @@ public class JavaReflectorInstaller exte
             final ProgrammingModelFacets programmingModelFacets, 
             final Set<FacetDecorator> facetDecorators, 
             final MetaModelValidator metaModelValidator) {
-        return new JavaReflector(configuration, classSubstitutor, collectionTypeRegistry, specificationTraverser, programmingModelFacets, facetDecorators, metaModelValidator);
+        return new ObjectReflectorDefault(configuration, classSubstitutor, collectionTypeRegistry, specificationTraverser, programmingModelFacets, facetDecorators, metaModelValidator);
     }
 
     // /////////////////////////////////////////////////////

Modified: incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/defaults/progmodel/ProgrammingModelFacetsJava5.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/defaults/progmodel/ProgrammingModelFacetsJava5.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/defaults/progmodel/ProgrammingModelFacetsJava5.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/defaults/progmodel/ProgrammingModelFacetsJava5.java Wed Dec 22 16:22:08 2010
@@ -20,12 +20,12 @@
 
 package org.apache.isis.defaults.progmodel;
 
-import org.apache.isis.core.metamodel.java5.RemoveGetClassMethodFacetFactory;
-import org.apache.isis.core.metamodel.java5.RemoveInitMethodFacetFactory;
-import org.apache.isis.core.metamodel.java5.RemoveJavaLangObjectMethodsFacetFactory;
-import org.apache.isis.core.metamodel.java5.RemoveSetDomainObjectContainerMethodFacetFactory;
-import org.apache.isis.core.metamodel.java5.RemoveStaticGettersAndSettersFacetFactory;
-import org.apache.isis.core.metamodel.java5.RemoveSuperclassMethodsFacetFactory;
+import org.apache.isis.core.metamodel.facets.object.isis.RemoveSetDomainObjectContainerMethodFacetFactory;
+import org.apache.isis.core.metamodel.facets.object.isis.RemoveStaticGettersAndSettersFacetFactory;
+import org.apache.isis.core.metamodel.facets.object.java5.RemoveGetClassMethodFacetFactory;
+import org.apache.isis.core.metamodel.facets.object.java5.RemoveInitMethodFacetFactory;
+import org.apache.isis.core.metamodel.facets.object.java5.RemoveJavaLangObjectMethodsFacetFactory;
+import org.apache.isis.core.metamodel.facets.object.java5.RemoveSuperclassMethodsFacetFactory;
 import org.apache.isis.core.metamodel.specloader.progmodelfacets.ProgrammingModelFacetsAbstract;
 import org.apache.isis.core.progmodel.facets.FallbackFacetFactory;
 import org.apache.isis.core.progmodel.facets.actcoll.typeof.TypeOfAnnotationFacetFactory;

Modified: incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflectorTestAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflectorTestAbstract.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflectorTestAbstract.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflectorTestAbstract.java Wed Dec 22 16:22:08 2010
@@ -30,11 +30,12 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.facets.naming.describedas.DescribedAsFacet;
 import org.apache.isis.core.metamodel.facets.naming.named.NamedFacet;
+import org.apache.isis.core.metamodel.facets.object.ident.plural.PluralFacet;
 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.facets.object.ident.plural.PluralFacet;
 import org.apache.isis.core.runtime.authentication.AuthenticationManager;
 import org.apache.isis.core.runtime.authorization.AuthorizationManager;
 import org.apache.isis.core.runtime.context.IsisContextStatic;
@@ -46,7 +47,6 @@ import org.apache.isis.core.runtime.sess
 import org.apache.isis.core.runtime.system.DeploymentType;
 import org.apache.isis.core.runtime.testsystem.TestClassSubstitutor;
 import org.apache.isis.core.runtime.userprofile.UserProfileLoader;
-import org.apache.isis.defaults.progmodel.JavaReflector;
 import org.apache.isis.defaults.progmodel.ProgrammingModelFacetsJava5;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
@@ -96,8 +96,8 @@ public abstract class JavaReflectorTestA
             }
         });
 
-        final JavaReflector reflector =
-            new JavaReflector(configuration, new TestClassSubstitutor(), new CollectionTypeRegistryDefault(),
+        final ObjectReflectorDefault reflector =
+            new ObjectReflectorDefault(configuration, new TestClassSubstitutor(), new CollectionTypeRegistryDefault(),
                 new SpecificationTraverserDefault(), new ProgrammingModelFacetsJava5(), new HashSet<FacetDecorator>(),
                 new MetaModelValidatorNoop());
         reflector.setRuntimeContext(new RuntimeContextFromSession());
@@ -115,7 +115,7 @@ public abstract class JavaReflectorTestA
         specification = loadSpecification(reflector);
     }
 
-    protected abstract ObjectSpecification loadSpecification(JavaReflector reflector);
+    protected abstract ObjectSpecification loadSpecification(ObjectReflectorDefault reflector);
 
     @Test
     public void testCollectionFacet() throws Exception {

Modified: incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_ArrayTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_ArrayTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_ArrayTest.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_ArrayTest.java Wed Dec 22 16:22:08 2010
@@ -26,14 +26,14 @@ import org.apache.isis.core.metamodel.fa
 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.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.specloader.ObjectReflectorDefault;
 import org.apache.isis.core.runtime.testsystem.TestPojo;
-import org.apache.isis.defaults.progmodel.JavaReflector;
 
 
 public class JavaReflector_ArrayTest extends JavaReflectorTestAbstract {
 
     @Override
-    protected ObjectSpecification loadSpecification(final JavaReflector reflector) {
+    protected ObjectSpecification loadSpecification(final ObjectReflectorDefault reflector) {
         return reflector.loadSpecification(TestPojo[].class);
     }
 

Modified: incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_CollectionTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_CollectionTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_CollectionTest.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_CollectionTest.java Wed Dec 22 16:22:08 2010
@@ -28,13 +28,13 @@ import org.apache.isis.core.metamodel.fa
 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.spec.ObjectSpecification;
-import org.apache.isis.defaults.progmodel.JavaReflector;
+import org.apache.isis.core.metamodel.specloader.ObjectReflectorDefault;
 
 
 public class JavaReflector_CollectionTest extends JavaReflectorTestAbstract {
 
     @Override
-    protected ObjectSpecification loadSpecification(final JavaReflector reflector) {
+    protected ObjectSpecification loadSpecification(final ObjectReflectorDefault reflector) {
         return reflector.loadSpecification(Vector.class);
     }
 

Modified: incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_ObjectTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_ObjectTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_ObjectTest.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_ObjectTest.java Wed Dec 22 16:22:08 2010
@@ -27,20 +27,20 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.facets.naming.describedas.DescribedAsFacet;
 import org.apache.isis.core.metamodel.facets.naming.named.NamedFacet;
+import org.apache.isis.core.metamodel.facets.object.ident.plural.PluralFacet;
+import org.apache.isis.core.metamodel.facets.object.ident.title.TitleFacet;
+import org.apache.isis.core.metamodel.facets.object.notpersistable.NotPersistableFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.progmodel.facets.object.ident.plural.PluralFacet;
-import org.apache.isis.core.progmodel.facets.object.ident.title.TitleFacet;
-import org.apache.isis.core.progmodel.facets.object.notpersistable.NotPersistableFacet;
+import org.apache.isis.core.metamodel.specloader.ObjectReflectorDefault;
 import org.apache.isis.core.progmodel.facets.object.validprops.ObjectValidPropertiesFacet;
 import org.apache.isis.core.runtime.system.TestDomainObject;
-import org.apache.isis.defaults.progmodel.JavaReflector;
 
 
 
 public class JavaReflector_ObjectTest extends JavaReflectorTestAbstract {
 
     @Override
-    protected ObjectSpecification loadSpecification(final JavaReflector reflector) {
+    protected ObjectSpecification loadSpecification(final ObjectReflectorDefault reflector) {
         return reflector.loadSpecification(TestDomainObject.class);
     }
 

Modified: incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_ValueTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_ValueTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_ValueTest.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_ValueTest.java Wed Dec 22 16:22:08 2010
@@ -23,13 +23,13 @@ package org.apache.isis.defaults.progmod
 import org.junit.Assert;
 import org.junit.Test;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.defaults.progmodel.JavaReflector;
+import org.apache.isis.core.metamodel.specloader.ObjectReflectorDefault;
 
 
 public class JavaReflector_ValueTest extends JavaReflectorTestAbstract {
 
     @Override
-    protected ObjectSpecification loadSpecification(final JavaReflector reflector) {
+    protected ObjectSpecification loadSpecification(final ObjectReflectorDefault reflector) {
         return reflector.loadSpecification(String.class);
     }
 

Modified: incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactory.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactory.java (original)
+++ incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactory.java Wed Dec 22 16:22:08 2010
@@ -28,8 +28,8 @@ import org.apache.isis.core.metamodel.fa
 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.spec.feature.ObjectFeatureType;
-import org.apache.isis.core.metamodel.spec.identifier.Identified;
+import org.apache.isis.core.metamodel.feature.FeatureType;
+import org.apache.isis.core.metamodel.feature.IdentifiedHolder;
 
 
 public class NameFileFacetFactory implements FacetFactory {
@@ -46,8 +46,8 @@ public class NameFileFacetFactory implem
     }
 
     @Override
-    public List<ObjectFeatureType> getFeatureTypes() {
-        return ObjectFeatureType.EVERYTHING_BUT_PARAMETERS;
+    public List<FeatureType> getFeatureTypes() {
+        return FeatureType.EVERYTHING_BUT_PARAMETERS;
     }
 
     
@@ -69,10 +69,10 @@ public class NameFileFacetFactory implem
      */
     @Override
     public boolean process(final Class<?> cls, final Method method, final MethodRemover methodRemover, final FacetHolder holder) {
-    	if (!(holder instanceof Identified)) {
+    	if (!(holder instanceof IdentifiedHolder)) {
     		return false;
     	}
-		Identified identifiedHolder = (Identified) holder;
+		IdentifiedHolder identifiedHolder = (IdentifiedHolder) holder;
         Class<?> declaringClass = method.getDeclaringClass();
         String memberName = identifiedHolder.getIdentifier().getMemberName();
         return FacetUtil.addFacet(create(declaringClass, memberName, holder));

Modified: incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactoryFeatureTypesTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactoryFeatureTypesTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactoryFeatureTypesTest.java (original)
+++ incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactoryFeatureTypesTest.java Wed Dec 22 16:22:08 2010
@@ -30,7 +30,7 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.feature.FeatureType;
 
 
 
@@ -50,32 +50,32 @@ public class NameFileFacetFactoryFeature
 
     @Test
     public void featureTypesLength() {
-        List<ObjectFeatureType> featureTypes = facetFactory.getFeatureTypes();
+        List<FeatureType> featureTypes = facetFactory.getFeatureTypes();
         assertThat(featureTypes.size(), is(4));
     }
 
     @Test
     public void featureTypesContainsTypeRepresentingObject() {
-        List<ObjectFeatureType> featureTypes = facetFactory.getFeatureTypes();
-        assertThat(featureTypes, hasItem(ObjectFeatureType.OBJECT));
+        List<FeatureType> featureTypes = facetFactory.getFeatureTypes();
+        assertThat(featureTypes, hasItem(FeatureType.OBJECT));
     }
 
     @Test
     public void featureTypesContainsTypeRepresentingProperty() {
-        List<ObjectFeatureType> featureTypes = facetFactory.getFeatureTypes();
-        assertThat(featureTypes, hasItem(ObjectFeatureType.PROPERTY));
+        List<FeatureType> featureTypes = facetFactory.getFeatureTypes();
+        assertThat(featureTypes, hasItem(FeatureType.PROPERTY));
     }
 
     @Test
     public void featureTypesContainsTypeRepresentingCollection() {
-        List<ObjectFeatureType> featureTypes = facetFactory.getFeatureTypes();
-        assertThat(featureTypes, hasItem(ObjectFeatureType.COLLECTION));
+        List<FeatureType> featureTypes = facetFactory.getFeatureTypes();
+        assertThat(featureTypes, hasItem(FeatureType.COLLECTION));
     }
 
     @Test
     public void featureTypesContainsTypeRepresentingAction() {
-        List<ObjectFeatureType> featureTypes = facetFactory.getFeatureTypes();
-        assertThat(featureTypes, hasItem(ObjectFeatureType.ACTION));
+        List<FeatureType> featureTypes = facetFactory.getFeatureTypes();
+        assertThat(featureTypes, hasItem(FeatureType.ACTION));
     }
 
 }

Modified: incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactoryProcessTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactoryProcessTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactoryProcessTest.java (original)
+++ incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactoryProcessTest.java Wed Dec 22 16:22:08 2010
@@ -34,7 +34,7 @@ import org.junit.runner.RunWith;
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.metamodel.facets.Facet;
 import org.apache.isis.core.metamodel.facets.MethodRemover;
-import org.apache.isis.core.metamodel.spec.identifier.Identified;
+import org.apache.isis.core.metamodel.feature.IdentifiedHolder;
 
 import static org.apache.isis.core.commons.matchers.IsisMatchers.anInstanceOf;
 
@@ -51,7 +51,7 @@ public class NameFileFacetFactoryProcess
     
     private NameFileFacetFactory facetFactory;
     private MethodRemover mockMethodRemover;
-    private Identified mockFacetHolder;
+    private IdentifiedHolder mockFacetHolder;
 
     private Class<DomainObjectWithNameFileEntry> domainObjectWithNameFileEntryClass;
     private Method domainObjectWithNameFileEntryMethod;
@@ -63,7 +63,7 @@ public class NameFileFacetFactoryProcess
     public void setUp() throws Exception {
         facetFactory = new NameFileFacetFactory();
         mockMethodRemover = mockery.mock(MethodRemover.class);
-        mockFacetHolder = mockery.mock(Identified.class);
+        mockFacetHolder = mockery.mock(IdentifiedHolder.class);
         
         domainObjectWithNameFileEntryClass = DomainObjectWithNameFileEntry.class;
         domainObjectWithNameFileEntryMethod = domainObjectWithNameFileEntryClass.getMethod("getLastName");

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractFixturePeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractFixturePeer.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractFixturePeer.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractFixturePeer.java Wed Dec 22 16:22:08 2010
@@ -4,7 +4,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.persistence.PersistenceSession;
 import org.apache.isis.core.runtime.persistence.adaptermanager.AdapterManager;

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/UsingIsisViewerPeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/UsingIsisViewerPeer.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/UsingIsisViewerPeer.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/UsingIsisViewerPeer.java Wed Dec 22 16:22:08 2010
@@ -10,7 +10,7 @@ import org.apache.isis.core.commons.lang
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
 import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
-import org.apache.isis.core.metamodel.runtimecontext.spec.feature.ObjectActionSet;
+import org.apache.isis.core.metamodel.spec.ObjectActionSet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;

Modified: incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/CheckSpecificationsLoadedForFitNesse.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/CheckSpecificationsLoadedForFitNesse.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/CheckSpecificationsLoadedForFitNesse.java (original)
+++ incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/CheckSpecificationsLoadedForFitNesse.java Wed Dec 22 16:22:08 2010
@@ -7,7 +7,7 @@ import java.util.TreeSet;
 import net.sf.isiscontrib.bdd.fitnesse.internal.AbstractSubsetFixture;
 
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.session.IsisSessionFactory;
 import org.apache.isis.viewer.bdd.common.AliasRegistry;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/EmptyFieldTitleText.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/EmptyFieldTitleText.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/EmptyFieldTitleText.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/EmptyFieldTitleText.java Wed Dec 22 16:22:08 2010
@@ -39,7 +39,7 @@ class EmptyFieldTitleText extends TitleT
 
     @Override
     protected String title() {
-        return ((ObjectContent) content).getSpecification().getSingularName();
+        return ((ObjectContent) content).getSpecification().getName();
     }
 
 }

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/form/ExpandableViewBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/form/ExpandableViewBorder.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/form/ExpandableViewBorder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/form/ExpandableViewBorder.java Wed Dec 22 16:22:08 2010
@@ -25,10 +25,10 @@ import java.util.List;
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 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.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.viewer.dnd.drawing.Canvas;
 import org.apache.isis.viewer.dnd.drawing.ColorsAndFonts;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/list/InternalCollectionBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/list/InternalCollectionBorder.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/list/InternalCollectionBorder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/list/InternalCollectionBorder.java Wed Dec 22 16:22:08 2010
@@ -24,8 +24,8 @@ import org.apache.isis.core.commons.debu
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.consent.Consent;
 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.spec.feature.OneToManyAssociation;
-import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
 import org.apache.isis.viewer.dnd.drawing.Canvas;
 import org.apache.isis.viewer.dnd.drawing.Color;
 import org.apache.isis.viewer.dnd.drawing.ColorsAndFonts;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/service/ServiceObject.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/service/ServiceObject.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/service/ServiceObject.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/service/ServiceObject.java Wed Dec 22 16:22:08 2010
@@ -69,7 +69,7 @@ public class ServiceObject extends Abstr
 
     @Override
     public String getDescription() {
-        final String specName = getSpecification().getSingularName();
+        final String specName = getSpecification().getName();
         final String objectTitle = getObject().titleString();
         return specName + (specName.equalsIgnoreCase(objectTitle) ? "" : ": " + objectTitle) + " "
                 + getSpecification().getDescription();
@@ -130,7 +130,7 @@ public class ServiceObject extends Abstr
 
     @Override
     public String windowTitle() {
-        return (isTransient() ? "UNSAVED " : "") + getSpecification().getSingularName();
+        return (isTransient() ? "UNSAVED " : "") + getSpecification().getName();
     }
 
     @Override

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/tree/ClosedCollectionNodeSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/tree/ClosedCollectionNodeSpecification.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/tree/ClosedCollectionNodeSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/tree/ClosedCollectionNodeSpecification.java Wed Dec 22 16:22:08 2010
@@ -22,7 +22,7 @@ package org.apache.isis.viewer.dnd.tree;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacetUtils;
 import org.apache.isis.viewer.dnd.view.Axes;
 import org.apache.isis.viewer.dnd.view.Content;
 import org.apache.isis.viewer.dnd.view.View;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/tree/OpenCollectionNodeSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/tree/OpenCollectionNodeSpecification.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/tree/OpenCollectionNodeSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/tree/OpenCollectionNodeSpecification.java Wed Dec 22 16:22:08 2010
@@ -22,7 +22,7 @@ package org.apache.isis.viewer.dnd.tree;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacetUtils;
 import org.apache.isis.viewer.dnd.view.Axes;
 import org.apache.isis.viewer.dnd.view.Content;
 import org.apache.isis.viewer.dnd.view.ViewRequirement;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/OptionFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/OptionFactory.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/OptionFactory.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/OptionFactory.java Wed Dec 22 16:22:08 2010
@@ -37,7 +37,7 @@ public class OptionFactory {
     public static void addCreateOptions(final ObjectSpecification specification, final UserActionSet options) {
         // TODO do the same as addObjectMenuOptions and collect together all the
         // actions for all the types
-        List<ObjectAction> actions = specification.getServiceActionsFor(ObjectActionType.USER, ObjectActionType.EXPLORATION,
+        List<ObjectAction> actions = specification.getServiceActionsReturning(ObjectActionType.USER, ObjectActionType.EXPLORATION,
                 ObjectActionType.PROTOTYPE, ObjectActionType.DEBUG);
         menuOptions(actions, null, options);
     }

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/TextParseableParameterImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/TextParseableParameterImpl.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/TextParseableParameterImpl.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/TextParseableParameterImpl.java Wed Dec 22 16:22:08 2010
@@ -22,6 +22,7 @@ package org.apache.isis.viewer.dnd.view.
 
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.lang.ToString;
+import org.apache.isis.core.metamodel.adapter.AdapterUtils;
 import org.apache.isis.core.metamodel.adapter.InvalidEntryException;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.consent.Allow;
@@ -30,7 +31,6 @@ import org.apache.isis.core.metamodel.co
 import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ParseableEntryActionParameter;
-import org.apache.isis.core.metamodel.util.IsisUtils;
 import org.apache.isis.viewer.dnd.drawing.Image;
 import org.apache.isis.viewer.dnd.drawing.ImageFactory;
 import org.apache.isis.viewer.dnd.view.Content;
@@ -124,7 +124,7 @@ public class TextParseableParameterImpl 
     }
 
     public String title() {
-        return IsisUtils.titleString(object);
+        return AdapterUtils.titleString(object);
     }
 
     @Override
@@ -161,7 +161,7 @@ public class TextParseableParameterImpl 
     @Override
     public void parseTextEntry(final String entryText) {
         object = parse(entryText);
-        final String reason = parameter.isValid(object, IsisUtils.unwrap(object));
+        final String reason = parameter.isValid(object, AdapterUtils.unwrap(object));
         if (reason != null) {
             throw new InvalidEntryException(reason);
         } else if (!parameter.isOptional() && object == null) {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractView.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractView.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractView.java Wed Dec 22 16:22:08 2010
@@ -759,7 +759,7 @@ public abstract class AbstractView imple
         }
 
         if (getContent() instanceof RootObject || getContent() instanceof RootCollection) {
-            options.add(new UserActionAbstract("Use as default view for " + getContent().getSpecification().getSingularName(), ObjectActionType.USER) {
+            options.add(new UserActionAbstract("Use as default view for " + getContent().getSpecification().getName(), ObjectActionType.USER) {
                 public void execute(final Workspace workspace, final View view, final Location at) {
                     Options viewOptions = Properties.getViewConfigurationOptions(getSpecification());
                     getView().saveOptions(viewOptions);

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/AbstractCollectionContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/AbstractCollectionContent.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/AbstractCollectionContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/AbstractCollectionContent.java Wed Dec 22 16:22:08 2010
@@ -31,10 +31,10 @@ import org.apache.isis.core.metamodel.co
 import org.apache.isis.core.metamodel.consent.ConsentAbstract;
 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.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
 import org.apache.isis.viewer.dnd.drawing.Image;
 import org.apache.isis.viewer.dnd.drawing.ImageFactory;
 import org.apache.isis.viewer.dnd.drawing.Location;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/CollectionElement.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/CollectionElement.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/CollectionElement.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/CollectionElement.java Wed Dec 22 16:22:08 2010
@@ -69,7 +69,7 @@ public class CollectionElement extends A
     }
 
     public String getDescription() {
-        return getSpecification().getSingularName() + ": " + getObject().titleString() + " "
+        return getSpecification().getName() + ": " + getObject().titleString() + " "
                 + getSpecification().getDescription();
     }
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ObjectFieldBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ObjectFieldBuilder.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ObjectFieldBuilder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ObjectFieldBuilder.java Wed Dec 22 16:22:08 2010
@@ -27,11 +27,11 @@ import org.apache.log4j.Logger;
 import org.apache.isis.core.commons.ensure.Assert;
 import org.apache.isis.core.commons.exceptions.UnknownTypeException;
 import org.apache.isis.core.commons.filters.Filter;
+import org.apache.isis.core.metamodel.adapter.AdapterUtils;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters;
-import org.apache.isis.core.metamodel.util.IsisUtils;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.viewer.dnd.view.Axes;
 import org.apache.isis.viewer.dnd.view.Content;
@@ -152,7 +152,7 @@ public class ObjectFieldBuilder extends 
                         }
                     }
                 } else {
-                    if (IsisUtils.exists(value) && !IsisUtils.wrappedEqual(value, existing)) {
+                    if (AdapterUtils.exists(value) && !AdapterUtils.wrappedEqual(value, existing)) {
                         final View fieldView = createFieldView(view, axes, object, i, field);
                         view.replaceView(subview, decorateSubview(axes, fieldView));
                     } else {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractObjectContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractObjectContent.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractObjectContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractObjectContent.java Wed Dec 22 16:22:08 2010
@@ -182,7 +182,7 @@ public abstract class AbstractObjectCont
         }
         // TODO: use Facet for this test instead
         return new Veto(String.format("No empty field accepting object of type %s in %s", sourceAdapter.getSpecification()
-                .getSingularName(), title()));
+                .getName(), title()));
     }
 
     @Override

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractTextParsableContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractTextParsableContent.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractTextParsableContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractTextParsableContent.java Wed Dec 22 16:22:08 2010
@@ -23,9 +23,9 @@ package org.apache.isis.viewer.dnd.view.
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.object.ident.title.TitleFacet;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.ParseableEntryActionParameter;
-import org.apache.isis.core.progmodel.facets.object.ident.title.TitleFacet;
 import org.apache.isis.viewer.dnd.drawing.Image;
 
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/RootObject.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/RootObject.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/RootObject.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/RootObject.java Wed Dec 22 16:22:08 2010
@@ -65,7 +65,7 @@ public class RootObject extends Abstract
     }
 
     public String getDescription() {
-        return getSpecification().getSingularName() + ": " + getObject().titleString() + " "
+        return getSpecification().getName() + ": " + getObject().titleString() + " "
                 + getSpecification().getDescription();
     }
 
@@ -119,6 +119,6 @@ public class RootObject extends Abstract
 
     @Override
     public String windowTitle() {
-        return (isTransient() ? "UNSAVED " : "") + getSpecification().getSingularName();
+        return (isTransient() ? "UNSAVED " : "") + getSpecification().getName();
     }
 }

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToManyFieldImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToManyFieldImpl.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToManyFieldImpl.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToManyFieldImpl.java Wed Dec 22 16:22:08 2010
@@ -66,7 +66,7 @@ public class OneToManyFieldImpl extends 
             if (!specification.isOfType(elementSpecification)) {
                 // TODO: move logic into Facet
                 return new Veto(String.format("Only objects of type %s are allowed in this collection", elementSpecification
-                        .getSingularName()));
+                        .getName()));
             }
             if (parentAdapter.isPersistent() && sourceAdapter.isTransient()) {
                 // TODO: move logic into Facet
@@ -113,7 +113,7 @@ public class OneToManyFieldImpl extends 
     @Override
     public String getDescription() {
         final String name = getFieldName();
-        String type = getField().getSpecification().getSingularName();
+        String type = getField().getSpecification().getName();
         type = name.indexOf(type) == -1 ? " (" + type + ")" : "";
         final String description = getOneToManyAssociation().getDescription();
         return name + type + " " + description;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToOneFieldImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToOneFieldImpl.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToOneFieldImpl.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToOneFieldImpl.java Wed Dec 22 16:22:08 2010
@@ -75,7 +75,7 @@ public class OneToOneFieldImpl extends A
 
         if (!spec.isOfType(targetType)) {
             // TODO: move logic into Facet
-            return new Veto(String.format("Can only drop objects of type %s", targetType.getSingularName()));
+            return new Veto(String.format("Can only drop objects of type %s", targetType.getName()));
         }
 
         if (getParent().isPersistent() && adapter.isTransient()) {
@@ -189,7 +189,7 @@ public class OneToOneFieldImpl extends A
 
     public String getDescription() {
         final String name = getFieldName();
-        String type = getField().getSpecification().getSingularName();
+        String type = getField().getSpecification().getName();
         type = name.indexOf(type) == -1 ? " (" + type + ")" : "";
         final String description = getOneToOneAssociation().getDescription();
         return name + type + " " + description;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/ApplicationWorkspace.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/ApplicationWorkspace.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/ApplicationWorkspace.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/ApplicationWorkspace.java Wed Dec 22 16:22:08 2010
@@ -32,8 +32,8 @@ import org.apache.isis.core.metamodel.co
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.consent.Veto;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.core.runtime.authentication.standard.exploration.MultiUserExplorationSession;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.persistence.PersistenceSession;

Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/text/MultilineTextFieldContentTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/text/MultilineTextFieldContentTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/text/MultilineTextFieldContentTest.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/text/MultilineTextFieldContentTest.java Wed Dec 22 16:22:08 2010
@@ -34,7 +34,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
 import org.apache.isis.core.runtime.authentication.AuthenticationManager;
 import org.apache.isis.core.runtime.authorization.AuthorizationManager;
 import org.apache.isis.core.runtime.context.IsisContextStatic;

Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/text/TextFieldContentTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/text/TextFieldContentTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/text/TextFieldContentTest.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/text/TextFieldContentTest.java Wed Dec 22 16:22:08 2010
@@ -36,7 +36,7 @@ import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
 import org.apache.isis.core.runtime.authentication.AuthenticationManager;
 import org.apache.isis.core.runtime.authorization.AuthorizationManager;
 import org.apache.isis.core.runtime.context.IsisContextStatic;

Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/ViewUpdateNotifierTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/ViewUpdateNotifierTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/ViewUpdateNotifierTest.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/ViewUpdateNotifierTest.java Wed Dec 22 16:22:08 2010
@@ -42,7 +42,7 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.adapter.ResolveState;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
 import org.apache.isis.core.runtime.authentication.AuthenticationManager;
 import org.apache.isis.core.runtime.authentication.standard.exploration.ExplorationSession;
 import org.apache.isis.core.runtime.authorization.AuthorizationManager;

Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ActionFieldBuilderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ActionFieldBuilderTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ActionFieldBuilderTest.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ActionFieldBuilderTest.java Wed Dec 22 16:22:08 2010
@@ -37,7 +37,7 @@ import org.junit.runner.RunWith;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
 import org.apache.isis.core.runtime.authentication.AuthenticationManager;
 import org.apache.isis.core.runtime.authentication.standard.exploration.ExplorationSession;
 import org.apache.isis.core.runtime.authorization.AuthorizationManager;

Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ScrollBorderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ScrollBorderTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ScrollBorderTest.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ScrollBorderTest.java Wed Dec 22 16:22:08 2010
@@ -34,7 +34,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
 import org.apache.isis.core.runtime.authentication.AuthenticationManager;
 import org.apache.isis.core.runtime.authorization.AuthorizationManager;
 import org.apache.isis.core.runtime.context.IsisContextStatic;

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/util/TableUtil.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/util/TableUtil.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/util/TableUtil.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/util/TableUtil.java Wed Dec 22 16:22:08 2010
@@ -28,11 +28,11 @@ import java.util.List;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 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.propparam.multiline.MultiLineFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.persistence.PersistenceSession;
 import org.apache.isis.viewer.html.component.ComponentFactory;

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/CollectionIcon.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/CollectionIcon.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/CollectionIcon.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/CollectionIcon.java Wed Dec 22 16:22:08 2010
@@ -61,7 +61,7 @@ public class CollectionIcon implements C
         writer.print("><img src=\"");
         writer.print(ImageLookup.image(elementSpecification));
         writer.print("\" alt=\"");
-        final String singularName = elementSpecification.getSingularName();
+        final String singularName = elementSpecification.getName();
         writer.print(singularName);
         writer.print(" collection\" />");
         writer.print(collection.titleString());

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ObjectIcon.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ObjectIcon.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ObjectIcon.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ObjectIcon.java Wed Dec 22 16:22:08 2010
@@ -59,7 +59,7 @@ public class ObjectIcon implements Compo
         writer.print("\"><img src=\"");
         writer.print(ImageLookup.image(element));
         writer.print("\" alt=\"");
-        final String singularName = element.getSpecification().getSingularName();
+        final String singularName = element.getSpecification().getName();
         writer.print(singularName);
         writer.print("\"");
         writer.print("/>");



Mime
View raw message