diff --git a/javadoc/allclasses-frame.html b/javadoc/allclasses-frame.html
index c4b7ad7..5ae947a 100644
--- a/javadoc/allclasses-frame.html
+++ b/javadoc/allclasses-frame.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_26) on Tue Jan 03 17:07:49 EST 2012 -->
+<!-- Generated by javadoc (build 1.6.0_26) on Fri Jan 06 14:58:31 EST 2012 -->
 <TITLE>
 All Classes (dexmaker)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-01-03">
+<META NAME="date" CONTENT="2012-01-06">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 
@@ -27,7 +27,7 @@
 <BR>
 <A HREF="com/google/dexmaker/Comparison.html" title="enum in com.google.dexmaker" target="classFrame">Comparison</A>
 <BR>
-<A HREF="com/google/dexmaker/DexGenerator.html" title="class in com.google.dexmaker" target="classFrame">DexGenerator</A>
+<A HREF="com/google/dexmaker/DexMaker.html" title="class in com.google.dexmaker" target="classFrame">DexMaker</A>
 <BR>
 <A HREF="com/google/dexmaker/FieldId.html" title="class in com.google.dexmaker" target="classFrame">FieldId</A>
 <BR>
@@ -39,7 +39,7 @@
 <BR>
 <A HREF="com/google/dexmaker/stock/ProxyBuilder.html" title="class in com.google.dexmaker.stock" target="classFrame">ProxyBuilder</A>
 <BR>
-<A HREF="com/google/dexmaker/Type.html" title="class in com.google.dexmaker" target="classFrame">Type</A>
+<A HREF="com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker" target="classFrame">TypeId</A>
 <BR>
 </FONT></TD>
 </TR>
diff --git a/javadoc/allclasses-noframe.html b/javadoc/allclasses-noframe.html
index ce731f5..d6ed9d0 100644
--- a/javadoc/allclasses-noframe.html
+++ b/javadoc/allclasses-noframe.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_26) on Tue Jan 03 17:07:49 EST 2012 -->
+<!-- Generated by javadoc (build 1.6.0_26) on Fri Jan 06 14:58:31 EST 2012 -->
 <TITLE>
 All Classes (dexmaker)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-01-03">
+<META NAME="date" CONTENT="2012-01-06">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 
@@ -27,7 +27,7 @@
 <BR>
 <A HREF="com/google/dexmaker/Comparison.html" title="enum in com.google.dexmaker">Comparison</A>
 <BR>
-<A HREF="com/google/dexmaker/DexGenerator.html" title="class in com.google.dexmaker">DexGenerator</A>
+<A HREF="com/google/dexmaker/DexMaker.html" title="class in com.google.dexmaker">DexMaker</A>
 <BR>
 <A HREF="com/google/dexmaker/FieldId.html" title="class in com.google.dexmaker">FieldId</A>
 <BR>
@@ -39,7 +39,7 @@
 <BR>
 <A HREF="com/google/dexmaker/stock/ProxyBuilder.html" title="class in com.google.dexmaker.stock">ProxyBuilder</A>
 <BR>
-<A HREF="com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>
+<A HREF="com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>
 <BR>
 </FONT></TD>
 </TR>
diff --git a/javadoc/com/google/dexmaker/BinaryOp.html b/javadoc/com/google/dexmaker/BinaryOp.html
index 48984d0..cf51d22 100644
--- a/javadoc/com/google/dexmaker/BinaryOp.html
+++ b/javadoc/com/google/dexmaker/BinaryOp.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_26) on Tue Jan 03 17:07:49 EST 2012 -->
+<!-- Generated by javadoc (build 1.6.0_26) on Fri Jan 06 14:58:30 EST 2012 -->
 <TITLE>
 BinaryOp (dexmaker)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-01-03">
+<META NAME="date" CONTENT="2012-01-06">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 
diff --git a/javadoc/com/google/dexmaker/Code.html b/javadoc/com/google/dexmaker/Code.html
index 5f3c067..5fb53ab 100644
--- a/javadoc/com/google/dexmaker/Code.html
+++ b/javadoc/com/google/dexmaker/Code.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_26) on Tue Jan 03 17:07:49 EST 2012 -->
+<!-- Generated by javadoc (build 1.6.0_26) on Fri Jan 06 14:58:30 EST 2012 -->
 <TITLE>
 Code (dexmaker)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-01-03">
+<META NAME="date" CONTENT="2012-01-06">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 
@@ -119,7 +119,7 @@
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/Code.html#addCatchClause(com.google.dexmaker.Type, com.google.dexmaker.Label)">addCatchClause</A></B>(<A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;?&gt;&nbsp;throwable,
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/Code.html#addCatchClause(com.google.dexmaker.TypeId, com.google.dexmaker.Label)">addCatchClause</A></B>(<A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;?&gt;&nbsp;throwable,
                <A HREF="../../../com/google/dexmaker/Label.html" title="class in com.google.dexmaker">Label</A>&nbsp;catchClause)</CODE>
 
 <BR>
@@ -128,9 +128,9 @@
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/Code.html#aget(com.google.dexmaker.Local, com.google.dexmaker.Local, com.google.dexmaker.Local)">aget</A></B>(<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;?&gt;&nbsp;array,
-     <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;java.lang.Integer&gt;&nbsp;index,
-     <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;?&gt;&nbsp;target)</CODE>
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/Code.html#aget(com.google.dexmaker.Local, com.google.dexmaker.Local, com.google.dexmaker.Local)">aget</A></B>(<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;?&gt;&nbsp;target,
+     <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;?&gt;&nbsp;array,
+     <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;java.lang.Integer&gt;&nbsp;index)</CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
@@ -155,8 +155,8 @@
 </TR>
 </TABLE>
 </CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/Code.html#arrayLength(com.google.dexmaker.Local, com.google.dexmaker.Local)">arrayLength</A></B>(<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;array,
-            <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;java.lang.Integer&gt;&nbsp;target)</CODE>
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/Code.html#arrayLength(com.google.dexmaker.Local, com.google.dexmaker.Local)">arrayLength</A></B>(<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;java.lang.Integer&gt;&nbsp;target,
+            <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;array)</CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
@@ -171,10 +171,10 @@
 </TR>
 </TABLE>
 </CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/Code.html#compare(com.google.dexmaker.Comparison, com.google.dexmaker.Local, com.google.dexmaker.Local, com.google.dexmaker.Label)">compare</A></B>(<A HREF="../../../com/google/dexmaker/Comparison.html" title="enum in com.google.dexmaker">Comparison</A>&nbsp;comparison,
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/Code.html#compare(com.google.dexmaker.Comparison, com.google.dexmaker.Label, com.google.dexmaker.Local, com.google.dexmaker.Local)">compare</A></B>(<A HREF="../../../com/google/dexmaker/Comparison.html" title="enum in com.google.dexmaker">Comparison</A>&nbsp;comparison,
+        <A HREF="../../../com/google/dexmaker/Label.html" title="class in com.google.dexmaker">Label</A>&nbsp;trueLabel,
         <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;a,
-        <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;b,
-        <A HREF="../../../com/google/dexmaker/Label.html" title="class in com.google.dexmaker">Label</A>&nbsp;trueLabel)</CODE>
+        <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;b)</CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Compare ints.</TD>
@@ -189,9 +189,9 @@
 </TR>
 </TABLE>
 </CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/Code.html#compare(com.google.dexmaker.Local, com.google.dexmaker.Local, com.google.dexmaker.Local)">compare</A></B>(<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;a,
-        <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;b,
-        <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;?&gt;&nbsp;target)</CODE>
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/Code.html#compare(com.google.dexmaker.Local, com.google.dexmaker.Local, com.google.dexmaker.Local)">compare</A></B>(<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;?&gt;&nbsp;target,
+        <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;a,
+        <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;b)</CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Compare longs.</TD>
@@ -208,9 +208,9 @@
 </TR>
 </TABLE>
 </CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/Code.html#compare(com.google.dexmaker.Local, com.google.dexmaker.Local, com.google.dexmaker.Local, int)">compare</A></B>(<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;a,
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/Code.html#compare(com.google.dexmaker.Local, com.google.dexmaker.Local, com.google.dexmaker.Local, int)">compare</A></B>(<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;java.lang.Integer&gt;&nbsp;target,
+        <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;a,
         <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;b,
-        <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;java.lang.Integer&gt;&nbsp;target,
         int&nbsp;nanValue)</CODE>
 
 <BR>
@@ -226,8 +226,8 @@
 </TR>
 </TABLE>
 </CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/Code.html#getParameter(int, com.google.dexmaker.Type)">getParameter</A></B>(int&nbsp;index,
-             <A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;T&gt;&nbsp;type)</CODE>
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/Code.html#getParameter(int, com.google.dexmaker.TypeId)">getParameter</A></B>(int&nbsp;index,
+             <A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;T&gt;&nbsp;type)</CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
@@ -242,7 +242,7 @@
 </TR>
 </TABLE>
 </CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/Code.html#getThis(com.google.dexmaker.Type)">getThis</A></B>(<A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;T&gt;&nbsp;type)</CODE>
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/Code.html#getThis(com.google.dexmaker.TypeId)">getThis</A></B>(<A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;T&gt;&nbsp;type)</CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
@@ -258,8 +258,8 @@
 </TABLE>
 </CODE></FONT></TD>
 <TD><CODE><B><A HREF="../../../com/google/dexmaker/Code.html#iget(com.google.dexmaker.FieldId, com.google.dexmaker.Local, com.google.dexmaker.Local)">iget</A></B>(<A HREF="../../../com/google/dexmaker/FieldId.html" title="class in com.google.dexmaker">FieldId</A>&lt;D,V&gt;&nbsp;fieldId,
-     <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;D&gt;&nbsp;instance,
-     <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;V&gt;&nbsp;target)</CODE>
+     <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;V&gt;&nbsp;target,
+     <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;D&gt;&nbsp;instance)</CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
@@ -267,9 +267,9 @@
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/Code.html#instanceOfType(com.google.dexmaker.Local, com.google.dexmaker.Local, com.google.dexmaker.Type)">instanceOfType</A></B>(<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;?&gt;&nbsp;target,
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/Code.html#instanceOfType(com.google.dexmaker.Local, com.google.dexmaker.Local, com.google.dexmaker.TypeId)">instanceOfType</A></B>(<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;?&gt;&nbsp;target,
                <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;?&gt;&nbsp;source,
-               <A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;?&gt;&nbsp;type)</CODE>
+               <A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;?&gt;&nbsp;type)</CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
@@ -422,8 +422,8 @@
 </TR>
 </TABLE>
 </CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/Code.html#negate(com.google.dexmaker.Local, com.google.dexmaker.Local)">negate</A></B>(<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;source,
-       <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;target)</CODE>
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/Code.html#negate(com.google.dexmaker.Local, com.google.dexmaker.Local)">negate</A></B>(<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;target,
+       <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;source)</CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
@@ -438,8 +438,8 @@
 </TR>
 </TABLE>
 </CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/Code.html#newArray(com.google.dexmaker.Local, com.google.dexmaker.Local)">newArray</A></B>(<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;java.lang.Integer&gt;&nbsp;length,
-         <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;target)</CODE>
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/Code.html#newArray(com.google.dexmaker.Local, com.google.dexmaker.Local)">newArray</A></B>(<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;target,
+         <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;java.lang.Integer&gt;&nbsp;length)</CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
@@ -463,14 +463,6 @@
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../com/google/dexmaker/Label.html" title="class in com.google.dexmaker">Label</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/Code.html#newLabel()">newLabel</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Creates a new label for use as a branch target.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>
 <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" SUMMARY="">
 <TR ALIGN="right" VALIGN="">
@@ -479,7 +471,7 @@
 </TR>
 </TABLE>
 </CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/Code.html#newLocal(com.google.dexmaker.Type)">newLocal</A></B>(<A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;T&gt;&nbsp;type)</CODE>
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/Code.html#newLocal(com.google.dexmaker.TypeId)">newLocal</A></B>(<A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;T&gt;&nbsp;type)</CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
@@ -494,8 +486,8 @@
 </TR>
 </TABLE>
 </CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/Code.html#not(com.google.dexmaker.Local, com.google.dexmaker.Local)">not</A></B>(<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;source,
-    <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;target)</CODE>
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/Code.html#not(com.google.dexmaker.Local, com.google.dexmaker.Local)">not</A></B>(<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;target,
+    <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;source)</CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
@@ -503,8 +495,8 @@
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/Code.html#numericCast(com.google.dexmaker.Local, com.google.dexmaker.Local)">numericCast</A></B>(<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;?&gt;&nbsp;source,
-            <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;?&gt;&nbsp;target)</CODE>
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/Code.html#numericCast(com.google.dexmaker.Local, com.google.dexmaker.Local)">numericCast</A></B>(<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;?&gt;&nbsp;target,
+            <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;?&gt;&nbsp;source)</CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
@@ -530,7 +522,7 @@
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;<A HREF="../../../com/google/dexmaker/Label.html" title="class in com.google.dexmaker">Label</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/Code.html#removeCatchClause(com.google.dexmaker.Type)">removeCatchClause</A></B>(<A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;?&gt;&nbsp;throwable)</CODE>
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/Code.html#removeCatchClause(com.google.dexmaker.TypeId)">removeCatchClause</A></B>(<A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;?&gt;&nbsp;throwable)</CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
@@ -594,8 +586,8 @@
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/Code.html#typeCast(com.google.dexmaker.Local, com.google.dexmaker.Local)">typeCast</A></B>(<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;?&gt;&nbsp;source,
-         <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;?&gt;&nbsp;target)</CODE>
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/Code.html#typeCast(com.google.dexmaker.Local, com.google.dexmaker.Local)">typeCast</A></B>(<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;?&gt;&nbsp;target,
+         <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;?&gt;&nbsp;source)</CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
@@ -623,10 +615,10 @@
 </TR>
 </TABLE>
 
-<A NAME="newLocal(com.google.dexmaker.Type)"><!-- --></A><H3>
+<A NAME="newLocal(com.google.dexmaker.TypeId)"><!-- --></A><H3>
 newLocal</H3>
 <PRE>
-public &lt;T&gt; <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt; <B>newLocal</B>(<A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;T&gt;&nbsp;type)</PRE>
+public &lt;T&gt; <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt; <B>newLocal</B>(<A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;T&gt;&nbsp;type)</PRE>
 <DL>
 <DD><DL>
 </DL>
@@ -634,11 +626,11 @@
 </DL>
 <HR>
 
-<A NAME="getParameter(int, com.google.dexmaker.Type)"><!-- --></A><H3>
+<A NAME="getParameter(int, com.google.dexmaker.TypeId)"><!-- --></A><H3>
 getParameter</H3>
 <PRE>
 public &lt;T&gt; <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt; <B>getParameter</B>(int&nbsp;index,
-                                 <A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;T&gt;&nbsp;type)</PRE>
+                                 <A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;T&gt;&nbsp;type)</PRE>
 <DL>
 <DD><DL>
 </DL>
@@ -646,10 +638,10 @@
 </DL>
 <HR>
 
-<A NAME="getThis(com.google.dexmaker.Type)"><!-- --></A><H3>
+<A NAME="getThis(com.google.dexmaker.TypeId)"><!-- --></A><H3>
 getThis</H3>
 <PRE>
-public &lt;T&gt; <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt; <B>getThis</B>(<A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;T&gt;&nbsp;type)</PRE>
+public &lt;T&gt; <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt; <B>getThis</B>(<A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;T&gt;&nbsp;type)</PRE>
 <DL>
 <DD><DL>
 </DL>
@@ -657,20 +649,6 @@
 </DL>
 <HR>
 
-<A NAME="newLabel()"><!-- --></A><H3>
-newLabel</H3>
-<PRE>
-public <A HREF="../../../com/google/dexmaker/Label.html" title="class in com.google.dexmaker">Label</A> <B>newLabel</B>()</PRE>
-<DL>
-<DD>Creates a new label for use as a branch target. The new label must have
- code attached to it later by calling <A HREF="../../../com/google/dexmaker/Code.html#mark(com.google.dexmaker.Label)"><CODE>mark(Label)</CODE></A>.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
 <A NAME="mark(com.google.dexmaker.Label)"><!-- --></A><H3>
 mark</H3>
 <PRE>
@@ -695,10 +673,10 @@
 </DL>
 <HR>
 
-<A NAME="addCatchClause(com.google.dexmaker.Type, com.google.dexmaker.Label)"><!-- --></A><H3>
+<A NAME="addCatchClause(com.google.dexmaker.TypeId, com.google.dexmaker.Label)"><!-- --></A><H3>
 addCatchClause</H3>
 <PRE>
