You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2011/05/03 08:42:09 UTC

svn commit: r1098940 [4/5] - in /incubator/isis/trunk/runtimes: dflt/objectstores/dflt/src/main/java/org/apache/isis/runtimes/dflt/objectstores/dflt/ dflt/objectstores/dflt/src/main/java/org/apache/isis/runtimes/dflt/objectstores/dflt/internal/ dflt/ob...

Modified: incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/ObjectDataVectorTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/ObjectDataVectorTest.java?rev=1098940&r1=1098939&r2=1098940&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/ObjectDataVectorTest.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/ObjectDataVectorTest.java Tue May  3 06:42:06 2011
@@ -17,54 +17,50 @@
  *  under the License.
  */
 
+package org.apache.isis.runtimes.dflt.objectstores.xml.internal.data;
 
-package org.apache.isis.runtimes.dflt.objectstores.xml.internal.data;
-
 import static org.junit.Assert.assertTrue;
 
 import java.util.Collections;
 
+import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
+import org.apache.isis.runtimes.dflt.objectstores.xml.internal.version.FileVersion;
+import org.apache.isis.runtimes.dflt.runtime.persistence.oidgenerator.simple.SerialOid;
 import org.junit.Before;
 import org.junit.Test;
 
-import org.apache.isis.runtimes.dflt.objectstores.xml.internal.version.FileVersion;
-import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
-import org.apache.isis.runtimes.dflt.runtime.persistence.oidgenerator.simple.SerialOid;
-
-public class ObjectDataVectorTest {
-	private ObjectDataVector objectDataVector;
-	private ObjectData objectData;
-    private TestProxySpecification spec;
-	private SerialOid oid;
-	private FileVersion version;
-
-	@Before
-	public void setUp() throws Exception {
-		boolean isTransient = true;
-		long serialNum = Long.parseLong("1", 16);
-		oid = isTransient ? SerialOid.createTransient(serialNum) : SerialOid.createPersistent(serialNum);
-
-		spec = new TestProxySpecification(this.getClass());
-        spec.fields = Collections.emptyList();
-
-        version = new FileVersion("", System.currentTimeMillis());
-        objectData = new ObjectData(spec, oid, version);
-		objectDataVector = new ObjectDataVector();
-	}
-	
-	@Test 
-	public void validatesObjectDataIsStored()throws Exception {
-		objectDataVector.addElement(objectData);
-		assertTrue(objectDataVector.contains(objectData));
-		assertTrue(objectDataVector.element(0).equals(objectData));
-	}
-	
-	@Test 
-	public void validatesObjectDataVectorSize()throws Exception {
-		objectDataVector.addElement(objectData);
-		assertTrue(objectDataVector.size() == 1);
-	}
-	
-}
-
-
+public class ObjectDataVectorTest {
+    private ObjectDataVector objectDataVector;
+    private ObjectData objectData;
+    private TestProxySpecification spec;
+    private SerialOid oid;
+    private FileVersion version;
+
+    @Before
+    public void setUp() throws Exception {
+        final boolean isTransient = true;
+        final long serialNum = Long.parseLong("1", 16);
+        oid = isTransient ? SerialOid.createTransient(serialNum) : SerialOid.createPersistent(serialNum);
+
+        spec = new TestProxySpecification(this.getClass());
+        spec.fields = Collections.emptyList();
+
+        version = new FileVersion("", System.currentTimeMillis());
+        objectData = new ObjectData(spec, oid, version);
+        objectDataVector = new ObjectDataVector();
+    }
+
+    @Test
+    public void validatesObjectDataIsStored() throws Exception {
+        objectDataVector.addElement(objectData);
+        assertTrue(objectDataVector.contains(objectData));
+        assertTrue(objectDataVector.element(0).equals(objectData));
+    }
+
+    @Test
+    public void validatesObjectDataVectorSize() throws Exception {
+        objectDataVector.addElement(objectData);
+        assertTrue(objectDataVector.size() == 1);
+    }
+
+}

