Merge branch 'master' into no-reformat-dialog-on-reformat-code-action
authorYaroslav Lepenkin <yaroslav.lepenkin@jetbrains.com>
Wed, 11 Feb 2015 12:07:55 +0000 (15:07 +0300)
committerYaroslav Lepenkin <yaroslav.lepenkin@jetbrains.com>
Wed, 11 Feb 2015 12:07:55 +0000 (15:07 +0300)
Conflicts:
platform/lang-impl/src/com/intellij/codeInsight/actions/AbstractLayoutCodeProcessor.java

1  2 
java/java-tests/testSrc/com/intellij/codeInsight/actions/AbstractLayoutCodeProcessorTest.java
java/java-tests/testSrc/com/intellij/codeInsight/actions/ReformatCodeActionTest.java
platform/lang-impl/src/com/intellij/codeInsight/actions/AbstractLayoutCodeProcessor.java
platform/lang-impl/src/com/intellij/codeInsight/actions/OptimizeImportsAction.java
platform/lang-impl/src/com/intellij/codeInsight/actions/ReformatCodeAction.java
platform/platform-resources/src/idea/Keymap_Default.xml
platform/platform-resources/src/idea/LangActions.xml

index 359e7e1273a2c1debec866cabbbd1e34cee04cc4,e2447f775f6a4da0f8b1e278b7d295f1235b79be..5613b489e71ca940d7571969ff730e5fe9426acd
@@@ -18,9 -18,7 +18,10 @@@ package com.intellij.codeInsight.action
  
  import com.intellij.codeInsight.CodeInsightBundle;
  import com.intellij.lang.LanguageFormatting;
 +import com.intellij.notification.Notification;
 +import com.intellij.notification.NotificationType;
 +import com.intellij.openapi.application.ApplicationBundle;
+ import com.intellij.openapi.application.ApplicationBundle;
  import com.intellij.openapi.application.ApplicationManager;
  import com.intellij.openapi.application.ModalityState;
  import com.intellij.openapi.command.CommandProcessor;