-public void <B>addCatchClause</B>(<A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;?&gt;&nbsp;throwable,
+public void <B>addCatchClause</B>(<A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;?&gt;&nbsp;throwable,
                            <A HREF="../../../com/google/dexmaker/Label.html" title="class in com.google.dexmaker">Label</A>&nbsp;catchClause)</PRE>
 <DL>
 <DD><DL>
@@ -707,10 +685,10 @@
 </DL>
 <HR>
 
-<A NAME="removeCatchClause(com.google.dexmaker.Type)"><!-- --></A><H3>
+<A NAME="removeCatchClause(com.google.dexmaker.TypeId)"><!-- --></A><H3>
 removeCatchClause</H3>
 <PRE>
-public <A HREF="../../../com/google/dexmaker/Label.html" title="class in com.google.dexmaker">Label</A> <B>removeCatchClause</B>(<A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;?&gt;&nbsp;throwable)</PRE>
+public <A HREF="../../../com/google/dexmaker/Label.html" title="class in com.google.dexmaker">Label</A> <B>removeCatchClause</B>(<A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;?&gt;&nbsp;throwable)</PRE>
 <DL>
 <DD><DL>
 </DL>
@@ -744,8 +722,8 @@
 <A NAME="negate(com.google.dexmaker.Local, com.google.dexmaker.Local)"><!-- --></A><H3>
 negate</H3>
 <PRE>
-public &lt;T&gt; void <B>negate</B>(<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;source,
-                       <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;target)</PRE>
+public &lt;T&gt; void <B>negate</B>(<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;target,
+                       <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;source)</PRE>
 <DL>
 <DD><DL>
 </DL>
@@ -756,8 +734,8 @@
 <A NAME="not(com.google.dexmaker.Local, com.google.dexmaker.Local)"><!-- --></A><H3>
 not</H3>
 <PRE>
-public &lt;T&gt; void <B>not</B>(<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;source,
-                    <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;target)</PRE>
+public &lt;T&gt; void <B>not</B>(<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;target,
+                    <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;source)</PRE>
 <DL>
 <DD><DL>
 </DL>
@@ -768,8 +746,8 @@
 <A NAME="numericCast(com.google.dexmaker.Local, com.google.dexmaker.Local)"><!-- --></A><H3>
 numericCast</H3>
 <PRE>
-public void <B>numericCast</B>(<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;?&gt;&nbsp;source,
-                        <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;?&gt;&nbsp;target)</PRE>
+public void <B>numericCast</B>(<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;?&gt;&nbsp;target,
+                        <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;?&gt;&nbsp;source)</PRE>
 <DL>
 <DD><DL>
 </DL>
@@ -791,13 +769,13 @@
 </DL>
 <HR>
 
-<A NAME="compare(com.google.dexmaker.Comparison, com.google.dexmaker.Local, com.google.dexmaker.Local, com.google.dexmaker.Label)"><!-- --></A><H3>
+<A NAME="compare(com.google.dexmaker.Comparison, com.google.dexmaker.Label, com.google.dexmaker.Local, com.google.dexmaker.Local)"><!-- --></A><H3>
 compare</H3>
 <PRE>
 public &lt;T&gt; void <B>compare</B>(<A HREF="../../../com/google/dexmaker/Comparison.html" title="enum in com.google.dexmaker">Comparison</A>&nbsp;comparison,
+                        <A HREF="../../../com/google/dexmaker/Label.html" title="class in com.google.dexmaker">Label</A>&nbsp;trueLabel,
                         <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;a,
-                        <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;b,
-                        <A HREF="../../../com/google/dexmaker/Label.html" title="class in com.google.dexmaker">Label</A>&nbsp;trueLabel)</PRE>
+                        <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;b)</PRE>
 <DL>
 <DD>Compare ints. If the comparison is true, execution jumps to <code>trueLabel</code>. If it is false, execution continues to the next instruction.
 <P>
@@ -810,9 +788,9 @@
 <A NAME="compare(com.google.dexmaker.Local, com.google.dexmaker.Local, com.google.dexmaker.Local, int)"><!-- --></A><H3>
 compare</H3>
 <PRE>
-public &lt;T extends java.lang.Number&gt; void <B>compare</B>(<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;a,
+public &lt;T extends java.lang.Number&gt; void <B>compare</B>(<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;java.lang.Integer&gt;&nbsp;target,
+                                                 <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;a,
                                                  <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;b,
-                                                 <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;java.lang.Integer&gt;&nbsp;target,
                                                  int&nbsp;nanValue)</PRE>
 <DL>
 <DD>Compare floats or doubles.
@@ -826,9 +804,9 @@
 <A NAME="compare(com.google.dexmaker.Local, com.google.dexmaker.Local, com.google.dexmaker.Local)"><!-- --></A><H3>
 compare</H3>
 <PRE>
-public &lt;T&gt; void <B>compare</B>(<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;a,
-                        <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;b,
-                        <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;?&gt;&nbsp;target)</PRE>
+public &lt;T&gt; void <B>compare</B>(<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;?&gt;&nbsp;target,
+                        <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;a,
+                        <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;b)</PRE>
 <DL>
 <DD>Compare longs.
 <P>
@@ -842,8 +820,8 @@
 iget</H3>
 <PRE>
 public &lt;D,V&gt; void <B>iget</B>(<A HREF="../../../com/google/dexmaker/FieldId.html" title="class in com.google.dexmaker">FieldId</A>&lt;D,V&gt;&nbsp;fieldId,
-                       <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;D&gt;&nbsp;instance,
-                       <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;V&gt;&nbsp;target)</PRE>
+                       <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;V&gt;&nbsp;target,
+                       <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;D&gt;&nbsp;instance)</PRE>
 <DL>
 <DD><DL>
 </DL>
@@ -970,12 +948,12 @@
 </DL>
 <HR>
 
-<A NAME="instanceOfType(com.google.dexmaker.Local, com.google.dexmaker.Local, com.google.dexmaker.Type)"><!-- --></A><H3>
+<A NAME="instanceOfType(com.google.dexmaker.Local, com.google.dexmaker.Local, com.google.dexmaker.TypeId)"><!-- --></A><H3>
 instanceOfType</H3>
 <PRE>
 public void <B>instanceOfType</B>(<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;?&gt;&nbsp;target,
                            <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;?&gt;&nbsp;source,
-                           <A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;?&gt;&nbsp;type)</PRE>
+                           <A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;?&gt;&nbsp;type)</PRE>
 <DL>
 <DD><DL>
 </DL>
@@ -986,8 +964,8 @@
 <A NAME="typeCast(com.google.dexmaker.Local, com.google.dexmaker.Local)"><!-- --></A><H3>
 typeCast</H3>
 <PRE>
-public void <B>typeCast</B>(<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;?&gt;&nbsp;source,
-                     <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;?&gt;&nbsp;target)</PRE>
+public void <B>typeCast</B>(<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;?&gt;&nbsp;target,
+                     <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;?&gt;&nbsp;source)</PRE>
 <DL>
 <DD><DL>
 </DL>
@@ -998,8 +976,8 @@
 <A NAME="arrayLength(com.google.dexmaker.Local, com.google.dexmaker.Local)"><!-- --></A><H3>
 arrayLength</H3>
 <PRE>
-public &lt;T&gt; void <B>arrayLength</B>(<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;array,
-                            <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;java.lang.Integer&gt;&nbsp;target)</PRE>
+public &lt;T&gt; void <B>arrayLength</B>(<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;java.lang.Integer&gt;&nbsp;target,
+                            <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;array)</PRE>
 <DL>
 <DD><DL>
 </DL>
@@ -1010,8 +988,8 @@
 <A NAME="newArray(com.google.dexmaker.Local, com.google.dexmaker.Local)"><!-- --></A><H3>
 newArray</H3>
 <PRE>
-public &lt;T&gt; void <B>newArray</B>(<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;java.lang.Integer&gt;&nbsp;length,
-                         <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;target)</PRE>
+public &lt;T&gt; void <B>newArray</B>(<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;T&gt;&nbsp;target,
+                         <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;java.lang.Integer&gt;&nbsp;length)</PRE>
 <DL>
 <DD><DL>
 </DL>
@@ -1022,9 +1000,9 @@
 <A NAME="aget(com.google.dexmaker.Local, com.google.dexmaker.Local, com.google.dexmaker.Local)"><!-- --></A><H3>
 aget</H3>
 <PRE>
-public void <B>aget</B>(<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;?&gt;&nbsp;array,
-                 <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;java.lang.Integer&gt;&nbsp;index,
-                 <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;?&gt;&nbsp;target)</PRE>
+public void <B>aget</B>(<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;?&gt;&nbsp;target,
+                 <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;?&gt;&nbsp;array,
+                 <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local</A>&lt;java.lang.Integer&gt;&nbsp;index)</PRE>
 <DL>
 <DD><DL>
 </DL>
diff --git a/javadoc/com/google/dexmaker/Comparison.html b/javadoc/com/google/dexmaker/Comparison.html
index f63aa57..96a651d 100644
--- a/javadoc/com/google/dexmaker/Comparison.html
+++ b/javadoc/com/google/dexmaker/Comparison.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_26) on Tue Jan 03 17:07:49 EST 2012 -->
+<!-- Generated by javadoc (build 1.6.0_26) on Fri Jan 06 14:58:30 EST 2012 -->
 <TITLE>
 Comparison (dexmaker)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-01-03">
+<META NAME="date" CONTENT="2012-01-06">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 
@@ -55,7 +55,7 @@
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
 &nbsp;<A HREF="../../../com/google/dexmaker/Code.html" title="class in com.google.dexmaker"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/google/dexmaker/DexGenerator.html" title="class in com.google.dexmaker"><B>NEXT CLASS</B></A></FONT></TD>
+&nbsp;<A HREF="../../../com/google/dexmaker/DexMaker.html" title="class in com.google.dexmaker"><B>NEXT CLASS</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../../../index.html?com/google/dexmaker/Comparison.html" target="_top"><B>FRAMES</B></A>  &nbsp;
 &nbsp;<A HREF="Comparison.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
@@ -366,7 +366,7 @@
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
 &nbsp;<A HREF="../../../com/google/dexmaker/Code.html" title="class in com.google.dexmaker"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/google/dexmaker/DexGenerator.html" title="class in com.google.dexmaker"><B>NEXT CLASS</B></A></FONT></TD>
+&nbsp;<A HREF="../../../com/google/dexmaker/DexMaker.html" title="class in com.google.dexmaker"><B>NEXT CLASS</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../../../index.html?com/google/dexmaker/Comparison.html" target="_top"><B>FRAMES</B></A>  &nbsp;
 &nbsp;<A HREF="Comparison.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
