Refactored ContainerBuilder API. Added support for generic types.
git-svn-id: https://google-guice.googlecode.com/svn/trunk@12 d779f126-a31b-0410-b53b-1d3aecad763e
diff --git a/guice.ipr b/guice.ipr
index 7df2927..ea9f168 100644
--- a/guice.ipr
+++ b/guice.ipr
@@ -661,21 +661,21 @@
<option name="MAXIMUM_HEAP_SIZE" value="512" />
</component>
<component name="JavadocGenerationManager">
- <option name="OUTPUT_DIRECTORY" />
+ <option name="OUTPUT_DIRECTORY" value="/tmp/javadoc" />
<option name="OPTION_SCOPE" value="protected" />
<option name="OPTION_HIERARCHY" value="true" />
<option name="OPTION_NAVIGATOR" value="true" />
<option name="OPTION_INDEX" value="true" />
<option name="OPTION_SEPARATE_INDEX" value="true" />
<option name="OPTION_DOCUMENT_TAG_USE" value="false" />
- <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
+ <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="true" />
<option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
<option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
<option name="OPTION_DEPRECATED_LIST" value="true" />
- <option name="OTHER_OPTIONS" value="" />
+ <option name="OTHER_OPTIONS" />
<option name="HEAP_SIZE" />
<option name="LOCALE" />
- <option name="OPEN_IN_BROWSER" value="true" />
+ <option name="OPEN_IN_BROWSER" value="false" />
</component>
<component name="JikesSettings">
<option name="JIKES_PATH" value="" />
diff --git a/guice.iws b/guice.iws
index 9030947..1e2dc9b 100644
--- a/guice.iws
+++ b/guice.iws
@@ -18,14 +18,36 @@
</component>
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/com/google/inject/Factory.html" afterPath="$PROJECT_DIR$/javadoc/com/google/inject/Factory.html" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/google/inject/Scope.java" afterPath="$PROJECT_DIR$/src/com/google/inject/Scope.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/com/google/inject/NotRequiredTest.java" afterPath="$PROJECT_DIR$/test/com/google/inject/NotRequiredTest.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/google/inject/InternalFactory.java" afterPath="$PROJECT_DIR$/src/com/google/inject/InternalFactory.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/google/inject/ContainerImpl.java" afterPath="$PROJECT_DIR$/src/com/google/inject/ContainerImpl.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/index-all.html" afterPath="$PROJECT_DIR$/javadoc/index-all.html" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/google/inject/ContextAwareFactory.java" afterPath="$PROJECT_DIR$/src/com/google/inject/ContextAwareFactory.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/guice.iws" afterPath="$PROJECT_DIR$/guice.iws" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/com/google/inject/StaticInjectionTest.java" afterPath="$PROJECT_DIR$/test/com/google/inject/StaticInjectionTest.java" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/src/com/google/inject/ExternalContext.java" afterPath="" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/google/inject/ContainerBuilder.java" afterPath="$PROJECT_DIR$/src/com/google/inject/ContainerBuilder.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/com/google/inject/ContainerTest.java" afterPath="$PROJECT_DIR$/test/com/google/inject/ContainerTest.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/google/inject/ConstantFactory.java" afterPath="$PROJECT_DIR$/src/com/google/inject/ConstantFactory.java" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/com/google/inject/SourceAware.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/google/inject/Key.java" afterPath="$PROJECT_DIR$/src/com/google/inject/Key.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/com/google/inject/ErrorMessage.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/google/inject/BindingBuilder.java" afterPath="$PROJECT_DIR$/src/com/google/inject/BindingBuilder.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/com/google/inject/BindingBuilderTest.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/google/inject/util/Function.java" afterPath="$PROJECT_DIR$/src/com/google/inject/util/Function.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/com/google/inject/SourceProvider.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/google/inject/TypeToken.java" afterPath="$PROJECT_DIR$/src/com/google/inject/TypeToken.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/google/inject/Factory.java" afterPath="$PROJECT_DIR$/src/com/google/inject/Factory.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/com/google/inject/SuperclassTest.java" afterPath="$PROJECT_DIR$/test/com/google/inject/SuperclassTest.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/google/inject/ErrorMessage.java" afterPath="$PROJECT_DIR$/src/com/google/inject/ErrorMessage.java" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/com/google/inject/ContextualFactory.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/com/google/inject/SpringTest.java" afterPath="$PROJECT_DIR$/test/com/google/inject/SpringTest.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/guice.ipr" afterPath="$PROJECT_DIR$/guice.ipr" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/com/google/inject/ConstantConversionTest.java" afterPath="$PROJECT_DIR$/test/com/google/inject/ConstantConversionTest.java" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/src/com/google/inject/Scope2.java" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/src/com/google/inject/BindingBuilder.java" afterPath="" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/com/google/inject/FactoryTest.java" afterPath="$PROJECT_DIR$/test/com/google/inject/FactoryTest.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/com/google/inject/ContainerBuilder.html" afterPath="$PROJECT_DIR$/javadoc/com/google/inject/ContainerBuilder.html" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/com/google/inject/web" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/src/com/google/inject/Binding.java" afterPath="" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/com/google/inject/CircularDependencyTest.java" afterPath="$PROJECT_DIR$/test/com/google/inject/CircularDependencyTest.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/com/google/inject/KeyTest.java" afterPath="$PROJECT_DIR$/test/com/google/inject/KeyTest.java" />
</list>
</component>
<component name="ChangeListSynchronizer" />
@@ -144,7 +166,24 @@
</breakpoint>
</breakpoint_any>
<breakpoint_rules />
- <ui_properties />
+ <ui_properties>
+ <property name="exception_breakpoints_flattenPackages" value="true" />
+ <property name="line_breakpoints_groupByClasses" value="true" />
+ <property name="exception_breakpoints_groupByMethods" value="false" />
+ <property name="method_breakpoints_viewId" value="TABLE" />
+ <property name="line_breakpoints_viewId" value="TABLE" />
+ <property name="exception_breakpoints_groupByClasses" value="true" />
+ <property name="method_breakpoints_groupByMethods" value="false" />
+ <property name="field_breakpoints_flattenPackages" value="true" />
+ <property name="line_breakpoints_flattenPackages" value="true" />
+ <property name="exception_breakpoints_viewId" value="TABLE" />
+ <property name="field_breakpoints_groupByClasses" value="true" />
+ <property name="method_breakpoints_flattenPackages" value="true" />
+ <property name="field_breakpoints_viewId" value="TABLE" />
+ <property name="line_breakpoints_groupByMethods" value="false" />
+ <property name="method_breakpoints_groupByClasses" value="true" />
+ <property name="field_breakpoints_groupByMethods" value="false" />
+ </ui_properties>
</component>
<component name="ErrorTreeViewConfiguration">
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
@@ -178,57 +217,91 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="BindingBuilder.java" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/com/google/inject/BindingBuilder.java">
+ <file leaf-file-name="InternalContext.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/com/google/inject/InternalContext.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="28" column="13" selection-start="826" selection-end="826" vertical-scroll-proportion="0.3278237">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="AbstractReferenceCache.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/com/google/inject/util/AbstractReferenceCache.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="28" column="15" selection-start="885" selection-end="885" vertical-scroll-proportion="0.25757575">
+ <state line="73" column="17" selection-start="2143" selection-end="2143" vertical-scroll-proportion="1.2992593">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ReferenceCacheTest.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/test/com/google/inject/util/ReferenceCacheTest.java">
+ <file leaf-file-name="InternalFactory.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/com/google/inject/InternalFactory.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="29" column="13" selection-start="945" selection-end="945" vertical-scroll-proportion="0.2107438">
+ <state line="23" column="10" selection-start="730" selection-end="730" vertical-scroll-proportion="0.22666667">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ReferenceCache.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/com/google/inject/util/ReferenceCache.java">
+ <file leaf-file-name="ExternalContext.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/com/google/inject/ExternalContext.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="25" column="3" selection-start="846" selection-end="846" vertical-scroll-proportion="0.25757575">
+ <state line="68" column="32" selection-start="1728" selection-end="1728" vertical-scroll-proportion="1.2740741">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="SourceProvider.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/com/google/inject/SourceProvider.java">
+ <file leaf-file-name="ConstantConversionException.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/com/google/inject/ConstantConversionException.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="25" column="0" selection-start="795" selection-end="795" vertical-scroll-proportion="0.25757575">
+ <state line="25" column="6" selection-start="773" selection-end="773" vertical-scroll-proportion="0.27703702">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Container.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/com/google/inject/Container.java">
+ <file leaf-file-name="ContextualFactory.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/com/google/inject/ContextualFactory.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="64" column="17" selection-start="1877" selection-end="1877" vertical-scroll-proportion="1.0936639">
+ <state line="23" column="17" selection-start="726" selection-end="726" vertical-scroll-proportion="0.22666667">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="Factory.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/com/google/inject/Factory.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="0" column="0" selection-start="0" selection-end="595" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="SourceAware.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/com/google/inject/SourceAware.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="15" column="0" selection-start="596" selection-end="596" vertical-scroll-proportion="0.37777779">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="ContainerImpl.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/com/google/inject/ContainerImpl.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="67" column="15" selection-start="2168" selection-end="2168" vertical-scroll-proportion="0.3674074">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="ConstantFactory.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/com/google/inject/ConstantFactory.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="21" column="6" selection-start="680" selection-end="680" vertical-scroll-proportion="0.1762963">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="Scope.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/com/google/inject/Scope.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="48" column="0" selection-start="1319" selection-end="1319" vertical-scroll-proportion="0.3614815">
<folding />
</state>
</provider>
@@ -237,45 +310,16 @@
<file leaf-file-name="ContainerBuilder.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/google/inject/ContainerBuilder.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="14" column="3" selection-start="595" selection-end="595" vertical-scroll-proportion="0.0">
+ <state line="541" column="27" selection-start="15820" selection-end="15820" vertical-scroll-proportion="0.3674074">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Key.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/com/google/inject/Key.java">
+ <file leaf-file-name="Container.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/com/google/inject/Container.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="51" column="26" selection-start="1386" selection-end="1386" vertical-scroll-proportion="0.35123968">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="ErrorMessage.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/com/google/inject/ErrorMessage.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="23" column="2" selection-start="751" selection-end="751" vertical-scroll-proportion="0.2107438">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="PrintStream.java" pinned="false" current="false" current-in-tab="false">
- <entry file="jar:///Users/crazybob/src.zip!/java/io/PrintStream.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="954" column="26" selection-start="32954" selection-end="32954" vertical-scroll-proportion="0.47796142">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="Formatter.java" pinned="false" current="false" current-in-tab="false">
- <entry file="jar:///Users/crazybob/src.zip!/java/util/Formatter.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="40" column="11" selection-start="1127" selection-end="1127" vertical-scroll-proportion="-1.6391184">
+ <state line="64" column="17" selection-start="1877" selection-end="1877" vertical-scroll-proportion="0.38074073">
<folding />
</state>
</provider>
@@ -284,61 +328,97 @@
<file leaf-file-name="BindingBuilderTest.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/test/com/google/inject/BindingBuilderTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="25" column="32" selection-start="792" selection-end="792" vertical-scroll-proportion="0.25757575">
+ <state line="23" column="13" selection-start="721" selection-end="721" vertical-scroll-proportion="0.22666667">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Throwable.java" pinned="false" current="false" current-in-tab="false">
- <entry file="jar:///Users/crazybob/src.zip!/java/lang/Throwable.java">
+ <file leaf-file-name="CircularDependencyTest.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/test/com/google/inject/CircularDependencyTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="563" column="32" selection-start="23216" selection-end="23216" vertical-scroll-proportion="0.23415978">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Scope2.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/com/google/inject/Scope2.java">
+ <file leaf-file-name="Key.java" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/src/com/google/inject/Key.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="21" column="17" selection-start="691" selection-end="691" vertical-scroll-proportion="0.16391185">
+ <state line="188" column="2" selection-start="4728" selection-end="4728" vertical-scroll-proportion="1.0266666">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="TypeToken.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/com/google/inject/TypeToken.java">
+ <file leaf-file-name="FactoryTest.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/test/com/google/inject/FactoryTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="159" column="33" selection-start="4511" selection-end="4511" vertical-scroll-proportion="1.1694214">
+ <state line="43" column="0" selection-start="1339" selection-end="1339" vertical-scroll-proportion="-0.025185185">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="TypeTokenTest.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/test/com/google/inject/TypeTokenTest.java">
+ <file leaf-file-name="ConstantConversionTest.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/test/com/google/inject/ConstantConversionTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="42" column="55" selection-start="1307" selection-end="1307" vertical-scroll-proportion="0.60881543">
+ <state line="26" column="13" selection-start="770" selection-end="770" vertical-scroll-proportion="0.22666667">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ClassRepository.class" pinned="false" current="false" current-in-tab="false">
- <entry file="jar:///System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Classes/classes.jar!/sun/reflect/generics/repository/ClassRepository.class">
+ <file leaf-file-name="NotRequiredTest.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/test/com/google/inject/NotRequiredTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="15" column="26" selection-start="851" selection-end="851" vertical-scroll-proportion="0.3347398">
+ <state line="38" column="24" selection-start="1174" selection-end="1174" vertical-scroll-proportion="0.60444444">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Objects.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/com/google/inject/util/Objects.java">
+ <file leaf-file-name="StaticInjectionTest.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/test/com/google/inject/StaticInjectionTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="23" column="13" selection-start="716" selection-end="716" vertical-scroll-proportion="0.2107438">
+ <state line="37" column="0" selection-start="1131" selection-end="1131" vertical-scroll-proportion="0.5792593">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="SpringTest.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/test/com/google/inject/SpringTest.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="14" column="3" selection-start="595" selection-end="595" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="ContainerTest.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/test/com/google/inject/ContainerTest.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="169" column="29" selection-start="3477" selection-end="3477" vertical-scroll-proportion="3.8533332">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="ParameterizedType.class" pinned="false" current="false" current-in-tab="false">
+ <entry file="jar:///usr/local/buildtools/java/jdk1.5.0_06/jre/lib/rt.jar!/java/lang/reflect/ParameterizedType.class">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="5" column="17" selection-start="159" selection-end="159" vertical-scroll-proportion="0.10074074">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="Type.class" pinned="false" current="false" current-in-tab="false">
+ <entry file="jar:///usr/local/buildtools/java/jdk1.5.0_06/jre/lib/rt.jar!/java/lang/reflect/Type.class">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="5" column="17" selection-start="159" selection-end="159" vertical-scroll-proportion="0.10074074">
<folding />
</state>
</provider>
@@ -347,7 +427,7 @@
<file leaf-file-name="KeyTest.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/test/com/google/inject/KeyTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="13" column="13" selection-start="264" selection-end="264" vertical-scroll-proportion="0.2107438">
+ <state line="14" column="3" selection-start="595" selection-end="595" vertical-scroll-proportion="0.3525926">
<folding />
</state>
</provider>
@@ -356,7 +436,43 @@
<file leaf-file-name="AllTests.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/test/com/google/inject/AllTests.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="34" column="37" selection-start="1084" selection-end="1084" vertical-scroll-proportion="0.3278237">
+ <state line="29" column="13" selection-start="964" selection-end="964" vertical-scroll-proportion="0.22666667">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="Context.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/com/google/inject/Context.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="53" column="57" selection-start="1496" selection-end="1496" vertical-scroll-proportion="0.9822222">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="Objects.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/com/google/inject/util/Objects.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="23" column="13" selection-start="716" selection-end="716" vertical-scroll-proportion="0.22666667">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="DependencyException.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/com/google/inject/DependencyException.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="23" column="13" selection-start="736" selection-end="736" vertical-scroll-proportion="0.22666667">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="ConstructionContext.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/com/google/inject/ConstructionContext.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="35" column="19" selection-start="1065" selection-end="1065" vertical-scroll-proportion="0.025185185">
<folding />
</state>
</provider>
@@ -400,6 +516,12 @@
<option name="myItemId" value="guice.ipr" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="guice.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+ </PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="com.google.inject.util" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
@@ -497,11 +619,11 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/com/google/inject" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/com/google/inject" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -519,11 +641,37 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/javadoc" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="guice.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="guice" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/com/google/inject" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/javadoc" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/javadoc/com" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/javadoc/com/google" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/javadoc/com/google/inject" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -578,10 +726,11 @@
</component>
<component name="RecentsManager">
<key name="MoveMembersDialog.RECENTS_KEY">
+ <recent name="com.google.inject.ContainerBuilder" />
<recent name="com.google.inject.Key" />
</key>
<key name="CopyClassDialog.RECENTS_KEY">
- <recent name="" />
+ <recent name="com.google.inject" />
</key>
<key name="IntroduceConstantDialog.RECENTS_KEY">
<recent name="" />
@@ -590,17 +739,123 @@
<recent name="com.google.inject.util" />
</key>
</component>
- <component name="RestoreUpdateTree" />
- <component name="RunManager" selected="JUnit.BindingBuilderTest.testStackTraceElement">
- <tempConfiguration default="false" name="BindingBuilderTest.testStackTraceElement" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
+ <component name="RestoreUpdateTree">
+ <UpdateInfo date="1/19/07 5:59 PM" ActionInfo="Chec_k Status">
+ <UpdatedFiles>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Updated from server" />
+ <option name="myStatusName" value="Changed on server" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="CHANGED_ON_SERVER" />
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Updated" />
+ <option name="myStatusName" value="Changed" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="UPDATED" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Created" />
+ <option name="myStatusName" value="Created" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="CREATED" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Deleted" />
+ <option name="myStatusName" value="Deleted" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="true" />
+ <option name="myId" value="REMOVED_FROM_REPOSITORY" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Restored" />
+ <option name="myStatusName" value="Will be restored" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="RESTORED" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="UpdatedOnServer" />
+ <option name="myStatusName" value="Modified on Server" />
+ <option name="mySupportsDeletion" value="true" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="Modified On Server" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="ReplacedOnServer" />
+ <option name="myStatusName" value="Replaced on Server" />
+ <option name="mySupportsDeletion" value="true" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="Replaced On Server" />
+ </FILE-GROUP>
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Modified" />
+ <option name="myStatusName" value="Modified" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="MODIFIED" />
+ <PATH>$PROJECT_DIR$/javadoc/com/google/inject/ContainerBuilder.html</PATH>
+ <PATH>$PROJECT_DIR$/javadoc/com/google/inject/Factory.html</PATH>
+ <PATH>$PROJECT_DIR$/javadoc/index-all.html</PATH>
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Skipped" />
+ <option name="myStatusName" value="Skipped" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="SKIPPED" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Merged with conflicts" />
+ <option name="myStatusName" value="Will be merged with conflicts" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="MERGED_WITH_CONFLICTS" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Merged" />
+ <option name="myStatusName" value="Will be merged" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="MERGED" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Not in repository" />
+ <option name="myStatusName" value="Not in repository" />
+ <option name="mySupportsDeletion" value="true" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="UNKNOWN" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Locally added" />
+ <option name="myStatusName" value="Locally added" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="LOCALLY_ADDED" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Locally removed" />
+ <option name="myStatusName" value="Locally removed" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="LOCALLY_REMOVED" />
+ </FILE-GROUP>
+ </UpdatedFiles>
+ </UpdateInfo>
+ </component>
+ <component name="RunManager" selected="JUnit.AllTests">
+ <tempConfiguration default="false" name="AllTests" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
<pattern value="com.google.inject.*" />
<module name="guice" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PACKAGE_NAME" value="com.google.inject" />
- <option name="MAIN_CLASS_NAME" value="com.google.inject.BindingBuilderTest" />
- <option name="METHOD_NAME" value="testStackTraceElement" />
- <option name="TEST_OBJECT" value="method" />
+ <option name="MAIN_CLASS_NAME" value="com.google.inject.AllTests" />
+ <option name="METHOD_NAME" />
+ <option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
@@ -614,6 +869,23 @@
<option name="Make" value="true" />
</method>
</tempConfiguration>
+ <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
+ <option name="MAIN_CLASS_NAME" />
+ <option name="VM_PARAMETERS" />
+ <option name="PROGRAM_PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="ENABLE_SWING_INSPECTOR" value="false" />
+ <module name="" />
+ </configuration>
+ <configuration default="true" type="Remote" factoryName="Remote">
+ <option name="USE_SOCKET_TRANSPORT" value="true" />
+ <option name="SERVER_MODE" value="false" />
+ <option name="SHMEM_ADDRESS" value="javadebug" />
+ <option name="HOST" value="localhost" />
+ <option name="PORT" value="5005" />
+ </configuration>
<configuration default="true" type="Applet" factoryName="Applet">
<module name="" />
<option name="MAIN_CLASS_NAME" />
@@ -626,23 +898,6 @@
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
</configuration>
- <configuration default="true" type="Remote" factoryName="Remote">
- <option name="USE_SOCKET_TRANSPORT" value="true" />
- <option name="SERVER_MODE" value="false" />
- <option name="SHMEM_ADDRESS" value="javadebug" />
- <option name="HOST" value="localhost" />
- <option name="PORT" value="5005" />
- </configuration>
- <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
- <option name="MAIN_CLASS_NAME" />
- <option name="VM_PARAMETERS" />
- <option name="PROGRAM_PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="ENABLE_SWING_INSPECTOR" value="false" />
- <module name="" />
- </configuration>
<configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
<module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -723,8 +978,9 @@
<option name="UPDATE_RUN_STATUS" value="false" />
<option name="UPDATE_RECURSIVELY" value="true" />
<option name="MERGE_DRY_RUN" value="false" />
- <configuration useDefault="true">/Users/crazybob/.subversion</configuration>
+ <configuration useDefault="true">/home/crazybob/.subversion</configuration>
<remoteStatus />
+ <upgradeMode>auto</upgradeMode>
</component>
<component name="TodoView" selected-index="0">
<todo-panel id="selected-file">
@@ -741,38 +997,38 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="4" y="22" width="1916" height="1200" extended-state="6" />
+ <frame x="4" y="44" width="1916" height="1156" extended-state="0" />
<editor active="false" />
<layout>
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
<window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
+ <window_info id="Mach" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32919848" order="9" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.15854311" order="0" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.29465094" order="1" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.29517502" order="1" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.16236559" order="1" />
- <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.28014505" order="10" />
+ <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.28003785" order="10" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="6" />
+ <window_info id="Profile" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32911393" order="13" />
<window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="11" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.14623655" order="1" />
- <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32919848" order="8" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.29011786" order="2" />
+ <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3282876" order="8" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.29044464" order="2" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" />
<window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="6" />
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3265306" order="4" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39978448" order="0" />
+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32639545" order="4" />
<window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
- <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.34541985" order="12" />
- <window_info id="Mach" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32919848" order="9" />
+ <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.34531695" order="12" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="0" />
<window_info id="Favorites" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="4" />
<window_info id="Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="5" />
<window_info id="Compare Directories" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32977018" order="3" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" />
<window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="3" />
- <window_info id="Profile" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32911393" order="13" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="5" />
</layout>
</component>
@@ -840,7 +1096,9 @@
<option name="ANSWER_NEGATIVELY" value="false" />
<option name="ANSWER_POSITIVELY" value="false" />
<option name="RECURSIVE" value="false" />
+ <option name="VERSION" />
</GetOptions>
+ <VssConfigurableExcludedFilesTag />
</component>
<component name="antWorkspaceConfiguration">
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
@@ -849,123 +1107,119 @@
<component name="com.intellij.ide.util.scopeChooser.ScopeChooserConfigurable" proportions="" version="1">
<option name="myLastEditedConfigurable" />
</component>
- <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="" version="1">
+ <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.16666667,0.5" version="1">
<option name="myPlainMode" value="false" />
- <option name="myLastEditedConfigurable" />
+ <option name="myLastEditedConfigurable" value="guice" />
</component>
<component name="com.intellij.profile.ui.ErrorOptionsConfigurable" proportions="0.16666667,0.60142857" version="1">
<option name="myLastEditedConfigurable" value="Default" />
</component>
<component name="editorHistoryManager">
- <entry file="jar:///Users/crazybob/src.zip!/java/util/Formatter.java">
+ <entry file="file://$PROJECT_DIR$/src/com/google/inject/ExternalContext.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="40" column="11" selection-start="1127" selection-end="1127" vertical-scroll-proportion="-1.6391184">
+ <state line="68" column="32" selection-start="1728" selection-end="1728" vertical-scroll-proportion="1.2740741">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/com/google/inject/TypeToken.java">
+ <entry file="file://$PROJECT_DIR$/test/com/google/inject/FactoryTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="159" column="33" selection-start="4511" selection-end="4511" vertical-scroll-proportion="1.1694214">
+ <state line="43" column="0" selection-start="1339" selection-end="1339" vertical-scroll-proportion="-0.025185185">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/com/google/inject/Key.java">
+ <entry file="file://$PROJECT_DIR$/src/com/google/inject/ConstantFactory.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="51" column="26" selection-start="1386" selection-end="1386" vertical-scroll-proportion="0.35123968">
+ <state line="21" column="6" selection-start="680" selection-end="680" vertical-scroll-proportion="0.1762963">
<folding />
</state>
</provider>
</entry>
- <entry file="jar:///Users/crazybob/src.zip!/java/lang/Throwable.java">
+ <entry file="file://$PROJECT_DIR$/test/com/google/inject/ConstantConversionTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="563" column="32" selection-start="23216" selection-end="23216" vertical-scroll-proportion="0.23415978">
+ <state line="26" column="13" selection-start="770" selection-end="770" vertical-scroll-proportion="0.22666667">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/test/com/google/inject/BindingBuilderTest.java">
+ <entry file="file://$PROJECT_DIR$/src/com/google/inject/ConstantConversionException.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="25" column="32" selection-start="792" selection-end="792" vertical-scroll-proportion="0.25757575">
+ <state line="25" column="6" selection-start="773" selection-end="773" vertical-scroll-proportion="0.27703702">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/com/google/inject/ErrorMessage.java">
+ <entry file="file://$PROJECT_DIR$/src/com/google/inject/Context.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="23" column="2" selection-start="751" selection-end="751" vertical-scroll-proportion="0.2107438">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="53" column="57" selection-start="1496" selection-end="1496" vertical-scroll-proportion="0.9822222">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/com/google/inject/Scope.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="48" column="0" selection-start="1319" selection-end="1319" vertical-scroll-proportion="0.3614815">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/com/google/inject/ContextualFactory.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="23" column="17" selection-start="726" selection-end="726" vertical-scroll-proportion="0.22666667">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/com/google/inject/Factory.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="0" column="0" selection-start="0" selection-end="595" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/com/google/inject/SourceAware.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="15" column="0" selection-start="596" selection-end="596" vertical-scroll-proportion="0.37777779">
+ <folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/test/com/google/inject/KeyTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="13" column="13" selection-start="264" selection-end="264" vertical-scroll-proportion="0.2107438">
+ <state line="14" column="3" selection-start="595" selection-end="595" vertical-scroll-proportion="0.3525926">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/test/com/google/inject/AllTests.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="34" column="37" selection-start="1084" selection-end="1084" vertical-scroll-proportion="0.3278237">
+ <state line="29" column="13" selection-start="964" selection-end="964" vertical-scroll-proportion="0.22666667">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/com/google/inject/ContainerImpl.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="67" column="15" selection-start="2168" selection-end="2168" vertical-scroll-proportion="0.3674074">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/google/inject/ContainerBuilder.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="14" column="3" selection-start="595" selection-end="595" vertical-scroll-proportion="0.0">
+ <state line="541" column="27" selection-start="15820" selection-end="15820" vertical-scroll-proportion="0.3674074">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/com/google/inject/util/AbstractReferenceCache.java">
+ <entry file="file://$PROJECT_DIR$/src/com/google/inject/Key.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="28" column="15" selection-start="885" selection-end="885" vertical-scroll-proportion="0.25757575">
+ <state line="188" column="2" selection-start="4728" selection-end="4728" vertical-scroll-proportion="1.0266666">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/test/com/google/inject/util/ReferenceCacheTest.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="29" column="13" selection-start="945" selection-end="945" vertical-scroll-proportion="0.2107438">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/com/google/inject/util/ReferenceCache.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="25" column="3" selection-start="846" selection-end="846" vertical-scroll-proportion="0.25757575">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/com/google/inject/SourceProvider.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="25" column="0" selection-start="795" selection-end="795" vertical-scroll-proportion="0.25757575">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/com/google/inject/Container.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="64" column="17" selection-start="1877" selection-end="1877" vertical-scroll-proportion="1.0936639">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/com/google/inject/BindingBuilder.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="28" column="13" selection-start="826" selection-end="826" vertical-scroll-proportion="0.3278237">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
</component>
</project>
diff --git a/javadoc/allclasses-frame.html b/javadoc/allclasses-frame.html
deleted file mode 100644
index e7e3229..0000000
--- a/javadoc/allclasses-frame.html
+++ /dev/null
@@ -1,48 +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.5.0_05) on Thu Aug 24 18:43:56 PDT 2006 -->
-<TITLE>
-All Classes (Guice 1.0 API)
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameHeadingFont">
-<B>All Classes</B></FONT>
-<BR>
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="com/google/inject/Container.html" title="interface in com.google.inject" target="classFrame"><I>Container</I></A>
-<BR>
-<A HREF="com/google/inject/ContainerBuilder.html" title="class in com.google.inject" target="classFrame">ContainerBuilder</A>
-<BR>
-<A HREF="com/google/inject/ContainerBuilder.Command.html" title="interface in com.google.inject" target="classFrame"><I>ContainerBuilder.Command</I></A>
-<BR>
-<A HREF="com/google/inject/Context.html" title="interface in com.google.inject" target="classFrame"><I>Context</I></A>
-<BR>
-<A HREF="com/google/inject/DependencyException.html" title="class in com.google.inject" target="classFrame">DependencyException</A>
-<BR>
-<A HREF="com/google/inject/Factory.html" title="interface in com.google.inject" target="classFrame"><I>Factory</I></A>
-<BR>
-<A HREF="com/google/inject/Inject.html" title="annotation in com.google.inject" target="classFrame">Inject</A>
-<BR>
-<A HREF="com/google/inject/Scope.html" title="enum in com.google.inject" target="classFrame">Scope</A>
-<BR>
-<A HREF="com/google/inject/Scope.Strategy.html" title="interface in com.google.inject" target="classFrame"><I>Scope.Strategy</I></A>
-<BR>
-<A HREF="com/google/inject/Scoped.html" title="annotation in com.google.inject" target="classFrame">Scoped</A>
-<BR>
-</FONT></TD>
-</TR>
-</TABLE>
-
-</BODY>
-</HTML>
diff --git a/javadoc/allclasses-noframe.html b/javadoc/allclasses-noframe.html
deleted file mode 100644
index 93d155c..0000000
--- a/javadoc/allclasses-noframe.html
+++ /dev/null
@@ -1,48 +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.5.0_05) on Thu Aug 24 18:43:56 PDT 2006 -->
-<TITLE>
-All Classes (Guice 1.0 API)
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameHeadingFont">
-<B>All Classes</B></FONT>
-<BR>
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="com/google/inject/Container.html" title="interface in com.google.inject"><I>Container</I></A>
-<BR>
-<A HREF="com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A>
-<BR>
-<A HREF="com/google/inject/ContainerBuilder.Command.html" title="interface in com.google.inject"><I>ContainerBuilder.Command</I></A>
-<BR>
-<A HREF="com/google/inject/Context.html" title="interface in com.google.inject"><I>Context</I></A>
-<BR>
-<A HREF="com/google/inject/DependencyException.html" title="class in com.google.inject">DependencyException</A>
-<BR>
-<A HREF="com/google/inject/Factory.html" title="interface in com.google.inject"><I>Factory</I></A>
-<BR>
-<A HREF="com/google/inject/Inject.html" title="annotation in com.google.inject">Inject</A>
-<BR>
-<A HREF="com/google/inject/Scope.html" title="enum in com.google.inject">Scope</A>
-<BR>
-<A HREF="com/google/inject/Scope.Strategy.html" title="interface in com.google.inject"><I>Scope.Strategy</I></A>
-<BR>
-<A HREF="com/google/inject/Scoped.html" title="annotation in com.google.inject">Scoped</A>
-<BR>
-</FONT></TD>
-</TR>
-</TABLE>
-
-</BODY>
-</HTML>
diff --git a/javadoc/com/google/inject/Container.html b/javadoc/com/google/inject/Container.html
deleted file mode 100644
index 401f579..0000000
--- a/javadoc/com/google/inject/Container.html
+++ /dev/null
@@ -1,419 +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.5.0_05) on Thu Aug 24 18:43:55 PDT 2006 -->
-<TITLE>
-Container (Guice 1.0 API)
-</TITLE>
-
-<META NAME="keywords" CONTENT="com.google.inject.Container interface">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- parent.document.title="Container (Guice 1.0 API)";
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= 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="../../../com/google/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV CLASS
- <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../index.html?com/google/inject/Container.html" target="_top"><B>FRAMES</B></A>
- <A HREF="Container.html" target="_top"><B>NO FRAMES</B></A>
- <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: NESTED | <A HREF="#field_summary">FIELD</A> | CONSTR | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: <A HREF="#field_detail">FIELD</A> | CONSTR | <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.inject</FONT>
-<BR>
-Interface Container</H2>
-<HR>
-<DL>
-<DT><PRE>public interface <B>Container</B></DL>
-</PRE>
-
-<P>
-Injects dependencies into constructors, methods and fields annotated with
- <A HREF="../../../com/google/inject/Inject.html" title="annotation in com.google.inject"><CODE>Inject</CODE></A>. Immutable.
-
- <p>When injecting a method or constructor, you can additionally annotate
- its parameters with <A HREF="../../../com/google/inject/Inject.html" title="annotation in com.google.inject"><CODE>Inject</CODE></A> and specify a dependency name. When a
- parameter has no annotation, the container uses the name from the method or
- constructor's <A HREF="../../../com/google/inject/Inject.html" title="annotation in com.google.inject"><CODE>Inject</CODE></A> annotation respectively.
-
- <p>For example:
-
- <pre>
- class Foo {
-
- // Inject the int constant named "i".
- @Inject("i") int i;
-
- // Inject the default implementation of Bar and the String constant
- // named "s".
- @Inject Foo(Bar bar, @Inject("s") String s) {
- ...
- }
-
- // Inject the default implementation of Baz and the Bob implementation
- // named "foo".
- @Inject void initialize(Baz baz, @Inject("foo") Bob bob) {
- ...
- }
-
- // Inject the default implementation of Tee.
- @Inject void setTee(Tee tee) {
- ...
- }
- }
- </pre>
-
- <p>To create and inject an instance of <code>Foo</code>:
-
- <pre>
- Container c = ...;
- Foo foo = c.inject(Foo.class);
- </pre>
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
- <DD>crazybob@google.com (Bob Lee)</DD>
-<DT><B>See Also:</B><DD><A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject"><CODE>ContainerBuilder</CODE></A></DL>
-<HR>
-
-<P>
-<!-- =========== FIELD SUMMARY =========== -->
-
-<A NAME="field_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>Field Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/Container.html#DEFAULT_NAME">DEFAULT_NAME</A></B></CODE>
-
-<BR>
- Default dependency name.</TD>
-</TR>
-</TABLE>
-
-<!-- ========== 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>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" SUMMARY="">
-<TR ALIGN="right" VALIGN="">
-<TD NOWRAP><FONT SIZE="-1">
-<CODE><T> T</CODE></FONT></TD>
-</TR>
-</TABLE>
-</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/Container.html#getInstance(java.lang.Class)">getInstance</A></B>(java.lang.Class<T> type)</CODE>
-
-<BR>
- Convenience method. Equivalent to <code>getInstance(type,
- DEFAULT_NAME)</code>.</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="">
-<TD NOWRAP><FONT SIZE="-1">
-<CODE><T> T</CODE></FONT></TD>
-</TR>
-</TABLE>
-</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/Container.html#getInstance(java.lang.Class, java.lang.String)">getInstance</A></B>(java.lang.Class<T> type,
- java.lang.String name)</CODE>
-
-<BR>
- Gets an instance of the given dependency which was declared in
- <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject"><CODE>ContainerBuilder</CODE></A>.</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="">
-<TD NOWRAP><FONT SIZE="-1">
-<CODE><T> T</CODE></FONT></TD>
-</TR>
-</TABLE>
-</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/Container.html#inject(java.lang.Class)">inject</A></B>(java.lang.Class<T> implementation)</CODE>
-
-<BR>
- Creates and injects a new instance of type <code>implementation</code>.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/Container.html#inject(java.lang.Object)">inject</A></B>(java.lang.Object o)</CODE>
-
-<BR>
- Injects dependencies into the fields and methods of an existing object.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/Container.html#removeScopeStrategy()">removeScopeStrategy</A></B>()</CODE>
-
-<BR>
- Removes the scope strategy for the current thread.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/Container.html#setScopeStrategy(com.google.inject.Scope.Strategy)">setScopeStrategy</A></B>(<A HREF="../../../com/google/inject/Scope.Strategy.html" title="interface in com.google.inject">Scope.Strategy</A> scopeStrategy)</CODE>
-
-<BR>
- Sets the scope strategy for the current thread.</TD>
-</TR>
-</TABLE>
-
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-<A NAME="field_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>Field Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="DEFAULT_NAME"><!-- --></A><H3>
-DEFAULT_NAME</H3>
-<PRE>
-static final java.lang.String <B>DEFAULT_NAME</B></PRE>
-<DL>
-<DD>Default dependency name.
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#com.google.inject.Container.DEFAULT_NAME">Constant Field Values</A></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="inject(java.lang.Object)"><!-- --></A><H3>
-inject</H3>
-<PRE>
-void <B>inject</B>(java.lang.Object o)</PRE>
-<DL>
-<DD>Injects dependencies into the fields and methods of an existing object.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="inject(java.lang.Class)"><!-- --></A><H3>
-inject</H3>
-<PRE>
-<T> T <B>inject</B>(java.lang.Class<T> implementation)</PRE>
-<DL>
-<DD>Creates and injects a new instance of type <code>implementation</code>.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getInstance(java.lang.Class, java.lang.String)"><!-- --></A><H3>
-getInstance</H3>
-<PRE>
-<T> T <B>getInstance</B>(java.lang.Class<T> type,
- java.lang.String name)</PRE>
-<DL>
-<DD>Gets an instance of the given dependency which was declared in
- <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject"><CODE>ContainerBuilder</CODE></A>.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getInstance(java.lang.Class)"><!-- --></A><H3>
-getInstance</H3>
-<PRE>
-<T> T <B>getInstance</B>(java.lang.Class<T> type)</PRE>
-<DL>
-<DD>Convenience method. Equivalent to <code>getInstance(type,
- DEFAULT_NAME)</code>.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setScopeStrategy(com.google.inject.Scope.Strategy)"><!-- --></A><H3>
-setScopeStrategy</H3>
-<PRE>
-void <B>setScopeStrategy</B>(<A HREF="../../../com/google/inject/Scope.Strategy.html" title="interface in com.google.inject">Scope.Strategy</A> scopeStrategy)</PRE>
-<DL>
-<DD>Sets the scope strategy for the current thread.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="removeScopeStrategy()"><!-- --></A><H3>
-removeScopeStrategy</H3>
-<PRE>
-void <B>removeScopeStrategy</B>()</PRE>
-<DL>
-<DD>Removes the scope strategy for the current thread.
-<P>
-<DD><DL>
-</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="../../../com/google/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV CLASS
- <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../index.html?com/google/inject/Container.html" target="_top"><B>FRAMES</B></A>
- <A HREF="Container.html" target="_top"><B>NO FRAMES</B></A>
- <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: NESTED | <A HREF="#field_summary">FIELD</A> | CONSTR | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: <A HREF="#field_detail">FIELD</A> | CONSTR | <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/inject/ContainerBuilder.Command.html b/javadoc/com/google/inject/ContainerBuilder.Command.html
deleted file mode 100644
index d6e73f8..0000000
--- a/javadoc/com/google/inject/ContainerBuilder.Command.html
+++ /dev/null
@@ -1,208 +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.5.0_05) on Thu Aug 24 18:43:56 PDT 2006 -->
-<TITLE>
-ContainerBuilder.Command (Guice 1.0 API)
-</TITLE>
-
-<META NAME="keywords" CONTENT="com.google.inject.ContainerBuilder.Command interface">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- parent.document.title="ContainerBuilder.Command (Guice 1.0 API)";
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= 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="../../../com/google/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject"><B>PREV CLASS</B></A>
- <A HREF="../../../com/google/inject/Context.html" title="interface in com.google.inject"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../index.html?com/google/inject/ContainerBuilder.Command.html" target="_top"><B>FRAMES</B></A>
- <A HREF="ContainerBuilder.Command.html" target="_top"><B>NO FRAMES</B></A>
- <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: NESTED | FIELD | CONSTR | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | CONSTR | <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.inject</FONT>
-<BR>
-Interface ContainerBuilder.Command</H2>
-<DL>
-<DT><B>Enclosing class:</B><DD><A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public static interface <B>ContainerBuilder.Command</B></DL>
-</PRE>
-
-<P>
-Implemented by classes which participate in building a container.
-<P>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ========== 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> void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/ContainerBuilder.Command.html#build(com.google.inject.ContainerBuilder)">build</A></B>(<A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A> builder)</CODE>
-
-<BR>
- Contributes factories to the given builder.</TD>
-</TR>
-</TABLE>
-
-<P>
-
-<!-- ============ 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="build(com.google.inject.ContainerBuilder)"><!-- --></A><H3>
-build</H3>
-<PRE>
-void <B>build</B>(<A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A> builder)</PRE>
-<DL>
-<DD>Contributes factories to the given builder.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>builder</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="../../../com/google/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject"><B>PREV CLASS</B></A>
- <A HREF="../../../com/google/inject/Context.html" title="interface in com.google.inject"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../index.html?com/google/inject/ContainerBuilder.Command.html" target="_top"><B>FRAMES</B></A>
- <A HREF="ContainerBuilder.Command.html" target="_top"><B>NO FRAMES</B></A>
- <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: NESTED | FIELD | CONSTR | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | CONSTR | <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/inject/ContainerBuilder.html b/javadoc/com/google/inject/ContainerBuilder.html
deleted file mode 100644
index 7b0c78a..0000000
--- a/javadoc/com/google/inject/ContainerBuilder.html
+++ /dev/null
@@ -1,1000 +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.5.0_05) on Thu Aug 24 18:43:55 PDT 2006 -->
-<TITLE>
-ContainerBuilder (Guice 1.0 API)
-</TITLE>
-
-<META NAME="keywords" CONTENT="com.google.inject.ContainerBuilder class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- parent.document.title="ContainerBuilder (Guice 1.0 API)";
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= 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="../../../com/google/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../com/google/inject/Container.html" title="interface in com.google.inject"><B>PREV CLASS</B></A>
- <A HREF="../../../com/google/inject/ContainerBuilder.Command.html" title="interface in com.google.inject"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../index.html?com/google/inject/ContainerBuilder.html" target="_top"><B>FRAMES</B></A>
- <A HREF="ContainerBuilder.html" target="_top"><B>NO FRAMES</B></A>
- <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: <A HREF="#nested_class_summary">NESTED</A> | FIELD | <A HREF="#constructor_summary">CONSTR</A> | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | <A HREF="#constructor_detail">CONSTR</A> | <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.inject</FONT>
-<BR>
-Class ContainerBuilder</H2>
-<PRE>
-java.lang.Object
- <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>com.google.inject.ContainerBuilder</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public final class <B>ContainerBuilder</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-Builds a dependency injection <A HREF="../../../com/google/inject/Container.html" title="interface in com.google.inject"><CODE>Container</CODE></A>. The combination of
- dependency type and name uniquely identifies a dependency mapping; you can
- use the same name for two different types. Not safe for concurrent use.
-
- <p>Adds the following factories by default:
-
- <ul>
- <li>Injects the current <A HREF="../../../com/google/inject/Container.html" title="interface in com.google.inject"><CODE>Container</CODE></A>.
- <li>Injects the <CODE>Logger</CODE> for the injected member's declaring class.
- </ul>
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
- <DD>crazybob@google.com (Bob Lee)</DD>
-</DL>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-<A NAME="nested_class_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>Nested Class Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static interface</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/ContainerBuilder.Command.html" title="interface in com.google.inject">ContainerBuilder.Command</A></B></CODE>
-
-<BR>
- Implemented by classes which participate in building a container.</TD>
-</TR>
-</TABLE>
-
-<!-- ======== 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/inject/ContainerBuilder.html#ContainerBuilder()">ContainerBuilder</A></B>()</CODE>
-
-<BR>
- Constructs a new builder.</TD>
-</TR>
-</TABLE>
-
-<!-- ========== 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> <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/ContainerBuilder.html#constant(java.lang.String, boolean)">constant</A></B>(java.lang.String name,
- boolean value)</CODE>
-
-<BR>
- Maps a constant value to the given name.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/ContainerBuilder.html#constant(java.lang.String, char)">constant</A></B>(java.lang.String name,
- char value)</CODE>
-
-<BR>
- Maps a constant value to the given name.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/ContainerBuilder.html#constant(java.lang.String, java.lang.Class)">constant</A></B>(java.lang.String name,
- java.lang.Class value)</CODE>
-
-<BR>
- Maps a class to the given name.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/ContainerBuilder.html#constant(java.lang.String, double)">constant</A></B>(java.lang.String name,
- double value)</CODE>
-
-<BR>
- Maps a constant value to the given name.</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="">
-<TD NOWRAP><FONT SIZE="-1">
-<CODE><E extends java.lang.Enum<E>>
-<BR>
-<A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A></CODE></FONT></TD>
-</TR>
-</TABLE>
-</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/ContainerBuilder.html#constant(java.lang.String, E)">constant</A></B>(java.lang.String name,
- E value)</CODE>
-
-<BR>
- Maps an enum to the given name.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/ContainerBuilder.html#constant(java.lang.String, float)">constant</A></B>(java.lang.String name,
- float value)</CODE>
-
-<BR>
- Maps a constant value to the given name.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/ContainerBuilder.html#constant(java.lang.String, int)">constant</A></B>(java.lang.String name,
- int value)</CODE>
-
-<BR>
- Maps a constant value to the given name.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/ContainerBuilder.html#constant(java.lang.String, long)">constant</A></B>(java.lang.String name,
- long value)</CODE>
-
-<BR>
- Maps a constant value to the given name.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/ContainerBuilder.html#constant(java.lang.String, short)">constant</A></B>(java.lang.String name,
- short value)</CODE>
-
-<BR>
- Maps a constant value to the given name.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/ContainerBuilder.html#constant(java.lang.String, java.lang.String)">constant</A></B>(java.lang.String name,
- java.lang.String value)</CODE>
-
-<BR>
- Maps a constant value to the given name.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/ContainerBuilder.html#contains(java.lang.Class)">contains</A></B>(java.lang.Class<?> type)</CODE>
-
-<BR>
- Convenience method. Equivalent to <code>contains(type,
- Container.DEFAULT_NAME)</code>.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/ContainerBuilder.html#contains(java.lang.Class, java.lang.String)">contains</A></B>(java.lang.Class<?> type,
- java.lang.String name)</CODE>
-
-<BR>
- Returns true if this builder contains a mapping for the given type and
- name.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../com/google/inject/Container.html" title="interface in com.google.inject">Container</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/ContainerBuilder.html#create(boolean)">create</A></B>(boolean loadSingletons)</CODE>
-
-<BR>
- Creates a <A HREF="../../../com/google/inject/Container.html" title="interface in com.google.inject"><CODE>Container</CODE></A> instance.</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="">
-<TD NOWRAP><FONT SIZE="-1">
-<CODE><T> <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A></CODE></FONT></TD>
-</TR>
-</TABLE>
-</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/ContainerBuilder.html#factory(java.lang.Class)">factory</A></B>(java.lang.Class<T> type)</CODE>
-
-<BR>
- Convenience method. Equivalent to <code>factory(type,
- Container.DEFAULT_NAME, type)</code>.</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="">
-<TD NOWRAP><FONT SIZE="-1">
-<CODE><T> <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A></CODE></FONT></TD>
-</TR>
-</TABLE>
-</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/ContainerBuilder.html#factory(java.lang.Class, java.lang.Class)">factory</A></B>(java.lang.Class<T> type,
- java.lang.Class<? extends T> implementation)</CODE>
-
-<BR>
- Convenience method. Equivalent to <code>factory(type,
- Container.DEFAULT_NAME, implementation)</code>.</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="">
-<TD NOWRAP><FONT SIZE="-1">
-<CODE><T> <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A></CODE></FONT></TD>
-</TR>
-</TABLE>
-</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/ContainerBuilder.html#factory(java.lang.Class, java.lang.Class, com.google.inject.Scope)">factory</A></B>(java.lang.Class<T> type,
- java.lang.Class<? extends T> implementation,
- <A HREF="../../../com/google/inject/Scope.html" title="enum in com.google.inject">Scope</A> scope)</CODE>
-
-<BR>
- Convenience method. Equivalent to <code>factory(type,
- Container.DEFAULT_NAME, implementation, scope)</code>.</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="">
-<TD NOWRAP><FONT SIZE="-1">
-<CODE><T> <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A></CODE></FONT></TD>
-</TR>
-</TABLE>
-</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/ContainerBuilder.html#factory(java.lang.Class, com.google.inject.Factory)">factory</A></B>(java.lang.Class<T> type,
- <A HREF="../../../com/google/inject/Factory.html" title="interface in com.google.inject">Factory</A><? extends T> factory)</CODE>
-
-<BR>
- Convenience method. Equivalent to <code>factory(type,
- Container.DEFAULT_NAME, factory, Scope.DEFAULT)</code>.</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="">
-<TD NOWRAP><FONT SIZE="-1">
-<CODE><T> <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A></CODE></FONT></TD>
-</TR>
-</TABLE>
-</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/ContainerBuilder.html#factory(java.lang.Class, com.google.inject.Factory, com.google.inject.Scope)">factory</A></B>(java.lang.Class<T> type,
- <A HREF="../../../com/google/inject/Factory.html" title="interface in com.google.inject">Factory</A><? extends T> factory,
- <A HREF="../../../com/google/inject/Scope.html" title="enum in com.google.inject">Scope</A> scope)</CODE>
-
-<BR>
- Convenience method. Equivalent to <code>factory(type,
- Container.DEFAULT_NAME, factory, scope)</code>.</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="">
-<TD NOWRAP><FONT SIZE="-1">
-<CODE><T> <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A></CODE></FONT></TD>
-</TR>
-</TABLE>
-</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/ContainerBuilder.html#factory(java.lang.Class, com.google.inject.Scope)">factory</A></B>(java.lang.Class<T> type,
- <A HREF="../../../com/google/inject/Scope.html" title="enum in com.google.inject">Scope</A> scope)</CODE>
-
-<BR>
- Convenience method. Equivalent to <code>factory(type,
- Container.DEFAULT_NAME, type, scope)</code>.</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="">
-<TD NOWRAP><FONT SIZE="-1">
-<CODE><T> <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A></CODE></FONT></TD>
-</TR>
-</TABLE>
-</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/ContainerBuilder.html#factory(java.lang.Class, java.lang.String)">factory</A></B>(java.lang.Class<T> type,
- java.lang.String name)</CODE>
-
-<BR>
- Convenience method. Equivalent to <code>factory(type, name, type)</code>.</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="">
-<TD NOWRAP><FONT SIZE="-1">
-<CODE><T> <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A></CODE></FONT></TD>
-</TR>
-</TABLE>
-</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/ContainerBuilder.html#factory(java.lang.Class, java.lang.String, java.lang.Class)">factory</A></B>(java.lang.Class<T> type,
- java.lang.String name,
- java.lang.Class<? extends T> implementation)</CODE>
-
-<BR>
- Maps an implementation class to a given dependency type and name.</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="">
-<TD NOWRAP><FONT SIZE="-1">
-<CODE><T> <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A></CODE></FONT></TD>
-</TR>
-</TABLE>
-</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/ContainerBuilder.html#factory(java.lang.Class, java.lang.String, java.lang.Class, com.google.inject.Scope)">factory</A></B>(java.lang.Class<T> type,
- java.lang.String name,
- java.lang.Class<? extends T> implementation,
- <A HREF="../../../com/google/inject/Scope.html" title="enum in com.google.inject">Scope</A> scope)</CODE>
-
-<BR>
- Maps an implementation class to a given dependency type and name.</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="">
-<TD NOWRAP><FONT SIZE="-1">
-<CODE><T> <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A></CODE></FONT></TD>
-</TR>
-</TABLE>
-</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/ContainerBuilder.html#factory(java.lang.Class, java.lang.String, com.google.inject.Factory)">factory</A></B>(java.lang.Class<T> type,
- java.lang.String name,
- <A HREF="../../../com/google/inject/Factory.html" title="interface in com.google.inject">Factory</A><? extends T> factory)</CODE>
-
-<BR>
- Convenience method. Equivalent to <code>factory(type, name, factory,
- Scope.DEFAULT)</code>.</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="">
-<TD NOWRAP><FONT SIZE="-1">
-<CODE><T> <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A></CODE></FONT></TD>
-</TR>
-</TABLE>
-</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/ContainerBuilder.html#factory(java.lang.Class, java.lang.String, com.google.inject.Factory, com.google.inject.Scope)">factory</A></B>(java.lang.Class<T> type,
- java.lang.String name,
- <A HREF="../../../com/google/inject/Factory.html" title="interface in com.google.inject">Factory</A><? extends T> factory,
- <A HREF="../../../com/google/inject/Scope.html" title="enum in com.google.inject">Scope</A> scope)</CODE>
-
-<BR>
- Maps a factory to a given dependency type and name.</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="">
-<TD NOWRAP><FONT SIZE="-1">
-<CODE><T> <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A></CODE></FONT></TD>
-</TR>
-</TABLE>
-</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/ContainerBuilder.html#factory(java.lang.Class, java.lang.String, com.google.inject.Scope)">factory</A></B>(java.lang.Class<T> type,
- java.lang.String name,
- <A HREF="../../../com/google/inject/Scope.html" title="enum in com.google.inject">Scope</A> scope)</CODE>
-
-<BR>
- Convenience method. Equivalent to <code>factory(type, name, type,
- scope)</code>.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/ContainerBuilder.html#injectStatics(java.lang.Class...)">injectStatics</A></B>(java.lang.Class<?>... types)</CODE>
-
-<BR>
- Upon creation, the <A HREF="../../../com/google/inject/Container.html" title="interface in com.google.inject"><CODE>Container</CODE></A> will inject static fields and methods
- into the given classes.</TD>
-</TR>
-</TABLE>
- <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>
-
-<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="ContainerBuilder()"><!-- --></A><H3>
-ContainerBuilder</H3>
-<PRE>
-public <B>ContainerBuilder</B>()</PRE>
-<DL>
-<DD>Constructs a new builder.
-<P>
-</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="factory(java.lang.Class, java.lang.String, com.google.inject.Factory, com.google.inject.Scope)"><!-- --></A><H3>
-factory</H3>
-<PRE>
-public <T> <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A> <B>factory</B>(java.lang.Class<T> type,
- java.lang.String name,
- <A HREF="../../../com/google/inject/Factory.html" title="interface in com.google.inject">Factory</A><? extends T> factory,
- <A HREF="../../../com/google/inject/Scope.html" title="enum in com.google.inject">Scope</A> scope)</PRE>
-<DL>
-<DD>Maps a factory to a given dependency type and name.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>type</CODE> - of dependency<DD><CODE>name</CODE> - of dependency<DD><CODE>factory</CODE> - creates objects to inject<DD><CODE>scope</CODE> - scope of injected instances
-<DT><B>Returns:</B><DD>this builder</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="factory(java.lang.Class, com.google.inject.Factory, com.google.inject.Scope)"><!-- --></A><H3>
-factory</H3>
-<PRE>
-public <T> <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A> <B>factory</B>(java.lang.Class<T> type,
- <A HREF="../../../com/google/inject/Factory.html" title="interface in com.google.inject">Factory</A><? extends T> factory,
- <A HREF="../../../com/google/inject/Scope.html" title="enum in com.google.inject">Scope</A> scope)</PRE>
-<DL>
-<DD>Convenience method. Equivalent to <code>factory(type,
- Container.DEFAULT_NAME, factory, scope)</code>.
-<P>
-<DD><DL>
-<DT><B>See Also:</B><DD><A HREF="../../../com/google/inject/ContainerBuilder.html#factory(java.lang.Class, java.lang.String, com.google.inject.Factory, com.google.inject.Scope)"><CODE>factory(Class, String, Factory, Scope)</CODE></A></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="factory(java.lang.Class, java.lang.String, com.google.inject.Factory)"><!-- --></A><H3>
-factory</H3>
-<PRE>
-public <T> <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A> <B>factory</B>(java.lang.Class<T> type,
- java.lang.String name,
- <A HREF="../../../com/google/inject/Factory.html" title="interface in com.google.inject">Factory</A><? extends T> factory)</PRE>
-<DL>
-<DD>Convenience method. Equivalent to <code>factory(type, name, factory,
- Scope.DEFAULT)</code>.
-<P>
-<DD><DL>
-<DT><B>See Also:</B><DD><A HREF="../../../com/google/inject/ContainerBuilder.html#factory(java.lang.Class, java.lang.String, com.google.inject.Factory, com.google.inject.Scope)"><CODE>factory(Class, String, Factory, Scope)</CODE></A></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="factory(java.lang.Class, com.google.inject.Factory)"><!-- --></A><H3>
-factory</H3>
-<PRE>
-public <T> <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A> <B>factory</B>(java.lang.Class<T> type,
- <A HREF="../../../com/google/inject/Factory.html" title="interface in com.google.inject">Factory</A><? extends T> factory)</PRE>
-<DL>
-<DD>Convenience method. Equivalent to <code>factory(type,
- Container.DEFAULT_NAME, factory, Scope.DEFAULT)</code>.
-<P>
-<DD><DL>
-<DT><B>See Also:</B><DD><A HREF="../../../com/google/inject/ContainerBuilder.html#factory(java.lang.Class, java.lang.String, com.google.inject.Factory, com.google.inject.Scope)"><CODE>factory(Class, String, Factory, Scope)</CODE></A></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="factory(java.lang.Class, java.lang.String, java.lang.Class, com.google.inject.Scope)"><!-- --></A><H3>
-factory</H3>
-<PRE>
-public <T> <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A> <B>factory</B>(java.lang.Class<T> type,
- java.lang.String name,
- java.lang.Class<? extends T> implementation,
- <A HREF="../../../com/google/inject/Scope.html" title="enum in com.google.inject">Scope</A> scope)</PRE>
-<DL>
-<DD>Maps an implementation class to a given dependency type and name. Creates
- instances using the container, recursively injecting dependencies.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>type</CODE> - of dependency<DD><CODE>name</CODE> - of dependency<DD><CODE>implementation</CODE> - class<DD><CODE>scope</CODE> - scope of injected instances
-<DT><B>Returns:</B><DD>this builder</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="factory(java.lang.Class, java.lang.String, java.lang.Class)"><!-- --></A><H3>
-factory</H3>
-<PRE>
-public <T> <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A> <B>factory</B>(java.lang.Class<T> type,
- java.lang.String name,
- java.lang.Class<? extends T> implementation)</PRE>
-<DL>
-<DD>Maps an implementation class to a given dependency type and name. Creates
- instances using the container, recursively injecting dependencies.
-
- <p>Sets scope to value from <A HREF="../../../com/google/inject/Scoped.html" title="annotation in com.google.inject"><CODE>Scoped</CODE></A> annotation on the
- implementation class. Defaults to <A HREF="../../../com/google/inject/Scope.html#DEFAULT"><CODE>Scope.DEFAULT</CODE></A> if no annotation
- is found.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>type</CODE> - of dependency<DD><CODE>name</CODE> - of dependency<DD><CODE>implementation</CODE> - class
-<DT><B>Returns:</B><DD>this builder</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="factory(java.lang.Class, java.lang.Class)"><!-- --></A><H3>
-factory</H3>
-<PRE>
-public <T> <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A> <B>factory</B>(java.lang.Class<T> type,
- java.lang.Class<? extends T> implementation)</PRE>
-<DL>
-<DD>Convenience method. Equivalent to <code>factory(type,
- Container.DEFAULT_NAME, implementation)</code>.
-<P>
-<DD><DL>
-<DT><B>See Also:</B><DD><A HREF="../../../com/google/inject/ContainerBuilder.html#factory(java.lang.Class, java.lang.String, java.lang.Class)"><CODE>factory(Class, String, Class)</CODE></A></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="factory(java.lang.Class)"><!-- --></A><H3>
-factory</H3>
-<PRE>
-public <T> <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A> <B>factory</B>(java.lang.Class<T> type)</PRE>
-<DL>
-<DD>Convenience method. Equivalent to <code>factory(type,
- Container.DEFAULT_NAME, type)</code>.
-<P>
-<DD><DL>
-<DT><B>See Also:</B><DD><A HREF="../../../com/google/inject/ContainerBuilder.html#factory(java.lang.Class, java.lang.String, java.lang.Class)"><CODE>factory(Class, String, Class)</CODE></A></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="factory(java.lang.Class, java.lang.String)"><!-- --></A><H3>
-factory</H3>
-<PRE>
-public <T> <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A> <B>factory</B>(java.lang.Class<T> type,
- java.lang.String name)</PRE>
-<DL>
-<DD>Convenience method. Equivalent to <code>factory(type, name, type)</code>.
-<P>
-<DD><DL>
-<DT><B>See Also:</B><DD><A HREF="../../../com/google/inject/ContainerBuilder.html#factory(java.lang.Class, java.lang.String, java.lang.Class)"><CODE>factory(Class, String, Class)</CODE></A></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="factory(java.lang.Class, java.lang.Class, com.google.inject.Scope)"><!-- --></A><H3>
-factory</H3>
-<PRE>
-public <T> <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A> <B>factory</B>(java.lang.Class<T> type,
- java.lang.Class<? extends T> implementation,
- <A HREF="../../../com/google/inject/Scope.html" title="enum in com.google.inject">Scope</A> scope)</PRE>
-<DL>
-<DD>Convenience method. Equivalent to <code>factory(type,
- Container.DEFAULT_NAME, implementation, scope)</code>.
-<P>
-<DD><DL>
-<DT><B>See Also:</B><DD><A HREF="../../../com/google/inject/ContainerBuilder.html#factory(java.lang.Class, java.lang.String, java.lang.Class, com.google.inject.Scope)"><CODE>factory(Class, String, Class, Scope)</CODE></A></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="factory(java.lang.Class, com.google.inject.Scope)"><!-- --></A><H3>
-factory</H3>
-<PRE>
-public <T> <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A> <B>factory</B>(java.lang.Class<T> type,
- <A HREF="../../../com/google/inject/Scope.html" title="enum in com.google.inject">Scope</A> scope)</PRE>
-<DL>
-<DD>Convenience method. Equivalent to <code>factory(type,
- Container.DEFAULT_NAME, type, scope)</code>.
-<P>
-<DD><DL>
-<DT><B>See Also:</B><DD><A HREF="../../../com/google/inject/ContainerBuilder.html#factory(java.lang.Class, java.lang.String, java.lang.Class, com.google.inject.Scope)"><CODE>factory(Class, String, Class, Scope)</CODE></A></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="factory(java.lang.Class, java.lang.String, com.google.inject.Scope)"><!-- --></A><H3>
-factory</H3>
-<PRE>
-public <T> <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A> <B>factory</B>(java.lang.Class<T> type,
- java.lang.String name,
- <A HREF="../../../com/google/inject/Scope.html" title="enum in com.google.inject">Scope</A> scope)</PRE>
-<DL>
-<DD>Convenience method. Equivalent to <code>factory(type, name, type,
- scope)</code>.
-<P>
-<DD><DL>
-<DT><B>See Also:</B><DD><A HREF="../../../com/google/inject/ContainerBuilder.html#factory(java.lang.Class, java.lang.String, java.lang.Class, com.google.inject.Scope)"><CODE>factory(Class, String, Class, Scope)</CODE></A></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="constant(java.lang.String, java.lang.String)"><!-- --></A><H3>
-constant</H3>
-<PRE>
-public <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A> <B>constant</B>(java.lang.String name,
- java.lang.String value)</PRE>
-<DL>
-<DD>Maps a constant value to the given name.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="constant(java.lang.String, int)"><!-- --></A><H3>
-constant</H3>
-<PRE>
-public <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A> <B>constant</B>(java.lang.String name,
- int value)</PRE>
-<DL>
-<DD>Maps a constant value to the given name.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="constant(java.lang.String, long)"><!-- --></A><H3>
-constant</H3>
-<PRE>
-public <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A> <B>constant</B>(java.lang.String name,
- long value)</PRE>
-<DL>
-<DD>Maps a constant value to the given name.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="constant(java.lang.String, boolean)"><!-- --></A><H3>
-constant</H3>
-<PRE>
-public <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A> <B>constant</B>(java.lang.String name,
- boolean value)</PRE>
-<DL>
-<DD>Maps a constant value to the given name.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="constant(java.lang.String, double)"><!-- --></A><H3>
-constant</H3>
-<PRE>
-public <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A> <B>constant</B>(java.lang.String name,
- double value)</PRE>
-<DL>
-<DD>Maps a constant value to the given name.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="constant(java.lang.String, float)"><!-- --></A><H3>
-constant</H3>
-<PRE>
-public <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A> <B>constant</B>(java.lang.String name,
- float value)</PRE>
-<DL>
-<DD>Maps a constant value to the given name.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="constant(java.lang.String, short)"><!-- --></A><H3>
-constant</H3>
-<PRE>
-public <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A> <B>constant</B>(java.lang.String name,
- short value)</PRE>
-<DL>
-<DD>Maps a constant value to the given name.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="constant(java.lang.String, char)"><!-- --></A><H3>
-constant</H3>
-<PRE>
-public <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A> <B>constant</B>(java.lang.String name,
- char value)</PRE>
-<DL>
-<DD>Maps a constant value to the given name.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="constant(java.lang.String, java.lang.Class)"><!-- --></A><H3>
-constant</H3>
-<PRE>
-public <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A> <B>constant</B>(java.lang.String name,
- java.lang.Class value)</PRE>
-<DL>
-<DD>Maps a class to the given name.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="constant(java.lang.String,java.lang.Enum)"><!-- --></A><A NAME="constant(java.lang.String, E)"><!-- --></A><H3>
-constant</H3>
-<PRE>
-public <E extends java.lang.Enum<E>> <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A> <B>constant</B>(java.lang.String name,
- E value)</PRE>
-<DL>
-<DD>Maps an enum to the given name.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="injectStatics(java.lang.Class...)"><!-- --></A><H3>
-injectStatics</H3>
-<PRE>
-public <A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A> <B>injectStatics</B>(java.lang.Class<?>... types)</PRE>
-<DL>
-<DD>Upon creation, the <A HREF="../../../com/google/inject/Container.html" title="interface in com.google.inject"><CODE>Container</CODE></A> will inject static fields and methods
- into the given classes.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>types</CODE> - for which static members will be injected</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="contains(java.lang.Class, java.lang.String)"><!-- --></A><H3>
-contains</H3>
-<PRE>
-public boolean <B>contains</B>(java.lang.Class<?> type,
- java.lang.String name)</PRE>
-<DL>
-<DD>Returns true if this builder contains a mapping for the given type and
- name.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="contains(java.lang.Class)"><!-- --></A><H3>
-contains</H3>
-<PRE>
-public boolean <B>contains</B>(java.lang.Class<?> type)</PRE>
-<DL>
-<DD>Convenience method. Equivalent to <code>contains(type,
- Container.DEFAULT_NAME)</code>.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="create(boolean)"><!-- --></A><H3>
-create</H3>
-<PRE>
-public <A HREF="../../../com/google/inject/Container.html" title="interface in com.google.inject">Container</A> <B>create</B>(boolean loadSingletons)</PRE>
-<DL>
-<DD>Creates a <A HREF="../../../com/google/inject/Container.html" title="interface in com.google.inject"><CODE>Container</CODE></A> instance. Injects static members for classes
- which were registered using <A HREF="../../../com/google/inject/ContainerBuilder.html#injectStatics(java.lang.Class...)"><CODE>injectStatics(Class...)</CODE></A>.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>loadSingletons</CODE> - If true, the container will load all singletons
- now. If false, the container will lazily load singletons. Eager loading
- is appropriate for production use while lazy loading can speed
- development.
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.IllegalStateException</CODE> - if called more than once</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="../../../com/google/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../com/google/inject/Container.html" title="interface in com.google.inject"><B>PREV CLASS</B></A>
- <A HREF="../../../com/google/inject/ContainerBuilder.Command.html" title="interface in com.google.inject"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../index.html?com/google/inject/ContainerBuilder.html" target="_top"><B>FRAMES</B></A>
- <A HREF="ContainerBuilder.html" target="_top"><B>NO FRAMES</B></A>
- <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: <A HREF="#nested_class_summary">NESTED</A> | FIELD | <A HREF="#constructor_summary">CONSTR</A> | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | <A HREF="#constructor_detail">CONSTR</A> | <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/inject/Context.html b/javadoc/com/google/inject/Context.html
deleted file mode 100644
index b2b0e1f..0000000
--- a/javadoc/com/google/inject/Context.html
+++ /dev/null
@@ -1,297 +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.5.0_05) on Thu Aug 24 18:43:56 PDT 2006 -->
-<TITLE>
-Context (Guice 1.0 API)
-</TITLE>
-
-<META NAME="keywords" CONTENT="com.google.inject.Context interface">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- parent.document.title="Context (Guice 1.0 API)";
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= 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="../../../com/google/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../com/google/inject/ContainerBuilder.Command.html" title="interface in com.google.inject"><B>PREV CLASS</B></A>
- <A HREF="../../../com/google/inject/DependencyException.html" title="class in com.google.inject"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../index.html?com/google/inject/Context.html" target="_top"><B>FRAMES</B></A>
- <A HREF="Context.html" target="_top"><B>NO FRAMES</B></A>
- <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: NESTED | FIELD | CONSTR | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | CONSTR | <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.inject</FONT>
-<BR>
-Interface Context</H2>
-<HR>
-<DL>
-<DT><PRE>public interface <B>Context</B></DL>
-</PRE>
-
-<P>
-Context of the current injection.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
- <DD>crazybob@google.com (Bob Lee)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ========== 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> <A HREF="../../../com/google/inject/Container.html" title="interface in com.google.inject">Container</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/Context.html#getContainer()">getContainer</A></B>()</CODE>
-
-<BR>
- Gets the <A HREF="../../../com/google/inject/Container.html" title="interface in com.google.inject"><CODE>Container</CODE></A>.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.reflect.Member</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/Context.html#getMember()">getMember</A></B>()</CODE>
-
-<BR>
- Gets the field, method or constructor which is being injected.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/Context.html#getName()">getName</A></B>()</CODE>
-
-<BR>
- Gets the name of the injection specified by <A HREF="../../../com/google/inject/Inject.html#value()"><CODE>Inject.value()</CODE></A>.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../com/google/inject/Scope.Strategy.html" title="interface in com.google.inject">Scope.Strategy</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/Context.html#getScopeStrategy()">getScopeStrategy</A></B>()</CODE>
-
-<BR>
- Gets the current scope strategy.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.Class<?></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/Context.html#getType()">getType</A></B>()</CODE>
-
-<BR>
- Gets the type of the field or parameter which is being injected.</TD>
-</TR>
-</TABLE>
-
-<P>
-
-<!-- ============ 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="getContainer()"><!-- --></A><H3>
-getContainer</H3>
-<PRE>
-<A HREF="../../../com/google/inject/Container.html" title="interface in com.google.inject">Container</A> <B>getContainer</B>()</PRE>
-<DL>
-<DD>Gets the <A HREF="../../../com/google/inject/Container.html" title="interface in com.google.inject"><CODE>Container</CODE></A>.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getScopeStrategy()"><!-- --></A><H3>
-getScopeStrategy</H3>
-<PRE>
-<A HREF="../../../com/google/inject/Scope.Strategy.html" title="interface in com.google.inject">Scope.Strategy</A> <B>getScopeStrategy</B>()</PRE>
-<DL>
-<DD>Gets the current scope strategy. See <A HREF="../../../com/google/inject/Container.html#setScopeStrategy(com.google.inject.Scope.Strategy)"><CODE>Container.setScopeStrategy(Scope.Strategy)</CODE></A>.
-<P>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.IllegalStateException</CODE> - if no strategy has been set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getMember()"><!-- --></A><H3>
-getMember</H3>
-<PRE>
-java.lang.reflect.Member <B>getMember</B>()</PRE>
-<DL>
-<DD>Gets the field, method or constructor which is being injected. Returns
- <code>null</code> if the object currently being constructed is pre-loaded as
- a singleton or requested from <A HREF="../../../com/google/inject/Container.html#getInstance(java.lang.Class)"><CODE>Container.getInstance(Class)</CODE></A>.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getType()"><!-- --></A><H3>
-getType</H3>
-<PRE>
-java.lang.Class<?> <B>getType</B>()</PRE>
-<DL>
-<DD>Gets the type of the field or parameter which is being injected.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getName()"><!-- --></A><H3>
-getName</H3>
-<PRE>
-java.lang.String <B>getName</B>()</PRE>
-<DL>
-<DD>Gets the name of the injection specified by <A HREF="../../../com/google/inject/Inject.html#value()"><CODE>Inject.value()</CODE></A>.
-<P>
-<DD><DL>
-</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="../../../com/google/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../com/google/inject/ContainerBuilder.Command.html" title="interface in com.google.inject"><B>PREV CLASS</B></A>
- <A HREF="../../../com/google/inject/DependencyException.html" title="class in com.google.inject"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../index.html?com/google/inject/Context.html" target="_top"><B>FRAMES</B></A>
- <A HREF="Context.html" target="_top"><B>NO FRAMES</B></A>
- <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: NESTED | FIELD | CONSTR | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | CONSTR | <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/inject/DependencyException.html b/javadoc/com/google/inject/DependencyException.html
deleted file mode 100644
index 6479eff..0000000
--- a/javadoc/com/google/inject/DependencyException.html
+++ /dev/null
@@ -1,270 +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.5.0_05) on Thu Aug 24 18:43:56 PDT 2006 -->
-<TITLE>
-DependencyException (Guice 1.0 API)
-</TITLE>
-
-<META NAME="keywords" CONTENT="com.google.inject.DependencyException class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- parent.document.title="DependencyException (Guice 1.0 API)";
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= 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="../../../com/google/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../com/google/inject/Context.html" title="interface in com.google.inject"><B>PREV CLASS</B></A>
- <A HREF="../../../com/google/inject/Factory.html" title="interface in com.google.inject"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../index.html?com/google/inject/DependencyException.html" target="_top"><B>FRAMES</B></A>
- <A HREF="DependencyException.html" target="_top"><B>NO FRAMES</B></A>
- <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: NESTED | FIELD | <A HREF="#constructor_summary">CONSTR</A> | <A HREF="#methods_inherited_from_class_java.lang.Throwable">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | <A HREF="#constructor_detail">CONSTR</A> | METHOD</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.inject</FONT>
-<BR>
-Class DependencyException</H2>
-<PRE>
-java.lang.Object
- <IMG SRC="../../../resources/inherit.gif" ALT="extended by ">java.lang.Throwable
- <IMG SRC="../../../resources/inherit.gif" ALT="extended by ">java.lang.Exception
- <IMG SRC="../../../resources/inherit.gif" ALT="extended by ">java.lang.RuntimeException
- <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>com.google.inject.DependencyException</B>
-</PRE>
-<DL>
-<DT><B>All Implemented Interfaces:</B> <DD>java.io.Serializable</DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public class <B>DependencyException</B><DT>extends java.lang.RuntimeException</DL>
-</PRE>
-
-<P>
-Thrown when a dependency is misconfigured.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
- <DD>crazybob@google.com (Bob Lee)</DD>
-<DT><B>See Also:</B><DD><A HREF="../../../serialized-form.html#com.google.inject.DependencyException">Serialized Form</A></DL>
-<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/inject/DependencyException.html#DependencyException(java.lang.String)">DependencyException</A></B>(java.lang.String message)</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../com/google/inject/DependencyException.html#DependencyException(java.lang.String, java.lang.Throwable)">DependencyException</A></B>(java.lang.String message,
- java.lang.Throwable cause)</CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../com/google/inject/DependencyException.html#DependencyException(java.lang.Throwable)">DependencyException</A></B>(java.lang.Throwable cause)</CODE>
-
-<BR>
- </TD>
-</TR>
-</TABLE>
-
-<!-- ========== 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>
-</TABLE>
- <A NAME="methods_inherited_from_class_java.lang.Throwable"><!-- --></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.Throwable</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toString</CODE></TD>
-</TR>
-</TABLE>
- <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, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-
-<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="DependencyException(java.lang.String)"><!-- --></A><H3>
-DependencyException</H3>
-<PRE>
-public <B>DependencyException</B>(java.lang.String message)</PRE>
-<DL>
-</DL>
-<HR>
-
-<A NAME="DependencyException(java.lang.String, java.lang.Throwable)"><!-- --></A><H3>
-DependencyException</H3>
-<PRE>
-public <B>DependencyException</B>(java.lang.String message,
- java.lang.Throwable cause)</PRE>
-<DL>
-</DL>
-<HR>
-
-<A NAME="DependencyException(java.lang.Throwable)"><!-- --></A><H3>
-DependencyException</H3>
-<PRE>
-public <B>DependencyException</B>(java.lang.Throwable cause)</PRE>
-<DL>
-</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="../../../com/google/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../com/google/inject/Context.html" title="interface in com.google.inject"><B>PREV CLASS</B></A>
- <A HREF="../../../com/google/inject/Factory.html" title="interface in com.google.inject"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../index.html?com/google/inject/DependencyException.html" target="_top"><B>FRAMES</B></A>
- <A HREF="DependencyException.html" target="_top"><B>NO FRAMES</B></A>
- <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: NESTED | FIELD | <A HREF="#constructor_summary">CONSTR</A> | <A HREF="#methods_inherited_from_class_java.lang.Throwable">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | <A HREF="#constructor_detail">CONSTR</A> | METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/javadoc/com/google/inject/Factory.html b/javadoc/com/google/inject/Factory.html
deleted file mode 100644
index 23d6bc9..0000000
--- a/javadoc/com/google/inject/Factory.html
+++ /dev/null
@@ -1,213 +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.5.0_05) on Thu Aug 24 18:43:56 PDT 2006 -->
-<TITLE>
-Factory (Guice 1.0 API)
-</TITLE>
-
-<META NAME="keywords" CONTENT="com.google.inject.Factory interface">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- parent.document.title="Factory (Guice 1.0 API)";
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= 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="../../../com/google/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../com/google/inject/DependencyException.html" title="class in com.google.inject"><B>PREV CLASS</B></A>
- <A HREF="../../../com/google/inject/Inject.html" title="annotation in com.google.inject"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../index.html?com/google/inject/Factory.html" target="_top"><B>FRAMES</B></A>
- <A HREF="Factory.html" target="_top"><B>NO FRAMES</B></A>
- <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: NESTED | FIELD | CONSTR | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | CONSTR | <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.inject</FONT>
-<BR>
-Interface Factory<T></H2>
-<HR>
-<DL>
-<DT><PRE>public interface <B>Factory<T></B></DL>
-</PRE>
-
-<P>
-A custom factory. Creates objects which will be injected.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
- <DD>crazybob@google.com (Bob Lee)</DD>
-</DL>
-<HR>
-
-<P>
-
-<!-- ========== 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> <A HREF="../../../com/google/inject/Factory.html" title="type parameter in Factory">T</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/Factory.html#create(com.google.inject.Context)">create</A></B>(<A HREF="../../../com/google/inject/Context.html" title="interface in com.google.inject">Context</A> context)</CODE>
-
-<BR>
- Creates an object to be injected.</TD>
-</TR>
-</TABLE>
-
-<P>
-
-<!-- ============ 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="create(com.google.inject.Context)"><!-- --></A><H3>
-create</H3>
-<PRE>
-<A HREF="../../../com/google/inject/Factory.html" title="type parameter in Factory">T</A> <B>create</B>(<A HREF="../../../com/google/inject/Context.html" title="interface in com.google.inject">Context</A> context)
- throws java.lang.Exception</PRE>
-<DL>
-<DD>Creates an object to be injected.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>context</CODE> - of this injection
-<DT><B>Returns:</B><DD>instance to be injected
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.Exception</CODE> - if unable to create object</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="../../../com/google/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../com/google/inject/DependencyException.html" title="class in com.google.inject"><B>PREV CLASS</B></A>
- <A HREF="../../../com/google/inject/Inject.html" title="annotation in com.google.inject"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../index.html?com/google/inject/Factory.html" target="_top"><B>FRAMES</B></A>
- <A HREF="Factory.html" target="_top"><B>NO FRAMES</B></A>
- <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: NESTED | FIELD | CONSTR | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | CONSTR | <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/inject/Inject.html b/javadoc/com/google/inject/Inject.html
deleted file mode 100644
index 40684e3..0000000
--- a/javadoc/com/google/inject/Inject.html
+++ /dev/null
@@ -1,232 +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.5.0_05) on Thu Aug 24 18:43:56 PDT 2006 -->
-<TITLE>
-Inject (Guice 1.0 API)
-</TITLE>
-
-<META NAME="keywords" CONTENT="com.google.inject.Inject class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- parent.document.title="Inject (Guice 1.0 API)";
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= 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="../../../com/google/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../com/google/inject/Factory.html" title="interface in com.google.inject"><B>PREV CLASS</B></A>
- <A HREF="../../../com/google/inject/Scope.html" title="enum in com.google.inject"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../index.html?com/google/inject/Inject.html" target="_top"><B>FRAMES</B></A>
- <A HREF="Inject.html" target="_top"><B>NO FRAMES</B></A>
- <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: REQUIRED | <A HREF="#annotation_type_optional_element_summary">OPTIONAL</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: <A HREF="#annotation_type_element_detail">ELEMENT</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.inject</FONT>
-<BR>
-Annotation Type Inject</H2>
-<HR>
-<DL>
-<DT><PRE><FONT SIZE="-1">@Target(value={METHOD,CONSTRUCTOR,FIELD,PARAMETER})
-@Retention(value=RUNTIME)
-</FONT>public @interface <B>Inject</B></DL>
-</PRE>
-
-<P>
-<p>Annotates members and parameters which should have their value[s]
- injected.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
- <DD>crazybob@google.com (Bob Lee)</DD>
-</DL>
-<HR>
-
-<P>
-<!-- =========== ANNOTATION TYPE OPTIONAL MEMBER SUMMARY =========== -->
-
-<A NAME="annotation_type_optional_element_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>Optional Element Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/Inject.html#required()">required</A></B></CODE>
-
-<BR>
- Whether or not injection is required.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/Inject.html#value()">value</A></B></CODE>
-
-<BR>
- Dependency name.</TD>
-</TR>
-</TABLE>
-
-<P>
-<A NAME="value()"><!-- --></A><H3>
-value</H3>
-<PRE>
-public abstract java.lang.String <B>value</B></PRE>
-<DL>
-<DD>Dependency name. Defaults to <A HREF="../../../com/google/inject/Container.html#DEFAULT_NAME"><CODE>Container.DEFAULT_NAME</CODE></A>.
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-<DL>
-<DT><B>Default:</B><DD>"default"</DD>
-</DL>
-</DL>
-<HR>
-
-<A NAME="required()"><!-- --></A><H3>
-required</H3>
-<PRE>
-public abstract boolean <B>required</B></PRE>
-<DL>
-<DD>Whether or not injection is required. Applicable only to methods and
- fields (not constructors or parameters).
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-<DL>
-<DT><B>Default:</B><DD>true</DD>
-</DL>
-</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="../../../com/google/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../com/google/inject/Factory.html" title="interface in com.google.inject"><B>PREV CLASS</B></A>
- <A HREF="../../../com/google/inject/Scope.html" title="enum in com.google.inject"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../index.html?com/google/inject/Inject.html" target="_top"><B>FRAMES</B></A>
- <A HREF="Inject.html" target="_top"><B>NO FRAMES</B></A>
- <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: REQUIRED | <A HREF="#annotation_type_optional_element_summary">OPTIONAL</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: <A HREF="#annotation_type_element_detail">ELEMENT</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/javadoc/com/google/inject/Scope.Strategy.html b/javadoc/com/google/inject/Scope.Strategy.html
deleted file mode 100644
index dc0f6cf..0000000
--- a/javadoc/com/google/inject/Scope.Strategy.html
+++ /dev/null
@@ -1,297 +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.5.0_05) on Thu Aug 24 18:43:56 PDT 2006 -->
-<TITLE>
-Scope.Strategy (Guice 1.0 API)
-</TITLE>
-
-<META NAME="keywords" CONTENT="com.google.inject.Scope.Strategy interface">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- parent.document.title="Scope.Strategy (Guice 1.0 API)";
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= 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="../../../com/google/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../com/google/inject/Scope.html" title="enum in com.google.inject"><B>PREV CLASS</B></A>
- <A HREF="../../../com/google/inject/Scoped.html" title="annotation in com.google.inject"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../index.html?com/google/inject/Scope.Strategy.html" target="_top"><B>FRAMES</B></A>
- <A HREF="Scope.Strategy.html" target="_top"><B>NO FRAMES</B></A>
- <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: NESTED | FIELD | CONSTR | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | CONSTR | <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.inject</FONT>
-<BR>
-Interface Scope.Strategy</H2>
-<DL>
-<DT><B>Enclosing class:</B><DD><A HREF="../../../com/google/inject/Scope.html" title="enum in com.google.inject">Scope</A></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public static interface <B>Scope.Strategy</B></DL>
-</PRE>
-
-<P>
-Pluggable scoping strategy. Enables users to provide custom
- implementations of request, session, and wizard scopes. Implement and
- pass to <A HREF="../../../com/google/inject/Container.html#setScopeStrategy(com.google.inject.Scope.Strategy)"><CODE>Container.setScopeStrategy(com.google.inject.Scope.Strategy)</CODE></A>.
-<P>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ========== 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>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" SUMMARY="">
-<TR ALIGN="right" VALIGN="">
-<TD NOWRAP><FONT SIZE="-1">
-<CODE><T> T</CODE></FONT></TD>
-</TR>
-</TABLE>
-</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/Scope.Strategy.html#findInRequest(java.lang.Class, java.lang.String, java.util.concurrent.Callable)">findInRequest</A></B>(java.lang.Class<T> type,
- java.lang.String name,
- java.util.concurrent.Callable<? extends T> factory)</CODE>
-
-<BR>
- Finds an object for the given type and name in the request scope.</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="">
-<TD NOWRAP><FONT SIZE="-1">
-<CODE><T> T</CODE></FONT></TD>
-</TR>
-</TABLE>
-</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/Scope.Strategy.html#findInSession(java.lang.Class, java.lang.String, java.util.concurrent.Callable)">findInSession</A></B>(java.lang.Class<T> type,
- java.lang.String name,
- java.util.concurrent.Callable<? extends T> factory)</CODE>
-
-<BR>
- Finds an object for the given type and name in the session scope.</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="">
-<TD NOWRAP><FONT SIZE="-1">
-<CODE><T> T</CODE></FONT></TD>
-</TR>
-</TABLE>
-</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/Scope.Strategy.html#findInWizard(java.lang.Class, java.lang.String, java.util.concurrent.Callable)">findInWizard</A></B>(java.lang.Class<T> type,
- java.lang.String name,
- java.util.concurrent.Callable<? extends T> factory)</CODE>
-
-<BR>
- Finds an object for the given type and name in the wizard scope.</TD>
-</TR>
-</TABLE>
-
-<P>
-
-<!-- ============ 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="findInRequest(java.lang.Class, java.lang.String, java.util.concurrent.Callable)"><!-- --></A><H3>
-findInRequest</H3>
-<PRE>
-<T> T <B>findInRequest</B>(java.lang.Class<T> type,
- java.lang.String name,
- java.util.concurrent.Callable<? extends T> factory)
- throws java.lang.Exception</PRE>
-<DL>
-<DD>Finds an object for the given type and name in the request scope.
- Creates a new object if necessary using the given factory.
-<P>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.Exception</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="findInSession(java.lang.Class, java.lang.String, java.util.concurrent.Callable)"><!-- --></A><H3>
-findInSession</H3>
-<PRE>
-<T> T <B>findInSession</B>(java.lang.Class<T> type,
- java.lang.String name,
- java.util.concurrent.Callable<? extends T> factory)
- throws java.lang.Exception</PRE>
-<DL>
-<DD>Finds an object for the given type and name in the session scope.
- Creates a new object if necessary using the given factory.
-<P>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.Exception</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="findInWizard(java.lang.Class, java.lang.String, java.util.concurrent.Callable)"><!-- --></A><H3>
-findInWizard</H3>
-<PRE>
-<T> T <B>findInWizard</B>(java.lang.Class<T> type,
- java.lang.String name,
- java.util.concurrent.Callable<? extends T> factory)
- throws java.lang.Exception</PRE>
-<DL>
-<DD>Finds an object for the given type and name in the wizard scope.
- Creates a new object if necessary using the given factory.
-<P>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.Exception</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="../../../com/google/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../com/google/inject/Scope.html" title="enum in com.google.inject"><B>PREV CLASS</B></A>
- <A HREF="../../../com/google/inject/Scoped.html" title="annotation in com.google.inject"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../index.html?com/google/inject/Scope.Strategy.html" target="_top"><B>FRAMES</B></A>
- <A HREF="Scope.Strategy.html" target="_top"><B>NO FRAMES</B></A>
- <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: NESTED | FIELD | CONSTR | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: FIELD | CONSTR | <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/inject/Scope.html b/javadoc/com/google/inject/Scope.html
deleted file mode 100644
index c0526ee..0000000
--- a/javadoc/com/google/inject/Scope.html
+++ /dev/null
@@ -1,418 +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.5.0_05) on Thu Aug 24 18:43:56 PDT 2006 -->
-<TITLE>
-Scope (Guice 1.0 API)
-</TITLE>
-
-<META NAME="keywords" CONTENT="com.google.inject.Scope class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- parent.document.title="Scope (Guice 1.0 API)";
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= 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="../../../com/google/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../com/google/inject/Inject.html" title="annotation in com.google.inject"><B>PREV CLASS</B></A>
- <A HREF="../../../com/google/inject/Scope.Strategy.html" title="interface in com.google.inject"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../index.html?com/google/inject/Scope.html" target="_top"><B>FRAMES</B></A>
- <A HREF="Scope.html" target="_top"><B>NO FRAMES</B></A>
- <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: <A HREF="#nested_class_summary">NESTED</A> | <A HREF="#enum_constant_summary">ENUM CONSTANTS</A> | FIELD | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: <A HREF="#enum_constant_detail">ENUM CONSTANTS</A> | FIELD | <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.inject</FONT>
-<BR>
-Enum Scope</H2>
-<PRE>
-java.lang.Object
- <IMG SRC="../../../resources/inherit.gif" ALT="extended by ">java.lang.Enum<<A HREF="../../../com/google/inject/Scope.html" title="enum in com.google.inject">Scope</A>>
- <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>com.google.inject.Scope</B>
-</PRE>
-<DL>
-<DT><B>All Implemented Interfaces:</B> <DD>java.io.Serializable, java.lang.Comparable<<A HREF="../../../com/google/inject/Scope.html" title="enum in com.google.inject">Scope</A>></DD>
-</DL>
-<HR>
-<DL>
-<DT><PRE>public enum <B>Scope</B><DT>extends java.lang.Enum<<A HREF="../../../com/google/inject/Scope.html" title="enum in com.google.inject">Scope</A>></DL>
-</PRE>
-
-<P>
-Scope of an injected objects.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
- <DD>crazybob</DD>
-</DL>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-<A NAME="nested_class_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>Nested Class Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static interface</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/Scope.Strategy.html" title="interface in com.google.inject">Scope.Strategy</A></B></CODE>
-
-<BR>
- Pluggable scoping strategy.</TD>
-</TR>
-</TABLE>
- <!-- =========== ENUM CONSTANT SUMMARY =========== -->
-
-<A NAME="enum_constant_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>Enum Constant Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../com/google/inject/Scope.html#DEFAULT">DEFAULT</A></B></CODE>
-
-<BR>
- One instance per injection.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../com/google/inject/Scope.html#REQUEST">REQUEST</A></B></CODE>
-
-<BR>
- One instance per request.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../com/google/inject/Scope.html#SESSION">SESSION</A></B></CODE>
-
-<BR>
- One instance per session.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../com/google/inject/Scope.html#SINGLETON">SINGLETON</A></B></CODE>
-
-<BR>
- One instance per container.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../com/google/inject/Scope.html#THREAD">THREAD</A></B></CODE>
-
-<BR>
- One instance per thread.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../com/google/inject/Scope.html#WIZARD">WIZARD</A></B></CODE>
-
-<BR>
- One instance per wizard.</TD>
-</TR>
-</TABLE>
-
-<!-- ========== 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>static <A HREF="../../../com/google/inject/Scope.html" title="enum in com.google.inject">Scope</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/Scope.html#valueOf(java.lang.String)">valueOf</A></B>(java.lang.String name)</CODE>
-
-<BR>
- Returns the enum constant of this type with the specified name.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static <A HREF="../../../com/google/inject/Scope.html" title="enum in com.google.inject">Scope</A>[]</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/Scope.html#values()">values</A></B>()</CODE>
-
-<BR>
- Returns an array containing the constants of this enum type, in
-the order they're declared.</TD>
-</TR>
-</TABLE>
- <A NAME="methods_inherited_from_class_java.lang.Enum"><!-- --></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.Enum</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>clone, compareTo, equals, getDeclaringClass, hashCode, name, ordinal, toString, valueOf</CODE></TD>
-</TR>
-</TABLE>
- <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>finalize, getClass, notify, notifyAll, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<!-- ============ ENUM CONSTANT DETAIL =========== -->
-
-<A NAME="enum_constant_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>Enum Constant Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="DEFAULT"><!-- --></A><H3>
-DEFAULT</H3>
-<PRE>
-public static final <A HREF="../../../com/google/inject/Scope.html" title="enum in com.google.inject">Scope</A> <B>DEFAULT</B></PRE>
-<DL>
-<DD>One instance per injection.
-<P>
-<DL>
-</DL>
-</DL>
-<HR>
-
-<A NAME="SINGLETON"><!-- --></A><H3>
-SINGLETON</H3>
-<PRE>
-public static final <A HREF="../../../com/google/inject/Scope.html" title="enum in com.google.inject">Scope</A> <B>SINGLETON</B></PRE>
-<DL>
-<DD>One instance per container.
-<P>
-<DL>
-</DL>
-</DL>
-<HR>
-
-<A NAME="THREAD"><!-- --></A><H3>
-THREAD</H3>
-<PRE>
-public static final <A HREF="../../../com/google/inject/Scope.html" title="enum in com.google.inject">Scope</A> <B>THREAD</B></PRE>
-<DL>
-<DD>One instance per thread.
-
- <p><b>Note:</b> if a thread local object strongly references its <A HREF="../../../com/google/inject/Container.html" title="interface in com.google.inject"><CODE>Container</CODE></A>, neither the <code>Container</code> nor the object will be
- eligible for garbage collection, i.e. memory leak.
-<P>
-<DL>
-</DL>
-</DL>
-<HR>
-
-<A NAME="REQUEST"><!-- --></A><H3>
-REQUEST</H3>
-<PRE>
-public static final <A HREF="../../../com/google/inject/Scope.html" title="enum in com.google.inject">Scope</A> <B>REQUEST</B></PRE>
-<DL>
-<DD>One instance per request.
-<P>
-<DL>
-</DL>
-</DL>
-<HR>
-
-<A NAME="SESSION"><!-- --></A><H3>
-SESSION</H3>
-<PRE>
-public static final <A HREF="../../../com/google/inject/Scope.html" title="enum in com.google.inject">Scope</A> <B>SESSION</B></PRE>
-<DL>
-<DD>One instance per session.
-<P>
-<DL>
-</DL>
-</DL>
-<HR>
-
-<A NAME="WIZARD"><!-- --></A><H3>
-WIZARD</H3>
-<PRE>
-public static final <A HREF="../../../com/google/inject/Scope.html" title="enum in com.google.inject">Scope</A> <B>WIZARD</B></PRE>
-<DL>
-<DD>One instance per wizard.
-<P>
-<DL>
-</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="values()"><!-- --></A><H3>
-values</H3>
-<PRE>
-public static final <A HREF="../../../com/google/inject/Scope.html" title="enum in com.google.inject">Scope</A>[] <B>values</B>()</PRE>
-<DL>
-<DD>Returns an array containing the constants of this enum type, in
-the order they're declared. This method may be used to iterate
-over the constants as follows:
-<pre>
-for(Scope c : Scope.values())
- System.out.println(c);
-</pre>
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>an array containing the constants of this enum type, in
-the order they're declared</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="valueOf(java.lang.String)"><!-- --></A><H3>
-valueOf</H3>
-<PRE>
-public static <A HREF="../../../com/google/inject/Scope.html" title="enum in com.google.inject">Scope</A> <B>valueOf</B>(java.lang.String name)</PRE>
-<DL>
-<DD>Returns the enum constant of this type with the specified name.
-The string must match <I>exactly</I> an identifier used to declare an
-enum constant in this type. (Extraneous whitespace characters are
-not permitted.)
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>name</CODE> - the name of the enum constant to be returned.
-<DT><B>Returns:</B><DD>the enum constant with the specified name
-<DT><B>Throws:</B>
-<DD><CODE>java.lang.IllegalArgumentException</CODE> - if this enum type has no constant
-with the specified name</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="../../../com/google/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../com/google/inject/Inject.html" title="annotation in com.google.inject"><B>PREV CLASS</B></A>
- <A HREF="../../../com/google/inject/Scope.Strategy.html" title="interface in com.google.inject"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../index.html?com/google/inject/Scope.html" target="_top"><B>FRAMES</B></A>
- <A HREF="Scope.html" target="_top"><B>NO FRAMES</B></A>
- <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: <A HREF="#nested_class_summary">NESTED</A> | <A HREF="#enum_constant_summary">ENUM CONSTANTS</A> | FIELD | <A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: <A HREF="#enum_constant_detail">ENUM CONSTANTS</A> | FIELD | <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/inject/Scoped.html b/javadoc/com/google/inject/Scoped.html
deleted file mode 100644
index cca83f7..0000000
--- a/javadoc/com/google/inject/Scoped.html
+++ /dev/null
@@ -1,212 +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.5.0_05) on Thu Aug 24 18:43:56 PDT 2006 -->
-<TITLE>
-Scoped (Guice 1.0 API)
-</TITLE>
-
-<META NAME="keywords" CONTENT="com.google.inject.Scoped class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- parent.document.title="Scoped (Guice 1.0 API)";
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= 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="../../../com/google/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../com/google/inject/Scope.Strategy.html" title="interface in com.google.inject"><B>PREV CLASS</B></A>
- NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../index.html?com/google/inject/Scoped.html" target="_top"><B>FRAMES</B></A>
- <A HREF="Scoped.html" target="_top"><B>NO FRAMES</B></A>
- <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: <A HREF="#annotation_type_required_element_summary">REQUIRED</A> | OPTIONAL</FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: <A HREF="#annotation_type_element_detail">ELEMENT</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.inject</FONT>
-<BR>
-Annotation Type Scoped</H2>
-<HR>
-<DL>
-<DT><PRE><FONT SIZE="-1">@Target(value=TYPE)
-@Retention(value=RUNTIME)
-</FONT>public @interface <B>Scoped</B></DL>
-</PRE>
-
-<P>
-Annotates a scoped implementation class.
-<P>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
- <DD>crazybob</DD>
-</DL>
-<HR>
-
-<P>
-<!-- =========== ANNOTATION TYPE REQUIRED MEMBER SUMMARY =========== -->
-
-<A NAME="annotation_type_required_element_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>Required Element Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE> <A HREF="../../../com/google/inject/Scope.html" title="enum in com.google.inject">Scope</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../com/google/inject/Scoped.html#value()">value</A></B></CODE>
-
-<BR>
- Scope.</TD>
-</TR>
-</TABLE>
-
-<P>
-
-<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->
-
-<A NAME="annotation_type_element_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>Element Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="value()"><!-- --></A><H3>
-value</H3>
-<PRE>
-public abstract <A HREF="../../../com/google/inject/Scope.html" title="enum in com.google.inject">Scope</A> <B>value</B></PRE>
-<DL>
-<DD>Scope.
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</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="../../../com/google/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../com/google/inject/Scope.Strategy.html" title="interface in com.google.inject"><B>PREV CLASS</B></A>
- NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../index.html?com/google/inject/Scoped.html" target="_top"><B>FRAMES</B></A>
- <A HREF="Scoped.html" target="_top"><B>NO FRAMES</B></A>
- <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: <A HREF="#annotation_type_required_element_summary">REQUIRED</A> | OPTIONAL</FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: <A HREF="#annotation_type_element_detail">ELEMENT</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/javadoc/com/google/inject/package-frame.html b/javadoc/com/google/inject/package-frame.html
deleted file mode 100644
index 4d6daf2..0000000
--- a/javadoc/com/google/inject/package-frame.html
+++ /dev/null
@@ -1,86 +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.5.0_05) on Thu Aug 24 18:43:56 PDT 2006 -->
-<TITLE>
-com.google.inject (Guice 1.0 API)
-</TITLE>
-
-<META NAME="keywords" CONTENT="com.google.inject package">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameTitleFont">
-<A HREF="../../../com/google/inject/package-summary.html" target="classFrame">com.google.inject</A></FONT>
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Interfaces</FONT>
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="Container.html" title="interface in com.google.inject" target="classFrame"><I>Container</I></A>
-<BR>
-<A HREF="ContainerBuilder.Command.html" title="interface in com.google.inject" target="classFrame"><I>ContainerBuilder.Command</I></A>
-<BR>
-<A HREF="Context.html" title="interface in com.google.inject" target="classFrame"><I>Context</I></A>
-<BR>
-<A HREF="Factory.html" title="interface in com.google.inject" target="classFrame"><I>Factory</I></A>
-<BR>
-<A HREF="Scope.Strategy.html" title="interface in com.google.inject" target="classFrame"><I>Scope.Strategy</I></A></FONT></TD>
-</TR>
-</TABLE>
-
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Classes</FONT>
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="ContainerBuilder.html" title="class in com.google.inject" target="classFrame">ContainerBuilder</A></FONT></TD>
-</TR>
-</TABLE>
-
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Enums</FONT>
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="Scope.html" title="enum in com.google.inject" target="classFrame">Scope</A></FONT></TD>
-</TR>
-</TABLE>
-
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Exceptions</FONT>
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="DependencyException.html" title="class in com.google.inject" target="classFrame">DependencyException</A></FONT></TD>
-</TR>
-</TABLE>
-
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Annotation Types</FONT>
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="Inject.html" title="annotation in com.google.inject" target="classFrame">Inject</A>
-<BR>
-<A HREF="Scoped.html" title="annotation in com.google.inject" target="classFrame">Scoped</A></FONT></TD>
-</TR>
-</TABLE>
-
-
-</BODY>
-</HTML>
diff --git a/javadoc/com/google/inject/package-summary.html b/javadoc/com/google/inject/package-summary.html
deleted file mode 100644
index a8a039c..0000000
--- a/javadoc/com/google/inject/package-summary.html
+++ /dev/null
@@ -1,253 +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.5.0_05) on Thu Aug 24 18:43:56 PDT 2006 -->
-<TITLE>
-com.google.inject (Guice 1.0 API)
-</TITLE>
-
-<META NAME="keywords" CONTENT="com.google.inject package">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- parent.document.title="com.google.inject (Guice 1.0 API)";
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= 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="../../../com/google/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV PACKAGE
- NEXT PACKAGE</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../index.html?com/google/inject/package-summary.html" target="_top"><B>FRAMES</B></A>
- <A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>
- <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>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<H2>
-Package com.google.inject
-</H2>
-<i>Guice</i> (pronounced "juice").
-<P>
-<B>See:</B>
-<BR>
- <A HREF="#package_description"><B>Description</B></A>
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Interface Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/google/inject/Container.html" title="interface in com.google.inject">Container</A></B></TD>
-<TD>Injects dependencies into constructors, methods and fields annotated with
- <A HREF="../../../com/google/inject/Inject.html" title="annotation in com.google.inject"><CODE>Inject</CODE></A>.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/google/inject/ContainerBuilder.Command.html" title="interface in com.google.inject">ContainerBuilder.Command</A></B></TD>
-<TD>Implemented by classes which participate in building a container.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/google/inject/Context.html" title="interface in com.google.inject">Context</A></B></TD>
-<TD>Context of the current injection.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/google/inject/Factory.html" title="interface in com.google.inject">Factory<T></A></B></TD>
-<TD>A custom factory.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/google/inject/Scope.Strategy.html" title="interface in com.google.inject">Scope.Strategy</A></B></TD>
-<TD>Pluggable scoping strategy.</TD>
-</TR>
-</TABLE>
-
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Class Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A></B></TD>
-<TD>Builds a dependency injection <A HREF="../../../com/google/inject/Container.html" title="interface in com.google.inject"><CODE>Container</CODE></A>.</TD>
-</TR>
-</TABLE>
-
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Enum Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/google/inject/Scope.html" title="enum in com.google.inject">Scope</A></B></TD>
-<TD>Scope of an injected objects.</TD>
-</TR>
-</TABLE>
-
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Exception Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/google/inject/DependencyException.html" title="class in com.google.inject">DependencyException</A></B></TD>
-<TD>Thrown when a dependency is misconfigured.</TD>
-</TR>
-</TABLE>
-
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Annotation Types Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/google/inject/Inject.html" title="annotation in com.google.inject">Inject</A></B></TD>
-<TD>Annotates members and parameters which should have their value[s]
- injected.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/google/inject/Scoped.html" title="annotation in com.google.inject">Scoped</A></B></TD>
-<TD>Annotates a scoped implementation class.</TD>
-</TR>
-</TABLE>
-
-
-<P>
-<A NAME="package_description"><!-- --></A><H2>
-Package com.google.inject Description
-</H2>
-
-<P>
-<i>Guice</i> (pronounced "juice"). A lightweight dependency injection
- container. Features include:
-
- <ul>
- <li>constructor, method, and field injection</li>
- <li>static method and field injection</li>
- <li>circular reference support (including constructors if you depend upon
- interfaces)</li>
- <li>high performance</li>
- <li>externalize what needs to be and no more</li>
- </ul>
-<P>
-
-<P>
-<DL>
-</DL>
-<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="../../../com/google/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV PACKAGE
- NEXT PACKAGE</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../index.html?com/google/inject/package-summary.html" target="_top"><B>FRAMES</B></A>
- <A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>
- <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>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/javadoc/com/google/inject/package-tree.html b/javadoc/com/google/inject/package-tree.html
deleted file mode 100644
index f752217..0000000
--- a/javadoc/com/google/inject/package-tree.html
+++ /dev/null
@@ -1,171 +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.5.0_05) on Thu Aug 24 18:43:56 PDT 2006 -->
-<TITLE>
-com.google.inject Class Hierarchy (Guice 1.0 API)
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- parent.document.title="com.google.inject Class Hierarchy (Guice 1.0 API)";
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= 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="../../../com/google/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../index.html?com/google/inject/package-tree.html" target="_top"><B>FRAMES</B></A>
- <A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>
- <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>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-Hierarchy For Package com.google.inject
-</H2>
-</CENTER>
-<H2>
-Class Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">java.lang.Object<UL>
-<LI TYPE="circle">com.google.inject.<A HREF="../../../com/google/inject/ContainerBuilder.html" title="class in com.google.inject"><B>ContainerBuilder</B></A><LI TYPE="circle">java.lang.Throwable (implements java.io.Serializable)
-<UL>
-<LI TYPE="circle">java.lang.Exception<UL>
-<LI TYPE="circle">java.lang.RuntimeException<UL>
-<LI TYPE="circle">com.google.inject.<A HREF="../../../com/google/inject/DependencyException.html" title="class in com.google.inject"><B>DependencyException</B></A></UL>
-</UL>
-</UL>
-</UL>
-</UL>
-<H2>
-Interface Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">com.google.inject.<A HREF="../../../com/google/inject/Container.html" title="interface in com.google.inject"><B>Container</B></A><LI TYPE="circle">com.google.inject.<A HREF="../../../com/google/inject/ContainerBuilder.Command.html" title="interface in com.google.inject"><B>ContainerBuilder.Command</B></A><LI TYPE="circle">com.google.inject.<A HREF="../../../com/google/inject/Context.html" title="interface in com.google.inject"><B>Context</B></A><LI TYPE="circle">com.google.inject.<A HREF="../../../com/google/inject/Factory.html" title="interface in com.google.inject"><B>Factory</B></A><T><LI TYPE="circle">com.google.inject.<A HREF="../../../com/google/inject/Scope.Strategy.html" title="interface in com.google.inject"><B>Scope.Strategy</B></A></UL>
-<H2>
-Annotation Type Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">com.google.inject.<A HREF="../../../com/google/inject/Scoped.html" title="annotation in com.google.inject"><B>Scoped</B></A> (implements java.lang.annotation.Annotation)
-<LI TYPE="circle">com.google.inject.<A HREF="../../../com/google/inject/Inject.html" title="annotation in com.google.inject"><B>Inject</B></A> (implements java.lang.annotation.Annotation)
-</UL>
-<H2>
-Enum Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">java.lang.Object<UL>
-<LI TYPE="circle">java.lang.Enum<E> (implements java.lang.Comparable<T>, java.io.Serializable)
-<UL>
-<LI TYPE="circle">com.google.inject.<A HREF="../../../com/google/inject/Scope.html" title="enum in com.google.inject"><B>Scope</B></A></UL>
-</UL>
-</UL>
-<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="../../../com/google/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../index.html?com/google/inject/package-tree.html" target="_top"><B>FRAMES</B></A>
- <A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>
- <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>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/javadoc/constant-values.html b/javadoc/constant-values.html
deleted file mode 100644
index 3973d30..0000000
--- a/javadoc/constant-values.html
+++ /dev/null
@@ -1,166 +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.5.0_05) on Thu Aug 24 18:43:56 PDT 2006 -->
-<TITLE>
-Constant Field Values (Guice 1.0 API)
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- parent.document.title="Constant Field Values (Guice 1.0 API)";
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= 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="com/google/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="com/google/inject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="index.html?constant-values.html" target="_top"><B>FRAMES</B></A>
- <A HREF="constant-values.html" target="_top"><B>NO FRAMES</B></A>
- <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>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H1>
-Constant Field Values</H1>
-</CENTER>
-<HR SIZE="4" NOSHADE>
-<B>Contents</B><UL>
-<LI><A HREF="#com.google">com.google.*</A>
-</UL>
-
-<A NAME="com.google"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left"><FONT SIZE="+2">
-com.google.*</FONT></TH>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="3">com.google.inject.<A HREF="com/google/inject/Container.html" title="interface in com.google.inject">Container</A></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.google.inject.Container.DEFAULT_NAME"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public static final java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/google/inject/Container.html#DEFAULT_NAME">DEFAULT_NAME</A></CODE></TD>
-<TD ALIGN="right"><CODE>"default"</CODE></TD>
-</TR>
-</FONT></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<P>
-<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="com/google/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="com/google/inject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="index.html?constant-values.html" target="_top"><B>FRAMES</B></A>
- <A HREF="constant-values.html" target="_top"><B>NO FRAMES</B></A>
- <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>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/javadoc/deprecated-list.html b/javadoc/deprecated-list.html
deleted file mode 100644
index 750d057..0000000
--- a/javadoc/deprecated-list.html
+++ /dev/null
@@ -1,138 +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.5.0_05) on Thu Aug 24 18:43:56 PDT 2006 -->
-<TITLE>
-Deprecated List (Guice 1.0 API)
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- parent.document.title="Deprecated List (Guice 1.0 API)";
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= 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="com/google/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="com/google/inject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Deprecated</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="index.html?deprecated-list.html" target="_top"><B>FRAMES</B></A>
- <A HREF="deprecated-list.html" target="_top"><B>NO FRAMES</B></A>
- <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>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Deprecated API</B></H2>
-</CENTER>
-<HR SIZE="4" NOSHADE>
-<B>Contents</B><UL>
-</UL>
-
-<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="com/google/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="com/google/inject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Deprecated</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="index.html?deprecated-list.html" target="_top"><B>FRAMES</B></A>
- <A HREF="deprecated-list.html" target="_top"><B>NO FRAMES</B></A>
- <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>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/javadoc/help-doc.html b/javadoc/help-doc.html
deleted file mode 100644
index ae6a859..0000000
--- a/javadoc/help-doc.html
+++ /dev/null
@@ -1,205 +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.5.0_05) on Thu Aug 24 18:43:56 PDT 2006 -->
-<TITLE>
-API Help (Guice 1.0 API)
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- parent.document.title="API Help (Guice 1.0 API)";
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= 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="com/google/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="com/google/inject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Help</B></FONT> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="index.html?help-doc.html" target="_top"><B>FRAMES</B></A>
- <A HREF="help-doc.html" target="_top"><B>NO FRAMES</B></A>
- <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>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H1>
-How This API Document Is Organized</H1>
-</CENTER>
-This API (Application Programming Interface) document has pages corresponding to the items in the navigation bar, described as follows.<H3>
-Package</H3>
-<BLOCKQUOTE>
-
-<P>
-Each package has a page that contains a list of its classes and interfaces, with a summary for each. This page can contain four categories:<UL>
-<LI>Interfaces (italic)<LI>Classes<LI>Enums<LI>Exceptions<LI>Errors<LI>Annotation Types</UL>
-</BLOCKQUOTE>
-<H3>
-Class/Interface</H3>
-<BLOCKQUOTE>
-
-<P>
-Each class, interface, nested class and nested interface has its own separate page. Each of these pages has three sections consisting of a class/interface description, summary tables, and detailed member descriptions:<UL>
-<LI>Class inheritance diagram<LI>Direct Subclasses<LI>All Known Subinterfaces<LI>All Known Implementing Classes<LI>Class/interface declaration<LI>Class/interface description
-<P>
-<LI>Nested Class Summary<LI>Field Summary<LI>Constructor Summary<LI>Method Summary
-<P>
-<LI>Field Detail<LI>Constructor Detail<LI>Method Detail</UL>
-Each summary entry contains the first sentence from the detailed description for that item. The summary entries are alphabetical, while the detailed descriptions are in the order they appear in the source code. This preserves the logical groupings established by the programmer.</BLOCKQUOTE>
-</BLOCKQUOTE>
-<H3>
-Annotation Type</H3>
-<BLOCKQUOTE>
-
-<P>
-Each annotation type has its own separate page with the following sections:<UL>
-<LI>Annotation Type declaration<LI>Annotation Type description<LI>Required Element Summary<LI>Optional Element Summary<LI>Element Detail</UL>
-</BLOCKQUOTE>
-</BLOCKQUOTE>
-<H3>
-Enum</H3>
-<BLOCKQUOTE>
-
-<P>
-Each enum has its own separate page with the following sections:<UL>
-<LI>Enum declaration<LI>Enum description<LI>Enum Constant Summary<LI>Enum Constant Detail</UL>
-</BLOCKQUOTE>
-<H3>
-Tree (Class Hierarchy)</H3>
-<BLOCKQUOTE>
-There is a <A HREF="overview-tree.html">Class Hierarchy</A> page for all packages, plus a hierarchy for each package. Each hierarchy page contains a list of classes and a list of interfaces. The classes are organized by inheritance structure starting with <code>java.lang.Object</code>. The interfaces do not inherit from <code>java.lang.Object</code>.<UL>
-<LI>When viewing the Overview page, clicking on "Tree" displays the hierarchy for all packages.<LI>When viewing a particular package, class or interface page, clicking "Tree" displays the hierarchy for only that package.</UL>
-</BLOCKQUOTE>
-<H3>
-Deprecated API</H3>
-<BLOCKQUOTE>
-The <A HREF="deprecated-list.html">Deprecated API</A> page lists all of the API that have been deprecated. A deprecated API is not recommended for use, generally due to improvements, and a replacement API is usually given. Deprecated APIs may be removed in future implementations.</BLOCKQUOTE>
-<H3>
-Index</H3>
-<BLOCKQUOTE>
-The <A HREF="index-all.html">Index</A> contains an alphabetic list of all classes, interfaces, constructors, methods, and fields.</BLOCKQUOTE>
-<H3>
-Prev/Next</H3>
-These links take you to the next or previous class, interface, package, or related page.<H3>
-Frames/No Frames</H3>
-These links show and hide the HTML frames. All pages are available with or without frames.
-<P>
-<H3>
-Serialized Form</H3>
-Each serializable or externalizable class has a description of its serialization fields and methods. This information is of interest to re-implementors, not to developers using the API. While there is no link in the navigation bar, you can get to this information by going to any serialized class and clicking "Serialized Form" in the "See also" section of the class description.
-<P>
-<H3>
-Constant Field Values</H3>
-The <a href="constant-values.html">Constant Field Values</a> page lists the static final fields and their values.
-<P>
-<FONT SIZE="-1">
-<EM>
-This help file applies to API documentation generated using the standard doclet.</EM>
-</FONT>
-<BR>
-<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="com/google/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="com/google/inject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Help</B></FONT> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="index.html?help-doc.html" target="_top"><B>FRAMES</B></A>
- <A HREF="help-doc.html" target="_top"><B>NO FRAMES</B></A>
- <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>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/javadoc/index-all.html b/javadoc/index-all.html
deleted file mode 100644
index 3c20559..0000000
--- a/javadoc/index-all.html
+++ /dev/null
@@ -1,337 +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.5.0_05) on Thu Aug 24 18:43:56 PDT 2006 -->
-<TITLE>
-Index (Guice 1.0 API)
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="./stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- parent.document.title="Index (Guice 1.0 API)";
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= 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="./com/google/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="./com/google/inject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="./deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="./help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="./index.html?index-all.html" target="_top"><B>FRAMES</B></A>
- <A HREF="index-all.html" target="_top"><B>NO FRAMES</B></A>
- <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>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<A HREF="#_B_">B</A> <A HREF="#_C_">C</A> <A HREF="#_D_">D</A> <A HREF="#_F_">F</A> <A HREF="#_G_">G</A> <A HREF="#_I_">I</A> <A HREF="#_R_">R</A> <A HREF="#_S_">S</A> <A HREF="#_V_">V</A> <HR>
-<A NAME="_B_"><!-- --></A><H2>
-<B>B</B></H2>
-<DL>
-<DT><A HREF="./com/google/inject/ContainerBuilder.Command.html#build(com.google.inject.ContainerBuilder)"><B>build(ContainerBuilder)</B></A> -
-Method in interface com.google.inject.<A HREF="./com/google/inject/ContainerBuilder.Command.html" title="interface in com.google.inject">ContainerBuilder.Command</A>
-<DD>Contributes factories to the given builder.
-</DL>
-<HR>
-<A NAME="_C_"><!-- --></A><H2>
-<B>C</B></H2>
-<DL>
-<DT><A HREF="./com/google/inject/package-summary.html"><B>com.google.inject</B></A> - package com.google.inject<DD><i>Guice</i> (pronounced "juice").<DT><A HREF="./com/google/inject/ContainerBuilder.html#constant(java.lang.String, java.lang.String)"><B>constant(String, String)</B></A> -
-Method in class com.google.inject.<A HREF="./com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A>
-<DD>Maps a constant value to the given name.
-<DT><A HREF="./com/google/inject/ContainerBuilder.html#constant(java.lang.String, int)"><B>constant(String, int)</B></A> -
-Method in class com.google.inject.<A HREF="./com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A>
-<DD>Maps a constant value to the given name.
-<DT><A HREF="./com/google/inject/ContainerBuilder.html#constant(java.lang.String, long)"><B>constant(String, long)</B></A> -
-Method in class com.google.inject.<A HREF="./com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A>
-<DD>Maps a constant value to the given name.
-<DT><A HREF="./com/google/inject/ContainerBuilder.html#constant(java.lang.String, boolean)"><B>constant(String, boolean)</B></A> -
-Method in class com.google.inject.<A HREF="./com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A>
-<DD>Maps a constant value to the given name.
-<DT><A HREF="./com/google/inject/ContainerBuilder.html#constant(java.lang.String, double)"><B>constant(String, double)</B></A> -
-Method in class com.google.inject.<A HREF="./com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A>
-<DD>Maps a constant value to the given name.
-<DT><A HREF="./com/google/inject/ContainerBuilder.html#constant(java.lang.String, float)"><B>constant(String, float)</B></A> -
-Method in class com.google.inject.<A HREF="./com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A>
-<DD>Maps a constant value to the given name.
-<DT><A HREF="./com/google/inject/ContainerBuilder.html#constant(java.lang.String, short)"><B>constant(String, short)</B></A> -
-Method in class com.google.inject.<A HREF="./com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A>
-<DD>Maps a constant value to the given name.
-<DT><A HREF="./com/google/inject/ContainerBuilder.html#constant(java.lang.String, char)"><B>constant(String, char)</B></A> -
-Method in class com.google.inject.<A HREF="./com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A>
-<DD>Maps a constant value to the given name.
-<DT><A HREF="./com/google/inject/ContainerBuilder.html#constant(java.lang.String, java.lang.Class)"><B>constant(String, Class)</B></A> -
-Method in class com.google.inject.<A HREF="./com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A>
-<DD>Maps a class to the given name.
-<DT><A HREF="./com/google/inject/ContainerBuilder.html#constant(java.lang.String, E)"><B>constant(String, E)</B></A> -
-Method in class com.google.inject.<A HREF="./com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A>
-<DD>Maps an enum to the given name.
-<DT><A HREF="./com/google/inject/Container.html" title="interface in com.google.inject"><B>Container</B></A> - Interface in <A HREF="./com/google/inject/package-summary.html">com.google.inject</A><DD>Injects dependencies into constructors, methods and fields annotated with
- <A HREF="./com/google/inject/Inject.html" title="annotation in com.google.inject"><CODE>Inject</CODE></A>.<DT><A HREF="./com/google/inject/ContainerBuilder.html" title="class in com.google.inject"><B>ContainerBuilder</B></A> - Class in <A HREF="./com/google/inject/package-summary.html">com.google.inject</A><DD>Builds a dependency injection <A HREF="./com/google/inject/Container.html" title="interface in com.google.inject"><CODE>Container</CODE></A>.<DT><A HREF="./com/google/inject/ContainerBuilder.html#ContainerBuilder()"><B>ContainerBuilder()</B></A> -
-Constructor for class com.google.inject.<A HREF="./com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A>
-<DD>Constructs a new builder.
-<DT><A HREF="./com/google/inject/ContainerBuilder.Command.html" title="interface in com.google.inject"><B>ContainerBuilder.Command</B></A> - Interface in <A HREF="./com/google/inject/package-summary.html">com.google.inject</A><DD>Implemented by classes which participate in building a container.<DT><A HREF="./com/google/inject/ContainerBuilder.html#contains(java.lang.Class, java.lang.String)"><B>contains(Class<?>, String)</B></A> -
-Method in class com.google.inject.<A HREF="./com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A>
-<DD>Returns true if this builder contains a mapping for the given type and
- name.
-<DT><A HREF="./com/google/inject/ContainerBuilder.html#contains(java.lang.Class)"><B>contains(Class<?>)</B></A> -
-Method in class com.google.inject.<A HREF="./com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A>
-<DD>Convenience method. Equivalent to <code>contains(type,
- Container.DEFAULT_NAME)</code>.
-<DT><A HREF="./com/google/inject/Context.html" title="interface in com.google.inject"><B>Context</B></A> - Interface in <A HREF="./com/google/inject/package-summary.html">com.google.inject</A><DD>Context of the current injection.<DT><A HREF="./com/google/inject/ContainerBuilder.html#create(boolean)"><B>create(boolean)</B></A> -
-Method in class com.google.inject.<A HREF="./com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A>
-<DD>Creates a <A HREF="./com/google/inject/Container.html" title="interface in com.google.inject"><CODE>Container</CODE></A> instance.
-<DT><A HREF="./com/google/inject/Factory.html#create(com.google.inject.Context)"><B>create(Context)</B></A> -
-Method in interface com.google.inject.<A HREF="./com/google/inject/Factory.html" title="interface in com.google.inject">Factory</A>
-<DD>Creates an object to be injected.
-</DL>
-<HR>
-<A NAME="_D_"><!-- --></A><H2>
-<B>D</B></H2>
-<DL>
-<DT><A HREF="./com/google/inject/Container.html#DEFAULT_NAME"><B>DEFAULT_NAME</B></A> -
-Static variable in interface com.google.inject.<A HREF="./com/google/inject/Container.html" title="interface in com.google.inject">Container</A>
-<DD>Default dependency name.
-<DT><A HREF="./com/google/inject/DependencyException.html" title="class in com.google.inject"><B>DependencyException</B></A> - Exception in <A HREF="./com/google/inject/package-summary.html">com.google.inject</A><DD>Thrown when a dependency is misconfigured.<DT><A HREF="./com/google/inject/DependencyException.html#DependencyException(java.lang.String)"><B>DependencyException(String)</B></A> -
-Constructor for exception com.google.inject.<A HREF="./com/google/inject/DependencyException.html" title="class in com.google.inject">DependencyException</A>
-<DD>
-<DT><A HREF="./com/google/inject/DependencyException.html#DependencyException(java.lang.String, java.lang.Throwable)"><B>DependencyException(String, Throwable)</B></A> -
-Constructor for exception com.google.inject.<A HREF="./com/google/inject/DependencyException.html" title="class in com.google.inject">DependencyException</A>
-<DD>
-<DT><A HREF="./com/google/inject/DependencyException.html#DependencyException(java.lang.Throwable)"><B>DependencyException(Throwable)</B></A> -
-Constructor for exception com.google.inject.<A HREF="./com/google/inject/DependencyException.html" title="class in com.google.inject">DependencyException</A>
-<DD>
-</DL>
-<HR>
-<A NAME="_F_"><!-- --></A><H2>
-<B>F</B></H2>
-<DL>
-<DT><A HREF="./com/google/inject/ContainerBuilder.html#factory(java.lang.Class, java.lang.String, com.google.inject.Factory, com.google.inject.Scope)"><B>factory(Class<T>, String, Factory<? extends T>, Scope)</B></A> -
-Method in class com.google.inject.<A HREF="./com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A>
-<DD>Maps a factory to a given dependency type and name.
-<DT><A HREF="./com/google/inject/ContainerBuilder.html#factory(java.lang.Class, com.google.inject.Factory, com.google.inject.Scope)"><B>factory(Class<T>, Factory<? extends T>, Scope)</B></A> -
-Method in class com.google.inject.<A HREF="./com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A>
-<DD>Convenience method. Equivalent to <code>factory(type,
- Container.DEFAULT_NAME, factory, scope)</code>.
-<DT><A HREF="./com/google/inject/ContainerBuilder.html#factory(java.lang.Class, java.lang.String, com.google.inject.Factory)"><B>factory(Class<T>, String, Factory<? extends T>)</B></A> -
-Method in class com.google.inject.<A HREF="./com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A>
-<DD>Convenience method. Equivalent to <code>factory(type, name, factory,
- Scope.DEFAULT)</code>.
-<DT><A HREF="./com/google/inject/ContainerBuilder.html#factory(java.lang.Class, com.google.inject.Factory)"><B>factory(Class<T>, Factory<? extends T>)</B></A> -
-Method in class com.google.inject.<A HREF="./com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A>
-<DD>Convenience method. Equivalent to <code>factory(type,
- Container.DEFAULT_NAME, factory, Scope.DEFAULT)</code>.
-<DT><A HREF="./com/google/inject/ContainerBuilder.html#factory(java.lang.Class, java.lang.String, java.lang.Class, com.google.inject.Scope)"><B>factory(Class<T>, String, Class<? extends T>, Scope)</B></A> -
-Method in class com.google.inject.<A HREF="./com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A>
-<DD>Maps an implementation class to a given dependency type and name.
-<DT><A HREF="./com/google/inject/ContainerBuilder.html#factory(java.lang.Class, java.lang.String, java.lang.Class)"><B>factory(Class<T>, String, Class<? extends T>)</B></A> -
-Method in class com.google.inject.<A HREF="./com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A>
-<DD>Maps an implementation class to a given dependency type and name.
-<DT><A HREF="./com/google/inject/ContainerBuilder.html#factory(java.lang.Class, java.lang.Class)"><B>factory(Class<T>, Class<? extends T>)</B></A> -
-Method in class com.google.inject.<A HREF="./com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A>
-<DD>Convenience method. Equivalent to <code>factory(type,
- Container.DEFAULT_NAME, implementation)</code>.
-<DT><A HREF="./com/google/inject/ContainerBuilder.html#factory(java.lang.Class)"><B>factory(Class<T>)</B></A> -
-Method in class com.google.inject.<A HREF="./com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A>
-<DD>Convenience method. Equivalent to <code>factory(type,
- Container.DEFAULT_NAME, type)</code>.
-<DT><A HREF="./com/google/inject/ContainerBuilder.html#factory(java.lang.Class, java.lang.String)"><B>factory(Class<T>, String)</B></A> -
-Method in class com.google.inject.<A HREF="./com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A>
-<DD>Convenience method. Equivalent to <code>factory(type, name, type)</code>.
-<DT><A HREF="./com/google/inject/ContainerBuilder.html#factory(java.lang.Class, java.lang.Class, com.google.inject.Scope)"><B>factory(Class<T>, Class<? extends T>, Scope)</B></A> -
-Method in class com.google.inject.<A HREF="./com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A>
-<DD>Convenience method. Equivalent to <code>factory(type,
- Container.DEFAULT_NAME, implementation, scope)</code>.
-<DT><A HREF="./com/google/inject/ContainerBuilder.html#factory(java.lang.Class, com.google.inject.Scope)"><B>factory(Class<T>, Scope)</B></A> -
-Method in class com.google.inject.<A HREF="./com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A>
-<DD>Convenience method. Equivalent to <code>factory(type,
- Container.DEFAULT_NAME, type, scope)</code>.
-<DT><A HREF="./com/google/inject/ContainerBuilder.html#factory(java.lang.Class, java.lang.String, com.google.inject.Scope)"><B>factory(Class<T>, String, Scope)</B></A> -
-Method in class com.google.inject.<A HREF="./com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A>
-<DD>Convenience method. Equivalent to <code>factory(type, name, type,
- scope)</code>.
-<DT><A HREF="./com/google/inject/Factory.html" title="interface in com.google.inject"><B>Factory</B></A><<A HREF="./com/google/inject/Factory.html" title="type parameter in Factory">T</A>> - Interface in <A HREF="./com/google/inject/package-summary.html">com.google.inject</A><DD>A custom factory.<DT><A HREF="./com/google/inject/Scope.Strategy.html#findInRequest(java.lang.Class, java.lang.String, java.util.concurrent.Callable)"><B>findInRequest(Class<T>, String, Callable<? extends T>)</B></A> -
-Method in interface com.google.inject.<A HREF="./com/google/inject/Scope.Strategy.html" title="interface in com.google.inject">Scope.Strategy</A>
-<DD>Finds an object for the given type and name in the request scope.
-<DT><A HREF="./com/google/inject/Scope.Strategy.html#findInSession(java.lang.Class, java.lang.String, java.util.concurrent.Callable)"><B>findInSession(Class<T>, String, Callable<? extends T>)</B></A> -
-Method in interface com.google.inject.<A HREF="./com/google/inject/Scope.Strategy.html" title="interface in com.google.inject">Scope.Strategy</A>
-<DD>Finds an object for the given type and name in the session scope.
-<DT><A HREF="./com/google/inject/Scope.Strategy.html#findInWizard(java.lang.Class, java.lang.String, java.util.concurrent.Callable)"><B>findInWizard(Class<T>, String, Callable<? extends T>)</B></A> -
-Method in interface com.google.inject.<A HREF="./com/google/inject/Scope.Strategy.html" title="interface in com.google.inject">Scope.Strategy</A>
-<DD>Finds an object for the given type and name in the wizard scope.
-</DL>
-<HR>
-<A NAME="_G_"><!-- --></A><H2>
-<B>G</B></H2>
-<DL>
-<DT><A HREF="./com/google/inject/Context.html#getContainer()"><B>getContainer()</B></A> -
-Method in interface com.google.inject.<A HREF="./com/google/inject/Context.html" title="interface in com.google.inject">Context</A>
-<DD>Gets the <A HREF="./com/google/inject/Container.html" title="interface in com.google.inject"><CODE>Container</CODE></A>.
-<DT><A HREF="./com/google/inject/Container.html#getInstance(java.lang.Class, java.lang.String)"><B>getInstance(Class<T>, String)</B></A> -
-Method in interface com.google.inject.<A HREF="./com/google/inject/Container.html" title="interface in com.google.inject">Container</A>
-<DD>Gets an instance of the given dependency which was declared in
- <A HREF="./com/google/inject/ContainerBuilder.html" title="class in com.google.inject"><CODE>ContainerBuilder</CODE></A>.
-<DT><A HREF="./com/google/inject/Container.html#getInstance(java.lang.Class)"><B>getInstance(Class<T>)</B></A> -
-Method in interface com.google.inject.<A HREF="./com/google/inject/Container.html" title="interface in com.google.inject">Container</A>
-<DD>Convenience method. Equivalent to <code>getInstance(type,
- DEFAULT_NAME)</code>.
-<DT><A HREF="./com/google/inject/Context.html#getMember()"><B>getMember()</B></A> -
-Method in interface com.google.inject.<A HREF="./com/google/inject/Context.html" title="interface in com.google.inject">Context</A>
-<DD>Gets the field, method or constructor which is being injected.
-<DT><A HREF="./com/google/inject/Context.html#getName()"><B>getName()</B></A> -
-Method in interface com.google.inject.<A HREF="./com/google/inject/Context.html" title="interface in com.google.inject">Context</A>
-<DD>Gets the name of the injection specified by <A HREF="./com/google/inject/Inject.html#value()"><CODE>Inject.value()</CODE></A>.
-<DT><A HREF="./com/google/inject/Context.html#getScopeStrategy()"><B>getScopeStrategy()</B></A> -
-Method in interface com.google.inject.<A HREF="./com/google/inject/Context.html" title="interface in com.google.inject">Context</A>
-<DD>Gets the current scope strategy.
-<DT><A HREF="./com/google/inject/Context.html#getType()"><B>getType()</B></A> -
-Method in interface com.google.inject.<A HREF="./com/google/inject/Context.html" title="interface in com.google.inject">Context</A>
-<DD>Gets the type of the field or parameter which is being injected.
-</DL>
-<HR>
-<A NAME="_I_"><!-- --></A><H2>
-<B>I</B></H2>
-<DL>
-<DT><A HREF="./com/google/inject/Container.html#inject(java.lang.Object)"><B>inject(Object)</B></A> -
-Method in interface com.google.inject.<A HREF="./com/google/inject/Container.html" title="interface in com.google.inject">Container</A>
-<DD>Injects dependencies into the fields and methods of an existing object.
-<DT><A HREF="./com/google/inject/Container.html#inject(java.lang.Class)"><B>inject(Class<T>)</B></A> -
-Method in interface com.google.inject.<A HREF="./com/google/inject/Container.html" title="interface in com.google.inject">Container</A>
-<DD>Creates and injects a new instance of type <code>implementation</code>.
-<DT><A HREF="./com/google/inject/Inject.html" title="annotation in com.google.inject"><B>Inject</B></A> - Annotation Type in <A HREF="./com/google/inject/package-summary.html">com.google.inject</A><DD>Annotates members and parameters which should have their value[s]
- injected.<DT><A HREF="./com/google/inject/ContainerBuilder.html#injectStatics(java.lang.Class...)"><B>injectStatics(Class<?>...)</B></A> -
-Method in class com.google.inject.<A HREF="./com/google/inject/ContainerBuilder.html" title="class in com.google.inject">ContainerBuilder</A>
-<DD>Upon creation, the <A HREF="./com/google/inject/Container.html" title="interface in com.google.inject"><CODE>Container</CODE></A> will inject static fields and methods
- into the given classes.
-</DL>
-<HR>
-<A NAME="_R_"><!-- --></A><H2>
-<B>R</B></H2>
-<DL>
-<DT><A HREF="./com/google/inject/Container.html#removeScopeStrategy()"><B>removeScopeStrategy()</B></A> -
-Method in interface com.google.inject.<A HREF="./com/google/inject/Container.html" title="interface in com.google.inject">Container</A>
-<DD>Removes the scope strategy for the current thread.
-</DL>
-<HR>
-<A NAME="_S_"><!-- --></A><H2>
-<B>S</B></H2>
-<DL>
-<DT><A HREF="./com/google/inject/Scope.html" title="enum in com.google.inject"><B>Scope</B></A> - Enum in <A HREF="./com/google/inject/package-summary.html">com.google.inject</A><DD>Scope of an injected objects.<DT><A HREF="./com/google/inject/Scope.Strategy.html" title="interface in com.google.inject"><B>Scope.Strategy</B></A> - Interface in <A HREF="./com/google/inject/package-summary.html">com.google.inject</A><DD>Pluggable scoping strategy.<DT><A HREF="./com/google/inject/Scoped.html" title="annotation in com.google.inject"><B>Scoped</B></A> - Annotation Type in <A HREF="./com/google/inject/package-summary.html">com.google.inject</A><DD>Annotates a scoped implementation class.<DT><A HREF="./com/google/inject/Container.html#setScopeStrategy(com.google.inject.Scope.Strategy)"><B>setScopeStrategy(Scope.Strategy)</B></A> -
-Method in interface com.google.inject.<A HREF="./com/google/inject/Container.html" title="interface in com.google.inject">Container</A>
-<DD>Sets the scope strategy for the current thread.
-</DL>
-<HR>
-<A NAME="_V_"><!-- --></A><H2>
-<B>V</B></H2>
-<DL>
-<DT><A HREF="./com/google/inject/Scope.html#valueOf(java.lang.String)"><B>valueOf(String)</B></A> -
-Static method in enum com.google.inject.<A HREF="./com/google/inject/Scope.html" title="enum in com.google.inject">Scope</A>
-<DD>Returns the enum constant of this type with the specified name.
-<DT><A HREF="./com/google/inject/Scope.html#values()"><B>values()</B></A> -
-Static method in enum com.google.inject.<A HREF="./com/google/inject/Scope.html" title="enum in com.google.inject">Scope</A>
-<DD>Returns an array containing the constants of this enum type, in
-the order they're declared.
-</DL>
-<HR>
-<A HREF="#_B_">B</A> <A HREF="#_C_">C</A> <A HREF="#_D_">D</A> <A HREF="#_F_">F</A> <A HREF="#_G_">G</A> <A HREF="#_I_">I</A> <A HREF="#_R_">R</A> <A HREF="#_S_">S</A> <A HREF="#_V_">V</A>
-
-<!-- ======= 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="./com/google/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="./com/google/inject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="./deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="./help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="./index.html?index-all.html" target="_top"><B>FRAMES</B></A>
- <A HREF="index-all.html" target="_top"><B>NO FRAMES</B></A>
- <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>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/javadoc/index.html b/javadoc/index.html
deleted file mode 100644
index 1bbffb8..0000000
--- a/javadoc/index.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc on Thu Aug 24 18:43:56 PDT 2006-->
-<TITLE>
-Guice 1.0 API
-</TITLE>
-<SCRIPT type="text/javascript">
- targetPage = "" + window.location.search;
- if (targetPage != "" && targetPage != "undefined")
- targetPage = targetPage.substring(1);
- function loadFrames() {
- if (targetPage != "" && targetPage != "undefined")
- top.classFrame.location = top.targetPage;
- }
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-</HEAD>
-<FRAMESET cols="20%,80%" title="" onLoad="top.loadFrames()">
-<FRAME src="allclasses-frame.html" name="packageFrame" title="All classes and interfaces (except non-static nested types)">
-<FRAME src="com/google/inject/package-summary.html" name="classFrame" title="Package, class and interface descriptions" scrolling="yes">
-<NOFRAMES>
-<H2>
-Frame Alert</H2>
-
-<P>
-This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.
-<BR>
-Link to<A HREF="com/google/inject/package-summary.html">Non-frame version.</A>
-</NOFRAMES>
-</FRAMESET>
-</HTML>
diff --git a/javadoc/overview-tree.html b/javadoc/overview-tree.html
deleted file mode 100644
index 4129c4e..0000000
--- a/javadoc/overview-tree.html
+++ /dev/null
@@ -1,173 +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.5.0_05) on Thu Aug 24 18:43:56 PDT 2006 -->
-<TITLE>
-Class Hierarchy (Guice 1.0 API)
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- parent.document.title="Class Hierarchy (Guice 1.0 API)";
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= 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="com/google/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="index.html?overview-tree.html" target="_top"><B>FRAMES</B></A>
- <A HREF="overview-tree.html" target="_top"><B>NO FRAMES</B></A>
- <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>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-Hierarchy For All Packages</H2>
-</CENTER>
-<DL>
-<DT><B>Package Hierarchies:</B><DD><A HREF="com/google/inject/package-tree.html">com.google.inject</A></DL>
-<HR>
-<H2>
-Class Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">java.lang.Object<UL>
-<LI TYPE="circle">com.google.inject.<A HREF="com/google/inject/ContainerBuilder.html" title="class in com.google.inject"><B>ContainerBuilder</B></A><LI TYPE="circle">java.lang.Throwable (implements java.io.Serializable)
-<UL>
-<LI TYPE="circle">java.lang.Exception<UL>
-<LI TYPE="circle">java.lang.RuntimeException<UL>
-<LI TYPE="circle">com.google.inject.<A HREF="com/google/inject/DependencyException.html" title="class in com.google.inject"><B>DependencyException</B></A></UL>
-</UL>
-</UL>
-</UL>
-</UL>
-<H2>
-Interface Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">com.google.inject.<A HREF="com/google/inject/Container.html" title="interface in com.google.inject"><B>Container</B></A><LI TYPE="circle">com.google.inject.<A HREF="com/google/inject/ContainerBuilder.Command.html" title="interface in com.google.inject"><B>ContainerBuilder.Command</B></A><LI TYPE="circle">com.google.inject.<A HREF="com/google/inject/Context.html" title="interface in com.google.inject"><B>Context</B></A><LI TYPE="circle">com.google.inject.<A HREF="com/google/inject/Factory.html" title="interface in com.google.inject"><B>Factory</B></A><T><LI TYPE="circle">com.google.inject.<A HREF="com/google/inject/Scope.Strategy.html" title="interface in com.google.inject"><B>Scope.Strategy</B></A></UL>
-<H2>
-Annotation Type Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">com.google.inject.<A HREF="com/google/inject/Scoped.html" title="annotation in com.google.inject"><B>Scoped</B></A> (implements java.lang.annotation.Annotation)
-<LI TYPE="circle">com.google.inject.<A HREF="com/google/inject/Inject.html" title="annotation in com.google.inject"><B>Inject</B></A> (implements java.lang.annotation.Annotation)
-</UL>
-<H2>
-Enum Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">java.lang.Object<UL>
-<LI TYPE="circle">java.lang.Enum<E> (implements java.lang.Comparable<T>, java.io.Serializable)
-<UL>
-<LI TYPE="circle">com.google.inject.<A HREF="com/google/inject/Scope.html" title="enum in com.google.inject"><B>Scope</B></A></UL>
-</UL>
-</UL>
-<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="com/google/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT> </TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="index.html?overview-tree.html" target="_top"><B>FRAMES</B></A>
- <A HREF="overview-tree.html" target="_top"><B>NO FRAMES</B></A>
- <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>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/javadoc/package-list b/javadoc/package-list
deleted file mode 100644
index 00497ea..0000000
--- a/javadoc/package-list
+++ /dev/null
@@ -1 +0,0 @@
-com.google.inject
diff --git a/javadoc/resources/inherit.gif b/javadoc/resources/inherit.gif
deleted file mode 100644
index c814867..0000000
--- a/javadoc/resources/inherit.gif
+++ /dev/null
Binary files differ
diff --git a/javadoc/serialized-form.html b/javadoc/serialized-form.html
deleted file mode 100644
index 3b49bb1..0000000
--- a/javadoc/serialized-form.html
+++ /dev/null
@@ -1,155 +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.5.0_05) on Thu Aug 24 18:43:56 PDT 2006 -->
-<TITLE>
-Serialized Form (Guice 1.0 API)
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
- parent.document.title="Serialized Form (Guice 1.0 API)";
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= 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="com/google/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="com/google/inject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="index.html?serialized-form.html" target="_top"><B>FRAMES</B></A>
- <A HREF="serialized-form.html" target="_top"><B>NO FRAMES</B></A>
- <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>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H1>
-Serialized Form</H1>
-</CENTER>
-<HR SIZE="4" NOSHADE>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="center"><FONT SIZE="+2">
-<B>Package</B> <B>com.google.inject</B></FONT></TH>
-</TR>
-</TABLE>
-
-<P>
-<A NAME="com.google.inject.DependencyException"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Class <A HREF="com/google/inject/DependencyException.html" title="class in com.google.inject">com.google.inject.DependencyException</A> extends java.lang.RuntimeException implements Serializable</B></FONT></TH>
-</TR>
-</TABLE>
-
-<P>
-
-<P>
-<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="com/google/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="com/google/inject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A> </TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- PREV
- NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="index.html?serialized-form.html" target="_top"><B>FRAMES</B></A>
- <A HREF="serialized-form.html" target="_top"><B>NO FRAMES</B></A>
- <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>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/javadoc/stylesheet.css b/javadoc/stylesheet.css
deleted file mode 100644
index 6d31fdb..0000000
--- a/javadoc/stylesheet.css
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Javadoc style sheet */
-
-/* Define colors, fonts and other style attributes here to override the defaults */
-
-/* Page background color */
-body { background-color: #FFFFFF }
-
-/* Headings */
-h1 { font-size: 145% }
-
-/* Table colors */
-.TableHeadingColor { background: #CCCCFF } /* Dark mauve */
-.TableSubHeadingColor { background: #EEEEFF } /* Light mauve */
-.TableRowColor { background: #FFFFFF } /* White */
-
-/* Font used in left-hand frame lists */
-.FrameTitleFont { font-size: 100%; font-family: Helvetica, Arial, sans-serif }
-.FrameHeadingFont { font-size: 90%; font-family: Helvetica, Arial, sans-serif }
-.FrameItemFont { font-size: 90%; font-family: Helvetica, Arial, sans-serif }
-
-/* Navigation bar fonts and colors */
-.NavBarCell1 { background-color:#EEEEFF;} /* Light mauve */
-.NavBarCell1Rev { background-color:#00008B;} /* Dark Blue */
-.NavBarFont1 { font-family: Arial, Helvetica, sans-serif; color:#000000;}
-.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;}
-
-.NavBarCell2 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;}
-.NavBarCell3 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;}
-
diff --git a/src/com/google/inject/Binding.java b/src/com/google/inject/Binding.java
deleted file mode 100644
index ac5c060..0000000
--- a/src/com/google/inject/Binding.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Copyright (C) 2006 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.inject;
-
-/**
- * Binds an interface with a name to a scope and implementation.
- *
- * @author crazybob@google.com (Bob Lee)
- */
-public class Binding<T> {
-
-
-}
diff --git a/src/com/google/inject/BindingBuilder.java b/src/com/google/inject/BindingBuilder.java
deleted file mode 100644
index ec6e731..0000000
--- a/src/com/google/inject/BindingBuilder.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/**
- * Copyright (C) 2006 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.inject;
-
-import static com.google.inject.util.Objects.nonNull;
-import com.google.inject.util.Objects;
-
-import java.util.*;
-
-/**
- * Builds a binding.
- *
- * @author crazybob@google.com (Bob Lee)
- */
-public class BindingBuilder<T> {
-
- final SourceProvider sourceProvider;
- Key<T> key;
- Object source;
- InternalFactory<? extends T> factory;
- boolean eagerlyLoad = false;
-
- /**
- * Keeps error messages in order and prevents duplicates.
- */
- Set<ErrorMessage> errorMessages = new LinkedHashSet<ErrorMessage>();
-
- /**
- * Creates a new binding for the given key.
- */
- BindingBuilder(Key<T> key, SourceProvider sourceProvider) {
- this.key = nonNull(key, "key");
- this.sourceProvider = nonNull(sourceProvider, "sourceProvider");
- }
-
- /**
- * Specifies that this binding should load as soon as its scope loads. For
- * example, a singleton will load at startup.
- */
- public BindingBuilder<T> eagerlyLoad() {
- this.eagerlyLoad = true;
- return this;
- }
-
- /**
- * Sets the name of this dependency.
- */
- public BindingBuilder<T> named(String name) {
- if (!this.key.hasDefaultName()) {
- errorMessages.add(
- new ErrorMessage(source, "Name set more than once."));
- }
-
- this.key = this.key.rename(name);
- return this;
- }
-
- /**
- * Sets the implementation to the given class.
- */
- public <I extends T> BindingBuilder<T> to(Class<I> implementation) {
- ensureImplementationIsNotSet();
- this.factory = new DefaultFactory<I>(implementation);
- return this;
- }
-
- /**
- * Uses the given factory to create instances of the implementation.
- */
- public BindingBuilder<T> to(final Factory<? extends T> factory) {
- ensureImplementationIsNotSet();
-
- this.factory = new InternalFactory<T>() {
- public T create(InternalContext context) {
- try {
- Context externalContext = context.getExternalContext();
- return factory.create(externalContext);
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
-
- public String toString() {
- return factory.toString();
- }
- };
-
- return this;
- }
-
- /**
- * Sets the implementation to the given class.
- */
- public BindingBuilder<T> to(Key<? extends T> implementation) {
- ensureImplementationIsNotSet();
-// this.factory = new DefaultFactory<I>(implementation);
- return this;
- }
-
- private void ensureImplementationIsNotSet() {
- if (factory != null) {
- errorMessages.add(
- new ErrorMessage(source, "Implementation set more than once."));
- }
- }
-
- /**
- * Specifies the scope.
- */
- public BindingBuilder<T> in(Scope scope) {
- if (scope != null) {
- errorMessages.add(
- new ErrorMessage(source, "Scope set more than once."));
- }
-
- return this;
- }
-
- /**
- * Sets the source object. Useful for debugging. Contents may include the
- * name of the file and the line number this binding came from, a code
- * snippet, etc.
- */
- public BindingBuilder<T> from(Object source) {
- this.source = source;
- return this;
- }
-
- /**
- * Injects new instances of the specified implementation class.
- */
- private class DefaultFactory<I extends T> implements InternalFactory<I> {
-
- volatile ContainerImpl.ConstructorInjector<I> constructor;
-
- private final Class<I> implementation;
-
- public DefaultFactory(Class<I> implementation) {
- this.implementation = implementation;
- }
-
- @SuppressWarnings("unchecked")
- public I create(InternalContext context) {
- if (constructor == null) {
- this.constructor =
- context.getContainerImpl().getConstructor(implementation);
- }
- return (I) constructor.construct(context, key.getRawType());
- }
-
- public String toString() {
- return implementation.toString();
- }
- }
-}
diff --git a/src/com/google/inject/ConstantFactory.java b/src/com/google/inject/ConstantFactory.java
index d7379e3..35e6aa0 100644
--- a/src/com/google/inject/ConstantFactory.java
+++ b/src/com/google/inject/ConstantFactory.java
@@ -27,7 +27,7 @@
this.value = value;
}
- public T create(InternalContext ignored) {
+ public T get(InternalContext ignored) {
return value;
}
diff --git a/src/com/google/inject/ContainerBuilder.java b/src/com/google/inject/ContainerBuilder.java
index bfd5fea..655a677 100644
--- a/src/com/google/inject/ContainerBuilder.java
+++ b/src/com/google/inject/ContainerBuilder.java
@@ -16,442 +16,186 @@
package com.google.inject;
+import com.google.inject.util.Objects;
+import static com.google.inject.util.Objects.nonNull;
+
import java.lang.reflect.Member;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
-import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
+import java.util.Set;
+import java.util.LinkedHashSet;
import java.util.logging.Logger;
/**
- * Builds a dependency injection {@link Container}. The combination of
- * dependency type and name uniquely identifies a dependency mapping; you can
- * use the same name for two different types. Not safe for concurrent use.
+ * Builds a dependency injection {@link Container}. Binds {@link Key}s to
+ * implementations. For example, a binding implementation could be anything
+ * from a constant value to an object in the HTTP session.
*
- * <p>Adds the following factories by default:
+ * <p>Not safe for concurrent use.
+ *
+ * <p>Default bindings include:
*
* <ul>
- * <li>Injects the current {@link Container}.
- * <li>Injects the {@link Logger} for the injected member's declaring class.
+ * <li>The {@link Container} iself
+ * <li>The {@link Logger} for the class being injected
* </ul>
*
* <p>Converts constants as needed from {@code String} to any primitive type
- * in addition to {@code enum} and {@code Class}.
+ * in addition to {@code enum} and {@code Class<?>}.
*
* @author crazybob@google.com (Bob Lee)
*/
public final class ContainerBuilder {
- final Map<Key<?>, InternalFactory<?>> factories =
- new HashMap<Key<?>, InternalFactory<?>>();
- final List<InternalFactory<?>> singletonFactories =
- new ArrayList<InternalFactory<?>>();
+ final List<BindingBuilder<?>> bindingBuilders =
+ new ArrayList<BindingBuilder<?>>();
+ final List<ConstantBindingBuilder> constantBindingBuilders =
+ new ArrayList<ConstantBindingBuilder>();
+ final List<LinkedBindingBuilder<?>> linkedBindingBuilders =
+ new ArrayList<LinkedBindingBuilder<?>>();
+
final List<Class<?>> staticInjections = new ArrayList<Class<?>>();
+
boolean created;
+ /**
+ * Keeps error messages in order and prevents duplicates.
+ */
+ Set<ErrorMessage> errorMessages = new LinkedHashSet<ErrorMessage>();
+
private static final InternalFactory<Container> CONTAINER_FACTORY =
new InternalFactory<Container>() {
- public Container create(InternalContext context) {
+ public Container get(InternalContext context) {
return context.getContainer();
}
};
private static final InternalFactory<Logger> LOGGER_FACTORY =
new InternalFactory<Logger>() {
- public Logger create(InternalContext context) {
+ public Logger get(InternalContext context) {
Member member = context.getExternalContext().getMember();
return member == null ? Logger.getAnonymousLogger()
: Logger.getLogger(member.getDeclaringClass().getName());
}
};
+ static final String UNKNOWN_SOURCE = "[unknown source]";
+
/**
* Constructs a new builder.
*/
public ContainerBuilder() {
- // In the current container as the default Container implementation.
- factories.put(Key.get(Container.class, Key.DEFAULT_NAME),
- CONTAINER_FACTORY);
-
- // Inject the logger for the injected member's declaring class.
- factories.put(Key.get(Logger.class, Key.DEFAULT_NAME),
- LOGGER_FACTORY);
+ bind(Container.class).to(CONTAINER_FACTORY);
+ bind(Logger.class).to(LOGGER_FACTORY);
}
/**
- * Maps a dependency. All methods in this class ultimately funnel through
- * here.
+ * Creates a source object to be associated with a binding. Called by
+ * default for each binding. The default implementation returns {@code
+ * ContainerBuilder}'s caller's {@code StackTraceElement}.
+ *
+ * <p>If you plan on manually setting the source (say for example you've
+ * implemented an XML configuration), you might override this method and
+ * return {@code null} to avoid unnecessary overhead.
*/
- private <T> ContainerBuilder factory(final Key<T> key,
- InternalFactory<? extends T> factory, Scope scope) {
+ protected Object source() {
+ // Search up the stack until we find a class outside of this one.
+ for (StackTraceElement element : new Throwable().getStackTrace()) {
+ if (!element.getClassName().equals(ContainerBuilder.class.getName()))
+ return element;
+ }
+ throw new AssertionError();
+ }
+
+ /**
+ * Binds the given key.
+ */
+ public <T> BindingBuilder<T> bind(Key<T> key) {
ensureNotCreated();
- checkKey(key);
- final InternalFactory<? extends T> scopedFactory =
- scope.scopeFactory(key.getRawType(), key.getName(), factory);
- factories.put(key, scopedFactory);
- if (scope == Scope.SINGLETON) {
- singletonFactories.add(new InternalFactory<T>() {
- public T create(InternalContext context) {
- try {
- context.setExternalContext(ExternalContext.newInstance(
- null, key, context.getContainerImpl()));
- return scopedFactory.create(context);
- } finally {
- context.setExternalContext(null);
- }
- }
- });
- }
- return this;
+ BindingBuilder<T> builder = new BindingBuilder<T>(key).from(source());
+ bindingBuilders.add(builder);
+ return builder;
}
/**
- * Ensures a key isn't already mapped.
+ * Binds the given type.
*/
- private void checkKey(Key<?> key) {
- if (factories.containsKey(key)) {
- throw new DependencyException(
- "Dependency mapping for " + key + " already exists.");
- }
+ public <T> BindingBuilder<T> bind(TypeToken<T> typeToken) {
+ return bind(Key.get(typeToken));
}
/**
- * Maps a factory to a given dependency type and name.
- *
- * @param type of dependency
- * @param name of dependency
- * @param factory creates objects to inject
- * @param scope scope of injected instances
- * @return this builder
+ * Binds the given type.
*/
- public <T> ContainerBuilder factory(final Class<T> type, final String name,
- final Factory<? extends T> factory, Scope scope) {
- InternalFactory<T> internalFactory =
- new InternalFactory<T>() {
-
- public T create(InternalContext context) {
- try {
- Context externalContext = context.getExternalContext();
- return factory.create(externalContext);
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
-
- public String toString() {
- return new LinkedHashMap<String, Object>() {{
- put("type", type);
- put("name", name);
- put("factory", factory);
- }}.toString();
- }
- };
-
- return factory(Key.get(type, name), internalFactory, scope);
+ public <T> BindingBuilder<T> bind(Class<T> clazz) {
+ return bind(Key.get(clazz));
}
/**
- * Convenience method. Equivalent to {@code factory(type,
- * Container.DEFAULT_NAME, factory, scope)}.
- *
- * @see #factory(Class, String, Factory, Scope)
+ * Links the given key to another key effectively creating an alias for a
+ * binding.
*/
- public <T> ContainerBuilder factory(Class<T> type,
- Factory<? extends T> factory, Scope scope) {
- return factory(type, Key.DEFAULT_NAME, factory, scope);
+ public <T> LinkedBindingBuilder<T> link(Key<T> key) {
+ ensureNotCreated();
+ LinkedBindingBuilder<T> builder =
+ new LinkedBindingBuilder<T>(key).from(source());
+ linkedBindingBuilders.add(builder);
+ return builder;
}
/**
- * Convenience method. Equivalent to {@code factory(type, name, factory,
- * Scope.DEFAULT)}.
- *
- * @see #factory(Class, String, Factory, Scope)
+ * Binds a constant to the given name.
*/
- public <T> ContainerBuilder factory(Class<T> type, String name,
- Factory<? extends T> factory) {
- return factory(type, name, factory, Scope.DEFAULT);
+ public ConstantBindingBuilder bind(String name) {
+ ensureNotCreated();
+ return bind(name, source());
}
/**
- * Convenience method. Equivalent to {@code factory(type,
- * Container.DEFAULT_NAME, factory, Scope.DEFAULT)}.
- *
- * @see #factory(Class, String, Factory, Scope)
+ * Binds a constant to the given name from the given source.
*/
- public <T> ContainerBuilder factory(Class<T> type,
- Factory<? extends T> factory) {
- return factory(type, Key.DEFAULT_NAME, factory, Scope.DEFAULT);
+ private ConstantBindingBuilder bind(String name, Object source) {
+ ConstantBindingBuilder builder =
+ new ConstantBindingBuilder(Objects.nonNull(name, "name")).from(source);
+ constantBindingBuilders.add(builder);
+ return builder;
}
/**
- * Maps an implementation class to a given dependency type and name. Creates
- * instances using the container, recursively injecting dependencies.
- *
- * @param type of dependency
- * @param name of dependency
- * @param implementation class
- * @param scope scope of injected instances
- * @return this builder
+ * Binds string constants based on the given properties.
*/
- public <T> ContainerBuilder factory(final Class<T> type, final String name,
- final Class<? extends T> implementation, final Scope scope) {
- // This factory creates new instances of the given implementation.
- // We have to lazy load the constructor because the Container
- // hasn't been created yet.
- InternalFactory<? extends T> factory = new InternalFactory<T>() {
-
- volatile ContainerImpl.ConstructorInjector<? extends T> constructor;
-
- @SuppressWarnings("unchecked")
- public T create(InternalContext context) {
- if (constructor == null) {
- this.constructor =
- context.getContainerImpl().getConstructor(implementation);
- }
- return (T) constructor.construct(context, type);
- }
-
- public String toString() {
- return new LinkedHashMap<String, Object>() {{
- put("type", type);
- put("name", name);
- put("implementation", implementation);
- put("scope", scope);
- }}.toString();
- }
- };
-
- return factory(Key.get(type, name), factory, scope);
- }
-
- /**
- * Maps an implementation class to a given dependency type and name. Creates
- * instances using the container, recursively injecting dependencies.
- *
- * <p>Sets scope to value from {@link Scoped} annotation on the
- * implementation class. Defaults to {@link Scope#DEFAULT} if no annotation
- * is found.
- *
- * @param type of dependency
- * @param name of dependency
- * @param implementation class
- * @return this builder
- */
- public <T> ContainerBuilder factory(final Class<T> type, String name,
- final Class<? extends T> implementation) {
- Scoped scoped = implementation.getAnnotation(Scoped.class);
- Scope scope = scoped == null ? Scope.DEFAULT : scoped.value();
- return factory(type, name, implementation, scope);
- }
-
- /**
- * Convenience method. Equivalent to {@code factory(type,
- * Container.DEFAULT_NAME, implementation)}.
- *
- * @see #factory(Class, String, Class)
- */
- public <T> ContainerBuilder factory(Class<T> type,
- Class<? extends T> implementation) {
- return factory(type, Key.DEFAULT_NAME, implementation);
- }
-
- /**
- * Convenience method. Equivalent to {@code factory(type,
- * Container.DEFAULT_NAME, type)}.
- *
- * @see #factory(Class, String, Class)
- */
- public <T> ContainerBuilder factory(Class<T> type) {
- return factory(type, Key.DEFAULT_NAME, type);
- }
-
- /**
- * Convenience method. Equivalent to {@code factory(type, name, type)}.
- *
- * @see #factory(Class, String, Class)
- */
- public <T> ContainerBuilder factory(Class<T> type, String name) {
- return factory(type, name, type);
- }
-
- /**
- * Convenience method. Equivalent to {@code factory(type,
- * Container.DEFAULT_NAME, implementation, scope)}.
- *
- * @see #factory(Class, String, Class, Scope)
- */
- public <T> ContainerBuilder factory(Class<T> type,
- Class<? extends T> implementation, Scope scope) {
- return factory(type, Key.DEFAULT_NAME, implementation, scope);
- }
-
- /**
- * Convenience method. Equivalent to {@code factory(type,
- * Container.DEFAULT_NAME, type, scope)}.
- *
- * @see #factory(Class, String, Class, Scope)
- */
- public <T> ContainerBuilder factory(Class<T> type, Scope scope) {
- return factory(type, Key.DEFAULT_NAME, type, scope);
- }
-
- /**
- * Convenience method. Equivalent to {@code factory(type, name, type,
- * scope)}.
- *
- * @see #factory(Class, String, Class, Scope)
- */
- public <T> ContainerBuilder factory(Class<T> type, String name, Scope scope) {
- return factory(type, name, type, scope);
- }
-
- /**
- * Maps constant names to values.
- */
- public ContainerBuilder properties(Map<String, String> properties) {
+ public ContainerBuilder bindProperties(Map<String, String> properties) {
+ ensureNotCreated();
+ Object source = source();
for (Map.Entry<String, String> entry : properties.entrySet()) {
- constant(entry.getKey(), entry.getValue());
+ String key = entry.getKey();
+ String value = entry.getValue();
+ bind(key, source).to(value);
}
return this;
}
/**
- * Maps constant names to values.
+ * Binds string constants based on the given properties.
*/
- public ContainerBuilder properties(Properties properties) {
- for (Map.Entry<Object, Object> entry : properties.entrySet()) {
- constant((String) entry.getKey(), (String) entry.getValue());
- }
- return this;
- }
-
- /**
- * Convenience method. Equivalent to {@code alias(type,
- * Container.DEFAULT_NAME, type)}.
- *
- * @see #alias(Class, String, String)
- */
- public <T> ContainerBuilder alias(Class<T> type, String alias) {
- return alias(type, Key.DEFAULT_NAME, alias);
- }
-
- /**
- * Maps an existing factory to a new name.
- *
- * @param type of dependency
- * @param name of dependency
- * @param alias of to the dependency
- * @return this builder
- */
- public <T> ContainerBuilder alias(Class<T> type, String name, String alias) {
- return alias(Key.get(type, name), Key.get(type, alias));
- }
-
- /**
- * Maps an existing dependency. All methods in this class ultimately funnel
- * through here.
- */
- @SuppressWarnings({"unchecked"})
- private <T> ContainerBuilder alias(final Key<T> key,
- final Key<T> aliasKey) {
+ public ContainerBuilder bindProperties(Properties properties) {
ensureNotCreated();
- checkKey(aliasKey);
-
- final InternalFactory<? extends T> scopedFactory =
- (InternalFactory<? extends T>) factories.get(key);
- if (scopedFactory == null) {
- throw new DependencyException(
- "Dependency mapping for " + key + " doesn't exists.");
+ Object source = source();
+ for (Map.Entry<Object, Object> entry : properties.entrySet()) {
+ String key = (String) entry.getKey();
+ String value = (String) entry.getValue();
+ bind(key, source).to(value);
}
- factories.put(aliasKey, scopedFactory);
return this;
}
/**
- * Maps a constant value to the given name.
- */
- public ContainerBuilder constant(String name, String value) {
- return constant(String.class, name, value);
- }
-
- /**
- * Maps a constant value to the given name.
- */
- public ContainerBuilder constant(String name, int value) {
- return constant(int.class, name, value);
- }
-
- /**
- * Maps a constant value to the given name.
- */
- public ContainerBuilder constant(String name, long value) {
- return constant(long.class, name, value);
- }
-
- /**
- * Maps a constant value to the given name.
- */
- public ContainerBuilder constant(String name, boolean value) {
- return constant(boolean.class, name, value);
- }
-
- /**
- * Maps a constant value to the given name.
- */
- public ContainerBuilder constant(String name, double value) {
- return constant(double.class, name, value);
- }
-
- /**
- * Maps a constant value to the given name.
- */
- public ContainerBuilder constant(String name, float value) {
- return constant(float.class, name, value);
- }
-
- /**
- * Maps a constant value to the given name.
- */
- public ContainerBuilder constant(String name, short value) {
- return constant(short.class, name, value);
- }
-
- /**
- * Maps a constant value to the given name.
- */
- public ContainerBuilder constant(String name, char value) {
- return constant(char.class, name, value);
- }
-
- /**
- * Maps a class to the given name.
- */
- public ContainerBuilder constant(String name, Class value) {
- return constant(Class.class, name, value);
- }
-
- /**
- * Maps an enum to the given name.
- */
- public <E extends Enum<E>> ContainerBuilder constant(String name, E value) {
- return constant(value.getDeclaringClass(), name, value);
- }
-
- /**
- * Maps a constant value to the given type and name.
- */
- public <T> ContainerBuilder constant(final Class<T> type, final String name,
- final T value) {
- InternalFactory<T> factory = new ConstantFactory<T>(value);
- return factory(Key.get(type, name), factory, Scope.DEFAULT);
- }
-
- /**
* Upon creation, the {@link Container} will inject static fields and methods
- * into the given classes.
+ * in the given classes.
*
* @param types for which static members will be injected
*/
@@ -461,19 +205,10 @@
}
/**
- * Returns true if this builder contains a mapping for the given type and
- * name.
+ * Adds an error message to be reported at creation time.
*/
- public boolean contains(Class<?> type, String name) {
- return factories.containsKey(Key.get(type, name));
- }
-
- /**
- * Convenience method. Equivalent to {@code contains(type,
- * Container.DEFAULT_NAME)}.
- */
- public boolean contains(Class<?> type) {
- return contains(type, Key.DEFAULT_NAME);
+ void add(ErrorMessage errorMessage) {
+ errorMessages.add(errorMessage);
}
/**
@@ -489,19 +224,87 @@
public Container create(boolean loadSingletons) {
ensureNotCreated();
created = true;
- final ContainerImpl container = new ContainerImpl(
- new HashMap<Key<?>, InternalFactory<?>>(factories));
+
+ HashMap<Key<?>, InternalFactory<?>> factories =
+ new HashMap<Key<?>, InternalFactory<?>>();
+
+ for (ConstantBindingBuilder builder : constantBindingBuilders) {
+ if (builder.hasValue()) {
+ factories.put(builder.getKey(), builder.getInternalFactory());
+ } else {
+ add(new ErrorMessage(builder.getSource(),
+ "Constant value isn't set."));
+ }
+ }
+
+ final List<ContainerImpl.ContextualCallable<Void>> singletonLoaders =
+ new ArrayList<ContainerImpl.ContextualCallable<Void>>();
+
+ for (BindingBuilder<?> builder : bindingBuilders) {
+ final Key<?> key = builder.getKey();
+ final InternalFactory<?> factory = builder.getInternalFactory();
+ factories.put(key, factory);
+
+ if (builder.isSingleton()) {
+ singletonLoaders.add(new ContainerImpl.ContextualCallable<Void>() {
+ public Void call(InternalContext context) {
+ context.setExternalContext(
+ ExternalContext.newInstance(null, key,
+ context.getContainerImpl()));
+ try {
+ factory.get(context);
+ return null;
+ } finally {
+ context.setExternalContext(null);
+ }
+ }
+ });
+ }
+ }
+
+ for (LinkedBindingBuilder<?> builder : linkedBindingBuilders) {
+ // TODO: Support alias to a later-declared alias.
+ Key<?> destination = builder.getDestination();
+ if (destination == null) {
+ add(new ErrorMessage(builder.getSource(),
+ "Link destination isn't set."));
+ continue;
+ }
+
+ InternalFactory<?> factory = factories.get(destination);
+ if (factory == null) {
+ add(new ErrorMessage(builder.getSource(),
+ "Destination of link binding not found: " + destination));
+ continue;
+ }
+
+ factories.put(builder.getKey(), factory);
+ }
+
+ // TODO: Handle this better.
+ if (!errorMessages.isEmpty()) {
+ for (ErrorMessage errorMessage : errorMessages) {
+ System.err.println(errorMessage);
+ throw new DependencyException("Configuration errors.");
+ }
+ }
+
+ final ContainerImpl container = new ContainerImpl(factories);
+
+ container.injectStatics(staticInjections);
+
if (loadSingletons) {
container.callInContext(new ContainerImpl.ContextualCallable<Void>() {
public Void call(InternalContext context) {
- for (InternalFactory<?> factory : singletonFactories) {
- factory.create(context);
+ for (ContainerImpl.ContextualCallable<Void> singletonLoader
+ : singletonLoaders) {
+ singletonLoader.call(context);
}
return null;
}
});
}
- container.injectStatics(staticInjections);
+
return container;
}
@@ -520,15 +323,359 @@
}
/**
- * Implemented by classes which participate in building a container.
+ * Implemented by classes which participate in building a container. Useful
+ * for encapsulating and reusing configuration logic.
*/
public interface Command {
/**
- * Contributes factories to the given builder.
- *
- * @param builder
+ * Configures the given builder.
*/
void build(ContainerBuilder builder);
}
+
+ /**
+ * Binds a {@link Key} to an implementation in a given scope.
+ */
+ public class BindingBuilder<T> implements SourceAware<BindingBuilder<T>> {
+
+ Object source = ContainerBuilder.UNKNOWN_SOURCE;
+ Key<T> key;
+ InternalFactory<? extends T> factory;
+ Scope scope;
+
+ BindingBuilder(Key<T> key) {
+ this.key = nonNull(key, "key");
+ }
+
+ Key<T> getKey() {
+ return key;
+ }
+
+ public BindingBuilder<T> from(Object source) {
+ this.source = source;
+ return this;
+ }
+
+ /**
+ * Sets the name of this binding.
+ */
+ public BindingBuilder<T> named(String name) {
+ if (!this.key.hasDefaultName()) {
+ add(new ErrorMessage(source, "Name set more than once."));
+ }
+
+ this.key = this.key.named(name);
+ return this;
+ }
+
+ /**
+ * Binds to instances of the given implementation class. The {@link
+ * Container} will inject the implementation instances as well. Sets the
+ * scope based on the @{@link Scoped} annotation on the implementation
+ * class if present.
+ */
+ public <I extends T> BindingBuilder<T> to(Class<I> implementation) {
+ return to(TypeToken.get(implementation));
+ }
+
+ /**
+ * Binds to instances of the given implementation type. The {@link
+ * Container} will inject the implementation instances as well. Sets the
+ * scope based on the @{@link Scoped} annotation on the implementation
+ * class if present.
+ */
+ public <I extends T> BindingBuilder<T> to(TypeToken<I> implementation) {
+ ensureImplementationIsNotSet();
+ this.factory = new DefaultFactory<I>(implementation);
+ setScopeFromType(implementation.getRawType());
+ return this;
+ }
+
+ private void setScopeFromType(Class<?> implementation) {
+ Scoped scoped = implementation.getAnnotation(Scoped.class);
+ if (scoped != null) {
+ in(scoped.value());
+ }
+ }
+
+ /**
+ * Binds to instances from the given factory.
+ */
+ public BindingBuilder<T> to(
+ final ContextualFactory<? extends T> factory) {
+ ensureImplementationIsNotSet();
+
+ this.factory = new InternalFactory<T>() {
+ public T get(InternalContext context) {
+ return factory.get(context.getExternalContext());
+ }
+
+ public String toString() {
+ return factory.toString();
+ }
+ };
+
+ return this;
+ }
+
+ /**
+ * Binds to instances from the given factory.
+ */
+ public BindingBuilder<T> to(final Factory<? extends T> factory) {
+ ensureImplementationIsNotSet();
+
+ this.factory = new InternalFactory<T>() {
+ public T get(InternalContext context) {
+ return factory.get();
+ }
+
+ public String toString() {
+ return factory.toString();
+ }
+ };
+
+ return this;
+ }
+
+ /**
+ * Binds to the given instance.
+ */
+ BindingBuilder<T> to(T instance) {
+ ensureImplementationIsNotSet();
+ this.factory = new ConstantFactory<T>(instance);
+ return this;
+ }
+
+ /**
+ * Binds to instances from the given factory.
+ */
+ BindingBuilder<T> to(final InternalFactory<? extends T> factory) {
+ ensureImplementationIsNotSet();
+ this.factory = factory;
+ return this;
+ }
+
+ /**
+ * Adds an error message if the implementation has already been bound.
+ */
+ private void ensureImplementationIsNotSet() {
+ if (factory != null) {
+ add(new ErrorMessage(source, "Implementation set more than once."));
+ }
+ }
+
+ /**
+ * Specifies the scope.
+ */
+ public BindingBuilder<T> in(Scope scope) {
+ if (this.scope != null) {
+ add(new ErrorMessage(source, "Scope set more than once."));
+ }
+
+ this.scope = scope;
+ return this;
+ }
+
+ InternalFactory<? extends T> getInternalFactory() {
+ // If an implementation wasn't specified, use the injection type.
+ if (this.factory == null) {
+ to(key.getTypeToken());
+ }
+
+ if (scope == null) {
+ return this.factory;
+ }
+
+ return scope.scopeFactory(key, this.factory);
+ }
+
+ boolean isSingleton() {
+ return this.scope == Scope.SINGLETON;
+ }
+
+ /**
+ * Injects new instances of the specified implementation class.
+ */
+ private class DefaultFactory<I extends T> implements InternalFactory<I> {
+
+ volatile ContainerImpl.ConstructorInjector<I> constructor;
+
+ private final TypeToken<I> implementation;
+
+ public DefaultFactory(TypeToken<I> implementation) {
+ // TODO: Ensure this is a concrete implementation.
+ this.implementation = implementation;
+ }
+
+ @SuppressWarnings("unchecked")
+ public I get(InternalContext context) {
+ if (constructor == null) {
+ this.constructor =
+ context.getContainerImpl().getConstructor(implementation);
+ }
+ return (I) constructor.construct(context, key.getRawType());
+ }
+
+ public String toString() {
+ return implementation.toString();
+ }
+ }
+ }
+
+ /**
+ * Builds a constant binding.
+ */
+ public class ConstantBindingBuilder
+ implements SourceAware<ConstantBindingBuilder> {
+
+ final String name;
+ Class<?> type;
+ Object value;
+ Object source = ContainerBuilder.UNKNOWN_SOURCE;
+
+ ConstantBindingBuilder(String name) {
+ this.name = name;
+ }
+
+ Key<?> getKey() {
+ return Key.get(type, name);
+ }
+
+ boolean hasValue() {
+ return type != null;
+ }
+
+ Object getSource() {
+ return source;
+ }
+
+ InternalFactory<?> getInternalFactory() {
+ return new ConstantFactory<Object>(value);
+ }
+
+ public ConstantBindingBuilder from(Object source) {
+ this.source = source;
+ return this;
+ }
+
+ /**
+ * Binds constant to the given value.
+ */
+ public ConstantBindingBuilder to(String value) {
+ return to(String.class, value);
+ }
+
+ /**
+ * Binds constant to the given value.
+ */
+ public ConstantBindingBuilder to(int value) {
+ return to(int.class, value);
+ }
+
+ /**
+ * Binds constant to the given value.
+ */
+ public ConstantBindingBuilder to(long value) {
+ return to(long.class, value);
+ }
+
+ /**
+ * Binds constant to the given value.
+ */
+ public ConstantBindingBuilder to(boolean value) {
+ return to(boolean.class, value);
+ }
+
+ /**
+ * Binds constant to the given value.
+ */
+ public ConstantBindingBuilder to(double value) {
+ return to(double.class, value);
+ }
+
+ /**
+ * Binds constant to the given value.
+ */
+ public ConstantBindingBuilder to(float value) {
+ return to(float.class, value);
+ }
+
+ /**
+ * Binds constant to the given value.
+ */
+ public ConstantBindingBuilder to(short value) {
+ return to(short.class, value);
+ }
+
+ /**
+ * Binds constant to the given value.
+ */
+ public ConstantBindingBuilder to(char value) {
+ return to(char.class, value);
+ }
+
+ /**
+ * Binds constant to the given value.
+ */
+ public ConstantBindingBuilder to(Class<?> value) {
+ return to(Class.class, value);
+ }
+
+ /**
+ * Binds constant to the given value.
+ */
+ public <E extends Enum<E>> ConstantBindingBuilder to(E value) {
+ return to(value.getDeclaringClass(), value);
+ }
+
+ /**
+ * Maps a constant value to the given type and name.
+ */
+ <T> ConstantBindingBuilder to(final Class<T> type, final T value) {
+ this.type = type;
+ this.value = value;
+ return this;
+ }
+ }
+
+ /**
+ * Links one binding to another.
+ */
+ public class LinkedBindingBuilder<T>
+ implements SourceAware<LinkedBindingBuilder<T>> {
+
+ Key<T> key;
+ Key<? extends T> destination;
+ Object source = ContainerBuilder.UNKNOWN_SOURCE;
+
+ LinkedBindingBuilder(Key<T> key) {
+ this.key = key;
+ }
+
+ Object getSource() {
+ return source;
+ }
+
+ Key<T> getKey() {
+ return key;
+ }
+
+ Key<? extends T> getDestination() {
+ return destination;
+ }
+
+ public LinkedBindingBuilder<T> from(Object source) {
+ this.source = source;
+ return this;
+ }
+
+ /**
+ * Links to another binding with the given key.
+ */
+ public LinkedBindingBuilder<T> to(Key<? extends T> destination) {
+ this.destination = destination;
+ return this;
+ }
+ }
}
diff --git a/src/com/google/inject/ContainerImpl.java b/src/com/google/inject/ContainerImpl.java
index 873fc30..68a6228 100644
--- a/src/com/google/inject/ContainerImpl.java
+++ b/src/com/google/inject/ContainerImpl.java
@@ -28,6 +28,7 @@
import java.lang.reflect.Member;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
+import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -74,7 +75,7 @@
// We don't need do pass in an InternalContext because we know this is
// a ConstantFactory which will not use it.
- String value = stringFactory.create(null);
+ String value = stringFactory.get(null);
// Do we need a primitive?
Converter<T> converter = (Converter<T>) PRIMITIVE_CONVERTERS.get(type);
@@ -219,7 +220,7 @@
this.field = field;
field.setAccessible(true);
- Key<?> key = Key.get(field.getType(), name);
+ Key<?> key = Key.get(field.getGenericType(), name);
factory = container.getFactory(field, key);
if (factory == null) {
throw new MissingDependencyException(
@@ -233,7 +234,7 @@
ExternalContext<?> previous = context.getExternalContext();
context.setExternalContext(externalContext);
try {
- field.set(o, factory.create(context));
+ field.set(o, factory.get(context));
} catch (IllegalAccessException e) {
throw new AssertionError(e);
} finally {
@@ -252,14 +253,14 @@
*/
<M extends AccessibleObject & Member> ParameterInjector<?>[]
getParametersInjectors(M member,
- Annotation[][] annotations, Class[] parameterTypes, String defaultName)
+ Annotation[][] annotations, Type[] parameterTypes, String defaultName)
throws MissingDependencyException {
List<ParameterInjector<?>> parameterInjectors =
new ArrayList<ParameterInjector<?>>();
Iterator<Annotation[]> annotationsIterator =
Arrays.asList(annotations).iterator();
- for (Class<?> parameterType : parameterTypes) {
+ for (Type parameterType : parameterTypes) {
Inject annotation = findInject(annotationsIterator.next());
String name = annotation == null ? defaultName : annotation.value();
Key<?> key = Key.get(parameterType, name);
@@ -311,7 +312,7 @@
this.method = method;
method.setAccessible(true);
- Class<?>[] parameterTypes = method.getParameterTypes();
+ Type[] parameterTypes = method.getGenericParameterTypes();
if (parameterTypes.length == 0) {
throw new DependencyException(
method + " has no parameters to inject.");
@@ -357,7 +358,7 @@
: container.getParametersInjectors(
constructor,
constructor.getParameterAnnotations(),
- constructor.getParameterTypes(),
+ constructor.getGenericParameterTypes(),
inject.value()
);
} catch (MissingDependencyException e) {
@@ -464,7 +465,7 @@
ExternalContext<?> previous = context.getExternalContext();
context.setExternalContext(externalContext);
try {
- return factory.create(context);
+ return factory.get(context);
} finally {
context.setExternalContext(previous);
}
@@ -513,7 +514,7 @@
if (factory == null) {
throw new DependencyException("Missing binding for " + key + ".");
}
- return factory.create(context);
+ return factory.get(context);
} finally {
context.setExternalContext(previous);
}
@@ -603,6 +604,11 @@
return constructors.get(implementation);
}
+ @SuppressWarnings("unchecked")
+ <T> ConstructorInjector<T> getConstructor(TypeToken<T> implementation) {
+ return constructors.get(implementation.getRawType());
+ }
+
final ThreadLocal<Scope.Strategy> localScopeStrategy =
new ThreadLocal<Scope.Strategy>();
diff --git a/src/com/google/inject/Scope2.java b/src/com/google/inject/ContextualFactory.java
similarity index 78%
rename from src/com/google/inject/Scope2.java
rename to src/com/google/inject/ContextualFactory.java
index 010f9e4..2664b68 100644
--- a/src/com/google/inject/Scope2.java
+++ b/src/com/google/inject/ContextualFactory.java
@@ -17,9 +17,16 @@
package com.google.inject;
/**
+ * Gets instances of {@code T}.
+ *
* @author crazybob@google.com (Bob Lee)
*/
-public interface Scope2 {
+public interface ContextualFactory<T> {
- <T> Factory<T> scope(Binding<T> binding);
+ /**
+ * Gets an instance of {@code T}.
+ *
+ * @param context of this call
+ */
+ T get(Context context);
}
diff --git a/src/com/google/inject/ErrorMessage.java b/src/com/google/inject/ErrorMessage.java
index 6fbbd6f..491e183 100644
--- a/src/com/google/inject/ErrorMessage.java
+++ b/src/com/google/inject/ErrorMessage.java
@@ -17,7 +17,6 @@
package com.google.inject;
import static com.google.inject.util.Objects.nonNull;
-import com.google.inject.util.Objects;
/**
* A configuration error.
@@ -34,6 +33,20 @@
this.message = nonNull(message, "message");
}
+ /**
+ * Gets the source of the configuration which resulted in this error message.
+ */
+ public Object getSource() {
+ return source;
+ }
+
+ /**
+ * Gets the error message text.
+ */
+ public String getMessage() {
+ return message;
+ }
+
public String toString() {
return source + " " + message;
}
diff --git a/src/com/google/inject/ExternalContext.java b/src/com/google/inject/ExternalContext.java
deleted file mode 100644
index c6a5e71..0000000
--- a/src/com/google/inject/ExternalContext.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * Copyright (C) 2006 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.inject;
-
-import java.lang.reflect.Member;
-import java.util.LinkedHashMap;
-
-/**
- * An immutable snapshot of the current context which is safe to
- * expose to client code.
- *
- * @author crazybob@google.com (Bob Lee)
- */
-class ExternalContext<T> implements Context {
-
- final Member member;
- final Key<T> key;
- final ContainerImpl container;
-
- public ExternalContext(Member member, Key<T> key, ContainerImpl container) {
- this.member = member;
- this.key = key;
- this.container = container;
- }
-
- public Class<T> getType() {
- return key.getRawType();
- }
-
- public Scope.Strategy getScopeStrategy() {
- return container.localScopeStrategy.get();
- }
-
- public Container getContainer() {
- return container;
- }
-
- public Member getMember() {
- return member;
- }
-
- public String getName() {
- return key.getName();
- }
-
- public String toString() {
- return "Context" + new LinkedHashMap<String, Object>() {{
- put("member", member);
- put("type", getType());
- put("name", getName());
- put("container", container);
- }}.toString();
- }
-
- static <T> ExternalContext<T> newInstance(Member member, Key<T> key,
- ContainerImpl container) {
- return new ExternalContext<T>(member, key, container);
- }
-}
diff --git a/src/com/google/inject/Factory.java b/src/com/google/inject/Factory.java
index 130488c..23666d2 100644
--- a/src/com/google/inject/Factory.java
+++ b/src/com/google/inject/Factory.java
@@ -17,18 +17,14 @@
package com.google.inject;
/**
- * A custom factory. Creates objects which will be injected.
+ * Gets instances of {@code T}.
*
* @author crazybob@google.com (Bob Lee)
*/
public interface Factory<T> {
/**
- * Creates an object to be injected.
- *
- * @param context of this injection
- * @return instance to be injected
- * @throws Exception if unable to create object
+ * Gets an instance of {@code T}.
*/
- T create(Context context) throws Exception;
+ T get();
}
diff --git a/src/com/google/inject/InternalFactory.java b/src/com/google/inject/InternalFactory.java
index fa5ec04..04d5829 100644
--- a/src/com/google/inject/InternalFactory.java
+++ b/src/com/google/inject/InternalFactory.java
@@ -29,5 +29,5 @@
* @param context of this injection
* @return instance to be injected
*/
- T create(InternalContext context);
+ T get(InternalContext context);
}
diff --git a/src/com/google/inject/Key.java b/src/com/google/inject/Key.java
index e80931e..32ffb43 100644
--- a/src/com/google/inject/Key.java
+++ b/src/com/google/inject/Key.java
@@ -24,14 +24,14 @@
* Binding key. A type token and a name. Matches the type and name ({@link
* Inject#value()}) at a point of injection.
*
- * <p>For example, {@code new Key<List<String>>("names") {}} will match:
+ * <p>For example, <tt>new Key<List<String>>("cities") {}</tt> will match:
*
- * <pre>
- * @Inject("names")
- * public void setList(List<String> list) {
+ * <tt>
+ * @Inject("cities")
+ * public void setList(List<String> cities) {
* ...
* }
- * </pre>
+ * </tt>
*
* @author crazybob@google.com (Bob Lee)
*/
@@ -105,7 +105,7 @@
/**
* Returns a new key with the same type as this key and the given name,
*/
- public Key<T> rename(String name) {
+ public Key<T> named(String name) {
return new SimpleKey<T>(this.typeToken, name);
}
@@ -158,7 +158,7 @@
/**
* Gets a key for a {@code Class} and a name.
*/
- public static <T> Key<T> get(Class<T> type, String name) {
+ static <T> Key<T> get(Class<T> type, String name) {
return new SimpleKey<T>(type, name);
}
@@ -172,7 +172,7 @@
/**
* Gets a key for a type and a name.
*/
- public static Key<?> get(Type type, String name) {
+ static Key<?> get(Type type, String name) {
return new SimpleKey<Object>(type, name);
}
@@ -186,7 +186,7 @@
/**
* Gets key for a type token and a name.
*/
- public static <T> Key<T> get(TypeToken<T> typeToken, String name) {
+ static <T> Key<T> get(TypeToken<T> typeToken, String name) {
return new SimpleKey<T>(typeToken, name);
}
diff --git a/src/com/google/inject/Scope.java b/src/com/google/inject/Scope.java
index 66a4d94..0db8887 100644
--- a/src/com/google/inject/Scope.java
+++ b/src/com/google/inject/Scope.java
@@ -29,7 +29,7 @@
* One instance per injection.
*/
DEFAULT {
- <T> InternalFactory<? extends T> scopeFactory(Class<T> type, String name,
+ <T> InternalFactory<? extends T> scopeFactory(Key<T> key,
InternalFactory<? extends T> factory) {
return factory;
}
@@ -39,14 +39,14 @@
* One instance per container.
*/
SINGLETON {
- <T> InternalFactory<? extends T> scopeFactory(Class<T> type, String name,
+ <T> InternalFactory<? extends T> scopeFactory(Key<T> key,
final InternalFactory<? extends T> factory) {
return new InternalFactory<T>() {
T instance;
- public T create(InternalContext context) {
+ public T get(InternalContext context) {
synchronized (context.getContainer()) {
if (instance == null) {
- instance = factory.create(context);
+ instance = factory.get(context);
}
return instance;
}
@@ -67,14 +67,14 @@
* eligible for garbage collection, i.e. memory leak.
*/
THREAD {
- <T> InternalFactory<? extends T> scopeFactory(Class<T> type, String name,
+ <T> InternalFactory<? extends T> scopeFactory(Key<T> key,
final InternalFactory<? extends T> factory) {
return new InternalFactory<T>() {
final ThreadLocal<T> threadLocal = new ThreadLocal<T>();
- public T create(final InternalContext context) {
+ public T get(final InternalContext context) {
T t = threadLocal.get();
if (t == null) {
- t = factory.create(context);
+ t = factory.get(context);
threadLocal.set(t);
}
return t;
@@ -91,14 +91,14 @@
* One instance per request.
*/
REQUEST {
- <T> InternalFactory<? extends T> scopeFactory(final Class<T> type,
- final String name, final InternalFactory<? extends T> factory) {
+ <T> InternalFactory<? extends T> scopeFactory(final Key<T> key,
+ final InternalFactory<? extends T> factory) {
return new InternalFactory<T>() {
- public T create(InternalContext context) {
+ public T get(InternalContext context) {
Strategy strategy = context.getScopeStrategy();
try {
return strategy.findInRequest(
- type, name, toCallable(context, factory));
+ key, toCallable(context, factory));
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -115,14 +115,14 @@
* One instance per session.
*/
SESSION {
- <T> InternalFactory<? extends T> scopeFactory(final Class<T> type,
- final String name, final InternalFactory<? extends T> factory) {
+ <T> InternalFactory<? extends T> scopeFactory(final Key<T> key,
+ final InternalFactory<? extends T> factory) {
return new InternalFactory<T>() {
- public T create(InternalContext context) {
+ public T get(InternalContext context) {
Strategy strategy = context.getScopeStrategy();
try {
return strategy.findInSession(
- type, name, toCallable(context, factory));
+ key, toCallable(context, factory));
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -139,14 +139,14 @@
* One instance per wizard.
*/
WIZARD {
- <T> InternalFactory<? extends T> scopeFactory(final Class<T> type,
- final String name, final InternalFactory<? extends T> factory) {
+ <T> InternalFactory<? extends T> scopeFactory(final Key<T> key,
+ final InternalFactory<? extends T> factory) {
return new InternalFactory<T>() {
- public T create(InternalContext context) {
+ public T get(InternalContext context) {
Strategy strategy = context.getScopeStrategy();
try {
return strategy.findInWizard(
- type, name, toCallable(context, factory));
+ key, toCallable(context, factory));
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -163,7 +163,7 @@
final InternalFactory<? extends T> factory) {
return new Callable<T>() {
public T call() throws Exception {
- return factory.create(context);
+ return factory.get(context);
}
};
}
@@ -172,7 +172,7 @@
* Wraps factory with scoping logic.
*/
abstract <T> InternalFactory<? extends T> scopeFactory(
- Class<T> type, String name, InternalFactory<? extends T> factory);
+ Key<T> key, InternalFactory<? extends T> factory);
/**
* Pluggable scoping strategy. Enables users to provide custom
@@ -186,21 +186,21 @@
* Finds an object for the given type and name in the request scope.
* Creates a new object if necessary using the given factory.
*/
- <T> T findInRequest(Class<T> type, String name,
+ <T> T findInRequest(Key<T> key,
Callable<? extends T> factory) throws Exception;
/**
* Finds an object for the given type and name in the session scope.
* Creates a new object if necessary using the given factory.
*/
- <T> T findInSession(Class<T> type, String name,
+ <T> T findInSession(Key<T> key,
Callable<? extends T> factory) throws Exception;
/**
* Finds an object for the given type and name in the wizard scope.
* Creates a new object if necessary using the given factory.
*/
- <T> T findInWizard(Class<T> type, String name,
+ <T> T findInWizard(Key<T> key,
Callable<? extends T> factory) throws Exception;
}
}
diff --git a/src/com/google/inject/Scope2.java b/src/com/google/inject/SourceAware.java
similarity index 69%
copy from src/com/google/inject/Scope2.java
copy to src/com/google/inject/SourceAware.java
index 010f9e4..d97572c 100644
--- a/src/com/google/inject/Scope2.java
+++ b/src/com/google/inject/SourceAware.java
@@ -17,9 +17,16 @@
package com.google.inject;
/**
+ * Implemented by classes which can remember their source.
+ *
* @author crazybob@google.com (Bob Lee)
*/
-public interface Scope2 {
+interface SourceAware<R> {
- <T> Factory<T> scope(Binding<T> binding);
+ /**
+ * Sets the source object. Useful for debugging. Contents may include the
+ * name of the file and the line number this binding came from, a code
+ * snippet, etc.
+ */
+ R from(Object source);
}
diff --git a/test/com/google/inject/CircularDependencyTest.java b/test/com/google/inject/CircularDependencyTest.java
index d0d54ee..caee7f3 100644
--- a/test/com/google/inject/CircularDependencyTest.java
+++ b/test/com/google/inject/CircularDependencyTest.java
@@ -27,9 +27,8 @@
public void testCircularlyDependentConstructors() {
ContainerBuilder builder = new ContainerBuilder();
- builder
- .factory(A.class, AImpl.class)
- .factory(B.class, BImpl.class);
+ builder.bind(A.class).to(AImpl.class);
+ builder.bind(B.class).to(BImpl.class);
Container container = builder.create(false);
A a = container.inject(AImpl.class);
diff --git a/test/com/google/inject/ConstantConversionTest.java b/test/com/google/inject/ConstantConversionTest.java
index 3c97ad3..971e742 100644
--- a/test/com/google/inject/ConstantConversionTest.java
+++ b/test/com/google/inject/ConstantConversionTest.java
@@ -58,7 +58,7 @@
}};
ContainerBuilder b = new ContainerBuilder();
- b.properties(properties);
+ b.bindProperties(properties);
Container c = b.create(false);
Foo foo = c.inject(Foo.class);
@@ -89,7 +89,7 @@
public void testInvalidInteger() {
ContainerBuilder b = new ContainerBuilder();
- b.constant("#", "invalid");
+ b.bind("#").to("invalid");
Container c = b.create(false);
try {
c.inject(InvalidInteger.class);
@@ -107,7 +107,7 @@
public void testInvalidCharacter() {
ContainerBuilder b = new ContainerBuilder();
- b.constant("foo", "invalid");
+ b.bind("foo").to("invalid");
Container c = b.create(false);
try {
c.inject(InvalidCharacter.class);
@@ -125,7 +125,7 @@
public void testInvalidEnum() {
ContainerBuilder b = new ContainerBuilder();
- b.constant("foo", "invalid");
+ b.bind("foo").to("invalid");
Container c = b.create(false);
try {
c.inject(InvalidEnum.class);
diff --git a/test/com/google/inject/ContainerTest.java b/test/com/google/inject/ContainerTest.java
index c4c38a5..67a1f4a 100644
--- a/test/com/google/inject/ContainerTest.java
+++ b/test/com/google/inject/ContainerTest.java
@@ -41,11 +41,10 @@
private Container createFooContainer() {
ContainerBuilder builder = new ContainerBuilder();
- builder
- .factory(Bar.class, BarImpl.class)
- .factory(Tee.class, TeeImpl.class)
- .constant("s", "test")
- .constant("i", 5);
+ builder.bind(Bar.class).to(BarImpl.class);
+ builder.bind(Tee.class).to(TeeImpl.class);
+ builder.bind("s").to("test");
+ builder.bind("i").to(5);
return builder.create(false);
}
@@ -127,9 +126,8 @@
public void testCircularlyDependentConstructors() {
ContainerBuilder builder = new ContainerBuilder();
- builder
- .factory(A.class, AImpl.class)
- .factory(B.class, BImpl.class);
+ builder.bind(A.class).to(AImpl.class);
+ builder.bind(B.class).to(BImpl.class);
Container container = builder.create(false);
A a = container.inject(AImpl.class);
@@ -166,11 +164,11 @@
}
public void testInjectStatics() {
- new ContainerBuilder()
- .constant("s", "test")
- .constant("i", 5)
- .injectStatics(Static.class)
- .create(false);
+ ContainerBuilder builder = new ContainerBuilder();
+ builder.bind("s").to("test");
+ builder.bind("i").to(5);
+ builder.injectStatics(Static.class);
+ builder.create(false);
assertEquals("test", Static.s);
assertEquals(5, Static.i);
diff --git a/test/com/google/inject/FactoryTest.java b/test/com/google/inject/FactoryTest.java
index a6e7d59..b5ef1fe 100644
--- a/test/com/google/inject/FactoryTest.java
+++ b/test/com/google/inject/FactoryTest.java
@@ -29,26 +29,27 @@
public void testInjection() throws Exception {
ContainerBuilder cb = new ContainerBuilder();
- // Called from get().
- cb.factory(Foo.class, createFactory(Foo.class, "default", null));
+ // Called from getInstance().
+ cb.bind(Foo.class).to(createFactory(Foo.class, "default", null));
// Called during singleton loading.
- cb.factory(Bar.class, "fooBar",
- createFactory(Bar.class, "fooBar", null), Scope.SINGLETON);
+ cb.bind(Bar.class)
+ .named("fooBar")
+ .to(createFactory(Bar.class, "fooBar", null))
+ .in(Scope.SINGLETON);
- cb.factory(Tee.class, "tee1",
- createFactory(Tee.class, "tee1",
+ cb.bind(Tee.class).named("tee1")
+ .to(createFactory(Tee.class, "tee1",
Bar.class.getDeclaredConstructor(Tee.class)));
- cb.factory(Tee.class, "tee2",
- createFactory(Tee.class, "tee2",
- Bar.class.getDeclaredField("tee2")));
+ cb.bind(Tee.class).named("tee2").to(
+ createFactory(Tee.class, "tee2", Bar.class.getDeclaredField("tee2")));
final Method execute = Tee.class.getDeclaredMethod(
"execute", Bob.class, Bob.class);
- cb.factory(Bob.class, "bob1",
+ cb.bind(Bob.class).named("bob1").to(
createFactory(Bob.class, "bob1", execute));
- cb.factory(Bob.class, "bob2",
+ cb.bind(Bob.class).named("bob2").to(
createFactory(Bob.class, "bob2", execute));
Container c = cb.create(true);
@@ -64,10 +65,10 @@
assertNotNull(foo.bar.tee2.bob2);
}
- <T> Factory<T> createFactory(final Class<T> type, final String name,
- final Member expectedMember) {
- return new Factory<T>() {
- public T create(Context context) throws Exception {
+ <T> ContextualFactory<T> createFactory(
+ final Class<T> type, final String name, final Member expectedMember) {
+ return new ContextualFactory<T>() {
+ public T get(Context context) {
assertEquals(expectedMember, context.getMember());
assertEquals(name, context.getName());
assertEquals(type, context.getType());
diff --git a/test/com/google/inject/KeyTest.java b/test/com/google/inject/KeyTest.java
index 90571e3..2e74f7b 100644
--- a/test/com/google/inject/KeyTest.java
+++ b/test/com/google/inject/KeyTest.java
@@ -1,4 +1,18 @@
-// Copyright 2006 Google Inc. All Rights Reserved.
+/**
+ * Copyright (C) 2006 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package com.google.inject;
diff --git a/test/com/google/inject/NotRequiredTest.java b/test/com/google/inject/NotRequiredTest.java
index 2f4f725..cc62cce 100644
--- a/test/com/google/inject/NotRequiredTest.java
+++ b/test/com/google/inject/NotRequiredTest.java
@@ -24,9 +24,9 @@
public class NotRequiredTest extends TestCase {
public void testProvided() {
- Container c = new ContainerBuilder()
- .factory(Bar.class)
- .create(false);
+ ContainerBuilder builder = new ContainerBuilder();
+ builder.bind(Bar.class);
+ Container c = builder.create(false);
Foo foo = c.inject(Foo.class);
assertNotNull(foo.bar);
assertNotNull(foo.fromMethod);
diff --git a/test/com/google/inject/SpringTest.java b/test/com/google/inject/SpringTest.java
index 859eaae..bfc288a 100644
--- a/test/com/google/inject/SpringTest.java
+++ b/test/com/google/inject/SpringTest.java
@@ -73,14 +73,17 @@
};
static final Callable<Foo> juiceFactory = new Callable<Foo>() {
+ final Container container;
+ {
+ ContainerBuilder builder = new ContainerBuilder();
+ builder.bind(Tee.class).to(TeeImpl.class);
+ builder.bind(Bar.class).to(BarImpl.class);
+ builder.bind(Foo.class).to(Foo.class);
+ builder.bind("i").to(5);
+ builder.bind("s").to("test");
- final Container container = new ContainerBuilder()
- .factory(Tee.class, TeeImpl.class)
- .factory(Bar.class, BarImpl.class)
- .factory(Foo.class, Foo.class)
- .constant("i", 5)
- .constant("s", "test")
- .create(false);
+ container = builder.create(false);
+ }
public Foo call() throws Exception {
return container.inject(Foo.class);
diff --git a/test/com/google/inject/StaticInjectionTest.java b/test/com/google/inject/StaticInjectionTest.java
index e14719b..85cca61 100644
--- a/test/com/google/inject/StaticInjectionTest.java
+++ b/test/com/google/inject/StaticInjectionTest.java
@@ -24,11 +24,12 @@
public class StaticInjectionTest extends TestCase {
public void testInjectStatics() {
- Container c = new ContainerBuilder()
- .constant("s", "test")
- .constant("i", 5)
- .injectStatics(StaticInjectionTest.Static.class)
- .create(false);
+ ContainerBuilder builder = new ContainerBuilder();
+ builder.bind("s").to("test");
+ builder.bind("i").to(5);
+ builder.injectStatics(StaticInjectionTest.Static.class);
+
+ Container c = builder.create(false);
assertEquals("test", StaticInjectionTest.Static.s);
assertEquals(5, StaticInjectionTest.Static.i);
diff --git a/test/com/google/inject/SuperclassTest.java b/test/com/google/inject/SuperclassTest.java
index 3ec47c0..b7de578 100644
--- a/test/com/google/inject/SuperclassTest.java
+++ b/test/com/google/inject/SuperclassTest.java
@@ -25,7 +25,7 @@
public void testSuperclassInjection() {
ContainerBuilder builder = new ContainerBuilder();
- builder.factory(Foo.class);
+ builder.bind(Foo.class);
Container container = builder.create(false);
Sub sub = container.inject(Sub.class);
sub = container.inject(Sub.class);
