incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1098939 [5/11] - in /incubator/isis/trunk/runtimes/dflt: profilestores/dflt/src/main/java/org/apache/isis/runtimes/dflt/profilestores/dflt/ profilestores/xml/src/main/java/org/apache/isis/runtimes/dflt/profilestores/xml/ profilestores/xml/...
Date Tue, 03 May 2011 06:33:49 GMT
Modified: incubator/isis/trunk/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/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/KnownObjectsRequest.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/KnownObjectsRequest.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/KnownObjectsRequest.java Tue May  3 06:33:43 2011
@@ -17,27 +17,26 @@
  *  under the License.
  */
 
-
 package org.apache.isis.runtimes.dflt.remoting.common.exchange;
 
 import java.util.Map;
 
-import org.apache.isis.runtimes.dflt.remoting.common.data.common.ObjectData;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.runtimes.dflt.remoting.common.data.common.ObjectData;
 
 import com.google.inject.internal.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 {
 
     private final Map<ObjectAdapter, ObjectData> dataToObjectMap = Maps.newHashMap();
     private final Map<ObjectData, ObjectAdapter> objectToDataMap = Maps.newHashMap();
 
-    public KnownObjectsRequest() {}
+    public KnownObjectsRequest() {
+    }
 
     public boolean containsKey(final ObjectAdapter object) {
         return dataToObjectMap.containsKey(object);
@@ -48,11 +47,11 @@ public class KnownObjectsRequest {
     }
 
     public ObjectData get(final ObjectAdapter object) {
-        return (ObjectData) dataToObjectMap.get(object);
+        return dataToObjectMap.get(object);
     }
 
     public ObjectAdapter get(final ObjectData data) {
-        return (ObjectAdapter) objectToDataMap.get(data);
+        return objectToDataMap.get(data);
     }
 
     public void put(final ObjectAdapter object, final ObjectData data) {
@@ -61,24 +60,31 @@ public class KnownObjectsRequest {
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
+    public boolean equals(final Object obj) {
+        if (this == obj) {
             return true;
-        if (obj == null)
+        }
+        if (obj == null) {
             return false;
-        if (getClass() != obj.getClass())
+        }
+        if (getClass() != obj.getClass()) {
             return false;
-        KnownObjectsRequest other = (KnownObjectsRequest) obj;
+        }
+        final KnownObjectsRequest other = (KnownObjectsRequest) obj;
         if (dataToObjectMap == null) {
-            if (other.dataToObjectMap != null)
+            if (other.dataToObjectMap != null) {
                 return false;
-        } else if (!dataToObjectMap.equals(other.dataToObjectMap))
+            }
+        } else if (!dataToObjectMap.equals(other.dataToObjectMap)) {
             return false;
+        }
         if (objectToDataMap == null) {
-            if (other.objectToDataMap != null)
+            if (other.objectToDataMap != null) {
                 return false;
-        } else if (!objectToDataMap.equals(other.objectToDataMap))
+            }
+        } else if (!objectToDataMap.equals(other.objectToDataMap)) {
             return false;
+        }
         return true;
     }
 
@@ -91,22 +97,19 @@ public class KnownObjectsRequest {
         return result;
     }
 
-
-//    @Override
-//    public boolean equals(final Object obj) {
-//        if (obj == this) {
-//            return true;
-//        }
-//
-//        if (obj instanceof KnownObjectsRequest) {
-//            final KnownObjectsRequest other = (KnownObjectsRequest) obj;
-//
-//            return other.dataToObjectMap.equals(dataToObjectMap) && other.objectToDataMap.equals(objectToDataMap);
-//        }
-//
-//        return false;
-//    }
-
+    // @Override
+    // public boolean equals(final Object obj) {
+    // if (obj == this) {
+    // return true;
+    // }
+    //
+    // if (obj instanceof KnownObjectsRequest) {
+    // final KnownObjectsRequest other = (KnownObjectsRequest) obj;
+    //
+    // return other.dataToObjectMap.equals(dataToObjectMap) && other.objectToDataMap.equals(objectToDataMap);
+    // }
+    //
+    // return false;
+    // }
 
 }
-

Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/OidForServiceRequest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/OidForServiceRequest.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/OidForServiceRequest.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/OidForServiceRequest.java Tue May  3 06:33:43 2011
@@ -17,16 +17,15 @@
  *  under the License.
  */
 
-
 package org.apache.isis.runtimes.dflt.remoting.common.exchange;
 
 import java.io.IOException;
 
-import org.apache.isis.runtimes.dflt.remoting.common.facade.ServerFacade;
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.commons.encoding.DataInputExtended;
 import org.apache.isis.core.commons.encoding.DataOutputExtended;
 import org.apache.isis.core.commons.lang.ToString;
+import org.apache.isis.runtimes.dflt.remoting.common.facade.ServerFacade;
 
 public class OidForServiceRequest extends RequestAbstract {
     private static final long serialVersionUID = 1L;
@@ -40,11 +39,11 @@ public class OidForServiceRequest extend
     }
 
     public OidForServiceRequest(final AuthenticationSession session, final String id) {
-    	super(session);
-    	this.serviceId = id;
-    	initialized();
+        super(session);
+        this.serviceId = id;
+        initialized();
     }
-    
+
     public OidForServiceRequest(final DataInputExtended input) throws IOException {
         super(input);
         this.serviceId = input.readUTF();
@@ -52,31 +51,31 @@ public class OidForServiceRequest extend
     }
 
     @Override
-    public void encode(DataOutputExtended output)
-    		throws IOException {
-    	super.encode(output);
+    public void encode(final DataOutputExtended output) throws IOException {
+        super.encode(output);
         output.writeUTF(serviceId);
     }
 
-	private void initialized() {
-		// nothing to do
-	}
+    private void initialized() {
+        // nothing to do
+    }
 
-    /////////////////////////////////////////////////////////
+    // ///////////////////////////////////////////////////////
     // request data
-    /////////////////////////////////////////////////////////
+    // ///////////////////////////////////////////////////////
 
-	public String getServiceId() {
-		return serviceId;
-	}
-	
-    /////////////////////////////////////////////////////////
+    public String getServiceId() {
+        return serviceId;
+    }
+
+    // ///////////////////////////////////////////////////////
     // execute, response
-    /////////////////////////////////////////////////////////
+    // ///////////////////////////////////////////////////////
 
-	/**
-	 * {@link #setResponse(Object) Sets a response} of a simple {@link Boolean}.
-	 */
+    /**
+     * {@link #setResponse(Object) Sets a response} of a simple {@link Boolean}.
+     */
+    @Override
     public void execute(final ServerFacade serverFacade) {
         setResponse(serverFacade.oidForService(this));
     }
@@ -89,11 +88,10 @@ public class OidForServiceRequest extend
         return (OidForServiceResponse) super.getResponse();
     }
 
-    
-    /////////////////////////////////////////////////////////
+    // ///////////////////////////////////////////////////////
     // tostring
-    /////////////////////////////////////////////////////////
-    
+    // ///////////////////////////////////////////////////////
+
     @Override
     public String toString() {
         final ToString str = new ToString(this);
@@ -103,4 +101,3 @@ public class OidForServiceRequest extend
     }
 
 }