diff --git a/javadoc/com/google/dexmaker/DexGenerator.html b/javadoc/com/google/dexmaker/DexGenerator.html
deleted file mode 100644
index 689075d..0000000
--- a/javadoc/com/google/dexmaker/DexGenerator.html
+++ /dev/null
@@ -1,387 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_26) on Tue Jan 03 17:07:49 EST 2012 -->
-<TITLE>
-DexGenerator (dexmaker)
-</TITLE>
-
-<META NAME="date" CONTENT="2012-01-03">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="DexGenerator (dexmaker)";
-    }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/google/dexmaker/Comparison.html" title="enum in com.google.dexmaker"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/google/dexmaker/FieldId.html" title="class in com.google.dexmaker"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/google/dexmaker/DexGenerator.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="DexGenerator.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-com.google.dexmaker</FONT>
-<BR>
-Class DexGenerator</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>com.google.dexmaker.DexGenerator</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public final class <B>DexGenerator</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-Define types, fields and methods.
-<P>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/DexGenerator.html#DexGenerator()">DexGenerator</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/DexGenerator.html#declare(com.google.dexmaker.FieldId, int, java.lang.Object)">declare</A></B>(<A HREF="../../../com/google/dexmaker/FieldId.html" title="class in com.google.dexmaker">FieldId</A>&lt;?,?&gt;&nbsp;fieldId,
-        int&nbsp;flags,
-        java.lang.Object&nbsp;staticValue)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../com/google/dexmaker/Code.html" title="class in com.google.dexmaker">Code</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/DexGenerator.html#declare(com.google.dexmaker.MethodId, int)">declare</A></B>(<A HREF="../../../com/google/dexmaker/MethodId.html" title="class in com.google.dexmaker">MethodId</A>&lt;?,?&gt;&nbsp;method,
-        int&nbsp;flags)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/DexGenerator.html#declare(com.google.dexmaker.Type, java.lang.String, int, com.google.dexmaker.Type, com.google.dexmaker.Type...)">declare</A></B>(<A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;?&gt;&nbsp;type,
-        java.lang.String&nbsp;sourceFile,
-        int&nbsp;flags,
-        <A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;?&gt;&nbsp;supertype,
-        <A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;?&gt;...&nbsp;interfaces)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../com/google/dexmaker/Code.html" title="class in com.google.dexmaker">Code</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/DexGenerator.html#declareConstructor(com.google.dexmaker.MethodId, int)">declareConstructor</A></B>(<A HREF="../../../com/google/dexmaker/MethodId.html" title="class in com.google.dexmaker">MethodId</A>&lt;?,?&gt;&nbsp;method,
-                   int&nbsp;flags)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;byte[]</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/DexGenerator.html#generate()">generate</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns a .dex formatted file.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.ClassLoader</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/DexGenerator.html#load(java.lang.ClassLoader, java.io.File, java.io.File)">load</A></B>(java.lang.ClassLoader&nbsp;parent,
-     java.io.File&nbsp;dexOutputDir,
-     java.io.File&nbsp;dexOptCacheDir)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Loads the generated types into the current process.</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="DexGenerator()"><!-- --></A><H3>
-DexGenerator</H3>
-<PRE>
-public <B>DexGenerator</B>()</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="declare(com.google.dexmaker.Type, java.lang.String, int, com.google.dexmaker.Type, com.google.dexmaker.Type...)"><!-- --></A><H3>
-declare</H3>
-<PRE>
-public void <B>declare</B>(<A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;?&gt;&nbsp;type,
-                    java.lang.String&nbsp;sourceFile,
-                    int&nbsp;flags,
-                    <A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;?&gt;&nbsp;supertype,
-                    <A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;?&gt;...&nbsp;interfaces)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>flags</CODE> - any flags masked by <CODE>com.android.dx.rop.code.AccessFlags#CLASS_FLAGS</CODE>.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="declareConstructor(com.google.dexmaker.MethodId, int)"><!-- --></A><H3>
-declareConstructor</H3>
-<PRE>
-public <A HREF="../../../com/google/dexmaker/Code.html" title="class in com.google.dexmaker">Code</A> <B>declareConstructor</B>(<A HREF="../../../com/google/dexmaker/MethodId.html" title="class in com.google.dexmaker">MethodId</A>&lt;?,?&gt;&nbsp;method,
-                               int&nbsp;flags)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>flags</CODE> - any flags masked by <CODE>com.android.dx.rop.code.AccessFlags#METHOD_FLAGS</CODE>.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="declare(com.google.dexmaker.MethodId, int)"><!-- --></A><H3>
-declare</H3>
-<PRE>
-public <A HREF="../../../com/google/dexmaker/Code.html" title="class in com.google.dexmaker">Code</A> <B>declare</B>(<A HREF="../../../com/google/dexmaker/MethodId.html" title="class in com.google.dexmaker">MethodId</A>&lt;?,?&gt;&nbsp;method,
-                    int&nbsp;flags)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>flags</CODE> - any flags masked by <CODE>com.android.dx.rop.code.AccessFlags#METHOD_FLAGS</CODE>.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="declare(com.google.dexmaker.FieldId, int, java.lang.Object)"><!-- --></A><H3>
-declare</H3>
-<PRE>
-public void <B>declare</B>(<A HREF="../../../com/google/dexmaker/FieldId.html" title="class in com.google.dexmaker">FieldId</A>&lt;?,?&gt;&nbsp;fieldId,
-                    int&nbsp;flags,
-                    java.lang.Object&nbsp;staticValue)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>flags</CODE> - any flags masked by <CODE>AccessFlags#FIELD_FLAGS</CODE>.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="generate()"><!-- --></A><H3>
-generate</H3>
-<PRE>
-public byte[] <B>generate</B>()</PRE>
-<DL>
-<DD>Returns a .dex formatted file.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="load(java.lang.ClassLoader, java.io.File, java.io.File)"><!-- --></A><H3>
-load</H3>
-<PRE>
-public java.lang.ClassLoader <B>load</B>(java.lang.ClassLoader&nbsp;parent,
-                                  java.io.File&nbsp;dexOutputDir,
-                                  java.io.File&nbsp;dexOptCacheDir)
-                           throws java.io.IOException</PRE>
-<DL>
-<DD>Loads the generated types into the current process.
-
- <p>All parameters are optional, you may pass <code>null</code> and suitable
- defaults will be used.
-
- <p>If you opt to provide your own output directories, take care to
- ensure that they are not world-readable, otherwise a malicious app will
- be able to inject code to run.  A suitable parameter for these output
- directories would be something like this:
- <code>getApplicationContext().getDir("dx", Context.MODE_PRIVATE); </code>
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>parent</CODE> - the parent ClassLoader to be used when loading
-     our generated types<DD><CODE>dexOutputDir</CODE> - the destination directory wherein we will write
-     emitted .dex files before they end up in the cache directory<DD><CODE>dexOptCacheDir</CODE> - where optimized .dex files are to be written
-<DT><B>Throws:</B>
-<DD><CODE>java.io.IOException</CODE></DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/google/dexmaker/Comparison.html" title="enum in com.google.dexmaker"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/google/dexmaker/FieldId.html" title="class in com.google.dexmaker"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/google/dexmaker/DexGenerator.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="DexGenerator.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/javadoc/com/google/dexmaker/DexMaker.html b/javadoc/com/google/dexmaker/DexMaker.html
new file mode 100644
index 0000000..ed40733
--- /dev/null
+++ b/javadoc/com/google/dexmaker/DexMaker.html
@@ -0,0 +1,516 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc (build 1.6.0_26) on Fri Jan 06 14:58:30 EST 2012 -->
+<TITLE>
+DexMaker (dexmaker)
+</TITLE>
+
+<META NAME="date" CONTENT="2012-01-06">
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="DexMaker (dexmaker)";
+    }
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;<A HREF="../../../com/google/dexmaker/Comparison.html" title="enum in com.google.dexmaker"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../com/google/dexmaker/FieldId.html" title="class in com.google.dexmaker"><B>NEXT CLASS</B></A></FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../index.html?com/google/dexmaker/DexMaker.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="DexMaker.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+<TR>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<HR>
+<!-- ======== START OF CLASS DATA ======== -->
+<H2>
+<FONT SIZE="-1">
+com.google.dexmaker</FONT>
+<BR>
+Class DexMaker</H2>
+<PRE>
+java.lang.Object
+  <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>com.google.dexmaker.DexMaker</B>
+</PRE>
+<HR>
+<DL>
+<DT><PRE>public final class <B>DexMaker</B><DT>extends java.lang.Object</DL>
+</PRE>
+
+<P>
+Generates a </i><strong>D</strong>alvik <strong>EX</strong>ecutable (dex)
+ file for execution on Android. dex files defines classes and interfaces,
+ including their member methods and fields, executable code, and debugging
+ information. They also define annotations, though this API currently has no
+ facility to create a dex file that contains annotations.
+
+ <p>This library is intended to satisfy two use cases:
+ <ul>
+   <li><strong>For runtime code generation.</strong> By embedding this library
+       in your Android application, you can dynamically generate and load
+       executable code. This approach takes advantage of the fact that the
+       host environment and target environment are both Android.
+   <li><strong>For compile time code generation.</strong> You may use this
+       library as a part of a compiler that targets Android. In this scenario
+       the generated dex file must be installed on an Android device before it
+       can be executed.
+ </ul>
+
+ <h3>Example: Fibonacci</h3>
+ To illustrate how this API is used, we'll use DexMaker to generate a class
+ equivalent to the following Java source: <pre>   <code>package com.publicobject.fib;
+
+ public class Fibonacci {
+   public static int fib(int i) {
+     if (i &lt; 2) {
+       return i;
+     }
+     return fib(i - 1) + fib(i - 2);
+   }
+ }</code></pre>
+
+ <p>We start by creating a <A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker"><CODE>TypeId</CODE></A> to identify the generated <code>Fibonacci</code> class. DexMaker identifies types by their internal names like
+ <code>Ljava/lang/Object;</code> rather than their Java identifiers like <code>java.lang.Object</code>. <pre>   <code>TypeId&lt;?&gt; fibonacci = TypeId.get("Lcom/google/dexmaker/examples/Fibonacci;");
+ </code></pre>
+
+ <p>Next we declare the class. It allows us to specify the type's source file
+ for stack traces, its modifiers, its superclass, and the interfaces it
+ implements. In this case, <code>Fibonacci</code> is a public class that extends
+ from <code>Object</code>: <pre>   <code>String fileName = "Fibonacci.generated";
+   DexMaker dexMaker = new DexMaker();
+   dexMaker.declare(fibonacci, fileName, Modifier.PUBLIC, TypeId.OBJECT);
+ </code></pre>
+ It is illegal to declare members of a class without also declaring the class
+ itself.
+
+ <p>To make it easier to go from our Java method to dex instructions, we'll
+ manually translate it to pseudocode fit for an assembler. We need to replace
+ control flow like <code>if()</code> blocks and <code>for()</code> loops with labels and
+ branches. We'll also avoid performing multiple operations in one statement,
+ using local variables to hold intermediate values as necessary:
+ <pre>   <code>int constant1 = 1;
+   int constant2 = 2;
+   if (i &lt; constant2) goto baseCase;
+   int a = i - constant1;
+   int b = i - constant2;
+   int c = fib(a);
+   int d = fib(b);
+   int result = c + d;
+   return result;
+ baseCase:
+   return i;
+ </code></pre>
+
+ <p>We lookup the <code>MethodId</code> for the method on the declaring type. This
+ takes the method's return type (possibly <A HREF="../../../com/google/dexmaker/TypeId.html#VOID"><CODE>TypeId.VOID</CODE></A>), its name, and
+ its parameters. Next we declare the method, specifying its modifiers by ORing
+ constants from <CODE>Modifier</CODE>. The declare call returns a
+ <A HREF="../../../com/google/dexmaker/Code.html" title="class in com.google.dexmaker"><CODE>Code</CODE></A> object, which we'll use to define the method's instructions.
+ <pre>   <code>MethodId&lt;?, Integer&gt; fib = fibonacci.getMethod(TypeId.INT, "fib", TypeId.INT);
+   Code code = dexMaker.declare(fib, Modifier.PUBLIC | Modifier.STATIC);
+ </code></pre>
+
+ <p>One limitation of <code>DexMaker</code>'s API is that it requires all local
+ variables to be created before any instructions are emitted. Use <A HREF="../../../com/google/dexmaker/Code.html#newLocal(com.google.dexmaker.TypeId)"><CODE>Code.newLocal(com.google.dexmaker.TypeId<T>)</CODE></A> to create a new local variable. The method's parameters are
+ exposed as locals using <A HREF="../../../com/google/dexmaker/Code.html#getParameter(int, com.google.dexmaker.TypeId)"><CODE>Code.getParameter(int, com.google.dexmaker.TypeId<T>)</CODE></A>. For non-static methods the
+ 'this' pointer is exposed using <A HREF="../../../com/google/dexmaker/Code.html#getThis(com.google.dexmaker.TypeId)"><CODE>Code.getThis(com.google.dexmaker.TypeId<T>)</CODE></A>. Here we declare all of
+ the local variables that we'll need for our <code>fib()</code> method:
+ <pre>   <code>Local&lt;Integer&gt; i = code.getParameter(0, TypeId.INT);
+   Local&lt;Integer&gt; constant1 = code.newLocal(TypeId.INT);
+   Local&lt;Integer&gt; constant2 = code.newLocal(TypeId.INT);
+   Local&lt;Integer&gt; a = code.newLocal(TypeId.INT);
+   Local&lt;Integer&gt; b = code.newLocal(TypeId.INT);
+   Local&lt;Integer&gt; c = code.newLocal(TypeId.INT);
+   Local&lt;Integer&gt; d = code.newLocal(TypeId.INT);
+   Local&lt;Integer&gt; result = code.newLocal(TypeId.INT);
+ </code></pre>
+
+ <p>Notice that <A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker"><CODE>Local</CODE></A> has a type parameter. This is useful for
+ generating code that works with existing types like <code>String</code> and <code>Integer</code>, but it can be a hindrance when generating code that involves new
+ types. For this reason you may prefer to use raw types only and add
+ <code>@SuppressWarnings("unsafe")</code> on your calling code. This will yield the
+ same result but you won't get a compiler warning if you make a type error.
+
+ <p>We're ready to start defining our method's instructions: <pre>   <code>code.loadConstant(constant1, 1);
+   code.loadConstant(constant2, 2);
+   Label baseCase = new Label();
+   code.compare(Comparison.LT, baseCase, i, constant2);
+   code.op(BinaryOp.SUBTRACT, a, i, constant1);
+   code.op(BinaryOp.SUBTRACT, b, i, constant2);
+   code.invokeStatic(fib, c, a);
+   code.invokeStatic(fib, d, b);
+   code.op(BinaryOp.ADD, result, c, d);
+   code.returnValue(result);
+   code.mark(baseCase);
+   code.returnValue(i);
+ </code></pre>
+
+ <p>We're done defining the instructions! We just need to write the dex to the
+ file system or load it into the current process. For this example we'll load
+ the generated code into the current process. This only works when the current
+ process is running on Android. We use <A HREF="../../../com/google/dexmaker/DexMaker.html#generateAndLoad(java.lang.ClassLoader, java.io.File)"><CODE>generateAndLoad(java.lang.ClassLoader, java.io.File)</CODE></A> which takes
+ the class loader that will be used as our generated code's parent class
+ loader. It also requires a directory where temporary files can be written.
+ <pre>   <code>ClassLoader loader = dexMaker.generateAndLoad(
+       Fibonacci.class.getClassLoader(), getDataDirectory());
+ </code></pre>
+ Finally we'll use reflection to lookup our generated class on its class
+ loader and invoke its <code>fib()</code> method: <pre>   <code>Class&lt;?&gt; fibonacciClass = loader.loadClass("com.google.dexmaker.examples.Fibonacci");
+   Method fibMethod = fibonacciClass.getMethod("fib", int.class);
+   System.out.println(fibMethod.invoke(null, 8));
+ </code></pre>
+<P>
+
+<P>
+<HR>
+
+<P>
+
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+
+<A NAME="constructor_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Constructor Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/DexMaker.html#DexMaker()">DexMaker</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<!-- ========== METHOD SUMMARY =========== -->
+
+<A NAME="method_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Method Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/DexMaker.html#declare(com.google.dexmaker.FieldId, int, java.lang.Object)">declare</A></B>(<A HREF="../../../com/google/dexmaker/FieldId.html" title="class in com.google.dexmaker">FieldId</A>&lt;?,?&gt;&nbsp;fieldId,
+        int&nbsp;flags,
+        java.lang.Object&nbsp;staticValue)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Declares a field.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../com/google/dexmaker/Code.html" title="class in com.google.dexmaker">Code</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/DexMaker.html#declare(com.google.dexmaker.MethodId, int)">declare</A></B>(<A HREF="../../../com/google/dexmaker/MethodId.html" title="class in com.google.dexmaker">MethodId</A>&lt;?,?&gt;&nbsp;method,
+        int&nbsp;flags)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Declares a method.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/DexMaker.html#declare(com.google.dexmaker.TypeId, java.lang.String, int, com.google.dexmaker.TypeId, com.google.dexmaker.TypeId...)">declare</A></B>(<A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;?&gt;&nbsp;type,
+        java.lang.String&nbsp;sourceFile,
+        int&nbsp;flags,
+        <A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;?&gt;&nbsp;supertype,
+        <A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;?&gt;...&nbsp;interfaces)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Declares <code>type</code>.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../com/google/dexmaker/Code.html" title="class in com.google.dexmaker">Code</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/DexMaker.html#declareConstructor(com.google.dexmaker.MethodId, int)">declareConstructor</A></B>(<A HREF="../../../com/google/dexmaker/MethodId.html" title="class in com.google.dexmaker">MethodId</A>&lt;?,?&gt;&nbsp;method,
+                   int&nbsp;flags)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Declares a constructor.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;byte[]</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/DexMaker.html#generate()">generate</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Generates a dex file and returns its bytes.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;java.lang.ClassLoader</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/DexMaker.html#generateAndLoad(java.lang.ClassLoader, java.io.File)">generateAndLoad</A></B>(java.lang.ClassLoader&nbsp;parent,
+                java.io.File&nbsp;dexDir)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Generates a dex file and loads its types into the current process.</TD>
+</TR>
+</TABLE>
+&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+
+<A NAME="constructor_detail"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Constructor Detail</B></FONT></TH>
+</TR>
+</TABLE>
+
+<A NAME="DexMaker()"><!-- --></A><H3>
+DexMaker</H3>
+<PRE>
+public <B>DexMaker</B>()</PRE>
+<DL>
+</DL>
+
+<!-- ============ METHOD DETAIL ========== -->
+
+<A NAME="method_detail"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Method Detail</B></FONT></TH>
+</TR>
+</TABLE>
+
+<A NAME="declare(com.google.dexmaker.TypeId, java.lang.String, int, com.google.dexmaker.TypeId, com.google.dexmaker.TypeId...)"><!-- --></A><H3>
+declare</H3>
+<PRE>
+public void <B>declare</B>(<A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;?&gt;&nbsp;type,
+                    java.lang.String&nbsp;sourceFile,
+                    int&nbsp;flags,
+                    <A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;?&gt;&nbsp;supertype,
+                    <A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;?&gt;...&nbsp;interfaces)</PRE>
+<DL>
+<DD>Declares <code>type</code>.
+<P>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>flags</CODE> - a bitwise combination of <CODE>Modifier.PUBLIC</CODE>, <CODE>Modifier.FINAL</CODE> and <CODE>Modifier.ABSTRACT</CODE>.</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="declareConstructor(com.google.dexmaker.MethodId, int)"><!-- --></A><H3>
+declareConstructor</H3>
+<PRE>
+public <A HREF="../../../com/google/dexmaker/Code.html" title="class in com.google.dexmaker">Code</A> <B>declareConstructor</B>(<A HREF="../../../com/google/dexmaker/MethodId.html" title="class in com.google.dexmaker">MethodId</A>&lt;?,?&gt;&nbsp;method,
+                               int&nbsp;flags)</PRE>
+<DL>
+<DD>Declares a constructor. The name of <code>method</code> must be "<init>",
+ as it is on all instances returned by <A HREF="../../../com/google/dexmaker/TypeId.html#getConstructor(com.google.dexmaker.TypeId...)"><CODE>TypeId.getConstructor(com.google.dexmaker.TypeId<?>...)</CODE></A>.
+<P>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>flags</CODE> - a bitwise combination of <CODE>Modifier.PUBLIC</CODE>, <CODE>Modifier.PRIVATE</CODE>, <CODE>Modifier.PROTECTED</CODE>, <CODE>Modifier.STATIC</CODE>,
+     <CODE>Modifier.FINAL</CODE>, and <CODE>Modifier.VARARGS</CODE>.</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="declare(com.google.dexmaker.MethodId, int)"><!-- --></A><H3>
+declare</H3>
+<PRE>
+public <A HREF="../../../com/google/dexmaker/Code.html" title="class in com.google.dexmaker">Code</A> <B>declare</B>(<A HREF="../../../com/google/dexmaker/MethodId.html" title="class in com.google.dexmaker">MethodId</A>&lt;?,?&gt;&nbsp;method,
+                    int&nbsp;flags)</PRE>
+<DL>
+<DD>Declares a method. The name of <code>method</code> must not be "<init>".
+<P>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>flags</CODE> - a bitwise combination of <CODE>Modifier.PUBLIC</CODE>, <CODE>Modifier.PRIVATE</CODE>, <CODE>Modifier.PROTECTED</CODE>, <CODE>Modifier.STATIC</CODE>,
+     <CODE>Modifier.FINAL</CODE>, and <CODE>Modifier.VARARGS</CODE>.</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="declare(com.google.dexmaker.FieldId, int, java.lang.Object)"><!-- --></A><H3>
+declare</H3>
+<PRE>
+public void <B>declare</B>(<A HREF="../../../com/google/dexmaker/FieldId.html" title="class in com.google.dexmaker">FieldId</A>&lt;?,?&gt;&nbsp;fieldId,
+                    int&nbsp;flags,
+                    java.lang.Object&nbsp;staticValue)</PRE>
+<DL>
+<DD>Declares a field.
+<P>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>flags</CODE> - a bitwise combination of <CODE>Modifier.PUBLIC</CODE>, <CODE>Modifier.PRIVATE</CODE>, <CODE>Modifier.PROTECTED</CODE>, <CODE>Modifier.STATIC</CODE>,
+     <CODE>Modifier.FINAL</CODE>, <CODE>Modifier.VOLATILE</CODE>, and <CODE>Modifier.TRANSIENT</CODE>.</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="generate()"><!-- --></A><H3>
+generate</H3>
+<PRE>
+public byte[] <B>generate</B>()</PRE>
+<DL>
+<DD>Generates a dex file and returns its bytes.
+<P>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="generateAndLoad(java.lang.ClassLoader, java.io.File)"><!-- --></A><H3>
+generateAndLoad</H3>
+<PRE>
+public java.lang.ClassLoader <B>generateAndLoad</B>(java.lang.ClassLoader&nbsp;parent,
+                                             java.io.File&nbsp;dexDir)
+                                      throws java.io.IOException</PRE>
+<DL>
+<DD>Generates a dex file and loads its types into the current process.
+
+ <p>All parameters are optional; you may pass <code>null</code> and suitable
+ defaults will be used.
+
+ <p>If you opt to provide your own <code>dexDir</code>, take care to ensure
+ that it is not world-writable, otherwise a malicious app may be able
+ to inject code into your process.  A suitable parameter is:
+ <code>getApplicationContext().getDir("dx", Context.MODE_PRIVATE); </code>
+<P>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>parent</CODE> - the parent ClassLoader to be used when loading
+     our generated types<DD><CODE>dexDir</CODE> - the destination directory where generated and
+     optimized dex files will be written.
+<DT><B>Throws:</B>
+<DD><CODE>java.io.IOException</CODE></DL>
+</DD>
+</DL>
+<!-- ========= END OF CLASS DATA ========= -->
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;<A HREF="../../../com/google/dexmaker/Comparison.html" title="enum in com.google.dexmaker"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../com/google/dexmaker/FieldId.html" title="class in com.google.dexmaker"><B>NEXT CLASS</B></A></FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../index.html?com/google/dexmaker/DexMaker.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="DexMaker.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+<TR>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<HR>
+
+</BODY>
+</HTML>
diff --git a/javadoc/com/google/dexmaker/FieldId.html b/javadoc/com/google/dexmaker/FieldId.html
index 692ec98..d7af1ac 100644
--- a/javadoc/com/google/dexmaker/FieldId.html
+++ b/javadoc/com/google/dexmaker/FieldId.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_26) on Tue Jan 03 17:07:49 EST 2012 -->
+<!-- Generated by javadoc (build 1.6.0_26) on Fri Jan 06 14:58:31 EST 2012 -->
 <TITLE>
 FieldId (dexmaker)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-01-03">
+<META NAME="date" CONTENT="2012-01-06">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 
@@ -54,7 +54,7 @@
 
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/google/dexmaker/DexGenerator.html" title="class in com.google.dexmaker"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../com/google/dexmaker/DexMaker.html" title="class in com.google.dexmaker"><B>PREV CLASS</B></A>&nbsp;
 &nbsp;<A HREF="../../../com/google/dexmaker/Label.html" title="class in com.google.dexmaker"><B>NEXT CLASS</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../../../index.html?com/google/dexmaker/FieldId.html" target="_top"><B>FRAMES</B></A>  &nbsp;
