diff --git a/src/java/com/threerings/presents/client/Client.java b/src/java/com/threerings/presents/client/Client.java
index d5021b1fc..14cb6250f 100644
--- a/src/java/com/threerings/presents/client/Client.java
+++ b/src/java/com/threerings/presents/client/Client.java
@@ -900,23 +900,20 @@ public class Client
     protected class ServerSwitcher extends ClientAdapter
     {
         public ServerSwitcher (
-            String hostname, int[] ports, InvocationService.ConfirmListener obs)
-        {
+            String hostname, int[] ports, InvocationService.ConfirmListener obs) {
             this(hostname, ports, new int[0], obs);
         }
 
         public ServerSwitcher (
             String hostname, int[] ports, int[] datagramPorts,
-            InvocationService.ConfirmListener obs)
-        {
+            InvocationService.ConfirmListener obs) {
             _hostname = hostname;
             _ports = ports;
             _datagramPorts = datagramPorts;
             _observer = obs;
         }
 
-        public void switchServers ()
-        {
+        public void switchServers () {
             addClientObserver(this);
             if (!isLoggedOn()) {
                 // if we're not logged on right now, just do the switch immediately
@@ -935,8 +932,7 @@ public class Client
         }
 
         @Override
-        public void clientDidClear (Client client)
-        {
+        public void clientDidClear (Client client) {
             // configure the client to point to the new server and logon
             setServer(_hostname, _ports, _datagramPorts);
 
@@ -948,8 +944,7 @@ public class Client
         }
 
         @Override
-        public void clientDidLogon (Client client)
-        {
+        public void clientDidLogon (Client client) {
             removeClientObserver(this);
             if (_observer != null) {
                 _observer.requestProcessed();
@@ -957,8 +952,7 @@ public class Client
         }
 
         @Override
-        public void clientFailedToLogon (Client client, Exception cause)
-        {
+        public void clientFailedToLogon (Client client, Exception cause) {
             removeClientObserver(this);
             if (_oldHostname != null) { // restore our previous server and ports
                 setServer(_oldHostname, _oldPorts, _oldDatagramPorts);
diff --git a/src/java/com/threerings/presents/dobj/AttributeChangeListener.java b/src/java/com/threerings/presents/dobj/AttributeChangeListener.java
index e7df5de18..7a277c7c2 100644
--- a/src/java/com/threerings/presents/dobj/AttributeChangeListener.java
+++ b/src/java/com/threerings/presents/dobj/AttributeChangeListener.java
@@ -22,18 +22,17 @@
 package com.threerings.presents.dobj;
 
 /**
- * Implemented by entities which wish to hear about attribute changes that
- * take place for a particular distributed object.
+ * Implemented by entities which wish to hear about attribute changes that take place for a
+ * particular distributed object.
  *
  * @see DObject#addListener
  */
 public interface AttributeChangeListener extends ChangeListener
 {
     /**
-     * Called when an attribute changed event has been dispatched on an
-     * object. This will be called <em>after</em> the event has been
-     * applied to the object. So fetching the attribute during this call
-     * will provide the new value for the attribute.
+     * Called when an attribute changed event has been dispatched on an object. This will be
+     * called <em>after</em> the event has been applied to the object. So fetching the attribute
+     * during this call will provide the new value for the attribute.
      *
      * @param event The event that was dispatched on the object.
      */
diff --git a/src/java/com/threerings/presents/dobj/ElementUpdateListener.java b/src/java/com/threerings/presents/dobj/ElementUpdateListener.java
index d0424f9f1..3b883352a 100644
--- a/src/java/com/threerings/presents/dobj/ElementUpdateListener.java
+++ b/src/java/com/threerings/presents/dobj/ElementUpdateListener.java
@@ -22,18 +22,17 @@
 package com.threerings.presents.dobj;
 
 /**
- * Implemented by entities which wish to hear about element updates that
- * take place for a particular distributed object.
+ * Implemented by entities which wish to hear about element updates that take place for a
+ * particular distributed object.
  *
  * @see DObject#addListener
  */
 public interface ElementUpdateListener extends ChangeListener
 {
     /**
-     * Called when an element updated event has been dispatched on an
-     * object. This will be called <em>after</em> the event has been
-     * applied to the object. So fetching the element during this call
-     * will provide the new value for the element.
+     * Called when an element updated event has been dispatched on an object. This will be called
+     * <em>after</em> the event has been applied to the object. So fetching the element during
+     * this call will provide the new value for the element.
      *
      * @param event The event that was dispatched on the object.
      */
diff --git a/src/java/com/threerings/presents/dobj/EventListener.java b/src/java/com/threerings/presents/dobj/EventListener.java
index 7a177cabc..d9c8c3272 100644
--- a/src/java/com/threerings/presents/dobj/EventListener.java
+++ b/src/java/com/threerings/presents/dobj/EventListener.java
@@ -22,20 +22,18 @@
 package com.threerings.presents.dobj;
 
 /**
- * Implemented by entities which wish to hear about all events being
- * dispatched on a particular distributed object.
+ * Implemented by entities which wish to hear about all events being dispatched on a particular
+ * distributed object.
  *
  * @see DObject#addListener
  */
 public interface EventListener extends ChangeListener
 {
     /**
-     * Called when any event has been dispatched on an object. The event
-     * will be of the derived class that corresponds to the kind of event
-     * that occurred on the object. This will be called <em>after</em> the
-     * event has been applied to the object. So fetching an attribute upon
-     * receiving an attribute changed event will provide the new value for
-     * the attribute.
+     * Called when any event has been dispatched on an object. The event will be of the derived
+     * class that corresponds to the kind of event that occurred on the object. This will be
+     * called <em>after</em> the event has been applied to the object. So fetching an attribute
+     * upon receiving an attribute changed event will provide the new value for the attribute.
      *
      * @param event The event that was dispatched on the object.
      */
diff --git a/src/java/com/threerings/presents/dobj/MessageListener.java b/src/java/com/threerings/presents/dobj/MessageListener.java
index 30a376a41..724ec95af 100644
--- a/src/java/com/threerings/presents/dobj/MessageListener.java
+++ b/src/java/com/threerings/presents/dobj/MessageListener.java
@@ -22,8 +22,8 @@
 package com.threerings.presents.dobj;
 
 /**
- * Implemented by entities which wish to hear about message events that are
- * dispatched on a particular distributed object.
+ * Implemented by entities which wish to hear about message events that are dispatched on a
+ * particular distributed object.
  *
  * @see DObject#addListener
  */
diff --git a/src/java/com/threerings/presents/dobj/OidListListener.java b/src/java/com/threerings/presents/dobj/OidListListener.java
index 135eaf341..a056964e9 100644
--- a/src/java/com/threerings/presents/dobj/OidListListener.java
+++ b/src/java/com/threerings/presents/dobj/OidListListener.java
@@ -22,26 +22,24 @@
 package com.threerings.presents.dobj;
 
 /**
- * Implemented by entities which wish to hear about changes that occur to
- * oid list attributes of a particular distributed object.
+ * Implemented by entities which wish to hear about changes that occur to oid list attributes of a
+ * particular distributed object.
  *
  * @see DObject#addListener
  */
 public interface OidListListener extends ChangeListener
 {
     /**
-     * Called when an object added event has been dispatched on an
-     * object. This will be called <em>after</em> the event has been
-     * applied to the object.
+     * Called when an object added event has been dispatched on an object. This will be called
+     * <em>after</em> the event has been applied to the object.
      *
      * @param event The event that was dispatched on the object.
      */
     void objectAdded (ObjectAddedEvent event);
 
     /**
-     * Called when an object removed event has been dispatched on an
-     * object. This will be called <em>after</em> the event has been
-     * applied to the object.
+     * Called when an object removed event has been dispatched on an object. This will be called
+     * <em>after</em> the event has been applied to the object.
      *
      * @param event The event that was dispatched on the object.
      */
diff --git a/src/java/com/threerings/presents/tools/GenDObjectTask.java b/src/java/com/threerings/presents/tools/GenDObjectTask.java
index daee06b35..e40c00083 100644
--- a/src/java/com/threerings/presents/tools/GenDObjectTask.java
+++ b/src/java/com/threerings/presents/tools/GenDObjectTask.java
@@ -53,8 +53,7 @@ import com.threerings.presents.dobj.DSet;
 import com.threerings.presents.dobj.OidList;
 
 /**
- * Generates necessary additional distributed object declarations and
- * methods.
+ * Generates necessary additional distributed object declarations and methods.
  */
 public class GenDObjectTask extends Task
 {