diff --git a/plugins/InspectionGadgets/InspectionGadgets.iml b/plugins/InspectionGadgets/InspectionGadgets.iml
index 42c4b537feb0..68bb23a99fe5 100644
--- a/plugins/InspectionGadgets/InspectionGadgets.iml
+++ b/plugins/InspectionGadgets/InspectionGadgets.iml
@@ -1,51 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="JAVA_MODULE">
+<module version="4" relativePaths="true" type="PLUGIN_MODULE">
+  <component name="DevKit.ModuleBuildProperties">
+    <option name="myJarPlugin" value="false" />
+    <option name="myPluginXMLPath" value="$MODULE_DIR$" />
+  </component>
+  <component name="DevKit.ModuleSandboxManager">
+    <option name="SANDBOX_NAME" value="3117-2" />
+  </component>
   <component name="ModuleRootManager" />
   <component name="NewModuleRootManager">
     <output url="file://$MODULE_DIR$/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$APPLICATION_HOME_DIR$/lib/jdom.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$APPLICATION_HOME_DIR$/lib/idea.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$APPLICATION_HOME_DIR$/lib/openapi.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$APPLICATION_HOME_DIR$/lib/junit.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
+    <orderEntry type="library" name="3117-2" level="IDEA_LIB_LAYER" />
     <orderEntryProperties />
   </component>
 </module>
diff --git a/plugins/InspectionGadgets/InspectionGadgets.ipr b/plugins/InspectionGadgets/InspectionGadgets.ipr
index 082f546d68d6..7dcc833edad6 100644
--- a/plugins/InspectionGadgets/InspectionGadgets.ipr
+++ b/plugins/InspectionGadgets/InspectionGadgets.ipr
@@ -18,8 +18,17 @@
   </component>
   <component name="BattleSpaces" />
   <component name="CodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS" />
-    <option name="USE_PER_PROJECT_SETTINGS" value="false" />
+    <option name="PER_PROJECT_SETTINGS">
+      <value>
+        <option name="GENERATE_FINAL_LOCALS" value="true" />
+        <option name="USE_FQ_CLASS_NAMES_IN_JAVADOC" value="false" />
+        <option name="IF_BRACE_FORCE" value="3" />
+        <option name="DOWHILE_BRACE_FORCE" value="3" />
+        <option name="WHILE_BRACE_FORCE" value="3" />
+        <option name="FOR_BRACE_FORCE" value="3" />
+      </value>
+    </option>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
   </component>
   <component name="CompilerConfiguration">
     <option name="DEFAULT_COMPILER" value="Javac" />
@@ -27,6 +36,7 @@
     <option name="DEPLOY_AFTER_MAKE" value="0" />
     <excludeFromCompile>
       <directory url="file://$PROJECT_DIR$/test" includeSubdirectories="true" />
+      <file url="file://$PROJECT_DIR$/src/com/siyeh/ig/confusing/Iterator.java" />
     </excludeFromCompile>
     <resourceExtensions>
       <entry name=".+\.(properties|xml|html|dtd|tld)" />
@@ -197,7 +207,7 @@
       <module fileurl="file://$PROJECT_DIR$/InspectionGadgets.iml" filepath="$PROJECT_DIR$/InspectionGadgets.iml" />
     </modules>
   </component>
-  <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="java version &quot;1.5.0-beta2&quot;" />
+  <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA 3144" />
   <component name="RmicSettings">
     <option name="IS_EANABLED" value="false" />
     <option name="DEBUGGING_INFO" value="true" />
@@ -206,16 +216,17 @@
     <option name="ADDITIONAL_OPTIONS_STRING" value="" />
   </component>
   <component name="com.siyeh.metrics.MetricsReloaded">
-    <option name="selectedProfile" value="Default" />
+    <option name="selectedProfile" value="TODOs" />
     <option name="autoscroll" value="false" />
     <option name="includeTestClasses" value="false" />
     <option name="flattenInnerClasses" value="false" />
-    <option name="cycleTableSpecificationString" value="" />
+    <option name="cycleTableSpecificationString" value="120,341,82,81,83,83,83,83" />
   </component>
   <component name="libraryTable" />
   <component name="uidesigner-configuration">
     <option name="INSTRUMENT_CLASSES" value="true" />
     <option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="true" />
   </component>
+  <UsedPathMacros />
 </project>
 
diff --git a/plugins/InspectionGadgets/InspectionGadgets.iws b/plugins/InspectionGadgets/InspectionGadgets.iws
index f0d19d1d7ef6..d90246a7f030 100644
--- a/plugins/InspectionGadgets/InspectionGadgets.iws
+++ b/plugins/InspectionGadgets/InspectionGadgets.iws
@@ -28,9 +28,9 @@
     <option name="DEFAULT_TEXT_FILE_SUBSTITUTION" value="kv" />
     <option name="PROCESS_UNKNOWN_FILES" value="false" />
     <option name="PROCESS_DELETED_FILES" value="false" />
+    <option name="PROCESS_IGNORED_FILES" value="false" />
     <option name="SHOW_EDIT_DIALOG" value="true" />
     <option name="RESERVED_EDIT" value="false" />