@@ -100,7 +100,7 @@
 </PRE>
 
 <P>
-A field.
+Identifies a field.
 <P>
 
 <P>
@@ -126,7 +126,7 @@
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;<A HREF="../../../com/google/dexmaker/FieldId.html" title="type parameter in FieldId">D</A>&gt;</CODE></FONT></TD>
+<CODE>&nbsp;<A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;<A HREF="../../../com/google/dexmaker/FieldId.html" title="type parameter in FieldId">D</A>&gt;</CODE></FONT></TD>
 <TD><CODE><B><A HREF="../../../com/google/dexmaker/FieldId.html#getDeclaringType()">getDeclaringType</A></B>()</CODE>
 
 <BR>
@@ -142,7 +142,7 @@
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;<A HREF="../../../com/google/dexmaker/FieldId.html" title="type parameter in FieldId">V</A>&gt;</CODE></FONT></TD>
+<CODE>&nbsp;<A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;<A HREF="../../../com/google/dexmaker/FieldId.html" title="type parameter in FieldId">V</A>&gt;</CODE></FONT></TD>
 <TD><CODE><B><A HREF="../../../com/google/dexmaker/FieldId.html#getType()">getType</A></B>()</CODE>
 
 <BR>
@@ -190,7 +190,7 @@
 <A NAME="getDeclaringType()"><!-- --></A><H3>
 getDeclaringType</H3>
 <PRE>
-public <A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;<A HREF="../../../com/google/dexmaker/FieldId.html" title="type parameter in FieldId">D</A>&gt; <B>getDeclaringType</B>()</PRE>
+public <A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;<A HREF="../../../com/google/dexmaker/FieldId.html" title="type parameter in FieldId">D</A>&gt; <B>getDeclaringType</B>()</PRE>
 <DL>
 <DD><DL>
 </DL>
@@ -201,7 +201,7 @@
 <A NAME="getType()"><!-- --></A><H3>
 getType</H3>
 <PRE>
-public <A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;<A HREF="../../../com/google/dexmaker/FieldId.html" title="type parameter in FieldId">V</A>&gt; <B>getType</B>()</PRE>
+public <A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;<A HREF="../../../com/google/dexmaker/FieldId.html" title="type parameter in FieldId">V</A>&gt; <B>getType</B>()</PRE>
 <DL>
 <DD><DL>
 </DL>
@@ -290,7 +290,7 @@
 
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/google/dexmaker/DexGenerator.html" title="class in com.google.dexmaker"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../com/google/dexmaker/DexMaker.html" title="class in com.google.dexmaker"><B>PREV CLASS</B></A>&nbsp;
 &nbsp;<A HREF="../../../com/google/dexmaker/Label.html" title="class in com.google.dexmaker"><B>NEXT CLASS</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../../../index.html?com/google/dexmaker/FieldId.html" target="_top"><B>FRAMES</B></A>  &nbsp;
diff --git a/javadoc/com/google/dexmaker/Label.html b/javadoc/com/google/dexmaker/Label.html
index e9350fe..bbc1b66 100644
--- a/javadoc/com/google/dexmaker/Label.html
+++ b/javadoc/com/google/dexmaker/Label.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_26) on Tue Jan 03 17:07:49 EST 2012 -->
+<!-- Generated by javadoc (build 1.6.0_26) on Fri Jan 06 14:58:31 EST 2012 -->
 <TITLE>
 Label (dexmaker)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-01-03">
+<META NAME="date" CONTENT="2012-01-06">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 
@@ -75,9 +75,9 @@
 </TR>
 <TR>
 <TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_java.lang.Object">METHOD</A></FONT></TD>
+  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_java.lang.Object">METHOD</A></FONT></TD>
 <TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;METHOD</FONT></TD>
+DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
 </TR>
 </TABLE>
 <A NAME="skip-navbar_top"></A>
@@ -108,6 +108,22 @@
 
 <P>
 
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+
+<A NAME="constructor_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Constructor Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/Label.html#Label()">Label</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
 <!-- ========== METHOD SUMMARY =========== -->
 
 <A NAME="method_summary"><!-- --></A>
@@ -128,6 +144,23 @@
 </TABLE>
 &nbsp;
 <P>
+
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+
+<A NAME="constructor_detail"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Constructor Detail</B></FONT></TH>
+</TR>
+</TABLE>
+
+<A NAME="Label()"><!-- --></A><H3>
+Label</H3>
+<PRE>
+public <B>Label</B>()</PRE>
+<DL>
+</DL>
 <!-- ========= END OF CLASS DATA ========= -->
 <HR>
 
@@ -179,9 +212,9 @@
 </TR>
 <TR>
 <TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_java.lang.Object">METHOD</A></FONT></TD>
+  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_java.lang.Object">METHOD</A></FONT></TD>
 <TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;METHOD</FONT></TD>
+DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
 </TR>
 </TABLE>
 <A NAME="skip-navbar_bottom"></A>
diff --git a/javadoc/com/google/dexmaker/Local.html b/javadoc/com/google/dexmaker/Local.html
index 3607b00..752acc0 100644
--- a/javadoc/com/google/dexmaker/Local.html
+++ b/javadoc/com/google/dexmaker/Local.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_26) on Tue Jan 03 17:07:49 EST 2012 -->
+<!-- Generated by javadoc (build 1.6.0_26) on Fri Jan 06 14:58:31 EST 2012 -->
 <TITLE>
 Local (dexmaker)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-01-03">
+<META NAME="date" CONTENT="2012-01-06">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 
@@ -100,7 +100,7 @@
 </PRE>
 
 <P>
-A temporary variable that holds a single value.
+A temporary variable that holds a single value of a known type.
 <P>
 
 <P>
@@ -118,7 +118,7 @@
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A></CODE></FONT></TD>
+<CODE>&nbsp;<A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A></CODE></FONT></TD>
 <TD><CODE><B><A HREF="../../../com/google/dexmaker/Local.html#getType()">getType</A></B>()</CODE>
 
 <BR>
@@ -158,7 +158,7 @@
 <A NAME="getType()"><!-- --></A><H3>
 getType</H3>
 <PRE>
-public <A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A> <B>getType</B>()</PRE>
+public <A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A> <B>getType</B>()</PRE>
 <DL>
 <DD><DL>
 </DL>
diff --git a/javadoc/com/google/dexmaker/MethodId.html b/javadoc/com/google/dexmaker/MethodId.html
index e429c1a..7cc028b 100644
--- a/javadoc/com/google/dexmaker/MethodId.html
+++ b/javadoc/com/google/dexmaker/MethodId.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_26) on Tue Jan 03 17:07:49 EST 2012 -->
+<!-- Generated by javadoc (build 1.6.0_26) on Fri Jan 06 14:58:31 EST 2012 -->
 <TITLE>
 MethodId (dexmaker)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-01-03">
+<META NAME="date" CONTENT="2012-01-06">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 
@@ -55,7 +55,7 @@
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
 &nbsp;<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker"><B>NEXT CLASS</B></A></FONT></TD>
+&nbsp;<A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker"><B>NEXT CLASS</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../../../index.html?com/google/dexmaker/MethodId.html" target="_top"><B>FRAMES</B></A>  &nbsp;
 &nbsp;<A HREF="MethodId.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
@@ -100,7 +100,7 @@
 </PRE>
 
 <P>
-A method or constructor.
+Identifies a method or constructor.
 <P>
 
 <P>
@@ -126,7 +126,7 @@
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;<A HREF="../../../com/google/dexmaker/MethodId.html" title="type parameter in MethodId">D</A>&gt;</CODE></FONT></TD>
+<CODE>&nbsp;<A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;<A HREF="../../../com/google/dexmaker/MethodId.html" title="type parameter in MethodId">D</A>&gt;</CODE></FONT></TD>
 <TD><CODE><B><A HREF="../../../com/google/dexmaker/MethodId.html#getDeclaringType()">getDeclaringType</A></B>()</CODE>
 
 <BR>
@@ -138,11 +138,11 @@
 <TD><CODE><B><A HREF="../../../com/google/dexmaker/MethodId.html#getName()">getName</A></B>()</CODE>
 
 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the method's name.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.List&lt;<A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;?&gt;&gt;</CODE></FONT></TD>
+<CODE>&nbsp;java.util.List&lt;<A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;?&gt;&gt;</CODE></FONT></TD>
 <TD><CODE><B><A HREF="../../../com/google/dexmaker/MethodId.html#getParameters()">getParameters</A></B>()</CODE>
 
 <BR>
@@ -150,7 +150,7 @@
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;<A HREF="../../../com/google/dexmaker/MethodId.html" title="type parameter in MethodId">R</A>&gt;</CODE></FONT></TD>
+<CODE>&nbsp;<A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;<A HREF="../../../com/google/dexmaker/MethodId.html" title="type parameter in MethodId">R</A>&gt;</CODE></FONT></TD>
 <TD><CODE><B><A HREF="../../../com/google/dexmaker/MethodId.html#getReturnType()">getReturnType</A></B>()</CODE>
 
 <BR>
@@ -198,7 +198,7 @@
 <A NAME="getDeclaringType()"><!-- --></A><H3>
 getDeclaringType</H3>
 <PRE>
-public <A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;<A HREF="../../../com/google/dexmaker/MethodId.html" title="type parameter in MethodId">D</A>&gt; <B>getDeclaringType</B>()</PRE>
+public <A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;<A HREF="../../../com/google/dexmaker/MethodId.html" title="type parameter in MethodId">D</A>&gt; <B>getDeclaringType</B>()</PRE>
 <DL>
 <DD><DL>
 </DL>
@@ -209,7 +209,7 @@
 <A NAME="getReturnType()"><!-- --></A><H3>
 getReturnType</H3>
 <PRE>
-public <A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;<A HREF="../../../com/google/dexmaker/MethodId.html" title="type parameter in MethodId">R</A>&gt; <B>getReturnType</B>()</PRE>
+public <A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;<A HREF="../../../com/google/dexmaker/MethodId.html" title="type parameter in MethodId">R</A>&gt; <B>getReturnType</B>()</PRE>
 <DL>
 <DD><DL>
 </DL>
@@ -222,6 +222,8 @@
 <PRE>
 public java.lang.String <B>getName</B>()</PRE>
 <DL>
+<DD>Returns the method's name. This is "<init>" if this is a constructor.
+<P>
 <DD><DL>
 </DL>
 </DD>
@@ -231,7 +233,7 @@
 <A NAME="getParameters()"><!-- --></A><H3>
 getParameters</H3>
 <PRE>
-public java.util.List&lt;<A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;?&gt;&gt; <B>getParameters</B>()</PRE>
+public java.util.List&lt;<A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;?&gt;&gt; <B>getParameters</B>()</PRE>
 <DL>
 <DD><DL>
 </DL>
@@ -310,7 +312,7 @@
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
 &nbsp;<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker"><B>NEXT CLASS</B></A></FONT></TD>
+&nbsp;<A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker"><B>NEXT CLASS</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../../../index.html?com/google/dexmaker/MethodId.html" target="_top"><B>FRAMES</B></A>  &nbsp;
 &nbsp;<A HREF="MethodId.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
diff --git a/javadoc/com/google/dexmaker/Type.html b/javadoc/com/google/dexmaker/TypeId.html
similarity index 64%
rename from javadoc/com/google/dexmaker/Type.html
rename to javadoc/com/google/dexmaker/TypeId.html
index a170c5e..6e1f8b1 100644
--- a/javadoc/com/google/dexmaker/Type.html
+++ b/javadoc/com/google/dexmaker/TypeId.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_26) on Tue Jan 03 17:07:49 EST 2012 -->
+<!-- Generated by javadoc (build 1.6.0_26) on Fri Jan 06 14:58:31 EST 2012 -->
 <TITLE>
-Type (dexmaker)
+TypeId (dexmaker)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-01-03">
+<META NAME="date" CONTENT="2012-01-06">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 
@@ -15,7 +15,7 @@
 function windowTitle()
 {
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Type (dexmaker)";
+        parent.document.title="TypeId (dexmaker)";
     }
 }
 </SCRIPT>
@@ -57,8 +57,8 @@
 &nbsp;<A HREF="../../../com/google/dexmaker/MethodId.html" title="class in com.google.dexmaker"><B>PREV CLASS</B></A>&nbsp;
 &nbsp;NEXT CLASS</FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/google/dexmaker/Type.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Type.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+  <A HREF="../../../index.html?com/google/dexmaker/TypeId.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="TypeId.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
 &nbsp;<SCRIPT type="text/javascript">
   <!--
   if(window==top) {
@@ -89,14 +89,14 @@
 <FONT SIZE="-1">
 com.google.dexmaker</FONT>
 <BR>
-Class Type&lt;T&gt;</H2>
+Class TypeId&lt;T&gt;</H2>
 <PRE>
 java.lang.Object
-  <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>com.google.dexmaker.Type&lt;T&gt;</B>
+  <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>com.google.dexmaker.TypeId&lt;T&gt;</B>
 </PRE>
 <HR>
 <DL>
-<DT><PRE>public final class <B>Type&lt;T&gt;</B><DT>extends java.lang.Object</DL>
+<DT><PRE>public final class <B>TypeId&lt;T&gt;</B><DT>extends java.lang.Object</DL>
 </PRE>
 
 <P>
@@ -117,88 +117,88 @@
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;java.lang.Boolean&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/Type.html#BOOLEAN">BOOLEAN</A></B></CODE>
+<CODE>static&nbsp;<A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;java.lang.Boolean&gt;</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/TypeId.html#BOOLEAN">BOOLEAN</A></B></CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The <code>boolean</code> primitive type.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;java.lang.Byte&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/Type.html#BYTE">BYTE</A></B></CODE>
+<CODE>static&nbsp;<A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;java.lang.Byte&gt;</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/TypeId.html#BYTE">BYTE</A></B></CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The <code>byte</code> primitive type.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;java.lang.Character&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/Type.html#CHAR">CHAR</A></B></CODE>
+<CODE>static&nbsp;<A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;java.lang.Character&gt;</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/TypeId.html#CHAR">CHAR</A></B></CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The <code>char</code> primitive type.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;java.lang.Double&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/Type.html#DOUBLE">DOUBLE</A></B></CODE>
+<CODE>static&nbsp;<A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;java.lang.Double&gt;</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/TypeId.html#DOUBLE">DOUBLE</A></B></CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The <code>double</code> primitive type.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;java.lang.Float&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/Type.html#FLOAT">FLOAT</A></B></CODE>
+<CODE>static&nbsp;<A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;java.lang.Float&gt;</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/TypeId.html#FLOAT">FLOAT</A></B></CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The <code>float</code> primitive type.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;java.lang.Integer&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/Type.html#INT">INT</A></B></CODE>
+<CODE>static&nbsp;<A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;java.lang.Integer&gt;</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/TypeId.html#INT">INT</A></B></CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The <code>int</code> primitive type.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;java.lang.Long&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/Type.html#LONG">LONG</A></B></CODE>
+<CODE>static&nbsp;<A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;java.lang.Long&gt;</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/TypeId.html#LONG">LONG</A></B></CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The <code>long</code> primitive type.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;java.lang.Object&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/Type.html#OBJECT">OBJECT</A></B></CODE>
+<CODE>static&nbsp;<A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;java.lang.Object&gt;</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/TypeId.html#OBJECT">OBJECT</A></B></CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The <code>Object</code> type.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;java.lang.Short&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/Type.html#SHORT">SHORT</A></B></CODE>
+<CODE>static&nbsp;<A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;java.lang.Short&gt;</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/TypeId.html#SHORT">SHORT</A></B></CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The <code>short</code> primitive type.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;java.lang.String&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/Type.html#STRING">STRING</A></B></CODE>
+<CODE>static&nbsp;<A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;java.lang.String&gt;</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/TypeId.html#STRING">STRING</A></B></CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The <code>String</code> type.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;java.lang.Void&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/Type.html#VOID">VOID</A></B></CODE>
+<CODE>static&nbsp;<A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;java.lang.Void&gt;</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/TypeId.html#VOID">VOID</A></B></CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The <code>void</code> primitive type.</TD>
@@ -216,7 +216,7 @@
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/Type.html#equals(java.lang.Object)">equals</A></B>(java.lang.Object&nbsp;o)</CODE>
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/TypeId.html#equals(java.lang.Object)">equals</A></B>(java.lang.Object&nbsp;o)</CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
@@ -227,11 +227,11 @@
 <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" SUMMARY="">
 <TR ALIGN="right" VALIGN="">
 <TD NOWRAP><FONT SIZE="-1">
-<CODE>&lt;T&gt; <A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;T&gt;</CODE></FONT></TD>
+<CODE>&lt;T&gt; <A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;T&gt;</CODE></FONT></TD>
 </TR>
 </TABLE>
 </CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/Type.html#get(java.lang.Class)">get</A></B>(java.lang.Class&lt;T&gt;&nbsp;type)</CODE>
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/TypeId.html#get(java.lang.Class)">get</A></B>(java.lang.Class&lt;T&gt;&nbsp;type)</CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
@@ -242,19 +242,19 @@
 <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" SUMMARY="">
 <TR ALIGN="right" VALIGN="">
 <TD NOWRAP><FONT SIZE="-1">
-<CODE>&lt;T&gt; <A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;T&gt;</CODE></FONT></TD>
+<CODE>&lt;T&gt; <A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;T&gt;</CODE></FONT></TD>
 </TR>
 </TABLE>
 </CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/Type.html#get(java.lang.String)">get</A></B>(java.lang.String&nbsp;name)</CODE>
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/TypeId.html#get(java.lang.String)">get</A></B>(java.lang.String&nbsp;name)</CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../com/google/dexmaker/MethodId.html" title="class in com.google.dexmaker">MethodId</A>&lt;<A HREF="../../../com/google/dexmaker/Type.html" title="type parameter in Type">T</A>,java.lang.Void&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/Type.html#getConstructor(com.google.dexmaker.Type...)">getConstructor</A></B>(<A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;?&gt;...&nbsp;parameters)</CODE>
+<CODE>&nbsp;<A HREF="../../../com/google/dexmaker/MethodId.html" title="class in com.google.dexmaker">MethodId</A>&lt;<A HREF="../../../com/google/dexmaker/TypeId.html" title="type parameter in TypeId">T</A>,java.lang.Void&gt;</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/TypeId.html#getConstructor(com.google.dexmaker.TypeId...)">getConstructor</A></B>(<A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;?&gt;...&nbsp;parameters)</CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
@@ -265,11 +265,11 @@
 <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" SUMMARY="">
 <TR ALIGN="right" VALIGN="">
 <TD NOWRAP><FONT SIZE="-1">
-<CODE>&lt;V&gt; <A HREF="../../../com/google/dexmaker/FieldId.html" title="class in com.google.dexmaker">FieldId</A>&lt;<A HREF="../../../com/google/dexmaker/Type.html" title="type parameter in Type">T</A>,V&gt;</CODE></FONT></TD>
+<CODE>&lt;V&gt; <A HREF="../../../com/google/dexmaker/FieldId.html" title="class in com.google.dexmaker">FieldId</A>&lt;<A HREF="../../../com/google/dexmaker/TypeId.html" title="type parameter in TypeId">T</A>,V&gt;</CODE></FONT></TD>
 </TR>
 </TABLE>
 </CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/Type.html#getField(com.google.dexmaker.Type, java.lang.String)">getField</A></B>(<A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;V&gt;&nbsp;type,
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/TypeId.html#getField(com.google.dexmaker.TypeId, java.lang.String)">getField</A></B>(<A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;V&gt;&nbsp;type,
          java.lang.String&nbsp;name)</CODE>
 
 <BR>
