isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1234456 [8/17] - in /incubator/isis/trunk/framework/runtimes: dflt/bytecode/dflt/src/main/java/org/apache/isis/runtimes/dflt/bytecode/dflt/classsubstitutor/ dflt/bytecode/dflt/src/main/java/org/apache/isis/runtimes/dflt/bytecode/dflt/objec...
Date Sun, 22 Jan 2012 07:36:26 GMT
Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/client/persistence/PersistenceSessionProxy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/client/persistence/PersistenceSessionProxy.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/client/persistence/PersistenceSessionProxy.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/client/persistence/PersistenceSessionProxy.java Sun Jan 22 07:36:07 2012
@@ -78,7 +78,8 @@ public class PersistenceSessionProxy ext
     private final ObjectEncoderDecoder encoderDecoder;
 
     /**
-     * Keyed on an adapter wrapping a <tt>java.util.List</tt> (or equiv), ie with a {@link CollectionFacet}.
+     * Keyed on an adapter wrapping a <tt>java.util.List</tt> (or equiv), ie
+     * with a {@link CollectionFacet}.
      */
     private final Map<ObjectSpecification, ObjectAdapter> cache = new HashMap<ObjectSpecification, ObjectAdapter>();
     private final HashMap<String, Oid> serviceOidByNameCache = new HashMap<String, Oid>();
@@ -87,10 +88,8 @@ public class PersistenceSessionProxy ext
     // Constructor
     // ////////////////////////////////////////////////////////////////
 