-    <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
     <option name="SHOW_CHECKOUT_OPTIONS" value="true" />
     <option name="CHECKOUT_DATE_OR_REVISION_SETTINGS">
       <value>
@@ -57,7 +57,6 @@
       </value>
     </option>
     <option name="SHOW_OUTPUT" value="false" />
-    <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
     <option name="ADD_WATCH_INDEX" value="0" />
     <option name="REMOVE_WATCH_INDEX" value="0" />
     <option name="UPDATE_KEYWORD_SUBSTITUTION" value="NONE" />
@@ -103,91 +102,91 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="ForCanBeForeachInspection.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/verbose/ForCanBeForeachInspection.java">
+      <file leaf-file-name="AutoBoxingInspection.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/verbose/AutoBoxingInspection.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="20" column="33" selection-start="0" selection-end="33877" vertical-scroll-proportion="0.03256705">
+            <state line="89" column="25" selection-start="3558" selection-end="3558" vertical-scroll-proportion="0.9112628">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PointlessArithmeticExpressionInspection.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/verbose/PointlessArithmeticExpressionInspection.java">
+      <file leaf-file-name="AutoUnboxingInspection.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/verbose/AutoUnboxingInspection.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="22" column="26" selection-start="779" selection-end="779" vertical-scroll-proportion="0.03256705">
+            <state line="98" column="34" selection-start="3872" selection-end="3872" vertical-scroll-proportion="0.8805461">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PointlessBitwiseExpressionInspection.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/verbose/PointlessBitwiseExpressionInspection.java">
+      <file leaf-file-name="ObjectEqualityInspection.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/bugs/ObjectEqualityInspection.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="23" column="30" selection-start="0" selection-end="8962" vertical-scroll-proportion="0.03256705">
+            <state line="133" column="50" selection-start="5245" selection-end="5245" vertical-scroll-proportion="0.67918086">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PointlessBooleanExpressionInspection.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/verbose/PointlessBooleanExpressionInspection.java">
+      <file leaf-file-name="FloatingPointEqualityInspection.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/bugs/FloatingPointEqualityInspection.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="20" column="45" selection-start="742" selection-end="742" vertical-scroll-proportion="0.03256705">
+            <state line="59" column="0" selection-start="2235" selection-end="2235" vertical-scroll-proportion="0.72696245">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="ReplaceAssignmentWithOperatorAssignmentInspection.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/verbose/ReplaceAssignmentWithOperatorAssignmentInspection.java">
+      <file leaf-file-name="MethodOverridesPrivateMethodInspection.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/visibility/MethodOverridesPrivateMethodInspection.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="16" column="26" selection-start="0" selection-end="4649" vertical-scroll-proportion="0.03256705">
+            <state line="69" column="69" selection-start="2625" selection-end="2625" vertical-scroll-proportion="0.91883117">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="UnnecessaryBoxingInspection.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/verbose/UnnecessaryBoxingInspection.java">
+      <file leaf-file-name="MethodOverridesStaticMethodInspection.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/visibility/MethodOverridesStaticMethodInspection.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="23" column="22" selection-start="0" selection-end="4562" vertical-scroll-proportion="0.03256705">
+            <state line="67" column="0" selection-start="2395" selection-end="2395" vertical-scroll-proportion="0.5032467">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="UnnecessaryParenthesesInspection.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/verbose/UnnecessaryParenthesesInspection.java">
+      <file leaf-file-name="EmptyStatementBodyInspection.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/bugs/EmptyStatementBodyInspection.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="21" column="42" selection-start="708" selection-end="708" vertical-scroll-proportion="0.03256705">
+            <state line="13" column="10" selection-start="418" selection-end="418" vertical-scroll-proportion="0.2901024">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="UnnecessaryThisInspection.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/verbose/UnnecessaryThisInspection.java">
+      <file leaf-file-name="AssignmentToNullInspection.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/bugs/AssignmentToNullInspection.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="21" column="41" selection-start="709" selection-end="709" vertical-scroll-proportion="0.03256705">
+            <state line="34" column="55" selection-start="1274" selection-end="1314" vertical-scroll-proportion="0.3447099">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="LocalVariableHidingMemberVariableInspection.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/visibility/LocalVariableHidingMemberVariableInspection.java">
+      <file leaf-file-name="ReturnNullInspection.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/bugs/ReturnNullInspection.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="26" column="71" selection-start="812" selection-end="812" vertical-scroll-proportion="0.03256705">
+            <state line="60" column="56" selection-start="862" selection-end="2137" vertical-scroll-proportion="1.4300342">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="IncompatibleMaskInspection.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/bugs/IncompatibleMaskInspection.java">
+      <file leaf-file-name="ClassUtils.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/psiutils/ClassUtils.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="20" column="57" selection-start="672" selection-end="672" vertical-scroll-proportion="0.03256705">
+            <state line="76" column="26" selection-start="2786" selection-end="2786" vertical-scroll-proportion="0.63139933">
               <folding />
             </state>
           </provider>
@@ -203,47 +202,69 @@
   <component name="InspectionManager">
     <option name="AUTOSCROLL_TO_SOURCE" value="false" />
     <option name="SPLITTER_PROPORTION" value="0.49470338" />
