From 37cf90c78883151c3a6a4f50cee35d8f3d70b42a Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@jetbrains.com>
Date: Thu, 13 Jan 2005 17:22:24 +0300
Subject: [PATCH] merged CVS and Subversion versions

---
 .../IntentionPowerPak/IntentionPowerPak.iml   |  43 +-
 .../IntentionPowerPak/IntentionPowerPak.ipr   |  10 +-
 .../IntentionPowerPak/IntentionPowerPak.iws   | 513 +++++++++++-------
 plugins/IntentionPowerPak/build.xml           |   4 +-
 4 files changed, 327 insertions(+), 243 deletions(-)

diff --git a/plugins/IntentionPowerPak/IntentionPowerPak.iml b/plugins/IntentionPowerPak/IntentionPowerPak.iml
index 1d1fcf4ca119..1c47471e9c9c 100644
--- a/plugins/IntentionPowerPak/IntentionPowerPak.iml
+++ b/plugins/IntentionPowerPak/IntentionPowerPak.iml
@@ -1,47 +1,24 @@
 <?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="3103-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/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/jdom.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
+    <orderEntry type="library" name="3103-2" level="IDEA_LIB_LAYER" />
     <orderEntryProperties />
   </component>
-  <component name="VcsManagerConfiguration">
-    <option name="ACTIVE_VCS_NAME" value="&lt;None&gt;" />
-    <option name="USE_PROJECT_VCS" value="true" />
-  </component>
 </module>
 
diff --git a/plugins/IntentionPowerPak/IntentionPowerPak.ipr b/plugins/IntentionPowerPak/IntentionPowerPak.ipr
index 40eed5d55feb..5a1516a8a478 100644
--- a/plugins/IntentionPowerPak/IntentionPowerPak.ipr
+++ b/plugins/IntentionPowerPak/IntentionPowerPak.ipr
@@ -19,6 +19,9 @@
     <option name="DEFAULT_COMPILER" value="Javac" />
     <option name="CLEAR_OUTPUT_DIRECTORY" value="false" />
     <option name="DEPLOY_AFTER_MAKE" value="0" />
+    <excludeFromCompile>
+      <file url="file://$PROJECT_DIR$/test/com/siyeh/ipp/ManualTestClass.java" />
+    </excludeFromCompile>
     <resourceExtensions>
       <entry name=".+\.(properties|xml|html|dtd|tld)" />
       <entry name=".+\.(gif|png|jpeg|jpg)" />
@@ -188,7 +191,7 @@
       <module fileurl="file://$PROJECT_DIR$/IntentionPowerPak.iml" filepath="$PROJECT_DIR$/IntentionPowerPak.iml" />
     </modules>
   </component>
-  <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="false" project-jdk-name="java version &quot;1.4.2_05&quot;" />
+  <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="false" project-jdk-name="IDEA 3144" />
   <component name="RmicSettings">
     <option name="IS_EANABLED" value="false" />
     <option name="DEBUGGING_INFO" value="true" />
@@ -197,16 +200,17 @@
     <option name="ADDITIONAL_OPTIONS_STRING" value="" />
   </component>
   <component name="com.siyeh.metrics.MetricsReloaded">
-    <option name="selectedProfile" value="Default" />
+    <option name="selectedProfile" value="PackageDependency" />
     <option name="autoscroll" value="false" />
     <option name="includeTestClasses" value="false" />
     <option name="flattenInnerClasses" value="false" />
-    <option name="cycleTableSpecificationString" value="" />
+    <option name="cycleTableSpecificationString" value="127,127,127,127,127,127,127,126" />
   </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/IntentionPowerPak/IntentionPowerPak.iws b/plugins/IntentionPowerPak/IntentionPowerPak.iws