-

Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/OidForServiceResponse.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/OidForServiceResponse.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/OidForServiceResponse.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/OidForServiceResponse.java Tue May  3 06:33:43 2011
@@ -17,48 +17,47 @@
  *  under the License.
  */
 
+package org.apache.isis.runtimes.dflt.remoting.common.exchange;
 
-package org.apache.isis.runtimes.dflt.remoting.common.exchange;
-
 import java.io.IOException;
 import java.io.Serializable;
 
-import org.apache.isis.runtimes.dflt.remoting.common.data.common.IdentityData;
 import org.apache.isis.core.commons.encoding.DataInputExtended;
 import org.apache.isis.core.commons.encoding.DataOutputExtended;
 import org.apache.isis.core.commons.encoding.Encodable;
-
-public class OidForServiceResponse implements Encodable, Serializable {
-
-	private static final long serialVersionUID = 1L;
-	
-	private final IdentityData identityData;
-	
-	public OidForServiceResponse(IdentityData identityData) {
-		this.identityData = identityData;
-		instantiated();
-	}
-
-	public OidForServiceResponse(DataInputExtended input) throws IOException {
-		this.identityData = input.readEncodable(IdentityData.class);
-		instantiated();
-	}
-
-	public void encode(DataOutputExtended output) throws IOException {
-		output.writeEncodable(identityData);
-	}
-
-	private void instantiated() {
-		// nothing to do
-	}
-
-	
-	///////////////////////////////////////////
-	//
-	///////////////////////////////////////////
-
-	public IdentityData getOidData() {
-		return identityData;
-	}
-	
-}
+import org.apache.isis.runtimes.dflt.remoting.common.data.common.IdentityData;
+
+public class OidForServiceResponse implements Encodable, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private final IdentityData identityData;
+
+    public OidForServiceResponse(final IdentityData identityData) {
+        this.identityData = identityData;
+        instantiated();
+    }
+
+    public OidForServiceResponse(final DataInputExtended input) throws IOException {
+        this.identityData = input.readEncodable(IdentityData.class);
+        instantiated();
+    }
+
+    @Override
+    public void encode(final DataOutputExtended output) throws IOException {
+        output.writeEncodable(identityData);
+    }
+
+    private void instantiated() {
+        // nothing to do
+    }
+
+    // /////////////////////////////////////////
+    //
+    // /////////////////////////////////////////
+
+    public IdentityData getOidData() {
+        return identityData;
+    }
+
+}

Modified: incubator/isis/trunk/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/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/OpenSessionRequest.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/OpenSessionRequest.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/OpenSessionRequest.java Tue May  3 06:33:43 2011
@@ -17,19 +17,18 @@
  *  under the License.
  */
 
-
 package org.apache.isis.runtimes.dflt.remoting.common.exchange;
 
 import java.io.IOException;
 
-import org.apache.isis.runtimes.dflt.remoting.common.facade.ServerFacade;
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.commons.encoding.DataInputExtended;
 import org.apache.isis.core.commons.encoding.DataOutputExtended;
 import org.apache.isis.core.commons.lang.ToString;
+import org.apache.isis.runtimes.dflt.remoting.common.facade.ServerFacade;
 
 public class OpenSessionRequest extends RequestAbstract {
-	
+
     private static final long serialVersionUID = 1L;
     private final String username;
     private final String password;
@@ -49,40 +48,39 @@ public class OpenSessionRequest extends 
     }
 
     @Override
-	public void encode(final DataOutputExtended output) throws IOException {
-    	super.encode(output);
-    	output.writeUTF(username);
-    	output.writeUTF(password);
+    public void encode(final DataOutputExtended output) throws IOException {
+        super.encode(output);
+        output.writeUTF(username);
+        output.writeUTF(password);
     }
 
-	private void initialized() {
-		// nothing to do
-	}
+    private void initialized() {
+        // nothing to do
+    }
 
-	
-    /////////////////////////////////////////////////////////
+    // ///////////////////////////////////////////////////////
     // request data
-    /////////////////////////////////////////////////////////
+    // ///////////////////////////////////////////////////////
 
-	public String getUsername() {
-		return username;
-	}
-
-	public String getPassword() {
-		return password;
-	}
-	
-    /////////////////////////////////////////////////////////
-    // execute, response
-    /////////////////////////////////////////////////////////
+    public String getUsername() {
+        return username;
+    }
 
+    public String getPassword() {
+        return password;
+    }
 
-	/**
-	 * {@link #setResponse(Object) Sets a response} of an {@link AuthenticationSession}.
-	 */
+    // ///////////////////////////////////////////////////////
+    // execute, response
+    // ///////////////////////////////////////////////////////
+
+    /**
+     * {@link #setResponse(Object) Sets a response} of an {@link AuthenticationSession}.
+     */
+    @Override
     public void execute(final ServerFacade serverFacade) {
-        OpenSessionResponse response = serverFacade.openSession(this);
-		setResponse(response);
+        final OpenSessionResponse response = serverFacade.openSession(this);
+        setResponse(response);
     }
 
     /**
@@ -93,10 +91,9 @@ public class OpenSessionRequest extends 
         return (OpenSessionResponse) super.getResponse();
     }
 
-    
-    /////////////////////////////////////////////////////////
+    // ///////////////////////////////////////////////////////
     // toString
-    /////////////////////////////////////////////////////////
+    // ///////////////////////////////////////////////////////
 
     @Override
     public String toString() {
@@ -105,6 +102,4 @@ public class OpenSessionRequest extends 
         return str.toString();
     }
 
-
 }
-

Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/OpenSessionResponse.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/OpenSessionResponse.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/OpenSessionResponse.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/OpenSessionResponse.java Tue May  3 06:33:43 2011
@@ -17,9 +17,8 @@
  *  under the License.
  */
 
+package org.apache.isis.runtimes.dflt.remoting.common.exchange;
 
-package org.apache.isis.runtimes.dflt.remoting.common.exchange;
-
 import java.io.IOException;
 import java.io.Serializable;
 
@@ -27,38 +26,38 @@ import org.apache.isis.core.commons.auth
 import org.apache.isis.core.commons.encoding.DataInputExtended;
 import org.apache.isis.core.commons.encoding.DataOutputExtended;
 import org.apache.isis.core.commons.encoding.Encodable;
-
-public class OpenSessionResponse implements Encodable, Serializable {
-
-	private static final long serialVersionUID = 1L;
-	
-	private final AuthenticationSession session;
-	
-	public OpenSessionResponse(final AuthenticationSession session) {
-		this.session = session;
-		instantiated();
-	}
-
-	public OpenSessionResponse(DataInputExtended input) throws IOException {
-		this.session = input.readEncodable(AuthenticationSession.class);
-		instantiated();
-	}
-
-	public void encode(DataOutputExtended output) throws IOException {
-		output.writeEncodable(session);
-	}
-
-	private void instantiated() {
-		// nothing to do
-	}
-
-	
-	///////////////////////////////////////////
-	//
-	///////////////////////////////////////////
-	
-	public AuthenticationSession getSession() {
-		return session;
-	}
-	
-}
+
+public class OpenSessionResponse implements Encodable, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private final AuthenticationSession session;
+
+    public OpenSessionResponse(final AuthenticationSession session) {
+        this.session = session;
+        instantiated();
+    }
+
+    public OpenSessionResponse(final DataInputExtended input) throws IOException {
+        this.session = input.readEncodable(AuthenticationSession.class);
+        instantiated();
+    }
+
+    @Override
+    public void encode(final DataOutputExtended output) throws IOException {
+        output.writeEncodable(session);
+    }
+
+    private void instantiated() {
+        // nothing to do
+    }
+
+    // /////////////////////////////////////////
+    //
+    // /////////////////////////////////////////
+
+    public AuthenticationSession getSession() {
+        return session;
+    }
+
+}