Modified: incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/Person.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/Person.java?rev=1098940&r1=1098939&r2=1098940&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/Person.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/Person.java Tue May  3 06:42:06 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.runtimes.dflt.objectstores.xml.internal.data;
 
 public class Person {

Modified: incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/ReferenceVectorTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/ReferenceVectorTest.java?rev=1098940&r1=1098939&r2=1098940&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/ReferenceVectorTest.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/ReferenceVectorTest.java Tue May  3 06:42:06 2011
@@ -17,58 +17,54 @@
  *  under the License.
  */
 
+package org.apache.isis.runtimes.dflt.objectstores.xml.internal.data;
 
-package org.apache.isis.runtimes.dflt.objectstores.xml.internal.data;
-
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import org.apache.isis.runtimes.dflt.runtime.persistence.oidgenerator.simple.SerialOid;
 import org.junit.Before;
 import org.junit.Test;
-
-public class ReferenceVectorTest {
-	private ReferenceVector referenceVector;
-	private SerialOid oid;
-
-	@Before
-	public void setUp() throws Exception {
-		long serialNum = Long.parseLong("1", 16);
-		oid = SerialOid.createTransient(serialNum);
-		referenceVector = new ReferenceVector();
-	}
-	
-	@Test 
-	public void validatesSerialOidIsStoredInElements()throws Exception {
-		referenceVector.add(oid);
-		assertTrue(referenceVector.elementAt(0).equals(oid));
-	}
-	
-	@Test 
-	public void validatesSerialOidIsRemovedInElements()throws Exception {
-		referenceVector.add(oid);
-		referenceVector.remove(oid);
-		assertTrue(referenceVector.size() == 0);
-	}
-	
-	@Test 
-	public void validatesReferenceVectorIsEqual()throws Exception {
-		assertTrue(referenceVector.equals(referenceVector));
-		assertTrue(referenceVector.equals(new ReferenceVector()));
-		assertFalse(referenceVector.equals(new Object()));
-	}
-	
-	@Test 
-	public void validateReferenceVectorHashCode()throws Exception {
-		assertTrue(referenceVector.hashCode() == 630);
-	}
-	
-	@Test 
-	public void validateReferenceToString()throws Exception {
-		assertTrue(referenceVector.toString() != null);
-	}
-	
-
-}
-
-
+
+public class ReferenceVectorTest {
+    private ReferenceVector referenceVector;
+    private SerialOid oid;
+
+    @Before
+    public void setUp() throws Exception {
+        final long serialNum = Long.parseLong("1", 16);
+        oid = SerialOid.createTransient(serialNum);
+        referenceVector = new ReferenceVector();
+    }
+
+    @Test
+    public void validatesSerialOidIsStoredInElements() throws Exception {
+        referenceVector.add(oid);
+        assertTrue(referenceVector.elementAt(0).equals(oid));
+    }
+
+    @Test
+    public void validatesSerialOidIsRemovedInElements() throws Exception {
+        referenceVector.add(oid);
+        referenceVector.remove(oid);
+        assertTrue(referenceVector.size() == 0);
+    }
+
+    @Test
+    public void validatesReferenceVectorIsEqual() throws Exception {
+        assertTrue(referenceVector.equals(referenceVector));
+        assertTrue(referenceVector.equals(new ReferenceVector()));
+        assertFalse(referenceVector.equals(new Object()));
+    }
+
+    @Test
+    public void validateReferenceVectorHashCode() throws Exception {
+        assertTrue(referenceVector.hashCode() == 630);
+    }
+
+    @Test
+    public void validateReferenceToString() throws Exception {
+        assertTrue(referenceVector.toString() != null);
+    }
+
+}

Modified: incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/Role.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/Role.java?rev=1098940&r1=1098939&r2=1098940&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/Role.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/Role.java Tue May  3 06:42:06 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.runtimes.dflt.objectstores.xml.internal.data;
 
 /**

Modified: incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/Team.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/Team.java?rev=1098940&r1=1098939&r2=1098940&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/Team.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/Team.java Tue May  3 06:42:06 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.runtimes.dflt.objectstores.xml.internal.data;
 
 public class Team {

Modified: incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/xml/XmlDataManagerInstancesTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/xml/XmlDataManagerInstancesTest.java?rev=1098940&r1=1098939&r2=1098940&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/xml/XmlDataManagerInstancesTest.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/xml/XmlDataManagerInstancesTest.java Tue May  3 06:42:06 2011
@@ -22,12 +22,12 @@ package org.apache.isis.runtimes.dflt.ob
 import java.io.File;
 import java.io.FilenameFilter;
 
+import org.apache.isis.core.commons.xml.XmlFile;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.runtimes.dflt.objectstores.xml.internal.clock.DefaultClock;
 import org.apache.isis.runtimes.dflt.objectstores.xml.internal.data.ObjectData;
 import org.apache.isis.runtimes.dflt.objectstores.xml.internal.data.ObjectDataVector;
 import org.apache.isis.runtimes.dflt.objectstores.xml.internal.version.FileVersion;
-import org.apache.isis.core.commons.xml.XmlFile;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.runtimes.dflt.runtime.persistence.oidgenerator.simple.SerialOid;
 import org.apache.isis.runtimes.dflt.runtime.testsystem.ProxyJunit3TestCase;
 import org.apache.log4j.Logger;
@@ -51,7 +51,7 @@ public class XmlDataManagerInstancesTest
         super.setUp();
 
         clearTestDirectory();
-        String charset = XmlFileUtil.lookupCharset(system.getConfiguration());
+        final String charset = XmlFileUtil.lookupCharset(system.getConfiguration());
         manager = new XmlDataManager(new XmlFile(charset, "tmp/tests"));
 
         FileVersion.setClock(new DefaultClock());
@@ -80,8 +80,8 @@ public class XmlDataManagerInstancesTest
         });
 
         if (files != null) {
-            for (int f = 0; f < files.length; f++) {
-                new File(directory, files[f]).delete();
+            for (final String file : files) {
+                new File(directory, file).delete();
             }
         }
     }

Modified: incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/xml/XmlDataManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/xml/XmlDataManagerTest.java?rev=1098940&r1=1098939&r2=1098940&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/xml/XmlDataManagerTest.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/xml/XmlDataManagerTest.java Tue May  3 06:42:06 2011
@@ -22,14 +22,14 @@ package org.apache.isis.runtimes.dflt.ob
 import java.io.File;
 import java.io.FilenameFilter;
 
+import org.apache.isis.core.commons.xml.XmlFile;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.runtimes.dflt.objectstores.xml.internal.clock.DefaultClock;
 import org.apache.isis.runtimes.dflt.objectstores.xml.internal.data.ObjectData;
 import org.apache.isis.runtimes.dflt.objectstores.xml.internal.data.ReferenceVector;
 import org.apache.isis.runtimes.dflt.objectstores.xml.internal.data.Role;
 import org.apache.isis.runtimes.dflt.objectstores.xml.internal.data.Team;
 import org.apache.isis.runtimes.dflt.objectstores.xml.internal.version.FileVersion;
-import org.apache.isis.core.commons.xml.XmlFile;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.runtimes.dflt.runtime.persistence.oidgenerator.simple.SerialOid;
 import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
 import org.apache.isis.runtimes.dflt.runtime.testsystem.ProxyJunit3TestCase;
@@ -45,7 +45,7 @@ public class XmlDataManagerTest extends 
         FileVersion.setClock(new DefaultClock());
 
         clearTestDirectory();
-        String charset = XmlFileUtil.lookupCharset(system.getConfiguration());
+        final String charset = XmlFileUtil.lookupCharset(system.getConfiguration());
         manager = new XmlDataManager(new XmlFile(charset, "tmp/tests"));
     }
 
@@ -64,8 +64,8 @@ public class XmlDataManagerTest extends 
         });
 
         if (files != null) {
-            for (int f = 0; f < files.length; f++) {
-                new File(directory, files[f]).delete();
+            for (final String file : files) {
+                new File(directory, file).delete();
             }
         }
     }

Modified: incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/services/DummyServiceManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/services/DummyServiceManager.java?rev=1098940&r1=1098939&r2=1098940&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/services/DummyServiceManager.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/services/DummyServiceManager.java Tue May  3 06:42:06 2011
@@ -17,21 +17,23 @@
  *  under the License.
  */
 
-
 package org.apache.isis.runtimes.dflt.objectstores.xml.internal.services;
 
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
 
-
 public class DummyServiceManager implements ServiceManager {
 
+    @Override
     public Oid getOidForService(final String name) {
         return null;
     }
 
-    public void loadServices() {}
+    @Override
+    public void loadServices() {
+    }
 
-    public void registerService(final String name, final Oid oid) {}
+    @Override
+    public void registerService(final String name, final Oid oid) {
+    }
 
 }
-

Modified: incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/version/FileVersionTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/version/FileVersionTest.java?rev=1098940&r1=1098939&r2=1098940&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/version/FileVersionTest.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/version/FileVersionTest.java Tue May  3 06:42:06 2011
@@ -17,9 +17,8 @@
  *  under the License.
  */
 
+package org.apache.isis.runtimes.dflt.objectstores.xml.internal.version;
 
-package org.apache.isis.runtimes.dflt.objectstores.xml.internal.version;
-
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
@@ -32,49 +31,56 @@ import org.jmock.Mockery;
 import org.jmock.integration.junit4.JUnit4Mockery;
 import org.junit.Before;
 import org.junit.Test;
-
-public class FileVersionTest extends ProxyJunit4TestCase {
-    Mockery context = new JUnit4Mockery();
-    final DataInputExtended extended = context.mock(DataInputExtended.class);; 
-
-    @Before
-	public void setUp() throws Exception {
-		
-	}
-	@Test
-	public void testFileVersionDataInputExtended() throws Exception { 
-        context.checking(new Expectations() {{
-            ignoring (extended);
-        }});		
-		FileVersion fileVersion = new FileVersion(extended);
-	}
-
-	@Test
-	public void testFileVersionEncoding() throws Exception { 
-		final DataOutputExtended outputExtended = context.mock(DataOutputExtended.class);
-        context.checking(new Expectations() {{
-            ignoring (extended);
-            ignoring (outputExtended);
-        }});		
-		FileVersion fileVersion = new FileVersion(extended);
-        fileVersion.encode(outputExtended);
-	}
-
-	@Test
-	public void testFileVersionDifferenceAndSequenceAndEquals() throws Exception { 
-		final Version version = context.mock(Version.class);
-        context.checking(new Expectations() {{
-        	ignoring (extended);
-            one (version);
-            	
-        }});		
-		FileVersion testVersion = new FileVersion(extended);
-		assertFalse(testVersion.different(version));
-		assertTrue(testVersion.sequence().length() > 0);
-		assertTrue(testVersion.getSequence() == 0);
-		assertTrue(testVersion.toString().length() > 0);
-		assertTrue(testVersion.equals(testVersion));
-		assertFalse(testVersion.equals(version));
-	}
-
-}
+
+public class FileVersionTest extends ProxyJunit4TestCase {
+    Mockery context = new JUnit4Mockery();
+    final DataInputExtended extended = context.mock(DataInputExtended.class);;
+
+    @Before
+    public void setUp() throws Exception {
+
+    }
+
+    @Test
+    public void testFileVersionDataInputExtended() throws Exception {
+        context.checking(new Expectations() {
+            {
+                ignoring(extended);
+            }
+        });
+        final FileVersion fileVersion = new FileVersion(extended);
+    }
+
+    @Test
+    public void testFileVersionEncoding() throws Exception {
+        final DataOutputExtended outputExtended = context.mock(DataOutputExtended.class);
+        context.checking(new Expectations() {
+            {
+                ignoring(extended);
+                ignoring(outputExtended);
+            }
+        });
+        final FileVersion fileVersion = new FileVersion(extended);
+        fileVersion.encode(outputExtended);
+    }
+
+    @Test
+    public void testFileVersionDifferenceAndSequenceAndEquals() throws Exception {
+        final Version version = context.mock(Version.class);
+        context.checking(new Expectations() {
+            {
+                ignoring(extended);
+                one(version);
+
+            }
+        });
+        final FileVersion testVersion = new FileVersion(extended);
+        assertFalse(testVersion.different(version));
+        assertTrue(testVersion.sequence().length() > 0);
+        assertTrue(testVersion.getSequence() == 0);
+        assertTrue(testVersion.toString().length() > 0);
+        assertTrue(testVersion.equals(testVersion));
+        assertFalse(testVersion.equals(version));
+    }
+
+}

Modified: incubator/isis/trunk/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/EmbeddedContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/EmbeddedContext.java?rev=1098940&r1=1098939&r2=1098940&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/EmbeddedContext.java (original)
+++ incubator/isis/trunk/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/EmbeddedContext.java Tue May  3 06:42:06 2011
@@ -17,38 +17,44 @@
  *  under the License.
  */
 
+package org.apache.isis.runtimes.embedded;
 
-package org.apache.isis.runtimes.embedded;
-
-import java.util.List;
-
-import org.apache.isis.runtimes.embedded.internal.PersistenceState;
-import org.apache.isis.applib.query.Query;
+import java.util.List;
+
+import org.apache.isis.applib.query.Query;
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
-
-public interface EmbeddedContext {
-
-	AuthenticationSession getAuthenticationSession();
-	
-	Object instantiate(Class<?> type);
-	
-	void resolve(Object parent);
-	void resolve(Object parent, Object field);
-	void objectChanged(Object object);
-
-	void makePersistent(Object object);
-	void remove(Object object);
-
-	PersistenceState getPersistenceState(Object object);
-	
-	<T> List<T> allMatchingQuery(Query<T> query);
-	<T> T firstMatchingQuery(Query<T> query);
-
-	boolean flush();
-	void commit();
-
-	void informUser(String message);
-	void warnUser(String message);
-	void raiseError(String message);
-
-}
+import org.apache.isis.runtimes.embedded.internal.PersistenceState;
+
+public interface EmbeddedContext {
+
+    AuthenticationSession getAuthenticationSession();
+
+    Object instantiate(Class<?> type);
+
+    void resolve(Object parent);
+
+    void resolve(Object parent, Object field);
+
+    void objectChanged(Object object);
+
+    void makePersistent(Object object);
+
+    void remove(Object object);
+
+    PersistenceState getPersistenceState(Object object);
+
+    <T> List<T> allMatchingQuery(Query<T> query);
+
+    <T> T firstMatchingQuery(Query<T> query);
+
+    boolean flush();
+
+    void commit();
+
+    void informUser(String message);
+
+    void warnUser(String message);
+
+    void raiseError(String message);
+
+}

Modified: incubator/isis/trunk/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/EmbeddedContextNoop.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/EmbeddedContextNoop.java?rev=1098940&r1=1098939&r2=1098940&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/EmbeddedContextNoop.java (original)
+++ incubator/isis/trunk/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/EmbeddedContextNoop.java Tue May  3 06:42:06 2011
@@ -17,60 +17,80 @@
  *  under the License.
  */
 
+package org.apache.isis.runtimes.embedded;
 
-package org.apache.isis.runtimes.embedded;
-
-import java.util.List;
-
-import org.apache.isis.runtimes.embedded.internal.PersistenceState;
-import org.apache.isis.applib.query.Query;
+import java.util.List;
+
+import org.apache.isis.applib.query.Query;
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
-
-public class EmbeddedContextNoop implements EmbeddedContext {
-	
-	public AuthenticationSession getAuthenticationSession() {
-		return null;
-	}
-
-	public PersistenceState getPersistenceState(Object object) {
-		return null;
-	}
-
-	public Object instantiate(Class<?> type) {
-		return null;
-	}
-	public void makePersistent(Object object) {
-	}
-	public void remove(Object object) {
-	}
-
-
-	public void resolve(Object parent) {
-	}
-	public void resolve(Object parent, Object field) {
-	}
-	public void objectChanged(Object object) {
-	}
-
-	public <T> List<T> allMatchingQuery(Query<T> query) {
-		return null;
-	}
-	public <T> T firstMatchingQuery(Query<T> query) {
-		return null;
-	}
-
-	
-	public void commit() {
-	}
-	public boolean flush() {
-		return false;
-	}
-	
-	public void informUser(String message) {
-	}
-	public void warnUser(String message) {
-	}
-	public void raiseError(String message) {
-	}
-
-}
+import org.apache.isis.runtimes.embedded.internal.PersistenceState;
+
+public class EmbeddedContextNoop implements EmbeddedContext {
+
+    @Override
+    public AuthenticationSession getAuthenticationSession() {
+        return null;
+    }
+
+    @Override
+    public PersistenceState getPersistenceState(final Object object) {
+        return null;
+    }
+
+    @Override
+    public Object instantiate(final Class<?> type) {
+        return null;
+    }
+
+    @Override
+    public void makePersistent(final Object object) {
+    }
+
+    @Override
+    public void remove(final Object object) {
+    }
+
+    @Override
+    public void resolve(final Object parent) {
+    }
+
+    @Override
+    public void resolve(final Object parent, final Object field) {
+    }
+
+    @Override
+    public void objectChanged(final Object object) {
+    }
+
+    @Override
+    public <T> List<T> allMatchingQuery(final Query<T> query) {
+        return null;
+    }
+
+    @Override
+    public <T> T firstMatchingQuery(final Query<T> query) {
+        return null;
+    }
+
+    @Override
+    public void commit() {
+    }
+
+    @Override
+    public boolean flush() {
+        return false;
+    }
+
+    @Override
+    public void informUser(final String message) {
+    }
+
+    @Override
+    public void warnUser(final String message) {
+    }
+
+    @Override
+    public void raiseError(final String message) {
+    }
+
+}

Modified: incubator/isis/trunk/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/IsisMetaModel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/IsisMetaModel.java?rev=1098940&r1=1098939&r2=1098940&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/IsisMetaModel.java (original)
+++ incubator/isis/trunk/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/IsisMetaModel.java Tue May  3 06:42:06 2011
@@ -17,9 +17,8 @@
  *  under the License.
  */
 
+package org.apache.isis.runtimes.embedded;
 
-package org.apache.isis.runtimes.embedded;
-
 import static org.apache.isis.core.commons.ensure.Ensure.ensureThatArg;
 import static org.apache.isis.core.commons.ensure.Ensure.ensureThatState;
 import static org.hamcrest.CoreMatchers.is;
@@ -32,8 +31,6 @@ import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
 
-import org.apache.isis.runtimes.dflt.bytecode.identity.classsubstitutor.ClassSubstitutorIdentity;
-import org.apache.isis.runtimes.embedded.internal.RuntimeContextForEmbeddedMetaModel;
 import org.apache.isis.core.commons.components.ApplicationScopedComponent;
 import org.apache.isis.core.commons.config.IsisConfiguration;
 import org.apache.isis.core.commons.config.IsisConfigurationDefault;
@@ -58,317 +55,305 @@ import org.apache.isis.progmodel.wrapper
 import org.apache.isis.progmodel.wrapper.metamodel.DomainObjectContainerWrapperFactory;
 import org.apache.isis.progmodel.wrapper.metamodel.internal.WrapperFactoryDefault;
 import org.apache.isis.progmodels.dflt.ProgrammingModelFacetsJava5;
-
-
-/**
- * Facade for the entire Isis metamodel and supporting components.
- */
-public class IsisMetaModel implements ApplicationScopedComponent {
-
-	private static enum State {
-		NOT_INITIALIZED,
-		INITIALIZED,
-		SHUTDOWN;
-	}
-
-
-	private final List<Class<?>> serviceTypes = new ArrayList<Class<?>>();
-	private State state = State.NOT_INITIALIZED;
-
-	private ObjectReflectorDefault reflector;
-	private RuntimeContextForEmbeddedMetaModel runtimeContext;
-
-	private IsisConfiguration configuration;
-	private ClassSubstitutor classSubstitutor;
-	private CollectionTypeRegistry collectionTypeRegistry;
-	private ProgrammingModel programmingModel;
-	private SpecificationTraverser specificationTraverser;
-	private MemberLayoutArranger memberLayoutArranger;
-	private Set<FacetDecorator> facetDecorators;
-	private MetaModelValidator metaModelValidator;
-
-	private WrapperFactory viewer;
-	private EmbeddedContext context;
-	private List<Object> services;
-
-
-    
-	public IsisMetaModel(
-			final EmbeddedContext context,
-			final Class<?>... serviceTypes) {
-
-		this.serviceTypes.addAll(Arrays.asList(serviceTypes));
-		setConfiguration(new IsisConfigurationDefault());
-		setClassSubstitutor(new ClassSubstitutorIdentity());
-		setCollectionTypeRegistry(new CollectionTypeRegistryDefault());
-		setSpecificationTraverser(new SpecificationTraverserDefault());
-		setMemberLayoutArranger(new MemberLayoutArrangerDefault());
-		setFacetDecorators(new TreeSet<FacetDecorator>());
-		setProgrammingModelFacets(new ProgrammingModelFacetsJava5());
-		
-		setMetaModelValidator(new MetaModelValidatorDefault());
-
-		this.context = context;
-	}
-
-
-	/**
-	 * The list of classes representing services, as specified in the {@link #IsisMetaModel(EmbeddedContext, Class...) constructor}.
-	 *
-	 * <p>
-	 * To obtain the instantiated services, use the {@link ServicesInjector#getRegisteredServices()} (available from {@link #getServicesInjector()}).
-	 */
-	public List<Class<?>> getServiceTypes() {
-		return Collections.unmodifiableList(serviceTypes);
-	}
-
-	/////////////////////////////////////////////////////////
-	// init, shutdown
-	/////////////////////////////////////////////////////////
-
-	@Override
-    public void init() {
-		ensureNotInitialized();
-		reflector = new ObjectReflectorDefault(configuration, classSubstitutor, collectionTypeRegistry, specificationTraverser, memberLayoutArranger, programmingModel, facetDecorators, metaModelValidator);
-
-		services = createServices(serviceTypes);
-		runtimeContext = new RuntimeContextForEmbeddedMetaModel(context, services);
-		DomainObjectContainerDefault container = new DomainObjectContainerWrapperFactory();
-
-		runtimeContext.injectInto(container);
-		runtimeContext.setContainer(container);
-		runtimeContext.injectInto(reflector);
-		reflector.injectInto(runtimeContext);
-
-		reflector.init();
-		runtimeContext.init();
-
-		for(Class<?> serviceType: serviceTypes) {
-			ObjectSpecification serviceSpec = reflector.loadSpecification(serviceType);
-			serviceSpec.markAsService();
-		}
-		state = State.INITIALIZED;
-
-		viewer = new WrapperFactoryDefault();
-	}
-
-	@Override
-    public void shutdown() {
-		ensureInitialized();
-		state = State.SHUTDOWN;
-	}
-
-	private List<Object> createServices(List<Class<?>> serviceTypes) {
-		List<Object> services = new ArrayList<Object>();
-		for(Class<?> serviceType: serviceTypes) {
-			try {
-				services.add(serviceType.newInstance());
-			} catch (InstantiationException e) {
-				throw new IsisException("Unable to instantiate service", e);
-			} catch (IllegalAccessException e) {
-				throw new IsisException("Unable to instantiate service", e);
-			}
-		}
-		return services;
-	}
-
-
-
-	/////////////////////////////////////////////////////////
-	// SpecificationLoader
-	/////////////////////////////////////////////////////////
-
-	/**
-	 * Available once {@link #init() initialized}.
-	 */
-	public SpecificationLoader getSpecificationLoader() {
-		return reflector;
-	}
-
-	/////////////////////////////////////////////////////////
-	// Viewer
-	/////////////////////////////////////////////////////////
-
-	/**
-	 * Available once {@link #init() initialized}.
-	 */
-	public WrapperFactory getViewer() {
-		ensureInitialized();
-		return viewer;
-	}
-
-	/////////////////////////////////////////////////////////
-	// ServicesInjector
-	/////////////////////////////////////////////////////////
-
-	/**
-	 * The {@link ServicesInjector}; can use to obtain the set of registered services.
-	 *
-	 * <p>
-	 * Available once {@link #init() initialized}.
-	 */
-	public ServicesInjector getServicesInjector() {
-		ensureInitialized();
-		return runtimeContext.getServicesInjector();
-	}
-
-	/////////////////////////////////////////////////////////
-	// Override defaults
-	/////////////////////////////////////////////////////////
-
-	/**
-	 * The {@link IsisConfiguration} in force, either defaulted or specified
-	 * {@link #setConfiguration(IsisConfiguration) explicitly.}
-	 */
-	public IsisConfiguration getConfiguration() {
-		return configuration;
-	}
-
-	/**
-	 * Optionally specify the {@link IsisConfiguration}.
-	 *
-	 * <p>
-	 * Call prior to {@link #init()}.
-	 */
-	public void setConfiguration(IsisConfiguration configuration) {
-		ensureNotInitialized();
-		ensureThatArg(configuration, is(notNullValue()));
-		this.configuration = configuration;
-	}
-
-	/**
-	 * The {@link ClassSubstitutor} in force, either defaulted or
-	 * specified {@link #setClassSubstitutor(ClassSubstitutor) explicitly}.
-	 */
-	public ClassSubstitutor getClassSubstitutor() {
-		return classSubstitutor;
-	}
-
-	/**
-	 * Optionally specify the {@link ClassSubstitutor}.
-	 *
-	 * <p>
-	 * Call prior to {@link #init()}.
-	 */
-	public void setClassSubstitutor(ClassSubstitutor classSubstitutor) {
-		ensureNotInitialized();
-		ensureThatArg(classSubstitutor, is(notNullValue()));
-		this.classSubstitutor = classSubstitutor;
-	}
-
-	/**
-	 * The {@link CollectionTypeRegistry} in force, either defaulted or
-	 * specified {@link #setCollectionTypeRegistry(CollectionTypeRegistry) explicitly.}
-	 */
-	public CollectionTypeRegistry getCollectionTypeRegistry() {
-		return collectionTypeRegistry;
-	}
-
-	/**
-	 * Optionally specify the {@link CollectionTypeRegistry}.
-	 *
-	 * <p>
-	 * Call prior to {@link #init()}.
-	 */
-	public void setCollectionTypeRegistry(
-			CollectionTypeRegistry collectionTypeRegistry) {
-		ensureNotInitialized();
-		ensureThatArg(collectionTypeRegistry, is(notNullValue()));
-		this.collectionTypeRegistry = collectionTypeRegistry;
-	}
-
-	/**
-	 * The {@link SpecificationTraverser} in force, either defaulted or
-	 * specified {@link #setSpecificationTraverser(SpecificationTraverser) explicitly}.
-	 */
-	public SpecificationTraverser getSpecificationTraverser() {
-		return specificationTraverser;
-	}
-
-	/**
-	 * Optionally specify the {@link SpecificationTraverser}.
-	 */
-	public void setSpecificationTraverser(
-			SpecificationTraverser specificationTraverser) {
-		this.specificationTraverser = specificationTraverser;
-	}
+import org.apache.isis.runtimes.dflt.bytecode.identity.classsubstitutor.ClassSubstitutorIdentity;
+import org.apache.isis.runtimes.embedded.internal.RuntimeContextForEmbeddedMetaModel;
+
+/**
+ * Facade for the entire Isis metamodel and supporting components.
+ */
+public class IsisMetaModel implements ApplicationScopedComponent {
+
+    private static enum State {
+        NOT_INITIALIZED, INITIALIZED, SHUTDOWN;
+    }
+
+    private final List<Class<?>> serviceTypes = new ArrayList<Class<?>>();
+    private State state = State.NOT_INITIALIZED;
+
+    private ObjectReflectorDefault reflector;
+    private RuntimeContextForEmbeddedMetaModel runtimeContext;
+
+    private IsisConfiguration configuration;
+    private ClassSubstitutor classSubstitutor;
+    private CollectionTypeRegistry collectionTypeRegistry;
+    private ProgrammingModel programmingModel;
+    private SpecificationTraverser specificationTraverser;
+    private MemberLayoutArranger memberLayoutArranger;
+    private Set<FacetDecorator> facetDecorators;
+    private MetaModelValidator metaModelValidator;
+
+    private WrapperFactory viewer;
+    private final EmbeddedContext context;
+    private List<Object> services;
+
+    public IsisMetaModel(final EmbeddedContext context, final Class<?>... serviceTypes) {
+
+        this.serviceTypes.addAll(Arrays.asList(serviceTypes));
+        setConfiguration(new IsisConfigurationDefault());
+        setClassSubstitutor(new ClassSubstitutorIdentity());
+        setCollectionTypeRegistry(new CollectionTypeRegistryDefault());
+        setSpecificationTraverser(new SpecificationTraverserDefault());
+        setMemberLayoutArranger(new MemberLayoutArrangerDefault());
+        setFacetDecorators(new TreeSet<FacetDecorator>());
+        setProgrammingModelFacets(new ProgrammingModelFacetsJava5());
+
+        setMetaModelValidator(new MetaModelValidatorDefault());
+
+        this.context = context;
+    }
+
+    /**
+     * The list of classes representing services, as specified in the {@link #IsisMetaModel(EmbeddedContext, Class...)
+     * constructor}.
+     * 
+     * <p>
+     * To obtain the instantiated services, use the {@link ServicesInjector#getRegisteredServices()} (available from
+     * {@link #getServicesInjector()}).
+     */
+    public List<Class<?>> getServiceTypes() {
+        return Collections.unmodifiableList(serviceTypes);
+    }
+
+    // ///////////////////////////////////////////////////////
+    // init, shutdown
+    // ///////////////////////////////////////////////////////
+
+    @Override
+    public void init() {
+        ensureNotInitialized();
+        reflector =
+            new ObjectReflectorDefault(configuration, classSubstitutor, collectionTypeRegistry, specificationTraverser,
+                memberLayoutArranger, programmingModel, facetDecorators, metaModelValidator);
+
+        services = createServices(serviceTypes);
+        runtimeContext = new RuntimeContextForEmbeddedMetaModel(context, services);
+        final DomainObjectContainerDefault container = new DomainObjectContainerWrapperFactory();
+
+        runtimeContext.injectInto(container);
+        runtimeContext.setContainer(container);
+        runtimeContext.injectInto(reflector);
+        reflector.injectInto(runtimeContext);
+
+        reflector.init();
+        runtimeContext.init();
+
+        for (final Class<?> serviceType : serviceTypes) {
+            final ObjectSpecification serviceSpec = reflector.loadSpecification(serviceType);
+            serviceSpec.markAsService();
+        }
+        state = State.INITIALIZED;
+
+        viewer = new WrapperFactoryDefault();
+    }
+
+    @Override
+    public void shutdown() {
+        ensureInitialized();
+        state = State.SHUTDOWN;
+    }
+
+    private List<Object> createServices(final List<Class<?>> serviceTypes) {
+        final List<Object> services = new ArrayList<Object>();
+        for (final Class<?> serviceType : serviceTypes) {
+            try {
+                services.add(serviceType.newInstance());
+            } catch (final InstantiationException e) {
+                throw new IsisException("Unable to instantiate service", e);
+            } catch (final IllegalAccessException e) {
+                throw new IsisException("Unable to instantiate service", e);
+            }
+        }
+        return services;
+    }
+
+    // ///////////////////////////////////////////////////////
+    // SpecificationLoader
+    // ///////////////////////////////////////////////////////
+
+    /**
+     * Available once {@link #init() initialized}.
+     */
+    public SpecificationLoader getSpecificationLoader() {
+        return reflector;
+    }
+
+    // ///////////////////////////////////////////////////////
+    // Viewer
+    // ///////////////////////////////////////////////////////
+
+    /**
+     * Available once {@link #init() initialized}.
+     */
+    public WrapperFactory getViewer() {
+        ensureInitialized();
+        return viewer;
+    }
+
+    // ///////////////////////////////////////////////////////
+    // ServicesInjector
+    // ///////////////////////////////////////////////////////
+
+    /**
+     * The {@link ServicesInjector}; can use to obtain the set of registered services.
+     * 
+     * <p>
+     * Available once {@link #init() initialized}.
+     */
+    public ServicesInjector getServicesInjector() {
+        ensureInitialized();
+        return runtimeContext.getServicesInjector();
+    }
+
+    // ///////////////////////////////////////////////////////
+    // Override defaults
+    // ///////////////////////////////////////////////////////
+
+    /**
+     * The {@link IsisConfiguration} in force, either defaulted or specified
+     * {@link #setConfiguration(IsisConfiguration) explicitly.}
+     */
+    public IsisConfiguration getConfiguration() {
+        return configuration;
+    }
+
+    /**
+     * Optionally specify the {@link IsisConfiguration}.
+     * 
+     * <p>
+     * Call prior to {@link #init()}.
+     */
+    public void setConfiguration(final IsisConfiguration configuration) {
+        ensureNotInitialized();
+        ensureThatArg(configuration, is(notNullValue()));
+        this.configuration = configuration;
+    }
+
+    /**
+     * The {@link ClassSubstitutor} in force, either defaulted or specified
+     * {@link #setClassSubstitutor(ClassSubstitutor) explicitly}.
+     */
+    public ClassSubstitutor getClassSubstitutor() {
+        return classSubstitutor;
+    }
+
+    /**
+     * Optionally specify the {@link ClassSubstitutor}.
+     * 
+     * <p>
+     * Call prior to {@link #init()}.
+     */
+    public void setClassSubstitutor(final ClassSubstitutor classSubstitutor) {
+        ensureNotInitialized();
+        ensureThatArg(classSubstitutor, is(notNullValue()));
+        this.classSubstitutor = classSubstitutor;
+    }
+
+    /**
+     * The {@link CollectionTypeRegistry} in force, either defaulted or specified
+     * {@link #setCollectionTypeRegistry(CollectionTypeRegistry) explicitly.}
+     */
+    public CollectionTypeRegistry getCollectionTypeRegistry() {
+        return collectionTypeRegistry;
+    }
+
+    /**
+     * Optionally specify the {@link CollectionTypeRegistry}.
+     * 
+     * <p>
+     * Call prior to {@link #init()}.
+     */
+    public void setCollectionTypeRegistry(final CollectionTypeRegistry collectionTypeRegistry) {
+        ensureNotInitialized();
+        ensureThatArg(collectionTypeRegistry, is(notNullValue()));
+        this.collectionTypeRegistry = collectionTypeRegistry;
+    }
+
+    /**
+     * The {@link SpecificationTraverser} in force, either defaulted or specified
+     * {@link #setSpecificationTraverser(SpecificationTraverser) explicitly}.
+     */
+    public SpecificationTraverser getSpecificationTraverser() {
+        return specificationTraverser;
+    }
+
+    /**
+     * Optionally specify the {@link SpecificationTraverser}.
+     */
+    public void setSpecificationTraverser(final SpecificationTraverser specificationTraverser) {
+        this.specificationTraverser = specificationTraverser;
+    }
 
     /**
      * Optionally specify the {@link MemberLayoutArranger}.
      */
-    public void setMemberLayoutArranger(MemberLayoutArranger memberLayoutArranger) {
+    public void setMemberLayoutArranger(final MemberLayoutArranger memberLayoutArranger) {
         this.memberLayoutArranger = memberLayoutArranger;
     }
-
-	/**
-	 * The {@link ProgrammingModel} in force, either defaulted or
-	 * specified {@link #setProgrammingModelFacets(ProgrammingModel) explicitly}.
-	 */
-	public ProgrammingModel getProgrammingModelFacets() {
-		return programmingModel;
-	}
-
-	/**
-	 * Optionally specify the {@link ProgrammingModel}.
-	 *
-	 * <p>
-	 * Call prior to {@link #init()}.
-	 */
-	public void setProgrammingModelFacets(
-			ProgrammingModel programmingModel) {
-		ensureNotInitialized();
-		ensureThatArg(programmingModel, is(notNullValue()));
-		this.programmingModel = programmingModel;
-	}
-
-	/**
-	 * The {@link FacetDecorator}s in force, either defaulted or specified
-	 * {@link #setFacetDecorators(Set) explicitly}.
-	 */
-	public Set<FacetDecorator> getFacetDecorators() {
-		return Collections.unmodifiableSet(facetDecorators);
-	}
-
-	/**
-	 * Optionally specify the {@link FacetDecorator}s.
-	 *
-	 * <p>
-	 * Call prior to {@link #init()}.
-	 */
-	public void setFacetDecorators(Set<FacetDecorator> facetDecorators) {
-		ensureNotInitialized();
-		ensureThatArg(facetDecorators, is(notNullValue()));
-		this.facetDecorators = facetDecorators;
-	}
-
-
-	/**
-	 * The {@link MetaModelValidator} in force, either defaulted or specified
-	 * {@link #setMetaModelValidator(MetaModelValidator) explicitly}.
-	 */
-	public MetaModelValidator getMetaModelValidator() {
-		return metaModelValidator;
-	}
-
-	/**
-	 * Optionally specify the {@link MetaModelValidator}.
-	 */
-	public void setMetaModelValidator(
-			MetaModelValidator metaModelValidator) {
-		this.metaModelValidator = metaModelValidator;
-	}
-
-
-	/////////////////////////////////////////////////////////
-	// State management
-	/////////////////////////////////////////////////////////
-
-	private State ensureNotInitialized() {
-		return ensureThatState(state, is(State.NOT_INITIALIZED));
-	}
-
-	private State ensureInitialized() {
-		return ensureThatState(state, is(State.INITIALIZED));
-	}
-
-}
+
+    /**
+     * The {@link ProgrammingModel} in force, either defaulted or specified
+     * {@link #setProgrammingModelFacets(ProgrammingModel) explicitly}.
+     */
+    public ProgrammingModel getProgrammingModelFacets() {
+        return programmingModel;
+    }
+
+    /**
+     * Optionally specify the {@link ProgrammingModel}.
+     * 
+     * <p>
+     * Call prior to {@link #init()}.
+     */
+    public void setProgrammingModelFacets(final ProgrammingModel programmingModel) {
+        ensureNotInitialized();
+        ensureThatArg(programmingModel, is(notNullValue()));
+        this.programmingModel = programmingModel;
+    }
+
+    /**
+     * The {@link FacetDecorator}s in force, either defaulted or specified {@link #setFacetDecorators(Set) explicitly}.
+     */
+    public Set<FacetDecorator> getFacetDecorators() {
+        return Collections.unmodifiableSet(facetDecorators);
+    }
+
+    /**
+     * Optionally specify the {@link FacetDecorator}s.
+     * 
+     * <p>
+     * Call prior to {@link #init()}.
+     */
+    public void setFacetDecorators(final Set<FacetDecorator> facetDecorators) {
+        ensureNotInitialized();
+        ensureThatArg(facetDecorators, is(notNullValue()));
+        this.facetDecorators = facetDecorators;
+    }
+
+    /**
+     * The {@link MetaModelValidator} in force, either defaulted or specified
+     * {@link #setMetaModelValidator(MetaModelValidator) explicitly}.
+     */
+    public MetaModelValidator getMetaModelValidator() {
+        return metaModelValidator;
+    }
+
+    /**
+     * Optionally specify the {@link MetaModelValidator}.
+     */
+    public void setMetaModelValidator(final MetaModelValidator metaModelValidator) {
+        this.metaModelValidator = metaModelValidator;
+    }
+
+    // ///////////////////////////////////////////////////////
+    // State management
+    // ///////////////////////////////////////////////////////
+
+    private State ensureNotInitialized() {
+        return ensureThatState(state, is(State.NOT_INITIALIZED));
+    }
+
+    private State ensureInitialized() {
+        return ensureThatState(state, is(State.INITIALIZED));
+    }
+
+}

Modified: incubator/isis/trunk/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/PersistenceState.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/PersistenceState.java?rev=1098940&r1=1098939&r2=1098940&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/PersistenceState.java (original)
+++ incubator/isis/trunk/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/PersistenceState.java Tue May  3 06:42:06 2011
@@ -17,23 +17,23 @@
  *  under the License.
  */
 
+package org.apache.isis.runtimes.embedded.internal;
 
-package org.apache.isis.runtimes.embedded.internal;
-
-public enum PersistenceState {
-	TRANSIENT(true,false),
-	PERSISTENT(false,true),
-	STANDALONE(false,false);
-	private boolean trans;
-	private boolean persistent;
-	PersistenceState(boolean trans, boolean persistent) {
-		this.trans = trans;
-		this.persistent = persistent;
-	}
-	public boolean isTransient() {
-		return trans;
-	}
-	public boolean isPersistent() {
-		return persistent;
-	}
+public enum PersistenceState {
+    TRANSIENT(true, false), PERSISTENT(false, true), STANDALONE(false, false);
+    private boolean trans;
+    private boolean persistent;
+
+    PersistenceState(final boolean trans, final boolean persistent) {
+        this.trans = trans;
+        this.persistent = persistent;
+    }
+
+    public boolean isTransient() {
+        return trans;
+    }
+
+    public boolean isPersistent() {
+        return persistent;
+    }
 }
\ No newline at end of file

Modified: incubator/isis/trunk/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/RuntimeContextForEmbeddedMetaModel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/RuntimeContextForEmbeddedMetaModel.java?rev=1098940&r1=1098939&r2=1098940&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/RuntimeContextForEmbeddedMetaModel.java (original)
+++ incubator/isis/trunk/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/RuntimeContextForEmbeddedMetaModel.java Tue May  3 06:42:06 2011
@@ -17,9 +17,8 @@
  *  under the License.
  */
 
+package org.apache.isis.runtimes.embedded.internal;
 
-package org.apache.isis.runtimes.embedded.internal;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -55,17 +54,16 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification.CreationMode;
 import org.apache.isis.runtimes.embedded.EmbeddedContext;
-
-/**
- * Acts as a bridge between the {@link RuntimeContext} (as used internally
- * within the meta-model) and the {@link EmbeddedContext} 
- * provided by the embedder (which deals only with pojos).
- */
-public class RuntimeContextForEmbeddedMetaModel extends RuntimeContextAbstract implements ApplicationScopedComponent {
-
-	private final List<Object> services;
-	private List<ObjectAdapter> serviceAdapters;
-	private ServicesInjector servicesInjector;
+
+/**
+ * Acts as a bridge between the {@link RuntimeContext} (as used internally within the meta-model) and the
+ * {@link EmbeddedContext} provided by the embedder (which deals only with pojos).
+ */
+public class RuntimeContextForEmbeddedMetaModel extends RuntimeContextAbstract implements ApplicationScopedComponent {
+
+    private final List<Object> services;
+    private List<ObjectAdapter> serviceAdapters;
+    private ServicesInjector servicesInjector;
     private final AdapterMap adapterMap;
     private final ObjectInstantiator objectInstantiator;
     private final ObjectDirtier objectDirtier;
@@ -75,85 +73,86 @@ public class RuntimeContextForEmbeddedMe
     private final DomainObjectServices domainObjectServices;
     private final QuerySubmitter querySubmitter;
     private final DependencyInjector dependencyInjector;
-    
-	public RuntimeContextForEmbeddedMetaModel(
-			final EmbeddedContext context, 
-			final List<Object> services) {
-		this.services = services;
-		this.authenticationSessionProvider = new AuthenticationSessionProviderAbstract() {
-		    @Override
-		    public AuthenticationSession getAuthenticationSession() {
-		        return context.getAuthenticationSession();
-		    }
+
+    public RuntimeContextForEmbeddedMetaModel(final EmbeddedContext context, final List<Object> services) {
+        this.services = services;
+        this.authenticationSessionProvider = new AuthenticationSessionProviderAbstract() {
+            @Override
+            public AuthenticationSession getAuthenticationSession() {
+                return context.getAuthenticationSession();
+            }
         };
         this.querySubmitter = new QuerySubmitterAbstract() {
             @Override
-            public List<ObjectAdapter> allMatchingQuery(Query query) {
+            public List<ObjectAdapter> allMatchingQuery(final Query query) {
                 return wrap(context.allMatchingQuery(query));
             }
+
             @Override
-            public <T> ObjectAdapter firstMatchingQuery(Query<T> query) {
+            public <T> ObjectAdapter firstMatchingQuery(final Query<T> query) {
                 return getAdapterMap().adapterFor(context.firstMatchingQuery(query));
             }
 
         };
-		this.adapterMap = new AdapterMapAbstract() {
-	        @Override
-	        public ObjectAdapter adapterFor(Object domainObject) {
-	            ObjectSpecification domainObjectSpec = getSpecificationLookup().loadSpecification(domainObject.getClass());
-	            PersistenceState persistenceState = context.getPersistenceState(domainObject);
-	            return new StandaloneAdapter(domainObjectSpec, domainObject, persistenceState);
-	        }
-
-	        @Override
-	        public ObjectAdapter adapterFor(Object domainObject, ObjectAdapter ownerAdapter, IdentifiedHolder identifiedHolder) {
-	            return adapterFor(domainObject);
-	        }
-            
-	        @Override
-            public ObjectAdapter adapterForAggregated(Object domainObject, ObjectAdapter parent) {
+        this.adapterMap = new AdapterMapAbstract() {
+            @Override
+            public ObjectAdapter adapterFor(final Object domainObject) {
+                final ObjectSpecification domainObjectSpec =
+                    getSpecificationLookup().loadSpecification(domainObject.getClass());
+                final PersistenceState persistenceState = context.getPersistenceState(domainObject);
+                return new StandaloneAdapter(domainObjectSpec, domainObject, persistenceState);
+            }
+
+            @Override
+            public ObjectAdapter adapterFor(final Object domainObject, final ObjectAdapter ownerAdapter,
+                final IdentifiedHolder identifiedHolder) {
+                return adapterFor(domainObject);
+            }
+
+            @Override
+            public ObjectAdapter adapterForAggregated(final Object domainObject, final ObjectAdapter parent) {
                 return adapterFor(domainObject);
             };
 
-	        @Override
-	        public ObjectAdapter getAdapterFor(Object domainObject) {
-	            return adapterFor(domainObject);
-	        }
-	    };
+            @Override
+            public ObjectAdapter getAdapterFor(final Object domainObject) {
+                return adapterFor(domainObject);
+            }
+        };
         this.objectInstantiator = new ObjectInstantiatorAbstract() {
-            
+
             @Override
-            public Object instantiate(Class<?> type) throws ObjectInstantiationException {
+            public Object instantiate(final Class<?> type) throws ObjectInstantiationException {
                 return context.instantiate(type);
             }
         };
-        
+
         this.objectPersistor = new ObjectPersistorAbstract() {
-            
+
             @Override
-            public void makePersistent(ObjectAdapter adapter) {
+            public void makePersistent(final ObjectAdapter adapter) {
                 context.makePersistent(adapter.getObject());
             }
 
             @Override
-            public void remove(ObjectAdapter adapter) {
+            public void remove(final ObjectAdapter adapter) {
                 context.remove(adapter.getObject());
             }
-            
+
         };
-		this.objectDirtier = new ObjectDirtierAbstract(){
+        this.objectDirtier = new ObjectDirtierAbstract() {
+
+            @Override
+            public void objectChanged(final ObjectAdapter adapter) {
+                context.objectChanged(adapter.getObject());
+            }
+
+            @Override
+            public void objectChanged(final Object object) {
+                context.objectChanged(object);
+            }
 
-	        @Override
-	        public void objectChanged(ObjectAdapter adapter) {
-	            context.objectChanged(adapter.getObject());
-	        }
-
-	        @Override
-	        public void objectChanged(Object object) {
-	            context.objectChanged(object);
-	        }
-	        
-	    };
+        };
 
         this.servicesProvider = new ServicesProviderAbstract() {
             @Override
@@ -162,43 +161,41 @@ public class RuntimeContextForEmbeddedMe
             }
         };
 
+        this.domainObjectServices = new DomainObjectServicesAbstract() {
 
-	    this.domainObjectServices = new DomainObjectServicesAbstract() {
+            @Override
+            public ObjectAdapter createTransientInstance(final ObjectSpecification spec) {
+                final Object domainObject = spec.createObject(CreationMode.INITIALIZE);
+                return adapterMap.adapterFor(domainObject);
+            }
 
-	        @Override
-	        public ObjectAdapter createTransientInstance(ObjectSpecification spec) {
-	            Object domainObject = spec.createObject(CreationMode.INITIALIZE);
-	            return adapterMap.adapterFor(domainObject);
-	        }
-
-            @Override
-            public ObjectAdapter createAggregatedInstance(ObjectSpecification spec, ObjectAdapter parent) {
-                throw new UnsupportedOperationException(
-                    "Not yet supported by this implementation of RuntimeContext");
-            }
-
-	        @Override
-	        public void resolve(Object parent) {
-	            context.resolve(parent);
-	        }
-
-	        @Override
-	        public void resolve(Object parent, Object field) {
-	            context.resolve(parent, field);
-	        }
-
-	        @Override
-	        public boolean flush() {
-	            return context.flush();
-	        }
-	        
-	        @Override
-	        public void commit() {
-	            context.commit();
-	        }
+            @Override
+            public ObjectAdapter createAggregatedInstance(final ObjectSpecification spec, final ObjectAdapter parent) {
+                throw new UnsupportedOperationException("Not yet supported by this implementation of RuntimeContext");
+            }
 
-	        @Override
-            public String getProperty(String name) {
+            @Override
+            public void resolve(final Object parent) {
+                context.resolve(parent);
+            }
+
+            @Override
+            public void resolve(final Object parent, final Object field) {
+                context.resolve(parent, field);
+            }
+
+            @Override
+            public boolean flush() {
+                return context.flush();
+            }
+
+            @Override
+            public void commit() {
+                context.commit();
+            }
+
+            @Override
+            public String getProperty(final String name) {
                 return RuntimeContextForEmbeddedMetaModel.this.getProperty(name);
             }
 
@@ -208,71 +205,67 @@ public class RuntimeContextForEmbeddedMe
             }
 
             @Override
-            public void informUser(String message) {
+            public void informUser(final String message) {
                 context.informUser(message);
             }
 
             @Override
-            public void warnUser(String message) {
+            public void warnUser(final String message) {
                 context.warnUser(message);
             }
 
             @Override
-            public void raiseError(String message) {
+            public void raiseError(final String message) {
                 context.raiseError(message);
             }
-        };
+        };
         this.dependencyInjector = new DependencyInjectorAbstract() {
             @Override
-            public void injectDependenciesInto(Object domainObject) {
+            public void injectDependenciesInto(final Object domainObject) {
                 if (servicesInjector == null) {
                     throw new IllegalStateException("must setContainer before using this method");
                 }
                 servicesInjector.injectDependencies(domainObject);
             }
         };
-	}
-
-
-	/////////////////////////////////////////////
-	// init, shutdown
-	/////////////////////////////////////////////
-
-	@Override
-    public void init() {
-		this.serviceAdapters = adaptersFor(services);
-		
-		servicesInjector = new ServicesInjectorDefault();
-		servicesInjector.setContainer(getContainer());
-		servicesInjector.setServices(services);
-	}
-	
-
-	@Override
-    public void shutdown() {
-		// does nothing
-	}
-
-
-	private List<ObjectAdapter> adaptersFor(List<Object> services) {
-		List<ObjectAdapter> serviceAdapters = new ArrayList<ObjectAdapter>();
-		for(Object service: services) {
-			ObjectSpecification spec = getSpecificationLookup().loadSpecification(service.getClass());
-			serviceAdapters.add(new ServiceAdapter(spec, service));
-		}
-		return Collections.unmodifiableList(serviceAdapters);
-	}
-
-	
-	/////////////////////////////////////////////
-	// Components
-	/////////////////////////////////////////////
-
-	@Override
-	public AuthenticationSessionProvider getAuthenticationSessionProvider() {
-	    return authenticationSessionProvider;
-	}
-	
+    }
+
+    // ///////////////////////////////////////////
+    // init, shutdown
+    // ///////////////////////////////////////////
+
+    @Override
+    public void init() {
+        this.serviceAdapters = adaptersFor(services);
+
+        servicesInjector = new ServicesInjectorDefault();
+        servicesInjector.setContainer(getContainer());
+        servicesInjector.setServices(services);
+    }
+
+    @Override
+    public void shutdown() {
+        // does nothing
+    }
+
+    private List<ObjectAdapter> adaptersFor(final List<Object> services) {
+        final List<ObjectAdapter> serviceAdapters = new ArrayList<ObjectAdapter>();
+        for (final Object service : services) {
+            final ObjectSpecification spec = getSpecificationLookup().loadSpecification(service.getClass());
+            serviceAdapters.add(new ServiceAdapter(spec, service));
+        }
+        return Collections.unmodifiableList(serviceAdapters);
+    }
+
+    // ///////////////////////////////////////////
+    // Components
+    // ///////////////////////////////////////////
+
+    @Override
+    public AuthenticationSessionProvider getAuthenticationSessionProvider() {
+        return authenticationSessionProvider;
+    }
+
     @Override
     public AdapterMap getAdapterMap() {
         return adapterMap;
@@ -282,7 +275,7 @@ public class RuntimeContextForEmbeddedMe
     public ObjectInstantiator getObjectInstantiator() {
         return objectInstantiator;
     }
-    
+
     @Override
     public ObjectDirtier getObjectDirtier() {
         return objectDirtier;
@@ -307,33 +300,30 @@ public class RuntimeContextForEmbeddedMe
     public QuerySubmitter getQuerySubmitter() {
         return querySubmitter;
     }
-	
 
     @Override
     public ObjectPersistor getObjectPersistor() {
         return objectPersistor;
     }
-
-	
-	/////////////////////////////////////////////
-	// firstMatchingQuery
-	/////////////////////////////////////////////
-
-	private List<ObjectAdapter> wrap(List<?> pojos) {
-		List<ObjectAdapter> adapters = new ArrayList<ObjectAdapter>();
-		for(Object pojo: pojos) {
-			adapters.add(getAdapterMap().adapterFor(pojo));
-		}
-		return adapters;
-	}
-
-
-	/////////////////////////////////////////////
-	// getServices
-	/////////////////////////////////////////////
-
-	public ServicesInjector getServicesInjector() {
-		return servicesInjector;
-	}
-
-}
+
+    // ///////////////////////////////////////////
+    // firstMatchingQuery
+    // ///////////////////////////////////////////
+
+    private List<ObjectAdapter> wrap(final List<?> pojos) {
+        final List<ObjectAdapter> adapters = new ArrayList<ObjectAdapter>();
+        for (final Object pojo : pojos) {
+            adapters.add(getAdapterMap().adapterFor(pojo));
+        }
+        return adapters;
+    }
+
+    // ///////////////////////////////////////////
+    // getServices
+    // ///////////////////////////////////////////
+
+    public ServicesInjector getServicesInjector() {
+        return servicesInjector;
+    }
+
+}

Modified: incubator/isis/trunk/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/ServiceAdapter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/ServiceAdapter.java?rev=1098940&r1=1098939&r2=1098940&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/ServiceAdapter.java (original)
+++ incubator/isis/trunk/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/ServiceAdapter.java Tue May  3 06:42:06 2011
@@ -17,16 +17,14 @@
  *  under the License.
  */
 
+package org.apache.isis.runtimes.embedded.internal;
 
-package org.apache.isis.runtimes.embedded.internal;
-
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-
-public class ServiceAdapter extends StandaloneAdapter {
-
-	
-	public ServiceAdapter(ObjectSpecification spec, Object serviceObject) {
-		super(spec, serviceObject, PersistenceState.PERSISTENT);
-	}
-
-}
+
+public class ServiceAdapter extends StandaloneAdapter {
+
+    public ServiceAdapter(final ObjectSpecification spec, final Object serviceObject) {
+        super(spec, serviceObject, PersistenceState.PERSISTENT);
+    }
+
+}

Modified: incubator/isis/trunk/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/StandaloneAdapter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/StandaloneAdapter.java?rev=1098940&r1=1098939&r2=1098940&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/StandaloneAdapter.java (original)
+++ incubator/isis/trunk/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/StandaloneAdapter.java Tue May  3 06:42:06 2011
@@ -17,9 +17,8 @@
  *  under the License.
  */
 
+package org.apache.isis.runtimes.embedded.internal;
 
-package org.apache.isis.runtimes.embedded.internal;
-
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.ResolveState;
 import org.apache.isis.core.metamodel.adapter.oid.AggregatedOid;
@@ -33,232 +32,225 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
 import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManager;
 import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
-
-/**
- * Only provides a concrete implementation of the methods corresponding to 
- * the {@link ObjectMetaModel} interface.
- */
-public class StandaloneAdapter implements ObjectAdapter {
-
-	private final ObjectSpecification spec;
-	private final PersistenceState persistenceState;
-	private Object domainObject;
-
-    private ElementSpecificationProvider elementSpecificationProvider;
-
-	public StandaloneAdapter(ObjectSpecification spec, Object domainObject, PersistenceState persistenceState) {
-		this.spec = spec;
-		this.domainObject = domainObject;
-		this.persistenceState = persistenceState;
-	}
-
-	/**
-	 * Returns the {@link ObjectSpecification} as provided in the constructor.
-	 */
-	@Override
-    public ObjectSpecification getSpecification() {
-		return spec;
-	}
-
-	/**
-	 * Returns the domain object as provided in the constructor.
-	 */
-	@Override
-    public Object getObject() {
-		return domainObject;
-	}
-	
-	/**
-	 * Replaces the {@link #getObject() domain object}.
-	 */
-	@Override
-    public void replacePojo(Object pojo) {
-		this.domainObject = pojo;
-	}
-
-	/**
-	 * Whether the object is persisted.
-	 * 
-	 * <p>
-	 * As per the {@link PersistenceState} provided in the constructor.
-	 */
-	@Override
-    public boolean isPersistent() {
-		return persistenceState.isPersistent();
-	}
-
-	/**
-	 * Whether the object is not persisted.
-	 * 
-	 * <p>
-	 * As per the {@link PersistenceState} provided in the constructor.
-	 */
-	@Override
-    public boolean isTransient() {
-		return persistenceState.isTransient();
-	}
-
-	/**
-	 * Always returns <tt>null</tt>.
-	 */
-	@Override
-    public ObjectAdapter getOwner() {
-		return null;
-	}
-
-	@Override
-    public String titleString() {
-		final ObjectSpecification specification = getSpecification();
-        if (specification.isCollection()) {
-            return "A collection of " + (" " + specification.getPluralName()).toLowerCase();
-        } 
-        // TODO do we want to localize titles  for embedded work?
-        String title = specification.getTitle(this, null);
-        if (title != null) {
-        	return title;
-        }
-        return "A " + specification.getSingularName().toLowerCase();
-	}
-
-
+
+/**
+ * Only provides a concrete implementation of the methods corresponding to the {@link ObjectMetaModel} interface.
+ */
+public class StandaloneAdapter implements ObjectAdapter {
+
+    private final ObjectSpecification spec;
+    private final PersistenceState persistenceState;
+    private Object domainObject;
+
+    private ElementSpecificationProvider elementSpecificationProvider;
+
+    public StandaloneAdapter(final ObjectSpecification spec, final Object domainObject,
+        final PersistenceState persistenceState) {
+        this.spec = spec;
+        this.domainObject = domainObject;
+        this.persistenceState = persistenceState;
+    }
+
+    /**
+     * Returns the {@link ObjectSpecification} as provided in the constructor.
+     */
+    @Override
+    public ObjectSpecification getSpecification() {
+        return spec;
+    }
+
+    /**
+     * Returns the domain object as provided in the constructor.
+     */
+    @Override
+    public Object getObject() {
+        return domainObject;
+    }
+
+    /**
+     * Replaces the {@link #getObject() domain object}.
+     */
+    @Override
+    public void replacePojo(final Object pojo) {
+        this.domainObject = pojo;
+    }
+
+    /**
+     * Whether the object is persisted.
+     * 
+     * <p>
+     * As per the {@link PersistenceState} provided in the constructor.
+     */
+    @Override
+    public boolean isPersistent() {
+        return persistenceState.isPersistent();
+    }
+
+    /**
+     * Whether the object is not persisted.
+     * 
+     * <p>
+     * As per the {@link PersistenceState} provided in the constructor.
+     */
+    @Override
+    public boolean isTransient() {
+        return persistenceState.isTransient();
+    }
+
+    /**
+     * Always returns <tt>null</tt>.
+     */
+    @Override
+    public ObjectAdapter getOwner() {
+        return null;
+    }
+
+    @Override
+    public String titleString() {
+        final ObjectSpecification specification = getSpecification();
+        if (specification.isCollection()) {
+            return "A collection of " + (" " + specification.getPluralName()).toLowerCase();
+        }
+        // TODO do we want to localize titles for embedded work?
+        final String title = specification.getTitle(this, null);
+        if (title != null) {
+            return title;
+        }
+        return "A " + specification.getSingularName().toLowerCase();
+    }
+
     @Override
     public ObjectSpecification getElementSpecification() {
-        if(elementSpecificationProvider==null) {
+        if (elementSpecificationProvider == null) {
             return null;
         }
         return elementSpecificationProvider.getElementType();
     }
 
     @Override
-    public void setElementSpecificationProvider(ElementSpecificationProvider elementSpecificationProvider) {
+    public void setElementSpecificationProvider(final ElementSpecificationProvider elementSpecificationProvider) {
         this.elementSpecificationProvider = elementSpecificationProvider;
     }
-
-
-
-	///////////////////////////////////////////////////////////
-	// Methods specified to ObjectAdapter (as opposed to 
-	// ObjectMetaModel) do not need to be implemented.
-	///////////////////////////////////////////////////////////
-	
-	/**
-	 * Not supported, always throws an exception.
-	 * 
-	 * @throws UnsupportedOperationException
-	 */
-	@Override
-    public ResolveState getResolveState() {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * Not supported, always throws an exception.
-	 * 
-	 * @throws UnsupportedOperationException
-	 */
-	@Override
-    public void changeState(ResolveState newState) {
-		throw new UnsupportedOperationException();
-	}
-
-
-	/**
-	 * Not supported, always throws an exception.
-	 * 
-	 * @throws UnsupportedOperationException
-	 */
-	@Override
-    public Oid getOid() {
-		return null;
-	}
-
-	/**
-	 * Not supported, always throws an exception.
-	 * 
-	 * @throws UnsupportedOperationException
-	 */
-	@Override
-    public boolean isAggregated() {
-		return false;
-	}
-
-	/**
-	 * Not supported, always throws an exception.
-	 * 
-	 * @throws UnsupportedOperationException
-	 */
-	@Override
-    public String getIconName() {
-		throw new UnsupportedOperationException();
-	}
-
-
-	/**
-	 * Not supported, always throws an exception.
-	 * 
-	 * @throws UnsupportedOperationException
-	 */
-	@Override
-    public Instance getInstance(Specification specification) {
-		throw new UnsupportedOperationException();
-	}
-
-	
-	/**
-	 * Not supported, always throws an exception.
-	 * 
-	 * @throws UnsupportedOperationException
-	 */
-	@Override
-    public Version getVersion() {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * Not supported, always throws an exception.
-	 * 
-	 * @throws UnsupportedOperationException
-	 */
-	@Override
-    public void checkLock(Version version) {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * Not supported, always throws an exception.
-	 * 
-	 * @throws UnsupportedOperationException
-	 */
-	@Override
-    public void setOptimisticLock(Version version) {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * Not supported, always throws an exception.
-	 * 
-	 * @throws UnsupportedOperationException
-	 */
-	@Override
-    public void fireChangedEvent() {
-		throw new UnsupportedOperationException();
-	}
 
-	
+    // /////////////////////////////////////////////////////////
+    // Methods specified to ObjectAdapter (as opposed to
+    // ObjectMetaModel) do not need to be implemented.
+    // /////////////////////////////////////////////////////////
+
+    /**
+     * Not supported, always throws an exception.
+     * 
+     * @throws UnsupportedOperationException
+     */
+    @Override
+    public ResolveState getResolveState() {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Not supported, always throws an exception.
+     * 
+     * @throws UnsupportedOperationException
+     */
+    @Override
+    public void changeState(final ResolveState newState) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Not supported, always throws an exception.
+     * 
+     * @throws UnsupportedOperationException
+     */
+    @Override
+    public Oid getOid() {
+        return null;
+    }
+
+    /**
+     * Not supported, always throws an exception.
+     * 
+     * @throws UnsupportedOperationException
+     */
+    @Override
+    public boolean isAggregated() {
+        return false;
+    }
+
+    /**
+     * Not supported, always throws an exception.
+     * 
+     * @throws UnsupportedOperationException
+     */
+    @Override
+    public String getIconName() {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Not supported, always throws an exception.
+     * 
+     * @throws UnsupportedOperationException
+     */
+    @Override
+    public Instance getInstance(final Specification specification) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Not supported, always throws an exception.
+     * 
+     * @throws UnsupportedOperationException
+     */
+    @Override
+    public Version getVersion() {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Not supported, always throws an exception.
+     * 
+     * @throws UnsupportedOperationException
+     */
+    @Override
+    public void checkLock(final Version version) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Not supported, always throws an exception.
+     * 
+     * @throws UnsupportedOperationException
+     */
+    @Override
+    public void setOptimisticLock(final Version version) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Not supported, always throws an exception.
+     * 
+     * @throws UnsupportedOperationException
+     */
+    @Override
+    public void fireChangedEvent() {
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     public ObjectAdapter getAggregateRoot() {
         if (getSpecification().isAggregated()) {
-            Oid parentOid = ((AggregatedOid) this.getOid()).getParentOid();
+            final Oid parentOid = ((AggregatedOid) this.getOid()).getParentOid();
             return getAdapterManager().getAdapterFor(parentOid);
         } else {
             return this;
         }
     }
 
-    //////////////////////////////////////////////////////////////////
+    // ////////////////////////////////////////////////////////////////
     // Dependencies (from context)
-    //////////////////////////////////////////////////////////////////
-    
+    // ////////////////////////////////////////////////////////////////
+
     protected AdapterManager getAdapterManager() {
         return getPersistenceSession().getAdapterManager();
     }
@@ -267,5 +259,4 @@ public class StandaloneAdapter implement
         return IsisContext.getPersistenceSession();
     }
 
-
-}
+}