And finally, narya gets the imports/overrides/regen love.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5241 542714f4-19e9-0310-aa3c-eee0fc999fb1

src/java/com/threerings/presents/dobj/AttributeChangedEvent.java

@@ -114,7 +114,7 @@ public class AttributeChangedEvent extends NamedEvent
         return ((Double)_value).doubleValue();
     }
 
-    @Override // from DEvent
+    @Override
     public boolean alreadyApplied ()
     {
         // if we have an old value, that means we're running on the master server and we have
@@ -122,7 +122,7 @@ public class AttributeChangedEvent extends NamedEvent
         return (_oldValue != UNSET_OLD_VALUE);
     }
 
-    @Override // from DEvent
+    @Override
     public boolean applyToObject (DObject target)
         throws ObjectAccessException
     {
@@ -184,7 +184,7 @@ public class AttributeChangedEvent extends NamedEvent
         _oldValue = oldValue;
     }
 
-    // documentation inherited
+    @Override
     protected void notifyListener (Object listener)
     {
         if (listener instanceof AttributeChangeListener) {
@@ -192,7 +192,7 @@ public class AttributeChangedEvent extends NamedEvent
         }
     }
 
-    // documentation inherited
+    @Override
     protected void toString (StringBuilder buf)
     {
         buf.append("CHANGE:");

src/java/com/threerings/presents/dobj/CompoundEvent.java

@@ -122,7 +122,7 @@ public class CompoundEvent extends DEvent
         _events.clear();
     }
 
-    @Override // from DEvent
+    @Override
     public void setSourceOid (int sourceOid)
     {
         super.setSourceOid(sourceOid);
@@ -134,7 +134,7 @@ public class CompoundEvent extends DEvent
         }
     }
 
-    @Override // from DEvent
+    @Override
     public void setTargetOid (int targetOid)
     {
         super.setTargetOid(targetOid);
@@ -146,7 +146,7 @@ public class CompoundEvent extends DEvent
         }
     }
 
-    @Override // from DEvent
+    @Override
     public void setTransport (Transport transport)
     {
         super.setTransport(transport);
@@ -155,7 +155,7 @@ public class CompoundEvent extends DEvent
         }
     }
 
-    @Override // from DEvent
+    @Override
     public boolean applyToObject (DObject target)
         throws ObjectAccessException
     {
@@ -174,7 +174,7 @@ public class CompoundEvent extends DEvent
         }
     }
 
-    // documentation inherited
+    @Override
     protected void toString (StringBuilder buf)
     {
         buf.append("COMPOUND:");

src/java/com/threerings/presents/dobj/DEvent.java

@@ -162,9 +162,7 @@ public abstract class DEvent implements Streamable
         // the default is to do nothing
     }
 
