isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1051971 [3/18] - in /incubator/isis/trunk: alternatives/bytecode/identity/src/main/java/org/apache/isis/alternatives/bytecode/identity/objectfactory/ alternatives/bytecode/javassist/src/main/java/org/apache/isis/alternatives/bytecode/javas...
Date Wed, 22 Dec 2010 16:22:32 GMT
Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectDirtier.java (from r1051471, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ObjectDirtier.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectDirtier.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectDirtier.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ObjectDirtier.java&r1=1051471&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ObjectDirtier.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectDirtier.java Wed Dec 22 16:22:08 2010
@@ -14,10 +14,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.isis.core.metamodel.runtimecontext;
+package org.apache.isis.core.metamodel.adapter;
 
 import org.apache.isis.core.commons.components.Injectable;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 
 public interface ObjectDirtier extends Injectable {
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectDirtierAbstract.java (from r1051471, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ObjectDirtierAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectDirtierAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectDirtierAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ObjectDirtierAbstract.java&r1=1051471&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ObjectDirtierAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectDirtierAbstract.java Wed Dec 22 16:22:08 2010
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.isis.core.metamodel.runtimecontext;
+package org.apache.isis.core.metamodel.adapter;
 
 
 public abstract class ObjectDirtierAbstract implements ObjectDirtier {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectDirtierAware.java (from r1051471, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ObjectDirtierAware.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectDirtierAware.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectDirtierAware.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ObjectDirtierAware.java&r1=1051471&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ObjectDirtierAware.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectDirtierAware.java Wed Dec 22 16:22:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.runtimecontext;
+package org.apache.isis.core.metamodel.adapter;
 
 public interface ObjectDirtierAware {
 	

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectList.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectList.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectList.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectList.java Wed Dec 22 16:22:08 2010
@@ -27,6 +27,7 @@ import java.util.Enumeration;
 import java.util.List;
 
 import org.apache.commons.collections.iterators.IteratorEnumeration;
+
 import org.apache.isis.core.commons.lang.ToString;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectPersistor.java (from r1051471, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ObjectPersistor.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectPersistor.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectPersistor.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ObjectPersistor.java&r1=1051471&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ObjectPersistor.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectPersistor.java Wed Dec 22 16:22:08 2010
@@ -14,10 +14,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.isis.core.metamodel.runtimecontext;
+package org.apache.isis.core.metamodel.adapter;
 
 import org.apache.isis.core.commons.components.Injectable;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 
 public interface ObjectPersistor extends Injectable {
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectPersistorAbstract.java (from r1051471, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ObjectPersistorAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectPersistorAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectPersistorAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ObjectPersistorAbstract.java&r1=1051471&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ObjectPersistorAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectPersistorAbstract.java Wed Dec 22 16:22:08 2010
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.isis.core.metamodel.runtimecontext;
+package org.apache.isis.core.metamodel.adapter;
 
 
 public abstract class ObjectPersistorAbstract implements ObjectPersistor {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectPersistorAware.java (from r1051471, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ObjectPersistorAware.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectPersistorAware.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectPersistorAware.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ObjectPersistorAware.java&r1=1051471&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ObjectPersistorAware.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectPersistorAware.java Wed Dec 22 16:22:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.runtimecontext;
+package org.apache.isis.core.metamodel.adapter;
 
 public interface ObjectPersistorAware {
 	

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/QuerySubmitter.java (from r1051471, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/QuerySubmitter.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/QuerySubmitter.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/QuerySubmitter.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/QuerySubmitter.java&r1=1051471&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/QuerySubmitter.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/QuerySubmitter.java Wed Dec 22 16:22:08 2010
@@ -14,13 +14,12 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.isis.core.metamodel.runtimecontext;
+package org.apache.isis.core.metamodel.adapter;
 
 import java.util.List;
 
 import org.apache.isis.applib.query.Query;
 import org.apache.isis.core.commons.components.Injectable;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 
 
 public interface QuerySubmitter extends Injectable {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/QuerySubmitterAbstract.java (from r1051471, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/QuerySubmitterAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/QuerySubmitterAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/QuerySubmitterAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/QuerySubmitterAbstract.java&r1=1051471&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/QuerySubmitterAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/QuerySubmitterAbstract.java Wed Dec 22 16:22:08 2010
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.isis.core.metamodel.runtimecontext;
+package org.apache.isis.core.metamodel.adapter;
 
 
 public abstract class QuerySubmitterAbstract implements QuerySubmitter {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/QuerySubmitterAware.java (from r1051471, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/QuerySubmitterAware.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/QuerySubmitterAware.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/QuerySubmitterAware.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/QuerySubmitterAware.java&r1=1051471&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/QuerySubmitterAware.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/QuerySubmitterAware.java Wed Dec 22 16:22:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.runtimecontext;
+package org.apache.isis.core.metamodel.adapter;
 
 public interface QuerySubmitterAware {
 	

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ResolveState.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ResolveState.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ResolveState.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ResolveState.java Wed Dec 22 16:22:08 2010
@@ -40,13 +40,13 @@ import static org.apache.isis.core.metam
 import static org.apache.isis.core.metamodel.adapter.ResolveState.RespondsToChanges.RESPONDS_TO_CHANGES;
 import static org.apache.isis.core.metamodel.adapter.ResolveState.Serializing.DOES_NOT_REPRESENT_SERIALIZING;
 import static org.apache.isis.core.metamodel.adapter.ResolveState.Serializing.REPRESENTS_SERIALIZING;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
 
 public final class ResolveState {
     private static final Hashtable<String,ResolveState> statesByName = new Hashtable<String,ResolveState>();

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ServicesProvider.java (from r1051471, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ServicesProvider.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ServicesProvider.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ServicesProvider.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ServicesProvider.java&r1=1051471&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ServicesProvider.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ServicesProvider.java Wed Dec 22 16:22:08 2010
@@ -14,12 +14,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.isis.core.metamodel.runtimecontext;
+package org.apache.isis.core.metamodel.adapter;
 
 import java.util.List;
 
 import org.apache.isis.core.commons.components.Injectable;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 
 
 public interface ServicesProvider extends Injectable {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ServicesProviderAbstract.java (from r1051471, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ServicesProviderAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ServicesProviderAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ServicesProviderAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ServicesProviderAbstract.java&r1=1051471&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ServicesProviderAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ServicesProviderAbstract.java Wed Dec 22 16:22:08 2010
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.isis.core.metamodel.runtimecontext;
+package org.apache.isis.core.metamodel.adapter;
 
 
 public abstract class ServicesProviderAbstract implements ServicesProvider {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ServicesProviderAware.java (from r1051471, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ServicesProviderAware.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ServicesProviderAware.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ServicesProviderAware.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ServicesProviderAware.java&r1=1051471&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ServicesProviderAware.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ServicesProviderAware.java Wed Dec 22 16:22:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.runtimecontext;
+package org.apache.isis.core.metamodel.adapter;
 
 public interface ServicesProviderAware {
 	

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/OidStringifierDirect.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/OidStringifierDirect.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/OidStringifierDirect.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/OidStringifierDirect.java Wed Dec 22 16:22:08 2010
@@ -20,13 +20,13 @@
 
 package org.apache.isis.core.metamodel.adapter.oid.stringable.directly;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
 import org.apache.isis.core.commons.ensure.Ensure;
 import org.apache.isis.core.commons.lang.JavaClassUtils;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/stringable/hex/OidStringifierHex.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/stringable/hex/OidStringifierHex.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/stringable/hex/OidStringifierHex.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/stringable/hex/OidStringifierHex.java Wed Dec 22 16:22:08 2010
@@ -20,12 +20,13 @@
 
 package org.apache.isis.core.metamodel.adapter.oid.stringable.hex;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import org.apache.commons.codec.DecoderException;
-import org.apache.commons.codec.binary.Hex;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+import org.apache.commons.codec.DecoderException;
+import org.apache.commons.codec.binary.Hex;
+
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
 import org.apache.isis.core.metamodel.adapter.oid.stringable.OidStringifier;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/NullVersion.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/NullVersion.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/NullVersion.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/NullVersion.java Wed Dec 22 16:22:08 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.core.metamodel.adapter.version;
 
-import java.util.Date;
-
+import java.util.Date;
+
 import org.apache.isis.core.commons.exceptions.UnexpectedCallException;
 
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/SerialNumberVersion.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/SerialNumberVersion.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/SerialNumberVersion.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/SerialNumberVersion.java Wed Dec 22 16:22:08 2010
@@ -20,9 +20,9 @@
 
 package org.apache.isis.core.metamodel.adapter.version;
 
-import java.io.IOException;
-import java.util.Date;
-
+import java.io.IOException;
+import java.util.Date;
+
 import org.apache.isis.core.commons.lang.ToString;
 import org.apache.isis.core.metamodel.encoding.DataInputExtended;
 import org.apache.isis.core.metamodel.encoding.DataOutputExtended;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/Version.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/Version.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/Version.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/Version.java Wed Dec 22 16:22:08 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.core.metamodel.adapter.version;
 
-import java.io.Serializable;
-import java.util.Date;
+import java.io.Serializable;
+import java.util.Date;
 
 
 /**

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/VersionUserAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/VersionUserAbstract.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/VersionUserAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/VersionUserAbstract.java Wed Dec 22 16:22:08 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.core.metamodel.adapter.version;
 
-import java.io.IOException;
-
+import java.io.IOException;
+
 import org.apache.isis.core.metamodel.encoding.DataInputExtended;
 import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
 import org.apache.isis.core.metamodel.encoding.Encodable;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/VersionUserAndTimeAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/VersionUserAndTimeAbstract.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/VersionUserAndTimeAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/VersionUserAndTimeAbstract.java Wed Dec 22 16:22:08 2010
@@ -20,9 +20,9 @@
 
 package org.apache.isis.core.metamodel.adapter.version;
 
-import java.io.IOException;
-import java.util.Date;
-
+import java.io.IOException;
+import java.util.Date;
+
 import org.apache.isis.core.metamodel.encoding.DataInputExtended;
 import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authentication/AuthenticationSessionAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authentication/AuthenticationSessionAbstract.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authentication/AuthenticationSessionAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authentication/AuthenticationSessionAbstract.java Wed Dec 22 16:22:08 2010
@@ -20,20 +20,18 @@
 
 package org.apache.isis.core.metamodel.authentication;
 
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import org.apache.isis.core.commons.lang.ToString;
 import org.apache.isis.core.metamodel.encoding.DataInputExtended;
-import org.apache.isis.core.metamodel.encoding.DataInputStreamExtended;
 import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
-import org.apache.isis.core.metamodel.encoding.Encodable;
 
 public abstract class AuthenticationSessionAbstract implements AuthenticationSession, Serializable {
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authentication/AuthenticationSessionProvider.java (from r1051471, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/AuthenticationSessionProvider.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authentication/AuthenticationSessionProvider.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authentication/AuthenticationSessionProvider.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/AuthenticationSessionProvider.java&r1=1051471&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/AuthenticationSessionProvider.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authentication/AuthenticationSessionProvider.java Wed Dec 22 16:22:08 2010
@@ -14,10 +14,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.isis.core.metamodel.runtimecontext;
+package org.apache.isis.core.metamodel.authentication;
 
 import org.apache.isis.core.commons.components.Injectable;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 
 public interface AuthenticationSessionProvider extends Injectable {
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authentication/AuthenticationSessionProviderAbstract.java (from r1051471, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/AuthenticationSessionProviderAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authentication/AuthenticationSessionProviderAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authentication/AuthenticationSessionProviderAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/AuthenticationSessionProviderAbstract.java&r1=1051471&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/AuthenticationSessionProviderAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authentication/AuthenticationSessionProviderAbstract.java Wed Dec 22 16:22:08 2010
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.isis.core.metamodel.runtimecontext;
+package org.apache.isis.core.metamodel.authentication;
 
 
 public abstract class AuthenticationSessionProviderAbstract implements AuthenticationSessionProvider {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authentication/AuthenticationSessionProviderAware.java (from r1051471, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/AuthenticationSessionProviderAware.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authentication/AuthenticationSessionProviderAware.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authentication/AuthenticationSessionProviderAware.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/AuthenticationSessionProviderAware.java&r1=1051471&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/AuthenticationSessionProviderAware.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authentication/AuthenticationSessionProviderAware.java Wed Dec 22 16:22:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.runtimecontext;
+package org.apache.isis.core.metamodel.authentication;
 
 public interface AuthenticationSessionProviderAware {
 	

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationBuilderDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationBuilderDefault.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationBuilderDefault.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationBuilderDefault.java Wed Dec 22 16:22:08 2010
@@ -21,6 +21,7 @@
 package org.apache.isis.core.metamodel.config;
 
 import org.apache.log4j.Logger;
+
 import org.apache.isis.core.commons.resource.ResourceStreamSourceContextLoaderClassPath;
 import org.apache.isis.core.commons.resource.ResourceStreamSourceFileSystem;
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationBuilderFileSystem.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationBuilderFileSystem.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationBuilderFileSystem.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationBuilderFileSystem.java Wed Dec 22 16:22:08 2010
@@ -19,10 +19,11 @@
 
 package org.apache.isis.core.metamodel.config;
 
+import org.apache.log4j.Logger;
+
 import org.apache.isis.core.commons.resource.ResourceStreamSource;
 import org.apache.isis.core.commons.resource.ResourceStreamSourceComposite;
 import org.apache.isis.core.commons.resource.ResourceStreamSourceFileSystem;
-import org.apache.log4j.Logger;
 
 /**
  * Convenience implementation of {@link ConfigurationBuilder} that loads configuration resource from a specified

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationBuilderResourceStreams.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationBuilderResourceStreams.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationBuilderResourceStreams.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/ConfigurationBuilderResourceStreams.java Wed Dec 22 16:22:08 2010
@@ -25,15 +25,16 @@ import java.util.Enumeration;
 import java.util.List;
 import java.util.Properties;
 
+import org.apache.log4j.Logger;
+
+import com.google.common.base.Objects;
+
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.commons.resource.ResourceStreamSource;
 import org.apache.isis.core.commons.resource.ResourceStreamSourceComposite;
 import org.apache.isis.core.commons.resource.ResourceStreamSourceFileSystem;
 import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
 import org.apache.isis.core.metamodel.config.internal.PropertiesReader;
-import org.apache.log4j.Logger;
-
-import com.google.common.base.Objects;
 
 /**
  * Adapter for {@link ConfigurationBuilder}, loading the specified configuration resource (file) from the given

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/IsisConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/IsisConfiguration.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/IsisConfiguration.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/IsisConfiguration.java Wed Dec 22 16:22:08 2010
@@ -20,10 +20,10 @@
 
 package org.apache.isis.core.metamodel.config;
 
-import java.awt.Color;
-import java.awt.Font;
-import java.util.Enumeration;
-
+import java.awt.Color;
+import java.awt.Font;
+import java.util.Enumeration;
+
 import org.apache.isis.core.commons.components.Injectable;
 import org.apache.isis.core.commons.debug.DebugInfo;
 import org.apache.isis.core.commons.resource.ResourceStreamSource;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/internal/PropertiesConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/internal/PropertiesConfiguration.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/internal/PropertiesConfiguration.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/internal/PropertiesConfiguration.java Wed Dec 22 16:22:08 2010
@@ -27,6 +27,7 @@ import java.util.Properties;
 import java.util.StringTokenizer;
 
 import org.apache.log4j.Logger;
+
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.commons.resource.ResourceStreamSource;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/internal/PropertiesReader.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/internal/PropertiesReader.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/internal/PropertiesReader.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/config/internal/PropertiesReader.java Wed Dec 22 16:22:08 2010
@@ -20,10 +20,10 @@
 
 package org.apache.isis.core.metamodel.config.internal;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
 import org.apache.isis.core.commons.io.IoUtils;
 import org.apache.isis.core.commons.resource.ResourceStreamSource;
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/ConsentAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/ConsentAbstract.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/ConsentAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/ConsentAbstract.java Wed Dec 22 16:22:08 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.core.metamodel.consent;
 
-import static org.hamcrest.CoreMatchers.is;
 import static org.apache.isis.core.commons.matchers.IsisMatchers.nonEmptyStringOrNull;
+import static org.hamcrest.CoreMatchers.is;
 
 import java.io.Serializable;
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResult.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResult.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResult.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResult.java Wed Dec 22 16:22:08 2010
@@ -20,11 +20,11 @@
 
 package org.apache.isis.core.metamodel.consent;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.isis.applib.events.InteractionEvent;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.isis.applib.events.InteractionEvent;
 
 
 public class InteractionResult {

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResultSet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResultSet.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResultSet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResultSet.java Wed Dec 22 16:22:08 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.core.metamodel.consent;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.ArrayList;
+import java.util.List;
 
 
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataInputExtended.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataInputExtended.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataInputExtended.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataInputExtended.java Wed Dec 22 16:22:08 2010
@@ -20,9 +20,9 @@
 
 package org.apache.isis.core.metamodel.encoding;
 
-import java.io.DataInput;
-import java.io.DataInputStream;
-import java.io.IOException;
+import java.io.DataInput;
+import java.io.DataInputStream;
+import java.io.IOException;
 
 public interface DataInputExtended extends DataInput {
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataInputExtendedDecorator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataInputExtendedDecorator.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataInputExtendedDecorator.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataInputExtendedDecorator.java Wed Dec 22 16:22:08 2010
@@ -20,9 +20,8 @@
 
 package org.apache.isis.core.metamodel.encoding;
 
-import java.io.Closeable;
-import java.io.DataInputStream;
-import java.io.IOException;
+import java.io.DataInputStream;
+import java.io.IOException;
 
 public class DataInputExtendedDecorator implements DataInputExtended {
 	

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataInputStreamExtended.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataInputStreamExtended.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataInputStreamExtended.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataInputStreamExtended.java Wed Dec 22 16:22:08 2010
@@ -20,7 +20,6 @@
 
 package org.apache.isis.core.metamodel.encoding;
 
-import java.io.Closeable;
 import java.io.DataInputStream;
 import java.io.IOException;
 import java.io.InputStream;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataOutputExtended.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataOutputExtended.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataOutputExtended.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataOutputExtended.java Wed Dec 22 16:22:08 2010
@@ -20,10 +20,10 @@
 
 package org.apache.isis.core.metamodel.encoding;
 
-import java.io.DataOutput;
-import java.io.DataOutputStream;
-import java.io.Flushable;
-import java.io.IOException;
+import java.io.DataOutput;
+import java.io.DataOutputStream;
+import java.io.Flushable;
+import java.io.IOException;
 
 public interface DataOutputExtended extends DataOutput, Flushable {
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataOutputExtendedDecorator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataOutputExtendedDecorator.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataOutputExtendedDecorator.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataOutputExtendedDecorator.java Wed Dec 22 16:22:08 2010
@@ -20,10 +20,8 @@
 
 package org.apache.isis.core.metamodel.encoding;
 
-import java.io.Closeable;
-import java.io.DataOutputStream;
-import java.io.Flushable;
-import java.io.IOException;
+import java.io.DataOutputStream;
+import java.io.IOException;
 
 public class DataOutputExtendedDecorator implements DataOutputExtended {
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DebugDataOutputExtended.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DebugDataOutputExtended.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DebugDataOutputExtended.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DebugDataOutputExtended.java Wed Dec 22 16:22:08 2010
@@ -21,7 +21,6 @@
 package org.apache.isis.core.metamodel.encoding;
 
 import java.io.IOException;
-import java.io.OutputStream;
 
 import org.apache.log4j.Logger;
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/FailedToDecodeException.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/FailedToDecodeException.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/FailedToDecodeException.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/FailedToDecodeException.java Wed Dec 22 16:22:08 2010
@@ -23,7 +23,7 @@
  */
 package org.apache.isis.core.metamodel.encoding;
 
-import java.io.IOException;
+import java.io.IOException;
 
 public class FailedToDecodeException extends IOException {
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/FailedToDeserializeException.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/FailedToDeserializeException.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/FailedToDeserializeException.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/FailedToDeserializeException.java Wed Dec 22 16:22:08 2010
@@ -23,7 +23,7 @@
  */
 package org.apache.isis.core.metamodel.encoding;
 
-import java.io.IOException;
+import java.io.IOException;
 
 public class FailedToDeserializeException extends IOException {
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/FieldType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/FieldType.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/FieldType.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/FieldType.java Wed Dec 22 16:22:08 2010
@@ -20,19 +20,19 @@
 
 package org.apache.isis.core.metamodel.encoding;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.Serializable;
-import java.lang.reflect.Array;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.log4j.Logger;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.lang.reflect.Array;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.log4j.Logger;
 
 /**
  * Typesafe writing and reading of fields, providing some level of integrity

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecoratorSet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecoratorSet.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecoratorSet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecoratorSet.java Wed Dec 22 16:22:08 2010
@@ -34,7 +34,10 @@ import org.apache.isis.core.commons.debu
 import org.apache.isis.core.metamodel.exceptions.ReflectionException;
 import org.apache.isis.core.metamodel.facets.Facet;
 import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.spec.IntrospectableSpecificationAbstract;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 
 public class FacetDecoratorSet implements ApplicationScopedComponent {
 
@@ -45,10 +48,12 @@ public class FacetDecoratorSet implement
 	// init, shutdown
 	// ////////////////////////////////////////////////////////////
 
-	public void init() {
+	@Override
+    public void init() {
 	}
 
-	public void shutdown() {
+	@Override
+    public void shutdown() {
 	}
 
 	// ////////////////////////////////////////////////////////////
@@ -95,7 +100,24 @@ public class FacetDecoratorSet implement
 	// decorate
 	// ////////////////////////////////////////////////////////////
 
-	public void decorateAllFacets(final FacetHolder holder) {
+    /**
+     * @param holder
+     */
+    public void decorate(IntrospectableSpecificationAbstract holder) {
+        decorateAllFacets(holder);
+        for (ObjectAssociation objectAssociation : holder.getAssociations()) {
+            this.decorateAllFacets(objectAssociation);
+        }
+        for (ObjectAction objectAction : holder.getObjectActionsAll()) {
+            decorateAllFacets(objectAction);
+            final List<ObjectActionParameter> parameters = objectAction.getParameters();
+            for (ObjectActionParameter parameter : parameters) {
+                this.decorateAllFacets(parameter);
+            }
+        }
+    }
+
+	private void decorateAllFacets(final FacetHolder holder) {
 		if (isEmpty()) {
 			return;
 		}
@@ -175,5 +197,7 @@ public class FacetDecoratorSet implement
 		str.unindent();
 	}
 
+
+
 }
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/AnnotationBasedFacetFactoryAbstract.java (from r1051446, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/AnnotationBasedFacetFactoryAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/AnnotationBasedFacetFactoryAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/AnnotationBasedFacetFactoryAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/AnnotationBasedFacetFactoryAbstract.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/AnnotationBasedFacetFactoryAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/AnnotationBasedFacetFactoryAbstract.java Wed Dec 22 16:22:08 2010
@@ -18,20 +18,19 @@
  */
 
 
-package org.apache.isis.core.metamodel.java5;
+package org.apache.isis.core.metamodel.facets;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.util.List;
 
-import org.apache.isis.core.metamodel.facets.FacetFactory;
-import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.feature.FeatureType;
+
 
 
 public abstract class AnnotationBasedFacetFactoryAbstract extends FacetFactoryAbstract {
 
-    public AnnotationBasedFacetFactoryAbstract(final List<ObjectFeatureType> featureTypes) {
+    public AnnotationBasedFacetFactoryAbstract(final List<FeatureType> featureTypes) {
         super(featureTypes);
     }
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ChoicesUtils.java (from r1051471, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/ObjectAdapterUtils.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ChoicesUtils.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ChoicesUtils.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/ObjectAdapterUtils.java&r1=1051471&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/ObjectAdapterUtils.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ChoicesUtils.java Wed Dec 22 16:22:08 2010
@@ -18,19 +18,20 @@
  */
 
 
-package org.apache.isis.core.metamodel.util;
+package org.apache.isis.core.metamodel.facets;
 
+import org.apache.isis.core.metamodel.adapter.AdapterMap;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.core.metamodel.runtimecontext.AdapterMap;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacetUtils;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
 
-public final class ObjectAdapterUtils {
-    private ObjectAdapterUtils() {}
+public final class ChoicesUtils {
+    private ChoicesUtils() {}
 
-    public static Object[] getCollectionAsObjectArray(final Object option, final ObjectSpecification spec, AdapterMap adapterManager) {
-        final ObjectAdapter collection = adapterManager.adapterFor(option);
+    public static Object[] getCollectionAsObjectArray(final Object option, final ObjectSpecification spec, AdapterMap adapterMap) {
+        final ObjectAdapter collection = adapterMap.adapterFor(option);
         final CollectionFacet facet = CollectionFacetUtils.getCollectionFacetFromSpec(collection);
     	final Object[] optionArray = new Object[facet.size(collection)];
     	int j = 0;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Facet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Facet.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Facet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Facet.java Wed Dec 22 16:22:08 2010
@@ -19,6 +19,8 @@
 
 
 package org.apache.isis.core.metamodel.facets;
+
+import org.apache.isis.core.metamodel.facets.actions.invoke.ActionInvocationFacet;
 
 public interface Facet {
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetAbstract.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetAbstract.java Wed Dec 22 16:22:08 2010
@@ -20,18 +20,18 @@
 
 package org.apache.isis.core.metamodel.facets;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
 import static org.apache.isis.core.commons.ensure.Ensure.ensureThatArg;
-
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+
 import org.apache.isis.core.commons.ensure.Ensure;
 import org.apache.isis.core.commons.matchers.IsisMatchers;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.feature.IdentifiedHolder;
 import org.apache.isis.core.metamodel.interactions.DisablingInteractionAdvisor;
 import org.apache.isis.core.metamodel.interactions.HidingInteractionAdvisor;
 import org.apache.isis.core.metamodel.interactions.ValidatingInteractionAdvisor;
-import org.apache.isis.core.metamodel.spec.identifier.Identified;
 
 
 public abstract class FacetAbstract implements Facet {
@@ -44,12 +44,12 @@ public abstract class FacetAbstract impl
     
     /**
      * Populated in {@link #setFacetHolder(FacetHolder)} if the provided holder
-     * implements {@link Identified}.
+     * implements {@link IdentifiedHolder}.
      * 
      * <p>
      * Otherwise is <tt>null</tt>.
      */
-    private Identified identified;
+    private IdentifiedHolder identifiedHolder;
     
     @SuppressWarnings("unchecked")
     public FacetAbstract(
@@ -61,31 +61,36 @@ public abstract class FacetAbstract impl
         this.derived = derived;
     }
 
+    @Override
     public final Class<? extends Facet> facetType() {
         return facetType;
     }
 
+    @Override
     public FacetHolder getFacetHolder() {
         return holder;
     }
     
+    @Override
     public boolean isDerived() {
     	return derived;
     }
 
     /**
      * Convenience method that returns {@link #getFacetHolder()} downcast to
-     * {@link Identified} if the implementation does indeed inherit from
-     * {@link Identified}, otherwise <tt>null</tt>. 
+     * {@link IdentifiedHolder} if the implementation does indeed inherit from
+     * {@link IdentifiedHolder}, otherwise <tt>null</tt>. 
      */
-    public Identified getIdentified() {
-        return identified;
+    public IdentifiedHolder getIdentified() {
+        return identifiedHolder;
     }
 
-	public Facet getUnderlyingFacet() {
+	@Override
+    public Facet getUnderlyingFacet() {
 		return underlyingFacet;
 	}
-	public void setUnderlyingFacet(Facet underlyingFacet) {
+	@Override
+    public void setUnderlyingFacet(Facet underlyingFacet) {
 		Ensure.ensureThatArg(underlyingFacet.facetType(), IsisMatchers.classEqualTo(facetType));
 		this.underlyingFacet = underlyingFacet;
 	}
@@ -96,6 +101,7 @@ public abstract class FacetAbstract impl
      * <p>
      * No-op implementations should override and return <tt>true</tt>.
      */
+    @Override
     public boolean isNoop() {
         return false;
     }
@@ -108,14 +114,46 @@ public abstract class FacetAbstract impl
      * Implementations that don't wish to replace none no-op implementations should override and return
      * <tt>false</tt>.
      */
+    @Override
     public boolean alwaysReplace() {
         return true;
     }
 
+    @Override
     public void setFacetHolder(final FacetHolder facetHolder) {
         this.holder = facetHolder;
-        this.identified = holder instanceof Identified? (Identified)holder: null;
+        this.identifiedHolder = holder instanceof IdentifiedHolder? (IdentifiedHolder)holder: null;
     }
+
+    /**
+     * For convenience of subclass facets that implement {@link ValidatingInteractionAdvisor},
+     * {@link HidingInteractionAdvisor} or {@link DisablingInteractionAdvisor}.
+     */
+    public Object unwrapObject(final ObjectAdapter adapter) {
+        if (adapter == null) {
+            return null;
+        }
+        return adapter.getObject();
+    }
+
+    /**
+     * For convenience of subclass facets that implement {@link ValidatingInteractionAdvisor},
+     * {@link HidingInteractionAdvisor} or {@link DisablingInteractionAdvisor}.
+     */
+    public String unwrapString(final ObjectAdapter adapter) {
+        final Object obj = unwrapObject(adapter);
+        if (obj == null) {
+            return null;
+        }
+        if (!(obj instanceof String)) {
+            return null;
+        }
+        return (String) obj;
+    }
+
+    protected String toStringValues() {
+        return "";
+    }
 
     @Override
     public String toString() {
@@ -144,34 +182,5 @@ public abstract class FacetAbstract impl
         }
         return className.substring(className.lastIndexOf('.') + 1) + "[" + details + stringValues + "]";
     }
-
-    /**
-     * For convenience of subclass facets that implement {@link ValidatingInteractionAdvisor},
-     * {@link HidingInteractionAdvisor} or {@link DisablingInteractionAdvisor}.
-     */
-    public Object unwrapObject(final ObjectAdapter adapter) {
-        if (adapter == null) {
-            return null;
-        }
-        return adapter.getObject();
-    }
-
-    /**
-     * For convenience of subclass facets that implement {@link ValidatingInteractionAdvisor},
-     * {@link HidingInteractionAdvisor} or {@link DisablingInteractionAdvisor}.
-     */
-    public String unwrapString(final ObjectAdapter adapter) {
-        final Object obj = unwrapObject(adapter);
-        if (obj == null) {
-            return null;
-        }
-        if (!(obj instanceof String)) {
-            return null;
-        }
-        return (String) obj;
-    }
-
-    protected String toStringValues() {
-        return "";
-    }
+
 }

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactory.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactory.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactory.java Wed Dec 22 16:22:08 2010
@@ -24,19 +24,20 @@ package org.apache.isis.core.metamodel.f
 import java.lang.reflect.Method;
 import java.util.List;
 
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.feature.FeatureType;
+
 
 
 public interface FacetFactory {
 
     /**
-     * The {@link ObjectFeatureType feature type}s that this facet factory can create {@link Facet}s for.
+     * The {@link FeatureType feature type}s that this facet factory can create {@link Facet}s for.
      * 
      * <p>
      * Used by the Java5 Reflector's <tt>ProgrammingModel</tt> to reduce the number of {@link FacetFactory factory}s that are
      * queried when building up the meta-model.
      */
-    List<ObjectFeatureType> getFeatureTypes();
+    List<FeatureType> getFeatureTypes();
 
     /**
      * Process the class, and return the correctly setup annotation if present.

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactoryAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactoryAbstract.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactoryAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactoryAbstract.java Wed Dec 22 16:22:08 2010
@@ -26,23 +26,23 @@ import java.util.List;
 
 import com.google.common.collect.ImmutableList;
 
-import org.apache.isis.core.metamodel.runtimecontext.SpecificationLookup;
-import org.apache.isis.core.metamodel.runtimecontext.SpecificationLookupAware;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.feature.FeatureType;
+import org.apache.isis.core.metamodel.spec.SpecificationLookup;
+import org.apache.isis.core.metamodel.spec.SpecificationLookupAware;
 
 
 public abstract class FacetFactoryAbstract implements FacetFactory, SpecificationLookupAware {
 
-    private final List<ObjectFeatureType> featureTypes;
+    private final List<FeatureType> featureTypes;
     
     private SpecificationLookup specificationLookup;
 
-    public FacetFactoryAbstract(final List<ObjectFeatureType> featureTypes) {
+    public FacetFactoryAbstract(final List<FeatureType> featureTypes) {
         this.featureTypes = ImmutableList.copyOf(featureTypes);
     }
 
     @Override
-    public List<ObjectFeatureType> getFeatureTypes() {
+    public List<FeatureType> getFeatureTypes() {
         return featureTypes;
     }
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetHolderImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetHolderImpl.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetHolderImpl.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetHolderImpl.java Wed Dec 22 16:22:08 2010
@@ -20,9 +20,9 @@
 
 package org.apache.isis.core.metamodel.facets;
 
-import java.util.HashMap;
-import java.util.Map;
-
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.isis.core.commons.filters.Filter;
 
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetUtil.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetUtil.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetUtil.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetUtil.java Wed Dec 22 16:22:08 2010
@@ -20,11 +20,11 @@
 
 package org.apache.isis.core.metamodel.facets;
 
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+
 import org.apache.isis.core.commons.filters.Filter;
 
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ImperativeFacet.java (from r1051446, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/ImperativeFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ImperativeFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ImperativeFacet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/ImperativeFacet.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/ImperativeFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ImperativeFacet.java Wed Dec 22 16:22:08 2010
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.metamodel.java5;
+package org.apache.isis.core.metamodel.facets;
 
 import java.lang.reflect.Method;
 import java.util.List;
@@ -25,8 +25,6 @@ import java.util.List;
 import org.apache.isis.applib.DomainObjectContainer;
 import org.apache.isis.core.commons.filters.AbstractFilter;
 import org.apache.isis.core.commons.filters.Filter;
-import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ImperativeFacetMulti.java (from r1051446, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/ImperativeFacetMulti.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ImperativeFacetMulti.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ImperativeFacetMulti.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/ImperativeFacetMulti.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/ImperativeFacetMulti.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ImperativeFacetMulti.java Wed Dec 22 16:22:08 2010
@@ -18,9 +18,9 @@
  */
 
 
-package org.apache.isis.core.metamodel.java5;
+package org.apache.isis.core.metamodel.facets;
 
-import java.lang.reflect.Method;
+import java.lang.reflect.Method;
 
 public interface ImperativeFacetMulti extends ImperativeFacet {
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ImperativeFacetUtils.java (from r1051446, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/ImperativeFacetUtils.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ImperativeFacetUtils.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ImperativeFacetUtils.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/ImperativeFacetUtils.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/ImperativeFacetUtils.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ImperativeFacetUtils.java Wed Dec 22 16:22:08 2010
@@ -18,15 +18,13 @@
  */
 
 
-package org.apache.isis.core.metamodel.java5;
-
-import java.lang.reflect.Method;
-import java.util.List;
+package org.apache.isis.core.metamodel.facets;
 
+import java.lang.reflect.Method;
+import java.util.List;
+
 import org.apache.isis.core.commons.filters.AbstractFilter;
 import org.apache.isis.core.commons.lang.CastUtils;
-import org.apache.isis.core.metamodel.facets.DecoratingFacet;
-import org.apache.isis.core.metamodel.facets.Facet;
 import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
 
 
@@ -50,7 +48,6 @@ public final class ImperativeFacetUtils 
             return getImperativeFacet(decoratingFacet.getDecoratedFacet());
         }
         return null;
-
     }
 
     public static boolean isImperativeFacet(final Facet facet) {

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodFilteringFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodFilteringFacetFactory.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodFilteringFacetFactory.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodFilteringFacetFactory.java Wed Dec 22 16:22:08 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.metamodel.facets;
 
-import java.lang.reflect.Method;
+import java.lang.reflect.Method;
 
 
 /**

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodPrefixBasedFacetFactory.java (from r1051446, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/MethodPrefixBasedFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodPrefixBasedFacetFactory.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodPrefixBasedFacetFactory.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/MethodPrefixBasedFacetFactory.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/MethodPrefixBasedFacetFactory.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodPrefixBasedFacetFactory.java Wed Dec 22 16:22:08 2010
@@ -18,11 +18,10 @@
  */
 
 
-package org.apache.isis.core.metamodel.java5;
+package org.apache.isis.core.metamodel.facets;
 
-import java.util.List;
-
-import org.apache.isis.core.metamodel.facets.FacetFactory;
+import java.util.List;
+
 import org.apache.isis.core.metamodel.specloader.internal.facetprocessor.FacetProcessor;
 
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodRemover.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodRemover.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodRemover.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodRemover.java Wed Dec 22 16:22:08 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.core.metamodel.facets;
 
-import java.lang.reflect.Method;
-import java.util.List;
+import java.lang.reflect.Method;
+import java.util.List;
 
 
 /**

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodRemoverConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodRemoverConstants.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodRemoverConstants.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodRemoverConstants.java Wed Dec 22 16:22:08 2010
@@ -20,9 +20,9 @@
 
 package org.apache.isis.core.metamodel.facets;
 
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
 
 
 public class MethodRemoverConstants {

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactory.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactory.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactory.java Wed Dec 22 16:22:08 2010
@@ -21,9 +21,9 @@
 package org.apache.isis.core.metamodel.facets;
 
 
-import java.lang.reflect.Method;
-import java.util.List;
-
+import java.lang.reflect.Method;
+import java.util.List;
+
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleClassValueFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleClassValueFacetAbstract.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleClassValueFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleClassValueFacetAbstract.java Wed Dec 22 16:22:08 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.core.metamodel.facets;
 
-import org.apache.isis.core.metamodel.runtimecontext.SpecificationLookup;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.SpecificationLookup;
 
 
 public abstract class SingleClassValueFacetAbstract extends FacetAbstract implements SingleClassValueFacet {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/TypedHolder.java (from r1051471, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/peer/TypedHolder.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/TypedHolder.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/TypedHolder.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/peer/TypedHolder.java&r1=1051471&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/peer/TypedHolder.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/TypedHolder.java Wed Dec 22 16:22:08 2010
@@ -18,10 +18,9 @@
  */
 
 
-package org.apache.isis.core.metamodel.specloader.internal.peer;
+package org.apache.isis.core.metamodel.facets;
 
-import org.apache.isis.core.metamodel.facets.FacetHolder;
-import org.apache.isis.core.metamodel.runtimecontext.spec.feature.FeatureType;
+import org.apache.isis.core.metamodel.feature.FeatureType;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
 
@@ -33,8 +32,17 @@ import org.apache.isis.core.metamodel.sp
  */
 public interface TypedHolder extends FacetHolder {
 
+
+    public FeatureType getFeatureType();
+
+    /**
+     * The type of a {@link FeatureType#PROPERTY property}, the referenced type
+     * of a {@link FeatureType#COLLECTION collection}, the return type of an
+     * {@link FeatureType#ACTION action} and the type of a {@link FeatureType#ACTION_PARAMETER action parameter}.
+     */
     public Class<?> getType();
-    
+
+
     /**
      * Type may not be known initially (eg {@link FeatureType#COLLECTION}s).
      * 
@@ -44,12 +52,5 @@ public interface TypedHolder extends Fac
      * <tt>java.util.List&lt;Customer&gt;</tt>.
      */
     public void setType(Class<?> type);
-
-
-    /**
-     * @return
-     */
-    public FeatureType getFeatureType();
-
 
 }

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/TypedHolderDefault.java (from r1051471, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/peer/TypedHolderImpl.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/TypedHolderDefault.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/TypedHolderDefault.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/peer/TypedHolderImpl.java&r1=1051471&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/peer/TypedHolderImpl.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/TypedHolderDefault.java Wed Dec 22 16:22:08 2010
@@ -14,17 +14,17 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.isis.core.metamodel.specloader.internal.peer;
+package org.apache.isis.core.metamodel.facets;
 
-import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
-import org.apache.isis.core.metamodel.runtimecontext.spec.feature.FeatureType;
+import org.apache.isis.core.metamodel.feature.FeatureType;
 
-public class TypedHolderImpl extends FacetHolderImpl implements TypedHolder {
+
+public class TypedHolderDefault extends FacetHolderImpl implements TypedHolder {
 
     private final FeatureType featureType;
     private Class<?> type;
     
-    public TypedHolderImpl(FeatureType featureType ,Class<?> type) {
+    public TypedHolderDefault(FeatureType featureType ,Class<?> type) {
         this.featureType = featureType;
         this.type = type;
     }

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actcoll/typeof/TypeOfFacetAbstract.java (from r1051471, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actcoll/typeof/TypeOfFacetAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actcoll/typeof/TypeOfFacetAbstract.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetAbstract.java&r1=1051471&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actcoll/typeof/TypeOfFacetAbstract.java Wed Dec 22 16:22:08 2010
@@ -18,13 +18,12 @@
  */
 
 
-package org.apache.isis.core.progmodel.facets.actcoll.typeof;
+package org.apache.isis.core.metamodel.facets.actcoll.typeof;
 
 import org.apache.isis.core.metamodel.facets.Facet;
 import org.apache.isis.core.metamodel.facets.FacetHolder;
 import org.apache.isis.core.metamodel.facets.SingleClassValueFacetAbstract;
-import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
-import org.apache.isis.core.metamodel.runtimecontext.SpecificationLookup;
+import org.apache.isis.core.metamodel.spec.SpecificationLookup;
 
 
 public abstract class TypeOfFacetAbstract extends SingleClassValueFacetAbstract implements TypeOfFacet {



Mime
View raw message