Used cglib for critical constructor and method invocations boosting overall performance by about 40%.
git-svn-id: https://google-guice.googlecode.com/svn/trunk@22 d779f126-a31b-0410-b53b-1d3aecad763e
diff --git a/guice.iws b/guice.iws
index edd94e0..408c554 100644
--- a/guice.iws
+++ b/guice.iws
@@ -19,11 +19,10 @@
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
<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$/guice.ipr" afterPath="$PROJECT_DIR$/guice.ipr" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/guice.iml" afterPath="$PROJECT_DIR$/guice.iml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/guice.iws" afterPath="$PROJECT_DIR$/guice.iws" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/google/inject/InternalContext.java" afterPath="$PROJECT_DIR$/src/com/google/inject/InternalContext.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/google/inject/ContainerBuilder.java" afterPath="$PROJECT_DIR$/src/com/google/inject/ContainerBuilder.java" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/test/com/google/inject/SpringTest.java" afterPath="" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/com/google/inject/SpringPerformanceComparison.java" afterPath="$PROJECT_DIR$/test/com/google/inject/SpringPerformanceComparison.java" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/cglib-nodep-2.1_3.jar" />
</list>
</component>
<component name="ChangeListSynchronizer" />
@@ -193,91 +192,28 @@
</component>
<component name="FileEditorManager">
<leaf>
- <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="39" column="48" selection-start="1332" selection-end="1332" vertical-scroll-proportion="0.43355703">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <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="46" column="19" selection-start="1603" selection-end="1603" vertical-scroll-proportion="0.73020136">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <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="30" column="0" selection-start="953" selection-end="953" vertical-scroll-proportion="0.36510068">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="SuperclassTest.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/test/com/google/inject/SuperclassTest.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="30" column="19" selection-start="998" selection-end="998" vertical-scroll-proportion="0.36510068">
- <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="121" column="36" selection-start="3986" selection-end="3986" vertical-scroll-proportion="-11.253692">
+ <state line="483" column="19" selection-start="16109" selection-end="16109" vertical-scroll-proportion="0.8813097">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Constructor.java" pinned="false" current="false" current-in-tab="false">
- <entry file="jar:///usr/local/src.zip!/java/lang/reflect/Constructor.java">
+ <file leaf-file-name="FastClass.class" pinned="false" current="false" current-in-tab="false">
+ <entry file="jar://$PROJECT_DIR$/lib/cglib-nodep-2.1_3.jar!/net/sf/cglib/reflect/FastClass.class">
<provider selected="true" editor-type-id="text-editor">
- <state line="477" column="13" selection-start="18429" selection-end="18429" vertical-scroll-proportion="0.3328859">
+ <state line="12" column="47" selection-start="386" selection-end="386" vertical-scroll-proportion="0.26044568">
<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">
+ <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="57" column="7" selection-start="1471" selection-end="1471" vertical-scroll-proportion="0.3328859">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <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="44" column="12" selection-start="1353" selection-end="1353" vertical-scroll-proportion="0.022818793">
- <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="57" column="3" selection-start="1733" selection-end="1733" vertical-scroll-proportion="0.022818793">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <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="41" column="10" selection-start="1184" selection-end="1184" vertical-scroll-proportion="0.5704698">
+ <state line="28" column="3" selection-start="950" selection-end="950" vertical-scroll-proportion="0.18553889">
<folding />
</state>
</provider>
@@ -286,171 +222,7 @@
<file leaf-file-name="SpringPerformanceComparison.java" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/test/com/google/inject/SpringPerformanceComparison.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="85" column="0" selection-start="3146" selection-end="3146" vertical-scroll-proportion="0.7758389">
- <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">
- <provider selected="true" editor-type-id="text-editor">
- <state line="23" column="15" selection-start="731" selection-end="731" vertical-scroll-proportion="0.022818793">
- <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">
- <provider selected="true" editor-type-id="text-editor">
- <state line="28" column="50" selection-start="1030" selection-end="1030" vertical-scroll-proportion="0.022818793">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <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="574" column="16" selection-start="17215" selection-end="17215" vertical-scroll-proportion="12.504698">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="Module.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/com/google/inject/Module.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="26" column="5" selection-start="836" selection-end="836" vertical-scroll-proportion="0.2738255">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <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="59" column="32" selection-start="1529" selection-end="1529" vertical-scroll-proportion="1.0040269">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <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="30" column="11" selection-start="847" selection-end="847" vertical-scroll-proportion="0.36510068">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <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="30" column="5" selection-start="882" selection-end="882" vertical-scroll-proportion="0.36510068">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <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="47" column="17" selection-start="1297" selection-end="1297" vertical-scroll-proportion="0.6979866">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="Map.java" pinned="false" current="false" current-in-tab="false">
- <entry file="jar:///usr/local/src.zip!/java/util/Map.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="204" column="6" selection-start="10089" selection-end="10089" vertical-scroll-proportion="0.022818793">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="Scopes.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/com/google/inject/Scopes.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="19" column="16" selection-start="393" selection-end="393" vertical-scroll-proportion="0.43355703">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="SingletonScope.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/com/google/inject/SingletonScope.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="21" column="15" selection-start="481" selection-end="481" vertical-scroll-proportion="0.47919464">
- <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">
- <provider selected="true" editor-type-id="text-editor">
- <state line="88" column="0" selection-start="2454" selection-end="2454" vertical-scroll-proportion="1.224161">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="FactoryInjectionTest.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/test/com/google/inject/FactoryInjectionTest.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="15" column="23" selection-start="364" selection-end="364" vertical-scroll-proportion="0.34228188">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="GenericInjectionTest.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/test/com/google/inject/GenericInjectionTest.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="12" column="13" selection-start="225" selection-end="225" vertical-scroll-proportion="0.20536913">
- <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="39" column="5" selection-start="1109" selection-end="1109" vertical-scroll-proportion="0.5704698">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="ConfigurationException.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/com/google/inject/ConfigurationException.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="24" column="0" selection-start="802" selection-end="802" vertical-scroll-proportion="0.22818792">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="Binding.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/com/google/inject/Binding.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="9" column="10" selection-start="212" selection-end="212" vertical-scroll-proportion="0.20536913">
- <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">
- <provider selected="true" editor-type-id="text-editor">
- <state line="24" column="10" selection-start="778" selection-end="778" vertical-scroll-proportion="0.22818792">
+ <state line="109" column="15" selection-start="3779" selection-end="3779" vertical-scroll-proportion="0.44065484">
<folding />
</state>
</provider>
@@ -459,7 +231,16 @@
<file leaf-file-name="Scoped.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/google/inject/Scoped.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="31" column="18" selection-start="1024" selection-end="1024" vertical-scroll-proportion="0.31946307">
+ <state line="31" column="18" selection-start="1024" selection-end="1024" vertical-scroll-proportion="0.32469305">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="FastMethod.class" pinned="false" current="false" current-in-tab="false">
+ <entry file="jar://$PROJECT_DIR$/lib/cglib-nodep-2.1_3.jar!/net/sf/cglib/reflect/FastMethod.class">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="5" column="13" selection-start="158" selection-end="158" vertical-scroll-proportion="0.09470752">
<folding />
</state>
</provider>
@@ -628,7 +409,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/javadoc" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/lib" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -646,19 +427,11 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/javadoc" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/lib" />
<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="myItemId" value="PsiDirectory:$PROJECT_DIR$/lib/build" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -668,7 +441,7 @@
<option name="STATE" value="0" />
</component>
<component name="ProjectView">
- <navigator currentView="PackagesPane" proportions="0.16666667" version="1" splitterProportion="0.5">
+ <navigator currentView="ProjectPane" proportions="0.16666667" version="1" splitterProportion="0.5">
<flattenPackages PackagesPane="true" />
<showMembers />
<showModules PackagesPane="false" />
@@ -901,17 +674,17 @@
</component>
<component name="ToolWindowManager">
<frame x="4" y="44" width="1916" height="1156" extended-state="0" />
- <editor active="true" />
+ <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.3336904" 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="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.15854311" order="0" />
+ <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.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="true" weight="0.27909178" order="10" />
+ <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.27909178" 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.32890996" 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" />
@@ -919,7 +692,7 @@
<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.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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" 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="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39978448" order="0" />
@@ -1010,117 +783,115 @@
<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="0.16666667,0.5" version="1">
+ <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.16666667" version="1">
<option name="myPlainMode" value="false" />
- <option name="myLastEditedConfigurable" value="guice" />
+ <option name="myLastEditedConfigurable" value="cglib-nodep-2.1_3" />
</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="file://$PROJECT_DIR$/src/com/google/inject/InternalContext.java">
+ <entry file="file://$PROJECT_DIR$/src/com/google/inject/Scopes.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="47" column="17" selection-start="1297" selection-end="1297" vertical-scroll-proportion="0.6979866">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/com/google/inject/ConstructionContext.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="57" column="7" selection-start="1471" selection-end="1471" vertical-scroll-proportion="0.3328859">
+ <state line="19" column="16" selection-start="393" selection-end="393" vertical-scroll-proportion="0.43355703">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/test/com/google/inject/ContainerTest.java">
+ <entry file="file://$PROJECT_DIR$/src/com/google/inject/SingletonScope.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="57" column="3" selection-start="1733" selection-end="1733" vertical-scroll-proportion="0.022818793">
+ <state line="21" column="15" selection-start="481" selection-end="481" vertical-scroll-proportion="0.47919464">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/test/com/google/inject/CircularDependencyTest.java">
+ <entry file="file://$PROJECT_DIR$/src/com/google/inject/Container.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="41" column="10" selection-start="1184" selection-end="1184" vertical-scroll-proportion="0.5704698">
+ <state line="88" column="0" selection-start="2454" selection-end="2454" vertical-scroll-proportion="1.224161">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/com/google/inject/Key.java">
+ <entry file="file://$PROJECT_DIR$/test/com/google/inject/FactoryInjectionTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="23" column="15" selection-start="731" selection-end="731" vertical-scroll-proportion="0.022818793">
+ <state line="15" column="23" selection-start="364" selection-end="364" vertical-scroll-proportion="0.34228188">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/com/google/inject/TypeToken.java">
+ <entry file="file://$PROJECT_DIR$/test/com/google/inject/GenericInjectionTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="28" column="50" selection-start="1030" selection-end="1030" vertical-scroll-proportion="0.022818793">
+ <state line="12" column="13" selection-start="225" selection-end="225" vertical-scroll-proportion="0.20536913">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/com/google/inject/Module.java">
+ <entry file="file://$PROJECT_DIR$/src/com/google/inject/Context.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="26" column="5" selection-start="836" selection-end="836" vertical-scroll-proportion="0.2738255">
+ <state line="39" column="5" selection-start="1109" selection-end="1109" vertical-scroll-proportion="0.5704698">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/com/google/inject/ExternalContext.java">
+ <entry file="file://$PROJECT_DIR$/src/com/google/inject/ConfigurationException.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="59" column="32" selection-start="1529" selection-end="1529" vertical-scroll-proportion="1.0040269">
+ <state line="24" column="0" selection-start="802" selection-end="802" vertical-scroll-proportion="0.22818792">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/com/google/inject/ContextualFactory.java">
+ <entry file="file://$PROJECT_DIR$/src/com/google/inject/Binding.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="30" column="11" selection-start="847" selection-end="847" vertical-scroll-proportion="0.36510068">
+ <state line="9" column="10" selection-start="212" selection-end="212" vertical-scroll-proportion="0.20536913">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/test/com/google/inject/SuperclassTest.java">
+ <entry file="file://$PROJECT_DIR$/src/com/google/inject/SourceProvider.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="30" column="19" selection-start="998" selection-end="998" vertical-scroll-proportion="0.36510068">
+ <state line="24" column="10" selection-start="778" selection-end="778" vertical-scroll-proportion="0.22818792">
<folding />
</state>
</provider>
</entry>
- <entry file="jar:///usr/local/src.zip!/java/lang/reflect/Constructor.java">
+ <entry file="jar://$PROJECT_DIR$/lib/cglib-nodep-2.1_3.jar!/net/sf/cglib/reflect/FastMethod.class">
<provider selected="true" editor-type-id="text-editor">
- <state line="477" column="13" selection-start="18429" selection-end="18429" vertical-scroll-proportion="0.3328859">
+ <state line="5" column="13" selection-start="158" selection-end="158" vertical-scroll-proportion="0.09470752">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="jar://$PROJECT_DIR$/lib/cglib-nodep-2.1_3.jar!/net/sf/cglib/reflect/FastClass.class">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="12" column="47" selection-start="386" selection-end="386" vertical-scroll-proportion="0.26044568">
<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="121" column="36" selection-start="3986" selection-end="3986" vertical-scroll-proportion="-11.253692">
+ <state line="483" column="19" selection-start="16109" selection-end="16109" vertical-scroll-proportion="0.8813097">
<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="39" column="48" selection-start="1332" selection-end="1332" vertical-scroll-proportion="0.43355703">
+ <state line="28" column="3" selection-start="950" selection-end="950" vertical-scroll-proportion="0.18553889">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/com/google/inject/ContainerBuilder.java">
+ <entry file="file://$PROJECT_DIR$/src/com/google/inject/Scoped.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="574" column="16" selection-start="17215" selection-end="17215" vertical-scroll-proportion="12.504698">
+ <state line="31" column="18" selection-start="1024" selection-end="1024" vertical-scroll-proportion="0.32469305">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/test/com/google/inject/SpringPerformanceComparison.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="85" column="0" selection-start="3146" selection-end="3146" vertical-scroll-proportion="0.7758389">
+ <state line="109" column="15" selection-start="3779" selection-end="3779" vertical-scroll-proportion="0.44065484">
<folding />
</state>
</provider>