@@ -281,13 +281,13 @@
 <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" SUMMARY="">
 <TR ALIGN="right" VALIGN="">
 <TD NOWRAP><FONT SIZE="-1">
-<CODE>&lt;R&gt; <A HREF="../../../com/google/dexmaker/MethodId.html" title="class in com.google.dexmaker">MethodId</A>&lt;<A HREF="../../../com/google/dexmaker/Type.html" title="type parameter in Type">T</A>,R&gt;</CODE></FONT></TD>
+<CODE>&lt;R&gt; <A HREF="../../../com/google/dexmaker/MethodId.html" title="class in com.google.dexmaker">MethodId</A>&lt;<A HREF="../../../com/google/dexmaker/TypeId.html" title="type parameter in TypeId">T</A>,R&gt;</CODE></FONT></TD>
 </TR>
 </TABLE>
 </CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/Type.html#getMethod(com.google.dexmaker.Type, java.lang.String, com.google.dexmaker.Type...)">getMethod</A></B>(<A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;R&gt;&nbsp;returnType,
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/TypeId.html#getMethod(com.google.dexmaker.TypeId, java.lang.String, com.google.dexmaker.TypeId...)">getMethod</A></B>(<A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;R&gt;&nbsp;returnType,
           java.lang.String&nbsp;name,
-          <A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;?&gt;...&nbsp;parameters)</CODE>
+          <A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;?&gt;...&nbsp;parameters)</CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
@@ -295,7 +295,7 @@
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/Type.html#getName()">getName</A></B>()</CODE>
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/TypeId.html#getName()">getName</A></B>()</CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
@@ -303,7 +303,7 @@
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/Type.html#hashCode()">hashCode</A></B>()</CODE>
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/TypeId.html#hashCode()">hashCode</A></B>()</CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
@@ -311,7 +311,7 @@
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/dexmaker/Type.html#toString()">toString</A></B>()</CODE>
+<TD><CODE><B><A HREF="../../../com/google/dexmaker/TypeId.html#toString()">toString</A></B>()</CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
@@ -342,7 +342,7 @@
 <A NAME="BOOLEAN"><!-- --></A><H3>
 BOOLEAN</H3>
 <PRE>
-public static final <A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;java.lang.Boolean&gt; <B>BOOLEAN</B></PRE>
+public static final <A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;java.lang.Boolean&gt; <B>BOOLEAN</B></PRE>
 <DL>
 <DD>The <code>boolean</code> primitive type.
 <P>
@@ -354,7 +354,7 @@
 <A NAME="BYTE"><!-- --></A><H3>
 BYTE</H3>
 <PRE>
-public static final <A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;java.lang.Byte&gt; <B>BYTE</B></PRE>
+public static final <A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;java.lang.Byte&gt; <B>BYTE</B></PRE>
 <DL>
 <DD>The <code>byte</code> primitive type.
 <P>
@@ -366,7 +366,7 @@
 <A NAME="CHAR"><!-- --></A><H3>
 CHAR</H3>
 <PRE>
-public static final <A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;java.lang.Character&gt; <B>CHAR</B></PRE>
+public static final <A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;java.lang.Character&gt; <B>CHAR</B></PRE>
 <DL>
 <DD>The <code>char</code> primitive type.
 <P>
@@ -378,7 +378,7 @@
 <A NAME="DOUBLE"><!-- --></A><H3>
 DOUBLE</H3>
 <PRE>
-public static final <A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;java.lang.Double&gt; <B>DOUBLE</B></PRE>
+public static final <A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;java.lang.Double&gt; <B>DOUBLE</B></PRE>
 <DL>
 <DD>The <code>double</code> primitive type.
 <P>
@@ -390,7 +390,7 @@
 <A NAME="FLOAT"><!-- --></A><H3>
 FLOAT</H3>
 <PRE>
-public static final <A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;java.lang.Float&gt; <B>FLOAT</B></PRE>
+public static final <A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;java.lang.Float&gt; <B>FLOAT</B></PRE>
 <DL>
 <DD>The <code>float</code> primitive type.
 <P>
@@ -402,7 +402,7 @@
 <A NAME="INT"><!-- --></A><H3>
 INT</H3>
 <PRE>
-public static final <A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;java.lang.Integer&gt; <B>INT</B></PRE>
+public static final <A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;java.lang.Integer&gt; <B>INT</B></PRE>
 <DL>
 <DD>The <code>int</code> primitive type.
 <P>
@@ -414,7 +414,7 @@
 <A NAME="LONG"><!-- --></A><H3>
 LONG</H3>
 <PRE>
-public static final <A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;java.lang.Long&gt; <B>LONG</B></PRE>
+public static final <A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;java.lang.Long&gt; <B>LONG</B></PRE>
 <DL>
 <DD>The <code>long</code> primitive type.
 <P>
@@ -426,7 +426,7 @@
 <A NAME="SHORT"><!-- --></A><H3>
 SHORT</H3>
 <PRE>
-public static final <A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;java.lang.Short&gt; <B>SHORT</B></PRE>
+public static final <A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;java.lang.Short&gt; <B>SHORT</B></PRE>
 <DL>
 <DD>The <code>short</code> primitive type.
 <P>
@@ -438,7 +438,7 @@
 <A NAME="VOID"><!-- --></A><H3>
 VOID</H3>
 <PRE>
-public static final <A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;java.lang.Void&gt; <B>VOID</B></PRE>
+public static final <A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;java.lang.Void&gt; <B>VOID</B></PRE>
 <DL>
 <DD>The <code>void</code> primitive type. Only used as a return type.
 <P>
@@ -450,7 +450,7 @@
 <A NAME="OBJECT"><!-- --></A><H3>
 OBJECT</H3>
 <PRE>
-public static final <A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;java.lang.Object&gt; <B>OBJECT</B></PRE>
+public static final <A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;java.lang.Object&gt; <B>OBJECT</B></PRE>
 <DL>
 <DD>The <code>Object</code> type.
 <P>
@@ -462,7 +462,7 @@
 <A NAME="STRING"><!-- --></A><H3>
 STRING</H3>
 <PRE>
-public static final <A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;java.lang.String&gt; <B>STRING</B></PRE>
+public static final <A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;java.lang.String&gt; <B>STRING</B></PRE>
 <DL>
 <DD>The <code>String</code> type.
 <P>
@@ -483,7 +483,7 @@
 <A NAME="get(java.lang.String)"><!-- --></A><H3>
 get</H3>
 <PRE>
-public static &lt;T&gt; <A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;T&gt; <B>get</B>(java.lang.String&nbsp;name)</PRE>
+public static &lt;T&gt; <A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;T&gt; <B>get</B>(java.lang.String&nbsp;name)</PRE>
 <DL>
 <DD><DL>
 <DT><B>Parameters:</B><DD><CODE>name</CODE> - a descriptor like "Ljava/lang/Class;".</DL>
@@ -494,7 +494,7 @@
 <A NAME="get(java.lang.Class)"><!-- --></A><H3>
 get</H3>
 <PRE>
-public static &lt;T&gt; <A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;T&gt; <B>get</B>(java.lang.Class&lt;T&gt;&nbsp;type)</PRE>
+public static &lt;T&gt; <A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;T&gt; <B>get</B>(java.lang.Class&lt;T&gt;&nbsp;type)</PRE>
 <DL>
 <DD><DL>
 </DL>
@@ -502,10 +502,10 @@
 </DL>
 <HR>
 
-<A NAME="getField(com.google.dexmaker.Type, java.lang.String)"><!-- --></A><H3>
+<A NAME="getField(com.google.dexmaker.TypeId, java.lang.String)"><!-- --></A><H3>
 getField</H3>
 <PRE>
-public &lt;V&gt; <A HREF="../../../com/google/dexmaker/FieldId.html" title="class in com.google.dexmaker">FieldId</A>&lt;<A HREF="../../../com/google/dexmaker/Type.html" title="type parameter in Type">T</A>,V&gt; <B>getField</B>(<A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;V&gt;&nbsp;type,
+public &lt;V&gt; <A HREF="../../../com/google/dexmaker/FieldId.html" title="class in com.google.dexmaker">FieldId</A>&lt;<A HREF="../../../com/google/dexmaker/TypeId.html" title="type parameter in TypeId">T</A>,V&gt; <B>getField</B>(<A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;V&gt;&nbsp;type,
                                  java.lang.String&nbsp;name)</PRE>
 <DL>
 <DD><DL>
@@ -514,10 +514,10 @@
 </DL>
 <HR>
 
-<A NAME="getConstructor(com.google.dexmaker.Type...)"><!-- --></A><H3>
+<A NAME="getConstructor(com.google.dexmaker.TypeId...)"><!-- --></A><H3>
 getConstructor</H3>
 <PRE>
-public <A HREF="../../../com/google/dexmaker/MethodId.html" title="class in com.google.dexmaker">MethodId</A>&lt;<A HREF="../../../com/google/dexmaker/Type.html" title="type parameter in Type">T</A>,java.lang.Void&gt; <B>getConstructor</B>(<A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;?&gt;...&nbsp;parameters)</PRE>
+public <A HREF="../../../com/google/dexmaker/MethodId.html" title="class in com.google.dexmaker">MethodId</A>&lt;<A HREF="../../../com/google/dexmaker/TypeId.html" title="type parameter in TypeId">T</A>,java.lang.Void&gt; <B>getConstructor</B>(<A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;?&gt;...&nbsp;parameters)</PRE>
 <DL>
 <DD><DL>
 </DL>
@@ -525,12 +525,12 @@
 </DL>
 <HR>
 
-<A NAME="getMethod(com.google.dexmaker.Type, java.lang.String, com.google.dexmaker.Type...)"><!-- --></A><H3>
+<A NAME="getMethod(com.google.dexmaker.TypeId, java.lang.String, com.google.dexmaker.TypeId...)"><!-- --></A><H3>
 getMethod</H3>
 <PRE>
-public &lt;R&gt; <A HREF="../../../com/google/dexmaker/MethodId.html" title="class in com.google.dexmaker">MethodId</A>&lt;<A HREF="../../../com/google/dexmaker/Type.html" title="type parameter in Type">T</A>,R&gt; <B>getMethod</B>(<A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;R&gt;&nbsp;returnType,
+public &lt;R&gt; <A HREF="../../../com/google/dexmaker/MethodId.html" title="class in com.google.dexmaker">MethodId</A>&lt;<A HREF="../../../com/google/dexmaker/TypeId.html" title="type parameter in TypeId">T</A>,R&gt; <B>getMethod</B>(<A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;R&gt;&nbsp;returnType,
                                    java.lang.String&nbsp;name,
-                                   <A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>&lt;?&gt;...&nbsp;parameters)</PRE>
+                                   <A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>&lt;?&gt;...&nbsp;parameters)</PRE>
 <DL>
 <DD><DL>
 </DL>
@@ -622,8 +622,8 @@
 &nbsp;<A HREF="../../../com/google/dexmaker/MethodId.html" title="class in com.google.dexmaker"><B>PREV CLASS</B></A>&nbsp;
 &nbsp;NEXT CLASS</FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../index.html?com/google/dexmaker/Type.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Type.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+  <A HREF="../../../index.html?com/google/dexmaker/TypeId.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="TypeId.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
 &nbsp;<SCRIPT type="text/javascript">
   <!--
   if(window==top) {
diff --git a/javadoc/com/google/dexmaker/package-frame.html b/javadoc/com/google/dexmaker/package-frame.html
index 0bab2bc..9a353ef 100644
--- a/javadoc/com/google/dexmaker/package-frame.html
+++ b/javadoc/com/google/dexmaker/package-frame.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_26) on Tue Jan 03 17:07:49 EST 2012 -->
+<!-- Generated by javadoc (build 1.6.0_26) on Fri Jan 06 14:58:31 EST 2012 -->
 <TITLE>
 com.google.dexmaker (dexmaker)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-01-03">
+<META NAME="date" CONTENT="2012-01-06">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 
@@ -25,7 +25,7 @@
 <BR>
 <A HREF="Code.html" title="class in com.google.dexmaker" target="classFrame">Code</A>
 <BR>
-<A HREF="DexGenerator.html" title="class in com.google.dexmaker" target="classFrame">DexGenerator</A>
+<A HREF="DexMaker.html" title="class in com.google.dexmaker" target="classFrame">DexMaker</A>
 <BR>
 <A HREF="FieldId.html" title="class in com.google.dexmaker" target="classFrame">FieldId</A>
 <BR>
@@ -35,7 +35,7 @@
 <BR>
 <A HREF="MethodId.html" title="class in com.google.dexmaker" target="classFrame">MethodId</A>
 <BR>
-<A HREF="Type.html" title="class in com.google.dexmaker" target="classFrame">Type</A></FONT></TD>
+<A HREF="TypeId.html" title="class in com.google.dexmaker" target="classFrame">TypeId</A></FONT></TD>
 </TR>
 </TABLE>
 
diff --git a/javadoc/com/google/dexmaker/package-summary.html b/javadoc/com/google/dexmaker/package-summary.html
index 47877d1..66b3f43 100644
--- a/javadoc/com/google/dexmaker/package-summary.html
+++ b/javadoc/com/google/dexmaker/package-summary.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_26) on Tue Jan 03 17:07:49 EST 2012 -->
+<!-- Generated by javadoc (build 1.6.0_26) on Fri Jan 06 14:58:31 EST 2012 -->
 <TITLE>
 com.google.dexmaker (dexmaker)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-01-03">
+<META NAME="date" CONTENT="2012-01-06">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 
@@ -92,12 +92,13 @@
 <TD>Builds a sequence of instructions.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/google/dexmaker/DexGenerator.html" title="class in com.google.dexmaker">DexGenerator</A></B></TD>
-<TD>Define types, fields and methods.</TD>
+<TD WIDTH="15%"><B><A HREF="../../../com/google/dexmaker/DexMaker.html" title="class in com.google.dexmaker">DexMaker</A></B></TD>
+<TD>Generates a </i><strong>D</strong>alvik <strong>EX</strong>ecutable (dex)
+ file for execution on Android.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD WIDTH="15%"><B><A HREF="../../../com/google/dexmaker/FieldId.html" title="class in com.google.dexmaker">FieldId&lt;D,V&gt;</A></B></TD>
-<TD>A field.</TD>
+<TD>Identifies a field.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD WIDTH="15%"><B><A HREF="../../../com/google/dexmaker/Label.html" title="class in com.google.dexmaker">Label</A></B></TD>
@@ -105,14 +106,14 @@
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD WIDTH="15%"><B><A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker">Local&lt;T&gt;</A></B></TD>
-<TD>A temporary variable that holds a single value.</TD>
+<TD>A temporary variable that holds a single value of a known type.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD WIDTH="15%"><B><A HREF="../../../com/google/dexmaker/MethodId.html" title="class in com.google.dexmaker">MethodId&lt;D,R&gt;</A></B></TD>
-<TD>A method or constructor.</TD>
+<TD>Identifies a method or constructor.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type&lt;T&gt;</A></B></TD>
+<TD WIDTH="15%"><B><A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId&lt;T&gt;</A></B></TD>
 <TD>A primitive type, interface or class.</TD>
 </TR>
 </TABLE>
diff --git a/javadoc/com/google/dexmaker/package-tree.html b/javadoc/com/google/dexmaker/package-tree.html
index d46eb28..6dc5411 100644
--- a/javadoc/com/google/dexmaker/package-tree.html
+++ b/javadoc/com/google/dexmaker/package-tree.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_26) on Tue Jan 03 17:07:49 EST 2012 -->
+<!-- Generated by javadoc (build 1.6.0_26) on Fri Jan 06 14:58:31 EST 2012 -->
 <TITLE>
 com.google.dexmaker Class Hierarchy (dexmaker)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-01-03">
