Restored Spring performance comparison to working order.
git-svn-id: https://google-guice.googlecode.com/svn/trunk@21 d779f126-a31b-0410-b53b-1d3aecad763e
diff --git a/guice.iws b/guice.iws
index 59d84b1..edd94e0 100644
--- a/guice.iws
+++ b/guice.iws
@@ -23,7 +23,7 @@
<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="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/com/google/inject/SpringPerformanceComparison.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/com/google/inject/SpringPerformanceComparison.java" afterPath="$PROJECT_DIR$/test/com/google/inject/SpringPerformanceComparison.java" />
</list>
</component>
<component name="ChangeListSynchronizer" />
@@ -196,7 +196,7 @@
<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.44065484">
+ <state line="39" column="48" selection-start="1332" selection-end="1332" vertical-scroll-proportion="0.43355703">
<folding />
</state>
</provider>
@@ -205,7 +205,7 @@
<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.74215555">
+ <state line="46" column="19" selection-start="1603" selection-end="1603" vertical-scroll-proportion="0.73020136">
<folding />
</state>
</provider>
@@ -214,7 +214,7 @@
<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.37107778">
+ <state line="30" column="0" selection-start="953" selection-end="953" vertical-scroll-proportion="0.36510068">
<folding />
</state>
</provider>
@@ -223,7 +223,7 @@
<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.37107778">
+ <state line="30" column="19" selection-start="998" selection-end="998" vertical-scroll-proportion="0.36510068">
<folding />
</state>
</provider>
@@ -232,7 +232,7 @@
<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.437926">
+ <state line="121" column="36" selection-start="3986" selection-end="3986" vertical-scroll-proportion="-11.253692">
<folding />
</state>
</provider>
@@ -241,7 +241,7 @@
<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">
<provider selected="true" editor-type-id="text-editor">
- <state line="477" column="13" selection-start="18429" selection-end="18429" vertical-scroll-proportion="0.3383356">
+ <state line="477" column="13" selection-start="18429" selection-end="18429" vertical-scroll-proportion="0.3328859">
<folding />
</state>
</provider>
@@ -250,7 +250,7 @@
<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="57" column="7" selection-start="1471" selection-end="1471" vertical-scroll-proportion="0.3383356">
+ <state line="57" column="7" selection-start="1471" selection-end="1471" vertical-scroll-proportion="0.3328859">
<folding />
</state>
</provider>
@@ -259,7 +259,7 @@
<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.023192361">
+ <state line="44" column="12" selection-start="1353" selection-end="1353" vertical-scroll-proportion="0.022818793">
<folding />
</state>
</provider>
@@ -268,7 +268,7 @@
<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.023192361">
+ <state line="57" column="3" selection-start="1733" selection-end="1733" vertical-scroll-proportion="0.022818793">
<folding />
</state>
</provider>
@@ -277,16 +277,16 @@
<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.579809">
+ <state line="41" column="10" selection-start="1184" selection-end="1184" vertical-scroll-proportion="0.5704698">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="SpringPerformanceComparison.java" pinned="false" current="false" current-in-tab="false">
+ <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="143" column="5" selection-start="4649" selection-end="4649" vertical-scroll-proportion="0.48294678">
+ <state line="85" column="0" selection-start="3146" selection-end="3146" vertical-scroll-proportion="0.7758389">
<folding />
</state>
</provider>
@@ -295,7 +295,7 @@
<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.023192361">
+ <state line="23" column="15" selection-start="731" selection-end="731" vertical-scroll-proportion="0.022818793">
<folding />
</state>
</provider>
@@ -304,16 +304,16 @@
<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.023192361">
+ <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="true" current-in-tab="true">
+ <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="563" column="0" selection-start="16827" selection-end="16827" vertical-scroll-proportion="0.21691678">
+ <state line="574" column="16" selection-start="17215" selection-end="17215" vertical-scroll-proportion="12.504698">
<folding />
</state>
</provider>
@@ -322,7 +322,7 @@
<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.27830833">
+ <state line="26" column="5" selection-start="836" selection-end="836" vertical-scroll-proportion="0.2738255">
<folding />
</state>
</provider>
@@ -331,7 +331,7 @@
<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.0204638">
+ <state line="59" column="32" selection-start="1529" selection-end="1529" vertical-scroll-proportion="1.0040269">
<folding />
</state>
</provider>
@@ -340,7 +340,7 @@
<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.37107778">
+ <state line="30" column="11" selection-start="847" selection-end="847" vertical-scroll-proportion="0.36510068">
<folding />
</state>
</provider>
@@ -349,7 +349,7 @@
<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.37107778">
+ <state line="30" column="5" selection-start="882" selection-end="882" vertical-scroll-proportion="0.36510068">
<folding />
</state>
</provider>
@@ -358,7 +358,7 @@
<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.70941335">
+ <state line="47" column="17" selection-start="1297" selection-end="1297" vertical-scroll-proportion="0.6979866">
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -369,7 +369,7 @@
<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.023192361">
+ <state line="204" column="6" selection-start="10089" selection-end="10089" vertical-scroll-proportion="0.022818793">
<folding />
</state>
</provider>
@@ -378,7 +378,7 @@
<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.44065484">
+ <state line="19" column="16" selection-start="393" selection-end="393" vertical-scroll-proportion="0.43355703">
<folding />
</state>
</provider>
@@ -387,7 +387,7 @@
<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.48703957">
+ <state line="21" column="15" selection-start="481" selection-end="481" vertical-scroll-proportion="0.47919464">
<folding />
</state>
</provider>
@@ -396,7 +396,7 @@
<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.2442019">
+ <state line="88" column="0" selection-start="2454" selection-end="2454" vertical-scroll-proportion="1.224161">
<folding />
</state>
</provider>
@@ -405,7 +405,7 @@
<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.3478854">
+ <state line="15" column="23" selection-start="364" selection-end="364" vertical-scroll-proportion="0.34228188">
<folding />
</state>
</provider>
@@ -414,7 +414,7 @@
<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.20873123">
+ <state line="12" column="13" selection-start="225" selection-end="225" vertical-scroll-proportion="0.20536913">
<folding />
</state>
</provider>
@@ -423,7 +423,7 @@
<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.579809">
+ <state line="39" column="5" selection-start="1109" selection-end="1109" vertical-scroll-proportion="0.5704698">
<folding />
</state>
</provider>
@@ -432,7 +432,7 @@
<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.2319236">
+ <state line="24" column="0" selection-start="802" selection-end="802" vertical-scroll-proportion="0.22818792">
<folding />
</state>
</provider>
@@ -441,7 +441,7 @@
<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.20873123">
+ <state line="9" column="10" selection-start="212" selection-end="212" vertical-scroll-proportion="0.20536913">
<folding />
</state>
</provider>
@@ -450,7 +450,7 @@
<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.2319236">
+ <state line="24" column="10" selection-start="778" selection-end="778" vertical-scroll-proportion="0.22818792">
<folding />
</state>
</provider>
@@ -459,7 +459,7 @@
<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.32469305">
+ <state line="31" column="18" selection-start="1024" selection-end="1024" vertical-scroll-proportion="0.31946307">
<folding />
</state>
</provider>
@@ -727,7 +727,7 @@
</key>
</component>
<component name="RestoreUpdateTree" />
- <component name="RunManager" selected="JUnit.AllTests">
+ <component name="RunManager" selected="Application.SpringPerformanceComparison">
<tempConfiguration default="false" name="AllTests" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
<pattern value="com.google.inject.*" />
<module name="guice" />
@@ -911,7 +911,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="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.27909178" order="10" />
+ <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="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 +919,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="true" weight="0.29044464" order="2" />
+ <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="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39978448" order="0" />
@@ -1020,7 +1020,7 @@
<component name="editorHistoryManager">
<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.70941335">
+ <state line="47" column="17" selection-start="1297" selection-end="1297" vertical-scroll-proportion="0.6979866">
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -1029,98 +1029,98 @@
</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.3383356">
+ <state line="57" column="7" selection-start="1471" selection-end="1471" vertical-scroll-proportion="0.3328859">
<folding />
</state>
</provider>
</entry>
<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.023192361">
+ <state line="57" column="3" selection-start="1733" selection-end="1733" vertical-scroll-proportion="0.022818793">
<folding />
</state>
</provider>
</entry>
<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.579809">
- <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="143" column="5" selection-start="4649" selection-end="4649" vertical-scroll-proportion="0.48294678">
+ <state line="41" column="10" selection-start="1184" selection-end="1184" vertical-scroll-proportion="0.5704698">
<folding />
</state>
</provider>
</entry>
<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.023192361">
+ <state line="23" column="15" selection-start="731" selection-end="731" vertical-scroll-proportion="0.022818793">
<folding />
</state>
</provider>
</entry>
<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.023192361">
+ <state line="28" column="50" selection-start="1030" selection-end="1030" vertical-scroll-proportion="0.022818793">
<folding />
</state>
</provider>
</entry>
<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.27830833">
+ <state line="26" column="5" selection-start="836" selection-end="836" vertical-scroll-proportion="0.2738255">
<folding />
</state>
</provider>
</entry>
<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.0204638">
+ <state line="59" column="32" selection-start="1529" selection-end="1529" vertical-scroll-proportion="1.0040269">
<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="30" column="11" selection-start="847" selection-end="847" vertical-scroll-proportion="0.37107778">
+ <state line="30" column="11" selection-start="847" selection-end="847" vertical-scroll-proportion="0.36510068">
<folding />
</state>
</provider>
</entry>
<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.37107778">
+ <state line="30" column="19" selection-start="998" selection-end="998" vertical-scroll-proportion="0.36510068">
<folding />
</state>
</provider>
</entry>
<entry file="jar:///usr/local/src.zip!/java/lang/reflect/Constructor.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="477" column="13" selection-start="18429" selection-end="18429" vertical-scroll-proportion="0.3383356">
+ <state line="477" column="13" selection-start="18429" selection-end="18429" vertical-scroll-proportion="0.3328859">
<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.437926">
+ <state line="121" column="36" selection-start="3986" selection-end="3986" vertical-scroll-proportion="-11.253692">
<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.44065484">
+ <state line="39" column="48" selection-start="1332" selection-end="1332" vertical-scroll-proportion="0.43355703">
<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="563" column="0" selection-start="16827" selection-end="16827" vertical-scroll-proportion="0.21691678">
+ <state line="574" column="16" selection-start="17215" selection-end="17215" vertical-scroll-proportion="12.504698">
+ <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">
<folding />
</state>
</provider>
diff --git a/test/com/google/inject/SpringPerformanceComparison.java b/test/com/google/inject/SpringPerformanceComparison.java
index 5224695..2fb1a77 100644
--- a/test/com/google/inject/SpringPerformanceComparison.java
+++ b/test/com/google/inject/SpringPerformanceComparison.java
@@ -83,7 +83,6 @@
builder.bind("s").to("test");
fooFactory = builder.create(false).getFactory(Key.get(Foo.class));
- fooFactory.get();
}
public Foo call() throws Exception {
@@ -101,29 +100,25 @@
}
public static void main(String[] args) throws Exception {
- for (int i = 0; i < 10000000; i++) {
- juiceFactory.call();
+ validate(springFactory);
+ validate(springFactory);
+ validate(juiceFactory);
+ validate(juiceFactory);
+
+ int count = 100000;
+ for (int i2 = 0; i2 < 10; i2++) {
+ long time = System.currentTimeMillis();
+ for (int i = 0; i < count; i++)
+ springFactory.call();
+ time = System.currentTimeMillis() - time;
+ System.err.println("Spring: " + count * 1000 / time + " creations/s");
+
+ time = System.currentTimeMillis();
+ for (int i = 0; i < count; i++)
+ juiceFactory.call();
+ time = System.currentTimeMillis() - time;
+ System.err.println("Guice: " + count * 1000 / time + " creations/s");
}
-// validate(springFactory);
-// validate(springFactory);
-// validate(juiceFactory);
-// validate(juiceFactory);
-//
-// System.err.println("Creations of Foo per second:");
-// int count = 100000;
-// for (int i2 = 0; i2 < 10; i2++) {
-// long time = System.currentTimeMillis();
-// for (int i = 0; i < count; i++)
-// springFactory.call();
-// time = System.currentTimeMillis() - time;
-// System.err.println("Spring: " + count * 1000 / time + "/s");
-//
-// time = System.currentTimeMillis();
-// for (int i = 0; i < count; i++)
-// juiceFactory.call();
-// time = System.currentTimeMillis() - time;
-// System.err.println("Guice: " + count * 1000 / time + "/s");
-// }
}
public static class Foo {