Moved PrivateBinder to inject package. Modified PrivateModule to use configure() instead of configurePrivateBindings().

git-svn-id: https://google-guice.googlecode.com/svn/trunk@834 d779f126-a31b-0410-b53b-1d3aecad763e

8 files changed, 21 insertions, 21 deletions

diff --git a/latest-api-diffs/missingSinces.txt b/latest-api-diffs/missingSinces.txt
index d266f58c..cf682d2e 100644
--- a/latest-api-diffs/missingSinces.txt
+++ b/latest-api-diffs/missingSinces.txt
@@ -22,7 +22,7 @@ OK: com.google.inject.spi.InterceptorBinding Class
 OK: com.google.inject.spi.LinkedKeyBinding Interface
 OK: com.google.inject.spi.ModuleWriter Class
 OK: com.google.inject.OutOfScopeException Class
-OK: com.google.inject.binder.PrivateBinder Interface
+OK: com.google.inject.PrivateBinder Interface
 OK: com.google.inject.spi.PrivateElements Interface
 OK: com.google.inject.PrivateModule Class
 OK: com.google.inject.spi.ProviderBinding Interface
diff --git a/latest-api-diffs/user_comments_for_v1_to_v2.xml b/latest-api-diffs/user_comments_for_v1_to_v2.xml
index a8170512..cb8f88a7 100644
--- a/latest-api-diffs/user_comments_for_v1_to_v2.xml
+++ b/latest-api-diffs/user_comments_for_v1_to_v2.xml
@@ -628,7 +628,7 @@
   </text>
 </comment>
 <comment>
-  <identifier id="com.google.inject.binder.PrivateBinder"/>
+  <identifier id="com.google.inject.PrivateBinder"/>
   <text>
     InsertCommentsHere
   </text>
diff --git a/latest-api-diffs/v2.xml b/latest-api-diffs/v2.xml
index bb8edaf2..98d826d1 100644
--- a/latest-api-diffs/v2.xml
+++ b/latest-api-diffs/v2.xml
@@ -469,7 +469,7 @@
  @since 2.0]]>
       </doc>
     </method>
-    <method name="newPrivateBinder" return="com.google.inject.binder.PrivateBinder"
+    <method name="newPrivateBinder" return="com.google.inject.PrivateBinder"
       abstract="false" native="false" synchronized="false"
       static="false" final="false" visibility="public"
       deprecated="not deprecated">
@@ -2545,7 +2545,7 @@
     </doc>
   </interface>
   <!-- end interface com.google.inject.binder.LinkedBindingBuilder -->
-  <!-- start interface com.google.inject.binder.PrivateBinder -->
+  <!-- start interface com.google.inject.PrivateBinder -->
   <interface name="PrivateBinder"    abstract="true"
     static="false" final="false" visibility="public"
     deprecated="not deprecated">
@@ -2581,13 +2581,13 @@
  binding annotation.]]>
       </doc>
     </method>
-    <method name="withSource" return="com.google.inject.binder.PrivateBinder"
+    <method name="withSource" return="com.google.inject.PrivateBinder"
       abstract="false" native="false" synchronized="false"
       static="false" final="false" visibility="public"
       deprecated="not deprecated">
       <param name="source" type="java.lang.Object"/>
     </method>
-    <method name="skipSources" return="com.google.inject.binder.PrivateBinder"
+    <method name="skipSources" return="com.google.inject.PrivateBinder"
       abstract="false" native="false" synchronized="false"
       static="false" final="false" visibility="public"
       deprecated="not deprecated">
@@ -2601,7 +2601,7 @@
  @since 2.0]]>
     </doc>
   </interface>
-  <!-- end interface com.google.inject.binder.PrivateBinder -->
+  <!-- end interface com.google.inject.PrivateBinder -->
   <!-- start interface com.google.inject.binder.ScopedBindingBuilder -->
   <interface name="ScopedBindingBuilder"    abstract="true"
     static="false" final="false" visibility="public"
@@ -4953,12 +4953,12 @@
       static="false" final="false" visibility="protected"
       deprecated="not deprecated">
       <param name="privateElements" type="com.google.inject.spi.PrivateElements"/>
-      <param name="binder" type="com.google.inject.binder.PrivateBinder"/>
+      <param name="binder" type="com.google.inject.PrivateBinder"/>
       <doc>
       <![CDATA[Associates {@code binder} with {@code privateElements}.]]>
       </doc>
     </method>