index 45a3c025bcdf..1e186f1ee21d 100644
--- a/plugins/IntentionPowerPak/IntentionPowerPak.iws
+++ b/plugins/IntentionPowerPak/IntentionPowerPak.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,73 +102,93 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
+      <file leaf-file-name="Intention.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/base/Intention.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="13" column="38" selection-start="489" selection-end="489" vertical-scroll-proportion="0.1716418">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="AssertStatementPredicate.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/asserttoif/AssertStatementPredicate.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="7" column="6" selection-start="216" selection-end="216" vertical-scroll-proportion="0.123411976">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PsiElementPredicate.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/base/PsiElementPredicate.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="4" column="17" selection-start="83" selection-end="83" vertical-scroll-proportion="0.123411976">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="BooleanLiteralEqualityPredicate.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/bool/BooleanLiteralEqualityPredicate.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="7" column="6" selection-start="189" selection-end="189" vertical-scroll-proportion="0.14814815">
+            <state line="8" column="6" selection-start="241" selection-end="241" vertical-scroll-proportion="0.07622504">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="FlipCommutativeMethodCallPredicate.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/commutative/FlipCommutativeMethodCallPredicate.java">
+      <file leaf-file-name="ComparisonPredicate.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/bool/ComparisonPredicate.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="5" column="6" selection-start="112" selection-end="112" vertical-scroll-proportion="0.14814815">
+            <state line="6" column="11" selection-start="207" selection-end="207" vertical-scroll-proportion="0.18511796">
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="MutablyNamedIntention.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/base/MutablyNamedIntention.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="10" column="0" selection-start="285" selection-end="285" vertical-scroll-proportion="0.21597096">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="ReplaceConditionalWithIfPredicate.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/conditional/ReplaceConditionalWithIfPredicate.java">
+      <file leaf-file-name="FlipComparisonIntention.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/bool/FlipComparisonIntention.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="5" column="6" selection-start="112" selection-end="112" vertical-scroll-proportion="0.14814815">
+            <state line="13" column="4" selection-start="416" selection-end="416" vertical-scroll-proportion="0.13059701">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="ConvertIntegerToDecimalPredicate.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/integer/ConvertIntegerToDecimalPredicate.java">
+      <file leaf-file-name="AssertToIfIntention.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/asserttoif/AssertToIfIntention.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="5" column="6" selection-start="108" selection-end="108" vertical-scroll-proportion="0.14814815">
+            <state line="37" column="27" selection-start="1465" selection-end="1465" vertical-scroll-proportion="0.619403">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="AssertEqualsWithLiteralPredicate.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/junit/AssertEqualsWithLiteralPredicate.java">
+      <file leaf-file-name="JoinConcatenatedStringLiteralsIntention.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/concatenation/JoinConcatenatedStringLiteralsIntention.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="5" column="6" selection-start="106" selection-end="106" vertical-scroll-proportion="0.14814815">
+            <state line="23" column="16" selection-start="675" selection-end="675" vertical-scroll-proportion="-0.36380598">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="ExpandBooleanIntention.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/trivialif/ExpandBooleanIntention.java">
+      <file leaf-file-name="IntentionPowerPack.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/IntentionPowerPack.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="10" column="13" selection-start="333" selection-end="333" vertical-scroll-proportion="0.14814815">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Intention.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/Intention.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="11" column="22" selection-start="407" selection-end="407" vertical-scroll-proportion="0.14814815">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="MergeIfAndPredicate.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/trivialif/MergeIfAndPredicate.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="6" column="6" selection-start="158" selection-end="158" vertical-scroll-proportion="0.14814815">
+            <state line="104" column="54" selection-start="6594" selection-end="6594" vertical-scroll-proportion="0.14365672">
               <folding />
             </state>
           </provider>
@@ -185,7 +204,7 @@
   <component name="InspectionManager">
     <option name="AUTOSCROLL_TO_SOURCE" value="false" />
     <option name="SPLITTER_PROPORTION" value="0.5" />
-    <profile name="Default" />
+    <profile name="Working Inspection" />
   </component>
   <component name="J2EEProjectPane">
     <setting name="SHOW_AS_DEPLOYMENT_VIEW" value="false" />
@@ -196,32 +215,42 @@
   </component>
   <component name="NamedScopeManager" />
   <component name="PackagesPane">
-    <expanded_node url="com.siyeh.ipp" module="IntentionPowerPak" type="package" />
     <expanded_node url="" module="IntentionPowerPak" 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="" module="IntentionPowerPak" type="module" />
