idea/community.git
11 years agoMerge branch 'appcode10' into merge_appcode10
Maxim Shafirov [Wed, 26 Oct 2011 15:53:14 +0000 (19:53 +0400)]
Merge branch 'appcode10' into merge_appcode10

Conflicts:
build.txt
java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodDialog.java
platform/core-api/src/com/intellij/openapi/vfs/CharsetToolkit.java
platform/core-impl/src/com/intellij/openapi/editor/impl/CharArray.java
platform/core-impl/src/com/intellij/openapi/fileEditor/impl/LoadTextUtil.java
platform/core-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java
platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesPanel.form
platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesPanel.java
platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java
platform/lang-impl/src/com/intellij/openapi/vcs/checkin/TodoCheckinHandler.java
platform/platform-api/src/com/intellij/openapi/fileEditor/OpenFileDescriptor.java
platform/platform-api/src/com/intellij/openapi/ui/FixedComboBoxEditor.java
platform/platform-impl/src/com/intellij/ide/actionMacro/ActionMacroManager.java
platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.form
platform/platform-impl/src/com/intellij/internal/statistic/updater/StatisticsNotificationManager.java
platform/platform-impl/src/com/intellij/notification/EventLogConsole.java
platform/platform-impl/src/com/intellij/notification/LogModel.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
platform/platform-impl/src/com/intellij/platform/PlatformProjectOpenProcessor.java
platform/platform-impl/src/com/intellij/ui/EditorTextField.java
platform/platform-impl/src/com/intellij/util/ui/table/JBListTable.java
platform/platform-resources-en/src/messages/ActionsBundle.properties
platform/platform-resources-en/src/misc/registry.properties
platform/util/src/com/intellij/openapi/ui/Splitter.java
platform/util/src/com/intellij/util/containers/MultiMap.java
platform/util/src/com/intellij/util/ui/MacUIUtil.java
platform/util/src/com/intellij/util/ui/UIUtil.java
platform/util/testSrc/com/intellij/util/text/DateFormatUtilTest.java
plugins/git4idea/src/git4idea/actions/GitAdd.java
plugins/git4idea/src/git4idea/commands/GitSimpleHandler.java
plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandExecutor.java
plugins/spellchecker/src/com/intellij/spellchecker/inspections/CommentSplitter.java
plugins/spellchecker/testSrc/com/intellij/spellchecker/inspector/SplitterTest.java

11 years agoEA-30726 - AIOOBE: BulkChangesMerger$Context.b
Denis.Zhdanov [Wed, 26 Oct 2011 11:26:13 +0000 (15:26 +0400)]
EA-30726 - AIOOBE: BulkChangesMerger$Context.b

1. Ensuring that CharArray sub-sequence objects use the same locks for the shared deferred changes storage;
2. Improved defence against race condition on deferred changes processing;

11 years agoproject content scope
Dmitry Avdeev [Wed, 26 Oct 2011 11:09:49 +0000 (15:09 +0400)]
project content scope

11 years agorefactored & javadoc added
nik [Wed, 26 Oct 2011 10:51:51 +0000 (14:51 +0400)]
refactored & javadoc added

11 years agomem leak
Alexey Kudravtsev [Tue, 25 Oct 2011 11:20:37 +0000 (15:20 +0400)]
mem leak

11 years agomem leaks
Alexey Kudravtsev [Tue, 25 Oct 2011 11:19:34 +0000 (15:19 +0400)]
mem leaks

11 years agomem leak
Alexey Kudravtsev [Tue, 25 Oct 2011 11:15:25 +0000 (15:15 +0400)]
mem leak

11 years agoremoved 'create grails/griffon from sources' items from wizard because they are cover...
nik [Wed, 26 Oct 2011 09:50:02 +0000 (13:50 +0400)]
removed 'create grails/griffon from sources' items from wizard because they are covered by generic 'create from sources' mode

11 years agoMinor code style settings improvements/code cleanup
Rustam.Vishnyakov [Wed, 26 Oct 2011 09:41:25 +0000 (13:41 +0400)]
Minor code style settings improvements/code cleanup