+<META NAME="date" CONTENT="2012-01-06">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 
@@ -91,7 +91,7 @@
 </H2>
 <UL>
 <LI TYPE="circle">java.lang.Object<UL>
-<LI TYPE="circle">com.google.dexmaker.<A HREF="../../../com/google/dexmaker/Code.html" title="class in com.google.dexmaker"><B>Code</B></A><LI TYPE="circle">com.google.dexmaker.<A HREF="../../../com/google/dexmaker/DexGenerator.html" title="class in com.google.dexmaker"><B>DexGenerator</B></A><LI TYPE="circle">com.google.dexmaker.<A HREF="../../../com/google/dexmaker/FieldId.html" title="class in com.google.dexmaker"><B>FieldId</B></A>&lt;D,V&gt;<LI TYPE="circle">com.google.dexmaker.<A HREF="../../../com/google/dexmaker/Label.html" title="class in com.google.dexmaker"><B>Label</B></A><LI TYPE="circle">com.google.dexmaker.<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker"><B>Local</B></A>&lt;T&gt;<LI TYPE="circle">com.google.dexmaker.<A HREF="../../../com/google/dexmaker/MethodId.html" title="class in com.google.dexmaker"><B>MethodId</B></A>&lt;D,R&gt;<LI TYPE="circle">com.google.dexmaker.<A HREF="../../../com/google/dexmaker/Type.html" title="class in com.google.dexmaker"><B>Type</B></A>&lt;T&gt;</UL>
+<LI TYPE="circle">com.google.dexmaker.<A HREF="../../../com/google/dexmaker/Code.html" title="class in com.google.dexmaker"><B>Code</B></A><LI TYPE="circle">com.google.dexmaker.<A HREF="../../../com/google/dexmaker/DexMaker.html" title="class in com.google.dexmaker"><B>DexMaker</B></A><LI TYPE="circle">com.google.dexmaker.<A HREF="../../../com/google/dexmaker/FieldId.html" title="class in com.google.dexmaker"><B>FieldId</B></A>&lt;D,V&gt;<LI TYPE="circle">com.google.dexmaker.<A HREF="../../../com/google/dexmaker/Label.html" title="class in com.google.dexmaker"><B>Label</B></A><LI TYPE="circle">com.google.dexmaker.<A HREF="../../../com/google/dexmaker/Local.html" title="class in com.google.dexmaker"><B>Local</B></A>&lt;T&gt;<LI TYPE="circle">com.google.dexmaker.<A HREF="../../../com/google/dexmaker/MethodId.html" title="class in com.google.dexmaker"><B>MethodId</B></A>&lt;D,R&gt;<LI TYPE="circle">com.google.dexmaker.<A HREF="../../../com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker"><B>TypeId</B></A>&lt;T&gt;</UL>
 </UL>
 <H2>
 Enum Hierarchy
@@ -100,7 +100,7 @@
 <LI TYPE="circle">java.lang.Object<UL>
 <LI TYPE="circle">java.lang.Enum&lt;E&gt; (implements java.lang.Comparable&lt;T&gt;, java.io.Serializable)
 <UL>
-<LI TYPE="circle">com.google.dexmaker.<A HREF="../../../com/google/dexmaker/Comparison.html" title="enum in com.google.dexmaker"><B>Comparison</B></A><LI TYPE="circle">com.google.dexmaker.<A HREF="../../../com/google/dexmaker/BinaryOp.html" title="enum in com.google.dexmaker"><B>BinaryOp</B></A></UL>
+<LI TYPE="circle">com.google.dexmaker.<A HREF="../../../com/google/dexmaker/BinaryOp.html" title="enum in com.google.dexmaker"><B>BinaryOp</B></A><LI TYPE="circle">com.google.dexmaker.<A HREF="../../../com/google/dexmaker/Comparison.html" title="enum in com.google.dexmaker"><B>Comparison</B></A></UL>
 </UL>
 </UL>
 <HR>
diff --git a/javadoc/com/google/dexmaker/stock/ProxyBuilder.html b/javadoc/com/google/dexmaker/stock/ProxyBuilder.html
index 7af0dbe..c0f49a8 100644
--- a/javadoc/com/google/dexmaker/stock/ProxyBuilder.html
+++ b/javadoc/com/google/dexmaker/stock/ProxyBuilder.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_26) on Tue Jan 03 17:07:49 EST 2012 -->
+<!-- Generated by javadoc (build 1.6.0_26) on Fri Jan 06 14:58:31 EST 2012 -->
 <TITLE>
 ProxyBuilder (dexmaker)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-01-03">
+<META NAME="date" CONTENT="2012-01-06">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
 
diff --git a/javadoc/com/google/dexmaker/stock/package-frame.html b/javadoc/com/google/dexmaker/stock/package-frame.html
index e103f6e..97596f1 100644
--- a/javadoc/com/google/dexmaker/stock/package-frame.html
+++ b/javadoc/com/google/dexmaker/stock/package-frame.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_26) on Tue Jan 03 17:07:49 EST 2012 -->
+<!-- Generated by javadoc (build 1.6.0_26) on Fri Jan 06 14:58:31 EST 2012 -->
 <TITLE>
 com.google.dexmaker.stock (dexmaker)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-01-03">
+<META NAME="date" CONTENT="2012-01-06">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
 
diff --git a/javadoc/com/google/dexmaker/stock/package-summary.html b/javadoc/com/google/dexmaker/stock/package-summary.html
index fb74b37..948a914 100644
--- a/javadoc/com/google/dexmaker/stock/package-summary.html
+++ b/javadoc/com/google/dexmaker/stock/package-summary.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_26) on Tue Jan 03 17:07:49 EST 2012 -->
+<!-- Generated by javadoc (build 1.6.0_26) on Fri Jan 06 14:58:31 EST 2012 -->
 <TITLE>
 com.google.dexmaker.stock (dexmaker)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-01-03">
+<META NAME="date" CONTENT="2012-01-06">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
 
diff --git a/javadoc/com/google/dexmaker/stock/package-tree.html b/javadoc/com/google/dexmaker/stock/package-tree.html
index 874bd58..c808ad1 100644
--- a/javadoc/com/google/dexmaker/stock/package-tree.html
+++ b/javadoc/com/google/dexmaker/stock/package-tree.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_26) on Tue Jan 03 17:07:49 EST 2012 -->
+<!-- Generated by javadoc (build 1.6.0_26) on Fri Jan 06 14:58:31 EST 2012 -->
 <TITLE>
 com.google.dexmaker.stock Class Hierarchy (dexmaker)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-01-03">
+<META NAME="date" CONTENT="2012-01-06">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
 
diff --git a/javadoc/constant-values.html b/javadoc/constant-values.html
index b94e8fd..37107a7 100644
--- a/javadoc/constant-values.html
+++ b/javadoc/constant-values.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_26) on Tue Jan 03 17:07:49 EST 2012 -->
+<!-- Generated by javadoc (build 1.6.0_26) on Fri Jan 06 14:58:31 EST 2012 -->
 <TITLE>
 Constant Field Values (dexmaker)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-01-03">
+<META NAME="date" CONTENT="2012-01-06">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 
diff --git a/javadoc/deprecated-list.html b/javadoc/deprecated-list.html
index fb1440c..b8572bc 100644
--- a/javadoc/deprecated-list.html
+++ b/javadoc/deprecated-list.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_26) on Tue Jan 03 17:07:49 EST 2012 -->
+<!-- Generated by javadoc (build 1.6.0_26) on Fri Jan 06 14:58:31 EST 2012 -->
 <TITLE>
 Deprecated List (dexmaker)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-01-03">
+<META NAME="date" CONTENT="2012-01-06">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 
diff --git a/javadoc/help-doc.html b/javadoc/help-doc.html
index 1d383c5..c707af3 100644
--- a/javadoc/help-doc.html
+++ b/javadoc/help-doc.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_26) on Tue Jan 03 17:07:49 EST 2012 -->
+<!-- Generated by javadoc (build 1.6.0_26) on Fri Jan 06 14:58:31 EST 2012 -->
 <TITLE>
 API Help (dexmaker)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-01-03">
+<META NAME="date" CONTENT="2012-01-06">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 
diff --git a/javadoc/index-all.html b/javadoc/index-all.html
index 20fa9d8..d86d815 100644
--- a/javadoc/index-all.html
+++ b/javadoc/index-all.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_26) on Tue Jan 03 17:07:49 EST 2012 -->
+<!-- Generated by javadoc (build 1.6.0_26) on Fri Jan 06 14:58:31 EST 2012 -->
 <TITLE>
 Index (dexmaker)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-01-03">
+<META NAME="date" CONTENT="2012-01-06">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="./stylesheet.css" TITLE="Style">
 
@@ -81,16 +81,16 @@
 <A NAME="_A_"><!-- --></A><H2>
 <B>A</B></H2>
 <DL>
-<DT><A HREF="./com/google/dexmaker/Code.html#addCatchClause(com.google.dexmaker.Type, com.google.dexmaker.Label)"><B>addCatchClause(Type&lt;?&gt;, Label)</B></A> - 
+<DT><A HREF="./com/google/dexmaker/Code.html#addCatchClause(com.google.dexmaker.TypeId, com.google.dexmaker.Label)"><B>addCatchClause(TypeId&lt;?&gt;, Label)</B></A> - 
 Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Code.html" title="class in com.google.dexmaker">Code</A>
 <DD>&nbsp;
-<DT><A HREF="./com/google/dexmaker/Code.html#aget(com.google.dexmaker.Local, com.google.dexmaker.Local, com.google.dexmaker.Local)"><B>aget(Local&lt;?&gt;, Local&lt;Integer&gt;, Local&lt;?&gt;)</B></A> - 
+<DT><A HREF="./com/google/dexmaker/Code.html#aget(com.google.dexmaker.Local, com.google.dexmaker.Local, com.google.dexmaker.Local)"><B>aget(Local&lt;?&gt;, Local&lt;?&gt;, Local&lt;Integer&gt;)</B></A> - 
 Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Code.html" title="class in com.google.dexmaker">Code</A>
 <DD>&nbsp;
 <DT><A HREF="./com/google/dexmaker/Code.html#aput(com.google.dexmaker.Local, com.google.dexmaker.Local, com.google.dexmaker.Local)"><B>aput(Local&lt;?&gt;, Local&lt;Integer&gt;, Local&lt;?&gt;)</B></A> - 
 Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Code.html" title="class in com.google.dexmaker">Code</A>
 <DD>&nbsp;
-<DT><A HREF="./com/google/dexmaker/Code.html#arrayLength(com.google.dexmaker.Local, com.google.dexmaker.Local)"><B>arrayLength(Local&lt;T&gt;, Local&lt;Integer&gt;)</B></A> - 
+<DT><A HREF="./com/google/dexmaker/Code.html#arrayLength(com.google.dexmaker.Local, com.google.dexmaker.Local)"><B>arrayLength(Local&lt;Integer&gt;, Local&lt;T&gt;)</B></A> - 
 Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Code.html" title="class in com.google.dexmaker">Code</A>
 <DD>&nbsp;
 </DL>
@@ -98,14 +98,14 @@
 <A NAME="_B_"><!-- --></A><H2>
 <B>B</B></H2>
 <DL>
-<DT><A HREF="./com/google/dexmaker/BinaryOp.html" title="enum in com.google.dexmaker"><B>BinaryOp</B></A> - Enum in <A HREF="./com/google/dexmaker/package-summary.html">com.google.dexmaker</A><DD>An operation on two values of the same type.<DT><A HREF="./com/google/dexmaker/Type.html#BOOLEAN"><B>BOOLEAN</B></A> - 
-Static variable in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>
+<DT><A HREF="./com/google/dexmaker/BinaryOp.html" title="enum in com.google.dexmaker"><B>BinaryOp</B></A> - Enum in <A HREF="./com/google/dexmaker/package-summary.html">com.google.dexmaker</A><DD>An operation on two values of the same type.<DT><A HREF="./com/google/dexmaker/TypeId.html#BOOLEAN"><B>BOOLEAN</B></A> - 
+Static variable in class com.google.dexmaker.<A HREF="./com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>
 <DD>The <code>boolean</code> primitive type.
 <DT><A HREF="./com/google/dexmaker/stock/ProxyBuilder.html#build()"><B>build()</B></A> - 
 Method in class com.google.dexmaker.stock.<A HREF="./com/google/dexmaker/stock/ProxyBuilder.html" title="class in com.google.dexmaker.stock">ProxyBuilder</A>
 <DD>Create a new instance of the class to proxy.
-<DT><A HREF="./com/google/dexmaker/Type.html#BYTE"><B>BYTE</B></A> - 
-Static variable in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>
+<DT><A HREF="./com/google/dexmaker/TypeId.html#BYTE"><B>BYTE</B></A> - 
+Static variable in class com.google.dexmaker.<A HREF="./com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>
 <DD>The <code>byte</code> primitive type.
 </DL>
 <HR>
@@ -115,16 +115,16 @@
 <DT><A HREF="./com/google/dexmaker/stock/ProxyBuilder.html#callSuper(java.lang.Object, java.lang.reflect.Method, java.lang.Object...)"><B>callSuper(Object, Method, Object...)</B></A> - 
 Static method in class com.google.dexmaker.stock.<A HREF="./com/google/dexmaker/stock/ProxyBuilder.html" title="class in com.google.dexmaker.stock">ProxyBuilder</A>
 <DD>&nbsp;
-<DT><A HREF="./com/google/dexmaker/Type.html#CHAR"><B>CHAR</B></A> - 
-Static variable in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>
+<DT><A HREF="./com/google/dexmaker/TypeId.html#CHAR"><B>CHAR</B></A> - 
+Static variable in class com.google.dexmaker.<A HREF="./com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>
 <DD>The <code>char</code> primitive type.
-<DT><A HREF="./com/google/dexmaker/Code.html" title="class in com.google.dexmaker"><B>Code</B></A> - Class in <A HREF="./com/google/dexmaker/package-summary.html">com.google.dexmaker</A><DD>Builds a sequence of instructions.<DT><A HREF="./com/google/dexmaker/package-summary.html"><B>com.google.dexmaker</B></A> - package com.google.dexmaker<DD>&nbsp;<DT><A HREF="./com/google/dexmaker/stock/package-summary.html"><B>com.google.dexmaker.stock</B></A> - package com.google.dexmaker.stock<DD>&nbsp;<DT><A HREF="./com/google/dexmaker/Code.html#compare(com.google.dexmaker.Comparison, com.google.dexmaker.Local, com.google.dexmaker.Local, com.google.dexmaker.Label)"><B>compare(Comparison, Local&lt;T&gt;, Local&lt;T&gt;, Label)</B></A> - 
+<DT><A HREF="./com/google/dexmaker/Code.html" title="class in com.google.dexmaker"><B>Code</B></A> - Class in <A HREF="./com/google/dexmaker/package-summary.html">com.google.dexmaker</A><DD>Builds a sequence of instructions.<DT><A HREF="./com/google/dexmaker/package-summary.html"><B>com.google.dexmaker</B></A> - package com.google.dexmaker<DD>&nbsp;<DT><A HREF="./com/google/dexmaker/stock/package-summary.html"><B>com.google.dexmaker.stock</B></A> - package com.google.dexmaker.stock<DD>&nbsp;<DT><A HREF="./com/google/dexmaker/Code.html#compare(com.google.dexmaker.Comparison, com.google.dexmaker.Label, com.google.dexmaker.Local, com.google.dexmaker.Local)"><B>compare(Comparison, Label, Local&lt;T&gt;, Local&lt;T&gt;)</B></A> - 
 Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Code.html" title="class in com.google.dexmaker">Code</A>
 <DD>Compare ints.
-<DT><A HREF="./com/google/dexmaker/Code.html#compare(com.google.dexmaker.Local, com.google.dexmaker.Local, com.google.dexmaker.Local, int)"><B>compare(Local&lt;T&gt;, Local&lt;T&gt;, Local&lt;Integer&gt;, int)</B></A> - 
+<DT><A HREF="./com/google/dexmaker/Code.html#compare(com.google.dexmaker.Local, com.google.dexmaker.Local, com.google.dexmaker.Local, int)"><B>compare(Local&lt;Integer&gt;, Local&lt;T&gt;, Local&lt;T&gt;, int)</B></A> - 
 Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Code.html" title="class in com.google.dexmaker">Code</A>
 <DD>Compare floats or doubles.
-<DT><A HREF="./com/google/dexmaker/Code.html#compare(com.google.dexmaker.Local, com.google.dexmaker.Local, com.google.dexmaker.Local)"><B>compare(Local&lt;T&gt;, Local&lt;T&gt;, Local&lt;?&gt;)</B></A> - 
+<DT><A HREF="./com/google/dexmaker/Code.html#compare(com.google.dexmaker.Local, com.google.dexmaker.Local, com.google.dexmaker.Local)"><B>compare(Local&lt;?&gt;, Local&lt;T&gt;, Local&lt;T&gt;)</B></A> - 
 Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Code.html" title="class in com.google.dexmaker">Code</A>
 <DD>Compare longs.
 <DT><A HREF="./com/google/dexmaker/Comparison.html" title="enum in com.google.dexmaker"><B>Comparison</B></A> - Enum in <A HREF="./com/google/dexmaker/package-summary.html">com.google.dexmaker</A><DD>A comparison between two values of the same type.<DT><A HREF="./com/google/dexmaker/stock/ProxyBuilder.html#constructorArgTypes(java.lang.Class...)"><B>constructorArgTypes(Class&lt;?&gt;...)</B></A> - 
