diff --git a/.idea/ant.xml b/.idea/ant.xml
new file mode 100644
index 000000000000..7ba222f2a1c4
--- /dev/null
+++ b/.idea/ant.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 000000000000..d211f9c85726
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,70 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
new file mode 100644
index 000000000000..05a3cf1ec6fa
--- /dev/null
+++ b/.idea/dataSources.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/.idea/dynamic.xml b/.idea/dynamic.xml
new file mode 100644
index 000000000000..05a3cf1ec6fa
--- /dev/null
+++ b/.idea/dynamic.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 000000000000..71313f22e1b4
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/.idea/fileColors.xml b/.idea/fileColors.xml
new file mode 100644
index 000000000000..05a3cf1ec6fa
--- /dev/null
+++ b/.idea/fileColors.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/.idea/libraries/CGLIB.xml b/.idea/libraries/CGLIB.xml
new file mode 100644
index 000000000000..061f6f213744
--- /dev/null
+++ b/.idea/libraries/CGLIB.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/JDOM.xml b/.idea/libraries/JDOM.xml
new file mode 100644
index 000000000000..17d2e7336796
--- /dev/null
+++ b/.idea/libraries/JDOM.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/JMock1.xml b/.idea/libraries/JMock1.xml
new file mode 100644
index 000000000000..ca4dac06d5e2
--- /dev/null
+++ b/.idea/libraries/JMock1.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/JUnit4.xml b/.idea/libraries/JUnit4.xml
new file mode 100644
index 000000000000..f26b345e7414
--- /dev/null
+++ b/.idea/libraries/JUnit4.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Log4J.xml b/.idea/libraries/Log4J.xml
new file mode 100644
index 000000000000..6e3948c15fc9
--- /dev/null
+++ b/.idea/libraries/Log4J.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/NanoXML.xml b/.idea/libraries/NanoXML.xml
new file mode 100644
index 000000000000..b189c1aeccf4
--- /dev/null
+++ b/.idea/libraries/NanoXML.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/OroMatcher.xml b/.idea/libraries/OroMatcher.xml
new file mode 100644
index 000000000000..11cae893cfea
--- /dev/null
+++ b/.idea/libraries/OroMatcher.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Trove4j.xml b/.idea/libraries/Trove4j.xml
new file mode 100644
index 000000000000..ffb447bb506b
--- /dev/null
+++ b/.idea/libraries/Trove4j.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Velocity.xml b/.idea/libraries/Velocity.xml
new file mode 100644
index 000000000000..9f17f5893203
--- /dev/null
+++ b/.idea/libraries/Velocity.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/XStream.xml b/.idea/libraries/XStream.xml
new file mode 100644
index 000000000000..1ae2bba6df3e
--- /dev/null
+++ b/.idea/libraries/XStream.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/XmlRPC.xml b/.idea/libraries/XmlRPC.xml
new file mode 100644
index 000000000000..4dc45f5b4c27
--- /dev/null
+++ b/.idea/libraries/XmlRPC.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/commons_codec.xml b/.idea/libraries/commons_codec.xml
new file mode 100644
index 000000000000..3921ae1a3395
--- /dev/null
+++ b/.idea/libraries/commons_codec.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/commons_collections.xml b/.idea/libraries/commons_collections.xml
new file mode 100644
index 000000000000..489c3f067ebf
--- /dev/null
+++ b/.idea/libraries/commons_collections.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/commons_net.xml b/.idea/libraries/commons_net.xml
new file mode 100644
index 000000000000..4bf75182b7e6
--- /dev/null
+++ b/.idea/libraries/commons_net.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/jgoodies_forms.xml b/.idea/libraries/jgoodies_forms.xml
new file mode 100644
index 000000000000..0acd33f16bd7
--- /dev/null
+++ b/.idea/libraries/jgoodies_forms.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/jna.xml b/.idea/libraries/jna.xml
new file mode 100644
index 000000000000..8c0751775e1e
--- /dev/null
+++ b/.idea/libraries/jna.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/microba.xml b/.idea/libraries/microba.xml
new file mode 100644
index 000000000000..893e0dcc7f2a
--- /dev/null
+++ b/.idea/libraries/microba.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/picocontainer.xml b/.idea/libraries/picocontainer.xml
new file mode 100644
index 000000000000..0850ebb24085
--- /dev/null
+++ b/.idea/libraries/picocontainer.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 000000000000..799d1bde2960
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,93 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 000000000000..4209bc87974d
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.idea/php.xml b/.idea/php.xml
new file mode 100644
index 000000000000..05a3cf1ec6fa
--- /dev/null
+++ b/.idea/php.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/.idea/projectCodeStyle.xml b/.idea/projectCodeStyle.xml
new file mode 100644
index 000000000000..d8b66ffff03d
--- /dev/null
+++ b/.idea/projectCodeStyle.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/.idea/spellchecker.xml b/.idea/spellchecker.xml
new file mode 100644
index 000000000000..05a3cf1ec6fa
--- /dev/null
+++ b/.idea/spellchecker.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/.idea/sqlDataSources.xml b/.idea/sqlDataSources.xml
new file mode 100644
index 000000000000..05a3cf1ec6fa
--- /dev/null
+++ b/.idea/sqlDataSources.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml
new file mode 100644
index 000000000000..05a3cf1ec6fa
--- /dev/null
+++ b/.idea/sqldialects.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/.idea/templateLanguages.xml b/.idea/templateLanguages.xml
new file mode 100644
index 000000000000..05a3cf1ec6fa
--- /dev/null
+++ b/.idea/templateLanguages.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
new file mode 100644
index 000000000000..de812f85b618
--- /dev/null
+++ b/.idea/uiDesigner.xml
@@ -0,0 +1,125 @@
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+
+
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 000000000000..9938710c1ee1
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/platform/extensions/extensions.iml b/platform/extensions/extensions.iml
index 70e205366bc0..a8084754df8f 100644
--- a/platform/extensions/extensions.iml
+++ b/platform/extensions/extensions.iml
@@ -12,8 +12,9 @@
-
-
+
+
+
diff --git a/platform/lang-api/lang-api.iml b/platform/lang-api/lang-api.iml
index 24b5eac200ee..7a4cdeb5f60d 100644
--- a/platform/lang-api/lang-api.iml
+++ b/platform/lang-api/lang-api.iml
@@ -9,6 +9,7 @@
+
diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/impl/DirectoryIndexImpl.java b/platform/lang-impl/src/com/intellij/openapi/roots/impl/DirectoryIndexImpl.java
index 52c10d6e4137..f535817396b3 100644
--- a/platform/lang-impl/src/com/intellij/openapi/roots/impl/DirectoryIndexImpl.java
+++ b/platform/lang-impl/src/com/intellij/openapi/roots/impl/DirectoryIndexImpl.java
@@ -29,7 +29,6 @@ import com.intellij.util.containers.*;
import com.intellij.util.containers.HashMap;
import com.intellij.util.messages.MessageBusConnection;
import gnu.trove.THashMap;
-import junit.framework.Assert;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
@@ -97,8 +96,8 @@ public class DirectoryIndexImpl extends DirectoryIndex implements ProjectCompone
@TestOnly
private void doCheckConsistency(boolean reverseAllSets) {
- Assert.assertTrue(myInitialized);
- Assert.assertTrue(!myDisposed);
+ assert myInitialized;
+ assert !myDisposed;
Map oldDirToInfoMap = myDirToInfoMap;
myDirToInfoMap = new THashMap();
@@ -124,14 +123,14 @@ public class DirectoryIndexImpl extends DirectoryIndex implements ProjectCompone
}
Set keySet = myDirToInfoMap.keySet();
- Assert.assertEquals(keySet.size(), oldDirToInfoMap.keySet().size());
+ assert keySet.size() == oldDirToInfoMap.keySet().size();
for (VirtualFile file : keySet) {
DirectoryInfo info1 = myDirToInfoMap.get(file);
DirectoryInfo info2 = oldDirToInfoMap.get(file);
- Assert.assertEquals(info1, info2);
+ assert info1.equals(info2);
}
- Assert.assertEquals(myPackageNameToDirsMap.keySet().size(), oldPackageNameToDirsMap.keySet().size());
+ assert myPackageNameToDirsMap.keySet().size() == oldPackageNameToDirsMap.keySet().size();
for (Map.Entry entry : myPackageNameToDirsMap.entrySet()) {
String packageName = entry.getKey();
VirtualFile[] dirs = entry.getValue();
@@ -141,7 +140,7 @@ public class DirectoryIndexImpl extends DirectoryIndex implements ProjectCompone
set1.addAll(Arrays.asList(dirs));
HashSet set2 = new HashSet();
set2.addAll(Arrays.asList(dirs1));
- Assert.assertEquals(set1, set2);
+ assert set1.equals(set2);
}
}
diff --git a/platform/lang-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java
index add177669366..b2711a2cd99c 100644
--- a/platform/lang-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java
@@ -36,7 +36,6 @@ import com.intellij.util.containers.ConcurrentHashMap;
import com.intellij.util.containers.ConcurrentWeakValueHashMap;
import com.intellij.util.messages.MessageBusConnection;
import gnu.trove.THashMap;
-import junit.framework.Assert;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -270,7 +269,7 @@ public class FileManagerImpl implements FileManager {
LOG.assertTrue(vFile.isValid());
PsiFile psiFile1 = findFile(vFile);
if (psiFile1 != null && fileViewProvider != null && fileViewProvider.isPhysical()) { // might get collected
- Assert.assertEquals(psiFile1.getClass(), fileViewProvider.getPsi(fileViewProvider.getBaseLanguage()).getClass());
+ assert psiFile1.getClass().equals(fileViewProvider.getPsi(fileViewProvider.getBaseLanguage()).getClass());
}
}
diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/PostprocessReformattingAspect.java b/platform/lang-impl/src/com/intellij/psi/impl/source/PostprocessReformattingAspect.java
index 7472bf57bd59..7b072956ea08 100644
--- a/platform/lang-impl/src/com/intellij/psi/impl/source/PostprocessReformattingAspect.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/source/PostprocessReformattingAspect.java
@@ -36,7 +36,6 @@ import com.intellij.psi.impl.source.tree.*;
import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
import com.intellij.util.LocalTimeCounter;
import com.intellij.util.text.CharArrayUtil;
-import junit.framework.Assert;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -302,7 +301,7 @@ public class PostprocessReformattingAspect implements PomModelAspect, Disposable
if (!expectedPsi.equals(actualPsiTree)) {
myReformatElements.clear();
- Assert.assertEquals("Refactored psi should be the same as result of parsing", expectedPsi, actualPsiTree);
+ assert expectedPsi.equals(actualPsiTree): "Refactored psi should be the same as result of parsing";
}
}
diff --git a/platform/platform-impl/platform-impl.iml b/platform/platform-impl/platform-impl.iml
index 3150419fd1c2..fc1c8dee52c4 100644
--- a/platform/platform-impl/platform-impl.iml
+++ b/platform/platform-impl/platform-impl.iml
@@ -40,8 +40,8 @@
-
+
diff --git a/platform/usageView/usageView.iml b/platform/usageView/usageView.iml
index e32f01a3071d..851573b387c6 100644
--- a/platform/usageView/usageView.iml
+++ b/platform/usageView/usageView.iml
@@ -9,7 +9,7 @@
-
+
diff --git a/platform/util/util.iml b/platform/util/util.iml
index 4c9c7eef5e76..315d1bbcb801 100644
--- a/platform/util/util.iml
+++ b/platform/util/util.iml
@@ -12,7 +12,6 @@
-