11 years agoUse current code style settings, not default ones in block structure view.
Rustam.Vishnyakov [Wed, 26 Oct 2011 09:40:33 +0000 (13:40 +0400)]
Use current code style settings, not default ones in block structure view.

11 years agogit log: checkout revision action
irengrig [Wed, 26 Oct 2011 09:37:37 +0000 (13:37 +0400)]
git log: checkout revision action

11 years agogit log: cosmetics
irengrig [Wed, 26 Oct 2011 08:19:41 +0000 (12:19 +0400)]
git log: cosmetics

11 years agogit log: better mark icon; also shown in details
irengrig [Wed, 26 Oct 2011 08:01:55 +0000 (12:01 +0400)]
git log: better mark icon; also shown in details

11 years agogit log: fix color for selected area and highlight
irengrig [Wed, 26 Oct 2011 07:42:09 +0000 (11:42 +0400)]
git log: fix color for selected area and highlight

11 years agoadded 'create from existing sources' mode to 'New Module' wizard
nik [Wed, 26 Oct 2011 09:34:39 +0000 (13:34 +0400)]
added 'create from existing sources' mode to 'New Module' wizard

11 years agodetected project roots table: allow to mark items using 'space'
nik [Wed, 26 Oct 2011 08:06:03 +0000 (12:06 +0400)]
detected project roots table: allow to mark items using 'space'

11 years agoAstella: allow to add build configuration dependencies to project and global libraries
kirill.safonov [Wed, 26 Oct 2011 09:03:26 +0000 (13:03 +0400)]
Astella: allow to add build configuration dependencies to project and global libraries

11 years agoAstella: draft UI for editing project and global libraries
kirill.safonov [Wed, 26 Oct 2011 06:39:46 +0000 (10:39 +0400)]
Astella: draft UI for editing project and global libraries

11 years agoChoose libraries dialog: use standard item height
kirill.safonov [Wed, 26 Oct 2011 06:23:11 +0000 (10:23 +0400)]
Choose libraries dialog: use standard item height

11 years agofix compilation
Maxim.Medvedev [Wed, 26 Oct 2011 08:57:34 +0000 (12:57 +0400)]
fix compilation

11 years agoIDEA-75633 Java Refactorings should not be available for non-java files via context...
Maxim.Medvedev [Wed, 26 Oct 2011 07:53:58 +0000 (11:53 +0400)]
IDEA-75633 Java Refactorings should not be available for non-java files via context menu in Project View

11 years agoEA-30718 "Remote branch name should have slash separator". LOG.assertTrue instead...
Kirill Likhodedov [Wed, 26 Oct 2011 08:26:28 +0000 (12:26 +0400)]
EA-30718 "Remote branch name should have slash separator". LOG.assertTrue instead of assert; print the branch name.

11 years agoCapitalize dialogs titles.
Kirill Likhodedov [Wed, 26 Oct 2011 08:23:21 +0000 (12:23 +0400)]
Capitalize dialogs titles.

11 years agoMerge remote-tracking branch 'origin/master'
Kirill Likhodedov [Wed, 26 Oct 2011 08:19:29 +0000 (12:19 +0400)]
Merge remote-tracking branch 'origin/master'

11 years agoIDEA-75972 Disable mnemonics for "Git -> Branches -> Current Branch item" to display...
Kirill Likhodedov [Wed, 26 Oct 2011 08:18:57 +0000 (12:18 +0400)]
IDEA-75972 Disable mnemonics for "Git -> Branches -> Current Branch item" to display underscores correctly.

11 years agoproject load cancelling: leaks & welcome screen shown
Dmitry Avdeev [Tue, 25 Oct 2011 12:23:00 +0000 (16:23 +0400)]
project load cancelling: leaks & welcome screen shown

11 years agoraw and diamond types in introduce refactorings
Maxim.Medvedev [Wed, 26 Oct 2011 06:54:16 +0000 (10:54 +0400)]
raw and diamond types in introduce refactorings

11 years agoGrTypeCombo used in all groovy introduce refactorings. Vars with diamond always shoul...
Maxim.Medvedev [Mon, 24 Oct 2011 13:31:34 +0000 (17:31 +0400)]
GrTypeCombo used in all groovy introduce refactorings. Vars with diamond always should be always introduced with explicit type