@@ -138,26 +138,27 @@
 <A NAME="_D_"><!-- --></A><H2>
 <B>D</B></H2>
 <DL>
-<DT><A HREF="./com/google/dexmaker/DexGenerator.html#declare(com.google.dexmaker.Type, java.lang.String, int, com.google.dexmaker.Type, com.google.dexmaker.Type...)"><B>declare(Type&lt;?&gt;, String, int, Type&lt;?&gt;, Type&lt;?&gt;...)</B></A> - 
-Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/DexGenerator.html" title="class in com.google.dexmaker">DexGenerator</A>
-<DD>&nbsp;
-<DT><A HREF="./com/google/dexmaker/DexGenerator.html#declare(com.google.dexmaker.MethodId, int)"><B>declare(MethodId&lt;?, ?&gt;, int)</B></A> - 
-Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/DexGenerator.html" title="class in com.google.dexmaker">DexGenerator</A>
-<DD>&nbsp;
-<DT><A HREF="./com/google/dexmaker/DexGenerator.html#declare(com.google.dexmaker.FieldId, int, java.lang.Object)"><B>declare(FieldId&lt;?, ?&gt;, int, Object)</B></A> - 
-Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/DexGenerator.html" title="class in com.google.dexmaker">DexGenerator</A>
-<DD>&nbsp;
-<DT><A HREF="./com/google/dexmaker/DexGenerator.html#declareConstructor(com.google.dexmaker.MethodId, int)"><B>declareConstructor(MethodId&lt;?, ?&gt;, int)</B></A> - 
-Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/DexGenerator.html" title="class in com.google.dexmaker">DexGenerator</A>
-<DD>&nbsp;
+<DT><A HREF="./com/google/dexmaker/DexMaker.html#declare(com.google.dexmaker.TypeId, java.lang.String, int, com.google.dexmaker.TypeId, com.google.dexmaker.TypeId...)"><B>declare(TypeId&lt;?&gt;, String, int, TypeId&lt;?&gt;, TypeId&lt;?&gt;...)</B></A> - 
+Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/DexMaker.html" title="class in com.google.dexmaker">DexMaker</A>
+<DD>Declares <code>type</code>.
+<DT><A HREF="./com/google/dexmaker/DexMaker.html#declare(com.google.dexmaker.MethodId, int)"><B>declare(MethodId&lt;?, ?&gt;, int)</B></A> - 
+Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/DexMaker.html" title="class in com.google.dexmaker">DexMaker</A>
+<DD>Declares a method.
+<DT><A HREF="./com/google/dexmaker/DexMaker.html#declare(com.google.dexmaker.FieldId, int, java.lang.Object)"><B>declare(FieldId&lt;?, ?&gt;, int, Object)</B></A> - 
+Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/DexMaker.html" title="class in com.google.dexmaker">DexMaker</A>
+<DD>Declares a field.
+<DT><A HREF="./com/google/dexmaker/DexMaker.html#declareConstructor(com.google.dexmaker.MethodId, int)"><B>declareConstructor(MethodId&lt;?, ?&gt;, int)</B></A> - 
+Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/DexMaker.html" title="class in com.google.dexmaker">DexMaker</A>
+<DD>Declares a constructor.
 <DT><A HREF="./com/google/dexmaker/stock/ProxyBuilder.html#dexCache(java.io.File)"><B>dexCache(File)</B></A> - 
 Method in class com.google.dexmaker.stock.<A HREF="./com/google/dexmaker/stock/ProxyBuilder.html" title="class in com.google.dexmaker.stock">ProxyBuilder</A>
 <DD>&nbsp;
-<DT><A HREF="./com/google/dexmaker/DexGenerator.html" title="class in com.google.dexmaker"><B>DexGenerator</B></A> - Class in <A HREF="./com/google/dexmaker/package-summary.html">com.google.dexmaker</A><DD>Define types, fields and methods.<DT><A HREF="./com/google/dexmaker/DexGenerator.html#DexGenerator()"><B>DexGenerator()</B></A> - 
-Constructor for class com.google.dexmaker.<A HREF="./com/google/dexmaker/DexGenerator.html" title="class in com.google.dexmaker">DexGenerator</A>
+<DT><A HREF="./com/google/dexmaker/DexMaker.html" title="class in com.google.dexmaker"><B>DexMaker</B></A> - Class in <A HREF="./com/google/dexmaker/package-summary.html">com.google.dexmaker</A><DD>Generates a </i><strong>D</strong>alvik <strong>EX</strong>ecutable (dex)
+ file for execution on Android.<DT><A HREF="./com/google/dexmaker/DexMaker.html#DexMaker()"><B>DexMaker()</B></A> - 
+Constructor for class com.google.dexmaker.<A HREF="./com/google/dexmaker/DexMaker.html" title="class in com.google.dexmaker">DexMaker</A>
 <DD>&nbsp;
-<DT><A HREF="./com/google/dexmaker/Type.html#DOUBLE"><B>DOUBLE</B></A> - 
-Static variable in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>
+<DT><A HREF="./com/google/dexmaker/TypeId.html#DOUBLE"><B>DOUBLE</B></A> - 
+Static variable in class com.google.dexmaker.<A HREF="./com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>
 <DD>The <code>double</code> primitive type.
 </DL>
 <HR>
@@ -170,16 +171,16 @@
 <DT><A HREF="./com/google/dexmaker/MethodId.html#equals(java.lang.Object)"><B>equals(Object)</B></A> - 
 Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/MethodId.html" title="class in com.google.dexmaker">MethodId</A>
 <DD>&nbsp;
-<DT><A HREF="./com/google/dexmaker/Type.html#equals(java.lang.Object)"><B>equals(Object)</B></A> - 
-Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>
+<DT><A HREF="./com/google/dexmaker/TypeId.html#equals(java.lang.Object)"><B>equals(Object)</B></A> - 
+Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>
 <DD>&nbsp;
 </DL>
 <HR>
 <A NAME="_F_"><!-- --></A><H2>
 <B>F</B></H2>
 <DL>
-<DT><A HREF="./com/google/dexmaker/FieldId.html" title="class in com.google.dexmaker"><B>FieldId</B></A>&lt;<A HREF="./com/google/dexmaker/FieldId.html" title="type parameter in FieldId">D</A>,<A HREF="./com/google/dexmaker/FieldId.html" title="type parameter in FieldId">V</A>&gt; - Class in <A HREF="./com/google/dexmaker/package-summary.html">com.google.dexmaker</A><DD>A field.<DT><A HREF="./com/google/dexmaker/Type.html#FLOAT"><B>FLOAT</B></A> - 
-Static variable in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>
+<DT><A HREF="./com/google/dexmaker/FieldId.html" title="class in com.google.dexmaker"><B>FieldId</B></A>&lt;<A HREF="./com/google/dexmaker/FieldId.html" title="type parameter in FieldId">D</A>,<A HREF="./com/google/dexmaker/FieldId.html" title="type parameter in FieldId">V</A>&gt; - Class in <A HREF="./com/google/dexmaker/package-summary.html">com.google.dexmaker</A><DD>Identifies a field.<DT><A HREF="./com/google/dexmaker/TypeId.html#FLOAT"><B>FLOAT</B></A> - 
+Static variable in class com.google.dexmaker.<A HREF="./com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>
 <DD>The <code>float</code> primitive type.
 <DT><A HREF="./com/google/dexmaker/stock/ProxyBuilder.html#forClass(java.lang.Class)"><B>forClass(Class&lt;T&gt;)</B></A> - 
 Static method in class com.google.dexmaker.stock.<A HREF="./com/google/dexmaker/stock/ProxyBuilder.html" title="class in com.google.dexmaker.stock">ProxyBuilder</A>
@@ -189,17 +190,20 @@
 <A NAME="_G_"><!-- --></A><H2>
 <B>G</B></H2>
 <DL>
-<DT><A HREF="./com/google/dexmaker/DexGenerator.html#generate()"><B>generate()</B></A> - 
-Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/DexGenerator.html" title="class in com.google.dexmaker">DexGenerator</A>
-<DD>Returns a .dex formatted file.
-<DT><A HREF="./com/google/dexmaker/Type.html#get(java.lang.String)"><B>get(String)</B></A> - 
-Static method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>
+<DT><A HREF="./com/google/dexmaker/DexMaker.html#generate()"><B>generate()</B></A> - 
+Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/DexMaker.html" title="class in com.google.dexmaker">DexMaker</A>
+<DD>Generates a dex file and returns its bytes.
+<DT><A HREF="./com/google/dexmaker/DexMaker.html#generateAndLoad(java.lang.ClassLoader, java.io.File)"><B>generateAndLoad(ClassLoader, File)</B></A> - 
+Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/DexMaker.html" title="class in com.google.dexmaker">DexMaker</A>
+<DD>Generates a dex file and loads its types into the current process.
+<DT><A HREF="./com/google/dexmaker/TypeId.html#get(java.lang.String)"><B>get(String)</B></A> - 
+Static method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>
 <DD>&nbsp;
-<DT><A HREF="./com/google/dexmaker/Type.html#get(java.lang.Class)"><B>get(Class&lt;T&gt;)</B></A> - 
-Static method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>
+<DT><A HREF="./com/google/dexmaker/TypeId.html#get(java.lang.Class)"><B>get(Class&lt;T&gt;)</B></A> - 
+Static method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>
 <DD>&nbsp;
-<DT><A HREF="./com/google/dexmaker/Type.html#getConstructor(com.google.dexmaker.Type...)"><B>getConstructor(Type&lt;?&gt;...)</B></A> - 
-Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>
+<DT><A HREF="./com/google/dexmaker/TypeId.html#getConstructor(com.google.dexmaker.TypeId...)"><B>getConstructor(TypeId&lt;?&gt;...)</B></A> - 
+Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>
 <DD>&nbsp;
 <DT><A HREF="./com/google/dexmaker/FieldId.html#getDeclaringType()"><B>getDeclaringType()</B></A> - 
 Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/FieldId.html" title="class in com.google.dexmaker">FieldId</A>
@@ -207,25 +211,25 @@
 <DT><A HREF="./com/google/dexmaker/MethodId.html#getDeclaringType()"><B>getDeclaringType()</B></A> - 
 Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/MethodId.html" title="class in com.google.dexmaker">MethodId</A>
 <DD>&nbsp;
-<DT><A HREF="./com/google/dexmaker/Type.html#getField(com.google.dexmaker.Type, java.lang.String)"><B>getField(Type&lt;V&gt;, String)</B></A> - 
-Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>
+<DT><A HREF="./com/google/dexmaker/TypeId.html#getField(com.google.dexmaker.TypeId, java.lang.String)"><B>getField(TypeId&lt;V&gt;, String)</B></A> - 
+Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>
 <DD>&nbsp;
 <DT><A HREF="./com/google/dexmaker/stock/ProxyBuilder.html#getInvocationHandler(java.lang.Object)"><B>getInvocationHandler(Object)</B></A> - 
 Static method in class com.google.dexmaker.stock.<A HREF="./com/google/dexmaker/stock/ProxyBuilder.html" title="class in com.google.dexmaker.stock">ProxyBuilder</A>
 <DD>Returns the proxy's <CODE>InvocationHandler</CODE>.
-<DT><A HREF="./com/google/dexmaker/Type.html#getMethod(com.google.dexmaker.Type, java.lang.String, com.google.dexmaker.Type...)"><B>getMethod(Type&lt;R&gt;, String, Type&lt;?&gt;...)</B></A> - 
-Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>
+<DT><A HREF="./com/google/dexmaker/TypeId.html#getMethod(com.google.dexmaker.TypeId, java.lang.String, com.google.dexmaker.TypeId...)"><B>getMethod(TypeId&lt;R&gt;, String, TypeId&lt;?&gt;...)</B></A> - 
+Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>
 <DD>&nbsp;
 <DT><A HREF="./com/google/dexmaker/FieldId.html#getName()"><B>getName()</B></A> - 
 Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/FieldId.html" title="class in com.google.dexmaker">FieldId</A>
 <DD>&nbsp;
 <DT><A HREF="./com/google/dexmaker/MethodId.html#getName()"><B>getName()</B></A> - 
 Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/MethodId.html" title="class in com.google.dexmaker">MethodId</A>
+<DD>Returns the method's name.
+<DT><A HREF="./com/google/dexmaker/TypeId.html#getName()"><B>getName()</B></A> - 
+Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>
 <DD>&nbsp;
-<DT><A HREF="./com/google/dexmaker/Type.html#getName()"><B>getName()</B></A> - 
-Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>
-<DD>&nbsp;
-<DT><A HREF="./com/google/dexmaker/Code.html#getParameter(int, com.google.dexmaker.Type)"><B>getParameter(int, Type&lt;T&gt;)</B></A> - 
+<DT><A HREF="./com/google/dexmaker/Code.html#getParameter(int, com.google.dexmaker.TypeId)"><B>getParameter(int, TypeId&lt;T&gt;)</B></A> - 
 Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Code.html" title="class in com.google.dexmaker">Code</A>
 <DD>&nbsp;
 <DT><A HREF="./com/google/dexmaker/MethodId.html#getParameters()"><B>getParameters()</B></A> - 
@@ -234,7 +238,7 @@
 <DT><A HREF="./com/google/dexmaker/MethodId.html#getReturnType()"><B>getReturnType()</B></A> - 
 Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/MethodId.html" title="class in com.google.dexmaker">MethodId</A>
 <DD>&nbsp;
-<DT><A HREF="./com/google/dexmaker/Code.html#getThis(com.google.dexmaker.Type)"><B>getThis(Type&lt;T&gt;)</B></A> - 
+<DT><A HREF="./com/google/dexmaker/Code.html#getThis(com.google.dexmaker.TypeId)"><B>getThis(TypeId&lt;T&gt;)</B></A> - 
 Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Code.html" title="class in com.google.dexmaker">Code</A>
 <DD>&nbsp;
 <DT><A HREF="./com/google/dexmaker/FieldId.html#getType()"><B>getType()</B></A> - 
@@ -257,22 +261,22 @@
 <DT><A HREF="./com/google/dexmaker/MethodId.html#hashCode()"><B>hashCode()</B></A> - 
 Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/MethodId.html" title="class in com.google.dexmaker">MethodId</A>
 <DD>&nbsp;
-<DT><A HREF="./com/google/dexmaker/Type.html#hashCode()"><B>hashCode()</B></A> - 
-Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>
+<DT><A HREF="./com/google/dexmaker/TypeId.html#hashCode()"><B>hashCode()</B></A> - 
+Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>
 <DD>&nbsp;
 </DL>
 <HR>
 <A NAME="_I_"><!-- --></A><H2>
 <B>I</B></H2>
 <DL>
-<DT><A HREF="./com/google/dexmaker/Code.html#iget(com.google.dexmaker.FieldId, com.google.dexmaker.Local, com.google.dexmaker.Local)"><B>iget(FieldId&lt;D, V&gt;, Local&lt;D&gt;, Local&lt;V&gt;)</B></A> - 
+<DT><A HREF="./com/google/dexmaker/Code.html#iget(com.google.dexmaker.FieldId, com.google.dexmaker.Local, com.google.dexmaker.Local)"><B>iget(FieldId&lt;D, V&gt;, Local&lt;V&gt;, Local&lt;D&gt;)</B></A> - 
 Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Code.html" title="class in com.google.dexmaker">Code</A>
 <DD>&nbsp;
-<DT><A HREF="./com/google/dexmaker/Code.html#instanceOfType(com.google.dexmaker.Local, com.google.dexmaker.Local, com.google.dexmaker.Type)"><B>instanceOfType(Local&lt;?&gt;, Local&lt;?&gt;, Type&lt;?&gt;)</B></A> - 
+<DT><A HREF="./com/google/dexmaker/Code.html#instanceOfType(com.google.dexmaker.Local, com.google.dexmaker.Local, com.google.dexmaker.TypeId)"><B>instanceOfType(Local&lt;?&gt;, Local&lt;?&gt;, TypeId&lt;?&gt;)</B></A> - 
 Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Code.html" title="class in com.google.dexmaker">Code</A>
 <DD>&nbsp;
-<DT><A HREF="./com/google/dexmaker/Type.html#INT"><B>INT</B></A> - 
-Static variable in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>
+<DT><A HREF="./com/google/dexmaker/TypeId.html#INT"><B>INT</B></A> - 
+Static variable in class com.google.dexmaker.<A HREF="./com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>
 <DD>The <code>int</code> primitive type.
 <DT><A HREF="./com/google/dexmaker/Code.html#invokeDirect(com.google.dexmaker.MethodId, com.google.dexmaker.Local, com.google.dexmaker.Local, com.google.dexmaker.Local...)"><B>invokeDirect(MethodId&lt;D, R&gt;, Local&lt;? super R&gt;, Local&lt;? extends D&gt;, Local&lt;?&gt;...)</B></A> - 
 Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Code.html" title="class in com.google.dexmaker">Code</A>
@@ -305,14 +309,14 @@
 <A NAME="_L_"><!-- --></A><H2>
 <B>L</B></H2>
 <DL>
