diff --git a/src/java/com/threerings/presents/dobj/SetAdapter.java b/src/java/com/threerings/presents/dobj/SetAdapter.java
index fd92a177e..cfa3ac457 100644
--- a/src/java/com/threerings/presents/dobj/SetAdapter.java
+++ b/src/java/com/threerings/presents/dobj/SetAdapter.java
@@ -25,22 +25,22 @@ package com.threerings.presents.dobj;
  * Implements the methods in SetListener so that you don't have to
  * implement the ones you don't want to.
  */
-public class SetAdapter implements SetListener
+public class SetAdapter<T extends DSet.Entry> implements SetListener<T>
 {
     // documentation inherited from interface SetListener
-    public void entryAdded (EntryAddedEvent event)
+    public void entryAdded (EntryAddedEvent<T> event)
     {
         // override to provide functionality
     }
 
     // documentation inherited from interface SetListener
-    public void entryUpdated (EntryUpdatedEvent event)
+    public void entryUpdated (EntryUpdatedEvent<T> event)
     {
         // override to provide functionality
     }
 
     // documentation inherited from interface SetListener
-    public void entryRemoved (EntryRemovedEvent event)
+    public void entryRemoved (EntryRemovedEvent<T> event)
     {
         // override to provide functionality
     }
diff --git a/src/java/com/threerings/presents/dobj/SetListener.java b/src/java/com/threerings/presents/dobj/SetListener.java
index 78cf73bf7..2ce19830e 100644
--- a/src/java/com/threerings/presents/dobj/SetListener.java
+++ b/src/java/com/threerings/presents/dobj/SetListener.java
@@ -22,12 +22,12 @@
 package com.threerings.presents.dobj;
 
 /**
- * Implemented by entites which wish to hear about changes that occur to
+ * Implemented by entities which wish to hear about changes that occur to
  * set attributes of a particular distributed object.
  *
  * @see DObject#addListener
  */
-public interface SetListener extends ChangeListener
+public interface SetListener<T extends DSet.Entry> extends ChangeListener
 {
     /**
      * Called when an entry added event has been dispatched on an
@@ -36,7 +36,7 @@ public interface SetListener extends ChangeListener
      *
      * @param event The event that was dispatched on the object.
      */
-    public void entryAdded (EntryAddedEvent event);
+    public void entryAdded (EntryAddedEvent<T> event);
 
     /**
      * Called when an entry updated event has been dispatched on an
@@ -45,7 +45,7 @@ public interface SetListener extends ChangeListener
      *
      * @param event The event that was dispatched on the object.
      */
-    public void entryUpdated (EntryUpdatedEvent event);
+    public void entryUpdated (EntryUpdatedEvent<T> event);
 
     /**
      * Called when an entry removed event has been dispatched on an
@@ -54,5 +54,5 @@ public interface SetListener extends ChangeListener
      *
      * @param event The event that was dispatched on the object.
      */
-    public void entryRemoved (EntryRemovedEvent event);
+    public void entryRemoved (EntryRemovedEvent<T> event);
 }