11 years agofix defaultMethods script in case of two type parameters of List inheritor
Maxim.Medvedev [Mon, 24 Oct 2011 13:02:59 +0000 (17:02 +0400)]
fix defaultMethods script in case of two type parameters of List inheritor

11 years agonew expression with diamond should return substituted type
Maxim.Medvedev [Fri, 21 Oct 2011 10:51:10 +0000 (14:51 +0400)]
new expression with diamond should return substituted type

11 years agoget rid of GroovyIntroduceVariableHandlerBase
Maxim.Medvedev [Fri, 21 Oct 2011 08:59:34 +0000 (12:59 +0400)]
get rid of GroovyIntroduceVariableHandlerBase

11 years agoIDEA-75097 Every keystroke in runconfig/vm-options field triggers network listening...
nik [Wed, 26 Oct 2011 05:09:53 +0000 (09:09 +0400)]
IDEA-75097 Every keystroke in runconfig/vm-options field triggers network listening firewall dialog on Mac OS

11 years agospacing idea/110.217 pycharm/110.218 rubymine/110.219 storm/110.220
Dmitry Jemerov [Tue, 25 Oct 2011 17:41:54 +0000 (19:41 +0200)]
spacing

11 years agodiagnostics for EA-21047 - IAE: TreePath.<init>
Dmitry Jemerov [Tue, 25 Oct 2011 15:40:16 +0000 (17:40 +0200)]
diagnostics for EA-21047 - IAE: TreePath.<init>

11 years agoEA-30247 - IAE: ProjectStructureConfigurable.select; cleanup
Dmitry Jemerov [Tue, 25 Oct 2011 14:28:03 +0000 (16:28 +0200)]
EA-30247 - IAE: ProjectStructureConfigurable.select; cleanup

11 years agoEA-30901 - NPE: TreeElement.getStartOffset
Dmitry Jemerov [Tue, 25 Oct 2011 14:18:06 +0000 (16:18 +0200)]
EA-30901 - NPE: TreeElement.getStartOffset

11 years agoEA-30897 - NPE: EditorTextField$4.getAttributes
Dmitry Jemerov [Tue, 25 Oct 2011 14:11:03 +0000 (16:11 +0200)]
EA-30897 - NPE: EditorTextField$4.getAttributes

11 years agoEA-30888 - assert: ComponentManagerImpl.getComponent
Dmitry Jemerov [Tue, 25 Oct 2011 13:33:40 +0000 (15:33 +0200)]
EA-30888 - assert: ComponentManagerImpl.getComponent

11 years agodiagnostics for EA-29454 - assert: AbstractTreeUi._expand
Dmitry Jemerov [Tue, 25 Oct 2011 13:28:29 +0000 (15:28 +0200)]
diagnostics for EA-29454 - assert: AbstractTreeUi._expand

11 years agoDisable OK action in conflicts dialog if no runnable was passed
Roman Shevchenko [Tue, 25 Oct 2011 17:59:05 +0000 (19:59 +0200)]
Disable OK action in conflicts dialog if no runnable was passed

11 years agoConflicts dialog layout fixed
Roman Shevchenko [Tue, 25 Oct 2011 17:25:57 +0000 (19:25 +0200)]
Conflicts dialog layout fixed

11 years agogroovy jps builder: parse output
peter [Tue, 25 Oct 2011 18:30:38 +0000 (20:30 +0200)]
groovy jps builder: parse output

11 years agoqualify this with containing class (IDEA-49251)
anna [Tue, 25 Oct 2011 17:47:20 +0000 (19:47 +0200)]
qualify this with containing class (IDEA-49251)

11 years agocreate annotation method from usage (IDEA-75910 )
anna [Tue, 25 Oct 2011 16:15:40 +0000 (18:15 +0200)]
create annotation method from usage (IDEA-75910 )

11 years agoNPE
anna [Tue, 25 Oct 2011 13:33:12 +0000 (15:33 +0200)]
NPE

11 years agogroovy jps builder initial
peter [Tue, 25 Oct 2011 17:41:01 +0000 (19:41 +0200)]
groovy jps builder initial