-    <profile name="QueryUpdate" />
+    <profile name="Default" />
   </component>
   <component name="J2EEProjectPane">
     <setting name="SHOW_AS_DEPLOYMENT_VIEW" value="false" />
   </component>
   <component name="ModuleEditorState">
     <option name="LAST_EDITED_MODULE_NAME" value="InspectionGadgets" />
-    <option name="LAST_EDITED_TAB_NAME" value="Paths" />
+    <option name="LAST_EDITED_TAB_NAME" value="Libraries (Classpath)" />
   </component>
   <component name="NamedScopeManager" />
   <component name="PackagesPane">
     <expanded_node url="" module="InspectionGadgets" type="module" />
   </component>
+  <component name="PerforceDirect.Settings">
+    <option name="useP4CONFIG" value="true" />
+    <option name="port" value="jasper:1666" />
+    <option name="client" value="" />
+    <option name="user" value="" />
+    <option name="passwd" value="" />
+    <option name="useExtDiff" value="false" />
+    <option name="extDiff" value="" />
+    <option name="showCmds" value="false" />
+    <option name="autoCheckoutAdd" value="true" />
+    <option name="promptCheckoutAdd" value="true" />
+    <option name="simpleP4Commands" value="false" />
+    <option name="useNativeApi" value="true" />
+    <option name="pathToExec" value="p4" />
+    <option name="useCustomPathToExec" value="false" />
+  </component>
   <component name="ProjectPane">
-    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ig/psiutils" module="InspectionGadgets" type="directory" />
-    <expanded_node url="" module="InspectionGadgets" type="module" />
-    <expanded_node url="file://$PROJECT_DIR$/test/com/siyeh/igtest/performance" module="InspectionGadgets" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ig/verbose" module="InspectionGadgets" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ig/imports" module="InspectionGadgets" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ig/portability" module="InspectionGadgets" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/test/com/siyeh/igtest/bugs" module="InspectionGadgets" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ig/junit" module="InspectionGadgets" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ig/naming" module="InspectionGadgets" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ig/performance" module="InspectionGadgets" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ig/serialization" module="InspectionGadgets" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ig/visibility" module="InspectionGadgets" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ig/threading" module="InspectionGadgets" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ig/confusing" module="InspectionGadgets" type="directory" />
     <expanded_node url="file://$PROJECT_DIR$/META-INF" module="InspectionGadgets" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/test" module="InspectionGadgets" type="directory" />
+    <expanded_node url="" module="InspectionGadgets" type="module" />
+    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ig/resources" module="InspectionGadgets" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ig/packaging" module="InspectionGadgets" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ig/serialization" module="InspectionGadgets" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ig/psiutils" module="InspectionGadgets" type="directory" />
     <expanded_node url="file://$PROJECT_DIR$/test/com/siyeh/igtest" module="InspectionGadgets" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/src/inspectionDescriptions" module="InspectionGadgets" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/test/com/siyeh/igtest/junit" module="InspectionGadgets" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ig" module="InspectionGadgets" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ig/abstraction" module="InspectionGadgets" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ig/bugs" module="InspectionGadgets" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ig/classlayout" module="InspectionGadgets" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/test/com/siyeh/igtest/threading" module="InspectionGadgets" type="directory" />
     <expanded_node url="file://$PROJECT_DIR$" module="InspectionGadgets" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/src" module="InspectionGadgets" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/test/com/siyeh/igtest/initialization" module="InspectionGadgets" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ig/abstraction" module="InspectionGadgets" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ig/fixes" module="InspectionGadgets" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/test" module="InspectionGadgets" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ig/performance" module="InspectionGadgets" type="directory" />
     <expanded_node url="file://$PROJECT_DIR$/test/com/siyeh/igtest/serialization" module="InspectionGadgets" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ig/threading" module="InspectionGadgets" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ig/bugs" module="InspectionGadgets" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/test/com/siyeh/igtest/cloneable" module="InspectionGadgets" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/test/com/siyeh/igtest/resources" module="InspectionGadgets" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ig/security" module="InspectionGadgets" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/src" module="InspectionGadgets" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/test/com/siyeh/igtest/naming" module="InspectionGadgets" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/test/com/siyeh/igtest/visibility2" module="InspectionGadgets" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ig/naming" module="InspectionGadgets" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/src/inspectionDescriptions" module="InspectionGadgets" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/test/com/siyeh/igtest/verbose" module="InspectionGadgets" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ig/confusing" module="InspectionGadgets" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ig/methodmetrics" module="InspectionGadgets" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ig/dependency" module="InspectionGadgets" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ig/initialization" module="InspectionGadgets" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ig" module="InspectionGadgets" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ig/verbose" module="InspectionGadgets" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ig/visibility" module="InspectionGadgets" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/test/com/siyeh/igtest/abstraction" module="InspectionGadgets" type="directory" />
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
@@ -262,107 +283,142 @@
     </navigator>
   </component>
   <component name="PropertiesComponent">
