merge idea90 branch into trunk
authorDmitry Jemerov <yole@jetbrains.com>
Mon, 18 Jan 2010 17:19:19 +0000 (20:19 +0300)
committerDmitry Jemerov <yole@jetbrains.com>
Mon, 18 Jan 2010 17:19:19 +0000 (20:19 +0300)
commit18440a69585082572ff5f07c048be104bce5dc9a
tree3b79b59abc43e05d49b740d353f9e8e682ebb69e
parent6a985a3c156978d20b58247ef231018e6f853ffb
parent809047de6530369fc56d353adae0a406fb972b6d
merge idea90 branch into trunk
107 files changed:
java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/BackendCompilerWrapper.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathPanel.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleEditor.java
java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java
java/java-tests/testSrc/com/intellij/refactoring/inline/InlineMethodTest.java
out/classes/production/resources-en/messages/JavaErrorMessages.properties
platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java
platform/lang-impl/lang-impl.iml
platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationAction.java
platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java
platform/lang-impl/src/com/intellij/ide/macro/MacroManager.java
platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java
platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/CommonContentEntriesEditor.java
platform/lang-impl/src/com/intellij/refactoring/rename/RenameUtil.java
platform/platform-api/src/com/intellij/openapi/ui/popup/JBPopup.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java
platform/platform-resources/src/META-INF/LangExtensionPoints.xml
platform/platform-resources/src/idea/PlatformActions.xml
platform/util/src/com/intellij/openapi/util/io/FileUtil.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTree.java
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ssh/ui/SshPasswordDialog.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/lexer/_GroovyLexer.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/GrStringUtil.java
plugins/junit_rt/src/com/intellij/junit4/JUnit4TestResultsSender.java
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnAuthenticationManager.java
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnFileSystemListener.java
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SvnAuthenticationProvider.java
plugins/testng/src/com/theoryinpractice/testng/model/TestData.java
resources-en/src/messages/JavaErrorMessages.properties
resources/src/META-INF/IdeaPlugin.xml
tools/lexer/jflex-1.4/JFlex-Changes.txt
tools/lexer/jflex-1.4/bin/jflex
tools/lexer/jflex-1.4/bin/jflex.bat
tools/lexer/jflex-1.4/doc/crossref.png
tools/lexer/jflex-1.4/doc/footnote.png
tools/lexer/jflex-1.4/doc/jflex_anttask.html
tools/lexer/jflex-1.4/doc/logo.gif
tools/lexer/jflex-1.4/lib/JFlex.jar
tools/lexer/jflex-1.4/lib/jflex-mode.el
tools/lexer/jflex-1.4/lib/jflex.vim
tools/lexer/jflex-1.4/src/JFlex/Action.java
tools/lexer/jflex-1.4/src/JFlex/CharClassException.java
tools/lexer/jflex-1.4/src/JFlex/CharClassInterval.java
tools/lexer/jflex-1.4/src/JFlex/CharClasses.java
tools/lexer/jflex-1.4/src/JFlex/CharSet.java
tools/lexer/jflex-1.4/src/JFlex/CharSetEnumerator.java
tools/lexer/jflex-1.4/src/JFlex/CountEmitter.java
tools/lexer/jflex-1.4/src/JFlex/DFA.java
tools/lexer/jflex-1.4/src/JFlex/EOFActions.java
tools/lexer/jflex-1.4/src/JFlex/Emitter.java
tools/lexer/jflex-1.4/src/JFlex/ErrorMessages.java
tools/lexer/jflex-1.4/src/JFlex/GeneratorException.java
tools/lexer/jflex-1.4/src/JFlex/HiLowEmitter.java
tools/lexer/jflex-1.4/src/JFlex/IntCharSet.java
tools/lexer/jflex-1.4/src/JFlex/IntPair.java
tools/lexer/jflex-1.4/src/JFlex/Interval.java
tools/lexer/jflex-1.4/src/JFlex/LexParse.cup
tools/lexer/jflex-1.4/src/JFlex/LexParse.java
tools/lexer/jflex-1.4/src/JFlex/LexScan.flex
tools/lexer/jflex-1.4/src/JFlex/LexScan.java
tools/lexer/jflex-1.4/src/JFlex/LexicalStates.java
tools/lexer/jflex-1.4/src/JFlex/MacroException.java
tools/lexer/jflex-1.4/src/JFlex/Macros.java
tools/lexer/jflex-1.4/src/JFlex/Main.java
tools/lexer/jflex-1.4/src/JFlex/Messages.properties
tools/lexer/jflex-1.4/src/JFlex/NFA.java
tools/lexer/jflex-1.4/src/JFlex/Options.java
tools/lexer/jflex-1.4/src/JFlex/Out.java
tools/lexer/jflex-1.4/src/JFlex/PackEmitter.java
tools/lexer/jflex-1.4/src/JFlex/RegExp.java
tools/lexer/jflex-1.4/src/JFlex/RegExp1.java
tools/lexer/jflex-1.4/src/JFlex/RegExp2.java
tools/lexer/jflex-1.4/src/JFlex/RegExps.java
tools/lexer/jflex-1.4/src/JFlex/ScannerException.java
tools/lexer/jflex-1.4/src/JFlex/SemCheck.java
tools/lexer/jflex-1.4/src/JFlex/SilentExit.java
tools/lexer/jflex-1.4/src/JFlex/Skeleton.java
tools/lexer/jflex-1.4/src/JFlex/StatePairList.java
tools/lexer/jflex-1.4/src/JFlex/StateSet.java
tools/lexer/jflex-1.4/src/JFlex/StateSetEnumerator.java
tools/lexer/jflex-1.4/src/JFlex/StdOutWriter.java
tools/lexer/jflex-1.4/src/JFlex/Timer.java
tools/lexer/jflex-1.4/src/JFlex/anttask/JFlexTask.java
tools/lexer/jflex-1.4/src/JFlex/gui/GeneratorThread.java
tools/lexer/jflex-1.4/src/JFlex/gui/GridPanel.java
tools/lexer/jflex-1.4/src/JFlex/gui/GridPanelConstraint.java
tools/lexer/jflex-1.4/src/JFlex/gui/Handles.java
tools/lexer/jflex-1.4/src/JFlex/gui/MainFrame.java
tools/lexer/jflex-1.4/src/JFlex/gui/OptionsDialog.java
tools/lexer/jflex-1.4/src/JFlex/sym.java
tools/lexer/jflex-1.4/src/JFlex/tests/AllTests.java
tools/lexer/jflex-1.4/src/JFlex/tests/AntTaskTests.java
tools/lexer/jflex-1.4/src/JFlex/tests/CharClassesTest.java
tools/lexer/jflex-1.4/src/JFlex/tests/EmitterTest.java
tools/lexer/jflex-1.4/src/JFlex/tests/PackEmitterTest.java
tools/lexer/jflex-1.4/src/JFlex/tests/RegExpTests.java
tools/lexer/jflex-1.4/src/JFlex/tests/SkeletonTest.java
tools/lexer/jflex-1.4/src/README
tools/lexer/jflex-1.4/src/build.xml
tools/lexer/jflex-1.4/src/changelog
tools/lexer/jflex-1.4/src/java_cup/runtime/Symbol.java
tools/lexer/jflex-1.4/src/java_cup/runtime/lr_parser.java
tools/lexer/jflex-1.4/src/skeleton.default
tools/lexer/jflex-1.4/src/skeleton.nested