-    public PersistenceSessionProxy(final PersistenceSessionFactory persistenceSessionFactory,
-        final ObjectAdapterFactory adapterFactory, final ObjectFactory objectFactory,
-        final ServicesInjector containerInjector, final OidGenerator oidGenerator,
-        final AdapterManagerExtended adapterManager, final ServerFacade serverFacade, final ObjectEncoderDecoder encoder) {
+    public PersistenceSessionProxy(final PersistenceSessionFactory persistenceSessionFactory, final ObjectAdapterFactory adapterFactory, final ObjectFactory objectFactory, final ServicesInjector containerInjector, final OidGenerator oidGenerator, final AdapterManagerExtended adapterManager,
+            final ServerFacade serverFacade, final ObjectEncoderDecoder encoder) {
         super(persistenceSessionFactory, adapterFactory, objectFactory, containerInjector, oidGenerator, adapterManager);
         this.serverFacade = serverFacade;
         this.encoderDecoder = encoder;
@@ -101,7 +100,8 @@ public class PersistenceSessionProxy ext
     // ////////////////////////////////////////////////////////////////
 
     /**
-     * TODO: mismatch between {@link SessionScopedComponent} (open) and {@link ApplicationScopedComponent} (init).
+     * TODO: mismatch between {@link SessionScopedComponent} (open) and
+     * {@link ApplicationScopedComponent} (init).
      */
     @Override
     public void doOpen() {
@@ -109,7 +109,8 @@ public class PersistenceSessionProxy ext
     }
 
     /**
-     * TODO: mismatch between {@link SessionScopedComponent} (open) and {@link ApplicationScopedComponent} (init).
+     * TODO: mismatch between {@link SessionScopedComponent} (open) and
+     * {@link ApplicationScopedComponent} (init).
      */
     @Override
     public void doClose() {
@@ -138,18 +139,18 @@ public class PersistenceSessionProxy ext
     }
 
     private ObjectAdapter loadObjectFromPersistenceLayer(final Oid oid, final ObjectSpecification specHint) {
-        return getTransactionManager().executeWithinTransaction(
-            new TransactionalClosureWithReturnAbstract<ObjectAdapter>() {
-                @Override
-                public ObjectAdapter execute() {
-                    // NB: I think that the auth session must be null because we may not yet have logged in if
-                    // retrieving the services.
-                    final GetObjectRequest request = new GetObjectRequest(null, oid, specHint.getFullIdentifier());
-                    final GetObjectResponse response = serverFacade.getObject(request);
-                    final ObjectData data = response.getObjectData();
-                    return encoderDecoder.decode(data);
-                }
-            });
+        return getTransactionManager().executeWithinTransaction(new TransactionalClosureWithReturnAbstract<ObjectAdapter>() {
+            @Override
+            public ObjectAdapter execute() {
+                // NB: I think that the auth session must be null because we may
+                // not yet have logged in if
+                // retrieving the services.
+                final GetObjectRequest request = new GetObjectRequest(null, oid, specHint.getFullIdentifier());
+                final GetObjectResponse response = serverFacade.getObject(request);
+                final ObjectData data = response.getObjectData();
+                return encoderDecoder.decode(data);
+            }
+        });
     }
 
     @Override
@@ -194,8 +195,10 @@ public class PersistenceSessionProxy ext
             @Override
             public void execute() {
                 final ResolveObjectRequest request = new ResolveObjectRequest(getAuthenticationSession(), adapterData);
-                // unlike the server-side implementation we don't invoke the callbacks
-                // for loading and loaded (they will already have been called in the server)
+                // unlike the server-side implementation we don't invoke the
+                // callbacks
+                // for loading and loaded (they will already have been called in
+                // the server)
                 final ResolveObjectResponse response = serverFacade.resolveImmediately(request);
                 final ObjectData data = response.getObjectData();
                 encoderDecoder.decode(data);
@@ -227,8 +230,7 @@ public class PersistenceSessionProxy ext
         getTransactionManager().executeWithinTransaction(new TransactionalClosureAbstract() {
             @Override
             public void execute() {
-                final ResolveFieldRequest request =
-                    new ResolveFieldRequest(getAuthenticationSession(), adapterData, fieldId);
+                final ResolveFieldRequest request = new ResolveFieldRequest(getAuthenticationSession(), adapterData, fieldId);
                 final ResolveFieldResponse response = serverFacade.resolveField(request);
                 final Data data = response.getData();
                 encoderDecoder.decode(data);
@@ -241,8 +243,9 @@ public class PersistenceSessionProxy ext
     // ////////////////////////////////////////////////////////////////
 
     /**
-     * REVIEW: we should perhaps have a little more symmetry here, and have the {@link ServerFacade} callback to the
-     * {@link PersistenceSession} (the <tt>PersistenceSessionPersist</tt> API) to handle remapping of adapters.
+     * REVIEW: we should perhaps have a little more symmetry here, and have the
+     * {@link ServerFacade} callback to the {@link PersistenceSession} (the
+     * <tt>PersistenceSessionPersist</tt> API) to handle remapping of adapters.
      */
     @Override
     public synchronized void makePersistent(final ObjectAdapter object) {
@@ -354,8 +357,8 @@ public class PersistenceSessionProxy ext
     }
 
     /**
-     * TODO: this code is not currently in use because there is no way to set up the cache. We may want to change what
-     * the cache is keyed on.
+     * TODO: this code is not currently in use because there is no way to set up
+     * the cache. We may want to change what the cache is keyed on.
      */
     private ObjectAdapter[] getInstancesFromCache(final PersistenceQuery persistenceQuery) {
         final ObjectSpecification noSpec = persistenceQuery.getSpecification();
@@ -377,26 +380,24 @@ public class PersistenceSessionProxy ext
 
     private ObjectAdapter[] findInstancesFromPersistenceLayer(final PersistenceQuery persistenceQuery) {
         final PersistenceQueryData criteriaData = encoderDecoder.encodePersistenceQuery(persistenceQuery);
-        return getTransactionManager().executeWithinTransaction(
-            new TransactionalClosureWithReturnAbstract<ObjectAdapter[]>() {
-                @Override
-                public ObjectAdapter[] execute() {
-                    final FindInstancesRequest request =
-                        new FindInstancesRequest(getAuthenticationSession(), criteriaData);
-                    final FindInstancesResponse response = serverFacade.findInstances(request);
-                    final ObjectData[] instancesAsObjectData = response.getInstances();
-                    final ObjectAdapter[] instances = new ObjectAdapter[instancesAsObjectData.length];
-                    for (int i = 0; i < instancesAsObjectData.length; i++) {
-                        instances[i] = encoderDecoder.decode(instancesAsObjectData[i]);
-                    }
-                    return instances;
+        return getTransactionManager().executeWithinTransaction(new TransactionalClosureWithReturnAbstract<ObjectAdapter[]>() {
+            @Override
+            public ObjectAdapter[] execute() {
+                final FindInstancesRequest request = new FindInstancesRequest(getAuthenticationSession(), criteriaData);
+                final FindInstancesResponse response = serverFacade.findInstances(request);
+                final ObjectData[] instancesAsObjectData = response.getInstances();
+                final ObjectAdapter[] instances = new ObjectAdapter[instancesAsObjectData.length];
+                for (int i = 0; i < instancesAsObjectData.length; i++) {
+                    instances[i] = encoderDecoder.decode(instancesAsObjectData[i]);
                 }
+                return instances;
+            }
 
-                @Override
-                public void onSuccess() {
-                    clearAllDirty();
-                }
-            });
+            @Override
+            public void onSuccess() {
+                clearAllDirty();
+            }
+        });
     }
 
     // ////////////////////////////////////////////////////////////////
@@ -440,7 +441,8 @@ public class PersistenceSessionProxy ext
     // ////////////////////////////////////////////////////////////////
 
     /**
-     * TODO: not symmetric with {@link PersistenceSessionObjectStore}; we have a cache but it does not?
+     * TODO: not symmetric with {@link PersistenceSessionObjectStore}; we have a
+     * cache but it does not?
      */
     @Override
     public Oid getOidForService(final String name) {
@@ -460,7 +462,8 @@ public class PersistenceSessionProxy ext
     }
 
     /**
-     * TODO: not symmetric with {@link PersistenceSessionObjectStore}; we have a cache but it does not?
+     * TODO: not symmetric with {@link PersistenceSessionObjectStore}; we have a
+     * cache but it does not?
      */
     @Override
     public void registerService(final String name, final Oid oid) {

Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/client/persistence/ProxyPersistenceSessionFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/client/persistence/ProxyPersistenceSessionFactory.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/client/persistence/ProxyPersistenceSessionFactory.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/client/persistence/ProxyPersistenceSessionFactory.java Sun Jan 22 07:36:07 2012
@@ -25,8 +25,7 @@ import org.apache.isis.runtimes.dflt.run
 
 public class ProxyPersistenceSessionFactory extends PersistenceSessionFactoryDelegating {
 
-    public ProxyPersistenceSessionFactory(final DeploymentType deploymentType,
-        final PersistenceSessionFactoryDelegate persistenceSessionFactoryDelegate) {
+    public ProxyPersistenceSessionFactory(final DeploymentType deploymentType, final PersistenceSessionFactoryDelegate persistenceSessionFactoryDelegate) {
         super(deploymentType, persistenceSessionFactoryDelegate);
     }
 

Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/client/transaction/ClientSideTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/client/transaction/ClientSideTransaction.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/client/transaction/ClientSideTransaction.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/client/transaction/ClientSideTransaction.java Sun Jan 22 07:36:07 2012
@@ -29,8 +29,8 @@ import org.apache.isis.runtimes.dflt.run
 import org.apache.isis.runtimes.dflt.runtime.transaction.IsisTransactionAbstract;
 
 /**
- * Encapsulates a transaction occurring on the client, where each of the actions (add, remove and change) are then
- * passed to the server as an atomic unit.
+ * Encapsulates a transaction occurring on the client, where each of the actions
+ * (add, remove and change) are then passed to the server as an atomic unit.
  * 
  * <p>
  * Each action is captured as an {@link ClientTransactionEvent} object.
@@ -43,8 +43,7 @@ public class ClientSideTransaction exten
     // Constructor
     // //////////////////////////////////////////////////////////////
 
-    public ClientSideTransaction(final IsisTransactionManager transactionManager, final MessageBroker messageBroker,
-        final UpdateNotifier updateNotifier) {
+    public ClientSideTransaction(final IsisTransactionManager transactionManager, final MessageBroker messageBroker, final UpdateNotifier updateNotifier) {
         super(transactionManager, messageBroker, updateNotifier);
     }
 

Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/DataFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/DataFactory.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/DataFactory.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/DataFactory.java Sun Jan 22 07:36:07 2012
@@ -29,13 +29,13 @@ import org.apache.isis.runtimes.dflt.rem
 import org.apache.isis.runtimes.dflt.remoting.common.data.common.ReferenceData;
 
 /**
- * Create serializable objects that are used to carry messages across the network. This assumes that the Oid and Version
- * implementations are also serializable.
+ * Create serializable objects that are used to carry messages across the
+ * network. This assumes that the Oid and Version implementations are also
+ * serializable.
  */
 public interface DataFactory {
 
-    CollectionData createCollectionData(String collectionType, String elementType, Oid oid, ReferenceData[] elements,
-        boolean hasAllElements, Version version);
+    CollectionData createCollectionData(String collectionType, String elementType, Oid oid, ReferenceData[] elements, boolean hasAllElements, Version version);
 
     NullData createNullData(String type);
 

Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/DataFactoryDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/DataFactoryDefault.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/DataFactoryDefault.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/DataFactoryDefault.java Sun Jan 22 07:36:07 2012
@@ -51,14 +51,12 @@ public class DataFactoryDefault implemen
     }
 
     @Override
-    public ObjectData createObjectData(final String type, final Oid oid, final boolean hasCompleteData,
-        final Version version) {
+    public ObjectData createObjectData(final String type, final Oid oid, final boolean hasCompleteData, final Version version) {
         return new ObjectDataImpl(oid, type, hasCompleteData, version);
     }
 
     @Override
-    public CollectionData createCollectionData(final String collectionType, final String elementType, final Oid oid,
-        final ReferenceData[] elements, final boolean hasAllElements, final Version version) {
+    public CollectionData createCollectionData(final String collectionType, final String elementType, final Oid oid, final ReferenceData[] elements, final boolean hasAllElements, final Version version) {
         return new CollectionDataImpl(oid, collectionType, elementType, elements, hasAllElements, version);
     }
 

Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/CollectionDataImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/CollectionDataImpl.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/CollectionDataImpl.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/CollectionDataImpl.java Sun Jan 22 07:36:07 2012
@@ -39,8 +39,7 @@ public class CollectionDataImpl implemen
     private final boolean hasAllElements;
     private final String elementType;
 
-    public CollectionDataImpl(final Oid oid, final String collectionType, final String elementType,
-        final ReferenceData[] elements, final boolean hasAllElements, final Version version) {
+    public CollectionDataImpl(final Oid oid, final String collectionType, final String elementType, final ReferenceData[] elements, final boolean hasAllElements, final Version version) {
         this.collectionType = collectionType;
         this.elementType = elementType;
         this.oid = oid;

Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/EncodableObjectData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/EncodableObjectData.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/EncodableObjectData.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/EncodableObjectData.java Sun Jan 22 07:36:07 2012
@@ -23,13 +23,16 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.runtimes.dflt.remoting.common.data.Data;
 
 /**
- * The data transfer object that contains the data for an encodeable object (ie one that has an {@link EncodableFacet})
- * in a form that can be passed over the network between a client and a server.
+ * The data transfer object that contains the data for an encodeable object (ie
+ * one that has an {@link EncodableFacet}) in a form that can be passed over the
+ * network between a client and a server.
  */
 public interface EncodableObjectData extends Data {
 
     /**
-     * Ultimately derived from {@link EncodableFacet#toEncodedString(org.apache.isis.noa.adapter.ObjectAdapter)}.
+     * Ultimately derived from
+     * {@link EncodableFacet#toEncodedString(org.apache.isis.noa.adapter.ObjectAdapter)}
+     * .
      */
     String getEncodedObjectData();
 }

Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/ObjectData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/ObjectData.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/ObjectData.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/ObjectData.java Sun Jan 22 07:36:07 2012
@@ -22,8 +22,8 @@ package org.apache.isis.runtimes.dflt.re
 import org.apache.isis.runtimes.dflt.remoting.common.data.Data;
 
 /**
- * ObjectData is data transfer object that contains all the data for an object in a form that can be passed over the
- * network between a client and a server.
+ * ObjectData is data transfer object that contains all the data for an object
+ * in a form that can be passed over the network between a client and a server.
  */
 public interface ObjectData extends ReferenceData {
     Data[] getFieldContent();

Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/query/PersistenceQueryFindUsingApplibQueryDefaultData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/query/PersistenceQueryFindUsingApplibQueryDefaultData.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/query/PersistenceQueryFindUsingApplibQueryDefaultData.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/query/PersistenceQueryFindUsingApplibQueryDefaultData.java Sun Jan 22 07:36:07 2012
@@ -27,7 +27,8 @@ import org.apache.isis.runtimes.dflt.rem
 import org.apache.isis.runtimes.dflt.runtime.persistence.query.PersistenceQueryFindUsingApplibQueryDefault;
 
 /**
- * Serializable representation of {@link PersistenceQueryFindUsingApplibQueryDefault}.
+ * Serializable representation of
+ * {@link PersistenceQueryFindUsingApplibQueryDefault}.
  */
 public class PersistenceQueryFindUsingApplibQueryDefaultData extends PersistenceQueryDataAbstract {
 
@@ -36,8 +37,7 @@ public class PersistenceQueryFindUsingAp
     private final QueryCardinality cardinality;
     private final String queryName;
 
-    public PersistenceQueryFindUsingApplibQueryDefaultData(final ObjectSpecification noSpec, final String queryName,
-        final Map<String, ObjectData> argumentDatasByParameterName, final QueryCardinality cardinality) {
+    public PersistenceQueryFindUsingApplibQueryDefaultData(final ObjectSpecification noSpec, final String queryName, final Map<String, ObjectData> argumentDatasByParameterName, final QueryCardinality cardinality) {
         super(noSpec);
         this.queryName = queryName;
         this.argumentDatasByParameterName = argumentDatasByParameterName;

Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/query/PersistenceQueryFindUsingApplibQuerySerializableData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/query/PersistenceQueryFindUsingApplibQuerySerializableData.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/query/PersistenceQueryFindUsingApplibQuerySerializableData.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/query/PersistenceQueryFindUsingApplibQuerySerializableData.java Sun Jan 22 07:36:07 2012
@@ -27,7 +27,8 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.runtimes.dflt.runtime.persistence.query.PersistenceQueryFindUsingApplibQuerySerializable;
 
 /**
- * Serializable representation of {@link PersistenceQueryFindUsingApplibQuerySerializable}.
+ * Serializable representation of
+ * {@link PersistenceQueryFindUsingApplibQuerySerializable}.
  */
 public class PersistenceQueryFindUsingApplibQuerySerializableData extends PersistenceQueryDataAbstract {
 
@@ -35,8 +36,7 @@ public class PersistenceQueryFindUsingAp
     private final Serializable querySerializable;
     private final QueryCardinality cardinality;
 
-    public PersistenceQueryFindUsingApplibQuerySerializableData(final ObjectSpecification noSpec,
-        final Query applibQuery, final QueryCardinality cardinality) {
+    public PersistenceQueryFindUsingApplibQuerySerializableData(final ObjectSpecification noSpec, final Query applibQuery, final QueryCardinality cardinality) {
         super(noSpec);
         querySerializable = applibQuery;
         this.cardinality = cardinality;

Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/AuthorizationRequestAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/AuthorizationRequestAbstract.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/AuthorizationRequestAbstract.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/AuthorizationRequestAbstract.java Sun Jan 22 07:36:07 2012
@@ -31,8 +31,7 @@ public abstract class AuthorizationReque
     private final String dataStr;
     private final IdentityData targetData;
 
-    public AuthorizationRequestAbstract(final AuthenticationSession session, final IdentityData targetData,
-        final String data) {
+    public AuthorizationRequestAbstract(final AuthenticationSession session, final IdentityData targetData, final String data) {
         super(session);
         this.targetData = targetData;
         this.dataStr = data;

Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/AuthorizationRequestUsability.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/AuthorizationRequestUsability.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/AuthorizationRequestUsability.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/AuthorizationRequestUsability.java Sun Jan 22 07:36:07 2012
@@ -29,8 +29,7 @@ import org.apache.isis.runtimes.dflt.rem
 public class AuthorizationRequestUsability extends AuthorizationRequestAbstract {
     private static final long serialVersionUID = 1L;
 
-    public AuthorizationRequestUsability(final AuthenticationSession session, final IdentityData targetData,
-        final String dataStr) {
+    public AuthorizationRequestUsability(final AuthenticationSession session, final IdentityData targetData, final String dataStr) {
         super(session, targetData, dataStr);
         initialized();
     }

Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/AuthorizationRequestVisibility.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/AuthorizationRequestVisibility.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/AuthorizationRequestVisibility.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/AuthorizationRequestVisibility.java Sun Jan 22 07:36:07 2012
@@ -29,8 +29,7 @@ import org.apache.isis.runtimes.dflt.rem
 public class AuthorizationRequestVisibility extends AuthorizationRequestAbstract {
     private static final long serialVersionUID = 1L;
 
-    public AuthorizationRequestVisibility(final AuthenticationSession session, final IdentityData targetData,
-        final String data) {
+    public AuthorizationRequestVisibility(final AuthenticationSession session, final IdentityData targetData, final String data) {
         super(session, targetData, data);
         initialized();
     }
@@ -49,7 +48,8 @@ public class AuthorizationRequestVisibil
     // ///////////////////////////////////////////////////////
 
     /**
-     * {@link #setResponse(Object) Sets a response} of an {@link AuthorizationResponse}.
+     * {@link #setResponse(Object) Sets a response} of an
+     * {@link AuthorizationResponse}.
      */
     @Override
     public void execute(final ServerFacade serverFacade) {

Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ClearAssociationRequest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ClearAssociationRequest.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ClearAssociationRequest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ClearAssociationRequest.java Sun Jan 22 07:36:07 2012
@@ -28,8 +28,8 @@ import org.apache.isis.runtimes.dflt.rem
 import org.apache.isis.runtimes.dflt.remoting.common.facade.ServerFacade;
 
 /**
- * REVIEW: should we split? the OTMA will need to specify the associate to remove, but the OTOA should not need to
- * provide the associate to clear.
+ * REVIEW: should we split? the OTMA will need to specify the associate to
+ * remove, but the OTOA should not need to provide the associate to clear.
  * 
  * @param request
  *            TODO
@@ -41,8 +41,7 @@ public class ClearAssociationRequest ext
     private final IdentityData target;
     private final IdentityData associate;
 
-    public ClearAssociationRequest(final AuthenticationSession session, final String fieldIdentifier,
-        final IdentityData target, final IdentityData associate) {
+    public ClearAssociationRequest(final AuthenticationSession session, final String fieldIdentifier, final IdentityData target, final IdentityData associate) {
         super(session);
         this.fieldIdentifier = fieldIdentifier;
         this.target = target;
@@ -91,7 +90,8 @@ public class ClearAssociationRequest ext
     // ///////////////////////////////////////////////////////
 
     /**
-     * {@link #setResponse(Object) Sets a response} of a {@link ClearAssociationResponse}.
+     * {@link #setResponse(Object) Sets a response} of a
+     * {@link ClearAssociationResponse}.
      */
     @Override
     public void execute(final ServerFacade serverFacade) {

Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ClearValueRequest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ClearValueRequest.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ClearValueRequest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ClearValueRequest.java Sun Jan 22 07:36:07 2012
@@ -33,8 +33,7 @@ public class ClearValueRequest extends R
     private final String fieldIdentifier;
     private final IdentityData target;
 
-    public ClearValueRequest(final AuthenticationSession session, final String fieldIdentifier,
-        final IdentityData target) {
+    public ClearValueRequest(final AuthenticationSession session, final String fieldIdentifier, final IdentityData target) {
         super(session);
         this.fieldIdentifier = fieldIdentifier;
         this.target = target;
@@ -76,7 +75,8 @@ public class ClearValueRequest extends R
     // ///////////////////////////////////////////////////////
 
     /**
-     * {@link #setResponse(Object) Sets a response} of {@link ObjectData}[] (array).
+     * {@link #setResponse(Object) Sets a response} of {@link ObjectData}[]
+     * (array).
      */
     @Override
     public void execute(final ServerFacade serverFacade) {

Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/CloseSessionRequest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/CloseSessionRequest.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/CloseSessionRequest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/CloseSessionRequest.java Sun Jan 22 07:36:07 2012
@@ -48,7 +48,8 @@ public class CloseSessionRequest extends
     // ///////////////////////////////////////////////////////
 
     /**
-     * {@link #setResponse(Object) Sets a response} to {@link CloseSessionResponse}.
+     * {@link #setResponse(Object) Sets a response} to
+     * {@link CloseSessionResponse}.
      */
     @Override
     public void execute(final ServerFacade serverFacade) {

Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ExecuteClientActionRequest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ExecuteClientActionRequest.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ExecuteClientActionRequest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ExecuteClientActionRequest.java Sun Jan 22 07:36:07 2012
@@ -75,7 +75,8 @@ public class ExecuteClientActionRequest 
     // ///////////////////////////////////////////////////////
 
     /**
-     * {@link #setResponse(Object) Sets a response} of a {@link ExecuteClientActionResponse}.
+     * {@link #setResponse(Object) Sets a response} of a
+     * {@link ExecuteClientActionResponse}.
      */
     @Override
     public void execute(final ServerFacade serverFacade) {

Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ExecuteClientActionResponse.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ExecuteClientActionResponse.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ExecuteClientActionResponse.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ExecuteClientActionResponse.java Sun Jan 22 07:36:07 2012
@@ -36,8 +36,7 @@ public class ExecuteClientActionResponse
     private final Version[] changedVersion;
     private final ObjectData[] updates;
 
-    public ExecuteClientActionResponse(final ReferenceData[] madePersistent, final Version[] changedVersion,
-        final ObjectData[] updates) {
+    public ExecuteClientActionResponse(final ReferenceData[] madePersistent, final Version[] changedVersion, final ObjectData[] updates) {
         this.madePersistent = madePersistent;
         this.changedVersion = changedVersion;
         this.updates = updates;
@@ -67,23 +66,26 @@ public class ExecuteClientActionResponse
     // ///////////////////////////////////////////////////////
 
     /**
-     * Return the ObjectDatas for the persisted objects (in the same seqence as passed to the server). This is used to
-     * update the client's copies with the new OIDs and Versions
+     * Return the ObjectDatas for the persisted objects (in the same seqence as
+     * passed to the server). This is used to update the client's copies with
+     * the new OIDs and Versions
      */
     public ReferenceData[] getPersisted() {
         return madePersistent;
     }
 
     /**
-     * Return the Versions for the objects that were saved by the server for the action. These are used to update the
-     * versions of the client's copies so they align with the servers copies.
+     * Return the Versions for the objects that were saved by the server for the
+     * action. These are used to update the versions of the client's copies so
+     * they align with the servers copies.
      */
     public Version[] getChanged() {
         return changedVersion;
     }
 
     /**
-     * Return the set of ObjectData for any objects that where changed by the server while executing the action.
+     * Return the set of ObjectData for any objects that where changed by the
+     * server while executing the action.
      */
     public ObjectData[] getUpdates() {
         return updates;

Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ExecuteServerActionRequest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ExecuteServerActionRequest.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ExecuteServerActionRequest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ExecuteServerActionRequest.java Sun Jan 22 07:36:07 2012
@@ -38,8 +38,7 @@ public class ExecuteServerActionRequest 
     private final ReferenceData target;
     private final Data[] parameters;
 
-    public ExecuteServerActionRequest(final AuthenticationSession session, final ActionType actionType,
-        final String actionIdentifier, final ReferenceData target, final Data[] parameters) {
+    public ExecuteServerActionRequest(final AuthenticationSession session, final ActionType actionType, final String actionIdentifier, final ReferenceData target, final Data[] parameters) {
         super(session);
         this.actionType = actionType;
         this.actionIdentifier = actionIdentifier;
@@ -95,7 +94,8 @@ public class ExecuteServerActionRequest 
     // ///////////////////////////////////////////////////////
 
     /**
-     * {@link #setResponse(Object) Sets a response} of a {@link ExecuteServerActionResponse}.
+     * {@link #setResponse(Object) Sets a response} of a
+     * {@link ExecuteServerActionResponse}.
      */
     @Override
     public void execute(final ServerFacade serverFacade) {

Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ExecuteServerActionResponse.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ExecuteServerActionResponse.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ExecuteServerActionResponse.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ExecuteServerActionResponse.java Sun Jan 22 07:36:07 2012
@@ -47,9 +47,7 @@ public class ExecuteServerActionResponse
     private final ObjectData persistedTarget;
     private final ObjectData[] persistedParameters;
 
-    public ExecuteServerActionResponse(final Data result, final ObjectData[] updatesData,
-        final ReferenceData[] disposed, final ObjectData persistedTarget, final ObjectData[] persistedParameters,
-        final String[] messages, final String[] warnings) {
+    public ExecuteServerActionResponse(final Data result, final ObjectData[] updatesData, final ReferenceData[] disposed, final ObjectData persistedTarget, final ObjectData[] persistedParameters, final String[] messages, final String[] warnings) {
         this.result = result;
         this.updatesData = updatesData;
         this.disposedData = disposed;
@@ -105,15 +103,16 @@ public class ExecuteServerActionResponse
     }
 
     /**
-     * Return the ObjectDatas for any of the parameters (in the same seqence as passed to the server) if they were was
-     * persisited by the server.
+     * Return the ObjectDatas for any of the parameters (in the same seqence as
+     * passed to the server) if they were was persisited by the server.
      */
     public ObjectData[] getPersistedParameters() {
         return persistedParameters;
     }
 
     /**
-     * Return the set of ObjectData for any objects that where changed by the server while executing the action.
+     * Return the set of ObjectData for any objects that where changed by the
+     * server while executing the action.
      */
     public ObjectData[] getUpdates() {
         return updatesData;

Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/FindInstancesRequest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/FindInstancesRequest.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/FindInstancesRequest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/FindInstancesRequest.java Sun Jan 22 07:36:07 2012
@@ -67,7 +67,8 @@ public class FindInstancesRequest extend
     // ///////////////////////////////////////////////////////
 
     /**
-     * {@link #setResponse(Object) Sets a response} of a {@link FindInstancesResponse}.
+     * {@link #setResponse(Object) Sets a response} of a
+     * {@link FindInstancesResponse}.
      */
     @Override
     public void execute(final ServerFacade serverFacade) {

Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/GetObjectRequest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/GetObjectRequest.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/GetObjectRequest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/GetObjectRequest.java Sun Jan 22 07:36:07 2012
@@ -76,7 +76,8 @@ public class GetObjectRequest extends Re
     // ///////////////////////////////////////////////////////
 
     /**
-     * {@link #setResponse(Object) Sets a response} of a {@link GetObjectResponse}.
+     * {@link #setResponse(Object) Sets a response} of a
+     * {@link GetObjectResponse}.
      */
     @Override
     public void execute(final ServerFacade serverFacade) {

Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/GetPropertiesRequest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/GetPropertiesRequest.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/GetPropertiesRequest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/GetPropertiesRequest.java Sun Jan 22 07:36:07 2012
@@ -53,7 +53,8 @@ public class GetPropertiesRequest extend
     // ///////////////////////////////////////////////////////
 
     /**
-     * {@link #setResponse(Object) Sets a response} of a {@link GetPropertiesResponse}.
+     * {@link #setResponse(Object) Sets a response} of a
+     * {@link GetPropertiesResponse}.
      */
     @Override
     public void execute(final ServerFacade serverFacade) {

Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/HasInstancesRequest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/HasInstancesRequest.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/HasInstancesRequest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/HasInstancesRequest.java Sun Jan 22 07:36:07 2012
@@ -66,7 +66,8 @@ public class HasInstancesRequest extends
     // ///////////////////////////////////////////////////////
 
     /**
-     * {@link #setResponse(Object) Sets a response} of a {@link HasInstancesResponse}.
+     * {@link #setResponse(Object) Sets a response} of a
+     * {@link HasInstancesResponse}.
      */
     @Override
     public void execute(final ServerFacade serverFacade) {

Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/KnownObjectsRequest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/KnownObjectsRequest.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/KnownObjectsRequest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/KnownObjectsRequest.java Sun Jan 22 07:36:07 2012
@@ -27,8 +27,9 @@ import org.apache.isis.runtimes.dflt.rem
 import com.google.common.collect.Maps;
 
 /**
- * A lookup of the objects that are part of a request or response. As only one instance of data per object should be
- * passed from node to node this object provides a way of ensuring this.
+ * A lookup of the objects that are part of a request or response. As only one
+ * instance of data per object should be passed from node to node this object
+ * provides a way of ensuring this.
  */
 public class KnownObjectsRequest {
 
@@ -106,7 +107,8 @@ public class KnownObjectsRequest {
     // if (obj instanceof KnownObjectsRequest) {
     // final KnownObjectsRequest other = (KnownObjectsRequest) obj;
     //
-    // return other.dataToObjectMap.equals(dataToObjectMap) && other.objectToDataMap.equals(objectToDataMap);
+    // return other.dataToObjectMap.equals(dataToObjectMap) &&
+    // other.objectToDataMap.equals(objectToDataMap);
     // }
     //
     // return false;

Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/OpenSessionRequest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/OpenSessionRequest.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/OpenSessionRequest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/OpenSessionRequest.java Sun Jan 22 07:36:07 2012
@@ -75,7 +75,8 @@ public class OpenSessionRequest extends 
     // ///////////////////////////////////////////////////////
 
     /**
-     * {@link #setResponse(Object) Sets a response} of an {@link AuthenticationSession}.
+     * {@link #setResponse(Object) Sets a response} of an
+     * {@link AuthenticationSession}.
      */
     @Override
     public void execute(final ServerFacade serverFacade) {

Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/Request.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/Request.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/Request.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/Request.java Sun Jan 22 07:36:07 2012
@@ -37,7 +37,8 @@ public interface Request extends Encodab
      * Unique identifier for the request.
      * 
      * <p>
-     * REVIEW: rather than using a simple <tt>int</tt>, wouldn't a {@link UUID} be preferable?
+     * REVIEW: rather than using a simple <tt>int</tt>, wouldn't a {@link UUID}
+     * be preferable?
      */
     int getId();
 

Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ResolveFieldRequest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ResolveFieldRequest.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ResolveFieldRequest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ResolveFieldRequest.java Sun Jan 22 07:36:07 2012
@@ -75,7 +75,8 @@ public class ResolveFieldRequest extends
     // ///////////////////////////////////////////////////////
 
     /**
-     * {@link #setResponse(Object) Sets a response} of a {@link ResolveFieldResponse}.
+     * {@link #setResponse(Object) Sets a response} of a
+     * {@link ResolveFieldResponse}.
      */
     @Override
     public void execute(final ServerFacade serverFacade) {

Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/SetAssociationRequest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/SetAssociationRequest.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/SetAssociationRequest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/SetAssociationRequest.java Sun Jan 22 07:36:07 2012
@@ -35,8 +35,7 @@ public class SetAssociationRequest exten
     private final IdentityData target;
     private final IdentityData associate;
 
-    public SetAssociationRequest(final AuthenticationSession session, final String fieldIdentifier,
-        final IdentityData target, final IdentityData associate) {
+    public SetAssociationRequest(final AuthenticationSession session, final String fieldIdentifier, final IdentityData target, final IdentityData associate) {
         super(session);
         this.fieldIdentifier = fieldIdentifier;
         this.target = target;
@@ -85,7 +84,8 @@ public class SetAssociationRequest exten
     // ///////////////////////////////////////////////////////
 
     /**
-     * {@link #setResponse(Object) Sets a response} of {@link SetAssociationResponse}.
+     * {@link #setResponse(Object) Sets a response} of
+     * {@link SetAssociationResponse}.
      */
     @Override
     public void execute(final ServerFacade serverFacade) {

Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/SetValueRequest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/SetValueRequest.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/SetValueRequest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/SetValueRequest.java Sun Jan 22 07:36:07 2012
@@ -34,8 +34,7 @@ public class SetValueRequest extends Req
     private final EncodableObjectData value;
     private final IdentityData target;
 
-    public SetValueRequest(final AuthenticationSession session, final String fieldIdentifier,
-        final IdentityData target, final EncodableObjectData value) {
+    public SetValueRequest(final AuthenticationSession session, final String fieldIdentifier, final IdentityData target, final EncodableObjectData value) {
         super(session);
         this.fieldIdentifier = fieldIdentifier;
         this.target = target;

Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/facade/ServerFacadeLogger.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/facade/ServerFacadeLogger.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/facade/ServerFacadeLogger.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/facade/ServerFacadeLogger.java Sun Jan 22 07:36:07 2012
@@ -162,8 +162,7 @@ public class ServerFacadeLogger extends 
         final IdentityData targetData = request.getTarget();
         final IdentityData associateData = request.getAssociate();
 
-        log("set association " + fieldIdentifier + indentedNewLine() + "target: " + dump(targetData)
-            + indentedNewLine() + "associate: " + dump(associateData));
+        log("set association " + fieldIdentifier + indentedNewLine() + "target: " + dump(targetData) + indentedNewLine() + "associate: " + dump(associateData));
         final SetAssociationResponse response = decorated.setAssociation(request);
         final ObjectData[] changes = response.getUpdates();
         log("  <-- changes: " + dump(changes));
@@ -177,8 +176,7 @@ public class ServerFacadeLogger extends 
         final IdentityData target = request.getTarget();
         final EncodableObjectData value = request.getValue();
 
-        log("set value " + fieldIdentifier + indentedNewLine() + "target: " + dump(target) + indentedNewLine()
-            + "value: " + value);
+        log("set value " + fieldIdentifier + indentedNewLine() + "target: " + dump(target) + indentedNewLine() + "value: " + value);
         final SetValueResponse response = decorated.setValue(request);
         final ObjectData[] updates = response.getUpdates();
         log("  <-- changes: " + dump(updates));
@@ -191,8 +189,7 @@ public class ServerFacadeLogger extends 
         final IdentityData target = request.getTarget();
         final IdentityData associate = request.getAssociate();
 
-        log("clear association " + fieldIdentifier + indentedNewLine() + "target: " + dump(target) + indentedNewLine()
-            + "associate: " + dump(associate));
+        log("clear association " + fieldIdentifier + indentedNewLine() + "target: " + dump(target) + indentedNewLine() + "associate: " + dump(associate));
         final ClearAssociationResponse response = decorated.clearAssociation(request);
         final ObjectData[] updates = response.getUpdates();
         log("  <-- changes: " + dump(updates));
@@ -224,8 +221,7 @@ public class ServerFacadeLogger extends 
         final ReferenceData target = request.getTarget();
         final Data[] parameters = request.getParameters();
 
-        log("execute action " + actionIdentifier + "/" + actionType + indentedNewLine() + "target: " + dump(target)
-            + indentedNewLine() + "parameters: " + dump(parameters));
+        log("execute action " + actionIdentifier + "/" + actionType + indentedNewLine() + "target: " + dump(target) + indentedNewLine() + "parameters: " + dump(parameters));
         ExecuteServerActionResponse result;
         try {
             result = decorated.executeServerAction(request);
@@ -255,15 +251,15 @@ public class ServerFacadeLogger extends 
             str.append(i + 1);
             str.append("] ");
             switch (types[i]) {
-                case ClientTransactionEvent.ADD:
-                    str.append("persisted: ");
-                    break;
-                case ClientTransactionEvent.CHANGE:
-                    str.append("changed: ");
-                    break;
-                case ClientTransactionEvent.DELETE:
-                    str.append("deleted: ");
-                    break;
+            case ClientTransactionEvent.ADD:
+                str.append("persisted: ");
+                break;
+            case ClientTransactionEvent.CHANGE:
+                str.append("changed: ");
+                break;
+            case ClientTransactionEvent.DELETE:
+                str.append("deleted: ");
+                break;
             }
             dump(str, data[i], 3, complete);
         }
@@ -281,19 +277,20 @@ public class ServerFacadeLogger extends 
             str.append(i + 1);
             str.append("] ");
             switch (types[i]) {
-                case ClientTransactionEvent.ADD:
-                    str.append("persisted: ");
-                    dump(str, persistedUpdates[i], 3, complete);
-                    break;
-                case ClientTransactionEvent.CHANGE:
-                    str.append("changed: ");
-                    str.append(changedVersions[i]);
-                    break;
+            case ClientTransactionEvent.ADD:
+                str.append("persisted: ");
+                dump(str, persistedUpdates[i], 3, complete);
+                break;
+            case ClientTransactionEvent.CHANGE:
+                str.append("changed: ");
+                str.append(changedVersions[i]);
+                break;
             }
         }
         log(" <--- execute client action results" + str);
         /*
-         * log(" <-- persisted: " + dump(results.getPersisted())); log(" <-- changed: " + dump(results.getChanged()));
+         * log(" <-- persisted: " + dump(results.getPersisted()));
+         * log(" <-- changed: " + dump(results.getChanged()));
          */
         return results;
     }
@@ -425,12 +422,10 @@ public class ServerFacadeLogger extends 
             str.append("NULL (NullData object)");
         } else if (data instanceof EncodableObjectData) {
             final EncodableObjectData encodeableObjectData = ((EncodableObjectData) data);
-            str.append("ValueData@" + Integer.toHexString(encodeableObjectData.hashCode()) + " "
-                + encodeableObjectData.getType() + ":" + encodeableObjectData.getEncodedObjectData());
+            str.append("ValueData@" + Integer.toHexString(encodeableObjectData.hashCode()) + " " + encodeableObjectData.getType() + ":" + encodeableObjectData.getEncodedObjectData());
         } else if (data instanceof IdentityData) {
             final IdentityData referenceData = (IdentityData) data;
-            str.append("ReferenceData@" + Integer.toHexString(referenceData.hashCode()) + " " + referenceData.getType()
-                + ":" + referenceData.getOid() + ":" + referenceData.getVersion());
+            str.append("ReferenceData@" + Integer.toHexString(referenceData.hashCode()) + " " + referenceData.getType() + ":" + referenceData.getOid() + ":" + referenceData.getVersion());
         } else if (data instanceof ObjectData) {
             dumpObjectData(str, data, indent, complete);
         } else if (data instanceof CollectionData) {
@@ -440,11 +435,9 @@ public class ServerFacadeLogger extends 
         }
     }
 
-    private void dumpCollectionData(final StringBuilder str, final Data data, final int indent,
-        final List<Data> complete) {
+    private void dumpCollectionData(final StringBuilder str, final Data data, final int indent, final List<Data> complete) {
         final CollectionData objectData = ((CollectionData) data);
-        str.append("CollectionData@" + Integer.toHexString(objectData.hashCode()) + " " + objectData.getType() + ":"
-            + objectData.getOid() + ":" + (objectData.hasAllElements() ? "A" : "-") + ":" + objectData.getVersion());
+        str.append("CollectionData@" + Integer.toHexString(objectData.hashCode()) + " " + objectData.getType() + ":" + objectData.getOid() + ":" + (objectData.hasAllElements() ? "A" : "-") + ":" + objectData.getVersion());
         final Object[] elements = objectData.getElements();
         for (int i = 0; elements != null && i < elements.length; i++) {
             str.append("\n");
@@ -457,8 +450,7 @@ public class ServerFacadeLogger extends 
 
     private void dumpObjectData(final StringBuilder str, final Data data, final int indent, final List<Data> complete) {
         final ObjectData objectData = ((ObjectData) data);
-        str.append("ObjectData@" + Integer.toHexString(objectData.hashCode()) + " " + objectData.getType() + ":"
-            + objectData.getOid() + ":" + (objectData.hasCompleteData() ? "C" : "-") + ":" + objectData.getVersion());
+        str.append("ObjectData@" + Integer.toHexString(objectData.hashCode()) + " " + objectData.getType() + ":" + objectData.getOid() + ":" + (objectData.hasCompleteData() ? "C" : "-") + ":" + objectData.getVersion());
 
         if (complete.contains(objectData)) {
             str.append(" (already detailed)");

Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/facade/impl/ServerFacadeImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/facade/impl/ServerFacadeImpl.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/facade/impl/ServerFacadeImpl.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/facade/impl/ServerFacadeImpl.java Sun Jan 22 07:36:07 2012
@@ -138,8 +138,7 @@ public class ServerFacadeImpl implements
 
     @Override
     public OpenSessionResponse openSession(final OpenSessionRequest request2) {
-        final AuthenticationRequestPassword request =
-            new AuthenticationRequestPassword(request2.getUsername(), request2.getPassword());
+        final AuthenticationRequestPassword request = new AuthenticationRequestPassword(request2.getUsername(), request2.getPassword());
         final AuthenticationSession session = authenticationManager.authenticate(request);
         return new OpenSessionResponse(session);
     }
@@ -157,16 +156,14 @@ public class ServerFacadeImpl implements
     @Override
     public AuthorizationResponse authorizeVisibility(final AuthorizationRequestVisibility request) {
         final ObjectAdapter targetAdapter = encoderDecoder.decode(request.getTarget());
-        final boolean allowed =
-            getMember(request.getIdentifier()).isVisible(request.getSession(), targetAdapter).isAllowed();
+        final boolean allowed = getMember(request.getIdentifier()).isVisible(request.getSession(), targetAdapter).isAllowed();
         return encoderDecoder.encodeAuthorizeResponse(allowed);
     }
 
     @Override
     public AuthorizationResponse authorizeUsability(final AuthorizationRequestUsability request) {
         final ObjectAdapter targetAdapter = encoderDecoder.decode(request.getTarget());
-        final boolean allowed =
-            getMember(request.getIdentifier()).isUsable(request.getSession(), targetAdapter).isAllowed();
+        final boolean allowed = getMember(request.getIdentifier()).isUsable(request.getSession(), targetAdapter).isAllowed();
         return encoderDecoder.encodeAuthorizeResponse(allowed);
     }
 
@@ -181,8 +178,7 @@ public class ServerFacadeImpl implements
     }
 
     private ObjectMember getActionElseThrowException(final Identifier id, final ObjectSpecification specification) {
-        final ObjectMember member =
-            specification.getObjectAction(ActionType.USER, id.getMemberName(), loadParameterSpecifications(id));
+        final ObjectMember member = specification.getObjectAction(ActionType.USER, id.getMemberName(), loadParameterSpecifications(id));
         if (member == null) {
             throw new IsisException("No user action found for id " + id);
         }
@@ -217,8 +213,7 @@ public class ServerFacadeImpl implements
 
         // pass over services
         final IsisConfiguration configuration = IsisContext.getConfiguration();
-        final IsisConfiguration serviceProperties =
-            configuration.getProperties(ConfigurationConstants.ROOT + "services");
+        final IsisConfiguration serviceProperties = configuration.getProperties(ConfigurationConstants.ROOT + "services");
 
         for (final String propertyName : serviceProperties) {
             properties.put(propertyName, serviceProperties.getString(propertyName));
@@ -239,7 +234,8 @@ public class ServerFacadeImpl implements
     // //////////////////////////////////////////////////////////////
 
     /**
-     * Applies to both {@link OneToOneAssociation}s and {@link OneToManyAssociation}s.
+     * Applies to both {@link OneToOneAssociation}s and
+     * {@link OneToManyAssociation}s.
      */
     @Override
     public SetAssociationResponse setAssociation(final SetAssociationRequest request) {
@@ -250,8 +246,7 @@ public class ServerFacadeImpl implements
         final IdentityData associateData = request.getAssociate();
 
         if (LOG.isDebugEnabled()) {
-            LOG.debug("request setAssociation " + fieldIdentifier + " on " + targetData + " with " + associateData
-                + " for " + session);
+            LOG.debug("request setAssociation " + fieldIdentifier + " on " + targetData + " with " + associateData + " for " + session);
         }
 
         final ObjectAdapter targetAdapter = getPersistentObjectAdapter(session, targetData);
@@ -282,13 +277,11 @@ public class ServerFacadeImpl implements
 
         Assert.assertNotNull(encodeableObjectData);
         if (LOG.isDebugEnabled()) {
-            LOG.debug("request setValue " + fieldIdentifier + " on " + targetIdentityData + " with "
-                + encodeableObjectData + " for " + session);
+            LOG.debug("request setValue " + fieldIdentifier + " on " + targetIdentityData + " with " + encodeableObjectData + " for " + session);
         }
 
         final ObjectAdapter targetAdapter = getPersistentObjectAdapter(session, targetIdentityData);
-        final OneToOneAssociation association =
-            (OneToOneAssociation) targetAdapter.getSpecification().getAssociation(fieldIdentifier);
+        final OneToOneAssociation association = (OneToOneAssociation) targetAdapter.getSpecification().getAssociation(fieldIdentifier);
 
         ensureAssociationModifiableElseThrowException(session, targetAdapter, association);
 
@@ -302,7 +295,8 @@ public class ServerFacadeImpl implements
     }
 
     /**
-     * Applies to both {@link OneToOneAssociation}s and {@link OneToManyAssociation}s.
+     * Applies to both {@link OneToOneAssociation}s and
+     * {@link OneToManyAssociation}s.
      */
     @Override
     public ClearAssociationResponse clearAssociation(final ClearAssociationRequest request) {
@@ -313,8 +307,7 @@ public class ServerFacadeImpl implements
         final IdentityData associateData = request.getAssociate();
 
         if (LOG.isDebugEnabled()) {
-            LOG.debug("request clearAssociation " + fieldIdentifier + " on " + targetData + " of " + associateData
-                + " for " + session);
+            LOG.debug("request clearAssociation " + fieldIdentifier + " on " + targetData + " of " + associateData + " for " + session);
         }
 
         final ObjectAdapter targetAdapter = getPersistentObjectAdapter(session, targetData);
@@ -322,8 +315,7 @@ public class ServerFacadeImpl implements
         final ObjectSpecification specification = targetAdapter.getSpecification();
         final ObjectAssociation association = specification.getAssociation(fieldIdentifier);
 
-        if (!association.isVisible(session, targetAdapter).isAllowed()
-            || association.isUsable(session, targetAdapter).isVetoed()) {
+        if (!association.isVisible(session, targetAdapter).isAllowed() || association.isUsable(session, targetAdapter).isVetoed()) {
             throw new IsisException("can't modify field as not visible or editable");
         }
         ensureAssociationModifiableElseThrowException(session, targetAdapter, association);
@@ -351,8 +343,7 @@ public class ServerFacadeImpl implements
         }
 
         final ObjectAdapter targetAdapter = getPersistentObjectAdapter(session, targetIdentityData);
-        final OneToOneAssociation association =
-            (OneToOneAssociation) targetAdapter.getSpecification().getAssociation(fieldIdentifier);
+        final OneToOneAssociation association = (OneToOneAssociation) targetAdapter.getSpecification().getAssociation(fieldIdentifier);
 
         ensureAssociationModifiableElseThrowException(session, targetAdapter, association);
 
@@ -360,10 +351,8 @@ public class ServerFacadeImpl implements
         return new ClearValueResponse(getUpdates());
     }
 
-    private void ensureAssociationModifiableElseThrowException(final AuthenticationSession session,
-        final ObjectAdapter targetAdapter, final ObjectAssociation association) {
-        if (!association.isVisible(session, targetAdapter).isAllowed()
-            || association.isUsable(session, targetAdapter).isVetoed()) {
+    private void ensureAssociationModifiableElseThrowException(final AuthenticationSession session, final ObjectAdapter targetAdapter, final ObjectAssociation association) {
+        if (!association.isVisible(session, targetAdapter).isAllowed() || association.isUsable(session, targetAdapter).isVetoed()) {
             throw new IsisException("can't modify field as not visible or editable");
         }
     }
@@ -396,34 +385,36 @@ public class ServerFacadeImpl implements
             for (int i = 0; i < data.length; i++) {
                 ObjectAdapter object;
                 switch (types[i]) {
-                    case ClientTransactionEvent.ADD:
-                        object = encoderDecoder.decode(data[i], knownObjects);
-                        persistedObjects[i] = object;
-                        if (object.getOid().isTransient()) { // confirm that the graph has not been made
-                            // persistent earlier in this loop
-                            LOG.debug("  makePersistent " + data[i]);
-                            getPersistenceSession().makePersistent(object);
-                        }
-                        break;
-
-                    case ClientTransactionEvent.CHANGE:
-                        final ObjectAdapter obj = getPersistentObjectAdapter(data[i]);
-                        obj.checkLock(data[i].getVersion());
-
-                        object = encoderDecoder.decode(data[i], knownObjects);
-                        LOG.debug("  objectChanged " + data[i]);
-                        getPersistenceSession().objectChanged(object);
-                        changedObjects[i] = object;
-                        break;
-
-                    case ClientTransactionEvent.DELETE:
-                        final ObjectAdapter inObject = getPersistentObjectAdapter(data[i]);
-                        inObject.checkLock(data[i].getVersion());
-
-                        LOG.debug("  destroyObject " + data[i] + " for " + session);
-                        disposedObjects[i] = inObject;
-                        getPersistenceSession().destroyObject(inObject);
-                        break;
+                case ClientTransactionEvent.ADD:
+                    object = encoderDecoder.decode(data[i], knownObjects);
+                    persistedObjects[i] = object;
+                    if (object.getOid().isTransient()) { // confirm that the
+                                                         // graph has not been
+                                                         // made
+                        // persistent earlier in this loop
+                        LOG.debug("  makePersistent " + data[i]);
+                        getPersistenceSession().makePersistent(object);
+                    }
+                    break;
+
+                case ClientTransactionEvent.CHANGE:
+                    final ObjectAdapter obj = getPersistentObjectAdapter(data[i]);
+                    obj.checkLock(data[i].getVersion());
+
+                    object = encoderDecoder.decode(data[i], knownObjects);
+                    LOG.debug("  objectChanged " + data[i]);
+                    getPersistenceSession().objectChanged(object);
+                    changedObjects[i] = object;
+                    break;
+
+                case ClientTransactionEvent.DELETE:
+                    final ObjectAdapter inObject = getPersistentObjectAdapter(data[i]);
+                    inObject.checkLock(data[i].getVersion());
+
+                    LOG.debug("  destroyObject " + data[i] + " for " + session);
+                    disposedObjects[i] = inObject;
+                    getPersistenceSession().destroyObject(inObject);
+                    break;
                 }
 
             }
@@ -438,13 +429,13 @@ public class ServerFacadeImpl implements
 
             for (int i = 0; i < data.length; i++) {
                 switch (types[i]) {
-                    case ClientTransactionEvent.ADD:
-                        madePersistent[i] = encoderDecoder.encodeIdentityData(persistedObjects[i]);
-                        break;
-
-                    case ClientTransactionEvent.CHANGE:
-                        changedVersion[i] = changedObjects[i].getVersion();
-                        break;
+                case ClientTransactionEvent.ADD:
+                    madePersistent[i] = encoderDecoder.encodeIdentityData(persistedObjects[i]);
+                    break;
+
+                case ClientTransactionEvent.CHANGE:
+                    changedVersion[i] = changedObjects[i].getVersion();
+                    break;
 
                 }
             }
@@ -498,22 +489,19 @@ public class ServerFacadeImpl implements
 
         final ObjectData[] persistedParameterData = new ObjectData[parameterData.length];
         for (int i = 0; i < persistedParameterData.length; i++) {
-            if (action.getParameters().get(i).getSpecification().isNotCollection()
-                && parameterData[i] instanceof ObjectData) {
-                persistedParameterData[i] =
-                    encoderDecoder.encodeMadePersistentGraph((ObjectData) parameterData[i], parameters[i]);
+            if (action.getParameters().get(i).getSpecification().isNotCollection() && parameterData[i] instanceof ObjectData) {
+                persistedParameterData[i] = encoderDecoder.encodeMadePersistentGraph((ObjectData) parameterData[i], parameters[i]);
             }
         }
         final List<String> messages = getMessageBroker().getMessages();
         final List<String> warnings = getMessageBroker().getWarnings();
 
-        // TODO for efficiency, need to remove the objects in the results graph from the updates set
-        return encoderDecoder.encodeServerActionResult(resultAdapter, getUpdates(), getDisposed(), persistedTargetData,
-            persistedParameterData, messages.toArray(new String[0]), warnings.toArray(new String[0]));
+        // TODO for efficiency, need to remove the objects in the results graph
+        // from the updates set
+        return encoderDecoder.encodeServerActionResult(resultAdapter, getUpdates(), getDisposed(), persistedTargetData, persistedParameterData, messages.toArray(new String[0]), warnings.toArray(new String[0]));
     }
 
-    private ObjectAdapter decodeTargetAdapter(final AuthenticationSession session, final ReferenceData targetData,
-        final KnownObjectsRequest knownObjects) {
+    private ObjectAdapter decodeTargetAdapter(final AuthenticationSession session, final ReferenceData targetData, final KnownObjectsRequest knownObjects) {
         ObjectAdapter targetAdapter;
         if (targetData == null) {
             throw new IsisRemoteException("No target specified");
@@ -529,8 +517,7 @@ public class ServerFacadeImpl implements
     }
 
     @SuppressWarnings("unused")
-    private ObjectAction getActionMethod(final String actionType, final String actionIdentifier,
-        final Data[] parameterData, final ObjectAdapter adapter) {
+    private ObjectAction getActionMethod(final String actionType, final String actionIdentifier, final Data[] parameterData, final ObjectAdapter adapter) {
         final List<ObjectSpecification> parameterSpecs = Lists.newArrayList();
         for (int i = 0; i < parameterSpecs.size(); i++) {
             parameterSpecs.add(getSpecification(parameterData[i].getType()));
@@ -548,8 +535,7 @@ public class ServerFacadeImpl implements
         return adapter.getSpecification().getObjectAction(type, methodName, parameterSpecs);
     }
 
-    private ObjectAdapter[] decodeParameters(final AuthenticationSession session, final Data[] parameterData,
-        final KnownObjectsRequest knownObjects) {
+    private ObjectAdapter[] decodeParameters(final AuthenticationSession session, final Data[] parameterData, final KnownObjectsRequest knownObjects) {
         final ObjectAdapter[] parameters = new ObjectAdapter[parameterData.length];
         for (int i = 0; i < parameters.length; i++) {
             final Data data = parameterData[i];
@@ -562,13 +548,14 @@ public class ServerFacadeImpl implements
             } else if (data instanceof ObjectData) {
                 parameters[i] = encoderDecoder.decode(data, knownObjects);
             } else if (data instanceof EncodableObjectData) {
-                final ObjectSpecification valueSpecification =
-                    getSpecificationLoader().loadSpecification(data.getType());
+                final ObjectSpecification valueSpecification = getSpecificationLoader().loadSpecification(data.getType());
                 final String valueData = ((EncodableObjectData) data).getEncodedObjectData();
 
                 final ObjectAdapter value = restoreLeafObject(valueData, valueSpecification);
                 /*
-                 * ObjectAdapter value = IsisContext.getObjectLoader().createValueInstance(valueSpecification);
+                 * ObjectAdapter value =
+                 * IsisContext.getObjectLoader().createValueInstance
+                 * (valueSpecification);
                  * value.restoreFromEncodedString(valueData);
                  */
                 parameters[i] = value;
@@ -637,7 +624,8 @@ public class ServerFacadeImpl implements
         final ObjectAdapter object = getPersistenceSession().loadObject(targetData.getOid(), spec);
 
         if (object.getResolveState().canChangeTo(ResolveState.RESOLVING)) {
-            // this is need when the object store does not load the object fully in the getObject() above
+            // this is need when the object store does not load the object fully
+            // in the getObject() above
             getPersistenceSession().resolveImmediately(object);
         }
 

Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/facade/proxy/ServerFacadeProxy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/facade/proxy/ServerFacadeProxy.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/facade/proxy/ServerFacadeProxy.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/facade/proxy/ServerFacadeProxy.java Sun Jan 22 07:36:07 2012
@@ -232,8 +232,7 @@ public class ServerFacadeProxy implement
         synchronized (connection) {
             final ResponseEnvelope response = connection.executeRemotely(request);
             if (request.getId() != response.getId()) {
-                throw new IsisRemoteException("Response out of sequence with respect to the request: "
-                    + request.getId() + " & " + response.getId() + " respectively");
+                throw new IsisRemoteException("Response out of sequence with respect to the request: " + request.getId() + " & " + response.getId() + " respectively");
             }
             if (LOG.isDebugEnabled()) {
                 LOG.debug("response " + response);

Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/marshalling/MarshallerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/marshalling/MarshallerAbstract.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/marshalling/MarshallerAbstract.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/marshalling/MarshallerAbstract.java Sun Jan 22 07:36:07 2012
@@ -46,8 +46,7 @@ public abstract class MarshallerAbstract
     @Override
     public void init() {
         transport.init();
-        keepAlive =
-            getConfiguration().getBoolean(MarshallingConstants.KEEPALIVE_KEY, MarshallingConstants.KEEPALIVE_DEFAULT);
+        keepAlive = getConfiguration().getBoolean(MarshallingConstants.KEEPALIVE_KEY, MarshallingConstants.KEEPALIVE_DEFAULT);
         if (LOG.isInfoEnabled()) {
             LOG.info("keepAlive=" + keepAlive);
         }
@@ -82,7 +81,8 @@ public abstract class MarshallerAbstract
     }
 
     /**
-     * Not API. Whether reconnects are performed depends on the marshaller/protocol.
+     * Not API. Whether reconnects are performed depends on the
+     * marshaller/protocol.
      */
     protected void reconnect() throws IOException {
         disconnect();



Mime
View raw message