-    <property name="vcs_file_view_treeWidth2" value="47" />
-    <property name="GoToClass.includeJavaFiles" value="false" />
-    <property name="vcs_file_view_flatOrder1" value="1" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
+    <property name="vcs_file_view_treeWidth2" value="42" />
     <property name="vcs_file_view_treeOrder4" value="4" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="vcs_file_view_flatWidth2" value="53" />
-    <property name="vcs_file_view_flatWidth5" value="52" />
-    <property name="GoToClass.includeLibraries" value="false" />
+    <property name="cvs_file_history_treeWidth0" value="138" />
+    <property name="cvs_file_history_treeOrder4" value="4" />
+    <property name="cvs_file_history_flatWidth2" value="138" />
+    <property name="cvs_file_history_flatOrder4" value="4" />
+    <property name="cvs_file_history_flatOrder1" value="1" />
+    <property name="vcs_file_view_flatWidth2" value="20" />
+    <property name="cvs_file_history_flatWidth1" value="139" />
+    <property name="vcs_file_view_flatWidth5" value="20" />
     <property name="vcs_file_view_flatOrder3" value="3" />
+    <property name="cvs_file_history_flatOrder2" value="2" />
     <property name="MemberChooser.showClasses" value="true" />
-    <property name="vcs_file_view_treeWidth0" value="310" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
+    <property name="cvs_file_history_flatWidth4" value="138" />
+    <property name="vcs_file_view_treeWidth0" value="110" />
     <property name="vcs_file_view_treeOrder0" value="0" />
+    <property name="cvs_file_history_treeOrder5" value="5" />
     <property name="vcs_file_view_flatOrder4" value="4" />
     <property name="MemberChooser.sorted" value="false" />
+    <property name="RunManagerConfig.compileBeforeRunning" value="true" />
+    <property name="cvs_file_history_flatOrder0" value="0" />
+    <property name="cvs_file_history_treeWidth4" value="138" />
+    <property name="cvs_file_history_treeOrder3" value="3" />
+    <property name="vcs_file_view_flatWidth4" value="20" />
+    <property name="cvs_file_history_treeWidth6" value="138" />
+    <property name="vcs_file_view_flatOrder2" value="2" />
+    <property name="cvs_file_history_treeWidth3" value="139" />
+    <property name="vcs_file_view_treeWidth4" value="43" />
+    <property name="cvs_file_history_flatOrder6" value="6" />
+    <property name="vcs_file_view_treeWidth3" value="44" />
+    <property name="cvs_file_history_flatWidth3" value="139" />
+    <property name="vcs_file_view_flatOrder0" value="0" />
+    <property name="vcs_file_view_flatWidth0" value="187" />
+    <property name="vcs_file_view_flatWidth1" value="16" />
+    <property name="GoToClass.includeJavaFiles" value="false" />
+    <property name="MemberChooser.copyJavadoc" value="false" />
+    <property name="vcs_file_view_flatOrder1" value="1" />
+    <property name="cvs_file_history_treeOrder1" value="1" />
+    <property name="GoToFile.includeJavaFiles" value="false" />
+    <property name="cvs_file_history_treeWidth1" value="139" />
+    <property name="cvs_file_history_treeOrder6" value="6" />
+    <property name="GoToClass.includeLibraries" value="false" />
+    <property name="cvs_file_history_treeWidth2" value="138" />
+    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
+    <property name="cvs_file_history_flatOrder3" value="3" />
+    <property name="RunManagerConfig.showSettingsBeforeRunnig" value="false" />
+    <property name="cvs_file_history_flatWidth6" value="138" />
     <property name="vcs_file_view_flatOrder5" value="5" />
     <property name="vcs_file_view_treeOrder3" value="3" />
-    <property name="vcs_file_view_flatWidth4" value="53" />
-    <property name="vcs_file_view_treeWidth1" value="48" />
-    <property name="vcs_file_view_flatOrder2" value="2" />
-    <property name="vcs_file_view_treeWidth4" value="49" />
+    <property name="vcs_file_view_treeWidth1" value="43" />
+    <property name="cvs_file_history_flatOrder5" value="5" />
+    <property name="cvs_file_history_flatWidth5" value="139" />
+    <property name="cvs_file_history_treeOrder2" value="2" />
     <property name="vcs_file_view_treeOrder2" value="2" />
-    <property name="vcs_file_view_flatWidth3" value="54" />
-    <property name="vcs_file_view_treeWidth3" value="50" />
-    <property name="vcs_file_view_flatOrder0" value="0" />
-    <property name="vcs_file_view_flatWidth0" value="236" />
+    <property name="cvs_file_history_treeWidth5" value="139" />
+    <property name="vcs_file_view_flatWidth3" value="19" />
+    <property name="cvs_file_history_flatWidth0" value="138" />
     <property name="vcs_file_view_treeOrder1" value="1" />
-    <property name="vcs_file_view_flatWidth1" value="56" />
+    <property name="cvs_file_history_treeOrder0" value="0" />
   </component>
   <component name="PsiViewer.ProjectComponent">
     <option name="HIGHLIGHT" value="false" />
     <option name="FILTER_WHITESPACE" value="false" />
     <option name="SHOW_PROPERTIES" value="true" />