-    <expanded_node url="file://$PROJECT_DIR$/src/intentionDescriptions/Replace Conditional With If Else" module="IntentionPowerPak" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ipp/bool" module="IntentionPowerPak" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ipp/psiutils" module="IntentionPowerPak" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/src/intentionDescriptions/Replace Multiply with Shift" module="IntentionPowerPak" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ipp/trivialif" module="IntentionPowerPak" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ipp/equality" module="IntentionPowerPak" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ipp/conditional" module="IntentionPowerPak" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/src" module="IntentionPowerPak" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ipp/switchtoif" module="IntentionPowerPak" type="directory" />
     <expanded_node url="file://$PROJECT_DIR$" module="IntentionPowerPak" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/src/intentionDescriptions/Expand Boolean" module="IntentionPowerPak" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/META-INF" module="IntentionPowerPak" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/test" module="IntentionPowerPak" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ipp/integer" module="IntentionPowerPak" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ipp/junit" module="IntentionPowerPak" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/src/intentionDescriptions/Simplify If Else" module="IntentionPowerPak" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/test/com/siyeh/ipp" module="IntentionPowerPak" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/src/intentionDescriptions/DeMorgan Law" module="IntentionPowerPak" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ipp/commutative" module="IntentionPowerPak" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ipp/concatenation" module="IntentionPowerPak" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ipp" module="IntentionPowerPak" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ipp/exceptions" module="IntentionPowerPak" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ipp/base" module="IntentionPowerPak" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ipp/psiutils" module="IntentionPowerPak" type="directory" />
     <expanded_node url="file://$PROJECT_DIR$/src/intentionDescriptions" module="IntentionPowerPak" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/src/intentionDescriptions/Split Else If" module="IntentionPowerPak" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/test/com/siyeh/ipp" module="IntentionPowerPak" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ipp/trivialif" module="IntentionPowerPak" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/src/intentionDescriptions/Merge Else If" module="IntentionPowerPak" type="directory" />
+    <expanded_node url="" module="IntentionPowerPak" type="module" />
+    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ipp/bool" module="IntentionPowerPak" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/test" module="IntentionPowerPak" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/src" module="IntentionPowerPak" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ipp" module="IntentionPowerPak" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ipp/concatenation" module="IntentionPowerPak" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/src/com/siyeh/ipp/asserttoif" module="IntentionPowerPak" type="directory" />
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
@@ -240,35 +269,37 @@
     </navigator>
   </component>
   <component name="PropertiesComponent">
+    <property name="vcs_file_view_treeWidth2" value="61" />
     <property name="GoToClass.includeJavaFiles" value="false" />
-    <property name="vcs_file_view_treeWidth2" value="114" />
     <property name="vcs_file_view_flatOrder1" value="1" />
     <property name="MemberChooser.copyJavadoc" value="false" />
     <property name="vcs_file_view_treeOrder4" value="4" />
     <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="vcs_file_view_flatWidth2" value="121" />
-    <property name="vcs_file_view_flatWidth5" value="41" />
+    <property name="vcs_file_view_flatWidth2" value="53" />
+    <property name="vcs_file_view_flatWidth5" value="46" />
     <property name="GoToClass.includeLibraries" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
     <property name="vcs_file_view_flatOrder3" value="3" />
-    <property name="vcs_file_view_treeWidth0" value="114" />
+    <property name="MemberChooser.showClasses" value="true" />
+    <property name="vcs_file_view_treeWidth0" value="61" />
     <property name="GoToClass.toSaveIncludeLibraries" value="false" />
     <property name="vcs_file_view_treeOrder0" value="0" />
+    <property name="RunManagerConfig.showSettingsBeforeRunnig" value="false" />
     <property name="vcs_file_view_flatOrder4" value="4" />
     <property name="MemberChooser.sorted" value="false" />
+    <property name="RunManagerConfig.compileBeforeRunning" value="true" />
     <property name="vcs_file_view_flatOrder5" value="5" />
     <property name="vcs_file_view_treeOrder3" value="3" />
-    <property name="vcs_file_view_flatWidth4" value="41" />
-    <property name="vcs_file_view_treeWidth1" value="115" />
+    <property name="vcs_file_view_flatWidth4" value="46" />
+    <property name="vcs_file_view_treeWidth1" value="61" />
     <property name="vcs_file_view_flatOrder2" value="2" />
-    <property name="vcs_file_view_treeWidth4" value="114" />
+    <property name="vcs_file_view_treeWidth4" value="62" />
     <property name="vcs_file_view_treeOrder2" value="2" />
-    <property name="vcs_file_view_flatWidth3" value="40" />
-    <property name="vcs_file_view_treeWidth3" value="115" />
+    <property name="vcs_file_view_flatWidth3" value="45" />
+    <property name="vcs_file_view_treeWidth3" value="62" />
     <property name="vcs_file_view_flatOrder0" value="0" />
-    <property name="vcs_file_view_flatWidth0" value="252" />
+    <property name="vcs_file_view_flatWidth0" value="69" />
     <property name="vcs_file_view_treeOrder1" value="1" />
-    <property name="vcs_file_view_flatWidth1" value="62" />
+    <property name="vcs_file_view_flatWidth1" value="48" />
   </component>
   <component name="PsiViewer.ProjectComponent">
     <option name="HIGHLIGHT" value="false" />
