Commit Graph
77644 Commits
Author SHA1 Message Date
anna c20dfe0a93 do not infer @NotNull for final fields with initializer (IDEA-75616) 2012-02-15 13:10:33 +01:00
irengrig 93f635b17c Merge remote branch 'origin/master' 2012-02-15 15:54:13 +04:00
irengrig 6d1479a846 Merge remote branch 'origin/master' 2012-02-15 15:52:33 +04:00
peter 36597ed9a8 don't suggest to search in libraries for project elements 2012-02-15 12:52:07 +01:00
peter b1f5cbc4f5 multi-line event log entries (IDEA-72708) 2012-02-15 12:52:06 +01:00
peter 8c0042260b second show usages invocation to search everywhere 2012-02-15 12:52:06 +01:00
irengrig 2583071ce4 SVN 1.7: show properties diff in common chain
for: local changes Ctrl+D, Repository view; browse changes

also show conflicted contents in show diff chain (r/o for now)
2012-02-15 15:28:22 +04:00
Sergey Evdokimov f74fa60139 IDEA-51438 (Maven: Allow explicit disabling of profiles)
Fixed for Maven Run Configuration.
2012-02-15 15:07:51 +04:00
Roman Shevchenko 4fc494cb65 IDEA-81189 (fix double clicking in Nimbus/GTK+ trees) 2012-02-15 12:01:48 +01:00
Konstantin Bulenkov 1b7e7c76a2 fix test 2012-02-15 11:54:37 +01:00
anna 7a875a6a17 do not count additionally tests with the same names (IDEA-81353) 2012-02-15 11:13:17 +01:00
anna e4119fbbb9 EA-30802 - AIOOBE: MoveClassesOrPackagesProcessor.performRefactoring 2012-02-15 10:36:04 +01:00
anna 4a0c087987 Merge remote-tracking branch 'origin/master' 2012-02-15 10:30:37 +01:00
anna 002567750d npes 2012-02-15 10:29:08 +01:00
Alexey Kudravtsev 0646acca24 cleanup 2012-02-15 13:15:35 +04:00
Alexey Kudravtsev a013e728b4 memory 2012-02-15 13:15:34 +04:00
Alexey Kudravtsev 8de93fecfe conserve memory 2012-02-15 13:15:33 +04:00
Alexey Kudravtsev 75c8569d3d removed expensive assertion 2012-02-15 13:15:33 +04:00
Alexey Kudravtsev ac7033340e NPE 2012-02-15 13:15:32 +04:00
Maxim.Medvedev d880505e5e reformat introduced parameters 2012-02-15 12:06:56 +04:00
Maxim.Medvedev 3f4ba9dbd4 delegate is restricted in closure introduce parameter 2012-02-15 12:06:55 +04:00
Dmitry Avdeev f8bd66811b IDEA-70961: 'Toggle Method Breakpoint/Field Watchpoint' shouldn't be present in the popup menu on a navbar module node 2012-02-15 11:43:07 +04:00
Dmitry Avdeev e6342efb29 deprecation in xml fixed 2012-02-15 10:48:30 +04:00
Roman Shevchenko 17bc57ef4e IDEA-79676 (always paint scroll bar borders with a same stroke) 2012-02-15 01:48:06 +01:00
Dmitry Jemerov 8e4b04ca14 Merge remote-tracking branch 'origin/master' 2012-02-14 21:36:08 +01:00
anna 7ad9853aa2 rename deadlock (IDEA-81152) 2012-02-14 21:17:16 +01:00
anna 385ce7fe33 bundle testng 6.4 2012-02-14 20:38:57 +01:00
anna 06410bffd5 bundle testng 6.4 2012-02-14 20:28:52 +01:00
Dmitry Jemerov 3656467501 possibility to put fixed property values in AttributesDefaults 2012-02-14 20:16:46 +01:00
Alexander Lobas b8d70ff460 DesignSurface & Events 2012-02-14 22:20:14 +04:00
anna 24054464f0 run all tests in abstract class inheritors 2012-02-14 18:54:08 +01:00
anna 281a692bff EA-33665 - AIOOBE: IntroduceVariableBase.createArrayCreationExpression 2012-02-14 18:54:07 +01:00
anna a829ba2568 ignore parameter for foreach (IDEA-72671) 2012-02-14 18:54:07 +01:00
anna 27ec78e579 suggest to turn refs to super after extract superclass/interface is already finished in order to prevent command break (IDEA-80565) 2012-02-14 18:54:06 +01:00
Konstantin Bulenkov d7dcfca5cf cosmetic 2012-02-14 17:39:42 +01:00
Kirill Likhodedov 0d162f22c4 Don't show additional info notification if there are no details. 2012-02-14 19:56:39 +04:00
Konstantin Bulenkov ee7b952986 same shortcut to enable/disable checkbox 2012-02-14 16:47:26 +01:00
Dmitry Trofimov acf49c4d4f Merge remote-tracking branch 'origin/master' 2012-02-14 16:20:46 +01:00
peter dbe73abeb1 IDEA-80815 Access to a Groovy console in any Java project 2012-02-14 16:02:20 +01:00
peter 72363bc6ce groupPath 2012-02-14 16:02:20 +01:00
peter 252f3302fb better wording 2012-02-14 16:02:20 +01:00
Dmitry Trofimov 2a1af489aa RI: pass environment variables via env command under unix 2012-02-14 16:01:02 +01:00
Kirill Likhodedov 56e555b092 GitMergeOperation: if an error occurred during merge and if the user decided not to rollback, don't popup the conflict resolver, but just show a notification instead. 2012-02-14 18:58:22 +04:00
Dmitry Avdeev 62ba20dc3a check class references only 2012-02-14 18:46:16 +04:00
Dmitry Avdeev aad1e06e15 NPE fixed 2012-02-14 18:46:16 +04:00
Dmitry Avdeev e4054fed33 UnusedDeclarationInspection group fixed 2012-02-14 18:46:15 +04:00
Kirill Likhodedov 8865535d1d IDEA-81325 Don't duplicate information about local changes overwritten by merge if user have declined smart merge. 2012-02-14 18:43:44 +04:00
Kirill Likhodedov 64100ac7c2 GitMergeOperation: rollback merges via git reset --merge and without taking care on local changes.
This fixes IDEA-81285 and IDEA-81287
2012-02-14 18:43:44 +04:00
Kirill Likhodedov 592e3ab694 Add some logging 2012-02-14 18:43:43 +04:00
Kirill Likhodedov 2f0400c4ed ChangeListManagerImpl: introduce freezeImmediately to freeze without update.
Use in GitFreezingProcess.
This fixes IDEA-81281.
2012-02-14 18:43:43 +04:00