-    <option name="SPLIT_DIVIDER_POSITION" value="290" />
+    <option name="SPLIT_DIVIDER_POSITION" value="285" />
     <option name="AUTOSCROLL_TO_SOURCE" value="false" />
     <option name="AUTOSCROLL_FROM_SOURCE" value="false" />
   </component>
   <component name="RestoreUpdateTree" />
   <component name="RunManager">
-    <activeType name="Application" />
-    <configuration selected="false" default="true" type="#com.intellij.j2ee.web.jsr45.JSR45ConfigurationFactory" factoryName="Remote">
-      <option name="WORKING_DIRECTORY" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="7001" />
-      <option name="LOCAL" value="false" />
-      <option name="OPEN_IN_BROWSER" value="true" />
-      <option name="OPEN_IN_BROWSER_URL" value="/" />
-      <option name="COMMON_VM_ARGUMENTS" value="" />
-      <option name="JSP_PACKAGE" value="" />
-      <option name="VM_OPTS" value="VM_OPTS" />
-      <option name="LOCAL_PORT" value="80" />
-    </configuration>
-    <configuration selected="false" default="true" type="WebLogic Instance" factoryName="Remote">
-      <option name="WORKING_DIRECTORY" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="7001" />
-      <option name="LOCAL" value="false" />
-      <option name="OPEN_IN_BROWSER" value="true" />
-      <option name="OPEN_IN_BROWSER_URL" value="/" />
-      <option name="COMMON_VM_ARGUMENTS" value="" />
-      <option name="DOMAIN_PATH" value="" />
-      <option name="USER" value="weblogic" />
-      <option name="PASSWORD" value="weblogic" />
-      <option name="SERVER_NAME" value="myserver" />
-      <option name="DOMAIN_NAME" value="mydomain" />
-    </configuration>
-    <configuration selected="false" default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local">
-      <option name="WORKING_DIRECTORY" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="7001" />
-      <option name="LOCAL" value="true" />
-      <option name="OPEN_IN_BROWSER" value="true" />
-      <option name="OPEN_IN_BROWSER_URL" value="/" />
-      <option name="COMMON_VM_ARGUMENTS" value="" />
-    </configuration>
-    <configuration selected="false" default="true" type="JUnit" factoryName="JUnit">
-      <module name="" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
+    <activeType name="#org.jetbrains.idea.devkit.run.PluginConfigurationType" />
+    <tempConfiguration selected="false" default="false" name="VariablePassedAsArgumentVisitor" type="Application" factoryName="Application">
+      <option name="MAIN_CLASS_NAME" value="com.siyeh.ig.psiutils.VariablePassedAsArgumentVisitor" />
       <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ADDITIONAL_CLASS_PATH" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="wholeProject" />
-      </option>
+      <module name="InspectionGadgets" />
+      <RunnerSettings RunnerId="Run" />
+      <ConfigurationWrapper RunnerId="Run" />
+    </tempConfiguration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
     </configuration>
-    <configuration selected="false" default="true" type="#com.intellij.j2ee.web.jsr45.JSR45ConfigurationFactory" factoryName="Local">
-      <option name="WORKING_DIRECTORY" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="7001" />
-      <option name="LOCAL" value="true" />
-      <option name="OPEN_IN_BROWSER" value="true" />
-      <option name="OPEN_IN_BROWSER_URL" value="/" />
-      <option name="COMMON_VM_ARGUMENTS" value="" />
-      <option name="JSP_PACKAGE" value="" />
-      <option name="VM_OPTS" value="VM_OPTS" />
-      <option name="LOCAL_PORT" value="80" />
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="InspectionGadgets" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="InspectionGadgets" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="InspectionGadgets" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
     </configuration>
     <configuration selected="false" default="true" type="WebLogic Instance" factoryName="Local">
       <option name="WORKING_DIRECTORY" />
@@ -378,22 +434,89 @@
       <option name="SERVER_NAME" value="myserver" />
       <option name="DOMAIN_NAME" value="mydomain" />
     </configuration>
-    <configuration selected="false" default="true" type="Applet" factoryName="Applet">
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
       <module name="" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="HTML_FILE_NAME" />
-      <option name="HTML_USED" value="false" />
-      <option name="WIDTH" value="400" />
-      <option name="HEIGHT" value="300" />
-      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
-      <option name="VM_PARAMETERS" />
     </configuration>
-    <configuration selected="false" 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" />
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="InspectionGadgets" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#com.intellij.j2ee.web.jsr45.JSR45ConfigurationFactory" factoryName="Remote">
+      <option name="WORKING_DIRECTORY" />
       <option name="HOST" value="localhost" />
-      <option name="PORT" value="5005" />
+      <option name="PORT" value="7001" />
+      <option name="LOCAL" value="false" />
+      <option name="OPEN_IN_BROWSER" value="true" />
+      <option name="OPEN_IN_BROWSER_URL" value="/" />
+      <option name="COMMON_VM_ARGUMENTS" value="" />
+      <option name="JSP_PACKAGE" value="" />
+      <option name="VM_OPTS" value="VM_OPTS" />
+      <option name="LOCAL_PORT" value="80" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="InspectionGadgets" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="InspectionGadgets" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
     </configuration>
     <configuration selected="false" default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Remote">
       <option name="WORKING_DIRECTORY" />