@@ -280,20 +311,20 @@
   </component>
   <component name="RestoreUpdateTree" />
   <component name="RunManager">
-    <activeType name="Application" />
-    <configuration selected="false" default="true" type="WebLogic Instance" 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="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" />
+    <activeType name="#org.jetbrains.idea.devkit.run.PluginConfigurationType" />
+    <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="WebLogic Instance" factoryName="Remote">
       <option name="WORKING_DIRECTORY" />
@@ -309,41 +340,6 @@
       <option name="SERVER_NAME" value="myserver" />
       <option name="DOMAIN_NAME" value="mydomain" />
     </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="#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="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" 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="" />
-    </configuration>
     <configuration selected="false" default="true" type="Remote" factoryName="Remote">
       <option name="USE_SOCKET_TRANSPORT" value="true" />
       <option name="SERVER_MODE" value="false" />
@@ -351,6 +347,21 @@
       <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="Applet" factoryName="Applet">
       <module name="" />
       <option name="MAIN_CLASS_NAME" />
@@ -368,6 +379,12 @@
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
       <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="#com.intellij.j2ee.web.jsr45.JSR45ConfigurationFactory" factoryName="Local">
       <option name="WORKING_DIRECTORY" />
       <option name="HOST" value="localhost" />
@@ -380,6 +397,36 @@
       <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="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" 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="" />
+    </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="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local">
       <option name="WORKING_DIRECTORY" />
       <option name="HOST" value="localhost" />
@@ -389,12 +436,54 @@
       <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="WebLogic Instance" 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="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="" />
+    </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="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="true" default="false" name="IntentionPowerPack" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="IntentionPowerPak" />
+      <RunnerSettings RunnerId="Run" />
+      <ConfigurationWrapper RunnerId="Run" />
+    </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" />
@@ -430,6 +519,12 @@
     <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="TodoView" selected-index="0">
     <todo-panel id="selected-file">
       <are-packages-shown value="false" />
@@ -443,39 +538,43 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-4" y="-4" width="1032" height="748" extended-state="6" />
-    <editor active="false" />
+    <frame x="6" y="0" width="1018" height="723" extended-state="0" />
+    <editor active="true" />
     <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="Color" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="-1" />
       <window_info id="PsiViewer" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
       <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3312789" 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.375" order="0" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3420647" order="4" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.33267328" order="0" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3312789" order="1" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" 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="false" internal_type="docked" type="docked" visible="false" weight="0.34775642" order="4" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33653846" order="1" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.40384614" order="9" />
+      <window_info id="Dependency Cycles" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.37859425" 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.3290735" order="11" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.1764706" order="1" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="5" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3429487" 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="true" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.5673828" order="3" />
+      <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3138614" 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="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3429487" 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.33073324" 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="Update Project" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33020344" order="11" />
       <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="BattleSpaces" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="11" />
+      <window_info id="Update Files" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.32973805" 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" />
+      <window_info id="BattleSpaces" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="11" />
       <window_info id="Metrics Reloaded" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="11" />
       <window_info id="Clash" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="11" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="2" />
       <window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="6" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="8" />
+      <window_info id="Update File" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.32973805" order="11" />
     </layout>
   </component>
   <component name="VCS.FileViewConfiguration">
@@ -501,6 +600,9 @@
     <option name="ACTIVE_VCS_NAME" value="CVS" />
     <option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
     <option name="SHOW_UPDATE_OPTIONS" value="true" />
+    <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="" />
@@ -562,110 +664,111 @@
     </buildFile>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/integer/ConvertIntegerToOctalPredicate.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="5" column="17" selection-start="119" selection-end="119" vertical-scroll-proportion="0.031307552">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/integer/ConvertIntegerToHexPredicate.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="5" column="6" selection-start="108" selection-end="108" vertical-scroll-proportion="0.12523021">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/com/siyeh/ipp/ManualTestClass.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="8" column="13" selection-start="194" selection-end="194" vertical-scroll-proportion="0.03046595">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/conditional/RemoveConditionalPredicate.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="36" column="0" selection-start="1376" selection-end="1376" vertical-scroll-proportion="0.8434622">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/intentionDescriptions/Replace If Else With Conditional/after.java.template">
+    <entry file="file://$PROJECT_DIR$/src/intentionDescriptions/Split Else If/description.html">
       <provider selected="true" editor-type-id="text-editor">
         <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/conditional/FlipConditionalPredicate.java">