-<DT><A HREF="./com/google/dexmaker/Label.html" title="class in com.google.dexmaker"><B>Label</B></A> - Class in <A HREF="./com/google/dexmaker/package-summary.html">com.google.dexmaker</A><DD>A branch target in a list of instructions.<DT><A HREF="./com/google/dexmaker/DexGenerator.html#load(java.lang.ClassLoader, java.io.File, java.io.File)"><B>load(ClassLoader, File, File)</B></A> - 
-Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/DexGenerator.html" title="class in com.google.dexmaker">DexGenerator</A>
-<DD>Loads the generated types into the current process.
+<DT><A HREF="./com/google/dexmaker/Label.html" title="class in com.google.dexmaker"><B>Label</B></A> - Class in <A HREF="./com/google/dexmaker/package-summary.html">com.google.dexmaker</A><DD>A branch target in a list of instructions.<DT><A HREF="./com/google/dexmaker/Label.html#Label()"><B>Label()</B></A> - 
+Constructor for class com.google.dexmaker.<A HREF="./com/google/dexmaker/Label.html" title="class in com.google.dexmaker">Label</A>
+<DD>&nbsp;
 <DT><A HREF="./com/google/dexmaker/Code.html#loadConstant(com.google.dexmaker.Local, T)"><B>loadConstant(Local&lt;T&gt;, T)</B></A> - 
 Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Code.html" title="class in com.google.dexmaker">Code</A>
 <DD>&nbsp;
-<DT><A HREF="./com/google/dexmaker/Local.html" title="class in com.google.dexmaker"><B>Local</B></A>&lt;<A HREF="./com/google/dexmaker/Local.html" title="type parameter in Local">T</A>&gt; - Class in <A HREF="./com/google/dexmaker/package-summary.html">com.google.dexmaker</A><DD>A temporary variable that holds a single value.<DT><A HREF="./com/google/dexmaker/Type.html#LONG"><B>LONG</B></A> - 
-Static variable in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>
+<DT><A HREF="./com/google/dexmaker/Local.html" title="class in com.google.dexmaker"><B>Local</B></A>&lt;<A HREF="./com/google/dexmaker/Local.html" title="type parameter in Local">T</A>&gt; - Class in <A HREF="./com/google/dexmaker/package-summary.html">com.google.dexmaker</A><DD>A temporary variable that holds a single value of a known type.<DT><A HREF="./com/google/dexmaker/TypeId.html#LONG"><B>LONG</B></A> - 
+Static variable in class com.google.dexmaker.<A HREF="./com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>
 <DD>The <code>long</code> primitive type.
 </DL>
 <HR>
@@ -322,7 +326,7 @@
 <DT><A HREF="./com/google/dexmaker/Code.html#mark(com.google.dexmaker.Label)"><B>mark(Label)</B></A> - 
 Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Code.html" title="class in com.google.dexmaker">Code</A>
 <DD>Start defining instructions for the named label.
-<DT><A HREF="./com/google/dexmaker/MethodId.html" title="class in com.google.dexmaker"><B>MethodId</B></A>&lt;<A HREF="./com/google/dexmaker/MethodId.html" title="type parameter in MethodId">D</A>,<A HREF="./com/google/dexmaker/MethodId.html" title="type parameter in MethodId">R</A>&gt; - Class in <A HREF="./com/google/dexmaker/package-summary.html">com.google.dexmaker</A><DD>A method or constructor.</DL>
+<DT><A HREF="./com/google/dexmaker/MethodId.html" title="class in com.google.dexmaker"><B>MethodId</B></A>&lt;<A HREF="./com/google/dexmaker/MethodId.html" title="type parameter in MethodId">D</A>,<A HREF="./com/google/dexmaker/MethodId.html" title="type parameter in MethodId">R</A>&gt; - Class in <A HREF="./com/google/dexmaker/package-summary.html">com.google.dexmaker</A><DD>Identifies a method or constructor.</DL>
 <HR>
 <A NAME="_N_"><!-- --></A><H2>
 <B>N</B></H2>
@@ -330,16 +334,13 @@
 <DT><A HREF="./com/google/dexmaker/Code.html#negate(com.google.dexmaker.Local, com.google.dexmaker.Local)"><B>negate(Local&lt;T&gt;, Local&lt;T&gt;)</B></A> - 
 Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Code.html" title="class in com.google.dexmaker">Code</A>
 <DD>&nbsp;
-<DT><A HREF="./com/google/dexmaker/Code.html#newArray(com.google.dexmaker.Local, com.google.dexmaker.Local)"><B>newArray(Local&lt;Integer&gt;, Local&lt;T&gt;)</B></A> - 
+<DT><A HREF="./com/google/dexmaker/Code.html#newArray(com.google.dexmaker.Local, com.google.dexmaker.Local)"><B>newArray(Local&lt;T&gt;, Local&lt;Integer&gt;)</B></A> - 
 Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Code.html" title="class in com.google.dexmaker">Code</A>
 <DD>&nbsp;
 <DT><A HREF="./com/google/dexmaker/Code.html#newInstance(com.google.dexmaker.Local, com.google.dexmaker.MethodId, com.google.dexmaker.Local...)"><B>newInstance(Local&lt;T&gt;, MethodId&lt;T, Void&gt;, Local&lt;?&gt;...)</B></A> - 
 Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Code.html" title="class in com.google.dexmaker">Code</A>
 <DD>&nbsp;
-<DT><A HREF="./com/google/dexmaker/Code.html#newLabel()"><B>newLabel()</B></A> - 
-Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Code.html" title="class in com.google.dexmaker">Code</A>
-<DD>Creates a new label for use as a branch target.
-<DT><A HREF="./com/google/dexmaker/Code.html#newLocal(com.google.dexmaker.Type)"><B>newLocal(Type&lt;T&gt;)</B></A> - 
+<DT><A HREF="./com/google/dexmaker/Code.html#newLocal(com.google.dexmaker.TypeId)"><B>newLocal(TypeId&lt;T&gt;)</B></A> - 
 Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Code.html" title="class in com.google.dexmaker">Code</A>
 <DD>&nbsp;
 <DT><A HREF="./com/google/dexmaker/Code.html#not(com.google.dexmaker.Local, com.google.dexmaker.Local)"><B>not(Local&lt;T&gt;, Local&lt;T&gt;)</B></A> - 
@@ -353,8 +354,8 @@
 <A NAME="_O_"><!-- --></A><H2>
 <B>O</B></H2>
 <DL>
-<DT><A HREF="./com/google/dexmaker/Type.html#OBJECT"><B>OBJECT</B></A> - 
-Static variable in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>
+<DT><A HREF="./com/google/dexmaker/TypeId.html#OBJECT"><B>OBJECT</B></A> - 
+Static variable in class com.google.dexmaker.<A HREF="./com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>
 <DD>The <code>Object</code> type.
 <DT><A HREF="./com/google/dexmaker/Code.html#op(com.google.dexmaker.BinaryOp, com.google.dexmaker.Local, com.google.dexmaker.Local, com.google.dexmaker.Local)"><B>op(BinaryOp, Local&lt;T&gt;, Local&lt;T&gt;, Local&lt;T&gt;)</B></A> - 
 Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Code.html" title="class in com.google.dexmaker">Code</A>
@@ -372,7 +373,7 @@
 <A NAME="_R_"><!-- --></A><H2>
 <B>R</B></H2>
 <DL>
-<DT><A HREF="./com/google/dexmaker/Code.html#removeCatchClause(com.google.dexmaker.Type)"><B>removeCatchClause(Type&lt;?&gt;)</B></A> - 
+<DT><A HREF="./com/google/dexmaker/Code.html#removeCatchClause(com.google.dexmaker.TypeId)"><B>removeCatchClause(TypeId&lt;?&gt;)</B></A> - 
 Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Code.html" title="class in com.google.dexmaker">Code</A>
 <DD>&nbsp;
 <DT><A HREF="./com/google/dexmaker/Code.html#returnValue(com.google.dexmaker.Local)"><B>returnValue(Local&lt;?&gt;)</B></A> - 
@@ -389,14 +390,14 @@
 <DT><A HREF="./com/google/dexmaker/Code.html#sget(com.google.dexmaker.FieldId, com.google.dexmaker.Local)"><B>sget(FieldId&lt;?, V&gt;, Local&lt;V&gt;)</B></A> - 
 Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Code.html" title="class in com.google.dexmaker">Code</A>
 <DD>&nbsp;
-<DT><A HREF="./com/google/dexmaker/Type.html#SHORT"><B>SHORT</B></A> - 
-Static variable in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>
+<DT><A HREF="./com/google/dexmaker/TypeId.html#SHORT"><B>SHORT</B></A> - 
+Static variable in class com.google.dexmaker.<A HREF="./com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>
 <DD>The <code>short</code> primitive type.
 <DT><A HREF="./com/google/dexmaker/Code.html#sput(com.google.dexmaker.FieldId, com.google.dexmaker.Local)"><B>sput(FieldId&lt;?, V&gt;, Local&lt;V&gt;)</B></A> - 
 Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Code.html" title="class in com.google.dexmaker">Code</A>
 <DD>&nbsp;
-<DT><A HREF="./com/google/dexmaker/Type.html#STRING"><B>STRING</B></A> - 
-Static variable in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>
+<DT><A HREF="./com/google/dexmaker/TypeId.html#STRING"><B>STRING</B></A> - 
+Static variable in class com.google.dexmaker.<A HREF="./com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>
 <DD>The <code>String</code> type.
 </DL>
 <HR>
@@ -415,13 +416,13 @@
 <DT><A HREF="./com/google/dexmaker/MethodId.html#toString()"><B>toString()</B></A> - 
 Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/MethodId.html" title="class in com.google.dexmaker">MethodId</A>
 <DD>&nbsp;
-<DT><A HREF="./com/google/dexmaker/Type.html#toString()"><B>toString()</B></A> - 
-Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>
+<DT><A HREF="./com/google/dexmaker/TypeId.html#toString()"><B>toString()</B></A> - 
+Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>
 <DD>&nbsp;
-<DT><A HREF="./com/google/dexmaker/Type.html" title="class in com.google.dexmaker"><B>Type</B></A>&lt;<A HREF="./com/google/dexmaker/Type.html" title="type parameter in Type">T</A>&gt; - Class in <A HREF="./com/google/dexmaker/package-summary.html">com.google.dexmaker</A><DD>A primitive type, interface or class.<DT><A HREF="./com/google/dexmaker/Code.html#typeCast(com.google.dexmaker.Local, com.google.dexmaker.Local)"><B>typeCast(Local&lt;?&gt;, Local&lt;?&gt;)</B></A> - 
+<DT><A HREF="./com/google/dexmaker/Code.html#typeCast(com.google.dexmaker.Local, com.google.dexmaker.Local)"><B>typeCast(Local&lt;?&gt;, Local&lt;?&gt;)</B></A> - 
 Method in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Code.html" title="class in com.google.dexmaker">Code</A>
 <DD>&nbsp;
-</DL>
+<DT><A HREF="./com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker"><B>TypeId</B></A>&lt;<A HREF="./com/google/dexmaker/TypeId.html" title="type parameter in TypeId">T</A>&gt; - Class in <A HREF="./com/google/dexmaker/package-summary.html">com.google.dexmaker</A><DD>A primitive type, interface or class.</DL>
 <HR>
 <A NAME="_V_"><!-- --></A><H2>
 <B>V</B></H2>
@@ -440,8 +441,8 @@
 Static method in enum com.google.dexmaker.<A HREF="./com/google/dexmaker/Comparison.html" title="enum in com.google.dexmaker">Comparison</A>
 <DD>Returns an array containing the constants of this enum type, in
 the order they are declared.
-<DT><A HREF="./com/google/dexmaker/Type.html#VOID"><B>VOID</B></A> - 
-Static variable in class com.google.dexmaker.<A HREF="./com/google/dexmaker/Type.html" title="class in com.google.dexmaker">Type</A>
+<DT><A HREF="./com/google/dexmaker/TypeId.html#VOID"><B>VOID</B></A> - 
+Static variable in class com.google.dexmaker.<A HREF="./com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker">TypeId</A>
 <DD>The <code>void</code> primitive type.
 </DL>
 <HR>
diff --git a/javadoc/index.html b/javadoc/index.html
index 13fe25c..e617bd8 100644
--- a/javadoc/index.html
+++ b/javadoc/index.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc on Tue Jan 03 17:07:49 EST 2012-->
+<!-- Generated by javadoc on Fri Jan 06 14:58:31 EST 2012-->
 <TITLE>
 dexmaker
 </TITLE>
diff --git a/javadoc/overview-frame.html b/javadoc/overview-frame.html
index 444e32f..2eb23ce 100644
--- a/javadoc/overview-frame.html
+++ b/javadoc/overview-frame.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_26) on Tue Jan 03 17:07:49 EST 2012 -->
+<!-- Generated by javadoc (build 1.6.0_26) on Fri Jan 06 14:58:31 EST 2012 -->
 <TITLE>
 Overview List (dexmaker)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-01-03">
+<META NAME="date" CONTENT="2012-01-06">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 
diff --git a/javadoc/overview-summary.html b/javadoc/overview-summary.html
index 3093e1b..8cd5542 100644
--- a/javadoc/overview-summary.html
+++ b/javadoc/overview-summary.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_26) on Tue Jan 03 17:07:49 EST 2012 -->
+<!-- Generated by javadoc (build 1.6.0_26) on Fri Jan 06 14:58:31 EST 2012 -->
 <TITLE>
 Overview (dexmaker)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-01-03">
+<META NAME="date" CONTENT="2012-01-06">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 
diff --git a/javadoc/overview-tree.html b/javadoc/overview-tree.html
index 58bcb8e..a5fb480 100644
--- a/javadoc/overview-tree.html
+++ b/javadoc/overview-tree.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_26) on Tue Jan 03 17:07:49 EST 2012 -->
+<!-- Generated by javadoc (build 1.6.0_26) on Fri Jan 06 14:58:31 EST 2012 -->
 <TITLE>
 Class Hierarchy (dexmaker)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-01-03">
+<META NAME="date" CONTENT="2012-01-06">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 
@@ -90,7 +90,7 @@
 </H2>
 <UL>
 <LI TYPE="circle">java.lang.Object<UL>
-<LI TYPE="circle">com.google.dexmaker.<A HREF="com/google/dexmaker/Code.html" title="class in com.google.dexmaker"><B>Code</B></A><LI TYPE="circle">com.google.dexmaker.<A HREF="com/google/dexmaker/DexGenerator.html" title="class in com.google.dexmaker"><B>DexGenerator</B></A><LI TYPE="circle">com.google.dexmaker.<A HREF="com/google/dexmaker/FieldId.html" title="class in com.google.dexmaker"><B>FieldId</B></A>&lt;D,V&gt;<LI TYPE="circle">com.google.dexmaker.<A HREF="com/google/dexmaker/Label.html" title="class in com.google.dexmaker"><B>Label</B></A><LI TYPE="circle">com.google.dexmaker.<A HREF="com/google/dexmaker/Local.html" title="class in com.google.dexmaker"><B>Local</B></A>&lt;T&gt;<LI TYPE="circle">com.google.dexmaker.<A HREF="com/google/dexmaker/MethodId.html" title="class in com.google.dexmaker"><B>MethodId</B></A>&lt;D,R&gt;<LI TYPE="circle">com.google.dexmaker.stock.<A HREF="com/google/dexmaker/stock/ProxyBuilder.html" title="class in com.google.dexmaker.stock"><B>ProxyBuilder</B></A>&lt;T&gt;<LI TYPE="circle">com.google.dexmaker.<A HREF="com/google/dexmaker/Type.html" title="class in com.google.dexmaker"><B>Type</B></A>&lt;T&gt;</UL>
+<LI TYPE="circle">com.google.dexmaker.<A HREF="com/google/dexmaker/Code.html" title="class in com.google.dexmaker"><B>Code</B></A><LI TYPE="circle">com.google.dexmaker.<A HREF="com/google/dexmaker/DexMaker.html" title="class in com.google.dexmaker"><B>DexMaker</B></A><LI TYPE="circle">com.google.dexmaker.<A HREF="com/google/dexmaker/FieldId.html" title="class in com.google.dexmaker"><B>FieldId</B></A>&lt;D,V&gt;<LI TYPE="circle">com.google.dexmaker.<A HREF="com/google/dexmaker/Label.html" title="class in com.google.dexmaker"><B>Label</B></A><LI TYPE="circle">com.google.dexmaker.<A HREF="com/google/dexmaker/Local.html" title="class in com.google.dexmaker"><B>Local</B></A>&lt;T&gt;<LI TYPE="circle">com.google.dexmaker.<A HREF="com/google/dexmaker/MethodId.html" title="class in com.google.dexmaker"><B>MethodId</B></A>&lt;D,R&gt;<LI TYPE="circle">com.google.dexmaker.stock.<A HREF="com/google/dexmaker/stock/ProxyBuilder.html" title="class in com.google.dexmaker.stock"><B>ProxyBuilder</B></A>&lt;T&gt;<LI TYPE="circle">com.google.dexmaker.<A HREF="com/google/dexmaker/TypeId.html" title="class in com.google.dexmaker"><B>TypeId</B></A>&lt;T&gt;</UL>
 </UL>
 <H2>
 Enum Hierarchy
@@ -99,7 +99,7 @@
 <LI TYPE="circle">java.lang.Object<UL>
 <LI TYPE="circle">java.lang.Enum&lt;E&gt; (implements java.lang.Comparable&lt;T&gt;, java.io.Serializable)
 <UL>
-<LI TYPE="circle">com.google.dexmaker.<A HREF="com/google/dexmaker/Comparison.html" title="enum in com.google.dexmaker"><B>Comparison</B></A><LI TYPE="circle">com.google.dexmaker.<A HREF="com/google/dexmaker/BinaryOp.html" title="enum in com.google.dexmaker"><B>BinaryOp</B></A></UL>
+<LI TYPE="circle">com.google.dexmaker.<A HREF="com/google/dexmaker/BinaryOp.html" title="enum in com.google.dexmaker"><B>BinaryOp</B></A><LI TYPE="circle">com.google.dexmaker.<A HREF="com/google/dexmaker/Comparison.html" title="enum in com.google.dexmaker"><B>Comparison</B></A></UL>
 </UL>
 </UL>
 <HR>