@@ -404,6 +527,192 @@
       <option name="OPEN_IN_BROWSER_URL" value="/" />
       <option name="COMMON_VM_ARGUMENTS" value="" />
     </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="InspectionGadgets" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="InspectionGadgets" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="InspectionGadgets" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="InspectionGadgets" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="InspectionGadgets" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="InspectionGadgets" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="InspectionGadgets" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#com.intellij.j2ee.web.jsr45.JSR45ConfigurationFactory" factoryName="Local">
+      <option name="WORKING_DIRECTORY" />
+      <option name="HOST" value="localhost" />
+      <option name="PORT" value="7001" />
+      <option name="LOCAL" value="true" />
+      <option name="OPEN_IN_BROWSER" value="true" />
+      <option name="OPEN_IN_BROWSER_URL" value="/" />
+      <option name="COMMON_VM_ARGUMENTS" value="" />
+      <option name="JSP_PACKAGE" value="" />
+      <option name="VM_OPTS" value="VM_OPTS" />
+      <option name="LOCAL_PORT" value="80" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="InspectionGadgets" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="InspectionGadgets" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="InspectionGadgets" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="InspectionGadgets" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="InspectionGadgets" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="InspectionGadgets" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="InspectionGadgets" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
     <configuration selected="false" default="true" type="Application" factoryName="Application">
       <option name="MAIN_CLASS_NAME" />
       <option name="VM_PARAMETERS" />
@@ -411,27 +720,304 @@
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
       <module name="" />
     </configuration>
+    <configuration selected="false" 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 selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="InspectionGadgets" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="InspectionGadgets" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="InspectionGadgets" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="InspectionGadgets" />
+    </configuration>
+    <configuration selected="false" default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local">
+      <option name="WORKING_DIRECTORY" />
+      <option name="HOST" value="localhost" />
+      <option name="PORT" value="7001" />
+      <option name="LOCAL" value="true" />
+      <option name="OPEN_IN_BROWSER" value="true" />
+      <option name="OPEN_IN_BROWSER_URL" value="/" />
+      <option name="COMMON_VM_ARGUMENTS" value="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="WebLogic Instance" factoryName="Remote">
+      <option name="WORKING_DIRECTORY" />
+      <option name="HOST" value="localhost" />
+      <option name="PORT" value="7001" />
+      <option name="LOCAL" value="false" />
+      <option name="OPEN_IN_BROWSER" value="true" />
+      <option name="OPEN_IN_BROWSER_URL" value="/" />
+      <option name="COMMON_VM_ARGUMENTS" value="" />
+      <option name="DOMAIN_PATH" value="" />
+      <option name="USER" value="weblogic" />
+      <option name="PASSWORD" value="weblogic" />
+      <option name="SERVER_NAME" value="myserver" />
+      <option name="DOMAIN_NAME" value="mydomain" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="InspectionGadgets" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="JUnit" factoryName="JUnit">
+      <module name="" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ADDITIONAL_CLASS_PATH" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="wholeProject" />
+      </option>
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="InspectionGadgets" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="InspectionGadgets" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="InspectionGadgets" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="InspectionGadgets" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="Applet" factoryName="Applet">
+      <module name="" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="HTML_FILE_NAME" />
+      <option name="HTML_USED" value="false" />
+      <option name="WIDTH" value="400" />
+      <option name="HEIGHT" value="300" />
+      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+      <option name="VM_PARAMETERS" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="InspectionGadgets" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="InspectionGadgets" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="InspectionGadgets" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="InspectionGadgets" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="InspectionGadgets" />
+    </configuration>
+    <configuration selected="false" default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="InspectionGadgets" />
+    </configuration>
     <configuration selected="true" default="false" name="InspectionList" type="Application" factoryName="Application">
       <option name="MAIN_CLASS_NAME" value="com.siyeh.ig.InspectionGadgetsPlugin" />
       <option name="VM_PARAMETERS" value="" />
       <option name="PROGRAM_PARAMETERS" value="" />
       <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
       <module name="InspectionGadgets" />
+      <RunnerSettings RunnerId="Run" />
       <RunnerSettings RunnerId="Debug">
         <option name="DEBUG_PORT" value="1039" />
         <option name="TRANSPORT" value="0" />
         <option name="LOCAL" value="false" />
       </RunnerSettings>
-      <RunnerSettings RunnerId="Run" />
-      <ConfigurationWrapper RunnerId="Debug" />
       <ConfigurationWrapper RunnerId="Run" />
+      <ConfigurationWrapper RunnerId="Debug" />
+    </configuration>
+    <configuration selected="true" default="false" name="InspectionGadgets" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="InspectionGadgets" />
+      <RunnerSettings RunnerId="Run" />
+      <RunnerSettings RunnerId="Debug">
+        <option name="DEBUG_PORT" value="2924" />
+        <option name="TRANSPORT" value="0" />
+        <option name="LOCAL" value="true" />
+      </RunnerSettings>
+      <ConfigurationWrapper RunnerId="Run" />
+      <ConfigurationWrapper RunnerId="Debug" />
     </configuration>
   </component>
   <component name="SQL">