-    <method name="getPrivateBinder" return="com.google.inject.binder.PrivateBinder"
+    <method name="getPrivateBinder" return="com.google.inject.PrivateBinder"
       abstract="false" native="false" synchronized="false"
       static="false" final="false" visibility="protected"
       deprecated="not deprecated">
diff --git a/latest-api-diffs/v2/com/google/inject/binder/class-use/PrivateBinder.html b/latest-api-diffs/v2/com/google/inject/binder/class-use/PrivateBinder.html
index f159cc7b..2c4fee59 100644
--- a/latest-api-diffs/v2/com/google/inject/binder/class-use/PrivateBinder.html
+++ b/latest-api-diffs/v2/com/google/inject/binder/class-use/PrivateBinder.html
@@ -4,7 +4,7 @@
 <HEAD>
 <!-- Generated by javadoc (build 1.6.0_07) on Tue Dec 30 23:53:15 PST 2008 -->
 <TITLE>
-Uses of Interface com.google.inject.binder.PrivateBinder (Guice 2 Prerelease)
+Uses of Interface com.google.inject.PrivateBinder (Guice 2 Prerelease)
 </TITLE>
 
 <META NAME="date" CONTENT="2008-12-30">
@@ -81,7 +81,7 @@ function windowTitle()
 <HR>
 <CENTER>
 <H2>
-<B>Uses of Interface<br>com.google.inject.binder.PrivateBinder</B></H2>
+<B>Uses of Interface<br>com.google.inject.PrivateBinder</B></H2>
 </CENTER>
 
 <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
@@ -197,7 +197,7 @@ Uses of <A HREF="../../../../../com/google/inject/binder/PrivateBinder.html" tit
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>protected &nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>ModuleWriter.</B><B><A HREF="../../../../../com/google/inject/spi/ModuleWriter.html#setPrivateBinder(com.google.inject.spi.PrivateElements, com.google.inject.binder.PrivateBinder)">setPrivateBinder</A></B>(<A HREF="../../../../../com/google/inject/spi/PrivateElements.html" title="interface in com.google.inject.spi">PrivateElements</A>&nbsp;privateElements,
+<TD><CODE><B>ModuleWriter.</B><B><A HREF="../../../../../com/google/inject/spi/ModuleWriter.html#setPrivateBinder(com.google.inject.spi.PrivateElements, com.google.inject.PrivateBinder)">setPrivateBinder</A></B>(<A HREF="../../../../../com/google/inject/spi/PrivateElements.html" title="interface in com.google.inject.spi">PrivateElements</A>&nbsp;privateElements,
                  <A HREF="../../../../../com/google/inject/binder/PrivateBinder.html" title="interface in com.google.inject.binder">PrivateBinder</A>&nbsp;binder)</CODE>
 
 <BR>
diff --git a/latest-api-diffs/v2/com/google/inject/class-use/Binder.html b/latest-api-diffs/v2/com/google/inject/class-use/Binder.html
index edf87c30..a21132f3 100644
--- a/latest-api-diffs/v2/com/google/inject/class-use/Binder.html
+++ b/latest-api-diffs/v2/com/google/inject/class-use/Binder.html
@@ -616,7 +616,7 @@ Uses of <A HREF="../../../../com/google/inject/Binder.html" title="interface in
                      <A HREF="../../../../com/google/inject/spi/PrivateElements.html" title="interface in com.google.inject.spi">PrivateElements</A>&nbsp;element)</CODE>
 
 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Writes the elements of the private environment to a new private binder and <A HREF="../../../../com/google/inject/spi/ModuleWriter.html#setPrivateBinder(com.google.inject.spi.PrivateElements, com.google.inject.binder.PrivateBinder)"><CODE>associates</CODE></A> the two.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Writes the elements of the private environment to a new private binder and <A HREF="../../../../com/google/inject/spi/ModuleWriter.html#setPrivateBinder(com.google.inject.spi.PrivateElements, com.google.inject.PrivateBinder)"><CODE>associates</CODE></A> the two.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