11 years agoGit. Detect "untracked files would be overwritten by" error and provide descriptive...
Kirill Likhodedov [Tue, 25 Oct 2011 17:13:04 +0000 (21:13 +0400)]
Git. Detect "untracked files would be overwritten by" error and provide descriptive message with the list of these untracked files. IDEA-75902, IDEA-73843, IDEA-71810, IDEA-71201

Generalize GitMessageWithFilesDetector to detect "untracked files" error along with "local changes" error.
Introduce utility class UntrackedFilesNotifier - shows notification for the error. Clicking on the link opens a dialog with the list of conflicting untracked files.
 Capture the error and show the notification in GitRebaseUpdater, GitMergeUpdater and GitBranchOperationsProcessor - for checkout.

11 years agoExtracted base functionality from OSProcessHandler; moved relevant classes to 'util...
Eugene Zhuravlev [Tue, 25 Oct 2011 17:02:35 +0000 (19:02 +0200)]
Extracted base functionality from OSProcessHandler; moved relevant classes to 'util' module

11 years agoRUBY-9687 Ignore *.rbc files by default
Dennis Ushakov [Tue, 25 Oct 2011 10:04:29 +0000 (14:04 +0400)]
RUBY-9687 Ignore *.rbc files by default

11 years agodecouple GroovyOSProcessHandler from progress indicators
peter [Tue, 25 Oct 2011 16:30:33 +0000 (18:30 +0200)]
decouple GroovyOSProcessHandler from progress indicators

11 years agono use of IDEA's OutputItem in GroovyOSProcessHandler
peter [Tue, 25 Oct 2011 16:25:57 +0000 (18:25 +0200)]
no use of IDEA's OutputItem in GroovyOSProcessHandler

11 years agoa bit on gdsl documentation
peter [Tue, 25 Oct 2011 11:11:03 +0000 (13:11 +0200)]
a bit on gdsl documentation

11 years agoAbstractSelectFilesDialog and descendants refactoring
Kirill Likhodedov [Tue, 25 Oct 2011 16:33:39 +0000 (20:33 +0400)]
AbstractSelectFilesDialog and descendants refactoring

Move action toolbar panel below the prompt.
Make "do not ask again" checkbox optional.
Make selection of displayed files optional.

11 years agoEA-30792 (yet more logging)
Roman Shevchenko [Tue, 25 Oct 2011 15:07:30 +0000 (17:07 +0200)]
EA-30792 (yet more logging)

11 years agoEA-30753 (more logging)
Roman Shevchenko [Tue, 25 Oct 2011 14:37:49 +0000 (16:37 +0200)]
EA-30753 (more logging)

11 years agofile history for dvcs: ask for current revision when checking whether history should...
irengrig [Tue, 25 Oct 2011 13:37:22 +0000 (17:37 +0400)]
file history for dvcs: ask for current revision when checking whether history should be updated (i.e. revision in current repository)

11 years agoold java source root detection code removed
nik [Tue, 25 Oct 2011 13:36:49 +0000 (17:36 +0400)]
old java source root detection code removed

11 years agodialog title fixed
nik [Tue, 25 Oct 2011 13:21:18 +0000 (17:21 +0400)]
dialog title fixed

11 years agoextract method: replace duplicates: skip promt for one-duplicate case (IDEA-75930)
anna [Tue, 25 Oct 2011 12:22:20 +0000 (14:22 +0200)]
extract method: replace duplicates: skip promt for one-duplicate case (IDEA-75930)

11 years agoIDEA-75908 Gradient of the new navigation bar is not based on the theme's base colors
Konstantin Bulenkov [Tue, 25 Oct 2011 13:22:47 +0000 (15:22 +0200)]
IDEA-75908 Gradient of the new navigation bar is not based on the theme's base colors

11 years agofixed plugin.xml files after move
nik [Tue, 25 Oct 2011 13:10:23 +0000 (17:10 +0400)]
fixed plugin.xml files after move

11 years agoFix GithubRebase action to use new Git API
Oleg Shpynov [Tue, 25 Oct 2011 12:54:40 +0000 (16:54 +0400)]
Fix GithubRebase action to use new Git API