-    <export>
-      <html table="border: 1px solid black; border-spacing:0px" cell="border: 1px solid black" header="background: darkgrey; font-weight:bold; text-align: center" row1="background: white" row2="background: lightgrey" alternate="true" interval="1" />
-      <csvExport delimiter="," text="&quot;" />
-    </export>
     <general />
     <databases savePasswords="false" encodePasswords="true" />
     <queries projectClassLoader="false" save="false" />
@@ -467,6 +1053,24 @@
     <option name="SHOW_INHERITED" value="false" />
     <option name="HIDE_NOT_PUBLIC" value="false" />
   </component>
+  <component name="SvnConfiguration">
+    <option name="USER" value="" />
+    <option name="PASSWORD" value="" />
+    <option name="AUTO_ADD_FILES" value="1" />
+    <option name="AUTO_DEL_FILES" value="1" />
+  </component>
+  <component name="TestDox.ConfigurationController">
+    <option name="allowCustomPackages" value="false" />
+    <option name="testNameTemplate" value="&lt;classname&gt;Test" />
+    <option name="alphabeticalSorting" value="false" />
+    <option name="createTestIfMissing" value="true" />
+    <option name="underscoreMode" value="false" />
+    <option name="showFullyQualifiedClassName" value="false" />
+    <option name="autoscrolling" value="false" />
+    <option name="autoApplyChangesToTests" value="true" />
+    <option name="deletePackageOccurrences" value="true" />
+    <custom-packaging allow="false" />
+  </component>
   <component name="TodoView" selected-index="0">
     <todo-panel id="selected-file">
       <are-packages-shown value="false" />
@@ -480,29 +1084,32 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-4" y="-4" width="1032" height="748" extended-state="6" />
-    <editor active="true" />
+    <frame x="6" y="0" width="1017" height="723" extended-state="0" />
+    <editor active="false" />
     <layout>
       <window_info id="SQL" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="11" />
-      <window_info id="PsiViewer" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.36172345" order="3" />
-      <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.42989215" order="0" />
+      <window_info id="Color" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
+      <window_info id="PsiViewer" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3138614" order="3" />
+      <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.43108973" order="0" />
       <window_info id="Code Outline" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="10" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.2626953" order="0" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33281973" order="4" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.18731417" order="0" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.249742" order="1" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.30046225" order="1" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3990755" order="9" />
-      <window_info id="Dependency Cycles" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="11" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="true" internal_type="docked" type="docked" visible="false" weight="0.36057693" order="4" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4070513" order="1" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.39906102" order="9" />
+      <window_info id="Dependency Cycles" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33067092" order="11" />
       <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="2" />
-      <window_info id="Metrics" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="11" />
+      <window_info id="Metrics" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.330033" order="11" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.48826292" order="5" />
+      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.37820512" order="5" />
       <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.50097656" order="3" />
+      <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.2891089" order="3" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.4" order="0" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="7" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3865415" order="7" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.35416666" order="11" />
       <window_info id="Workspaces" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
+      <window_info id="Update Project" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.32917318" order="11" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
       <window_info id="CycleKillerQQC" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="11" />
       <window_info id="CVS File View" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
@@ -516,7 +1123,7 @@
     </layout>
   </component>
   <component name="VCS.FileViewConfiguration">
-    <option name="SELECTED_STATUSES" value="Unknown" />
+    <option name="SELECTED_STATUSES" value="Added;Deleted;Merged;Modified;Unknown;Deleted from file system (cvs);Merged with conflicts (cvs)" />
     <option name="SELECTED_COLUMNS" value="DEFAULT" />
     <option name="SHOW_FILTERS" value="true" />
     <option name="CUSTOMIZE_VIEW" value="true" />
@@ -538,6 +1145,9 @@
     <option name="ACTIVE_VCS_NAME" value="CVS" />
     <option name="UPDATE_GROUP_BY_PACKAGES" value="true" />
     <option name="SHOW_UPDATE_OPTIONS" value="false" />
+    <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
+    <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
+    <option name="SHOW_STATUS_OPTIONS" value="true" />
   </component>
   <component name="VssConfiguration">
     <option name="CLIENT_PATH" value="" />
@@ -607,107 +1217,107 @@
     </buildFile>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/psiutils/ExpressionEquivalenceChecker.java">