diff --git a/latest-api-diffs/v2/com/google/inject/spi/ModuleWriter.html b/latest-api-diffs/v2/com/google/inject/spi/ModuleWriter.html
index 6d918fe5..5dc65299 100644
--- a/latest-api-diffs/v2/com/google/inject/spi/ModuleWriter.html
+++ b/latest-api-diffs/v2/com/google/inject/spi/ModuleWriter.html
@@ -191,7 +191,7 @@ Creates a Module from a collection of component elements.
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>protected &nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/google/inject/spi/ModuleWriter.html#setPrivateBinder(com.google.inject.spi.PrivateElements, com.google.inject.binder.PrivateBinder)">setPrivateBinder</A></B>(<A HREF="../../../../com/google/inject/spi/PrivateElements.html" title="interface in com.google.inject.spi">PrivateElements</A>&nbsp;privateElements,
+<TD><CODE><B><A HREF="../../../../com/google/inject/spi/ModuleWriter.html#setPrivateBinder(com.google.inject.spi.PrivateElements, com.google.inject.PrivateBinder)">setPrivateBinder</A></B>(<A HREF="../../../../com/google/inject/spi/PrivateElements.html" title="interface in com.google.inject.spi">PrivateElements</A>&nbsp;privateElements,
                  <A HREF="../../../../com/google/inject/binder/PrivateBinder.html" title="interface in com.google.inject.binder">PrivateBinder</A>&nbsp;binder)</CODE>
 
 <BR>
@@ -272,7 +272,7 @@ Creates a Module from a collection of component elements.
                      <A HREF="../../../../com/google/inject/spi/PrivateElements.html" title="interface in com.google.inject.spi">PrivateElements</A>&nbsp;element)</CODE>
 
 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Writes the elements of the private environment to a new private binder and <A HREF="../../../../com/google/inject/spi/ModuleWriter.html#setPrivateBinder(com.google.inject.spi.PrivateElements, com.google.inject.binder.PrivateBinder)"><CODE>associates</CODE></A> the two.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Writes the elements of the private environment to a new private binder and <A HREF="../../../../com/google/inject/spi/ModuleWriter.html#setPrivateBinder(com.google.inject.spi.PrivateElements, com.google.inject.PrivateBinder)"><CODE>associates</CODE></A> the two.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -449,7 +449,7 @@ writePrivateElements</H3>
 protected void <B>writePrivateElements</B>(<A HREF="../../../../com/google/inject/Binder.html" title="interface in com.google.inject">Binder</A>&nbsp;binder,
                                     <A HREF="../../../../com/google/inject/spi/PrivateElements.html" title="interface in com.google.inject.spi">PrivateElements</A>&nbsp;element)</PRE>
 <DL>
-<DD>Writes the elements of the private environment to a new private binder and <A HREF="../../../../com/google/inject/spi/ModuleWriter.html#setPrivateBinder(com.google.inject.spi.PrivateElements, com.google.inject.binder.PrivateBinder)"><CODE>associates</CODE></A> the two.
+<DD>Writes the elements of the private environment to a new private binder and <A HREF="../../../../com/google/inject/spi/ModuleWriter.html#setPrivateBinder(com.google.inject.spi.PrivateElements, com.google.inject.PrivateBinder)"><CODE>associates</CODE></A> the two.
 <P>
 <DD><DL>
 </DL>
@@ -472,7 +472,7 @@ protected &lt;T&gt; <A HREF="../../../../com/google/inject/binder/ScopedBindingB
 </DL>
 <HR>
 
