Index: src/java/javax/jdo/Extent.java
===================================================================
--- src/java/javax/jdo/Extent.java	(revision 582408)
+++ src/java/javax/jdo/Extent.java	(working copy)
@@ -22,6 +22,7 @@
 
 package javax.jdo;
 
+import java.lang.Iterable;
 import java.util.Iterator;
 
 /** Instances of the <code>Extent</code> class represent the entire collection
@@ -33,16 +34,16 @@
  * <li>to execute a <code>Query</code> in the data store over all instances
  * of a particular class
  * </ol>
- * @version 2.0
+ * @version 2.1
  */
-public interface Extent {
+public interface Extent<T> extends Iterable<T> {
         
     /** Returns an iterator over all the instances in the <code>Extent</code>.
      * The behavior of the returned iterator might depend on the setting of the
      * <code>ignoreCache</code> flag in the owning <code>PersistenceManager</code>.
      * @return an iterator over all instances in the <code>Extent</code>
      */
-    Iterator iterator();
+    Iterator<T> iterator();
 
     /** Returns whether this <code>Extent</code> was defined to contain subclasses.
      * @return true if this <code>Extent</code> was defined to contain instances
@@ -54,7 +55,7 @@
      * store; this method returns the <code>Class</code> of the instances.
       * @return the <code>Class</code> of instances of this <code>Extent</code>.
       */
-    Class getCandidateClass();
+    Class<T> getCandidateClass();
 
     /** An <code>Extent</code> is managed by a <code>PersistenceManager</code>;
      * this method gives access to the owning <code>PersistenceManager</code>.
Index: src/java/javax/jdo/PersistenceManager.java
===================================================================
--- src/java/javax/jdo/PersistenceManager.java	(revision 582408)
+++ src/java/javax/jdo/PersistenceManager.java	(working copy)
@@ -262,7 +262,7 @@
      * @return an <code>Extent</code> of the specified <code>Class</code>
      * @see Query
      */
-    Extent getExtent (Class persistenceCapableClass, boolean subclasses);
+    <T> Extent<T> getExtent (Class<T> persistenceCapableClass, boolean subclasses);
 
     /**
      * Equivalent to <code>getExtent (persistenceCapableClass,
@@ -270,7 +270,7 @@
      * @see #getExtent(Class,boolean)
      * @since 2.0
      */
-    Extent getExtent (Class persistenceCapableClass);
+    <T> Extent<T> getExtent (Class<T> persistenceCapableClass);
 
     /** This method locates a persistent instance in the cache of instances
      * managed by this <code>PersistenceManager</code>.
@@ -533,7 +533,7 @@
      * parameter array
      * @see #makePersistent(Object pc)
      */
-    <T> T[] makePersistentAll (T[] pcs);
+    <T> T[] makePersistentAll (T... pcs);
     
     /** Make a <code>Collection</code> of instances persistent.
      * @param pcs a <code>Collection</code> of instances