+    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/BaseInspectionVisitor.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="9" column="27" selection-start="0" selection-end="15020" vertical-scroll-proportion="0.478125">
+        <state line="57" column="19" selection-start="2144" selection-end="2144" vertical-scroll-proportion="0.053968254">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/psiutils/ImportUtils.java">
+    <entry file="jar://$APPLICATION_HOME_DIR$/lib/openapi.jar!/com/intellij/psi/PsiDeclarationStatement.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="5" column="53" selection-start="0" selection-end="6821" vertical-scroll-proportion="0.265625">
+        <state line="5" column="17" selection-start="158" selection-end="158" vertical-scroll-proportion="0.123411976">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/psiutils/InitializationReadUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/psiutils/ExceptionUtils.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="23" column="27" selection-start="0" selection-end="20990" vertical-scroll-proportion="0.796875">
+        <state line="9" column="13" selection-start="179" selection-end="179" vertical-scroll-proportion="0.055016182">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/psiutils/ParenthesesUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/psiutils/ControlFlowUtils.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="14" column="13" selection-start="255" selection-end="255" vertical-scroll-proportion="0.53125">
+        <state line="11" column="26" selection-start="218" selection-end="218" vertical-scroll-proportion="0.031716418">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/psiutils/RecursionUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/psiutils/ExpectedTypeUtils.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="16" column="42" selection-start="0" selection-end="25649" vertical-scroll-proportion="0.8528428">
+        <state line="57" column="102" selection-start="2629" selection-end="2629" vertical-scroll-proportion="0.2631579">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/verbose/ForCanBeForeachInspection.java">
+    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/psiutils/ClassUtils.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="20" column="33" selection-start="0" selection-end="33877" vertical-scroll-proportion="0.03256705">
+        <state line="76" column="26" selection-start="2786" selection-end="2786" vertical-scroll-proportion="0.63139933">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/verbose/PointlessArithmeticExpressionInspection.java">
+    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/verbose/AutoBoxingInspection.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="22" column="26" selection-start="779" selection-end="779" vertical-scroll-proportion="0.03256705">
+        <state line="89" column="25" selection-start="3558" selection-end="3558" vertical-scroll-proportion="0.9112628">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/verbose/PointlessBitwiseExpressionInspection.java">
+    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/verbose/AutoUnboxingInspection.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="23" column="30" selection-start="0" selection-end="8962" vertical-scroll-proportion="0.03256705">
+        <state line="98" column="34" selection-start="3872" selection-end="3872" vertical-scroll-proportion="0.8805461">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/verbose/PointlessBooleanExpressionInspection.java">
+    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/bugs/AssignmentToNullInspection.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="20" column="45" selection-start="742" selection-end="742" vertical-scroll-proportion="0.03256705">
+        <state line="34" column="55" selection-start="1274" selection-end="1314" vertical-scroll-proportion="0.3447099">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/verbose/ReplaceAssignmentWithOperatorAssignmentInspection.java">
+    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/bugs/ReturnNullInspection.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="16" column="26" selection-start="0" selection-end="4649" vertical-scroll-proportion="0.03256705">
+        <state line="60" column="56" selection-start="862" selection-end="2137" vertical-scroll-proportion="1.4300342">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/verbose/UnnecessaryBoxingInspection.java">
+    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/bugs/ObjectEqualityInspection.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="23" column="22" selection-start="0" selection-end="4562" vertical-scroll-proportion="0.03256705">
+        <state line="133" column="50" selection-start="5245" selection-end="5245" vertical-scroll-proportion="0.67918086">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/verbose/UnnecessaryParenthesesInspection.java">
+    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/bugs/EmptyStatementBodyInspection.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="21" column="42" selection-start="708" selection-end="708" vertical-scroll-proportion="0.03256705">
+        <state line="13" column="10" selection-start="418" selection-end="418" vertical-scroll-proportion="0.2901024">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/verbose/UnnecessaryThisInspection.java">
+    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/bugs/FloatingPointEqualityInspection.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="21" column="41" selection-start="709" selection-end="709" vertical-scroll-proportion="0.03256705">
+        <state line="59" column="0" selection-start="2235" selection-end="2235" vertical-scroll-proportion="0.72696245">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/visibility/LocalVariableHidingMemberVariableInspection.java">
+    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/visibility/MethodOverridesPrivateMethodInspection.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="26" column="71" selection-start="812" selection-end="812" vertical-scroll-proportion="0.03256705">
+        <state line="69" column="69" selection-start="2625" selection-end="2625" vertical-scroll-proportion="0.91883117">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/bugs/IncompatibleMaskInspection.java">
+    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ig/visibility/MethodOverridesStaticMethodInspection.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="20" column="57" selection-start="672" selection-end="672" vertical-scroll-proportion="0.03256705">
+        <state line="67" column="0" selection-start="2395" selection-end="2395" vertical-scroll-proportion="0.5032467">
           <folding />
         </state>
       </provider>
diff --git a/plugins/InspectionGadgets/build.xml b/plugins/InspectionGadgets/build.xml
index 96349a2c5a0f..3ea91ad34a7b 100644
--- a/plugins/InspectionGadgets/build.xml
+++ b/plugins/InspectionGadgets/build.xml
@@ -3,8 +3,8 @@
 <project name="InspectionGadgets" default="compile">
     <taskdef name="javac2" classname="com.intellij.uiDesigner.ant.Javac2" classpathref="project.class.path"/>
     <property name="src.dir" value="src"/>
-    <property name="idea.dir" value="c:/IntelliJ-IDEA-3075"/>
-    <property name="idea.plugin.dir" value="${idea.dir}/plugins"/>
+    <property name="idea.dir" value="c:/IntelliJ-IDEA-3144"/>
+    <property name="idea.plugin.dir" value="C:\Documents and Settings\dgriffith\.IntelliJIdea\config\plugins"/>
     <property name="debug" value="true"/>
     <property name="optimize" value="off"/>
     <property name="deprecation" value="off"/>