+    <entry file="file://$PROJECT_DIR$/src/intentionDescriptions/Merge Else If/description.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="15" column="3" selection-start="481" selection-end="481" vertical-scroll-proportion="0.42337164">
+        <state line="3" column="73" selection-start="195" selection-end="195" vertical-scroll-proportion="0.09514926">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/trivialif/MergeElseIfPredicate.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="37" column="53" selection-start="1318" selection-end="1318" vertical-scroll-proportion="0.4754991">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/exceptions/DetailExceptionsIntention.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="32" column="34" selection-start="783" selection-end="783" vertical-scroll-proportion="0.76119405">
           <folding>
-            <marker date="1067549444630" expanded="false" signature="43:163" placeholder="..." />
-            <marker date="1067549444630" expanded="true" signature="284:651" placeholder="{...}" />
+            <marker date="1105547422243" expanded="true" signature="436:460" placeholder="{...}" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/trivialif/ExpandBooleanPredicate.java">
+    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/exceptions/DetailExceptionsPredicate.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="61" column="30" selection-start="2256" selection-end="2256" vertical-scroll-proportion="0.6570881">
+        <state line="25" column="26" selection-start="612" selection-end="612" vertical-scroll-proportion="0.65120965">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/base/MutablyNamedIntention.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="10" column="0" selection-start="285" selection-end="285" vertical-scroll-proportion="0.21597096">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/bool/FlipComparisonIntention.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="13" column="4" selection-start="416" selection-end="416" vertical-scroll-proportion="0.13059701">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/IntentionPowerPack.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="104" column="54" selection-start="6594" selection-end="6594" vertical-scroll-proportion="0.14365672">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/asserttoif/AssertStatementPredicate.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="7" column="6" selection-start="216" selection-end="216" vertical-scroll-proportion="0.123411976">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/base/PsiElementPredicate.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="4" column="17" selection-start="83" selection-end="83" vertical-scroll-proportion="0.123411976">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/bool/BooleanLiteralEqualityPredicate.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="7" column="6" selection-start="189" selection-end="189" vertical-scroll-proportion="0.14814815">
+        <state line="8" column="6" selection-start="241" selection-end="241" vertical-scroll-proportion="0.07622504">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/commutative/FlipCommutativeMethodCallPredicate.java">
+    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/bool/ComparisonPredicate.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="5" column="6" selection-start="112" selection-end="112" vertical-scroll-proportion="0.14814815">
+        <state line="6" column="11" selection-start="207" selection-end="207" vertical-scroll-proportion="0.18511796">
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/base/Intention.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="13" column="38" selection-start="489" selection-end="489" vertical-scroll-proportion="0.1716418">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/conditional/ReplaceConditionalWithIfPredicate.java">
+    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/asserttoif/AssertToIfIntention.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="5" column="6" selection-start="112" selection-end="112" vertical-scroll-proportion="0.14814815">
+        <state line="37" column="27" selection-start="1465" selection-end="1465" vertical-scroll-proportion="0.619403">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/integer/ConvertIntegerToDecimalPredicate.java">
+    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/concatenation/JoinConcatenatedStringLiteralsIntention.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="5" column="6" selection-start="108" selection-end="108" vertical-scroll-proportion="0.14814815">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/junit/AssertEqualsWithLiteralPredicate.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="5" column="6" selection-start="106" selection-end="106" vertical-scroll-proportion="0.14814815">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/trivialif/MergeIfAndPredicate.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="6" column="6" selection-start="158" selection-end="158" vertical-scroll-proportion="0.14814815">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/trivialif/ExpandBooleanIntention.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="10" column="13" selection-start="333" selection-end="333" vertical-scroll-proportion="0.14814815">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/siyeh/ipp/Intention.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="11" column="22" selection-start="407" selection-end="407" vertical-scroll-proportion="0.14814815">
+        <state line="23" column="16" selection-start="675" selection-end="675" vertical-scroll-proportion="-0.36380598">
           <folding />
         </state>
       </provider>
diff --git a/plugins/IntentionPowerPak/build.xml b/plugins/IntentionPowerPak/build.xml
index 39a8eab6a8af..337fc7440eea 100644
--- a/plugins/IntentionPowerPak/build.xml
+++ b/plugins/IntentionPowerPak/build.xml
@@ -3,8 +3,8 @@
 <project name ="IntentionPowerPack" default ="compile">
 
     <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-3084"/>
+    <property name="idea.plugin.dir" value="C:\Documents and Settings\dgriffith\.IntelliJIdea\config\plugins"/>
 
     <property name="debug" value="true"/>
     <property name="optimize" value="off"/>