11 years agopartially revert to fix test
Bas Leijdekkers [Tue, 25 Oct 2011 12:51:45 +0000 (14:51 +0200)]
partially revert to fix test

11 years agoIDEA-75854 do not copy sources from aidl gen source root of library modules
Eugene Kudelevsky [Tue, 25 Oct 2011 12:32:48 +0000 (16:32 +0400)]
IDEA-75854 do not copy sources from aidl gen source root of library modules

11 years agoclasses moved and renamed
nik [Tue, 25 Oct 2011 12:18:35 +0000 (16:18 +0400)]
classes moved and renamed

11 years agoclasses moved and renamed
nik [Tue, 25 Oct 2011 12:17:55 +0000 (16:17 +0400)]
classes moved and renamed

11 years agoerror loading message format, wording, possibility to reenable necessary plugins...
anna [Tue, 25 Oct 2011 11:07:18 +0000 (13:07 +0200)]
error loading message format, wording, possibility to reenable necessary plugins, open plugin repository from plugin loading error notification (IDEA-73908;IDEA-75903 )

11 years agoplugin manager: store disabled plugins name to present them correctly in error messag...
anna [Tue, 25 Oct 2011 11:03:23 +0000 (13:03 +0200)]
plugin manager: store disabled plugins name to present them correctly in error message (IDEA-75903 )

11 years agoIDEA-75863 (Create setting whether IDEA inserts space after "namedArgument:")
Sergey Evdokimov [Tue, 25 Oct 2011 12:11:19 +0000 (16:11 +0400)]
IDEA-75863 (Create setting whether IDEA inserts space after "namedArgument:")

11 years agoalpha for different LaFs
Konstantin Bulenkov [Tue, 25 Oct 2011 11:55:36 +0000 (13:55 +0200)]
alpha for different LaFs

11 years agoclasses moved
nik [Tue, 25 Oct 2011 12:10:55 +0000 (16:10 +0400)]
classes moved

11 years agoclasses moved
nik [Tue, 25 Oct 2011 12:10:07 +0000 (16:10 +0400)]
classes moved

11 years agoIDEA-75933 Console: Correct processing of user text that contains '\r'
Denis.Zhdanov [Tue, 25 Oct 2011 11:37:26 +0000 (15:37 +0400)]
IDEA-75933 Console: Correct processing of user text that contains '\r'

Correctly processing '\r' at the user input now

11 years agoEA-30872 - assert: ComponentManagerImpl.getPicoContainer
Denis.Zhdanov [Tue, 25 Oct 2011 11:20:08 +0000 (15:20 +0400)]
EA-30872 - assert: ComponentManagerImpl.getPicoContainer

