From 1cd91e1af2c1780415b6c9515ed336624d11665e Mon Sep 17 00:00:00 2001
From: Yaroslav Lepenkin <yaroslav.lepenkin@jetbrains.com>
Date: Wed, 18 Feb 2015 16:08:47 +0300
Subject: [PATCH] refactoring, removed interface

---
 .../src/com/intellij/lang/java/JavaImportOptimizer.java     | 5 ++---
 .../InfoCollectingImportOptimizer.java}                     | 6 +++---
 .../codeInsight/actions/OptimizeImportsProcessor.java       | 6 +++---
 .../psi/codeStyle/arrangement/engine/ArrangementEngine.java | 4 +---
 4 files changed, 9 insertions(+), 12 deletions(-)
 rename platform/lang-api/src/com/intellij/{notification/UserNotificationInfoProvider.java => lang/InfoCollectingImportOptimizer.java} (87%)

diff --git a/java/java-impl/src/com/intellij/lang/java/JavaImportOptimizer.java b/java/java-impl/src/com/intellij/lang/java/JavaImportOptimizer.java
index 049477ff04fa..388819312e34 100644
--- a/java/java-impl/src/com/intellij/lang/java/JavaImportOptimizer.java
+++ b/java/java-impl/src/com/intellij/lang/java/JavaImportOptimizer.java
@@ -16,8 +16,7 @@
 
 package com.intellij.lang.java;
 
-import com.intellij.lang.ImportOptimizer;
-import com.intellij.notification.UserNotificationInfoProvider;
+import com.intellij.lang.InfoCollectingImportOptimizer;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.project.Project;
@@ -34,7 +33,7 @@ import org.jetbrains.annotations.Nullable;
 /**
  * @author max
  */
-public class JavaImportOptimizer implements ImportOptimizer, UserNotificationInfoProvider {
+public class JavaImportOptimizer implements InfoCollectingImportOptimizer {
   private static final Logger LOG = Logger.getInstance("#com.intellij.lang.java.JavaImportOptimizer");
   private int myImportListLengthDiff;
 
diff --git a/platform/lang-api/src/com/intellij/notification/UserNotificationInfoProvider.java b/platform/lang-api/src/com/intellij/lang/InfoCollectingImportOptimizer.java
similarity index 87%
rename from platform/lang-api/src/com/intellij/notification/UserNotificationInfoProvider.java
rename to platform/lang-api/src/com/intellij/lang/InfoCollectingImportOptimizer.java
index 9a0abef512a0..b97c5b217ae5 100644
--- a/platform/lang-api/src/com/intellij/notification/UserNotificationInfoProvider.java
+++ b/platform/lang-api/src/com/intellij/lang/InfoCollectingImportOptimizer.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.notification;
+package com.intellij.lang;
 
 import org.jetbrains.annotations.Nullable;
 
-public interface UserNotificationInfoProvider {
+public interface InfoCollectingImportOptimizer extends ImportOptimizer {
 
   @Nullable
   String getUserNotificationInfo();
 
-}
\ No newline at end of file
+}
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/actions/OptimizeImportsProcessor.java b/platform/lang-impl/src/com/intellij/codeInsight/actions/OptimizeImportsProcessor.java
index d0f024edf332..fd187c4335dd 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/actions/OptimizeImportsProcessor.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/actions/OptimizeImportsProcessor.java
@@ -18,8 +18,8 @@ package com.intellij.codeInsight.actions;
 
 import com.intellij.codeInsight.CodeInsightBundle;
 import com.intellij.lang.ImportOptimizer;
+import com.intellij.lang.InfoCollectingImportOptimizer;
 import com.intellij.lang.LanguageImportStatements;
-import com.intellij.notification.UserNotificationInfoProvider;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.EmptyRunnable;
@@ -108,8 +108,8 @@ public class OptimizeImportsProcessor extends AbstractLayoutCodeProcessor {
 
   private static String retrieveMessage(@NotNull ImportOptimizer optimizer) {
     String info = "imports optimized";
-    if (optimizer instanceof UserNotificationInfoProvider) {
-        info = ((UserNotificationInfoProvider)optimizer).getUserNotificationInfo();
+    if (optimizer instanceof InfoCollectingImportOptimizer) {
+        info = ((InfoCollectingImportOptimizer)optimizer).getUserNotificationInfo();
     }
     return info;
   }
diff --git a/platform/lang-impl/src/com/intellij/psi/codeStyle/arrangement/engine/ArrangementEngine.java b/platform/lang-impl/src/com/intellij/psi/codeStyle/arrangement/engine/ArrangementEngine.java
index ab461b31716f..b3d39daede51 100644
--- a/platform/lang-impl/src/com/intellij/psi/codeStyle/arrangement/engine/ArrangementEngine.java
+++ b/platform/lang-impl/src/com/intellij/psi/codeStyle/arrangement/engine/ArrangementEngine.java
@@ -15,7 +15,6 @@
  */
 package com.intellij.psi.codeStyle.arrangement.engine;
 
-import com.intellij.notification.UserNotificationInfoProvider;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.Editor;
@@ -57,11 +56,10 @@ import static com.intellij.psi.codeStyle.arrangement.std.StdArrangementTokens.Se
  * @author Denis Zhdanov
  * @since 7/20/12 1:56 PM
  */
-public class ArrangementEngine implements UserNotificationInfoProvider {
+public class ArrangementEngine {
   private boolean myCodeChanged;
 
   @Nullable
-  @Override
   public String getUserNotificationInfo() {
     if (myCodeChanged) {
       return "rearranged code";