-    /**
-     * Constructs and returns a string representation of this event.
-     */
+    @Override
     public String toString ()
     {
         StringBuilder buf = new StringBuilder();

src/java/com/threerings/presents/dobj/DSet.java

@@ -409,14 +409,13 @@ public class DSet<E extends DSet.Entry>
     /**
      * Generates a shallow copy of this object.
      */
+    @Override
     public Object clone ()
     {
         return typedClone();
     }
 
-    /**
-     * Generates a string representation of this set instance.
-     */
+    @Override
     public String toString ()
     {
         StringBuilder buf = new StringBuilder("(");

src/java/com/threerings/presents/dobj/ElementUpdatedEvent.java

@@ -153,13 +153,13 @@ public class ElementUpdatedEvent extends NamedEvent
         return ((Double)_value).doubleValue();
     }
 
-    @Override // from DEvent
+    @Override
     public boolean alreadyApplied ()
     {
         return (_oldValue != UNSET_OLD_VALUE);
     }
 
-    @Override // from DEvent
+    @Override
     public boolean applyToObject (DObject target)
         throws ObjectAccessException
     {
@@ -191,7 +191,7 @@ public class ElementUpdatedEvent extends NamedEvent
         return true;
     }
 
-    // documentation inherited
+    @Override
     protected void notifyListener (Object listener)
     {
         if (listener instanceof ElementUpdateListener) {
@@ -199,7 +199,7 @@ public class ElementUpdatedEvent extends NamedEvent
         }
     }
 
-    // documentation inherited
+    @Override
     protected void toString (StringBuilder buf)
     {
         buf.append("UPDATE:");

src/java/com/threerings/presents/dobj/EntryAddedEvent.java

@@ -71,13 +71,13 @@ public class EntryAddedEvent<T extends DSet.Entry> extends NamedEvent
         return _entry;
     }
 
-    @Override // from DEvent
+    @Override
     public boolean alreadyApplied ()
     {
         return _alreadyApplied;
     }
 
-    @Override // from DEvent
+    @Override
     public boolean applyToObject (DObject target)
         throws ObjectAccessException
     {
@@ -89,7 +89,7 @@ public class EntryAddedEvent<T extends DSet.Entry> extends NamedEvent
         return true;
     }
 
-    // documentation inherited
+    @Override
     protected void notifyListener (Object listener)
     {
         if (listener instanceof SetListener) {
@@ -98,7 +98,7 @@ public class EntryAddedEvent<T extends DSet.Entry> extends NamedEvent
         }
     }
 
-    // documentation inherited
+    @Override
     protected void toString (StringBuilder buf)
     {
         buf.append("ELADD:");

src/java/com/threerings/presents/dobj/EntryRemovedEvent.java

@@ -72,13 +72,13 @@ public class EntryRemovedEvent<T extends DSet.Entry> extends NamedEvent
         return _oldEntry;
     }
 
-    @Override // from DEvent
+    @Override
     public boolean alreadyApplied ()
     {
         return (_oldEntry != UNSET_OLD_ENTRY);
     }
 
-    @Override // from DEvent
+    @Override
     public boolean applyToObject (DObject target)
         throws ObjectAccessException
     {
@@ -95,7 +95,7 @@ public class EntryRemovedEvent<T extends DSet.Entry> extends NamedEvent
         return true;
     }
 
-    // documentation inherited
+    @Override
     protected void notifyListener (Object listener)
     {
         if (listener instanceof SetListener) {
@@ -104,7 +104,7 @@ public class EntryRemovedEvent<T extends DSet.Entry> extends NamedEvent
         }
     }
 
-    // documentation inherited
+    @Override
     protected void toString (StringBuilder buf)
     {
         buf.append("ELREM:");

src/java/com/threerings/presents/dobj/EntryUpdatedEvent.java

@@ -90,13 +90,13 @@ public class EntryUpdatedEvent<T extends DSet.Entry> extends NamedEvent
         return _oldEntry;
     }
 
-    @Override // from DEvent
+    @Override
     public boolean alreadyApplied ()
     {
         return (_oldEntry != UNSET_OLD_ENTRY);
     }
 
-    @Override // from DEvent
+    @Override
     public boolean applyToObject (DObject target)
         throws ObjectAccessException
     {
@@ -114,7 +114,7 @@ public class EntryUpdatedEvent<T extends DSet.Entry> extends NamedEvent
         return true;
     }
 
-    // documentation inherited
+    @Override
     protected void notifyListener (Object listener)
     {
         if (listener instanceof SetListener) {
@@ -123,7 +123,7 @@ public class EntryUpdatedEvent<T extends DSet.Entry> extends NamedEvent
         }
     }
 
-    // documentation inherited
+    @Override
     protected void toString (StringBuilder buf)
     {
         buf.append("ELUPD:");

src/java/com/threerings/presents/dobj/InvocationNotificationEvent.java

@@ -107,9 +107,7 @@ public class InvocationNotificationEvent extends DEvent
         return _args;
     }
 
-    /**
-     * Applies this attribute change to the object.
-     */
+    @Override
     public boolean applyToObject (DObject target)
         throws ObjectAccessException
     {
@@ -117,13 +115,13 @@ public class InvocationNotificationEvent extends DEvent
         return true;
     }
 
-    // documentation inherited
+    @Override
     protected void notifyListener (Object listener)
     {
         // nothing to do here
     }
 
-    // documentation inherited
+    @Override
     protected void toString (StringBuilder buf)
     {
         buf.append("INOT:");

src/java/com/threerings/presents/dobj/InvocationRequestEvent.java

@@ -102,9 +102,7 @@ public class InvocationRequestEvent extends DEvent
         return _args;
     }
 
-    /**
-     * Applies this attribute change to the object.
-     */
+    @Override
     public boolean applyToObject (DObject target)
         throws ObjectAccessException
     {
@@ -112,13 +110,13 @@ public class InvocationRequestEvent extends DEvent
         return true;
     }
 
-    // documentation inherited
+    @Override
     protected void notifyListener (Object listener)
     {
         // nothing to do here
     }
 
-    // documentation inherited
+    @Override
     protected void toString (StringBuilder buf)
     {
         buf.append("IREQ:");

src/java/com/threerings/presents/dobj/InvocationResponseEvent.java

@@ -102,9 +102,7 @@ public class InvocationResponseEvent extends DEvent
         return _args;
     }
 
-    /**
-     * Applies this attribute change to the object.
-     */
+    @Override
     public boolean applyToObject (DObject target)
         throws ObjectAccessException
     {
@@ -112,13 +110,13 @@ public class InvocationResponseEvent extends DEvent
         return true;
     }
 
-    // documentation inherited
+    @Override
     protected void notifyListener (Object listener)
     {
         // nothing to do here
     }
 
-    // documentation inherited
+    @Override
     protected void toString (StringBuilder buf)
     {
         buf.append("IRSP:");

src/java/com/threerings/presents/dobj/MessageEvent.java

@@ -94,9 +94,7 @@ public class MessageEvent extends NamedEvent
         _args = args;
     }
 
-    /**
-     * Applies this attribute change to the object.
-     */
+    @Override
     public boolean applyToObject (DObject target)
         throws ObjectAccessException
     {
@@ -104,7 +102,7 @@ public class MessageEvent extends NamedEvent
         return true;
     }
 
-    // documentation inherited
+    @Override
     protected void notifyListener (Object listener)
     {
         if (listener instanceof MessageListener) {
@@ -112,7 +110,7 @@ public class MessageEvent extends NamedEvent
         }
     }
 
-    // documentation inherited
+    @Override
     protected void toString (StringBuilder buf)
     {
         buf.append("MSG:");

src/java/com/threerings/presents/dobj/NamedEvent.java

@@ -71,6 +71,7 @@ public abstract class NamedEvent extends DEvent
         return _name;
     }
 
+    @Override
     protected void toString (StringBuilder buf)
     {
         super.toString(buf);

src/java/com/threerings/presents/dobj/ObjectAddedEvent.java

@@ -63,9 +63,7 @@ public class ObjectAddedEvent extends NamedEvent
         return _oid;
     }
 
-    /**
-     * Applies this event to the object.
-     */
+    @Override
     public boolean applyToObject (DObject target)
         throws ObjectAccessException
     {
@@ -74,7 +72,7 @@ public class ObjectAddedEvent extends NamedEvent
         return true;
     }
 
-    // documentation inherited
+    @Override
     protected void notifyListener (Object listener)
     {
         if (listener instanceof OidListListener) {
@@ -82,7 +80,7 @@ public class ObjectAddedEvent extends NamedEvent
         }
     }
 
-    // documentation inherited
+    @Override
     protected void toString (StringBuilder buf)
     {
         buf.append("OBJADD:");

src/java/com/threerings/presents/dobj/ObjectDestroyedEvent.java

@@ -49,7 +49,7 @@ public class ObjectDestroyedEvent extends DEvent
     {
     }
 
-    // documentation inherited
+    @Override
     public boolean applyToObject (DObject target)
         throws ObjectAccessException
     {
@@ -58,7 +58,7 @@ public class ObjectDestroyedEvent extends DEvent
         return true;
     }
 
-    // documentation inherited
+    @Override
     protected void notifyListener (Object listener)
     {
         if (listener instanceof ObjectDeathListener) {
@@ -66,7 +66,7 @@ public class ObjectDestroyedEvent extends DEvent
         }
     }
 
-    // documentation inherited
+    @Override
     protected void toString (StringBuilder buf)
     {
         buf.append("DESTROY:");

src/java/com/threerings/presents/dobj/ObjectRemovedEvent.java

@@ -64,9 +64,7 @@ public class ObjectRemovedEvent extends NamedEvent
         return _oid;
     }
 
-    /**
-     * Applies this event to the object.
-     */
+    @Override
     public boolean applyToObject (DObject target)
         throws ObjectAccessException
     {
@@ -75,7 +73,7 @@ public class ObjectRemovedEvent extends NamedEvent
         return true;
     }
 
-    // documentation inherited
+    @Override
     protected void notifyListener (Object listener)
     {
         if (listener instanceof OidListListener) {
@@ -83,7 +81,7 @@ public class ObjectRemovedEvent extends NamedEvent
         }
     }
 
-    // documentation inherited
+    @Override
     protected void toString (StringBuilder buf)
     {
         buf.append("OBJREM:");

src/java/com/threerings/presents/dobj/OidList.java

@@ -133,6 +133,7 @@ public class OidList implements Streamable
         return _oids[index];
     }
 
+    @Override
     public String toString ()
     {
         StringBuilder buf = new StringBuilder();

src/java/com/threerings/presents/dobj/ReleaseLockEvent.java

@@ -54,7 +54,7 @@ public class ReleaseLockEvent extends NamedEvent
     {
     }
 
-    // documentation inherited
+    @Override
     public boolean isPrivate ()
     {
         // we need only run on the server; no need to propagate to proxies
@@ -64,6 +64,7 @@ public class ReleaseLockEvent extends NamedEvent
     /**
      * Applies this lock release to the object.
      */
+    @Override
     public boolean applyToObject (DObject target)
         throws ObjectAccessException
     {
@@ -73,6 +74,7 @@ public class ReleaseLockEvent extends NamedEvent
         return false;
     }
 
+    @Override
     protected void toString (StringBuilder buf)
     {
         buf.append("UNLOCK:");