11 years agoEA-30150 (don't poll invalid files)
Roman Shevchenko [Tue, 25 Oct 2011 10:14:42 +0000 (12:14 +0200)]
EA-30150 (don't poll invalid files)

11 years agoMerge branch 'master' of git.labs.intellij.net:idea/community
Michael Golubev [Tue, 25 Oct 2011 11:52:54 +0000 (13:52 +0200)]
Merge branch 'master' of git.labs.intellij.net:idea/community

11 years agocreate project from existing sources: process each directory only once
nik [Tue, 25 Oct 2011 11:42:21 +0000 (15:42 +0400)]
create project from existing sources: process each directory only once

11 years agounused methods removed
nik [Tue, 25 Oct 2011 07:38:45 +0000 (11:38 +0400)]
unused methods removed

11 years agoapp servers - fix IDEA-75619 - Context path of the browser url is lost if the field...
Michael Golubev [Tue, 25 Oct 2011 11:49:44 +0000 (13:49 +0200)]
app servers - fix IDEA-75619 - Context path of the browser url is lost if the field is modified on the Server tab

11 years agoMerge remote-tracking branch 'origin/master' idea/110.216
Kirill Likhodedov [Tue, 25 Oct 2011 11:03:16 +0000 (15:03 +0400)]
Merge remote-tracking branch 'origin/master'

11 years agoAnother attempt to specify correct library name in libLicenses.
Kirill Likhodedov [Tue, 25 Oct 2011 11:01:42 +0000 (15:01 +0400)]
Another attempt to specify correct library name in libLicenses.

11 years agogradient separator
Konstantin Bulenkov [Tue, 25 Oct 2011 10:55:52 +0000 (12:55 +0200)]
gradient separator

11 years agoEA-30841 fix NPE
Eugene Kudelevsky [Tue, 25 Oct 2011 10:14:25 +0000 (14:14 +0400)]
EA-30841 fix NPE

11 years agoEA-30733 fix already disposed
Eugene Kudelevsky [Tue, 25 Oct 2011 10:10:50 +0000 (14:10 +0400)]
EA-30733 fix already disposed

11 years agoIDEA-74213 (NonSerializableFieldInSerializableClass - Ignore by annotation)
Bas Leijdekkers [Tue, 25 Oct 2011 10:43:15 +0000 (12:43 +0200)]
IDEA-74213 (NonSerializableFieldInSerializableClass - Ignore by annotation)

11 years agogit log: allow to mark commits (state is NOT persisted between restarts). icon to...
irengrig [Tue, 25 Oct 2011 10:37:27 +0000 (14:37 +0400)]
git log: allow to mark commits (state is NOT persisted between restarts). icon to be changed

11 years agoBookmarkManagerTest.testBookmarkIsSavedAfterRemoteChange test is fixed
Sergey Simonchik [Tue, 25 Oct 2011 10:38:07 +0000 (14:38 +0400)]
BookmarkManagerTest.testBookmarkIsSavedAfterRemoteChange test is fixed

11 years agogroovy compiler
Eugene Zhuravlev [Tue, 25 Oct 2011 10:34:09 +0000 (12:34 +0200)]
groovy compiler

11 years agoeye restored, leaks fixed
Alexey Kudravtsev [Tue, 25 Oct 2011 10:29:34 +0000 (14:29 +0400)]
eye restored, leaks fixed

11 years agomock tests
Alexey Kudravtsev [Tue, 25 Oct 2011 09:07:58 +0000 (13:07 +0400)]
mock tests

11 years agoinstall plugin from disk (IDEA-72087)
anna [Tue, 25 Oct 2011 09:25:26 +0000 (11:25 +0200)]
install plugin from disk (IDEA-72087)

11 years agoprovide plugin info when new version is suggested (IDEA-75849 )
anna [Mon, 24 Oct 2011 18:30:17 +0000 (20:30 +0200)]
provide plugin info when new version is suggested (IDEA-75849 )

11 years agocomma?
irengrig [Tue, 25 Oct 2011 09:21:15 +0000 (13:21 +0400)]
comma?

11 years agogit log: detect stash commits by some heuristics
irengrig [Tue, 25 Oct 2011 09:17:08 +0000 (13:17 +0400)]
git log: detect stash commits by some heuristics

11 years agoPlatform: Already Disposed from Deferred icon cidr/109.53 cidr/109.54 cidr/109.55 cidr/109.56
Anton Makeev [Tue, 25 Oct 2011 09:02:06 +0000 (11:02 +0200)]
Platform: Already Disposed from Deferred icon

11 years agoIDEA-72278
Alexey Kudravtsev [Tue, 25 Oct 2011 09:05:04 +0000 (13:05 +0400)]
IDEA-72278

11 years agoOC-2221
Maxim Shafirov [Tue, 25 Oct 2011 09:02:36 +0000 (13:02 +0400)]
OC-2221

11 years agonotnull
Alexey Kudravtsev [Mon, 24 Oct 2011 13:33:17 +0000 (17:33 +0400)]
notnull

11 years agobetter settings ui for serializable inspections
Bas Leijdekkers [Tue, 25 Oct 2011 08:51:00 +0000 (10:51 +0200)]
better settings ui for serializable inspections

11 years agoIDEA-75726 Gradle: Allow to adjust project settings prior to importing
Denis.Zhdanov [Tue, 25 Oct 2011 08:40:34 +0000 (12:40 +0400)]
IDEA-75726 Gradle: Allow to adjust project settings prior to importing

1. It's possible to attach more than one path of the same type to library now;
2. Added dedicated GUI control for 'library dependency' node;
3. Added control for managing 'exported' status of library dependency;