Modified: incubator/isis/trunk/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/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/Request.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/Request.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/Request.java Tue May  3 06:33:43 2011
@@ -17,20 +17,20 @@
  *  under the License.
  */
 
-
 package org.apache.isis.runtimes.dflt.remoting.common.exchange;
 
 import java.util.UUID;
 
-import org.apache.isis.runtimes.dflt.remoting.common.facade.ServerFacade;
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.commons.encoding.Encodable;
+import org.apache.isis.runtimes.dflt.remoting.common.facade.ServerFacade;
 
 public interface Request extends Encodable {
 
     void execute(ServerFacade serverFacade);
 
     Object getResponse();
+
     void setResponse(Object response);
 
     /**

Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/RequestAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/RequestAbstract.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/RequestAbstract.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/RequestAbstract.java Tue May  3 06:33:43 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.runtimes.dflt.remoting.common.exchange;
 
 import java.io.IOException;
@@ -26,11 +25,9 @@ import org.apache.isis.core.commons.auth
 import org.apache.isis.core.commons.encoding.DataInputExtended;
 import org.apache.isis.core.commons.encoding.DataOutputExtended;
 
-
 public abstract class RequestAbstract implements Request {
-	
-	
-	private static int nextId = 0;
+
+    private static int nextId = 0;
     protected transient Object response;
     private final int id;
     protected final AuthenticationSession session;
@@ -47,32 +44,36 @@ public abstract class RequestAbstract im
         initialized();
     }
 
+    @Override
     public void encode(final DataOutputExtended output) throws IOException {
         output.writeInt(id);
         output.writeEncodable(session);
     }
 
-	private void initialized() {
-		// nothing to do
-	}
+    private void initialized() {
+        // nothing to do
+    }
 
-    /////////////////////////////////////////////////////////
+    // ///////////////////////////////////////////////////////
     //
-    /////////////////////////////////////////////////////////
-
+    // ///////////////////////////////////////////////////////
 
+    @Override
     public final void setResponse(final Object response) {
         this.response = response;
     }
 
+    @Override
     public Object getResponse() {
         return response;
     }
 
+    @Override
     public AuthenticationSession getSession() {
         return session;
     }
 
+    @Override
     public int getId() {
         return id;
     }

Modified: incubator/isis/trunk/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/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ResolveFieldRequest.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ResolveFieldRequest.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ResolveFieldRequest.java Tue May  3 06:33:43 2011
@@ -17,17 +17,16 @@
  *  under the License.
  */
 
-
 package org.apache.isis.runtimes.dflt.remoting.common.exchange;
 
 import java.io.IOException;
 
-import org.apache.isis.runtimes.dflt.remoting.common.data.common.IdentityData;
-import org.apache.isis.runtimes.dflt.remoting.common.facade.ServerFacade;
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.commons.encoding.DataInputExtended;
 import org.apache.isis.core.commons.encoding.DataOutputExtended;
 import org.apache.isis.core.commons.lang.ToString;
+import org.apache.isis.runtimes.dflt.remoting.common.data.common.IdentityData;
+import org.apache.isis.runtimes.dflt.remoting.common.facade.ServerFacade;
 
 public class ResolveFieldRequest extends RequestAbstract {
     private static final long serialVersionUID = 1L;
@@ -49,38 +48,39 @@ public class ResolveFieldRequest extends
     }
 
     @Override
-    public void encode(DataOutputExtended output)
-    		throws IOException {
-    	super.encode(output);
+    public void encode(final DataOutputExtended output) throws IOException {
+        super.encode(output);
         output.writeUTF(fieldIdentifier);
         output.writeEncodable(target);
     }
 
-	private void initialized() {
-		// nothing to do
-	}
+    private void initialized() {
+        // nothing to do
+    }
 
-    /////////////////////////////////////////////////////////
+    // ///////////////////////////////////////////////////////
     // request data
-    /////////////////////////////////////////////////////////
+    // ///////////////////////////////////////////////////////
 
-	public String getFieldIdentifier() {
-		return fieldIdentifier;
-	}
-	public IdentityData getTarget() {
-		return target;
-	}
-	
-    /////////////////////////////////////////////////////////
+    public String getFieldIdentifier() {
+        return fieldIdentifier;
+    }
+
+    public IdentityData getTarget() {
+        return target;
+    }
+
+    // ///////////////////////////////////////////////////////
     // execute, response
-    /////////////////////////////////////////////////////////
+    // ///////////////////////////////////////////////////////
 
-	/**
-	 * {@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) {
-        ResolveFieldResponse response = serverFacade.resolveField(this);
-		setResponse(response);
+        final ResolveFieldResponse response = serverFacade.resolveField(this);
+        setResponse(response);
     }
 
     /**
@@ -91,10 +91,9 @@ public class ResolveFieldRequest extends
         return (ResolveFieldResponse) super.getResponse();
     }
 
-    
-    /////////////////////////////////////////////////////////
+    // ///////////////////////////////////////////////////////
     // toString
-    /////////////////////////////////////////////////////////
+    // ///////////////////////////////////////////////////////
 
     @Override
     public String toString() {

Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ResolveFieldResponse.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ResolveFieldResponse.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ResolveFieldResponse.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ResolveFieldResponse.java Tue May  3 06:33:43 2011
@@ -17,49 +17,48 @@
  *  under the License.
  */
 
+package org.apache.isis.runtimes.dflt.remoting.common.exchange;
 
-package org.apache.isis.runtimes.dflt.remoting.common.exchange;
-
 import java.io.IOException;
 import java.io.Serializable;
 
-import org.apache.isis.runtimes.dflt.remoting.common.data.Data;
-import org.apache.isis.runtimes.dflt.remoting.common.data.common.ObjectData;
 import org.apache.isis.core.commons.encoding.DataInputExtended;
 import org.apache.isis.core.commons.encoding.DataOutputExtended;
 import org.apache.isis.core.commons.encoding.Encodable;
-
-public class ResolveFieldResponse implements Encodable, Serializable {
-
-	private static final long serialVersionUID = 1L;
-	
-	private final Data data;
-	
-	public ResolveFieldResponse(Data data) {
-		this.data = data;
-		instantiated();
-	}
-
-	public ResolveFieldResponse(DataInputExtended input) throws IOException {
-		this.data = input.readEncodable(ObjectData.class);
-		instantiated();
-	}
-
-	public void encode(DataOutputExtended output) throws IOException {
-		output.writeEncodable(data);
-	}
-
-	private void instantiated() {
-		// nothing to do
-	}
-
-	
-	///////////////////////////////////////////
-	//
-	///////////////////////////////////////////
-
-	public Data getData() {
-		return data;
-	}
-	
-}
+import org.apache.isis.runtimes.dflt.remoting.common.data.Data;
+import org.apache.isis.runtimes.dflt.remoting.common.data.common.ObjectData;
+
+public class ResolveFieldResponse implements Encodable, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private final Data data;
+
+    public ResolveFieldResponse(final Data data) {
+        this.data = data;
+        instantiated();
+    }
+
+    public ResolveFieldResponse(final DataInputExtended input) throws IOException {
+        this.data = input.readEncodable(ObjectData.class);
+        instantiated();
+    }
+
+    @Override
+    public void encode(final DataOutputExtended output) throws IOException {
+        output.writeEncodable(data);
+    }
+
+    private void instantiated() {
+        // nothing to do
+    }
+
+    // /////////////////////////////////////////
+    //
+    // /////////////////////////////////////////
+
+    public Data getData() {
+        return data;
+    }
+
+}

Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ResolveObjectRequest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ResolveObjectRequest.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ResolveObjectRequest.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ResolveObjectRequest.java Tue May  3 06:33:43 2011
@@ -17,18 +17,17 @@
  *  under the License.
  */
 
-
 package org.apache.isis.runtimes.dflt.remoting.common.exchange;
 
 import java.io.IOException;
 
-import org.apache.isis.runtimes.dflt.remoting.common.data.common.IdentityData;
-import org.apache.isis.runtimes.dflt.remoting.common.data.common.ObjectData;
-import org.apache.isis.runtimes.dflt.remoting.common.facade.ServerFacade;
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.commons.encoding.DataInputExtended;
 import org.apache.isis.core.commons.encoding.DataOutputExtended;
 import org.apache.isis.core.commons.lang.ToString;
+import org.apache.isis.runtimes.dflt.remoting.common.data.common.IdentityData;
+import org.apache.isis.runtimes.dflt.remoting.common.data.common.ObjectData;
+import org.apache.isis.runtimes.dflt.remoting.common.facade.ServerFacade;
 
 public class ResolveObjectRequest extends RequestAbstract {
     private static final long serialVersionUID = 1L;
@@ -47,34 +46,34 @@ public class ResolveObjectRequest extend
     }
 
     @Override
-    public void encode(DataOutputExtended output)
-    		throws IOException {
-    	super.encode(output);
+    public void encode(final DataOutputExtended output) throws IOException {
+        super.encode(output);
         output.writeEncodable(target);
     }
 
-	private void initialized() {
-		// nothing to do
-	}
+    private void initialized() {
+        // nothing to do
+    }
 
-    /////////////////////////////////////////////////////////
+    // ///////////////////////////////////////////////////////
     // request data
-    /////////////////////////////////////////////////////////
+    // ///////////////////////////////////////////////////////
+
+    public IdentityData getTarget() {
+        return target;
+    }
 
-	public IdentityData getTarget() {
-		return target;
-	}
-	
-    /////////////////////////////////////////////////////////
+    // ///////////////////////////////////////////////////////
     // execute, response
-    /////////////////////////////////////////////////////////
+    // ///////////////////////////////////////////////////////
 
-	/**
-	 * {@link #setResponse(Object) Sets a response} of an {@link ObjectData}.
-	 */
+    /**
+     * {@link #setResponse(Object) Sets a response} of an {@link ObjectData}.
+     */
+    @Override
     public void execute(final ServerFacade serverFacade) {
-        ResolveObjectResponse response = serverFacade.resolveImmediately(this);
-		setResponse(response);
+        final ResolveObjectResponse response = serverFacade.resolveImmediately(this);
+        setResponse(response);
     }
 
     /**
@@ -85,10 +84,9 @@ public class ResolveObjectRequest extend
         return (ResolveObjectResponse) super.getResponse();
     }
 
-
-    /////////////////////////////////////////////////////////
+    // ///////////////////////////////////////////////////////
     // toString
-    /////////////////////////////////////////////////////////
+    // ///////////////////////////////////////////////////////
 
     @Override
     public String toString() {

Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ResolveObjectResponse.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ResolveObjectResponse.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ResolveObjectResponse.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ResolveObjectResponse.java Tue May  3 06:33:43 2011
@@ -17,48 +17,47 @@
  *  under the License.
  */
 
+package org.apache.isis.runtimes.dflt.remoting.common.exchange;
 
-package org.apache.isis.runtimes.dflt.remoting.common.exchange;
-
 import java.io.IOException;
 import java.io.Serializable;
 
-import org.apache.isis.runtimes.dflt.remoting.common.data.common.ObjectData;
 import org.apache.isis.core.commons.encoding.DataInputExtended;
 import org.apache.isis.core.commons.encoding.DataOutputExtended;
 import org.apache.isis.core.commons.encoding.Encodable;
-
-public class ResolveObjectResponse implements Encodable, Serializable {
-
-	private static final long serialVersionUID = 1L;
-	
-	private final ObjectData objectData;
-	
-	public ResolveObjectResponse(ObjectData objectData) {
-		this.objectData = objectData;
-		instantiated();
-	}
-
-	public ResolveObjectResponse(DataInputExtended input) throws IOException {
-		this.objectData = input.readEncodable(ObjectData.class);
-		instantiated();
-	}
-
-	public void encode(DataOutputExtended output) throws IOException {
-		output.writeEncodable(objectData);
-	}
-
-	private void instantiated() {
-		// nothing to do
-	}
-
-	
-	///////////////////////////////////////////
-	//
-	///////////////////////////////////////////
-
-	public ObjectData getObjectData() {
-		return objectData;
-	}
-	
-}
+import org.apache.isis.runtimes.dflt.remoting.common.data.common.ObjectData;
+
+public class ResolveObjectResponse implements Encodable, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private final ObjectData objectData;
+
+    public ResolveObjectResponse(final ObjectData objectData) {
+        this.objectData = objectData;
+        instantiated();
+    }
+
+    public ResolveObjectResponse(final DataInputExtended input) throws IOException {
+        this.objectData = input.readEncodable(ObjectData.class);
+        instantiated();
+    }
+
+    @Override
+    public void encode(final DataOutputExtended output) throws IOException {
+        output.writeEncodable(objectData);
+    }
+
+    private void instantiated() {
+        // nothing to do
+    }
+
+    // /////////////////////////////////////////
+    //
+    // /////////////////////////////////////////
+
+    public ObjectData getObjectData() {
+        return objectData;
+    }
+
+}

Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ResponseEnvelope.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ResponseEnvelope.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ResponseEnvelope.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ResponseEnvelope.java Tue May  3 06:33:43 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.runtimes.dflt.remoting.common.exchange;
 
 import java.io.IOException;
@@ -29,9 +28,9 @@ import org.apache.isis.core.commons.enco
 import org.apache.isis.core.commons.lang.ToString;
 
 public class ResponseEnvelope implements Encodable, Serializable {
-	
+
     private static final long serialVersionUID = 1L;
-    
+
     private final int id;
     private final Object object;
 
@@ -46,35 +45,36 @@ public class ResponseEnvelope implements
     }
 
     public ResponseEnvelope(final DataInputExtended input) throws IOException {
-    	this.id = input.readInt();
-    	this.object = input.readEncodable(Object.class);
-    	initialized();
+        this.id = input.readInt();
+        this.object = input.readEncodable(Object.class);
+        initialized();
     }
-    
+
+    @Override
     public void encode(final DataOutputExtended output) throws IOException {
         output.writeInt(id);
         output.writeEncodable(object);
     }
 
-	private void initialized() {
-		// nothing to do
-	}
+    private void initialized() {
+        // nothing to do
+    }
 
-    /////////////////////////////////////////////////////////
+    // ///////////////////////////////////////////////////////
     //
-    /////////////////////////////////////////////////////////
+    // ///////////////////////////////////////////////////////
 
     public int getId() {
         return id;
     }
 
     public Object getObject() {
-    	return object;
+        return object;
     }
-    
-    /////////////////////////////////////////////////////////
+
+    // ///////////////////////////////////////////////////////
     // toString
-    /////////////////////////////////////////////////////////
+    // ///////////////////////////////////////////////////////
 
     @Override
     public String toString() {

Modified: incubator/isis/trunk/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/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/SetAssociationRequest.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/SetAssociationRequest.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/SetAssociationRequest.java Tue May  3 06:33:43 2011
@@ -17,30 +17,26 @@
  *  under the License.
  */
 
-
 package org.apache.isis.runtimes.dflt.remoting.common.exchange;
 
 import java.io.IOException;
 
-import org.apache.isis.runtimes.dflt.remoting.common.data.common.IdentityData;
-import org.apache.isis.runtimes.dflt.remoting.common.facade.ServerFacade;
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.commons.encoding.DataInputExtended;
 import org.apache.isis.core.commons.encoding.DataOutputExtended;
+import org.apache.isis.runtimes.dflt.remoting.common.data.common.IdentityData;
+import org.apache.isis.runtimes.dflt.remoting.common.facade.ServerFacade;
 
 public class SetAssociationRequest extends RequestAbstract {
-	
+
     private static final long serialVersionUID = 1L;
-    
+
     private final String fieldIdentifier;
     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;
@@ -57,45 +53,44 @@ public class SetAssociationRequest exten
     }
 
     @Override
-    public void encode(DataOutputExtended output)
-    		throws IOException {
-    	super.encode(output);
+    public void encode(final DataOutputExtended output) throws IOException {
+        super.encode(output);
         output.writeUTF(fieldIdentifier);
         output.writeEncodable(target);
         output.writeEncodable(associate);
     }
 
-	private void initialized() {
-		// nothing to do
-	}
+    private void initialized() {
+        // nothing to do
+    }
 
-	
-    /////////////////////////////////////////////////////////
+    // ///////////////////////////////////////////////////////
     // request data
-    /////////////////////////////////////////////////////////
+    // ///////////////////////////////////////////////////////
 
-	public String getFieldIdentifier() {
-		return fieldIdentifier;
-	}
-	
-	public IdentityData getTarget() {
-		return target;
-	}
-	
-	public IdentityData getAssociate() {
-		return associate;
-	}
-	
-    /////////////////////////////////////////////////////////
+    public String getFieldIdentifier() {
+        return fieldIdentifier;
+    }
+
+    public IdentityData getTarget() {
+        return target;
+    }
+
+    public IdentityData getAssociate() {
+        return associate;
+    }
+
+    // ///////////////////////////////////////////////////////
     // execute, response
-    /////////////////////////////////////////////////////////
+    // ///////////////////////////////////////////////////////
 
-	/**
-	 * {@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) {
-        SetAssociationResponse response = serverFacade.setAssociation(this);
-		setResponse(response);
+        final SetAssociationResponse response = serverFacade.setAssociation(this);
+        setResponse(response);
     }
 
     /**

Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/SetAssociationResponse.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/SetAssociationResponse.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/SetAssociationResponse.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/SetAssociationResponse.java Tue May  3 06:33:43 2011
@@ -17,48 +17,47 @@
  *  under the License.
  */
 
+package org.apache.isis.runtimes.dflt.remoting.common.exchange;
 
-package org.apache.isis.runtimes.dflt.remoting.common.exchange;
-
 import java.io.IOException;
 import java.io.Serializable;
 
-import org.apache.isis.runtimes.dflt.remoting.common.data.common.ObjectData;
 import org.apache.isis.core.commons.encoding.DataInputExtended;
 import org.apache.isis.core.commons.encoding.DataOutputExtended;
 import org.apache.isis.core.commons.encoding.Encodable;
-
-public class SetAssociationResponse implements Encodable, Serializable {
-
-	private static final long serialVersionUID = 1L;
-	
-	private final ObjectData[] updates;
-	
-	public SetAssociationResponse(ObjectData[] updates) {
-		this.updates = updates;
-		instantiated();
-	}
-
-	public SetAssociationResponse(DataInputExtended input) throws IOException {
-		this.updates = input.readEncodables(ObjectData.class);
-		instantiated();
-	}
-
-	public void encode(DataOutputExtended output) throws IOException {
-		output.writeEncodables(updates);
-	}
-
-	private void instantiated() {
-		// nothing to do
-	}
-
-	
-	///////////////////////////////////////////
-	//
-	///////////////////////////////////////////
-
-	public ObjectData[] getUpdates() {
-		return updates;
-	}
-	
-}
+import org.apache.isis.runtimes.dflt.remoting.common.data.common.ObjectData;
+
+public class SetAssociationResponse implements Encodable, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private final ObjectData[] updates;
+
+    public SetAssociationResponse(final ObjectData[] updates) {
+        this.updates = updates;
+        instantiated();
+    }
+
+    public SetAssociationResponse(final DataInputExtended input) throws IOException {
+        this.updates = input.readEncodables(ObjectData.class);
+        instantiated();
+    }
+
+    @Override
+    public void encode(final DataOutputExtended output) throws IOException {
+        output.writeEncodables(updates);
+    }
+
+    private void instantiated() {
+        // nothing to do
+    }
+
+    // /////////////////////////////////////////
+    //
+    // /////////////////////////////////////////
+
+    public ObjectData[] getUpdates() {
+        return updates;
+    }
+
+}

Modified: incubator/isis/trunk/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/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/SetValueRequest.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/SetValueRequest.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/SetValueRequest.java Tue May  3 06:33:43 2011
@@ -17,17 +17,16 @@
  *  under the License.
  */
 
-
 package org.apache.isis.runtimes.dflt.remoting.common.exchange;
 
 import java.io.IOException;
 
-import org.apache.isis.runtimes.dflt.remoting.common.data.common.EncodableObjectData;
-import org.apache.isis.runtimes.dflt.remoting.common.data.common.IdentityData;
-import org.apache.isis.runtimes.dflt.remoting.common.facade.ServerFacade;
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.commons.encoding.DataInputExtended;
 import org.apache.isis.core.commons.encoding.DataOutputExtended;
+import org.apache.isis.runtimes.dflt.remoting.common.data.common.EncodableObjectData;
+import org.apache.isis.runtimes.dflt.remoting.common.data.common.IdentityData;
+import org.apache.isis.runtimes.dflt.remoting.common.facade.ServerFacade;
 
 public class SetValueRequest extends RequestAbstract {
     private static final long serialVersionUID = 1L;
@@ -35,11 +34,8 @@ 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;
@@ -52,49 +48,49 @@ public class SetValueRequest extends Req
         fieldIdentifier = input.readUTF();
         target = input.readEncodable(IdentityData.class);
         value = input.readEncodable(EncodableObjectData.class);
-        initialized();        
+        initialized();
     }
 
     @Override
-    public void encode(DataOutputExtended output)
-    		throws IOException {
-    	super.encode(output);
-    	
+    public void encode(final DataOutputExtended output) throws IOException {
+        super.encode(output);
+
         output.writeUTF(fieldIdentifier);
         output.writeEncodable(target);
         output.writeEncodable(value);
     }
 
-	private void initialized() {
-		// nothing to do
-	}
+    private void initialized() {
+        // nothing to do
+    }
 
-    /////////////////////////////////////////////////////////
+    // ///////////////////////////////////////////////////////
     // request data
-    /////////////////////////////////////////////////////////
+    // ///////////////////////////////////////////////////////
 
-	public String getFieldIdentifier() {
-		return fieldIdentifier;
-	}
-	
-	public IdentityData getTarget() {
-		return target;
-	}
-	
-	public EncodableObjectData getValue() {
-		return value;
-	}
-	
-    /////////////////////////////////////////////////////////
+    public String getFieldIdentifier() {
+        return fieldIdentifier;
+    }
+
+    public IdentityData getTarget() {
+        return target;
+    }
+
+    public EncodableObjectData getValue() {
+        return value;
+    }
+
+    // ///////////////////////////////////////////////////////
     // execute, response
-    /////////////////////////////////////////////////////////
+    // ///////////////////////////////////////////////////////
 
-	/**
-	 * {@link #setResponse(Object) Sets a response} of {@link SetValueResponse}
-	 */
+    /**
+     * {@link #setResponse(Object) Sets a response} of {@link SetValueResponse}
+     */
+    @Override
     public void execute(final ServerFacade serverFacade) {
-        SetValueResponse response = serverFacade.setValue(this);
-		setResponse(response);
+        final SetValueResponse response = serverFacade.setValue(this);
+        setResponse(response);
     }
 
     /**
@@ -104,5 +100,5 @@ public class SetValueRequest extends Req
     public SetValueResponse getResponse() {
         return (SetValueResponse) super.getResponse();
     }
-    
+
 }

Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/SetValueResponse.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/SetValueResponse.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/SetValueResponse.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/SetValueResponse.java Tue May  3 06:33:43 2011
@@ -17,48 +17,47 @@
  *  under the License.
  */
 
+package org.apache.isis.runtimes.dflt.remoting.common.exchange;
 
-package org.apache.isis.runtimes.dflt.remoting.common.exchange;
-
 import java.io.IOException;
 import java.io.Serializable;
 
-import org.apache.isis.runtimes.dflt.remoting.common.data.common.ObjectData;
 import org.apache.isis.core.commons.encoding.DataInputExtended;
 import org.apache.isis.core.commons.encoding.DataOutputExtended;
 import org.apache.isis.core.commons.encoding.Encodable;
-
-public class SetValueResponse implements Encodable, Serializable {
-
-	private static final long serialVersionUID = 1L;
-	
-	private final ObjectData[] updates;
-	
-	public SetValueResponse(ObjectData[] updates) {
-		this.updates = updates;
-		instantiated();
-	}
-
-	public SetValueResponse(DataInputExtended input) throws IOException {
-		this.updates = input.readEncodables(ObjectData.class);
-		instantiated();
-	}
-
-	public void encode(DataOutputExtended output) throws IOException {
-		output.writeEncodables(updates);
-	}
-
-	private void instantiated() {
-		// nothing to do
-	}
-
-	
-	///////////////////////////////////////////
-	//
-	///////////////////////////////////////////
-
-	public ObjectData[] getUpdates() {
-		return updates;
-	}
-	
-}
+import org.apache.isis.runtimes.dflt.remoting.common.data.common.ObjectData;
+
+public class SetValueResponse implements Encodable, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private final ObjectData[] updates;
+
+    public SetValueResponse(final ObjectData[] updates) {
+        this.updates = updates;
+        instantiated();
+    }
+
+    public SetValueResponse(final DataInputExtended input) throws IOException {
+        this.updates = input.readEncodables(ObjectData.class);
+        instantiated();
+    }
+
+    @Override
+    public void encode(final DataOutputExtended output) throws IOException {
+        output.writeEncodables(updates);
+    }
+
+    private void instantiated() {
+        // nothing to do
+    }
+
+    // /////////////////////////////////////////
+    //
+    // /////////////////////////////////////////
+
+    public ObjectData[] getUpdates() {
+        return updates;
+    }
+
+}

Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/facade/ServerFacade.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/facade/ServerFacade.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/facade/ServerFacade.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/facade/ServerFacade.java Tue May  3 06:33:43 2011
@@ -17,10 +17,9 @@
  *  under the License.
  */
 
-
 package org.apache.isis.runtimes.dflt.remoting.common.facade;
 
-
+import org.apache.isis.core.commons.components.ApplicationScopedComponent;
 import org.apache.isis.runtimes.dflt.remoting.common.exchange.AuthorizationRequestUsability;
 import org.apache.isis.runtimes.dflt.remoting.common.exchange.AuthorizationRequestVisibility;
 import org.apache.isis.runtimes.dflt.remoting.common.exchange.AuthorizationResponse;
@@ -54,60 +53,57 @@ import org.apache.isis.runtimes.dflt.rem
 import org.apache.isis.runtimes.dflt.remoting.common.exchange.SetAssociationResponse;
 import org.apache.isis.runtimes.dflt.remoting.common.exchange.SetValueRequest;
 import org.apache.isis.runtimes.dflt.remoting.common.exchange.SetValueResponse;
-import org.apache.isis.core.commons.components.ApplicationScopedComponent;
-
 
 /**
  * previously called <tt>Distribution</tt>.
  */
 public interface ServerFacade extends ApplicationScopedComponent {
 
-	///////////////////////////////////////////////////////////////////////
-	// Authentication
-	///////////////////////////////////////////////////////////////////////
+    // /////////////////////////////////////////////////////////////////////
+    // Authentication
+    // /////////////////////////////////////////////////////////////////////
 
     OpenSessionResponse openSession(OpenSessionRequest request);
+
     CloseSessionResponse closeSession(CloseSessionRequest request);
 
-    
-	///////////////////////////////////////////////////////////////////////
-	// Authorization
-	///////////////////////////////////////////////////////////////////////
-
-    AuthorizationResponse authorizeUsability(
-    		AuthorizationRequestUsability request);
-    AuthorizationResponse authorizeVisibility(
-    		AuthorizationRequestVisibility request);
-
-	///////////////////////////////////////////////////////////////////////
-	// Misc
-	///////////////////////////////////////////////////////////////////////
+    // /////////////////////////////////////////////////////////////////////
+    // Authorization
+    // /////////////////////////////////////////////////////////////////////
+
+    AuthorizationResponse authorizeUsability(AuthorizationRequestUsability request);
+
+    AuthorizationResponse authorizeVisibility(AuthorizationRequestVisibility request);
+
+    // /////////////////////////////////////////////////////////////////////
+    // Misc
+    // /////////////////////////////////////////////////////////////////////
 
     GetPropertiesResponse getProperties(GetPropertiesRequest request);
-    
-	///////////////////////////////////////////////////////////////////////
-	// Associations (Properties and Collections)
-	///////////////////////////////////////////////////////////////////////
+
+    // /////////////////////////////////////////////////////////////////////
+    // Associations (Properties and Collections)
+    // /////////////////////////////////////////////////////////////////////
 
     SetAssociationResponse setAssociation(SetAssociationRequest request);
+
     ClearAssociationResponse clearAssociation(ClearAssociationRequest request);
 
     SetValueResponse setValue(SetValueRequest request);
+
     ClearValueResponse clearValue(ClearValueRequest request);
-    
-	///////////////////////////////////////////////////////////////////////
-	// Actions
-	///////////////////////////////////////////////////////////////////////
-
-    ExecuteClientActionResponse executeClientAction(
-    		ExecuteClientActionRequest request);
-
-    ExecuteServerActionResponse executeServerAction(
-            ExecuteServerActionRequest request);
-    
-	///////////////////////////////////////////////////////////////////////
-	// getObject, resolve
-	///////////////////////////////////////////////////////////////////////
+
+    // /////////////////////////////////////////////////////////////////////
+    // Actions
+    // /////////////////////////////////////////////////////////////////////
+
+    ExecuteClientActionResponse executeClientAction(ExecuteClientActionRequest request);
+
+    ExecuteServerActionResponse executeServerAction(ExecuteServerActionRequest request);
+
+    // /////////////////////////////////////////////////////////////////////
+    // getObject, resolve
+    // /////////////////////////////////////////////////////////////////////
 
     OidForServiceResponse oidForService(OidForServiceRequest request);
 
@@ -116,11 +112,10 @@ public interface ServerFacade extends Ap
     ResolveObjectResponse resolveImmediately(ResolveObjectRequest request);
 
     ResolveFieldResponse resolveField(ResolveFieldRequest request);
-    
-    
-	///////////////////////////////////////////////////////////////////////
-	// findInstances, hasInstances
-	///////////////////////////////////////////////////////////////////////
+
+    // /////////////////////////////////////////////////////////////////////
+    // findInstances, hasInstances
+    // /////////////////////////////////////////////////////////////////////
 
     FindInstancesResponse findInstances(FindInstancesRequest request);
 

Modified: incubator/isis/trunk/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/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/facade/ServerFacadeLogger.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/facade/ServerFacadeLogger.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/facade/ServerFacadeLogger.java Tue May  3 06:33:43 2011
@@ -24,6 +24,13 @@ import java.util.List;
 import java.util.Properties;
 import java.util.Vector;
 
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.version.Version;
+import org.apache.isis.core.metamodel.spec.ActionType;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.runtime.logging.Logger;
 import org.apache.isis.runtimes.dflt.remoting.common.client.transaction.ClientTransactionEvent;
 import org.apache.isis.runtimes.dflt.remoting.common.data.Data;
 import org.apache.isis.runtimes.dflt.remoting.common.data.common.CollectionData;
@@ -67,13 +74,6 @@ import org.apache.isis.runtimes.dflt.rem
 import org.apache.isis.runtimes.dflt.remoting.common.exchange.SetValueRequest;
 import org.apache.isis.runtimes.dflt.remoting.common.exchange.SetValueResponse;
 import org.apache.isis.runtimes.dflt.remoting.common.protocol.ObjectEncoderDecoder;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.adapter.oid.Oid;
-import org.apache.isis.core.metamodel.adapter.version.Version;
-import org.apache.isis.core.metamodel.spec.ActionType;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.core.runtime.logging.Logger;
 import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
 
 import com.google.inject.internal.Lists;
@@ -122,19 +122,19 @@ public class ServerFacadeLogger extends 
     // ////////////////////////////////////////////////////////////////
 
     @Override
-    public OpenSessionResponse openSession(OpenSessionRequest request) {
+    public OpenSessionResponse openSession(final OpenSessionRequest request) {
         log("authenticate");
         return decorated.openSession(request);
     }
 
     @Override
-    public AuthorizationResponse authorizeUsability(AuthorizationRequestUsability request) {
+    public AuthorizationResponse authorizeUsability(final AuthorizationRequestUsability request) {
         log("authoriseUsability");
         return decorated.authorizeUsability(request);
     }
 
     @Override
-    public AuthorizationResponse authorizeVisibility(AuthorizationRequestVisibility request) {
+    public AuthorizationResponse authorizeVisibility(final AuthorizationRequestVisibility request) {
         log("authoriseVisibility");
         return decorated.authorizeVisibility(request);
     }
@@ -144,10 +144,10 @@ public class ServerFacadeLogger extends 
     // ////////////////////////////////////////////////////////////////
 
     @Override
-    public CloseSessionResponse closeSession(CloseSessionRequest request) {
-        AuthenticationSession session = request.getSession();
+    public CloseSessionResponse closeSession(final CloseSessionRequest request) {
+        final AuthenticationSession session = request.getSession();
         log("close session " + session);
-        CloseSessionResponse response = decorated.closeSession(request);
+        final CloseSessionResponse response = decorated.closeSession(request);
         return response;
     }
 
@@ -156,15 +156,15 @@ public class ServerFacadeLogger extends 
     // ////////////////////////////////////////////////////////////////
 
     @Override
-    public SetAssociationResponse setAssociation(SetAssociationRequest request) {
+    public SetAssociationResponse setAssociation(final SetAssociationRequest request) {
 
-        String fieldIdentifier = request.getFieldIdentifier();
-        IdentityData targetData = request.getTarget();
-        IdentityData associateData = request.getAssociate();
+        final String fieldIdentifier = request.getFieldIdentifier();
+        final IdentityData targetData = request.getTarget();
+        final IdentityData associateData = request.getAssociate();
 
         log("set association " + fieldIdentifier + indentedNewLine() + "target: " + dump(targetData)
             + indentedNewLine() + "associate: " + dump(associateData));
-        SetAssociationResponse response = decorated.setAssociation(request);
+        final SetAssociationResponse response = decorated.setAssociation(request);
         final ObjectData[] changes = response.getUpdates();
         log("  <-- changes: " + dump(changes));
         return response;
@@ -173,13 +173,13 @@ public class ServerFacadeLogger extends 
     @Override
     public SetValueResponse setValue(final SetValueRequest request) {
 
-        String fieldIdentifier = request.getFieldIdentifier();
-        IdentityData target = request.getTarget();
-        EncodableObjectData value = request.getValue();
+        final String fieldIdentifier = request.getFieldIdentifier();
+        final IdentityData target = request.getTarget();
+        final EncodableObjectData value = request.getValue();
 
         log("set value " + fieldIdentifier + indentedNewLine() + "target: " + dump(target) + indentedNewLine()
             + "value: " + value);
-        SetValueResponse response = decorated.setValue(request);
+        final SetValueResponse response = decorated.setValue(request);
         final ObjectData[] updates = response.getUpdates();
         log("  <-- changes: " + dump(updates));
         return response;
@@ -187,13 +187,13 @@ public class ServerFacadeLogger extends 
 
     @Override
     public ClearAssociationResponse clearAssociation(final ClearAssociationRequest request) {
-        String fieldIdentifier = request.getFieldIdentifier();
-        IdentityData target = request.getTarget();
-        IdentityData associate = request.getAssociate();
+        final String fieldIdentifier = request.getFieldIdentifier();
+        final IdentityData target = request.getTarget();
+        final IdentityData associate = request.getAssociate();
 
         log("clear association " + fieldIdentifier + indentedNewLine() + "target: " + dump(target) + indentedNewLine()
             + "associate: " + dump(associate));
-        ClearAssociationResponse response = decorated.clearAssociation(request);
+        final ClearAssociationResponse response = decorated.clearAssociation(request);
         final ObjectData[] updates = response.getUpdates();
         log("  <-- changes: " + dump(updates));
         return response;
@@ -202,11 +202,11 @@ public class ServerFacadeLogger extends 
     @Override
     public ClearValueResponse clearValue(final ClearValueRequest request) {
 
-        String fieldIdentifier = request.getFieldIdentifier();
-        IdentityData target = request.getTarget();
+        final String fieldIdentifier = request.getFieldIdentifier();
+        final IdentityData target = request.getTarget();
 
         log("clear value " + fieldIdentifier + indentedNewLine() + "target: " + dump(target));
-        ClearValueResponse response = decorated.clearValue(request);
+        final ClearValueResponse response = decorated.clearValue(request);
         final ObjectData[] updates = response.getUpdates();
         log("  <-- changes: " + dump(updates));
         return response;
@@ -219,10 +219,10 @@ public class ServerFacadeLogger extends 
     @Override
     public ExecuteServerActionResponse executeServerAction(final ExecuteServerActionRequest request) {
 
-        ActionType actionType = request.getActionType();
-        String actionIdentifier = request.getActionIdentifier();
-        ReferenceData target = request.getTarget();
-        Data[] parameters = request.getParameters();
+        final ActionType actionType = request.getActionType();
+        final String actionIdentifier = request.getActionIdentifier();
+        final ReferenceData target = request.getTarget();
+        final Data[] parameters = request.getParameters();
 
         log("execute action " + actionIdentifier + "/" + actionType + indentedNewLine() + "target: " + dump(target)
             + indentedNewLine() + "parameters: " + dump(parameters));
@@ -242,10 +242,10 @@ public class ServerFacadeLogger extends 
     }
 
     @Override
-    public ExecuteClientActionResponse executeClientAction(ExecuteClientActionRequest request) {
+    public ExecuteClientActionResponse executeClientAction(final ExecuteClientActionRequest request) {
 
-        ReferenceData[] data = request.getData();
-        int[] types = request.getTypes();
+        final ReferenceData[] data = request.getData();
+        final int[] types = request.getTypes();
 
         List<Data> complete = Lists.newArrayList();
         StringBuilder str = new StringBuilder();
@@ -303,37 +303,37 @@ public class ServerFacadeLogger extends 
     // ////////////////////////////////////////////////////////////////
 
     @Override
-    public GetObjectResponse getObject(GetObjectRequest request) {
+    public GetObjectResponse getObject(final GetObjectRequest request) {
 
-        Oid oid = request.getOid();
+        final Oid oid = request.getOid();
 
         log("get object " + oid);
-        GetObjectResponse response = decorated.getObject(request);
+        final GetObjectResponse response = decorated.getObject(request);
         final ObjectData data = response.getObjectData();
         log(" <-- data: " + data);
         return response;
     }
 
     @Override
-    public ResolveFieldResponse resolveField(ResolveFieldRequest request) {
+    public ResolveFieldResponse resolveField(final ResolveFieldRequest request) {
 
-        IdentityData target = request.getTarget();
-        String fieldIdentifier = request.getFieldIdentifier();
+        final IdentityData target = request.getTarget();
+        final String fieldIdentifier = request.getFieldIdentifier();
 
         log("resolve field " + fieldIdentifier + " - " + dump(target));
-        ResolveFieldResponse response = decorated.resolveField(request);
+        final ResolveFieldResponse response = decorated.resolveField(request);
         final Data result = response.getData();
         log(" <-- data: " + dump(result));
         return response;
     }
 
     @Override
-    public ResolveObjectResponse resolveImmediately(ResolveObjectRequest request) {
+    public ResolveObjectResponse resolveImmediately(final ResolveObjectRequest request) {
 
-        IdentityData target = request.getTarget();
+        final IdentityData target = request.getTarget();
 
         log("resolve immediately" + dump(target));
-        ResolveObjectResponse response = decorated.resolveImmediately(request);
+        final ResolveObjectResponse response = decorated.resolveImmediately(request);
         final ObjectData objectData = response.getObjectData();
         log("  <-- data: " + dump(objectData));
         return response;
@@ -344,24 +344,24 @@ public class ServerFacadeLogger extends 
     // ////////////////////////////////////////////////////////////////
 
     @Override
-    public FindInstancesResponse findInstances(FindInstancesRequest request) {
+    public FindInstancesResponse findInstances(final FindInstancesRequest request) {
 
-        PersistenceQueryData criteria = request.getCriteria();
+        final PersistenceQueryData criteria = request.getCriteria();
 
         log("find instances " + criteria);
-        FindInstancesResponse response = decorated.findInstances(request);
+        final FindInstancesResponse response = decorated.findInstances(request);
         final ObjectData[] instances = response.getInstances();
         log(" <-- instances: " + dump(instances));
         return response;
     }
 
     @Override
-    public HasInstancesResponse hasInstances(HasInstancesRequest request) {
+    public HasInstancesResponse hasInstances(final HasInstancesRequest request) {
 
-        String specificationName = request.getSpecificationName();
+        final String specificationName = request.getSpecificationName();
 
         log("has instances " + specificationName);
-        HasInstancesResponse response = decorated.hasInstances(request);
+        final HasInstancesResponse response = decorated.hasInstances(request);
         final boolean hasInstances = response.hasInstances();
         log(" <-- instances: " + (hasInstances ? "yes" : "no"));
         return response;
@@ -372,9 +372,9 @@ public class ServerFacadeLogger extends 
     // ////////////////////////////////////////////////////////////////
 
     @Override
-    public GetPropertiesResponse getProperties(GetPropertiesRequest request) {
+    public GetPropertiesResponse getProperties(final GetPropertiesRequest request) {
         log("get properties");
-        GetPropertiesResponse response = decorated.getProperties(request);
+        final GetPropertiesResponse response = decorated.getProperties(request);
         final Properties properties = response.getProperties();
         log(" <-- data: " + properties);
         return response;
@@ -385,13 +385,13 @@ public class ServerFacadeLogger extends 
     // ////////////////////////////////////////////////////////////////
 
     @Override
-    public OidForServiceResponse oidForService(OidForServiceRequest request) {
+    public OidForServiceResponse oidForService(final OidForServiceRequest request) {
 
-        String serviceId = request.getServiceId();
+        final String serviceId = request.getServiceId();
 
         log("oid for resource " + serviceId);
 
-        OidForServiceResponse response = decorated.oidForService(request);
+        final OidForServiceResponse response = decorated.oidForService(request);
         final IdentityData oidData = response.getOidData();
         log(" <-- data: " + dump(oidData));
         return response;



Mime
View raw message