-<A NAME="setPrivateBinder(com.google.inject.spi.PrivateElements, com.google.inject.binder.PrivateBinder)"><!-- --></A><H3>
+<A NAME="setPrivateBinder(com.google.inject.spi.PrivateElements, com.google.inject.PrivateBinder)"><!-- --></A><H3>
 setPrivateBinder</H3>
 <PRE>
 protected void <B>setPrivateBinder</B>(<A HREF="../../../../com/google/inject/spi/PrivateElements.html" title="interface in com.google.inject.spi">PrivateElements</A>&nbsp;privateElements,
diff --git a/latest-api-diffs/v2/com/google/inject/spi/class-use/PrivateElements.html b/latest-api-diffs/v2/com/google/inject/spi/class-use/PrivateElements.html
index f76d1ca7..0b413f9a 100644
--- a/latest-api-diffs/v2/com/google/inject/spi/class-use/PrivateElements.html
+++ b/latest-api-diffs/v2/com/google/inject/spi/class-use/PrivateElements.html
@@ -137,7 +137,7 @@ Uses of <A HREF="../../../../../com/google/inject/spi/PrivateElements.html" titl
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>protected &nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>ModuleWriter.</B><B><A HREF="../../../../../com/google/inject/spi/ModuleWriter.html#setPrivateBinder(com.google.inject.spi.PrivateElements, com.google.inject.binder.PrivateBinder)">setPrivateBinder</A></B>(<A HREF="../../../../../com/google/inject/spi/PrivateElements.html" title="interface in com.google.inject.spi">PrivateElements</A>&nbsp;privateElements,
+<TD><CODE><B>ModuleWriter.</B><B><A HREF="../../../../../com/google/inject/spi/ModuleWriter.html#setPrivateBinder(com.google.inject.spi.PrivateElements, com.google.inject.PrivateBinder)">setPrivateBinder</A></B>(<A HREF="../../../../../com/google/inject/spi/PrivateElements.html" title="interface in com.google.inject.spi">PrivateElements</A>&nbsp;privateElements,
                  <A HREF="../../../../../com/google/inject/binder/PrivateBinder.html" title="interface in com.google.inject.binder">PrivateBinder</A>&nbsp;binder)</CODE>
 
 <BR>
@@ -166,7 +166,7 @@ Uses of <A HREF="../../../../../com/google/inject/spi/PrivateElements.html" titl
                      <A HREF="../../../../../com/google/inject/spi/PrivateElements.html" title="interface in com.google.inject.spi">PrivateElements</A>&nbsp;element)</CODE>
 
 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Writes the elements of the private environment to a new private binder and <A HREF="../../../../../com/google/inject/spi/ModuleWriter.html#setPrivateBinder(com.google.inject.spi.PrivateElements, com.google.inject.binder.PrivateBinder)"><CODE>associates</CODE></A> the two.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Writes the elements of the private environment to a new private binder and <A HREF="../../../../../com/google/inject/spi/ModuleWriter.html#setPrivateBinder(com.google.inject.spi.PrivateElements, com.google.inject.PrivateBinder)"><CODE>associates</CODE></A> the two.</TD>
 </TR>
 </TABLE>
 &nbsp;
diff --git a/latest-api-diffs/v2/index-all.html b/latest-api-diffs/v2/index-all.html
index fc4b4c29..f379f168 100644
--- a/latest-api-diffs/v2/index-all.html
+++ b/latest-api-diffs/v2/index-all.html
@@ -1199,7 +1199,7 @@ Static variable in class com.google.inject.servlet.<A HREF="./com/google/inject/
 Static method in class com.google.inject.util.<A HREF="./com/google/inject/util/Types.html" title="class in com.google.inject.util">Types</A>
 <DD>Returns a type modelling a <A HREF="http://java.sun.com/j2se/1.5.0/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util"><CODE>Set</CODE></A> whose elements are of type
  <code>elementType</code>.
-<DT><A HREF="./com/google/inject/spi/ModuleWriter.html#setPrivateBinder(com.google.inject.spi.PrivateElements, com.google.inject.binder.PrivateBinder)"><B>setPrivateBinder(PrivateElements, PrivateBinder)</B></A> - 
+<DT><A HREF="./com/google/inject/spi/ModuleWriter.html#setPrivateBinder(com.google.inject.spi.PrivateElements, com.google.inject.PrivateBinder)"><B>setPrivateBinder(PrivateElements, PrivateBinder)</B></A> -
 Method in class com.google.inject.spi.<A HREF="./com/google/inject/spi/ModuleWriter.html" title="class in com.google.inject.spi">ModuleWriter</A>
 <DD>Associates <code>binder</code> with <code>privateElements</code>.
 <DT><A HREF="./com/google/inject/Scopes.html#SINGLETON"><B>SINGLETON</B></A> - 
@@ -1538,7 +1538,7 @@ Method in class com.google.inject.spi.<A HREF="./com/google/inject/spi/ModuleWri
 <DD>&nbsp;
 <DT><A HREF="./com/google/inject/spi/ModuleWriter.html#writePrivateElements(com.google.inject.Binder, com.google.inject.spi.PrivateElements)"><B>writePrivateElements(Binder, PrivateElements)</B></A> - 
 Method in class com.google.inject.spi.<A HREF="./com/google/inject/spi/ModuleWriter.html" title="class in com.google.inject.spi">ModuleWriter</A>
-<DD>Writes the elements of the private environment to a new private binder and <A HREF="./com/google/inject/spi/ModuleWriter.html#setPrivateBinder(com.google.inject.spi.PrivateElements, com.google.inject.binder.PrivateBinder)"><CODE>associates</CODE></A> the two.
+<DD>Writes the elements of the private environment to a new private binder and <A HREF="./com/google/inject/spi/ModuleWriter.html#setPrivateBinder(com.google.inject.spi.PrivateElements, com.google.inject.PrivateBinder)"><CODE>associates</CODE></A> the two.
 <DT><A HREF="./com/google/inject/Key.html#writeReplace()"><B>writeReplace()</B></A> - 
 Method in class com.google.inject.<A HREF="./com/google/inject/Key.html" title="class in com.google.inject">Key</A>
 <DD>&nbsp;